diff -Nru folks-0.6.6/aclocal.m4 folks-0.6.7/aclocal.m4 --- folks-0.6.6/aclocal.m4 2011-12-13 23:38:28.000000000 +0000 +++ folks-0.6.7/aclocal.m4 2012-02-23 00:04:10.000000000 +0000 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.2 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,200 +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'.])]) - -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 40 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], [ -AC_PREREQ([2.50])dnl -AC_REQUIRE([AM_NLS])dnl - -case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; -esac - -if test -n "$1"; then - AC_MSG_CHECKING([for intltool >= $1]) - - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -fi - -AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) -AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) -AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) -fi - - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - -_IT_SUBST(INTLTOOL_DESKTOP_RULE) -_IT_SUBST(INTLTOOL_DIRECTORY_RULE) -_IT_SUBST(INTLTOOL_KEYS_RULE) -_IT_SUBST(INTLTOOL_PROP_RULE) -_IT_SUBST(INTLTOOL_OAF_RULE) -_IT_SUBST(INTLTOOL_PONG_RULE) -_IT_SUBST(INTLTOOL_SERVER_RULE) -_IT_SUBST(INTLTOOL_SHEET_RULE) -_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) -_IT_SUBST(INTLTOOL_UI_RULE) -_IT_SUBST(INTLTOOL_XAM_RULE) -_IT_SUBST(INTLTOOL_KBD_RULE) -_IT_SUBST(INTLTOOL_XML_RULE) -_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) -_IT_SUBST(INTLTOOL_CAVES_RULE) -_IT_SUBST(INTLTOOL_SCHEMAS_RULE) -_IT_SUBST(INTLTOOL_THEME_RULE) -_IT_SUBST(INTLTOOL_SERVICE_RULE) -_IT_SUBST(INTLTOOL_POLICY_RULE) - -# Check the gettext tools to make sure they are GNU -AC_PATH_PROG(XGETTEXT, xgettext) -AC_PATH_PROG(MSGMERGE, msgmerge) -AC_PATH_PROG(MSGFMT, msgfmt) -AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi - -AC_PATH_PROG(INTLTOOL_PERL, perl) -if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found]) -fi -AC_MSG_CHECKING([for perl >= 5.8.1]) -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -if test $? -ne 0; then - AC_MSG_ERROR([perl 5.8.1 is required for intltool]) -else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" - AC_MSG_RESULT([$IT_PERL_VERSION]) -fi -if test "x$2" != "xno-xml"; then - AC_MSG_CHECKING([for XML::Parser]) - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - AC_MSG_RESULT([ok]) - else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) - fi -fi - -# Substitute ALL_LINGUAS so we can use it in po/Makefile -AC_SUBST(ALL_LINGUAS) - -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) - -IT_PO_SUBDIR([po]) - -]) - - -# IT_PO_SUBDIR(DIRNAME) -# --------------------- -# All po subdirs have to be declared with this macro; the subdir "po" is -# declared by IT_PROG_INTLTOOL. -# -AC_DEFUN([IT_PO_SUBDIR], -[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -dnl -dnl The following CONFIG_COMMANDS should be executed at the very end -dnl of config.status. -AC_CONFIG_COMMANDS_PRE([ - AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then - AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) - fi - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" - >"$1/stamp-it.tmp" - [sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" - ] - [sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r $1/POTFILES - } - ' "$1/Makefile.in" >"$1/Makefile"] - rm -f "$1/Makefile.tmp" - mv "$1/stamp-it.tmp" "$1/stamp-it" - ]) -])dnl -]) - -# _IT_SUBST(VARIABLE) -# ------------------- -# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -# -AC_DEFUN([_IT_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) - -# deprecated macros -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -# A hint is needed for aclocal from Automake <= 1.9.4: -# AC_DEFUN([AC_PROG_INTLTOOL], ...) - - # nls.m4 serial 5 (gettext-0.18) dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, dnl Inc. @@ -406,12 +213,15 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -421,7 +231,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.11.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -437,19 +247,21 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.11.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -531,14 +343,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 12 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -578,6 +390,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -642,7 +455,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -707,10 +520,13 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -932,12 +748,15 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -977,8 +796,8 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, +# 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -998,7 +817,7 @@ [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -1144,12 +963,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -1172,13 +994,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -1186,13 +1009,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -1203,12 +1026,14 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_RUN_LOG(COMMAND) # ------------------- # Run COMMAND, save the exit status in ac_status, and log it. @@ -1312,12 +1137,14 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -1340,13 +1167,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -1355,7 +1182,7 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) @@ -1486,6 +1313,7 @@ ]) m4_include([m4/as-compiler-flag.m4]) +m4_include([m4/intltool.m4]) m4_include([m4/introspection.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) diff -Nru folks-0.6.6/autogen.sh folks-0.6.7/autogen.sh --- folks-0.6.6/autogen.sh 2011-09-27 20:43:44.000000000 +0000 +++ folks-0.6.7/autogen.sh 2012-01-20 22:23:23.000000000 +0000 @@ -17,16 +17,20 @@ autoreconf -i -f intltoolize --force --copy --automake -run_configure=true -for arg in $*; do - case $arg in - --no-configure) - run_configure=false - ;; - *) - ;; - esac -done +if test -z "$NOCONFIGURE"; then + run_configure=true + for arg in $*; do + case $arg in + --no-configure) + run_configure=false + ;; + *) + ;; + esac + done +else + run_configure=false +fi if test $run_configure = true; then ./configure "$@" diff -Nru folks-0.6.6/backends/eds/eds-backend.c folks-0.6.7/backends/eds/eds-backend.c --- folks-0.6.6/backends/eds/eds-backend.c 2011-12-13 23:41:03.000000000 +0000 +++ folks-0.6.7/backends/eds/eds-backend.c 2012-02-23 00:02:12.000000000 +0000 @@ -1,4 +1,4 @@ -/* eds-backend.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* eds-backend.c generated by valac 0.15.1, the Vala compiler * generated from eds-backend.vala, do not modify */ /* @@ -376,7 +376,7 @@ _data_->self->priv->_prepare_pending = TRUE; { _data_->_tmp6_ = _data_->self->priv->_persona_stores; - _data_->_tmp7_ = gee_map_get_values ((GeeMap*) _data_->_tmp6_); + _data_->_tmp7_ = gee_abstract_map_get_values ((GeeMap*) _data_->_tmp6_); _data_->_tmp8_ = _data_->_tmp7_; _data_->_tmp9_ = _data_->_tmp8_; _data_->_tmp10_ = NULL; @@ -590,7 +590,7 @@ _tmp24_ = _g_object_ref0 (_tmp23_); _source_list = _tmp24_; _tmp25_ = _source_list; - _tmp26_ = gee_collection_get_size ((GeeCollection*) _tmp25_); + _tmp26_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp25_); _tmp27_ = _tmp26_; _source_size = _tmp27_; _source_index = -1; @@ -861,11 +861,11 @@ /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_EDS_BACKEND_NAME, "name"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_EDS_BACKEND_NAME, g_param_spec_string ("name", "name", "name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_EDS_BACKEND_PERSONA_STORES, "persona-stores"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_EDS_BACKEND_PERSONA_STORES, g_param_spec_object ("persona-stores", "persona-stores", "persona-stores", GEE_TYPE_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this Backend has been prepared. * @@ -873,7 +873,7 @@ * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_EDS_BACKEND_IS_PREPARED, "is-prepared"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_EDS_BACKEND_IS_PREPARED, g_param_spec_boolean ("is-prepared", "is-prepared", "is-prepared", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this Backend has reached a quiescent state. * @@ -881,7 +881,7 @@ * * @since 0.6.2 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_EDS_BACKEND_IS_QUIESCENT, "is-quiescent"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_EDS_BACKEND_IS_QUIESCENT, g_param_spec_boolean ("is-quiescent", "is-quiescent", "is-quiescent", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); } diff -Nru folks-0.6.6/backends/eds/eds-backend-factory.c folks-0.6.7/backends/eds/eds-backend-factory.c --- folks-0.6.6/backends/eds/eds-backend-factory.c 2011-12-13 23:41:03.000000000 +0000 +++ folks-0.6.7/backends/eds/eds-backend-factory.c 2012-02-23 00:02:12.000000000 +0000 @@ -1,4 +1,4 @@ -/* eds-backend-factory.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* eds-backend-factory.c generated by valac 0.15.1, the Vala compiler * generated from eds-backend-factory.vala, do not modify */ /* diff -Nru folks-0.6.6/backends/eds/lib/edsf-persona.c folks-0.6.7/backends/eds/lib/edsf-persona.c --- folks-0.6.6/backends/eds/lib/edsf-persona.c 2011-12-13 23:40:50.000000000 +0000 +++ folks-0.6.7/backends/eds/lib/edsf-persona.c 2012-02-23 00:02:09.000000000 +0000 @@ -1,4 +1,4 @@ -/* edsf-persona.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* edsf-persona.c generated by valac 0.15.1, the Vala compiler * generated from edsf-persona.vala, do not modify */ /* @@ -83,6 +83,7 @@ #define __vala_EVCardAttributeParam_free0(var) ((var == NULL) ? NULL : (var = (_vala_EVCardAttributeParam_free (var), NULL))) #define __g_list_free___vala_EVCardAttribute_free0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free___vala_EVCardAttribute_free0_ (var), NULL))) #define __vala_EContactName_free0(var) ((var == NULL) ? NULL : (var = (_vala_EContactName_free (var), NULL))) +#define __vala_EContactPhoto_free0(var) ((var == NULL) ? NULL : (var = (_vala_EContactPhoto_free (var), NULL))) #define EDSF_TYPE_MEMORY_ICON (edsf_memory_icon_get_type ()) #define EDSF_MEMORY_ICON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EDSF_TYPE_MEMORY_ICON, EdsfMemoryIcon)) @@ -95,7 +96,6 @@ typedef struct _EdsfMemoryIconClass EdsfMemoryIconClass; typedef struct _Block1Data Block1Data; #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) -#define __vala_EContactPhoto_free0(var) ((var == NULL) ? NULL : (var = (_vala_EContactPhoto_free (var), NULL))) #define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL))) #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL))) @@ -617,18 +617,19 @@ static void _g_list_free___vala_EVCardAttribute_free0_ (GList* self); static EContactName* _vala_EContactName_copy (EContactName* self); static void _vala_EContactName_free (EContactName* self); -static GLoadableIcon* _edsf_persona_contact_photo_to_loadable_icon (EdsfPersona* self, EContactPhoto* p); +static GLoadableIcon* _edsf_persona_contact_photo_to_loadable_icon (EdsfPersona* self, EContactPhoto* _p); +static EContactPhoto* _vala_EContactPhoto_copy (EContactPhoto* self); +static void _vala_EContactPhoto_free (EContactPhoto* self); +static guint8* _vala_array_dup1 (guint8* self, int length); EdsfMemoryIcon* edsf_memory_icon_new (const gchar* image_type, guint8* image_data, int image_data_length1); EdsfMemoryIcon* edsf_memory_icon_construct (GType object_type, const gchar* image_type, guint8* image_data, int image_data_length1); GType edsf_memory_icon_get_type (void) G_GNUC_CONST; static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (Block1Data* _data1_); -static EContactPhoto* _vala_EContactPhoto_copy (EContactPhoto* self); static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res); static void ____lambda4__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); -static void ____lambda7_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res); -static void _____lambda7__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); -static void _vala_EContactPhoto_free (EContactPhoto* self); +static void ____lambda5_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res); +static void _____lambda5__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); GHashTable* _edsf_persona_get_im_eds_map (void); static gchar* _edsf_persona_im_proto_from_addr (EdsfPersona* self, const gchar* addr); static void _g_free0_ (gpointer var); @@ -1438,7 +1439,7 @@ EdsfPersonaChangeFullNameData* _data_; EdsfPersona* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; self = (EdsfPersona*) base; _data_ = g_slice_new0 (EdsfPersonaChangeFullNameData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, edsf_persona_real_change_full_name); @@ -1534,7 +1535,7 @@ EdsfPersonaChangeNicknameData* _data_; EdsfPersona* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; self = (EdsfPersona*) base; _data_ = g_slice_new0 (EdsfPersonaChangeNicknameData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, edsf_persona_real_change_nickname); @@ -1915,7 +1916,7 @@ EdsfPersonaChangeGroupData* _data_; EdsfPersona* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; gboolean _tmp3_; self = (EdsfPersona*) base; _data_ = g_slice_new0 (EdsfPersonaChangeGroupData); @@ -2479,16 +2480,33 @@ gchar* _tmp2_; gchar* contact_id; const gchar* _tmp3_; - gchar* _tmp4_ = NULL; + gchar* _tmp4_; + gchar* _tmp5_; + const gchar* _tmp6_; + const gchar* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_ = NULL; g_return_val_if_fail (store_id != NULL, NULL); g_return_val_if_fail (contact != NULL, NULL); _tmp0_ = contact; _tmp1_ = _edsf_persona_get_property_from_contact (_tmp0_, "id"); _tmp2_ = g_strdup ((const gchar*) _tmp1_); contact_id = _tmp2_; - _tmp3_ = store_id; - _tmp4_ = edsf_persona_build_iid (_tmp3_, contact_id); - result = _tmp4_; + _tmp3_ = contact_id; + _tmp4_ = g_strdup (_tmp3_); + _tmp5_ = _tmp4_; + _tmp6_ = _tmp5_; + if (_tmp6_ == NULL) { + gchar* _tmp7_; + _tmp7_ = g_strdup (""); + _g_free0 (_tmp5_); + _tmp5_ = _tmp7_; + } + _tmp8_ = store_id; + _tmp9_ = _tmp5_; + _tmp10_ = edsf_persona_build_iid (_tmp8_, (const gchar*) _tmp9_); + result = _tmp10_; + _g_free0 (_tmp5_); _g_free0 (contact_id); return result; } @@ -2531,78 +2549,112 @@ EContact* _tmp0_; void* _tmp1_ = NULL; gchar* _tmp2_; - gchar* contact_id; - EdsfPersonaStore* _tmp3_; - const gchar* _tmp4_; - const gchar* _tmp5_; + gchar* _contact_id; + const gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; const gchar* _tmp6_; - gchar* _tmp7_ = NULL; - gchar* uid; - EdsfPersonaStore* _tmp8_; - const gchar* _tmp9_; - const gchar* _tmp10_; + const gchar* _tmp8_; + gchar* _tmp9_; + gchar* contact_id; + EdsfPersonaStore* _tmp10_; const gchar* _tmp11_; - gchar* _tmp12_ = NULL; + const gchar* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_ = NULL; + gchar* uid; + EdsfPersonaStore* _tmp15_; + const gchar* _tmp16_; + const gchar* _tmp17_; + const gchar* _tmp18_; + gchar* _tmp19_ = NULL; gchar* iid; - EContact* _tmp13_; - gboolean _tmp14_ = FALSE; + EContact* _tmp20_; + gboolean _tmp21_ = FALSE; gboolean is_user; - EContact* _tmp15_; - void* _tmp16_ = NULL; - gchar* _tmp17_; - gchar* full_name; - const gchar* _tmp18_; - const gchar* _tmp20_; - const gchar* _tmp21_; - const gchar* _tmp22_; - EdsfPersonaStore* _tmp23_; - gboolean _tmp24_; + EContact* _tmp22_; + void* _tmp23_ = NULL; + gchar* _tmp24_; + gchar* _full_name; const gchar* _tmp25_; - EContact* _tmp26_; + gchar* _tmp26_; + gchar* _tmp27_; + const gchar* _tmp28_; + const gchar* _tmp30_; + gchar* _tmp31_; + gchar* full_name; + const gchar* _tmp32_; + const gchar* _tmp33_; + EdsfPersonaStore* _tmp34_; + gboolean _tmp35_; + const gchar* _tmp36_; + EContact* _tmp37_; g_return_val_if_fail (store != NULL, NULL); g_return_val_if_fail (contact != NULL, NULL); _tmp0_ = contact; _tmp1_ = _edsf_persona_get_property_from_contact (_tmp0_, "id"); _tmp2_ = g_strdup ((const gchar*) _tmp1_); - contact_id = _tmp2_; - _tmp3_ = store; - _tmp4_ = folks_persona_store_get_id ((FolksPersonaStore*) _tmp3_); + _contact_id = _tmp2_; + _tmp3_ = _contact_id; + _tmp4_ = g_strdup (_tmp3_); _tmp5_ = _tmp4_; - _tmp6_ = contact_id; - _tmp7_ = folks_persona_build_uid (BACKEND_NAME, _tmp5_, _tmp6_); - uid = _tmp7_; - _tmp8_ = store; - _tmp9_ = folks_persona_store_get_id ((FolksPersonaStore*) _tmp8_); - _tmp10_ = _tmp9_; - _tmp11_ = contact_id; - _tmp12_ = edsf_persona_build_iid (_tmp10_, _tmp11_); - iid = _tmp12_; - _tmp13_ = contact; - _tmp14_ = e_book_client_is_self (_tmp13_); - is_user = _tmp14_; - _tmp15_ = contact; - _tmp16_ = _edsf_persona_get_property_from_contact (_tmp15_, "full_name"); - _tmp17_ = g_strdup ((const gchar*) _tmp16_); - full_name = _tmp17_; - _tmp18_ = full_name; - if (_tmp18_ == NULL) { - gchar* _tmp19_; - _tmp19_ = g_strdup (""); - _g_free0 (full_name); - full_name = _tmp19_; - } - _tmp20_ = full_name; - _tmp21_ = uid; - _tmp22_ = iid; - _tmp23_ = store; - _tmp24_ = is_user; - _tmp25_ = contact_id; - _tmp26_ = contact; - self = (EdsfPersona*) g_object_new (object_type, "display-id", _tmp20_, "uid", _tmp21_, "iid", _tmp22_, "store", _tmp23_, "is-user", _tmp24_, "contact-id", _tmp25_, "contact", _tmp26_, NULL); + _tmp6_ = _tmp5_; + if (_tmp6_ == NULL) { + gchar* _tmp7_; + _tmp7_ = g_strdup (""); + _g_free0 (_tmp5_); + _tmp5_ = _tmp7_; + } + _tmp8_ = _tmp5_; + _tmp9_ = g_strdup ((const gchar*) _tmp8_); + contact_id = _tmp9_; + _tmp10_ = store; + _tmp11_ = folks_persona_store_get_id ((FolksPersonaStore*) _tmp10_); + _tmp12_ = _tmp11_; + _tmp13_ = contact_id; + _tmp14_ = folks_persona_build_uid (BACKEND_NAME, _tmp12_, _tmp13_); + uid = _tmp14_; + _tmp15_ = store; + _tmp16_ = folks_persona_store_get_id ((FolksPersonaStore*) _tmp15_); + _tmp17_ = _tmp16_; + _tmp18_ = contact_id; + _tmp19_ = edsf_persona_build_iid (_tmp17_, _tmp18_); + iid = _tmp19_; + _tmp20_ = contact; + _tmp21_ = e_book_client_is_self (_tmp20_); + is_user = _tmp21_; + _tmp22_ = contact; + _tmp23_ = _edsf_persona_get_property_from_contact (_tmp22_, "full_name"); + _tmp24_ = g_strdup ((const gchar*) _tmp23_); + _full_name = _tmp24_; + _tmp25_ = _full_name; + _tmp26_ = g_strdup (_tmp25_); + _tmp27_ = _tmp26_; + _tmp28_ = _tmp27_; + if (_tmp28_ == NULL) { + gchar* _tmp29_; + _tmp29_ = g_strdup (""); + _g_free0 (_tmp27_); + _tmp27_ = _tmp29_; + } + _tmp30_ = _tmp27_; + _tmp31_ = g_strdup ((const gchar*) _tmp30_); + full_name = _tmp31_; + _tmp32_ = uid; + _tmp33_ = iid; + _tmp34_ = store; + _tmp35_ = is_user; + _tmp36_ = contact_id; + _tmp37_ = contact; + self = (EdsfPersona*) g_object_new (object_type, "display-id", full_name, "uid", _tmp32_, "iid", _tmp33_, "store", _tmp34_, "is-user", _tmp35_, "contact-id", _tmp36_, "contact", _tmp37_, NULL); _g_free0 (full_name); + _g_free0 (_tmp27_); + _g_free0 (_full_name); _g_free0 (iid); _g_free0 (uid); _g_free0 (contact_id); + _g_free0 (_tmp5_); + _g_free0 (_contact_id); return self; } @@ -2986,8 +3038,8 @@ EVCardAttribute* _tmp3_; EVCardAttribute* gender_attr; EVCardAttribute* _tmp4_; - FolksGender _tmp12_; FolksGender _tmp13_; + FolksGender _tmp14_; g_return_if_fail (self != NULL); gender = FOLKS_GENDER_UNSPECIFIED; _tmp0_ = edsf_persona_get_contact (self); @@ -2999,36 +3051,55 @@ if (_tmp4_ != NULL) { EVCardAttribute* _tmp5_; gchar* _tmp6_ = NULL; - gchar* _tmp7_; - gchar* _tmp8_ = NULL; - gchar* _tmp9_; - gchar* gender_str; - const gchar* _tmp10_; + gchar* val; + const gchar* _tmp7_; _tmp5_ = gender_attr; - _tmp6_ = e_vcard_attribute_get_value (_tmp5_); - _tmp7_ = _tmp6_; - _tmp8_ = g_utf8_strup (_tmp7_, (gssize) (-1)); - _tmp9_ = _tmp8_; - _g_free0 (_tmp7_); - gender_str = _tmp9_; - _tmp10_ = gender_str; - if (g_strcmp0 (_tmp10_, EDSF_PERSONA_gender_male) == 0) { - gender = FOLKS_GENDER_MALE; - } else { - const gchar* _tmp11_; - _tmp11_ = gender_str; - if (g_strcmp0 (_tmp11_, EDSF_PERSONA_gender_female) == 0) { - gender = FOLKS_GENDER_FEMALE; + _tmp6_ = e_vcard_attribute_get_value ((EVCardAttribute*) _tmp5_); + val = _tmp6_; + _tmp7_ = val; + if (_tmp7_ != NULL) { + const gchar* _tmp8_; + gchar* _tmp9_ = NULL; + gchar* _tmp10_; + GQuark _tmp12_ = 0U; + _tmp8_ = val; + _tmp9_ = g_utf8_strup ((const gchar*) _tmp8_, (gssize) (-1)); + _tmp10_ = _tmp9_; + _tmp12_ = (NULL == _tmp10_) ? 0 : g_quark_from_string (_tmp10_); + g_free (_tmp10_); + if (_tmp12_ == g_quark_from_string (EDSF_PERSONA_gender_male)) { + switch (0) { + default: + { + gender = FOLKS_GENDER_MALE; + break; + } + } + } else if (_tmp12_ == g_quark_from_string (EDSF_PERSONA_gender_female)) { + switch (0) { + default: + { + gender = FOLKS_GENDER_FEMALE; + break; + } + } + } else { + switch (0) { + default: + { + break; + } + } } } - _g_free0 (gender_str); - } - _tmp12_ = self->priv->_gender; - _tmp13_ = gender; - if (_tmp12_ != _tmp13_) { - FolksGender _tmp14_; - _tmp14_ = gender; - self->priv->_gender = _tmp14_; + _g_free0 (val); + } + _tmp13_ = self->priv->_gender; + _tmp14_ = gender; + if (_tmp13_ != _tmp14_) { + FolksGender _tmp15_; + _tmp15_ = gender; + self->priv->_gender = _tmp15_; g_object_notify ((GObject*) self, "gender"); } __vala_EVCardAttribute_free0 (gender_attr); @@ -3053,83 +3124,90 @@ static void _edsf_persona_update_birthday (EdsfPersona* self) { void* _tmp0_ = NULL; EContactDate* _tmp1_; - EContactDate* bday; + EContactDate* _bday; EContactDate* _tmp2_; g_return_if_fail (self != NULL); _tmp0_ = _edsf_persona_get_property (self, "birth_date"); _tmp1_ = __vala_EContactDate_copy0 ((EContactDate*) _tmp0_); - bday = _tmp1_; - _tmp2_ = bday; + _bday = _tmp1_; + _tmp2_ = _bday; if (_tmp2_ != NULL) { - GTimeZone* _tmp3_; + EContactDate* _tmp3_; EContactDate* _tmp4_; - guint _tmp5_; + EContactDate* bday; + GTimeZone* _tmp5_; EContactDate* _tmp6_; guint _tmp7_; EContactDate* _tmp8_; guint _tmp9_; - GDateTime* _tmp10_; - GDateTime* d; - gboolean _tmp11_ = FALSE; + EContactDate* _tmp10_; + guint _tmp11_; GDateTime* _tmp12_; - gboolean _tmp21_; - _tmp3_ = edsf_persona__local_time_zone; - _tmp4_ = bday; - _tmp5_ = _tmp4_->year; + GDateTime* d; + gboolean _tmp13_ = FALSE; + GDateTime* _tmp14_; + gboolean _tmp23_; + _tmp3_ = _bday; + _tmp4_ = __vala_EContactDate_copy0 ((EContactDate*) _tmp3_); + bday = _tmp4_; + _tmp5_ = edsf_persona__local_time_zone; _tmp6_ = bday; - _tmp7_ = _tmp6_->month; + _tmp7_ = _tmp6_->year; _tmp8_ = bday; - _tmp9_ = _tmp8_->day; - _tmp10_ = g_date_time_new (_tmp3_, (gint) _tmp5_, (gint) _tmp7_, (gint) _tmp9_, 0, 0, 0.0); - d = _tmp10_; - _tmp12_ = self->priv->_birthday; - if (_tmp12_ == NULL) { - _tmp11_ = TRUE; + _tmp9_ = _tmp8_->month; + _tmp10_ = bday; + _tmp11_ = _tmp10_->day; + _tmp12_ = g_date_time_new (_tmp5_, (gint) _tmp7_, (gint) _tmp9_, (gint) _tmp11_, 0, 0, 0.0); + d = _tmp12_; + _tmp14_ = self->priv->_birthday; + if (_tmp14_ == NULL) { + _tmp13_ = TRUE; } else { - gboolean _tmp13_ = FALSE; - GDateTime* _tmp14_; - gboolean _tmp20_; - _tmp14_ = self->priv->_birthday; - if (_tmp14_ != NULL) { - GDateTime* _tmp15_; - GDateTime* _tmp16_; - GDateTime* _tmp17_ = NULL; + gboolean _tmp15_ = FALSE; + GDateTime* _tmp16_; + gboolean _tmp22_; + _tmp16_ = self->priv->_birthday; + if (_tmp16_ != NULL) { + GDateTime* _tmp17_; GDateTime* _tmp18_; - gboolean _tmp19_ = FALSE; - _tmp15_ = self->priv->_birthday; - _tmp16_ = d; - _tmp17_ = g_date_time_to_utc (_tmp16_); - _tmp18_ = _tmp17_; - _tmp19_ = g_date_time_equal (_tmp15_, _tmp18_); - _tmp13_ = !_tmp19_; - _g_date_time_unref0 (_tmp18_); + GDateTime* _tmp19_ = NULL; + GDateTime* _tmp20_; + gboolean _tmp21_ = FALSE; + _tmp17_ = self->priv->_birthday; + _tmp18_ = d; + _tmp19_ = g_date_time_to_utc (_tmp18_); + _tmp20_ = _tmp19_; + _tmp21_ = g_date_time_equal ((GDateTime*) _tmp17_, _tmp20_); + _tmp15_ = !_tmp21_; + _g_date_time_unref0 (_tmp20_); } else { - _tmp13_ = FALSE; + _tmp15_ = FALSE; } - _tmp20_ = _tmp13_; - _tmp11_ = _tmp20_; + _tmp22_ = _tmp15_; + _tmp13_ = _tmp22_; } - _tmp21_ = _tmp11_; - if (_tmp21_) { - GDateTime* _tmp22_; - GDateTime* _tmp23_ = NULL; - _tmp22_ = d; - _tmp23_ = g_date_time_to_utc (_tmp22_); + _tmp23_ = _tmp13_; + if (_tmp23_) { + GDateTime* _tmp24_; + GDateTime* _tmp25_ = NULL; + _tmp24_ = d; + _tmp25_ = g_date_time_to_utc (_tmp24_); _g_date_time_unref0 (self->priv->_birthday); - self->priv->_birthday = _tmp23_; + self->priv->_birthday = _tmp25_; g_object_notify ((GObject*) self, "birthday"); } _g_date_time_unref0 (d); + __vala_EContactDate_free0 (bday); } else { - GDateTime* _tmp24_; - _tmp24_ = self->priv->_birthday; - if (_tmp24_ != NULL) { + GDateTime* _tmp26_; + _tmp26_ = self->priv->_birthday; + if (_tmp26_ != NULL) { _g_date_time_unref0 (self->priv->_birthday); self->priv->_birthday = NULL; g_object_notify ((GObject*) self, "birthday"); } } - __vala_EContactDate_free0 (bday); + __vala_EContactDate_free0 (_bday); } @@ -3145,9 +3223,9 @@ EVCard* vcard; EVCard* _tmp8_; GList* _tmp9_ = NULL; - GeeHashSet* _tmp41_; - GeeHashSet* _tmp42_; - gboolean _tmp43_ = FALSE; + GeeHashSet* _tmp45_; + GeeHashSet* _tmp46_; + gboolean _tmp47_ = FALSE; g_return_if_fail (self != NULL); _tmp0_ = gee_hash_set_new (FOLKS_TYPE_ROLE_FIELD_DETAILS, (GBoxedCopyFunc) g_object_ref, g_object_unref, (GHashFunc) folks_abstract_field_details_hash, (GEqualFunc) folks_abstract_field_details_equal); new_roles = _tmp0_; @@ -3159,7 +3237,7 @@ FolksRoleFieldDetails* _tmp4_; _tmp3_ = new_roles; _tmp4_ = default_role_fd; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp3_, _tmp4_); + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp3_, FOLKS_ROLE_FIELD_DETAILS (_tmp4_)); } _tmp5_ = edsf_persona_get_contact (self); _tmp6_ = _tmp5_; @@ -3177,122 +3255,139 @@ { EVCardAttribute* _tmp10_; const gchar* _tmp11_ = NULL; - FolksRole* _tmp12_; + EVCardAttribute* _tmp12_; + gchar* _tmp13_ = NULL; + gchar* val; + gboolean _tmp14_ = FALSE; + const gchar* _tmp15_; + gboolean _tmp17_; + FolksRole* _tmp18_; FolksRole* role; - FolksRole* _tmp13_; - EVCardAttribute* _tmp14_; - gchar* _tmp15_ = NULL; - gchar* _tmp16_; - FolksRole* _tmp17_; - FolksRoleFieldDetails* _tmp18_; + FolksRole* _tmp19_; + const gchar* _tmp20_; + FolksRole* _tmp21_; + FolksRoleFieldDetails* _tmp22_; FolksRoleFieldDetails* role_fd; - EVCardAttribute* _tmp19_; - GList* _tmp20_ = NULL; - GeeHashSet* _tmp39_; - FolksRoleFieldDetails* _tmp40_; + EVCardAttribute* _tmp23_; + GList* _tmp24_ = NULL; + GeeHashSet* _tmp43_; + FolksRoleFieldDetails* _tmp44_; _tmp10_ = attr; _tmp11_ = e_vcard_attribute_get_name (_tmp10_); if (g_strcmp0 (_tmp11_, "X-ROLES") != 0) { continue; } - _tmp12_ = folks_role_new ("", "", NULL); - role = _tmp12_; - _tmp13_ = role; - _tmp14_ = attr; - _tmp15_ = e_vcard_attribute_get_value (_tmp14_); - _tmp16_ = _tmp15_; - folks_role_set_role (_tmp13_, _tmp16_); - _g_free0 (_tmp16_); - _tmp17_ = role; - _tmp18_ = folks_role_field_details_new (_tmp17_, NULL); - role_fd = _tmp18_; - _tmp19_ = attr; - _tmp20_ = e_vcard_attribute_get_params (_tmp19_); + _tmp12_ = attr; + _tmp13_ = e_vcard_attribute_get_value (_tmp12_); + val = _tmp13_; + _tmp15_ = val; + if (_tmp15_ == NULL) { + _tmp14_ = TRUE; + } else { + const gchar* _tmp16_; + _tmp16_ = val; + _tmp14_ = g_strcmp0 ((const gchar*) _tmp16_, "") == 0; + } + _tmp17_ = _tmp14_; + if (_tmp17_) { + _g_free0 (val); + continue; + } + _tmp18_ = folks_role_new ("", "", NULL); + role = _tmp18_; + _tmp19_ = role; + _tmp20_ = val; + folks_role_set_role (_tmp19_, (const gchar*) _tmp20_); + _tmp21_ = role; + _tmp22_ = folks_role_field_details_new (_tmp21_, NULL); + role_fd = _tmp22_; + _tmp23_ = attr; + _tmp24_ = e_vcard_attribute_get_params (_tmp23_); { GList* param_collection = NULL; GList* param_it = NULL; - param_collection = _tmp20_; + param_collection = _tmp24_; for (param_it = param_collection; param_it != NULL; param_it = param_it->next) { EVCardAttributeParam* param = NULL; param = (EVCardAttributeParam*) param_it->data; { - EVCardAttributeParam* _tmp21_; - const gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; + EVCardAttributeParam* _tmp25_; + const gchar* _tmp26_ = NULL; + gchar* _tmp27_ = NULL; gchar* param_name; - const gchar* _tmp24_; - _tmp21_ = param; - _tmp22_ = e_vcard_attribute_param_get_name (_tmp21_); - _tmp23_ = g_utf8_strdown (_tmp22_, (gssize) (-1)); - param_name = _tmp23_; - _tmp24_ = param_name; - if (g_strcmp0 (_tmp24_, "organisation_name") == 0) { - EVCardAttributeParam* _tmp25_; - GList* _tmp26_ = NULL; - _tmp25_ = param; - _tmp26_ = e_vcard_attribute_param_get_values (_tmp25_); + const gchar* _tmp28_; + _tmp25_ = param; + _tmp26_ = e_vcard_attribute_param_get_name (_tmp25_); + _tmp27_ = g_utf8_strdown (_tmp26_, (gssize) (-1)); + param_name = _tmp27_; + _tmp28_ = param_name; + if (g_strcmp0 (_tmp28_, "organisation_name") == 0) { + EVCardAttributeParam* _tmp29_; + GList* _tmp30_ = NULL; + _tmp29_ = param; + _tmp30_ = e_vcard_attribute_param_get_values (_tmp29_); { GList* param_value_collection = NULL; GList* param_value_it = NULL; - param_value_collection = _tmp26_; + param_value_collection = _tmp30_; for (param_value_it = param_value_collection; param_value_it != NULL; param_value_it = param_value_it->next) { const gchar* param_value = NULL; param_value = (const gchar*) param_value_it->data; { - FolksRole* _tmp27_; - const gchar* _tmp28_; - _tmp27_ = role; - _tmp28_ = param_value; - folks_role_set_organisation_name (_tmp27_, _tmp28_); + FolksRole* _tmp31_; + const gchar* _tmp32_; + _tmp31_ = role; + _tmp32_ = param_value; + folks_role_set_organisation_name (_tmp31_, _tmp32_); break; } } } } else { - const gchar* _tmp29_; - _tmp29_ = param_name; - if (g_strcmp0 (_tmp29_, "title") == 0) { - EVCardAttributeParam* _tmp30_; - GList* _tmp31_ = NULL; - _tmp30_ = param; - _tmp31_ = e_vcard_attribute_param_get_values (_tmp30_); + const gchar* _tmp33_; + _tmp33_ = param_name; + if (g_strcmp0 (_tmp33_, "title") == 0) { + EVCardAttributeParam* _tmp34_; + GList* _tmp35_ = NULL; + _tmp34_ = param; + _tmp35_ = e_vcard_attribute_param_get_values (_tmp34_); { GList* param_value_collection = NULL; GList* param_value_it = NULL; - param_value_collection = _tmp31_; + param_value_collection = _tmp35_; for (param_value_it = param_value_collection; param_value_it != NULL; param_value_it = param_value_it->next) { const gchar* param_value = NULL; param_value = (const gchar*) param_value_it->data; { - FolksRole* _tmp32_; - const gchar* _tmp33_; - _tmp32_ = role; - _tmp33_ = param_value; - folks_role_set_title (_tmp32_, _tmp33_); + FolksRole* _tmp36_; + const gchar* _tmp37_; + _tmp36_ = role; + _tmp37_ = param_value; + folks_role_set_title (_tmp36_, _tmp37_); break; } } } } else { - EVCardAttributeParam* _tmp34_; - GList* _tmp35_ = NULL; - _tmp34_ = param; - _tmp35_ = e_vcard_attribute_param_get_values (_tmp34_); + EVCardAttributeParam* _tmp38_; + GList* _tmp39_ = NULL; + _tmp38_ = param; + _tmp39_ = e_vcard_attribute_param_get_values (_tmp38_); { GList* param_value_collection = NULL; GList* param_value_it = NULL; - param_value_collection = _tmp35_; + param_value_collection = _tmp39_; for (param_value_it = param_value_collection; param_value_it != NULL; param_value_it = param_value_it->next) { const gchar* param_value = NULL; param_value = (const gchar*) param_value_it->data; { - FolksRoleFieldDetails* _tmp36_; - const gchar* _tmp37_; - const gchar* _tmp38_; - _tmp36_ = role_fd; - _tmp37_ = param_name; - _tmp38_ = param_value; - folks_abstract_field_details_add_parameter ((FolksAbstractFieldDetails*) _tmp36_, _tmp37_, _tmp38_); + FolksRoleFieldDetails* _tmp40_; + const gchar* _tmp41_; + const gchar* _tmp42_; + _tmp40_ = role_fd; + _tmp41_ = param_name; + _tmp42_ = param_value; + folks_abstract_field_details_add_parameter ((FolksAbstractFieldDetails*) _tmp40_, _tmp41_, _tmp42_); } } } @@ -3302,32 +3397,33 @@ } } } - _tmp39_ = new_roles; - _tmp40_ = role_fd; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp39_, _tmp40_); + _tmp43_ = new_roles; + _tmp44_ = role_fd; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp43_, _tmp44_); _g_object_unref0 (role_fd); _g_object_unref0 (role); + _g_free0 (val); } } } - _tmp41_ = new_roles; - _tmp42_ = self->priv->_roles; - _tmp43_ = folks_internal_equal_sets (FOLKS_TYPE_ROLE_FIELD_DETAILS, (GBoxedCopyFunc) g_object_ref, g_object_unref, (GeeSet*) _tmp41_, (GeeSet*) _tmp42_); - if (!_tmp43_) { - GeeHashSet* _tmp44_; - GeeHashSet* _tmp45_; - GeeHashSet* _tmp46_; - GeeSet* _tmp47_; - GeeSet* _tmp48_; - _tmp44_ = new_roles; - _tmp45_ = _g_object_ref0 (_tmp44_); + _tmp45_ = new_roles; + _tmp46_ = self->priv->_roles; + _tmp47_ = folks_internal_equal_sets (FOLKS_TYPE_ROLE_FIELD_DETAILS, (GBoxedCopyFunc) g_object_ref, g_object_unref, (GeeSet*) _tmp45_, (GeeSet*) _tmp46_); + if (!_tmp47_) { + GeeHashSet* _tmp48_; + GeeHashSet* _tmp49_; + GeeHashSet* _tmp50_; + GeeSet* _tmp51_; + GeeSet* _tmp52_; + _tmp48_ = new_roles; + _tmp49_ = _g_object_ref0 (_tmp48_); _g_object_unref0 (self->priv->_roles); - self->priv->_roles = _tmp45_; - _tmp46_ = new_roles; - _tmp47_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp46_); - _tmp48_ = _tmp47_; + self->priv->_roles = _tmp49_; + _tmp50_ = new_roles; + _tmp51_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp50_); + _tmp52_ = _tmp51_; _g_object_unref0 (self->priv->_roles_ro); - self->priv->_roles_ro = _tmp48_; + self->priv->_roles_ro = _tmp52_; g_object_notify ((GObject*) self, "roles"); } _g_object_unref0 (vcard); @@ -3338,7 +3434,7 @@ static FolksRoleFieldDetails* _edsf_persona_get_default_role (EdsfPersona* self) { FolksRoleFieldDetails* result = NULL; - FolksRoleFieldDetails* default_role; + FolksRoleFieldDetails* _default_role; void* _tmp0_ = NULL; gchar* _tmp1_; gchar* org; @@ -3374,7 +3470,7 @@ gboolean _tmp30_; gboolean _tmp32_; g_return_val_if_fail (self != NULL, NULL); - default_role = NULL; + _default_role = NULL; _tmp0_ = _edsf_persona_get_property (self, "org"); _tmp1_ = g_strdup ((const gchar*) _tmp0_); org = _tmp1_; @@ -3450,104 +3546,127 @@ const gchar* _tmp34_; FolksRole* _tmp35_; FolksRole* new_role; - const gchar* _tmp36_; - FolksRole* _tmp39_; - FolksRoleFieldDetails* _tmp40_; - gboolean _tmp41_ = FALSE; - const gchar* _tmp42_; - gboolean _tmp44_; - gboolean _tmp47_ = FALSE; - const gchar* _tmp48_; - gboolean _tmp50_; - gboolean _tmp53_ = FALSE; - const gchar* _tmp54_; - gboolean _tmp56_; - gboolean _tmp59_ = FALSE; - const gchar* _tmp60_; - gboolean _tmp62_; + gboolean _tmp36_ = FALSE; + const gchar* _tmp37_; + gboolean _tmp39_; + FolksRole* _tmp42_; + gboolean _tmp43_ = FALSE; _tmp33_ = title; _tmp34_ = org; _tmp35_ = folks_role_new (_tmp33_, _tmp34_, NULL); new_role = _tmp35_; - _tmp36_ = role; - if (_tmp36_ != NULL) { - FolksRole* _tmp37_; + _tmp37_ = role; + if (_tmp37_ != NULL) { const gchar* _tmp38_; - _tmp37_ = new_role; _tmp38_ = role; - folks_role_set_role (_tmp37_, _tmp38_); - } - _tmp39_ = new_role; - _tmp40_ = folks_role_field_details_new (_tmp39_, NULL); - _g_object_unref0 (default_role); - default_role = _tmp40_; - _tmp42_ = org_unit; - if (_tmp42_ != NULL) { - const gchar* _tmp43_; - _tmp43_ = org_unit; - _tmp41_ = g_strcmp0 (_tmp43_, "") != 0; + _tmp36_ = g_strcmp0 ((const gchar*) _tmp38_, "") != 0; } else { - _tmp41_ = FALSE; + _tmp36_ = FALSE; } - _tmp44_ = _tmp41_; - if (_tmp44_) { + _tmp39_ = _tmp36_; + if (_tmp39_) { + FolksRole* _tmp40_; + const gchar* _tmp41_; + _tmp40_ = new_role; + _tmp41_ = role; + folks_role_set_role (_tmp40_, (const gchar*) _tmp41_); + } + _tmp42_ = new_role; + _tmp43_ = folks_role_is_empty (_tmp42_); + if (!_tmp43_) { + FolksRole* _tmp44_; FolksRoleFieldDetails* _tmp45_; - const gchar* _tmp46_; - _tmp45_ = default_role; - _tmp46_ = org_unit; - folks_abstract_field_details_set_parameter ((FolksAbstractFieldDetails*) _tmp45_, "org_unit", _tmp46_); - } - _tmp48_ = office; - if (_tmp48_ != NULL) { - const gchar* _tmp49_; - _tmp49_ = office; - _tmp47_ = g_strcmp0 (_tmp49_, "") != 0; - } else { - _tmp47_ = FALSE; - } - _tmp50_ = _tmp47_; - if (_tmp50_) { - FolksRoleFieldDetails* _tmp51_; - const gchar* _tmp52_; - _tmp51_ = default_role; - _tmp52_ = office; - folks_abstract_field_details_set_parameter ((FolksAbstractFieldDetails*) _tmp51_, "office", _tmp52_); - } - _tmp54_ = manager; - if (_tmp54_ != NULL) { - const gchar* _tmp55_; - _tmp55_ = manager; - _tmp53_ = g_strcmp0 (_tmp55_, "") != 0; - } else { - _tmp53_ = FALSE; - } - _tmp56_ = _tmp53_; - if (_tmp56_) { - FolksRoleFieldDetails* _tmp57_; - const gchar* _tmp58_; - _tmp57_ = default_role; - _tmp58_ = manager; - folks_abstract_field_details_set_parameter ((FolksAbstractFieldDetails*) _tmp57_, "manager", _tmp58_); - } - _tmp60_ = assistant; - if (_tmp60_ != NULL) { - const gchar* _tmp61_; - _tmp61_ = manager; - _tmp59_ = g_strcmp0 (_tmp61_, "") != 0; - } else { - _tmp59_ = FALSE; - } - _tmp62_ = _tmp59_; - if (_tmp62_) { - FolksRoleFieldDetails* _tmp63_; - const gchar* _tmp64_; - _tmp63_ = default_role; - _tmp64_ = assistant; - folks_abstract_field_details_set_parameter ((FolksAbstractFieldDetails*) _tmp63_, "assistant", _tmp64_); + FolksRoleFieldDetails* default_role; + gboolean _tmp46_ = FALSE; + const gchar* _tmp47_; + gboolean _tmp49_; + gboolean _tmp52_ = FALSE; + const gchar* _tmp53_; + gboolean _tmp55_; + gboolean _tmp58_ = FALSE; + const gchar* _tmp59_; + gboolean _tmp61_; + gboolean _tmp64_ = FALSE; + const gchar* _tmp65_; + gboolean _tmp67_; + FolksRoleFieldDetails* _tmp70_; + FolksRoleFieldDetails* _tmp71_; + _tmp44_ = new_role; + _tmp45_ = folks_role_field_details_new (_tmp44_, NULL); + default_role = _tmp45_; + _tmp47_ = org_unit; + if (_tmp47_ != NULL) { + const gchar* _tmp48_; + _tmp48_ = org_unit; + _tmp46_ = g_strcmp0 (_tmp48_, "") != 0; + } else { + _tmp46_ = FALSE; + } + _tmp49_ = _tmp46_; + if (_tmp49_) { + FolksRoleFieldDetails* _tmp50_; + const gchar* _tmp51_; + _tmp50_ = default_role; + _tmp51_ = org_unit; + folks_abstract_field_details_set_parameter ((FolksAbstractFieldDetails*) _tmp50_, "org_unit", (const gchar*) _tmp51_); + } + _tmp53_ = office; + if (_tmp53_ != NULL) { + const gchar* _tmp54_; + _tmp54_ = office; + _tmp52_ = g_strcmp0 (_tmp54_, "") != 0; + } else { + _tmp52_ = FALSE; + } + _tmp55_ = _tmp52_; + if (_tmp55_) { + FolksRoleFieldDetails* _tmp56_; + const gchar* _tmp57_; + _tmp56_ = default_role; + _tmp57_ = office; + folks_abstract_field_details_set_parameter ((FolksAbstractFieldDetails*) _tmp56_, "office", (const gchar*) _tmp57_); + } + _tmp59_ = manager; + if (_tmp59_ != NULL) { + const gchar* _tmp60_; + _tmp60_ = manager; + _tmp58_ = g_strcmp0 (_tmp60_, "") != 0; + } else { + _tmp58_ = FALSE; + } + _tmp61_ = _tmp58_; + if (_tmp61_) { + FolksRoleFieldDetails* _tmp62_; + const gchar* _tmp63_; + _tmp62_ = default_role; + _tmp63_ = manager; + folks_abstract_field_details_set_parameter ((FolksAbstractFieldDetails*) _tmp62_, "manager", (const gchar*) _tmp63_); + } + _tmp65_ = assistant; + if (_tmp65_ != NULL) { + const gchar* _tmp66_; + _tmp66_ = manager; + _tmp64_ = g_strcmp0 (_tmp66_, "") != 0; + } else { + _tmp64_ = FALSE; + } + _tmp67_ = _tmp64_; + if (_tmp67_) { + FolksRoleFieldDetails* _tmp68_; + const gchar* _tmp69_; + _tmp68_ = default_role; + _tmp69_ = assistant; + folks_abstract_field_details_set_parameter ((FolksAbstractFieldDetails*) _tmp68_, "assistant", (const gchar*) _tmp69_); + } + _tmp70_ = default_role; + _tmp71_ = _g_object_ref0 (_tmp70_); + _g_object_unref0 (_default_role); + _default_role = _tmp71_; + _g_object_unref0 (default_role); } _g_object_unref0 (new_role); } - result = default_role; + result = _default_role; _g_free0 (assistant); _g_free0 (manager); _g_free0 (role); @@ -3599,7 +3718,7 @@ EVCardAttribute* _tmp6_; GList* _tmp7_ = NULL; _tmp6_ = services; - _tmp7_ = e_vcard_attribute_get_params (_tmp6_); + _tmp7_ = e_vcard_attribute_get_params ((EVCardAttribute*) _tmp6_); { GList* service_collection = NULL; GList* service_it = NULL; @@ -3639,7 +3758,7 @@ FolksWebServiceFieldDetails* _tmp19_; FolksWebServiceFieldDetails* _tmp20_; _tmp15_ = service_id; - if (_tmp15_ == NULL) { + if (g_strcmp0 (_tmp15_, "") == 0) { _g_free0 (service_id); continue; } @@ -3696,9 +3815,9 @@ GList* _tmp3_ = NULL; GList* attrs; GList* _tmp4_; - GeeHashSet* _tmp15_; - GeeHashSet* _tmp16_; - gboolean _tmp17_ = FALSE; + GeeHashSet* _tmp18_; + GeeHashSet* _tmp19_; + gboolean _tmp20_ = FALSE; g_return_if_fail (self != NULL); _tmp0_ = gee_hash_set_new (FOLKS_TYPE_EMAIL_FIELD_DETAILS, (GBoxedCopyFunc) g_object_ref, g_object_unref, (GHashFunc) folks_abstract_field_details_hash, (GEqualFunc) folks_abstract_field_details_equal); new_email_addresses = _tmp0_; @@ -3719,50 +3838,67 @@ { EVCardAttribute* _tmp6_; gchar* _tmp7_ = NULL; - gchar* _tmp8_; - FolksEmailFieldDetails* _tmp9_; - FolksEmailFieldDetails* _tmp10_; + gchar* val; + gboolean _tmp8_ = FALSE; + const gchar* _tmp9_; + gboolean _tmp11_; + const gchar* _tmp12_; + FolksEmailFieldDetails* _tmp13_; FolksEmailFieldDetails* email_fd; - FolksEmailFieldDetails* _tmp11_; - EVCardAttribute* _tmp12_; - GeeHashSet* _tmp13_; FolksEmailFieldDetails* _tmp14_; + EVCardAttribute* _tmp15_; + GeeHashSet* _tmp16_; + FolksEmailFieldDetails* _tmp17_; _tmp6_ = attr; _tmp7_ = e_vcard_attribute_get_value (_tmp6_); - _tmp8_ = _tmp7_; - _tmp9_ = folks_email_field_details_new (_tmp8_, NULL); - _tmp10_ = _tmp9_; - _g_free0 (_tmp8_); - email_fd = _tmp10_; - _tmp11_ = email_fd; - _tmp12_ = attr; - _edsf_persona_update_params (self, (FolksAbstractFieldDetails*) _tmp11_, _tmp12_); - _tmp13_ = new_email_addresses; + val = _tmp7_; + _tmp9_ = val; + if (_tmp9_ == NULL) { + _tmp8_ = TRUE; + } else { + const gchar* _tmp10_; + _tmp10_ = val; + _tmp8_ = g_strcmp0 ((const gchar*) _tmp10_, "") == 0; + } + _tmp11_ = _tmp8_; + if (_tmp11_) { + _g_free0 (val); + __vala_EVCardAttribute_free0 (attr); + continue; + } + _tmp12_ = val; + _tmp13_ = folks_email_field_details_new ((const gchar*) _tmp12_, NULL); + email_fd = _tmp13_; _tmp14_ = email_fd; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp13_, _tmp14_); + _tmp15_ = attr; + _edsf_persona_update_params (self, (FolksAbstractFieldDetails*) _tmp14_, _tmp15_); + _tmp16_ = new_email_addresses; + _tmp17_ = email_fd; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp16_, _tmp17_); _g_object_unref0 (email_fd); + _g_free0 (val); __vala_EVCardAttribute_free0 (attr); } } } - _tmp15_ = new_email_addresses; - _tmp16_ = self->priv->_email_addresses; - _tmp17_ = folks_internal_equal_sets (FOLKS_TYPE_EMAIL_FIELD_DETAILS, (GBoxedCopyFunc) g_object_ref, g_object_unref, (GeeSet*) _tmp15_, (GeeSet*) _tmp16_); - if (!_tmp17_) { - GeeHashSet* _tmp18_; - GeeHashSet* _tmp19_; - GeeHashSet* _tmp20_; - GeeSet* _tmp21_; - GeeSet* _tmp22_; - _tmp18_ = new_email_addresses; - _tmp19_ = _g_object_ref0 (_tmp18_); + _tmp18_ = new_email_addresses; + _tmp19_ = self->priv->_email_addresses; + _tmp20_ = folks_internal_equal_sets (FOLKS_TYPE_EMAIL_FIELD_DETAILS, (GBoxedCopyFunc) g_object_ref, g_object_unref, (GeeSet*) _tmp18_, (GeeSet*) _tmp19_); + if (!_tmp20_) { + GeeHashSet* _tmp21_; + GeeHashSet* _tmp22_; + GeeHashSet* _tmp23_; + GeeSet* _tmp24_; + GeeSet* _tmp25_; + _tmp21_ = new_email_addresses; + _tmp22_ = _g_object_ref0 (_tmp21_); _g_object_unref0 (self->priv->_email_addresses); - self->priv->_email_addresses = _tmp19_; - _tmp20_ = new_email_addresses; - _tmp21_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp20_); - _tmp22_ = _tmp21_; + self->priv->_email_addresses = _tmp22_; + _tmp23_ = new_email_addresses; + _tmp24_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp23_); + _tmp25_ = _tmp24_; _g_object_unref0 (self->priv->_email_addresses_ro); - self->priv->_email_addresses_ro = _tmp22_; + self->priv->_email_addresses_ro = _tmp25_; g_object_notify ((GObject*) self, "email-addresses"); } __g_list_free___vala_EVCardAttribute_free0_0 (attrs); @@ -3804,7 +3940,7 @@ GeeHashSet* _tmp9_; FolksNoteFieldDetails* _tmp10_; _tmp7_ = n; - _tmp8_ = folks_note_field_details_new (_tmp7_, NULL, NULL); + _tmp8_ = folks_note_field_details_new ((const gchar*) _tmp7_, NULL, NULL); note = _tmp8_; _tmp9_ = new_notes; _tmp10_ = note; @@ -3854,239 +3990,331 @@ static void _edsf_persona_update_names (EdsfPersona* self) { void* _tmp0_ = NULL; gchar* _tmp1_; - gchar* full_name; + gchar* _full_name; const gchar* _tmp2_; const gchar* _tmp4_; - const gchar* _tmp5_; - void* _tmp8_ = NULL; - gchar* _tmp9_; - gchar* nickname; - const gchar* _tmp10_; + gchar* _tmp5_; + gchar* full_name; + const gchar* _tmp6_; + const gchar* _tmp7_; + void* _tmp10_ = NULL; + gchar* _tmp11_; + gchar* _nickname; const gchar* _tmp12_; - const gchar* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; + gchar* nickname; + const gchar* _tmp16_; + const gchar* _tmp17_; FolksStructuredName* structured_name; - void* _tmp16_ = NULL; - EContactName* _tmp17_; - EContactName* cn; - EContactName* _tmp18_; - gboolean _tmp40_ = FALSE; - FolksStructuredName* _tmp41_; - gboolean _tmp44_; + void* _tmp20_ = NULL; + EContactName* _tmp21_; + EContactName* _cn; + EContactName* _tmp22_; + gboolean _tmp46_ = FALSE; + FolksStructuredName* _tmp47_; + gboolean _tmp50_; g_return_if_fail (self != NULL); _tmp0_ = _edsf_persona_get_property (self, "full_name"); _tmp1_ = g_strdup ((const gchar*) _tmp0_); - full_name = _tmp1_; - _tmp2_ = full_name; + _full_name = _tmp1_; + _tmp2_ = _full_name; if (_tmp2_ == NULL) { gchar* _tmp3_; _tmp3_ = g_strdup (""); - _g_free0 (full_name); - full_name = _tmp3_; + _g_free0 (_full_name); + _full_name = _tmp3_; } - _tmp4_ = self->priv->_full_name; - _tmp5_ = full_name; - if (g_strcmp0 (_tmp4_, _tmp5_) != 0) { - const gchar* _tmp6_; - gchar* _tmp7_; - _tmp6_ = full_name; - _tmp7_ = g_strdup (_tmp6_); + _tmp4_ = _full_name; + _tmp5_ = g_strdup ((const gchar*) _tmp4_); + full_name = _tmp5_; + _tmp6_ = self->priv->_full_name; + _tmp7_ = full_name; + if (g_strcmp0 (_tmp6_, _tmp7_) != 0) { + const gchar* _tmp8_; + gchar* _tmp9_; + _tmp8_ = full_name; + _tmp9_ = g_strdup (_tmp8_); _g_free0 (self->priv->_full_name); - self->priv->_full_name = _tmp7_; + self->priv->_full_name = _tmp9_; g_object_notify ((GObject*) self, "full-name"); } - _tmp8_ = _edsf_persona_get_property (self, "nickname"); - _tmp9_ = g_strdup ((const gchar*) _tmp8_); - nickname = _tmp9_; - _tmp10_ = nickname; - if (_tmp10_ == NULL) { - gchar* _tmp11_; - _tmp11_ = g_strdup (""); - _g_free0 (nickname); - nickname = _tmp11_; - } - _tmp12_ = self->priv->_nickname; - _tmp13_ = nickname; - if (g_strcmp0 (_tmp12_, _tmp13_) != 0) { - const gchar* _tmp14_; - gchar* _tmp15_; - _tmp14_ = nickname; - _tmp15_ = g_strdup (_tmp14_); + _tmp10_ = _edsf_persona_get_property (self, "nickname"); + _tmp11_ = g_strdup ((const gchar*) _tmp10_); + _nickname = _tmp11_; + _tmp12_ = _nickname; + if (_tmp12_ == NULL) { + gchar* _tmp13_; + _tmp13_ = g_strdup (""); + _g_free0 (_nickname); + _nickname = _tmp13_; + } + _tmp14_ = _nickname; + _tmp15_ = g_strdup ((const gchar*) _tmp14_); + nickname = _tmp15_; + _tmp16_ = self->priv->_nickname; + _tmp17_ = nickname; + if (g_strcmp0 (_tmp16_, _tmp17_) != 0) { + const gchar* _tmp18_; + gchar* _tmp19_; + _tmp18_ = nickname; + _tmp19_ = g_strdup (_tmp18_); _g_free0 (self->priv->_nickname); - self->priv->_nickname = _tmp15_; + self->priv->_nickname = _tmp19_; g_object_notify ((GObject*) self, "nickname"); } structured_name = NULL; - _tmp16_ = _edsf_persona_get_property (self, "name"); - _tmp17_ = __vala_EContactName_copy0 ((EContactName*) _tmp16_); - cn = _tmp17_; - _tmp18_ = cn; - if (_tmp18_ != NULL) { - EContactName* _tmp19_; - const gchar* _tmp20_; - gchar* _tmp21_; - gchar* family_name; - EContactName* _tmp22_; - const gchar* _tmp23_; - gchar* _tmp24_; - gchar* given_name; + _tmp20_ = _edsf_persona_get_property (self, "name"); + _tmp21_ = __vala_EContactName_copy0 ((EContactName*) _tmp20_); + _cn = _tmp21_; + _tmp22_ = _cn; + if (_tmp22_ != NULL) { + EContactName* _tmp23_; + EContactName* _tmp24_; + EContactName* cn; EContactName* _tmp25_; const gchar* _tmp26_; gchar* _tmp27_; - gchar* additional_names; + gchar* family_name; EContactName* _tmp28_; const gchar* _tmp29_; gchar* _tmp30_; - gchar* prefixes; + gchar* given_name; EContactName* _tmp31_; const gchar* _tmp32_; gchar* _tmp33_; - gchar* suffixes; - const gchar* _tmp34_; + gchar* additional_names; + EContactName* _tmp34_; const gchar* _tmp35_; - const gchar* _tmp36_; - const gchar* _tmp37_; + gchar* _tmp36_; + gchar* prefixes; + EContactName* _tmp37_; const gchar* _tmp38_; - FolksStructuredName* _tmp39_; - _tmp19_ = cn; - _tmp20_ = _tmp19_->family; - _tmp21_ = g_strdup (_tmp20_); - family_name = _tmp21_; - _tmp22_ = cn; - _tmp23_ = _tmp22_->given; - _tmp24_ = g_strdup (_tmp23_); - given_name = _tmp24_; + gchar* _tmp39_; + gchar* suffixes; + const gchar* _tmp40_; + const gchar* _tmp41_; + const gchar* _tmp42_; + const gchar* _tmp43_; + const gchar* _tmp44_; + FolksStructuredName* _tmp45_; + _tmp23_ = _cn; + _tmp24_ = __vala_EContactName_copy0 ((EContactName*) _tmp23_); + cn = _tmp24_; _tmp25_ = cn; - _tmp26_ = _tmp25_->additional; + _tmp26_ = _tmp25_->family; _tmp27_ = g_strdup (_tmp26_); - additional_names = _tmp27_; + family_name = _tmp27_; _tmp28_ = cn; - _tmp29_ = _tmp28_->prefixes; + _tmp29_ = _tmp28_->given; _tmp30_ = g_strdup (_tmp29_); - prefixes = _tmp30_; + given_name = _tmp30_; _tmp31_ = cn; - _tmp32_ = _tmp31_->suffixes; + _tmp32_ = _tmp31_->additional; _tmp33_ = g_strdup (_tmp32_); - suffixes = _tmp33_; - _tmp34_ = family_name; - _tmp35_ = given_name; - _tmp36_ = additional_names; - _tmp37_ = prefixes; - _tmp38_ = suffixes; - _tmp39_ = folks_structured_name_new (_tmp34_, _tmp35_, _tmp36_, _tmp37_, _tmp38_); + additional_names = _tmp33_; + _tmp34_ = cn; + _tmp35_ = _tmp34_->prefixes; + _tmp36_ = g_strdup (_tmp35_); + prefixes = _tmp36_; + _tmp37_ = cn; + _tmp38_ = _tmp37_->suffixes; + _tmp39_ = g_strdup (_tmp38_); + suffixes = _tmp39_; + _tmp40_ = family_name; + _tmp41_ = given_name; + _tmp42_ = additional_names; + _tmp43_ = prefixes; + _tmp44_ = suffixes; + _tmp45_ = folks_structured_name_new (_tmp40_, _tmp41_, _tmp42_, _tmp43_, _tmp44_); _g_object_unref0 (structured_name); - structured_name = _tmp39_; + structured_name = _tmp45_; _g_free0 (suffixes); _g_free0 (prefixes); _g_free0 (additional_names); _g_free0 (given_name); _g_free0 (family_name); + __vala_EContactName_free0 (cn); } - _tmp41_ = structured_name; - if (_tmp41_ != NULL) { - FolksStructuredName* _tmp42_; - gboolean _tmp43_ = FALSE; - _tmp42_ = structured_name; - _tmp43_ = folks_structured_name_is_empty (_tmp42_); - _tmp40_ = !_tmp43_; + _tmp47_ = structured_name; + if (_tmp47_ != NULL) { + FolksStructuredName* _tmp48_; + gboolean _tmp49_ = FALSE; + _tmp48_ = structured_name; + _tmp49_ = folks_structured_name_is_empty (FOLKS_STRUCTURED_NAME (_tmp48_)); + _tmp46_ = !_tmp49_; } else { - _tmp40_ = FALSE; + _tmp46_ = FALSE; } - _tmp44_ = _tmp40_; - if (_tmp44_) { - FolksStructuredName* _tmp45_; - FolksStructuredName* _tmp46_; - _tmp45_ = structured_name; - _tmp46_ = _g_object_ref0 (_tmp45_); + _tmp50_ = _tmp46_; + if (_tmp50_) { + FolksStructuredName* _tmp51_; + FolksStructuredName* _tmp52_; + _tmp51_ = structured_name; + _tmp52_ = _g_object_ref0 (FOLKS_STRUCTURED_NAME (_tmp51_)); _g_object_unref0 (self->priv->_structured_name); - self->priv->_structured_name = _tmp46_; + self->priv->_structured_name = _tmp52_; g_object_notify ((GObject*) self, "structured-name"); } else { - FolksStructuredName* _tmp47_; - _tmp47_ = self->priv->_structured_name; - if (_tmp47_ != NULL) { + FolksStructuredName* _tmp53_; + _tmp53_ = self->priv->_structured_name; + if (_tmp53_ != NULL) { _g_object_unref0 (self->priv->_structured_name); self->priv->_structured_name = NULL; g_object_notify ((GObject*) self, "structured-name"); } } - __vala_EContactName_free0 (cn); + __vala_EContactName_free0 (_cn); _g_object_unref0 (structured_name); _g_free0 (nickname); + _g_free0 (_nickname); _g_free0 (full_name); + _g_free0 (_full_name); +} + + +static EContactPhoto* _vala_EContactPhoto_copy (EContactPhoto* self) { + return g_boxed_copy (e_contact_photo_get_type (), self); +} + + +static gpointer __vala_EContactPhoto_copy0 (gpointer self) { + return self ? _vala_EContactPhoto_copy (self) : NULL; } -static GLoadableIcon* _edsf_persona_contact_photo_to_loadable_icon (EdsfPersona* self, EContactPhoto* p) { +static void _vala_EContactPhoto_free (EContactPhoto* self) { + g_boxed_free (e_contact_photo_get_type (), self); +} + + +static guint8* _vala_array_dup1 (guint8* self, int length) { + return g_memdup (self, length * sizeof (guint8)); +} + + +static GLoadableIcon* _edsf_persona_contact_photo_to_loadable_icon (EdsfPersona* self, EContactPhoto* _p) { GLoadableIcon* result = NULL; EContactPhoto* _tmp0_; EContactPhoto* _tmp1_; - EContactPhotoType _tmp2_; + EContactPhoto* _tmp2_; + EContactPhoto* p; + EContactPhoto* _tmp3_; + EContactPhotoType _tmp4_; g_return_val_if_fail (self != NULL, NULL); - _tmp0_ = p; + _tmp0_ = _p; if (_tmp0_ == NULL) { result = NULL; return result; } - _tmp1_ = p; - _tmp2_ = _tmp1_->type; - switch (_tmp2_) { + _tmp1_ = _p; + _tmp2_ = __vala_EContactPhoto_copy0 ((EContactPhoto*) _tmp1_); + p = _tmp2_; + _tmp3_ = p; + _tmp4_ = _tmp3_->type; + switch (_tmp4_) { case E_CONTACT_PHOTO_TYPE_URI: { - EContactPhoto* _tmp3_; - const gchar* _tmp4_ = NULL; EContactPhoto* _tmp5_; const gchar* _tmp6_ = NULL; - GFile* _tmp7_ = NULL; - GFile* _tmp8_; - GFileIcon* _tmp9_; - GLoadableIcon* _tmp10_; - _tmp3_ = p; - _tmp4_ = e_contact_photo_get_uri (_tmp3_); - if (_tmp4_ == NULL) { + gchar* _tmp7_; + gchar* uri; + const gchar* _tmp8_; + const gchar* _tmp9_; + GFile* _tmp10_ = NULL; + GFile* _tmp11_; + GFileIcon* _tmp12_; + GLoadableIcon* _tmp13_; + _tmp5_ = p; + _tmp6_ = e_contact_photo_get_uri (_tmp5_); + _tmp7_ = g_strdup (_tmp6_); + uri = _tmp7_; + _tmp8_ = uri; + if (_tmp8_ == NULL) { result = NULL; + _g_free0 (uri); + __vala_EContactPhoto_free0 (p); return result; } - _tmp5_ = p; - _tmp6_ = e_contact_photo_get_uri (_tmp5_); - _tmp7_ = g_file_new_for_uri (_tmp6_); - _tmp8_ = _tmp7_; - _tmp9_ = (GFileIcon*) g_file_icon_new (_tmp8_); - _tmp10_ = (GLoadableIcon*) _tmp9_; - _g_object_unref0 (_tmp8_); - result = _tmp10_; + _tmp9_ = uri; + _tmp10_ = g_file_new_for_uri ((const gchar*) _tmp9_); + _tmp11_ = _tmp10_; + _tmp12_ = (GFileIcon*) g_file_icon_new (_tmp11_); + _tmp13_ = (GLoadableIcon*) _tmp12_; + _g_object_unref0 (_tmp11_); + result = _tmp13_; + _g_free0 (uri); + __vala_EContactPhoto_free0 (p); return result; } case E_CONTACT_PHOTO_TYPE_INLINED: { - EContactPhoto* _tmp11_; - gsize _tmp12_; - guint8* _tmp13_ = NULL; EContactPhoto* _tmp14_; - const gchar* _tmp15_ = NULL; - EContactPhoto* _tmp16_; - gsize _tmp17_; - guint8* _tmp18_ = NULL; - EdsfMemoryIcon* _tmp19_; - _tmp11_ = p; - _tmp13_ = e_contact_photo_get_inlined (_tmp11_, &_tmp12_); - if (_tmp13_ == NULL) { + gsize _tmp15_; + guint8* _tmp16_ = NULL; + guint8* _tmp17_; + gint _tmp17__length1; + guint8* data; + gint data_length1; + gint _data_size_; + EContactPhoto* _tmp18_; + const gchar* _tmp19_ = NULL; + gchar* _tmp20_; + gchar* mime_type; + gboolean _tmp21_ = FALSE; + guint8* _tmp22_; + gint _tmp22__length1; + gboolean _tmp24_; + const gchar* _tmp25_; + guint8* _tmp26_; + gint _tmp26__length1; + EdsfMemoryIcon* _tmp27_; + _tmp14_ = p; + _tmp16_ = e_contact_photo_get_inlined (_tmp14_, &_tmp15_); + _tmp17_ = (_tmp16_ != NULL) ? _vala_array_dup1 (_tmp16_, _tmp15_) : ((gpointer) _tmp16_); + _tmp17__length1 = _tmp15_; + data = _tmp17_; + data_length1 = _tmp17__length1; + _data_size_ = data_length1; + _tmp18_ = p; + _tmp19_ = e_contact_photo_get_mime_type (_tmp18_); + _tmp20_ = g_strdup (_tmp19_); + mime_type = _tmp20_; + _tmp22_ = data; + _tmp22__length1 = data_length1; + if (_tmp22_ == NULL) { + _tmp21_ = TRUE; + } else { + const gchar* _tmp23_; + _tmp23_ = mime_type; + _tmp21_ = _tmp23_ == NULL; + } + _tmp24_ = _tmp21_; + if (_tmp24_) { result = NULL; + _g_free0 (mime_type); + data = (g_free (data), NULL); + __vala_EContactPhoto_free0 (p); return result; } - _tmp14_ = p; - _tmp15_ = e_contact_photo_get_mime_type (_tmp14_); - _tmp16_ = p; - _tmp18_ = e_contact_photo_get_inlined (_tmp16_, &_tmp17_); - _tmp19_ = edsf_memory_icon_new (_tmp15_, _tmp18_, _tmp17_); - result = (GLoadableIcon*) _tmp19_; + _tmp25_ = mime_type; + _tmp26_ = data; + _tmp26__length1 = data_length1; + _tmp27_ = edsf_memory_icon_new ((const gchar*) _tmp25_, (guint8*) _tmp26_, _tmp26__length1); + result = (GLoadableIcon*) _tmp27_; + _g_free0 (mime_type); + data = (g_free (data), NULL); + __vala_EContactPhoto_free0 (p); return result; } default: { result = NULL; + __vala_EContactPhoto_free0 (p); return result; } } + __vala_EContactPhoto_free0 (p); } @@ -4098,24 +4326,16 @@ static void block1_data_unref (Block1Data* _data1_) { if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { - _g_object_unref0 (_data1_->self); + EdsfPersona * self; + self = _data1_->self; _g_object_unref0 (_data1_->new_avatar); _g_object_unref0 (_data1_->cache); + _g_object_unref0 (self); g_slice_free (Block1Data, _data1_); } } -static EContactPhoto* _vala_EContactPhoto_copy (EContactPhoto* self) { - return g_boxed_copy (e_contact_photo_get_type (), self); -} - - -static gpointer __vala_EContactPhoto_copy0 (gpointer self) { - return self ? _vala_EContactPhoto_copy (self) : NULL; -} - - static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) { EdsfPersona * self; GError * _inner_error_ = NULL; @@ -4157,7 +4377,7 @@ } -static void ____lambda7_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) { +static void ____lambda5_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) { EdsfPersona * self; GError * _inner_error_ = NULL; self = _data1_->self; @@ -4197,7 +4417,7 @@ _tmp7_ = _tmp6_; _tmp8_ = e2; _tmp9_ = _tmp8_->message; - g_warning ("edsf-persona.vala:1231: Couldn't cache avatar for Edsf.Persona '%s': %" \ + g_warning ("edsf-persona.vala:1272: Couldn't cache avatar for Edsf.Persona '%s': %" \ "s", _tmp7_, _tmp9_); _g_object_unref0 (_data1_->new_avatar); _data1_->new_avatar = NULL; @@ -4212,17 +4432,12 @@ } -static void _____lambda7__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { - ____lambda7_ (self, source_object, res); +static void _____lambda5__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { + ____lambda5_ (self, source_object, res); block1_data_unref (self); } -static void _vala_EContactPhoto_free (EContactPhoto* self) { - g_boxed_free (e_contact_photo_get_type (), self); -} - - static void _edsf_persona_update_avatar (EdsfPersona* self) { Block1Data* _data1_; void* _tmp0_ = NULL; @@ -4267,63 +4482,59 @@ gboolean _tmp12_ = FALSE; gboolean _tmp13_ = FALSE; GLoadableIcon* _tmp14_; - GLoadableIcon* _tmp15_; - gboolean _tmp17_; - gboolean _tmp28_; - _tmp14_ = folks_avatar_details_get_avatar ((FolksAvatarDetails*) self); - _tmp15_ = _tmp14_; - if (_tmp15_ == NULL) { - GLoadableIcon* _tmp16_; - _tmp16_ = _data1_->new_avatar; - _tmp13_ = _tmp16_ != NULL; + gboolean _tmp16_; + gboolean _tmp26_; + _tmp14_ = self->priv->_avatar; + if (_tmp14_ == NULL) { + GLoadableIcon* _tmp15_; + _tmp15_ = _data1_->new_avatar; + _tmp13_ = _tmp15_ != NULL; } else { _tmp13_ = FALSE; } - _tmp17_ = _tmp13_; - if (_tmp17_) { + _tmp16_ = _tmp13_; + if (_tmp16_) { _tmp12_ = TRUE; } else { + gboolean _tmp17_ = FALSE; gboolean _tmp18_ = FALSE; - gboolean _tmp19_ = FALSE; - GLoadableIcon* _tmp20_; - GLoadableIcon* _tmp21_; - gboolean _tmp23_; - gboolean _tmp27_; - _tmp20_ = folks_avatar_details_get_avatar ((FolksAvatarDetails*) self); - _tmp21_ = _tmp20_; - if (_tmp21_ != NULL) { - GLoadableIcon* _tmp22_; - _tmp22_ = _data1_->new_avatar; - _tmp19_ = _tmp22_ != NULL; + GLoadableIcon* _tmp19_; + gboolean _tmp21_; + gboolean _tmp25_; + _tmp19_ = self->priv->_avatar; + if (_tmp19_ != NULL) { + GLoadableIcon* _tmp20_; + _tmp20_ = _data1_->new_avatar; + _tmp18_ = _tmp20_ != NULL; } else { - _tmp19_ = FALSE; + _tmp18_ = FALSE; } - _tmp23_ = _tmp19_; - if (_tmp23_) { - GLoadableIcon* _tmp24_; - GLoadableIcon* _tmp25_; - gboolean _tmp26_ = FALSE; - _tmp24_ = self->priv->_avatar; - _tmp25_ = _data1_->new_avatar; - _tmp26_ = g_icon_equal ((GIcon*) _tmp24_, (GIcon*) _tmp25_); - _tmp18_ = _tmp26_ == FALSE; + _tmp21_ = _tmp18_; + if (_tmp21_) { + GLoadableIcon* _tmp22_; + GLoadableIcon* _tmp23_; + gboolean _tmp24_ = FALSE; + _tmp22_ = self->priv->_avatar; + _tmp23_ = _data1_->new_avatar; + _tmp24_ = g_icon_equal ((GIcon*) G_LOADABLE_ICON (_tmp22_), (GIcon*) _tmp23_); + _tmp17_ = _tmp24_ == FALSE; } else { - _tmp18_ = FALSE; + _tmp17_ = FALSE; } - _tmp27_ = _tmp18_; - _tmp12_ = _tmp27_; + _tmp25_ = _tmp17_; + _tmp12_ = _tmp25_; } - _tmp28_ = _tmp12_; - if (_tmp28_) { - FolksAvatarCache* _tmp29_; - const gchar* _tmp30_; - const gchar* _tmp31_; - GLoadableIcon* _tmp32_; - _tmp29_ = _data1_->cache; - _tmp30_ = folks_persona_get_uid ((FolksPersona*) self); - _tmp31_ = _tmp30_; - _tmp32_ = _data1_->new_avatar; - folks_avatar_cache_store_avatar (_tmp29_, _tmp31_, _tmp32_, _____lambda7__gasync_ready_callback, block1_data_ref (_data1_)); + _tmp26_ = _tmp12_; + if (_tmp26_) { + FolksAvatarCache* _tmp27_; + const gchar* _tmp28_; + const gchar* _tmp29_; + GLoadableIcon* _tmp30_; + _tmp27_ = _data1_->cache; + _tmp28_ = folks_persona_get_uid ((FolksPersona*) self); + _tmp29_ = _tmp28_; + _tmp30_ = _data1_->new_avatar; + folks_avatar_cache_store_avatar (_tmp27_, _tmp29_, G_LOADABLE_ICON (_tmp30_), _____lambda5__gasync_ready_callback, block1_data_ref (_data1_)); } } __vala_EContactPhoto_free0 (p); @@ -4341,9 +4552,9 @@ EVCard* vcard; EVCard* _tmp24_; GList* _tmp25_ = NULL; - GeeHashSet* _tmp37_; - GeeHashSet* _tmp38_; - gboolean _tmp39_ = FALSE; + GeeHashSet* _tmp40_; + GeeHashSet* _tmp41_; + gboolean _tmp42_ = FALSE; g_return_if_fail (self != NULL); _tmp0_ = gee_hash_set_new (FOLKS_TYPE_URL_FIELD_DETAILS, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); new_urls = _tmp0_; @@ -4404,7 +4615,7 @@ GeeHashSet* _tmp19_; FolksUrlFieldDetails* _tmp20_; _tmp14_ = u; - _tmp15_ = folks_url_field_details_new (_tmp14_, NULL); + _tmp15_ = folks_url_field_details_new ((const gchar*) _tmp14_, NULL); fd_u = _tmp15_; _tmp16_ = fd_u; _tmp17_ = fd_u; @@ -4442,50 +4653,66 @@ if (g_strcmp0 (_tmp27_, "X-URIS") == 0) { EVCardAttribute* _tmp28_; gchar* _tmp29_ = NULL; - gchar* _tmp30_; - FolksUrlFieldDetails* _tmp31_; - FolksUrlFieldDetails* _tmp32_; + gchar* val; + gboolean _tmp30_ = FALSE; + const gchar* _tmp31_; + gboolean _tmp33_; + const gchar* _tmp34_; + FolksUrlFieldDetails* _tmp35_; FolksUrlFieldDetails* url_fd; - FolksUrlFieldDetails* _tmp33_; - EVCardAttribute* _tmp34_; - GeeHashSet* _tmp35_; FolksUrlFieldDetails* _tmp36_; + EVCardAttribute* _tmp37_; + GeeHashSet* _tmp38_; + FolksUrlFieldDetails* _tmp39_; _tmp28_ = attr; _tmp29_ = e_vcard_attribute_get_value (_tmp28_); - _tmp30_ = _tmp29_; - _tmp31_ = folks_url_field_details_new (_tmp30_, NULL); - _tmp32_ = _tmp31_; - _g_free0 (_tmp30_); - url_fd = _tmp32_; - _tmp33_ = url_fd; - _tmp34_ = attr; - _edsf_persona_update_params (self, (FolksAbstractFieldDetails*) _tmp33_, _tmp34_); - _tmp35_ = new_urls; + val = _tmp29_; + _tmp31_ = val; + if (_tmp31_ == NULL) { + _tmp30_ = TRUE; + } else { + const gchar* _tmp32_; + _tmp32_ = val; + _tmp30_ = g_strcmp0 ((const gchar*) _tmp32_, "") == 0; + } + _tmp33_ = _tmp30_; + if (_tmp33_) { + _g_free0 (val); + continue; + } + _tmp34_ = val; + _tmp35_ = folks_url_field_details_new ((const gchar*) _tmp34_, NULL); + url_fd = _tmp35_; _tmp36_ = url_fd; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp35_, _tmp36_); + _tmp37_ = attr; + _edsf_persona_update_params (self, (FolksAbstractFieldDetails*) _tmp36_, _tmp37_); + _tmp38_ = new_urls; + _tmp39_ = url_fd; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp38_, _tmp39_); _g_object_unref0 (url_fd); + _g_free0 (val); } } } } - _tmp37_ = new_urls; - _tmp38_ = self->priv->_urls; - _tmp39_ = folks_utils_set_afd_equal ((GeeSet*) _tmp37_, (GeeSet*) _tmp38_); - if (!_tmp39_) { - GeeHashSet* _tmp40_; - GeeHashSet* _tmp41_; - GeeHashSet* _tmp42_; - GeeSet* _tmp43_; - GeeSet* _tmp44_; - _tmp40_ = new_urls; - _tmp41_ = _g_object_ref0 (_tmp40_); + _tmp40_ = new_urls; + _tmp41_ = self->priv->_urls; + _tmp42_ = folks_utils_set_afd_equal ((GeeSet*) _tmp40_, (GeeSet*) _tmp41_); + if (!_tmp42_) { + GeeHashSet* _tmp43_; + GeeHashSet* _tmp44_; + GeeHashSet* _tmp45_; + GeeSet* _tmp46_; + GeeSet* _tmp47_; + _tmp43_ = new_urls; + _tmp44_ = _g_object_ref0 (_tmp43_); _g_object_unref0 (self->priv->_urls); - self->priv->_urls = _tmp41_; - _tmp42_ = new_urls; - _tmp43_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp42_); - _tmp44_ = _tmp43_; + self->priv->_urls = _tmp44_; + _tmp45_ = new_urls; + _tmp46_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp45_); + _tmp47_ = _tmp46_; _g_object_unref0 (self->priv->_urls_ro); - self->priv->_urls_ro = _tmp44_; + self->priv->_urls_ro = _tmp47_; g_object_notify ((GObject*) self, "urls"); } _g_object_unref0 (vcard); @@ -4500,9 +4727,9 @@ GeeHashMultiMap* new_im_addresses; GHashTable* _tmp2_; GList* _tmp3_ = NULL; - GeeHashMultiMap* _tmp73_; - GeeHashMultiMap* _tmp74_; - gboolean _tmp75_ = FALSE; + GeeHashMultiMap* _tmp79_; + GeeHashMultiMap* _tmp80_; + gboolean _tmp81_ = FALSE; GError * _inner_error_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = _edsf_persona_get_im_eds_map (); @@ -4549,27 +4776,44 @@ EVCardAttribute* _tmp12_; gchar* _tmp13_ = NULL; gchar* addr; - const gchar* _tmp14_; + gboolean _tmp14_ = FALSE; const gchar* _tmp15_; - gchar* _tmp16_ = NULL; - gchar* _tmp17_; - gchar* _tmp18_; - gchar* _tmp19_; - gchar* _tmp20_; + gboolean _tmp17_; + const gchar* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_ = NULL; + gchar* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; gchar* normalised_addr; - const gchar* _tmp21_; - FolksImFieldDetails* _tmp22_; + const gchar* _tmp25_; + FolksImFieldDetails* _tmp26_; FolksImFieldDetails* im_fd; - GeeHashMultiMap* _tmp23_; - const gchar* _tmp24_; - FolksImFieldDetails* _tmp25_; + GeeHashMultiMap* _tmp27_; + const gchar* _tmp28_; + FolksImFieldDetails* _tmp29_; _tmp12_ = attr; _tmp13_ = e_vcard_attribute_get_value (_tmp12_); addr = _tmp13_; - _tmp14_ = addr; - _tmp15_ = im_proto; - _tmp16_ = folks_im_details_normalise_im_address (_tmp14_, _tmp15_, &_inner_error_); - _tmp17_ = _tmp16_; + _tmp15_ = addr; + if (_tmp15_ == NULL) { + _tmp14_ = TRUE; + } else { + const gchar* _tmp16_; + _tmp16_ = addr; + _tmp14_ = g_strcmp0 ((const gchar*) _tmp16_, "") == 0; + } + _tmp17_ = _tmp14_; + if (_tmp17_) { + _g_free0 (addr); + __vala_EVCardAttribute_free0 (attr); + continue; + } + _tmp18_ = addr; + _tmp19_ = im_proto; + _tmp20_ = folks_im_details_normalise_im_address ((const gchar*) _tmp18_, _tmp19_, &_inner_error_); + _tmp21_ = _tmp20_; if (_inner_error_ != NULL) { _g_free0 (addr); if (_inner_error_->domain == FOLKS_IM_DETAILS_ERROR) { @@ -4585,19 +4829,19 @@ g_clear_error (&_inner_error_); return; } - _tmp18_ = _tmp17_; - _tmp19_ = _tmp18_; - _tmp18_ = NULL; - _tmp20_ = _tmp19_; - _g_free0 (_tmp18_); - normalised_addr = _tmp20_; - _tmp21_ = normalised_addr; - _tmp22_ = folks_im_field_details_new (_tmp21_, NULL); - im_fd = _tmp22_; - _tmp23_ = new_im_addresses; - _tmp24_ = im_proto; - _tmp25_ = im_fd; - gee_multi_map_set ((GeeMultiMap*) _tmp23_, _tmp24_, _tmp25_); + _tmp22_ = _tmp21_; + _tmp23_ = _tmp22_; + _tmp22_ = NULL; + _tmp24_ = _tmp23_; + _g_free0 (_tmp22_); + normalised_addr = _tmp24_; + _tmp25_ = normalised_addr; + _tmp26_ = folks_im_field_details_new (_tmp25_, NULL); + im_fd = _tmp26_; + _tmp27_ = new_im_addresses; + _tmp28_ = im_proto; + _tmp29_ = im_fd; + gee_multi_map_set ((GeeMultiMap*) _tmp27_, _tmp28_, _tmp29_); _g_object_unref0 (im_fd); _g_free0 (normalised_addr); _g_free0 (addr); @@ -4606,13 +4850,13 @@ __catch2_folks_im_details_error: { GError* e = NULL; - GError* _tmp26_; - const gchar* _tmp27_; + GError* _tmp30_; + const gchar* _tmp31_; e = _inner_error_; _inner_error_ = NULL; - _tmp26_ = e; - _tmp27_ = _tmp26_->message; - g_warning ("edsf-persona.vala:1301: Problem when trying to normalise address: %s\n", _tmp27_); + _tmp30_ = e; + _tmp31_ = _tmp30_->message; + g_warning ("edsf-persona.vala:1353: Problem when trying to normalise address: %s\n", _tmp31_); _g_error_free0 (e); } __finally2: @@ -4636,89 +4880,95 @@ _g_list_free0 (im_proto_collection); } { - GeeSet* _tmp28_; - GeeSet* _tmp29_; - GeeIterator* _tmp30_ = NULL; + GeeSet* _tmp32_; + GeeSet* _tmp33_; + GeeIterator* _tmp34_ = NULL; GeeIterator* _email_it; - _tmp28_ = folks_email_details_get_email_addresses ((FolksEmailDetails*) self); - _tmp29_ = _tmp28_; - _tmp30_ = gee_iterable_iterator ((GeeIterable*) _tmp29_); - _email_it = _tmp30_; + _tmp32_ = folks_email_details_get_email_addresses ((FolksEmailDetails*) self); + _tmp33_ = _tmp32_; + _tmp34_ = gee_iterable_iterator ((GeeIterable*) _tmp33_); + _email_it = _tmp34_; while (TRUE) { - GeeIterator* _tmp31_; - gboolean _tmp32_ = FALSE; - GeeIterator* _tmp33_; - gpointer _tmp34_ = NULL; + GeeIterator* _tmp35_; + gboolean _tmp36_ = FALSE; + GeeIterator* _tmp37_; + gpointer _tmp38_ = NULL; FolksEmailFieldDetails* email; - FolksEmailFieldDetails* _tmp35_; - gconstpointer _tmp36_; - const gchar* _tmp37_; - gchar* _tmp38_ = NULL; - gchar* proto; - const gchar* _tmp39_; - _tmp31_ = _email_it; - _tmp32_ = gee_iterator_next (_tmp31_); - if (!_tmp32_) { + FolksEmailFieldDetails* _tmp39_; + gconstpointer _tmp40_; + const gchar* _tmp41_; + gchar* _tmp42_ = NULL; + gchar* _proto; + const gchar* _tmp43_; + _tmp35_ = _email_it; + _tmp36_ = gee_iterator_next (_tmp35_); + if (!_tmp36_) { break; } - _tmp33_ = _email_it; - _tmp34_ = gee_iterator_get (_tmp33_); - email = (FolksEmailFieldDetails*) _tmp34_; - _tmp35_ = email; - _tmp36_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp35_); - _tmp37_ = _tmp36_; - _tmp38_ = _edsf_persona_im_proto_from_addr (self, (const gchar*) _tmp37_); - proto = _tmp38_; - _tmp39_ = proto; - if (_tmp39_ != NULL) { + _tmp37_ = _email_it; + _tmp38_ = gee_iterator_get (_tmp37_); + email = (FolksEmailFieldDetails*) _tmp38_; + _tmp39_ = email; + _tmp40_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp39_); + _tmp41_ = _tmp40_; + _tmp42_ = _edsf_persona_im_proto_from_addr (self, (const gchar*) _tmp41_); + _proto = _tmp42_; + _tmp43_ = _proto; + if (_tmp43_ != NULL) { + const gchar* _tmp44_; + gchar* _tmp45_; + gchar* proto; gboolean exists; - GeeHashMultiMap* _tmp40_; - const gchar* _tmp41_; - GeeCollection* _tmp42_ = NULL; + GeeHashMultiMap* _tmp46_; + const gchar* _tmp47_; + GeeCollection* _tmp48_ = NULL; GeeCollection* current_im_addrs; - GeeCollection* _tmp43_; - gboolean _tmp56_; + GeeCollection* _tmp49_; + gboolean _tmp62_; + _tmp44_ = _proto; + _tmp45_ = g_strdup ((const gchar*) _tmp44_); + proto = _tmp45_; exists = FALSE; - _tmp40_ = new_im_addresses; - _tmp41_ = proto; - _tmp42_ = gee_multi_map_get ((GeeMultiMap*) _tmp40_, _tmp41_); - current_im_addrs = _tmp42_; - _tmp43_ = current_im_addrs; - if (_tmp43_ != NULL) { + _tmp46_ = new_im_addresses; + _tmp47_ = proto; + _tmp48_ = gee_multi_map_get ((GeeMultiMap*) _tmp46_, _tmp47_); + current_im_addrs = _tmp48_; + _tmp49_ = current_im_addrs; + if (_tmp49_ != NULL) { { - GeeCollection* _tmp44_; - GeeIterator* _tmp45_ = NULL; + GeeCollection* _tmp50_; + GeeIterator* _tmp51_ = NULL; GeeIterator* _cur_im_it; - _tmp44_ = current_im_addrs; - _tmp45_ = gee_iterable_iterator ((GeeIterable*) _tmp44_); - _cur_im_it = _tmp45_; + _tmp50_ = current_im_addrs; + _tmp51_ = gee_iterable_iterator ((GeeIterable*) GEE_COLLECTION (_tmp50_)); + _cur_im_it = _tmp51_; while (TRUE) { - GeeIterator* _tmp46_; - gboolean _tmp47_ = FALSE; - GeeIterator* _tmp48_; - gpointer _tmp49_ = NULL; + GeeIterator* _tmp52_; + gboolean _tmp53_ = FALSE; + GeeIterator* _tmp54_; + gpointer _tmp55_ = NULL; FolksImFieldDetails* cur_im; - FolksImFieldDetails* _tmp50_; - gconstpointer _tmp51_; - const gchar* _tmp52_; - FolksEmailFieldDetails* _tmp53_; - gconstpointer _tmp54_; - const gchar* _tmp55_; - _tmp46_ = _cur_im_it; - _tmp47_ = gee_iterator_next (_tmp46_); - if (!_tmp47_) { + FolksImFieldDetails* _tmp56_; + gconstpointer _tmp57_; + const gchar* _tmp58_; + FolksEmailFieldDetails* _tmp59_; + gconstpointer _tmp60_; + const gchar* _tmp61_; + _tmp52_ = _cur_im_it; + _tmp53_ = gee_iterator_next (_tmp52_); + if (!_tmp53_) { break; } - _tmp48_ = _cur_im_it; - _tmp49_ = gee_iterator_get (_tmp48_); - cur_im = (FolksImFieldDetails*) _tmp49_; - _tmp50_ = cur_im; - _tmp51_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp50_); - _tmp52_ = _tmp51_; - _tmp53_ = email; - _tmp54_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp53_); - _tmp55_ = _tmp54_; - if (g_strcmp0 ((const gchar*) _tmp52_, (const gchar*) _tmp55_) == 0) { + _tmp54_ = _cur_im_it; + _tmp55_ = gee_iterator_get (_tmp54_); + cur_im = (FolksImFieldDetails*) _tmp55_; + _tmp56_ = cur_im; + _tmp57_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp56_); + _tmp58_ = _tmp57_; + _tmp59_ = email; + _tmp60_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp59_); + _tmp61_ = _tmp60_; + if (g_strcmp0 ((const gchar*) _tmp58_, (const gchar*) _tmp61_) == 0) { exists = TRUE; _g_object_unref0 (cur_im); break; @@ -4728,42 +4978,44 @@ _g_object_unref0 (_cur_im_it); } } - _tmp56_ = exists; - if (_tmp56_) { + _tmp62_ = exists; + if (_tmp62_) { _g_object_unref0 (current_im_addrs); _g_free0 (proto); + _g_free0 (_proto); _g_object_unref0 (email); continue; } { - FolksEmailFieldDetails* _tmp57_; - gconstpointer _tmp58_; - const gchar* _tmp59_; - const gchar* _tmp60_; - gchar* _tmp61_ = NULL; - gchar* _tmp62_; - gchar* _tmp63_; - gchar* _tmp64_; - gchar* _tmp65_; - gchar* normalised_addr; + FolksEmailFieldDetails* _tmp63_; + gconstpointer _tmp64_; + const gchar* _tmp65_; const gchar* _tmp66_; - FolksImFieldDetails* _tmp67_; + gchar* _tmp67_ = NULL; + gchar* _tmp68_; + gchar* _tmp69_; + gchar* _tmp70_; + gchar* _tmp71_; + gchar* normalised_addr; + const gchar* _tmp72_; + FolksImFieldDetails* _tmp73_; FolksImFieldDetails* im_fd; - GeeHashMultiMap* _tmp68_; - const gchar* _tmp69_; - FolksImFieldDetails* _tmp70_; - _tmp57_ = email; - _tmp58_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp57_); - _tmp59_ = _tmp58_; - _tmp60_ = proto; - _tmp61_ = folks_im_details_normalise_im_address ((const gchar*) _tmp59_, _tmp60_, &_inner_error_); - _tmp62_ = _tmp61_; + GeeHashMultiMap* _tmp74_; + const gchar* _tmp75_; + FolksImFieldDetails* _tmp76_; + _tmp63_ = email; + _tmp64_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp63_); + _tmp65_ = _tmp64_; + _tmp66_ = proto; + _tmp67_ = folks_im_details_normalise_im_address ((const gchar*) _tmp65_, _tmp66_, &_inner_error_); + _tmp68_ = _tmp67_; if (_inner_error_ != NULL) { if (_inner_error_->domain == FOLKS_IM_DETAILS_ERROR) { goto __catch3_folks_im_details_error; } _g_object_unref0 (current_im_addrs); _g_free0 (proto); + _g_free0 (_proto); _g_object_unref0 (email); _g_object_unref0 (_email_it); _g_object_unref0 (new_im_addresses); @@ -4772,19 +5024,19 @@ g_clear_error (&_inner_error_); return; } - _tmp63_ = _tmp62_; - _tmp64_ = _tmp63_; - _tmp63_ = NULL; - _tmp65_ = _tmp64_; - _g_free0 (_tmp63_); - normalised_addr = _tmp65_; - _tmp66_ = normalised_addr; - _tmp67_ = folks_im_field_details_new (_tmp66_, NULL); - im_fd = _tmp67_; - _tmp68_ = new_im_addresses; - _tmp69_ = proto; - _tmp70_ = im_fd; - gee_multi_map_set ((GeeMultiMap*) _tmp68_, _tmp69_, _tmp70_); + _tmp69_ = _tmp68_; + _tmp70_ = _tmp69_; + _tmp69_ = NULL; + _tmp71_ = _tmp70_; + _g_free0 (_tmp69_); + normalised_addr = _tmp71_; + _tmp72_ = normalised_addr; + _tmp73_ = folks_im_field_details_new (_tmp72_, NULL); + im_fd = _tmp73_; + _tmp74_ = new_im_addresses; + _tmp75_ = proto; + _tmp76_ = im_fd; + gee_multi_map_set ((GeeMultiMap*) _tmp74_, _tmp75_, _tmp76_); _g_object_unref0 (im_fd); _g_free0 (normalised_addr); } @@ -4792,19 +5044,20 @@ __catch3_folks_im_details_error: { GError* e = NULL; - GError* _tmp71_; - const gchar* _tmp72_; + GError* _tmp77_; + const gchar* _tmp78_; e = _inner_error_; _inner_error_ = NULL; - _tmp71_ = e; - _tmp72_ = _tmp71_->message; - g_warning ("edsf-persona.vala:1349: Problem when trying to normalise address: %s\n", _tmp72_); + _tmp77_ = e; + _tmp78_ = _tmp77_->message; + g_warning ("edsf-persona.vala:1404: Problem when trying to normalise address: %s\n", _tmp78_); _g_error_free0 (e); } __finally3: if (_inner_error_ != NULL) { _g_object_unref0 (current_im_addrs); _g_free0 (proto); + _g_free0 (_proto); _g_object_unref0 (email); _g_object_unref0 (_email_it); _g_object_unref0 (new_im_addresses); @@ -4814,22 +5067,23 @@ return; } _g_object_unref0 (current_im_addrs); + _g_free0 (proto); } - _g_free0 (proto); + _g_free0 (_proto); _g_object_unref0 (email); } _g_object_unref0 (_email_it); } - _tmp73_ = new_im_addresses; - _tmp74_ = self->priv->_im_addresses; - _tmp75_ = folks_utils_multi_map_str_afd_equal ((GeeMultiMap*) _tmp73_, (GeeMultiMap*) _tmp74_); - if (!_tmp75_) { - GeeHashMultiMap* _tmp76_; - GeeHashMultiMap* _tmp77_; - _tmp76_ = new_im_addresses; - _tmp77_ = _g_object_ref0 (_tmp76_); + _tmp79_ = new_im_addresses; + _tmp80_ = self->priv->_im_addresses; + _tmp81_ = folks_utils_multi_map_str_afd_equal ((GeeMultiMap*) _tmp79_, (GeeMultiMap*) _tmp80_); + if (!_tmp81_) { + GeeHashMultiMap* _tmp82_; + GeeHashMultiMap* _tmp83_; + _tmp82_ = new_im_addresses; + _tmp83_ = _g_object_ref0 (_tmp82_); _g_object_unref0 (self->priv->_im_addresses); - self->priv->_im_addresses = _tmp77_; + self->priv->_im_addresses = _tmp83_; g_object_notify ((GObject*) self, "im-addresses"); } _g_object_unref0 (new_im_addresses); @@ -4947,7 +5201,7 @@ _tmp26_ = _g_object_ref0 (_tmp25_); _category_name_list = _tmp26_; _tmp27_ = _category_name_list; - _tmp28_ = gee_collection_get_size ((GeeCollection*) _tmp27_); + _tmp28_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp27_); _tmp29_ = _tmp28_; _category_name_size = _tmp29_; _category_name_index = -1; @@ -4995,7 +5249,7 @@ _tmp40_ = _g_object_ref0 (_tmp39_); _category_name_list = _tmp40_; _tmp41_ = _category_name_list; - _tmp42_ = gee_collection_get_size ((GeeCollection*) _tmp41_); + _tmp42_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp41_); _tmp43_ = _tmp42_; _category_name_size = _tmp43_; _category_name_index = -1; @@ -5031,7 +5285,7 @@ _g_object_unref0 (_category_name_list); } _tmp54_ = added_categories; - _tmp55_ = gee_collection_get_size ((GeeCollection*) _tmp54_); + _tmp55_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp54_); _tmp56_ = _tmp55_; if (_tmp56_ != 0) { _tmp53_ = TRUE; @@ -5040,7 +5294,7 @@ gint _tmp58_; gint _tmp59_; _tmp57_ = removed_categories; - _tmp58_ = gee_collection_get_size ((GeeCollection*) _tmp57_); + _tmp58_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp57_); _tmp59_ = _tmp58_; _tmp53_ = _tmp59_ != 0; } @@ -5069,8 +5323,7 @@ GHashTable* _edsf_persona_get_im_eds_map (void) { GHashTable* result = NULL; - GHashTable* _tmp22_; - GHashTable* _tmp23_; + GHashTable* retval = NULL; GError * _inner_error_ = NULL; { GHashTable* _tmp0_; @@ -5078,11 +5331,14 @@ g_static_rec_mutex_lock (&__lock_edsf_persona__im_eds_map); { GHashTable* _tmp1_; + GHashTable* _tmp23_; + GHashTable* _tmp24_; _tmp1_ = edsf_persona__im_eds_map; if (_tmp1_ == NULL) { GHashFunc _tmp2_; GEqualFunc _tmp3_; GHashTable* _tmp4_; + GHashTable* table; GHashTable* _tmp5_; gchar* _tmp6_; GHashTable* _tmp7_; @@ -5099,52 +5355,61 @@ gchar* _tmp18_; GHashTable* _tmp19_; gchar* _tmp20_; + GHashTable* _tmp21_; + GHashTable* _tmp22_; _tmp2_ = g_str_hash; _tmp3_ = g_str_equal; _tmp4_ = g_hash_table_new_full (_tmp2_, _tmp3_, _g_free0_, NULL); - _g_hash_table_unref0 (edsf_persona__im_eds_map); - edsf_persona__im_eds_map = _tmp4_; - _tmp5_ = edsf_persona__im_eds_map; + table = _tmp4_; + _tmp5_ = table; _tmp6_ = g_strdup ("aim"); g_hash_table_insert (_tmp5_, _tmp6_, GINT_TO_POINTER (E_CONTACT_IM_AIM)); - _tmp7_ = edsf_persona__im_eds_map; + _tmp7_ = table; _tmp8_ = g_strdup ("yahoo"); g_hash_table_insert (_tmp7_, _tmp8_, GINT_TO_POINTER (E_CONTACT_IM_YAHOO)); - _tmp9_ = edsf_persona__im_eds_map; + _tmp9_ = table; _tmp10_ = g_strdup ("groupwise"); g_hash_table_insert (_tmp9_, _tmp10_, GINT_TO_POINTER (E_CONTACT_IM_GROUPWISE)); - _tmp11_ = edsf_persona__im_eds_map; + _tmp11_ = table; _tmp12_ = g_strdup ("jabber"); g_hash_table_insert (_tmp11_, _tmp12_, GINT_TO_POINTER (E_CONTACT_IM_JABBER)); - _tmp13_ = edsf_persona__im_eds_map; + _tmp13_ = table; _tmp14_ = g_strdup ("msn"); g_hash_table_insert (_tmp13_, _tmp14_, GINT_TO_POINTER (E_CONTACT_IM_MSN)); - _tmp15_ = edsf_persona__im_eds_map; + _tmp15_ = table; _tmp16_ = g_strdup ("icq"); g_hash_table_insert (_tmp15_, _tmp16_, GINT_TO_POINTER (E_CONTACT_IM_ICQ)); - _tmp17_ = edsf_persona__im_eds_map; + _tmp17_ = table; _tmp18_ = g_strdup ("gadugadu"); g_hash_table_insert (_tmp17_, _tmp18_, GINT_TO_POINTER (E_CONTACT_IM_GADUGADU)); - _tmp19_ = edsf_persona__im_eds_map; + _tmp19_ = table; _tmp20_ = g_strdup ("skype"); g_hash_table_insert (_tmp19_, _tmp20_, GINT_TO_POINTER (E_CONTACT_IM_SKYPE)); + _tmp21_ = table; + _tmp22_ = _g_hash_table_ref0 (_tmp21_); + _g_hash_table_unref0 (edsf_persona__im_eds_map); + edsf_persona__im_eds_map = _tmp22_; + _g_hash_table_unref0 (table); } + _tmp23_ = edsf_persona__im_eds_map; + _tmp24_ = _g_hash_table_ref0 ((GHashTable*) _tmp23_); + _g_hash_table_unref0 (retval); + retval = _tmp24_; } __finally4: { - GHashTable* _tmp21_; - _tmp21_ = edsf_persona__im_eds_map; + GHashTable* _tmp25_; + _tmp25_ = edsf_persona__im_eds_map; g_static_rec_mutex_unlock (&__lock_edsf_persona__im_eds_map); } if (_inner_error_ != NULL) { + _g_hash_table_unref0 (retval); g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); return NULL; } } - _tmp22_ = edsf_persona__im_eds_map; - _tmp23_ = _g_hash_table_ref0 (_tmp22_); - result = _tmp23_; + result = retval; return result; } @@ -5157,9 +5422,9 @@ GList* _tmp3_ = NULL; GList* attrs; GList* _tmp4_; - GeeHashSet* _tmp15_; - GeeHashSet* _tmp16_; - gboolean _tmp17_ = FALSE; + GeeHashSet* _tmp18_; + GeeHashSet* _tmp19_; + gboolean _tmp20_ = FALSE; g_return_if_fail (self != NULL); _tmp0_ = gee_hash_set_new (FOLKS_TYPE_PHONE_FIELD_DETAILS, (GBoxedCopyFunc) g_object_ref, g_object_unref, (GHashFunc) folks_abstract_field_details_hash, (GEqualFunc) folks_abstract_field_details_equal); new_phone_numbers = _tmp0_; @@ -5180,50 +5445,67 @@ { EVCardAttribute* _tmp6_; gchar* _tmp7_ = NULL; - gchar* _tmp8_; - FolksPhoneFieldDetails* _tmp9_; - FolksPhoneFieldDetails* _tmp10_; + gchar* val; + gboolean _tmp8_ = FALSE; + const gchar* _tmp9_; + gboolean _tmp11_; + const gchar* _tmp12_; + FolksPhoneFieldDetails* _tmp13_; FolksPhoneFieldDetails* phone_fd; - FolksPhoneFieldDetails* _tmp11_; - EVCardAttribute* _tmp12_; - GeeHashSet* _tmp13_; FolksPhoneFieldDetails* _tmp14_; + EVCardAttribute* _tmp15_; + GeeHashSet* _tmp16_; + FolksPhoneFieldDetails* _tmp17_; _tmp6_ = attr; _tmp7_ = e_vcard_attribute_get_value (_tmp6_); - _tmp8_ = _tmp7_; - _tmp9_ = folks_phone_field_details_new (_tmp8_, NULL); - _tmp10_ = _tmp9_; - _g_free0 (_tmp8_); - phone_fd = _tmp10_; - _tmp11_ = phone_fd; - _tmp12_ = attr; - _edsf_persona_update_params (self, (FolksAbstractFieldDetails*) _tmp11_, _tmp12_); - _tmp13_ = new_phone_numbers; + val = _tmp7_; + _tmp9_ = val; + if (_tmp9_ == NULL) { + _tmp8_ = TRUE; + } else { + const gchar* _tmp10_; + _tmp10_ = val; + _tmp8_ = g_strcmp0 ((const gchar*) _tmp10_, "") == 0; + } + _tmp11_ = _tmp8_; + if (_tmp11_) { + _g_free0 (val); + __vala_EVCardAttribute_free0 (attr); + continue; + } + _tmp12_ = val; + _tmp13_ = folks_phone_field_details_new ((const gchar*) _tmp12_, NULL); + phone_fd = _tmp13_; _tmp14_ = phone_fd; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp13_, _tmp14_); + _tmp15_ = attr; + _edsf_persona_update_params (self, (FolksAbstractFieldDetails*) _tmp14_, _tmp15_); + _tmp16_ = new_phone_numbers; + _tmp17_ = phone_fd; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp16_, _tmp17_); _g_object_unref0 (phone_fd); + _g_free0 (val); __vala_EVCardAttribute_free0 (attr); } } } - _tmp15_ = new_phone_numbers; - _tmp16_ = self->priv->_phone_numbers; - _tmp17_ = folks_internal_equal_sets (FOLKS_TYPE_PHONE_FIELD_DETAILS, (GBoxedCopyFunc) g_object_ref, g_object_unref, (GeeSet*) _tmp15_, (GeeSet*) _tmp16_); - if (!_tmp17_) { - GeeHashSet* _tmp18_; - GeeHashSet* _tmp19_; - GeeHashSet* _tmp20_; - GeeSet* _tmp21_; - GeeSet* _tmp22_; - _tmp18_ = new_phone_numbers; - _tmp19_ = _g_object_ref0 (_tmp18_); + _tmp18_ = new_phone_numbers; + _tmp19_ = self->priv->_phone_numbers; + _tmp20_ = folks_internal_equal_sets (FOLKS_TYPE_PHONE_FIELD_DETAILS, (GBoxedCopyFunc) g_object_ref, g_object_unref, (GeeSet*) _tmp18_, (GeeSet*) _tmp19_); + if (!_tmp20_) { + GeeHashSet* _tmp21_; + GeeHashSet* _tmp22_; + GeeHashSet* _tmp23_; + GeeSet* _tmp24_; + GeeSet* _tmp25_; + _tmp21_ = new_phone_numbers; + _tmp22_ = _g_object_ref0 (_tmp21_); _g_object_unref0 (self->priv->_phone_numbers); - self->priv->_phone_numbers = _tmp19_; - _tmp20_ = new_phone_numbers; - _tmp21_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp20_); - _tmp22_ = _tmp21_; + self->priv->_phone_numbers = _tmp22_; + _tmp23_ = new_phone_numbers; + _tmp24_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp23_); + _tmp25_ = _tmp24_; _g_object_unref0 (self->priv->_phone_numbers_ro); - self->priv->_phone_numbers_ro = _tmp22_; + self->priv->_phone_numbers_ro = _tmp25_; g_object_notify ((GObject*) self, "phone-numbers"); } __g_list_free___vala_EVCardAttribute_free0_0 (attrs); @@ -5301,12 +5583,12 @@ GList* _tmp15_; GList* _tmp16_; _tmp12_ = l; - _tmp13_ = _tmp12_->data; + _tmp13_ = ((GList*) _tmp12_)->data; _tmp14_ = g_strdup ((const gchar*) _tmp13_); _g_free0 (po_box); po_box = _tmp14_; _tmp15_ = l; - _tmp16_ = _tmp15_->next; + _tmp16_ = ((GList*) _tmp15_)->next; l = _tmp16_; } _tmp17_ = l; @@ -5317,12 +5599,12 @@ GList* _tmp21_; GList* _tmp22_; _tmp18_ = l; - _tmp19_ = _tmp18_->data; + _tmp19_ = ((GList*) _tmp18_)->data; _tmp20_ = g_strdup ((const gchar*) _tmp19_); _g_free0 (extension); extension = _tmp20_; _tmp21_ = l; - _tmp22_ = _tmp21_->next; + _tmp22_ = ((GList*) _tmp21_)->next; l = _tmp22_; } _tmp23_ = l; @@ -5333,12 +5615,12 @@ GList* _tmp27_; GList* _tmp28_; _tmp24_ = l; - _tmp25_ = _tmp24_->data; + _tmp25_ = ((GList*) _tmp24_)->data; _tmp26_ = g_strdup ((const gchar*) _tmp25_); _g_free0 (street); street = _tmp26_; _tmp27_ = l; - _tmp28_ = _tmp27_->next; + _tmp28_ = ((GList*) _tmp27_)->next; l = _tmp28_; } _tmp29_ = l; @@ -5349,12 +5631,12 @@ GList* _tmp33_; GList* _tmp34_; _tmp30_ = l; - _tmp31_ = _tmp30_->data; + _tmp31_ = ((GList*) _tmp30_)->data; _tmp32_ = g_strdup ((const gchar*) _tmp31_); _g_free0 (locality); locality = _tmp32_; _tmp33_ = l; - _tmp34_ = _tmp33_->next; + _tmp34_ = ((GList*) _tmp33_)->next; l = _tmp34_; } _tmp35_ = l; @@ -5365,12 +5647,12 @@ GList* _tmp39_; GList* _tmp40_; _tmp36_ = l; - _tmp37_ = _tmp36_->data; + _tmp37_ = ((GList*) _tmp36_)->data; _tmp38_ = g_strdup ((const gchar*) _tmp37_); _g_free0 (region); region = _tmp38_; _tmp39_ = l; - _tmp40_ = _tmp39_->next; + _tmp40_ = ((GList*) _tmp39_)->next; l = _tmp40_; } _tmp41_ = l; @@ -5381,12 +5663,12 @@ GList* _tmp45_; GList* _tmp46_; _tmp42_ = l; - _tmp43_ = _tmp42_->data; + _tmp43_ = ((GList*) _tmp42_)->data; _tmp44_ = g_strdup ((const gchar*) _tmp43_); _g_free0 (postal_code); postal_code = _tmp44_; _tmp45_ = l; - _tmp46_ = _tmp45_->next; + _tmp46_ = ((GList*) _tmp45_)->next; l = _tmp46_; } _tmp47_ = l; @@ -5397,12 +5679,12 @@ GList* _tmp51_; GList* _tmp52_; _tmp48_ = l; - _tmp49_ = _tmp48_->data; + _tmp49_ = ((GList*) _tmp48_)->data; _tmp50_ = g_strdup ((const gchar*) _tmp49_); _g_free0 (country); country = _tmp50_; _tmp51_ = l; - _tmp52_ = _tmp51_->next; + _tmp52_ = ((GList*) _tmp51_)->next; l = _tmp52_; } _tmp53_ = po_box; @@ -5516,13 +5798,13 @@ EVCardAttribute* _tmp4_; EVCardAttribute* ids; EVCardAttribute* _tmp5_; - GeeHashSet* _tmp12_; - const gchar* _tmp13_; + GeeHashSet* _tmp13_; const gchar* _tmp14_; - GeeHashSet* _tmp15_; - GeeSet* _tmp16_; + const gchar* _tmp15_; + GeeHashSet* _tmp16_; GeeSet* _tmp17_; - gboolean _tmp18_ = FALSE; + GeeSet* _tmp18_; + gboolean _tmp19_ = FALSE; g_return_if_fail (self != NULL); _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL); new_local_ids = _tmp0_; @@ -5538,7 +5820,7 @@ GList* ids_v; GList* _tmp8_; _tmp6_ = ids; - _tmp7_ = e_vcard_attribute_get_values (_tmp6_); + _tmp7_ = e_vcard_attribute_get_values ((EVCardAttribute*) _tmp6_); ids_v = _tmp7_; _tmp8_ = ids_v; { @@ -5551,39 +5833,43 @@ _tmp9_ = g_strdup ((const gchar*) local_id_it->data); local_id = _tmp9_; { - GeeHashSet* _tmp10_; - const gchar* _tmp11_; - _tmp10_ = new_local_ids; - _tmp11_ = local_id; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp10_, _tmp11_); + const gchar* _tmp10_; + _tmp10_ = local_id; + if (g_strcmp0 (_tmp10_, "") != 0) { + GeeHashSet* _tmp11_; + const gchar* _tmp12_; + _tmp11_ = new_local_ids; + _tmp12_ = local_id; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp11_, _tmp12_); + } _g_free0 (local_id); } } } } - _tmp12_ = new_local_ids; - _tmp13_ = folks_persona_get_iid ((FolksPersona*) self); - _tmp14_ = _tmp13_; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp12_, _tmp14_); - _tmp15_ = new_local_ids; - _tmp16_ = folks_local_id_details_get_local_ids ((FolksLocalIdDetails*) self); - _tmp17_ = _tmp16_; - _tmp18_ = folks_internal_equal_sets (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, (GeeSet*) _tmp15_, _tmp17_); - if (!_tmp18_) { - GeeHashSet* _tmp19_; + _tmp13_ = new_local_ids; + _tmp14_ = folks_persona_get_iid ((FolksPersona*) self); + _tmp15_ = _tmp14_; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp13_, _tmp15_); + _tmp16_ = new_local_ids; + _tmp17_ = folks_local_id_details_get_local_ids ((FolksLocalIdDetails*) self); + _tmp18_ = _tmp17_; + _tmp19_ = folks_internal_equal_sets (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, (GeeSet*) _tmp16_, _tmp18_); + if (!_tmp19_) { GeeHashSet* _tmp20_; GeeHashSet* _tmp21_; - GeeSet* _tmp22_; + GeeHashSet* _tmp22_; GeeSet* _tmp23_; - _tmp19_ = new_local_ids; - _tmp20_ = _g_object_ref0 (_tmp19_); + GeeSet* _tmp24_; + _tmp20_ = new_local_ids; + _tmp21_ = _g_object_ref0 (_tmp20_); _g_object_unref0 (self->priv->_local_ids); - self->priv->_local_ids = _tmp20_; - _tmp21_ = self->priv->_local_ids; - _tmp22_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp21_); - _tmp23_ = _tmp22_; + self->priv->_local_ids = _tmp21_; + _tmp22_ = self->priv->_local_ids; + _tmp23_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp22_); + _tmp24_ = _tmp23_; _g_object_unref0 (self->priv->_local_ids_ro); - self->priv->_local_ids_ro = _tmp23_; + self->priv->_local_ids_ro = _tmp24_; g_object_notify ((GObject*) self, "local-ids"); } __vala_EVCardAttribute_free0 (ids); @@ -5599,8 +5885,8 @@ EVCardAttribute* _tmp3_; EVCardAttribute* fav; EVCardAttribute* _tmp4_; - gboolean _tmp11_; - gboolean _tmp12_; + gboolean _tmp13_; + gboolean _tmp14_; g_return_if_fail (self != NULL); is_fav = FALSE; _tmp0_ = edsf_persona_get_contact (self); @@ -5613,29 +5899,37 @@ EVCardAttribute* _tmp5_; gchar* _tmp6_ = NULL; gchar* val; - const gchar* _tmp7_; - gchar* _tmp8_ = NULL; - gchar* _tmp9_; - gboolean _tmp10_; + gboolean _tmp7_ = FALSE; + const gchar* _tmp8_; + gboolean _tmp12_; _tmp5_ = fav; - _tmp6_ = e_vcard_attribute_get_value (_tmp5_); + _tmp6_ = e_vcard_attribute_get_value ((EVCardAttribute*) _tmp5_); val = _tmp6_; - _tmp7_ = val; - _tmp8_ = g_utf8_strdown (_tmp7_, (gssize) (-1)); - _tmp9_ = _tmp8_; - _tmp10_ = g_strcmp0 (_tmp9_, "true") == 0; - _g_free0 (_tmp9_); - if (_tmp10_) { + _tmp8_ = val; + if (_tmp8_ != NULL) { + const gchar* _tmp9_; + gchar* _tmp10_ = NULL; + gchar* _tmp11_; + _tmp9_ = val; + _tmp10_ = g_utf8_strdown ((const gchar*) _tmp9_, (gssize) (-1)); + _tmp11_ = _tmp10_; + _tmp7_ = g_strcmp0 (_tmp11_, "true") == 0; + _g_free0 (_tmp11_); + } else { + _tmp7_ = FALSE; + } + _tmp12_ = _tmp7_; + if (_tmp12_) { is_fav = TRUE; } _g_free0 (val); } - _tmp11_ = is_fav; - _tmp12_ = self->priv->_is_favourite; - if (_tmp11_ != _tmp12_) { - gboolean _tmp13_; - _tmp13_ = is_fav; - self->priv->_is_favourite = _tmp13_; + _tmp13_ = is_fav; + _tmp14_ = self->priv->_is_favourite; + if (_tmp13_ != _tmp14_) { + gboolean _tmp15_; + _tmp15_ = is_fav; + self->priv->_is_favourite = _tmp15_; g_object_notify ((GObject*) self, "is-favourite"); } __vala_EVCardAttribute_free0 (fav); @@ -6364,7 +6658,7 @@ self = EDSF_PERSONA (obj); _tmp0_ = folks_persona_get_iid ((FolksPersona*) self); _tmp1_ = _tmp0_; - g_debug ("edsf-persona.vala:719: Creating new Edsf.Persona with IID '%s'", _tmp1_); + g_debug ("edsf-persona.vala:720: Creating new Edsf.Persona with IID '%s'", _tmp1_); self->priv->_gender = FOLKS_GENDER_UNSPECIFIED; _tmp2_ = gee_hash_set_new (FOLKS_TYPE_PHONE_FIELD_DETAILS, (GBoxedCopyFunc) g_object_ref, g_object_unref, (GHashFunc) folks_abstract_field_details_hash, (GEqualFunc) folks_abstract_field_details_equal); _g_object_unref0 (self->priv->_phone_numbers); @@ -6441,9 +6735,9 @@ static void edsf_persona_url_type_mapping_copy (const EdsfPersonaUrlTypeMapping* self, EdsfPersonaUrlTypeMapping* dest) { const gchar* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; + gchar* _tmp3_; _tmp0_ = (*self).vcard_field_name; _tmp1_ = g_strdup (_tmp0_); _g_free0 ((*dest).vcard_field_name); @@ -6504,11 +6798,11 @@ /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_WEB_SERVICE_ADDRESSES, "web-service-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_WEB_SERVICE_ADDRESSES, g_param_spec_object ("web-service-addresses", "web-service-addresses", "web-service-addresses", GEE_TYPE_MULTI_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * IDs used to link {@link Edsf.Persona}s. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_LOCAL_IDS, "local-ids"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_LOCAL_IDS, g_param_spec_object ("local-ids", "local-ids", "local-ids", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * The postal addresses of the contact. * @@ -6516,37 +6810,37 @@ * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_POSTAL_ADDRESSES, "postal-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_POSTAL_ADDRESSES, g_param_spec_object ("postal-addresses", "postal-addresses", "postal-addresses", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_PHONE_NUMBERS, "phone-numbers"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_PHONE_NUMBERS, g_param_spec_object ("phone-numbers", "phone-numbers", "phone-numbers", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_EMAIL_ADDRESSES, "email-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_EMAIL_ADDRESSES, g_param_spec_object ("email-addresses", "email-addresses", "email-addresses", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_NOTES, "notes"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_NOTES, g_param_spec_object ("notes", "notes", "notes", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_LINKABLE_PROPERTIES, "linkable-properties"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_LINKABLE_PROPERTIES, g_param_spec_boxed ("linkable-properties", "linkable-properties", "linkable-properties", G_TYPE_STRV, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_WRITEABLE_PROPERTIES, "writeable-properties"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_WRITEABLE_PROPERTIES, g_param_spec_boxed ("writeable-properties", "writeable-properties", "writeable-properties", G_TYPE_STRV, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * An avatar for the Persona. * @@ -6554,13 +6848,13 @@ * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_AVATAR, "avatar"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_AVATAR, g_param_spec_object ("avatar", "avatar", "avatar", g_loadable_icon_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STRUCTURED_NAME, "structured-name"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STRUCTURED_NAME, g_param_spec_object ("structured-name", "structured-name", "structured-name", FOLKS_TYPE_STRUCTURED_NAME, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * The e-d-s contact uid * @@ -6572,37 +6866,37 @@ * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_FULL_NAME, "full-name"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_FULL_NAME, g_param_spec_string ("full-name", "full-name", "full-name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_NICKNAME, "nickname"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_NICKNAME, g_param_spec_string ("nickname", "nickname", "nickname", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_GENDER, "gender"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_GENDER, g_param_spec_enum ("gender", "gender", "gender", FOLKS_TYPE_GENDER, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_URLS, "urls"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_URLS, g_param_spec_object ("urls", "urls", "urls", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_IM_ADDRESSES, "im-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_IM_ADDRESSES, g_param_spec_object ("im-addresses", "im-addresses", "im-addresses", GEE_TYPE_MULTI_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_GROUPS, "groups"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_GROUPS, g_param_spec_object ("groups", "groups", "groups", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * @@ -6610,25 +6904,25 @@ * * @since 0.6.2 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_CALENDAR_EVENT_ID, "calendar-event-id"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_CALENDAR_EVENT_ID, g_param_spec_string ("calendar-event-id", "calendar-event-id", "calendar-event-id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.2 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_BIRTHDAY, "birthday"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_BIRTHDAY, g_param_spec_boxed ("birthday", "birthday", "birthday", G_TYPE_DATE_TIME, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.2 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_ROLES, "roles"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_ROLES, g_param_spec_object ("roles", "roles", "roles", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * Whether this contact is a user-defined favourite. * * @since 0.6.5 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_IS_FAVOURITE, "is-favourite"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_IS_FAVOURITE, g_param_spec_boolean ("is-favourite", "is-favourite", "is-favourite", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); g_static_rec_mutex_init (&__lock_edsf_persona__im_eds_map); _tmp0_ = g_time_zone_new_local (); edsf_persona__local_time_zone = _tmp0_; @@ -6806,7 +7100,7 @@ self = EDSF_PERSONA (obj); _tmp0_ = folks_persona_get_uid ((FolksPersona*) self); _tmp1_ = _tmp0_; - g_debug ("edsf-persona.vala:808: Destroying Edsf.Persona '%s': %p", _tmp1_, self); + g_debug ("edsf-persona.vala:809: Destroying Edsf.Persona '%s': %p", _tmp1_, self); _g_object_unref0 (self->priv->_phone_numbers); _g_object_unref0 (self->priv->_phone_numbers_ro); _g_object_unref0 (self->priv->_email_addresses); diff -Nru folks-0.6.6/backends/eds/lib/edsf-persona-store.c folks-0.6.7/backends/eds/lib/edsf-persona-store.c --- folks-0.6.6/backends/eds/lib/edsf-persona-store.c 2011-12-13 23:40:50.000000000 +0000 +++ folks-0.6.7/backends/eds/lib/edsf-persona-store.c 2012-02-23 00:02:09.000000000 +0000 @@ -1,4 +1,4 @@ -/* edsf-persona-store.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* edsf-persona-store.c generated by valac 0.15.1, the Vala compiler * generated from edsf-persona-store.vala, do not modify */ /* @@ -62,12 +62,11 @@ #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL))) -#define __vala_GValue_free0(var) ((var == NULL) ? NULL : (var = (_vala_GValue_free (var), NULL))) -#define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL))) #define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL))) typedef struct _EdsfPersonaStoreAddPersonaFromDetailsData EdsfPersonaStoreAddPersonaFromDetailsData; typedef struct _EdsfPersonaStoreRemovePersonaData EdsfPersonaStoreRemovePersonaData; typedef struct _EdsfPersonaStorePrepareData EdsfPersonaStorePrepareData; +typedef struct _EdsfPersonaStoreOpenAddressBookData EdsfPersonaStoreOpenAddressBookData; typedef struct _Block2Data Block2Data; typedef struct _Block3Data Block3Data; typedef struct _EdsfPersonaStoreCommitModifiedPropertyData EdsfPersonaStoreCommitModifiedPropertyData; @@ -107,6 +106,7 @@ #define __vala_EContactName_free0(var) ((var == NULL) ? NULL : (var = (_vala_EContactName_free (var), NULL))) typedef struct _EdsfPersonaStoreSetContactNameData EdsfPersonaStoreSetContactNameData; typedef struct _EdsfPersonaStoreSetImFdsData EdsfPersonaStoreSetImFdsData; +#define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL))) typedef struct _EdsfPersonaStoreSetContactImFdsData EdsfPersonaStoreSetContactImFdsData; typedef struct _EdsfPersonaStoreSetGroupsData EdsfPersonaStoreSetGroupsData; #define __g_list_free__g_free0_0(var) ((var == NULL) ? NULL : (var = (_g_list_free__g_free0_ (var), NULL))) @@ -139,6 +139,10 @@ gint _always_writeable_properties_length1; gint __always_writeable_properties_size_; ESource* _source; + GError* _open_address_book_error; + GSourceFunc _open_address_book_callback; + gpointer _open_address_book_callback_target; + GDestroyNotify _open_address_book_callback_target_destroy_notify; }; struct _EdsfPersonaStoreAddPersonaFromDetailsData { @@ -149,58 +153,58 @@ EdsfPersonaStore* self; GHashTable* details; FolksPersona* result; - EContact* _tmp0_; + gboolean _tmp0_; + GError* _tmp1_; + EContact* _tmp2_; EContact* contact; - GHashTable* _tmp1_; - GList* _tmp2_; - GList* k_collection; - GList* k_it; - const gchar* k; GHashTable* _tmp3_; - const gchar* _tmp4_; + GHashTableIter iter; + const gchar* k; + GValue* _v; + gconstpointer _tmp4_; gconstpointer _tmp5_; - GValue* _tmp6_; - GValue* v; - const gchar* _tmp7_; - const gchar* _tmp8_; - GValue* _tmp9_; + gboolean _tmp6_; + GValue* _tmp7_; + GValue* _tmp8_; + GValue v; + const gchar* _tmp9_; const gchar* _tmp10_; - gchar* _tmp11_; + const gchar* _tmp11_; + gchar* _tmp12_; gchar* full_name; - const gchar* _tmp12_; - EContact* _tmp13_; - EContactField _tmp14_; + gboolean _tmp13_; + const gchar* _tmp14_; const gchar* _tmp15_; - const gchar* _tmp16_; - const gchar* _tmp17_; - GValue* _tmp18_; - GObject* _tmp19_; - GeeSet* _tmp20_; + gboolean _tmp16_; + EContact* _tmp17_; + EContactField _tmp18_; + const gchar* _tmp19_; + const gchar* _tmp20_; + const gchar* _tmp21_; + GObject* _tmp22_; + GeeSet* _tmp23_; GeeSet* email_addresses; - EContact* _tmp21_; - GeeSet* _tmp22_; - const gchar* _tmp23_; - const gchar* _tmp24_; - GValue* _tmp25_; - GObject* _tmp26_; - GLoadableIcon* _tmp27_; - GLoadableIcon* avatar; - EContact* _tmp28_; + EContact* _tmp24_; + GeeSet* _tmp25_; + const gchar* _tmp26_; + const gchar* _tmp27_; + GObject* _tmp28_; GLoadableIcon* _tmp29_; + GLoadableIcon* avatar; + EContact* _tmp30_; + GLoadableIcon* _tmp31_; GError* e1; - GError* _tmp30_; - const gchar* _tmp31_; - const gchar* _tmp32_; + GError* _tmp32_; const gchar* _tmp33_; - GValue* _tmp34_; - GObject* _tmp35_; - GeeMultiMap* _tmp36_; + const gchar* _tmp34_; + const gchar* _tmp35_; + GObject* _tmp36_; + GeeMultiMap* _tmp37_; GeeMultiMap* im_fds; - EContact* _tmp37_; - GeeMultiMap* _tmp38_; - const gchar* _tmp39_; + EContact* _tmp38_; + GeeMultiMap* _tmp39_; const gchar* _tmp40_; - GValue* _tmp41_; + const gchar* _tmp41_; GObject* _tmp42_; GeeSet* _tmp43_; GeeSet* phone_numbers; @@ -208,121 +212,114 @@ GeeSet* _tmp45_; const gchar* _tmp46_; const gchar* _tmp47_; - GValue* _tmp48_; - GObject* _tmp49_; - GeeSet* _tmp50_; + GObject* _tmp48_; + GeeSet* _tmp49_; GeeSet* postal_fds; - EContact* _tmp51_; - GeeSet* _tmp52_; + EContact* _tmp50_; + GeeSet* _tmp51_; + const gchar* _tmp52_; const gchar* _tmp53_; - const gchar* _tmp54_; - GValue* _tmp55_; - GObject* _tmp56_; - FolksStructuredName* _tmp57_; + GObject* _tmp54_; + FolksStructuredName* _tmp55_; FolksStructuredName* sname; - EContact* _tmp58_; - FolksStructuredName* _tmp59_; - const gchar* _tmp60_; - const gchar* _tmp61_; - GValue* _tmp62_; - GObject* _tmp63_; - GeeSet* _tmp64_; + EContact* _tmp56_; + FolksStructuredName* _tmp57_; + const gchar* _tmp58_; + const gchar* _tmp59_; + GObject* _tmp60_; + GeeSet* _tmp61_; GeeSet* local_ids; - EContact* _tmp65_; - GeeSet* _tmp66_; - const gchar* _tmp67_; - const gchar* _tmp68_; - GValue* _tmp69_; - GObject* _tmp70_; - GeeHashMultiMap* _tmp71_; + EContact* _tmp62_; + GeeSet* _tmp63_; + const gchar* _tmp64_; + const gchar* _tmp65_; + GObject* _tmp66_; + GeeHashMultiMap* _tmp67_; GeeHashMultiMap* web_service_addresses; - EContact* _tmp72_; - GeeHashMultiMap* _tmp73_; - const gchar* _tmp74_; - const gchar* _tmp75_; - GValue* _tmp76_; - GObject* _tmp77_; - GeeHashSet* _tmp78_; + EContact* _tmp68_; + GeeHashMultiMap* _tmp69_; + const gchar* _tmp70_; + const gchar* _tmp71_; + GObject* _tmp72_; + GeeHashSet* _tmp73_; GeeHashSet* notes; + EContact* _tmp74_; + GeeHashSet* _tmp75_; + const gchar* _tmp76_; + const gchar* _tmp77_; + gint _tmp78_; + FolksGender gender; EContact* _tmp79_; - GeeHashSet* _tmp80_; + FolksGender _tmp80_; const gchar* _tmp81_; const gchar* _tmp82_; - GValue* _tmp83_; - gint _tmp84_; - FolksGender gender; + GObject* _tmp83_; + GeeSet* _tmp84_; + GeeSet* urls; EContact* _tmp85_; - FolksGender _tmp86_; + GeeSet* _tmp86_; const gchar* _tmp87_; const gchar* _tmp88_; - GValue* _tmp89_; - GObject* _tmp90_; - GeeSet* _tmp91_; - GeeSet* urls; - EContact* _tmp92_; - GeeSet* _tmp93_; - const gchar* _tmp94_; - const gchar* _tmp95_; - GValue* _tmp96_; - void* _tmp97_; - GDateTime* _tmp98_; + void* _tmp89_; + GDateTime* _tmp90_; GDateTime* birthday; - EContact* _tmp99_; - GDateTime* _tmp100_; - const gchar* _tmp101_; - const gchar* _tmp102_; - GValue* _tmp103_; - GObject* _tmp104_; - GeeSet* _tmp105_; + EContact* _tmp91_; + GDateTime* _tmp92_; + const gchar* _tmp93_; + const gchar* _tmp94_; + GObject* _tmp95_; + GeeSet* _tmp96_; GeeSet* roles; - EContact* _tmp106_; - GeeSet* _tmp107_; - const gchar* _tmp108_; - const gchar* _tmp109_; - GValue* _tmp110_; - gboolean _tmp111_; + EContact* _tmp97_; + GeeSet* _tmp98_; + const gchar* _tmp99_; + const gchar* _tmp100_; + gboolean _tmp101_; gboolean is_fav; - EContact* _tmp112_; - gboolean _tmp113_; - EdsfPersona* persona; + EContact* _tmp102_; + gboolean _tmp103_; + EdsfPersona* _persona; gchar* added_uid; - EBookClient* _tmp114_; - EContact* _tmp115_; - gchar* _tmp116_; - gboolean _tmp117_; + EBookClient* _tmp104_; + EContact* _tmp105_; + gchar* _tmp106_; + gboolean _tmp107_; gboolean _result_; - gboolean _tmp118_; - const gchar* _tmp119_; - GeeHashMap* _tmp120_; - const gchar* _tmp121_; - const gchar* _tmp122_; - const gchar* _tmp123_; - gchar* _tmp124_; + gboolean _tmp108_; + const gchar* _tmp109_; + GeeHashMap* _tmp110_; + const gchar* _tmp111_; + const gchar* _tmp112_; + const gchar* _tmp113_; + gchar* _tmp114_; gchar* iid; - GeeHashMap* _tmp125_; + GeeHashMap* _tmp115_; + const gchar* _tmp116_; + gpointer _tmp117_; + EdsfPersona* _tmp118_; + EdsfPersona* persona; + EContact* _tmp119_; + EContactField _tmp120_; + const gchar* _tmp121_; + EContact* _tmp122_; + EdsfPersona* _tmp123_; + GeeHashMap* _tmp124_; + EdsfPersona* _tmp125_; const gchar* _tmp126_; - gpointer _tmp127_; + const gchar* _tmp127_; EdsfPersona* _tmp128_; - EContact* _tmp129_; - EContactField _tmp130_; - const gchar* _tmp131_; - EContact* _tmp132_; - EdsfPersona* _tmp133_; - GeeHashMap* _tmp134_; - EdsfPersona* _tmp135_; - const gchar* _tmp136_; - const gchar* _tmp137_; - EdsfPersona* _tmp138_; - GeeHashSet* _tmp139_; + GeeHashSet* _tmp129_; GeeHashSet* added_personas; - GeeHashSet* _tmp140_; - EdsfPersona* _tmp141_; - GeeHashSet* _tmp142_; - GeeHashMap* _tmp143_; - GError* _tmp144_; + GeeHashSet* _tmp130_; + EdsfPersona* _tmp131_; + GeeHashSet* _tmp132_; + EdsfPersona* _tmp133_; + EdsfPersona* _tmp134_; + GeeHashMap* _tmp135_; + GError* _tmp136_; GError* e; - GError* _tmp145_; - const gchar* _tmp146_; + GError* _tmp137_; + const gchar* _tmp138_; GError * _inner_error_; }; @@ -333,33 +330,33 @@ GSimpleAsyncResult* _async_result; EdsfPersonaStore* self; FolksPersona* persona; - EBookClient* _tmp0_; - FolksPersona* _tmp1_; - EContact* _tmp2_; - EContact* _tmp3_; + gboolean _tmp0_; + GError* _tmp1_; + EBookClient* _tmp2_; + FolksPersona* _tmp3_; + EContact* _tmp4_; + EContact* _tmp5_; GError* e; - GError* _tmp4_; - GQuark _tmp5_; - GQuark _tmp6_; - GError* _tmp7_; - gint _tmp8_; + GError* _tmp6_; + GQuark _tmp7_; + GQuark _tmp8_; GError* _tmp9_; - GQuark _tmp10_; - GQuark _tmp11_; - GError* _tmp12_; - gint _tmp13_; - const gchar* _tmp14_; - const gchar* _tmp15_; + gint _tmp10_; + GError* _tmp11_; + GQuark _tmp12_; + GQuark _tmp13_; + GError* _tmp14_; + gint _tmp15_; const gchar* _tmp16_; - FolksPersona* _tmp17_; + const gchar* _tmp17_; const gchar* _tmp18_; - const gchar* _tmp19_; - GError* _tmp20_; + FolksPersona* _tmp19_; + const gchar* _tmp20_; const gchar* _tmp21_; - FolksPersona* _tmp22_; + GError* _tmp22_; const gchar* _tmp23_; - const gchar* _tmp24_; - GError* _tmp25_; + FolksPersona* _tmp24_; + const gchar* _tmp25_; const gchar* _tmp26_; GError* _tmp27_; const gchar* _tmp28_; @@ -367,12 +364,14 @@ const gchar* _tmp30_; GError* _tmp31_; const gchar* _tmp32_; - FolksPersona* _tmp33_; + GError* _tmp33_; const gchar* _tmp34_; - const gchar* _tmp35_; - GError* _tmp36_; + FolksPersona* _tmp35_; + const gchar* _tmp36_; const gchar* _tmp37_; GError* _tmp38_; + const gchar* _tmp39_; + GError* _tmp40_; GError * _inner_error_; }; @@ -395,168 +394,211 @@ EBookClient* _tmp10_; EBookClient* _tmp11_; EBookClient* _tmp12_; + EBookClient* _tmp13_; + const gchar* _tmp14_; + const gchar* _tmp15_; GError* e1; - GError* _tmp13_; - GQuark _tmp14_; - GQuark _tmp15_; GError* _tmp16_; - gint _tmp17_; - GError* _tmp18_; - GQuark _tmp19_; - GQuark _tmp20_; + GQuark _tmp17_; + GQuark _tmp18_; + GError* _tmp19_; + gint _tmp20_; GError* _tmp21_; - gint _tmp22_; - const gchar* _tmp23_; - const gchar* _tmp24_; - const gchar* _tmp25_; - GError* _tmp26_; + GQuark _tmp22_; + GQuark _tmp23_; + GError* _tmp24_; + gint _tmp25_; + const gchar* _tmp26_; const gchar* _tmp27_; const gchar* _tmp28_; - const gchar* _tmp29_; - GError* _tmp30_; + GError* _tmp29_; + const gchar* _tmp30_; const gchar* _tmp31_; - GError* _tmp32_; - const gchar* _tmp33_; + const gchar* _tmp32_; + GError* _tmp33_; const gchar* _tmp34_; - const gchar* _tmp35_; - GError* _tmp36_; + GError* _tmp35_; + const gchar* _tmp36_; const gchar* _tmp37_; - GError* _tmp38_; - EBookClient* _tmp39_; - gboolean _tmp40_; - const gchar* _tmp41_; - const gchar* _tmp42_; - const gchar* _tmp43_; - GError* _tmp44_; + const gchar* _tmp38_; + GError* _tmp39_; + const gchar* _tmp40_; + GError* _tmp41_; gchar* supported_fields; - EBookClient* _tmp45_; - gchar* _tmp46_; - GeeHashSet* _tmp47_; + EBookClient* _tmp42_; + gchar* _tmp43_; + GeeHashSet* _tmp44_; GeeHashSet* prop_set; - const gchar* _tmp48_; - const gchar* _tmp49_; - gchar** _tmp50_; - gchar** _tmp51_; + const gchar* _tmp45_; + const gchar* _tmp46_; + gchar** _tmp47_; + gchar** _tmp48_; gchar** fields; gint fields_length1; gint _fields_size_; - GeeHashSet* _tmp52_; - const gchar* _tmp53_; - GeeHashSet* _tmp54_; - const gchar* _tmp55_; - GeeHashSet* _tmp56_; - const gchar* _tmp57_; - GeeHashSet* _tmp58_; - const gchar* _tmp59_; - gchar** _tmp60_; - gint _tmp60__length1; + GeeHashSet* _tmp49_; + const gchar* _tmp50_; + GeeHashSet* _tmp51_; + const gchar* _tmp52_; + GeeHashSet* _tmp53_; + const gchar* _tmp54_; + GeeHashSet* _tmp55_; + const gchar* _tmp56_; + gchar** _tmp57_; + gint _tmp57__length1; gchar** field_collection; gint field_collection_length1; gint _field_collection_size_; gint field_it; const gchar* field; - const gchar* _tmp61_; - FolksPersonaDetail _tmp62_; - const gchar* _tmp63_; - gchar* _tmp64_; + const gchar* _tmp58_; + FolksPersonaDetail _tmp59_; + const gchar* _tmp60_; + gchar* _tmp61_; gchar* prop; - const gchar* _tmp65_; + const gchar* _tmp62_; + GeeHashSet* _tmp63_; + gchar* _tmp64_; + gchar* _tmp65_; GeeHashSet* _tmp66_; - gchar* _tmp67_; - gchar* _tmp68_; - GeeHashSet* _tmp69_; - gint _tmp70_; - gint _tmp71_; - gchar** _tmp72_; + gint _tmp67_; + gint _tmp68_; + gchar** _tmp69_; guint i; - GeeHashSet* _tmp73_; - GeeIterator* _tmp74_; + GeeHashSet* _tmp70_; + GeeIterator* _tmp71_; GeeIterator* _final_prop_it; - GeeIterator* _tmp75_; - gboolean _tmp76_; - GeeIterator* _tmp77_; - gpointer _tmp78_; + GeeIterator* _tmp72_; + gboolean _tmp73_; + GeeIterator* _tmp74_; + gpointer _tmp75_; gchar* final_prop; - gchar** _tmp79_; - gint _tmp79__length1; - guint _tmp80_; - const gchar* _tmp81_; - gchar* _tmp82_; - gchar* _tmp83_; - gchar** _tmp84_; - gint _tmp84__length1; - guint _tmp85_; - gchar* _tmp86_; + gchar** _tmp76_; + gint _tmp76__length1; + guint _tmp77_; + const gchar* _tmp78_; + gchar* _tmp79_; + gchar* _tmp80_; GError* e2; - const gchar* _tmp87_; - GError* _tmp88_; - const gchar* _tmp89_; - GError* _tmp90_; + const gchar* _tmp81_; + GError* _tmp82_; + const gchar* _tmp83_; + GError* _tmp84_; gboolean do_initial_query; gchar* capabilities; - EBookClient* _tmp91_; - gchar* _tmp92_; - const gchar* _tmp93_; - const gchar* _tmp94_; - gchar** _tmp95_; - gchar** _tmp96_; + EBookClient* _tmp85_; + gchar* _tmp86_; + const gchar* _tmp87_; + const gchar* _tmp88_; + gchar** _tmp89_; + gchar** _tmp90_; gchar** caps; gint caps_length1; gint _caps_size_; - gchar** _tmp97_; - gint _tmp97__length1; + gchar** _tmp91_; + gint _tmp91__length1; GError* e4; - const gchar* _tmp98_; - GError* _tmp99_; - const gchar* _tmp100_; - GError* _tmp101_; + const gchar* _tmp92_; + GError* _tmp93_; + const gchar* _tmp94_; + GError* _tmp95_; gboolean got_view; - EBookClient* _tmp102_; + EBookClient* _tmp96_; + const gchar* _tmp97_; + EBookClientView* _tmp98_; + gboolean _tmp99_; + gboolean _tmp100_; + gboolean _tmp101_; + const gchar* _tmp102_; const gchar* _tmp103_; - EBookClientView* _tmp104_; - gboolean _tmp105_; - gboolean _tmp106_; - gboolean _tmp107_; - const gchar* _tmp108_; - const gchar* _tmp109_; - const gchar* _tmp110_; - GError* _tmp111_; - EBookClientView* _tmp112_; - EBookClientView* _tmp113_; - EBookClientView* _tmp114_; - EBookClientView* _tmp115_; + const gchar* _tmp104_; + GError* _tmp105_; + EBookClientView* _tmp106_; + EBookClientView* _tmp107_; + EBookClientView* _tmp108_; + EBookClientView* _tmp109_; + EBookClientView* _tmp110_; GError* e3; + GError* _tmp111_; + GQuark _tmp112_; + GQuark _tmp113_; + GError* _tmp114_; + gint _tmp115_; GError* _tmp116_; GQuark _tmp117_; GQuark _tmp118_; GError* _tmp119_; gint _tmp120_; - GError* _tmp121_; - GQuark _tmp122_; - GQuark _tmp123_; + const gchar* _tmp121_; + const gchar* _tmp122_; + const gchar* _tmp123_; GError* _tmp124_; - gint _tmp125_; + const gchar* _tmp125_; const gchar* _tmp126_; const gchar* _tmp127_; - const gchar* _tmp128_; - GError* _tmp129_; - const gchar* _tmp130_; + GError* _tmp128_; + const gchar* _tmp129_; + GError* _tmp130_; const gchar* _tmp131_; const gchar* _tmp132_; - GError* _tmp133_; - const gchar* _tmp134_; - GError* _tmp135_; - const gchar* _tmp136_; - const gchar* _tmp137_; - const gchar* _tmp138_; - GError* _tmp139_; - const gchar* _tmp140_; - GError* _tmp141_; - gboolean _tmp142_; - gboolean _tmp143_; - gboolean _tmp144_; - gboolean _tmp145_; - gboolean _tmp146_; + const gchar* _tmp133_; + GError* _tmp134_; + const gchar* _tmp135_; + GError* _tmp136_; + gboolean _tmp137_; + gboolean _tmp138_; + gboolean _tmp139_; + gboolean _tmp140_; + gboolean _tmp141_; + GError * _inner_error_; +}; + +struct _EdsfPersonaStoreOpenAddressBookData { + int _state_; + GObject* _source_object_; + GAsyncResult* _res_; + GSimpleAsyncResult* _async_result; + EdsfPersonaStore* self; + GError* err_out; + EBookClient* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + EBookClient* _tmp3_; + gulong _tmp4_; + gulong signal_id; + EBookClient* _tmp5_; + GError* _tmp6_; + GError* _tmp7_; + GError* _tmp8_; + GError* e1; + gboolean _tmp9_; + GError* _tmp10_; + GQuark _tmp11_; + GQuark _tmp12_; + GError* _tmp13_; + gint _tmp14_; + gboolean _tmp15_; + EBookClient* _tmp16_; + const gchar* _tmp17_; + const gchar* _tmp18_; + GError* _tmp19_; + GError* _tmp20_; + GError* _tmp21_; + GError* _tmp22_; + GError* _tmp23_; + GError* _tmp24_; + GError* _tmp25_; + EBookClient* _tmp26_; + gulong _tmp27_; + gboolean _tmp28_; + EBookClient* _tmp29_; + gboolean _tmp30_; + GError* _tmp31_; + gboolean _tmp32_; + GQuark _tmp33_; + const gchar* _tmp34_; + const gchar* _tmp35_; + GError* _tmp36_; GError * _inner_error_; }; @@ -582,33 +624,34 @@ EdsfPersona* persona; gchar* property_name; Block2Data* _data2_; - EdsfPersona* _tmp0_; - EContact* _tmp1_; + EBookClient* _tmp0_; + EdsfPersona* _tmp1_; EContact* _tmp2_; EContact* _tmp3_; + EContact* _tmp4_; EContact* contact; gulong signal_id; guint timeout_id; Block3Data* _data3_; - EdsfPersona* _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; - gulong _tmp7_; - EBookClient* _tmp8_; - EContact* _tmp9_; - guint _tmp10_; - gboolean _tmp11_; + EdsfPersona* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; + gulong _tmp8_; + EBookClient* _tmp9_; + EContact* _tmp10_; + guint _tmp11_; gboolean _tmp12_; - const gchar* _tmp13_; + gboolean _tmp13_; const gchar* _tmp14_; - GError* _tmp15_; + const gchar* _tmp15_; + GError* _tmp16_; GError* e; - const gchar* _tmp16_; - GError* _tmp17_; + const gchar* _tmp17_; GError* _tmp18_; - EdsfPersona* _tmp19_; - gulong _tmp20_; - guint _tmp21_; + GError* _tmp19_; + EdsfPersona* _tmp20_; + gulong _tmp21_; + guint _tmp22_; GError * _inner_error_; }; @@ -685,47 +728,42 @@ GeeMultiMap* web_service_addresses; EContact* _tmp0_; EVCardAttribute* _tmp1_; - EVCardAttribute* attr; - EVCardAttribute* _tmp2_; - EContact* _tmp3_; - EVCardAttribute* _tmp4_; - EVCardAttribute* _tmp5_; EVCardAttribute* attr_n; - GeeMultiMap* _tmp6_; - GeeSet* _tmp7_; - GeeSet* _tmp8_; - GeeIterator* _tmp9_; - GeeIterator* _tmp10_; + GeeMultiMap* _tmp2_; + GeeSet* _tmp3_; + GeeSet* _tmp4_; + GeeIterator* _tmp5_; + GeeIterator* _tmp6_; GeeIterator* _service_it; - GeeIterator* _tmp11_; - gboolean _tmp12_; - GeeIterator* _tmp13_; - gpointer _tmp14_; + GeeIterator* _tmp7_; + gboolean _tmp8_; + GeeIterator* _tmp9_; + gpointer _tmp10_; gchar* service; - const gchar* _tmp15_; - EVCardAttributeParam* _tmp16_; + const gchar* _tmp11_; + EVCardAttributeParam* _tmp12_; EVCardAttributeParam* param; - GeeMultiMap* _tmp17_; - const gchar* _tmp18_; - GeeCollection* _tmp19_; - GeeCollection* _tmp20_; - GeeIterator* _tmp21_; - GeeIterator* _tmp22_; + GeeMultiMap* _tmp13_; + const gchar* _tmp14_; + GeeCollection* _tmp15_; + GeeCollection* _tmp16_; + GeeIterator* _tmp17_; + GeeIterator* _tmp18_; GeeIterator* _ws_fd_it; - GeeIterator* _tmp23_; - gboolean _tmp24_; - GeeIterator* _tmp25_; - gpointer _tmp26_; + GeeIterator* _tmp19_; + gboolean _tmp20_; + GeeIterator* _tmp21_; + gpointer _tmp22_; FolksWebServiceFieldDetails* ws_fd; - EVCardAttributeParam* _tmp27_; - FolksWebServiceFieldDetails* _tmp28_; - gconstpointer _tmp29_; - const gchar* _tmp30_; + EVCardAttributeParam* _tmp23_; + FolksWebServiceFieldDetails* _tmp24_; + gconstpointer _tmp25_; + const gchar* _tmp26_; + EVCardAttribute* _tmp27_; + EVCardAttributeParam* _tmp28_; + EVCardAttributeParam* _tmp29_; + EContact* _tmp30_; EVCardAttribute* _tmp31_; - EVCardAttributeParam* _tmp32_; - EVCardAttributeParam* _tmp33_; - EContact* _tmp34_; - EVCardAttribute* _tmp35_; }; struct _EdsfPersonaStoreSetUrlsData { @@ -879,24 +917,19 @@ GeeSet* local_ids; EContact* _tmp0_; EVCardAttribute* _tmp1_; - EVCardAttribute* attr; - EVCardAttribute* _tmp2_; - EContact* _tmp3_; - EVCardAttribute* _tmp4_; - EVCardAttribute* _tmp5_; EVCardAttribute* new_attr; - GeeSet* _tmp6_; - GeeIterator* _tmp7_; + GeeSet* _tmp2_; + GeeIterator* _tmp3_; GeeIterator* _local_id_it; - GeeIterator* _tmp8_; - gboolean _tmp9_; - GeeIterator* _tmp10_; - gpointer _tmp11_; + GeeIterator* _tmp4_; + gboolean _tmp5_; + GeeIterator* _tmp6_; + gpointer _tmp7_; gchar* local_id; - EVCardAttribute* _tmp12_; - const gchar* _tmp13_; - EContact* _tmp14_; - EVCardAttribute* _tmp15_; + EVCardAttribute* _tmp8_; + const gchar* _tmp9_; + EContact* _tmp10_; + EVCardAttribute* _tmp11_; }; struct _EdsfPersonaStoreSetIsFavouriteData { @@ -928,17 +961,12 @@ EContact* contact; gboolean is_favourite; EContact* _tmp0_; - EVCardAttribute* _tmp1_; - EVCardAttribute* attr; + gboolean _tmp1_; EVCardAttribute* _tmp2_; - EContact* _tmp3_; - EVCardAttribute* _tmp4_; - gboolean _tmp5_; - EVCardAttribute* _tmp6_; EVCardAttribute* new_attr; - EVCardAttribute* _tmp7_; - EContact* _tmp8_; - EVCardAttribute* _tmp9_; + EVCardAttribute* _tmp3_; + EContact* _tmp4_; + EVCardAttribute* _tmp5_; }; struct _EdsfPersonaStoreSetContactAvatarData { @@ -951,65 +979,57 @@ GLoadableIcon* avatar; GLoadableIcon* _tmp0_; EContact* _tmp1_; - EVCardAttribute* _tmp2_; - EVCardAttribute* attr; - EVCardAttribute* _tmp3_; - EContact* _tmp4_; - EVCardAttribute* _tmp5_; - EContactPhoto* _tmp6_; + EContactPhoto* _tmp2_; EContactPhoto* cp; - EContactPhoto* _tmp7_; - GLoadableIcon* _tmp8_; - GInputStream* _tmp9_; + EContactPhoto* _tmp3_; + GLoadableIcon* _tmp4_; + GInputStream* _tmp5_; GInputStream* input_s; - guint8* _tmp10_; + guint8* _tmp6_; guint8* image_data; gint image_data_length1; gint _image_data_size_; - guint8* _tmp11_; + guint8* _tmp7_; guint8* buffer; gint buffer_length1; gint _buffer_size_; - GInputStream* _tmp12_; - guint8* _tmp13_; - gint _tmp13__length1; - gssize _tmp14_; + GInputStream* _tmp8_; + guint8* _tmp9_; + gint _tmp9__length1; + gssize _tmp10_; gssize size_read; - gssize _tmp15_; + gssize _tmp11_; + guint8* _tmp12_; + gint _tmp12__length1; + gint read_cur; + gint _tmp13_; + gssize _tmp14_; + gint _tmp15_; guint8* _tmp16_; gint _tmp16__length1; - gint read_cur; gint _tmp17_; - gssize _tmp18_; - gint _tmp19_; - guint8* _tmp20_; - gint _tmp20__length1; - gint _tmp21_; + guint8* _tmp18_; + gint _tmp18__length1; + gssize _tmp19_; + EContactPhoto* _tmp20_; + guint8* _tmp21_; + gint _tmp21__length1; + gboolean uncertain; guint8* _tmp22_; gint _tmp22__length1; - gssize _tmp23_; - EContactPhoto* _tmp24_; - guint8* _tmp25_; - gint _tmp25__length1; - gboolean uncertain; - guint8* _tmp26_; - gint _tmp26__length1; - gboolean _tmp27_; - gchar* _tmp28_; + gboolean _tmp23_; + gchar* _tmp24_; gchar* mime_type; - gboolean _tmp29_; - const gchar* _tmp30_; - gboolean _tmp31_; - gboolean _tmp32_; - EContactPhoto* _tmp33_; - const gchar* _tmp34_; - EContact* _tmp35_; - EContactPhoto* _tmp36_; + gboolean _tmp25_; + EContactPhoto* _tmp26_; + const gchar* _tmp27_; + EContact* _tmp28_; + EContactPhoto* _tmp29_; GError* e1; - const gchar* _tmp37_; - GError* _tmp38_; - const gchar* _tmp39_; - GError* _tmp40_; + const gchar* _tmp30_; + GError* _tmp31_; + const gchar* _tmp32_; + GError* _tmp33_; GError * _inner_error_; }; @@ -1192,16 +1212,19 @@ const gchar* _tmp1_; GError* _tmp2_; const gchar* _tmp3_; - EdsfPersona* _tmp4_; + gchar* _tmp4_; + gchar* _full_name; const gchar* _tmp5_; - const gchar* _tmp6_; + EdsfPersona* _tmp6_; const gchar* _tmp7_; - EdsfPersona* _tmp8_; - EContact* _tmp9_; - EContact* _tmp10_; - EContactField _tmp11_; - const gchar* _tmp12_; - EdsfPersona* _tmp13_; + const gchar* _tmp8_; + const gchar* _tmp9_; + EdsfPersona* _tmp10_; + EContact* _tmp11_; + EContact* _tmp12_; + EContactField _tmp13_; + const gchar* _tmp14_; + EdsfPersona* _tmp15_; GError * _inner_error_; }; @@ -1218,16 +1241,19 @@ const gchar* _tmp1_; GError* _tmp2_; const gchar* _tmp3_; - EdsfPersona* _tmp4_; + gchar* _tmp4_; + gchar* _nickname; const gchar* _tmp5_; - const gchar* _tmp6_; + EdsfPersona* _tmp6_; const gchar* _tmp7_; - EdsfPersona* _tmp8_; - EContact* _tmp9_; - EContact* _tmp10_; - EContactField _tmp11_; - const gchar* _tmp12_; - EdsfPersona* _tmp13_; + const gchar* _tmp8_; + const gchar* _tmp9_; + EdsfPersona* _tmp10_; + EContact* _tmp11_; + EContact* _tmp12_; + EContactField _tmp13_; + const gchar* _tmp14_; + EdsfPersona* _tmp15_; GError * _inner_error_; }; @@ -1328,22 +1354,28 @@ GSimpleAsyncResult* _async_result; EdsfPersonaStore* self; EContact* contact; + GDateTime* _bday; + EContactDate* _contact_bday; + GDateTime* _tmp0_; + GDateTime* _tmp1_; + GDateTime* _tmp2_; GDateTime* bday; EContactDate* contact_bday; - GDateTime* _tmp0_; - EContactDate* _tmp1_; - EContactDate* _tmp2_; - GDateTime* _tmp3_; - gint _tmp4_; - EContactDate* _tmp5_; - GDateTime* _tmp6_; - gint _tmp7_; - EContactDate* _tmp8_; - GDateTime* _tmp9_; - gint _tmp10_; - EContact* _tmp11_; - EContactField _tmp12_; + EContactDate* _tmp3_; + EContactDate* _tmp4_; + GDateTime* _tmp5_; + gint _tmp6_; + EContactDate* _tmp7_; + GDateTime* _tmp8_; + gint _tmp9_; + EContactDate* _tmp10_; + GDateTime* _tmp11_; + gint _tmp12_; EContactDate* _tmp13_; + EContactDate* _tmp14_; + EContact* _tmp15_; + EContactField _tmp16_; + EContactDate* _tmp17_; }; struct _EdsfPersonaStoreSetRolesData { @@ -1589,20 +1621,29 @@ const gchar* _tmp1_; GError* _tmp2_; gboolean _tmp3_; - EdsfPersona* _tmp4_; - FolksStructuredName* _tmp5_; + gboolean _tmp4_; + EdsfPersona* _tmp5_; FolksStructuredName* _tmp6_; - EdsfPersona* _tmp7_; + FolksStructuredName* _tmp7_; FolksStructuredName* _tmp8_; - FolksStructuredName* _tmp9_; - FolksStructuredName* _tmp10_; - gboolean _tmp11_; - gboolean _tmp12_; - EdsfPersona* _tmp13_; - EContact* _tmp14_; - EContact* _tmp15_; - FolksStructuredName* _tmp16_; + gboolean _tmp9_; + EdsfPersona* _tmp10_; + FolksStructuredName* _tmp11_; + FolksStructuredName* _tmp12_; + FolksStructuredName* _tmp13_; + gboolean _tmp14_; + gboolean _tmp15_; + gboolean _tmp16_; EdsfPersona* _tmp17_; + FolksStructuredName* _tmp18_; + FolksStructuredName* _tmp19_; + FolksStructuredName* _tmp20_; + gboolean _tmp21_; + EdsfPersona* _tmp22_; + EContact* _tmp23_; + EContact* _tmp24_; + FolksStructuredName* _tmp25_; + EdsfPersona* _tmp26_; GError * _inner_error_; }; @@ -1613,38 +1654,41 @@ GSimpleAsyncResult* _async_result; EdsfPersonaStore* self; EContact* contact; - FolksStructuredName* sname; + FolksStructuredName* _sname; EContactName* _tmp0_; EContactName* contact_name; FolksStructuredName* _tmp1_; - EContactName* _tmp2_; + FolksStructuredName* _tmp2_; FolksStructuredName* _tmp3_; - const gchar* _tmp4_; - const gchar* _tmp5_; - gchar* _tmp6_; - EContactName* _tmp7_; - FolksStructuredName* _tmp8_; - const gchar* _tmp9_; - const gchar* _tmp10_; - gchar* _tmp11_; - EContactName* _tmp12_; - FolksStructuredName* _tmp13_; - const gchar* _tmp14_; - const gchar* _tmp15_; - gchar* _tmp16_; - EContactName* _tmp17_; - FolksStructuredName* _tmp18_; - const gchar* _tmp19_; - const gchar* _tmp20_; - gchar* _tmp21_; - EContactName* _tmp22_; - FolksStructuredName* _tmp23_; - const gchar* _tmp24_; - const gchar* _tmp25_; - gchar* _tmp26_; - EContact* _tmp27_; - EContactField _tmp28_; - EContactName* _tmp29_; + FolksStructuredName* sname; + EContactName* _tmp4_; + FolksStructuredName* _tmp5_; + const gchar* _tmp6_; + const gchar* _tmp7_; + gchar* _tmp8_; + EContactName* _tmp9_; + FolksStructuredName* _tmp10_; + const gchar* _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; + EContactName* _tmp14_; + FolksStructuredName* _tmp15_; + const gchar* _tmp16_; + const gchar* _tmp17_; + gchar* _tmp18_; + EContactName* _tmp19_; + FolksStructuredName* _tmp20_; + const gchar* _tmp21_; + const gchar* _tmp22_; + gchar* _tmp23_; + EContactName* _tmp24_; + FolksStructuredName* _tmp25_; + const gchar* _tmp26_; + const gchar* _tmp27_; + gchar* _tmp28_; + EContact* _tmp29_; + EContactField _tmp30_; + EContactName* _tmp31_; }; struct _EdsfPersonaStoreSetImFdsData { @@ -1813,19 +1857,14 @@ FolksGender gender; EContact* _tmp0_; EVCardAttribute* _tmp1_; - EVCardAttribute* attr; - EVCardAttribute* _tmp2_; - EContact* _tmp3_; - EVCardAttribute* _tmp4_; - EVCardAttribute* _tmp5_; EVCardAttribute* new_attr; - FolksGender _tmp6_; - EVCardAttribute* _tmp7_; - EContact* _tmp8_; - EVCardAttribute* _tmp9_; - EVCardAttribute* _tmp10_; - EContact* _tmp11_; - EVCardAttribute* _tmp12_; + FolksGender _tmp2_; + EVCardAttribute* _tmp3_; + EContact* _tmp4_; + EVCardAttribute* _tmp5_; + EVCardAttribute* _tmp6_; + EContact* _tmp7_; + EVCardAttribute* _tmp8_; }; @@ -1858,6 +1897,10 @@ static void __edsf_persona_store_contacts_removed_cb_e_book_client_view_objects_removed (EBookClientView* _sender, GList* object, gpointer self); static void _edsf_persona_store_contacts_changed_cb (EdsfPersonaStore* self, GList* contacts); static void __edsf_persona_store_contacts_changed_cb_e_book_client_view_objects_modified (EBookClientView* _sender, GList* object, gpointer self); +static void _edsf_persona_store_contacts_complete_cb (EdsfPersonaStore* self, GError* err); +static void __edsf_persona_store_contacts_complete_cb_e_book_client_view_complete (EBookClientView* _sender, GError* _error_, gpointer self); +static gboolean _edsf_persona_store_address_book_authenticate_cb (EdsfPersonaStore* self, EClient* address_book, void* credentials); +static gboolean __edsf_persona_store_address_book_authenticate_cb_e_client_authenticate (EClient* _sender, void* credentials, gpointer self); static void _edsf_persona_store_address_book_notify_read_only_cb (EdsfPersonaStore* self, GObject* address_book, GParamSpec* pspec); static void __edsf_persona_store_address_book_notify_read_only_cb_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); static void _edsf_persona_store_source_list_changed_cb (EdsfPersonaStore* self, ESourceList* list); @@ -1869,18 +1912,16 @@ static void edsf_persona_store_real_add_persona_from_details_data_free (gpointer _data); static void edsf_persona_store_real_add_persona_from_details (FolksPersonaStore* base, GHashTable* details, GAsyncReadyCallback _callback_, gpointer _user_data_); static gboolean edsf_persona_store_real_add_persona_from_details_co (EdsfPersonaStoreAddPersonaFromDetailsData* _data_); -static GValue* _g_value_dup (GValue* self); static void _edsf_persona_store_set_contact_attributes_string (EdsfPersonaStore* self, EContact* contact, GeeSet* new_attributes, const gchar* attrib_name, EContactField field_id, GAsyncReadyCallback _callback_, gpointer _user_data_); static void _edsf_persona_store_set_contact_attributes_string_finish (EdsfPersonaStore* self, GAsyncResult* _res_); static void edsf_persona_store_add_persona_from_details_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); static void _edsf_persona_store_set_contact_avatar (EdsfPersonaStore* self, EContact* contact, GLoadableIcon* avatar, GAsyncReadyCallback _callback_, gpointer _user_data_); static void _edsf_persona_store_set_contact_avatar_finish (EdsfPersonaStore* self, GAsyncResult* _res_, GError** error); -static void _vala_GValue_free (GValue* self); static void _edsf_persona_store_set_contact_im_fds (EdsfPersonaStore* self, EContact* contact, GeeMultiMap* im_fds, GAsyncReadyCallback _callback_, gpointer _user_data_); static void _edsf_persona_store_set_contact_im_fds_finish (EdsfPersonaStore* self, GAsyncResult* _res_); static void _edsf_persona_store_set_contact_postal_addresses (EdsfPersonaStore* self, EContact* contact, GeeSet* postal_fds, GAsyncReadyCallback _callback_, gpointer _user_data_); static void _edsf_persona_store_set_contact_postal_addresses_finish (EdsfPersonaStore* self, GAsyncResult* _res_); -static void _edsf_persona_store_set_contact_name (EdsfPersonaStore* self, EContact* contact, FolksStructuredName* sname, GAsyncReadyCallback _callback_, gpointer _user_data_); +static void _edsf_persona_store_set_contact_name (EdsfPersonaStore* self, EContact* contact, FolksStructuredName* _sname, GAsyncReadyCallback _callback_, gpointer _user_data_); static void _edsf_persona_store_set_contact_name_finish (EdsfPersonaStore* self, GAsyncResult* _res_); static void _edsf_persona_store_set_contact_local_ids (EdsfPersonaStore* self, EContact* contact, GeeSet* local_ids, GAsyncReadyCallback _callback_, gpointer _user_data_); static void _edsf_persona_store_set_contact_local_ids_finish (EdsfPersonaStore* self, GAsyncResult* _res_); @@ -1892,7 +1933,7 @@ static void _edsf_persona_store_set_contact_gender_finish (EdsfPersonaStore* self, GAsyncResult* _res_); static void _edsf_persona_store_set_contact_urls (EdsfPersonaStore* self, EContact* contact, GeeSet* urls, GAsyncReadyCallback _callback_, gpointer _user_data_); static void _edsf_persona_store_set_contact_urls_finish (EdsfPersonaStore* self, GAsyncResult* _res_); -static void _edsf_persona_store_set_contact_birthday (EdsfPersonaStore* self, EContact* contact, GDateTime* bday, GAsyncReadyCallback _callback_, gpointer _user_data_); +static void _edsf_persona_store_set_contact_birthday (EdsfPersonaStore* self, EContact* contact, GDateTime* _bday, GAsyncReadyCallback _callback_, gpointer _user_data_); static void _edsf_persona_store_set_contact_birthday_finish (EdsfPersonaStore* self, GAsyncResult* _res_); static void _edsf_persona_store_set_contact_roles (EdsfPersonaStore* self, EContact* contact, GeeSet* roles, GAsyncReadyCallback _callback_, gpointer _user_data_); static void _edsf_persona_store_set_contact_roles_finish (EdsfPersonaStore* self, GAsyncResult* _res_); @@ -1910,9 +1951,16 @@ static void edsf_persona_store_real_prepare (FolksPersonaStore* base, GAsyncReadyCallback _callback_, gpointer _user_data_); static gboolean edsf_persona_store_real_prepare_co (EdsfPersonaStorePrepareData* _data_); ESource* edsf_persona_store_get_source (EdsfPersonaStore* self); +static void _edsf_persona_store_open_address_book (EdsfPersonaStore* self, GAsyncReadyCallback _callback_, gpointer _user_data_); +static void _edsf_persona_store_open_address_book_finish (EdsfPersonaStore* self, GAsyncResult* _res_, GError** error); static void edsf_persona_store_prepare_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); static FolksPersonaDetail _edsf_persona_store_eds_field_name_to_folks_persona_detail (EdsfPersonaStore* self, const gchar* eds_field_name); static gboolean _vala_string_array_contains (gchar** stack, int stack_length, gchar* needle); +static void _edsf_persona_store_open_address_book_data_free (gpointer _data); +static gboolean _edsf_persona_store_open_address_book_co (EdsfPersonaStoreOpenAddressBookData* _data_); +static void _edsf_persona_store_address_book_opened_cb (EdsfPersonaStore* self, GError* err, EBookClient* address_book); +static void _edsf_persona_store_open_address_book_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); +static gboolean __edsf_persona_store_open_address_book_co_gsource_func (gpointer self); static void _edsf_persona_store_commit_modified_property_data_free (gpointer _data); static void _edsf_persona_store_commit_modified_property (EdsfPersonaStore* self, EdsfPersona* persona, const gchar* property_name, GAsyncReadyCallback _callback_, gpointer _user_data_); static void _edsf_persona_store_commit_modified_property_finish (EdsfPersonaStore* self, GAsyncResult* _res_, GError** error); @@ -1921,12 +1969,13 @@ static void block2_data_unref (Block2Data* _data2_); static Block3Data* block3_data_ref (Block3Data* _data3_); static void block3_data_unref (Block3Data* _data3_); -static void ___lambda5_ (Block3Data* _data3_, GObject* obj, GParamSpec* pspec); -static void ____lambda5__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void ___lambda6_ (Block3Data* _data3_, GObject* obj, GParamSpec* pspec); +static void ____lambda6__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); static void _edsf_persona_store_commit_modified_property_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); -static gboolean ___lambda6_ (Block3Data* _data3_); -static gboolean ____lambda6__gsource_func (gpointer self); +static gboolean ___lambda7_ (Block3Data* _data3_); +static gboolean ____lambda7__gsource_func (gpointer self); static GError* edsf_persona_store_e_client_error_to_property_error (EdsfPersonaStore* self, const gchar* property_name, GError* error_in); +static void _edsf_persona_store_remove_attribute (EdsfPersonaStore* self, EContact* contact, const gchar* attr_name); static void _edsf_persona_store_set_avatar_data_free (gpointer _data); void _edsf_persona_store_set_avatar (EdsfPersonaStore* self, EdsfPersona* persona, GLoadableIcon* avatar, GAsyncReadyCallback _callback_, gpointer _user_data_); void _edsf_persona_store_set_avatar_finish (EdsfPersonaStore* self, GAsyncResult* _res_, GError** error); @@ -2027,6 +2076,7 @@ static void _edsf_persona_store_set_contact_birthday_data_free (gpointer _data); static gboolean _edsf_persona_store_set_contact_birthday_co (EdsfPersonaStoreSetContactBirthdayData* _data_); static void _vala_EContactDate_free (EContactDate* self); +static EContactDate* _vala_EContactDate_copy (EContactDate* self); static void _edsf_persona_store_set_roles_data_free (gpointer _data); void _edsf_persona_store_set_roles (EdsfPersonaStore* self, EdsfPersona* persona, GeeSet* roles, GAsyncReadyCallback _callback_, gpointer _user_data_); void _edsf_persona_store_set_roles_finish (EdsfPersonaStore* self, GAsyncResult* _res_, GError** error); @@ -2103,6 +2153,18 @@ } +static void __edsf_persona_store_contacts_complete_cb_e_book_client_view_complete (EBookClientView* _sender, GError* _error_, gpointer self) { + _edsf_persona_store_contacts_complete_cb (self, _error_); +} + + +static gboolean __edsf_persona_store_address_book_authenticate_cb_e_client_authenticate (EClient* _sender, void* credentials, gpointer self) { + gboolean result; + result = _edsf_persona_store_address_book_authenticate_cb (self, _sender, credentials); + return result; +} + + static void __edsf_persona_store_address_book_notify_read_only_cb_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { _edsf_persona_store_address_book_notify_read_only_cb (self, _sender, pspec); } @@ -2232,16 +2294,6 @@ * * @since 0.6.0 */ -static GValue* _g_value_dup (GValue* self) { - return g_boxed_copy (G_TYPE_VALUE, self); -} - - -static gpointer __g_value_dup0 (gpointer self) { - return self ? _g_value_dup (self) : NULL; -} - - static void edsf_persona_store_add_persona_from_details_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { EdsfPersonaStoreAddPersonaFromDetailsData* _data_; _data_ = _user_data_; @@ -2251,12 +2303,6 @@ } -static void _vala_GValue_free (GValue* self) { - g_value_unset (self); - g_free (self); -} - - static gpointer _g_date_time_ref0 (gpointer self) { return self ? g_date_time_ref (self) : NULL; } @@ -2300,341 +2346,349 @@ g_assert_not_reached (); } _state_0: - _data_->_tmp0_ = e_contact_new (); - _data_->contact = _data_->_tmp0_; - _data_->_tmp1_ = _data_->details; - _data_->_tmp2_ = NULL; - _data_->_tmp2_ = g_hash_table_get_keys (_data_->_tmp1_); - { - _data_->k_collection = _data_->_tmp2_; - for (_data_->k_it = _data_->k_collection; _data_->k_it != NULL; _data_->k_it = _data_->k_it->next) { - _data_->k = (const gchar*) _data_->k_it->data; - { - _data_->_tmp3_ = _data_->details; - _data_->_tmp4_ = _data_->k; - _data_->_tmp5_ = NULL; - _data_->_tmp5_ = g_hash_table_lookup (_data_->_tmp3_, _data_->_tmp4_); - _data_->_tmp6_ = __g_value_dup0 ((GValue*) _data_->_tmp5_); - _data_->v = _data_->_tmp6_; - _data_->_tmp7_ = _data_->k; - _data_->_tmp8_ = NULL; - _data_->_tmp8_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_FULL_NAME); - if (g_strcmp0 (_data_->_tmp7_, _data_->_tmp8_) == 0) { - _data_->_tmp9_ = _data_->v; - _data_->_tmp10_ = NULL; - _data_->_tmp10_ = g_value_get_string (_data_->_tmp9_); - _data_->_tmp11_ = g_strdup (_data_->_tmp10_); - _data_->full_name = _data_->_tmp11_; - _data_->_tmp12_ = _data_->full_name; - if (g_strcmp0 (_data_->_tmp12_, "") == 0) { - _g_free0 (_data_->full_name); - _data_->full_name = NULL; + _data_->_tmp0_ = _data_->self->priv->_is_prepared; + if (!_data_->_tmp0_) { + _data_->_tmp1_ = g_error_new_literal (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_STORE_OFFLINE, "Persona store has not yet been prepared."); + _data_->_inner_error_ = _data_->_tmp1_; + if (_data_->_inner_error_->domain == FOLKS_PERSONA_STORE_ERROR) { + g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); + g_error_free (_data_->_inner_error_); + if (_data_->_state_ == 0) { + g_simple_async_result_complete_in_idle (_data_->_async_result); + } else { + g_simple_async_result_complete (_data_->_async_result); + } + g_object_unref (_data_->_async_result); + return FALSE; + } else { + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); + g_clear_error (&_data_->_inner_error_); + return FALSE; + } + } + _data_->_tmp2_ = e_contact_new (); + _data_->contact = _data_->_tmp2_; + _data_->_tmp3_ = _data_->details; + g_hash_table_iter_init (&_data_->iter, _data_->_tmp3_); + while (TRUE) { + _data_->_tmp4_ = NULL; + _data_->_tmp5_ = NULL; + _data_->_tmp6_ = FALSE; + _data_->_tmp6_ = g_hash_table_iter_next (&_data_->iter, &_data_->_tmp4_, &_data_->_tmp5_); + _data_->k = _data_->_tmp4_; + _data_->_v = _data_->_tmp5_; + if (!(_data_->_tmp6_ == TRUE)) { + break; + } + _data_->_tmp7_ = _data_->_v; + if (_data_->_tmp7_ == NULL) { + continue; + } + _data_->_tmp8_ = _data_->_v; + _data_->v = (GValue) (*_data_->_tmp8_); + _data_->_tmp9_ = _data_->k; + _data_->_tmp10_ = NULL; + _data_->_tmp10_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_FULL_NAME); + if (g_strcmp0 (_data_->_tmp9_, _data_->_tmp10_) == 0) { + _data_->_tmp11_ = NULL; + _data_->_tmp11_ = g_value_get_string (&_data_->v); + _data_->_tmp12_ = g_strdup (_data_->_tmp11_); + _data_->full_name = _data_->_tmp12_; + _data_->_tmp14_ = _data_->full_name; + if (_data_->_tmp14_ != NULL) { + _data_->_tmp15_ = _data_->full_name; + _data_->_tmp13_ = g_strcmp0 ((const gchar*) _data_->_tmp15_, "") == 0; + } else { + _data_->_tmp13_ = FALSE; + } + _data_->_tmp16_ = _data_->_tmp13_; + if (_data_->_tmp16_) { + _g_free0 (_data_->full_name); + _data_->full_name = NULL; + } + _data_->_tmp17_ = _data_->contact; + _data_->_tmp18_ = 0; + _data_->_tmp18_ = e_contact_field_id ("full_name"); + _data_->_tmp19_ = _data_->full_name; + e_contact_set (_data_->_tmp17_, _data_->_tmp18_, _data_->_tmp19_); + _g_free0 (_data_->full_name); + } else { + _data_->_tmp20_ = _data_->k; + _data_->_tmp21_ = NULL; + _data_->_tmp21_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_EMAIL_ADDRESSES); + if (g_strcmp0 (_data_->_tmp20_, _data_->_tmp21_) == 0) { + _data_->_tmp22_ = NULL; + _data_->_tmp22_ = g_value_get_object (&_data_->v); + _data_->_tmp23_ = _g_object_ref0 (GEE_SET (_data_->_tmp22_)); + _data_->email_addresses = _data_->_tmp23_; + _data_->_tmp24_ = _data_->contact; + _data_->_tmp25_ = _data_->email_addresses; + _data_->_state_ = 1; + _edsf_persona_store_set_contact_attributes_string (_data_->self, _data_->_tmp24_, _data_->_tmp25_, "EMAIL", E_CONTACT_EMAIL, edsf_persona_store_add_persona_from_details_ready, _data_); + return FALSE; + _state_1: + _edsf_persona_store_set_contact_attributes_string_finish (_data_->self, _data_->_res_); + _g_object_unref0 (_data_->email_addresses); + } else { + _data_->_tmp26_ = _data_->k; + _data_->_tmp27_ = NULL; + _data_->_tmp27_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_AVATAR); + if (g_strcmp0 (_data_->_tmp26_, _data_->_tmp27_) == 0) { + { + _data_->_tmp28_ = NULL; + _data_->_tmp28_ = g_value_get_object (&_data_->v); + _data_->_tmp29_ = _g_object_ref0 (G_LOADABLE_ICON (_data_->_tmp28_)); + _data_->avatar = _data_->_tmp29_; + _data_->_tmp30_ = _data_->contact; + _data_->_tmp31_ = _data_->avatar; + _data_->_state_ = 2; + _edsf_persona_store_set_contact_avatar (_data_->self, _data_->_tmp30_, _data_->_tmp31_, edsf_persona_store_add_persona_from_details_ready, _data_); + return FALSE; + _state_2: + _edsf_persona_store_set_contact_avatar_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); + if (_data_->_inner_error_ != NULL) { + _g_object_unref0 (_data_->avatar); + if (_data_->_inner_error_->domain == FOLKS_PROPERTY_ERROR) { + goto __catch6_folks_property_error; + } + _g_object_unref0 (_data_->avatar); + _g_object_unref0 (_data_->contact); + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); + g_clear_error (&_data_->_inner_error_); + return FALSE; + } + _g_object_unref0 (_data_->avatar); + } + goto __finally6; + __catch6_folks_property_error: + { + _data_->e1 = _data_->_inner_error_; + _data_->_inner_error_ = NULL; + _data_->_tmp32_ = _data_->e1; + _data_->_tmp33_ = _data_->_tmp32_->message; + g_warning ("edsf-persona-store.vala:351: Couldn't set avatar on the EContact: %s", _data_->_tmp33_); + _g_error_free0 (_data_->e1); + } + __finally6: + if (_data_->_inner_error_ != NULL) { + if (_data_->_inner_error_->domain == FOLKS_PERSONA_STORE_ERROR) { + g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); + g_error_free (_data_->_inner_error_); + _g_object_unref0 (_data_->contact); + if (_data_->_state_ == 0) { + g_simple_async_result_complete_in_idle (_data_->_async_result); + } else { + g_simple_async_result_complete (_data_->_async_result); + } + g_object_unref (_data_->_async_result); + return FALSE; + } else { + _g_object_unref0 (_data_->contact); + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); + g_clear_error (&_data_->_inner_error_); + return FALSE; + } } - _data_->_tmp13_ = _data_->contact; - _data_->_tmp14_ = 0; - _data_->_tmp14_ = e_contact_field_id ("full_name"); - _data_->_tmp15_ = _data_->full_name; - e_contact_set (_data_->_tmp13_, _data_->_tmp14_, _data_->_tmp15_); - _g_free0 (_data_->full_name); } else { - _data_->_tmp16_ = _data_->k; - _data_->_tmp17_ = NULL; - _data_->_tmp17_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_EMAIL_ADDRESSES); - if (g_strcmp0 (_data_->_tmp16_, _data_->_tmp17_) == 0) { - _data_->_tmp18_ = _data_->v; - _data_->_tmp19_ = NULL; - _data_->_tmp19_ = g_value_get_object (_data_->_tmp18_); - _data_->_tmp20_ = _g_object_ref0 (GEE_SET (_data_->_tmp19_)); - _data_->email_addresses = _data_->_tmp20_; - _data_->_tmp21_ = _data_->contact; - _data_->_tmp22_ = _data_->email_addresses; - _data_->_state_ = 1; - _edsf_persona_store_set_contact_attributes_string (_data_->self, _data_->_tmp21_, _data_->_tmp22_, "EMAIL", E_CONTACT_EMAIL, edsf_persona_store_add_persona_from_details_ready, _data_); + _data_->_tmp34_ = _data_->k; + _data_->_tmp35_ = NULL; + _data_->_tmp35_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_IM_ADDRESSES); + if (g_strcmp0 (_data_->_tmp34_, _data_->_tmp35_) == 0) { + _data_->_tmp36_ = NULL; + _data_->_tmp36_ = g_value_get_object (&_data_->v); + _data_->_tmp37_ = _g_object_ref0 (GEE_MULTI_MAP (_data_->_tmp36_)); + _data_->im_fds = _data_->_tmp37_; + _data_->_tmp38_ = _data_->contact; + _data_->_tmp39_ = _data_->im_fds; + _data_->_state_ = 3; + _edsf_persona_store_set_contact_im_fds (_data_->self, _data_->_tmp38_, _data_->_tmp39_, edsf_persona_store_add_persona_from_details_ready, _data_); return FALSE; - _state_1: - _edsf_persona_store_set_contact_attributes_string_finish (_data_->self, _data_->_res_); - _g_object_unref0 (_data_->email_addresses); + _state_3: + _edsf_persona_store_set_contact_im_fds_finish (_data_->self, _data_->_res_); + _g_object_unref0 (_data_->im_fds); } else { - _data_->_tmp23_ = _data_->k; - _data_->_tmp24_ = NULL; - _data_->_tmp24_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_AVATAR); - if (g_strcmp0 (_data_->_tmp23_, _data_->_tmp24_) == 0) { - { - _data_->_tmp25_ = _data_->v; - _data_->_tmp26_ = NULL; - _data_->_tmp26_ = g_value_get_object (_data_->_tmp25_); - _data_->_tmp27_ = _g_object_ref0 (G_LOADABLE_ICON (_data_->_tmp26_)); - _data_->avatar = _data_->_tmp27_; - _data_->_tmp28_ = _data_->contact; - _data_->_tmp29_ = _data_->avatar; - _data_->_state_ = 2; - _edsf_persona_store_set_contact_avatar (_data_->self, _data_->_tmp28_, _data_->_tmp29_, edsf_persona_store_add_persona_from_details_ready, _data_); - return FALSE; - _state_2: - _edsf_persona_store_set_contact_avatar_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); - if (_data_->_inner_error_ != NULL) { - _g_object_unref0 (_data_->avatar); - if (_data_->_inner_error_->domain == FOLKS_PROPERTY_ERROR) { - goto __catch6_folks_property_error; - } - _g_object_unref0 (_data_->avatar); - __vala_GValue_free0 (_data_->v); - _g_list_free0 (_data_->k_collection); - _g_object_unref0 (_data_->contact); - g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); - g_clear_error (&_data_->_inner_error_); - return FALSE; - } - _g_object_unref0 (_data_->avatar); - } - goto __finally6; - __catch6_folks_property_error: - { - _data_->e1 = _data_->_inner_error_; - _data_->_inner_error_ = NULL; - _data_->_tmp30_ = _data_->e1; - _data_->_tmp31_ = _data_->_tmp30_->message; - g_warning ("edsf-persona-store.vala:328: Couldn't set avatar on the EContact: %s", _data_->_tmp31_); - _g_error_free0 (_data_->e1); - } - __finally6: - if (_data_->_inner_error_ != NULL) { - if (_data_->_inner_error_->domain == FOLKS_PERSONA_STORE_ERROR) { - g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); - g_error_free (_data_->_inner_error_); - __vala_GValue_free0 (_data_->v); - _g_list_free0 (_data_->k_collection); - _g_object_unref0 (_data_->contact); - if (_data_->_state_ == 0) { - g_simple_async_result_complete_in_idle (_data_->_async_result); - } else { - g_simple_async_result_complete (_data_->_async_result); - } - g_object_unref (_data_->_async_result); - return FALSE; - } else { - __vala_GValue_free0 (_data_->v); - _g_list_free0 (_data_->k_collection); - _g_object_unref0 (_data_->contact); - g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); - g_clear_error (&_data_->_inner_error_); - return FALSE; - } - } + _data_->_tmp40_ = _data_->k; + _data_->_tmp41_ = NULL; + _data_->_tmp41_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_PHONE_NUMBERS); + if (g_strcmp0 (_data_->_tmp40_, _data_->_tmp41_) == 0) { + _data_->_tmp42_ = NULL; + _data_->_tmp42_ = g_value_get_object (&_data_->v); + _data_->_tmp43_ = _g_object_ref0 (GEE_SET (_data_->_tmp42_)); + _data_->phone_numbers = _data_->_tmp43_; + _data_->_tmp44_ = _data_->contact; + _data_->_tmp45_ = _data_->phone_numbers; + _data_->_state_ = 4; + _edsf_persona_store_set_contact_attributes_string (_data_->self, _data_->_tmp44_, _data_->_tmp45_, "TEL", E_CONTACT_TEL, edsf_persona_store_add_persona_from_details_ready, _data_); + return FALSE; + _state_4: + _edsf_persona_store_set_contact_attributes_string_finish (_data_->self, _data_->_res_); + _g_object_unref0 (_data_->phone_numbers); } else { - _data_->_tmp32_ = _data_->k; - _data_->_tmp33_ = NULL; - _data_->_tmp33_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_IM_ADDRESSES); - if (g_strcmp0 (_data_->_tmp32_, _data_->_tmp33_) == 0) { - _data_->_tmp34_ = _data_->v; - _data_->_tmp35_ = NULL; - _data_->_tmp35_ = g_value_get_object (_data_->_tmp34_); - _data_->_tmp36_ = _g_object_ref0 (GEE_MULTI_MAP (_data_->_tmp35_)); - _data_->im_fds = _data_->_tmp36_; - _data_->_tmp37_ = _data_->contact; - _data_->_tmp38_ = _data_->im_fds; - _data_->_state_ = 3; - _edsf_persona_store_set_contact_im_fds (_data_->self, _data_->_tmp37_, _data_->_tmp38_, edsf_persona_store_add_persona_from_details_ready, _data_); + _data_->_tmp46_ = _data_->k; + _data_->_tmp47_ = NULL; + _data_->_tmp47_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_POSTAL_ADDRESSES); + if (g_strcmp0 (_data_->_tmp46_, _data_->_tmp47_) == 0) { + _data_->_tmp48_ = NULL; + _data_->_tmp48_ = g_value_get_object (&_data_->v); + _data_->_tmp49_ = _g_object_ref0 (GEE_SET (_data_->_tmp48_)); + _data_->postal_fds = _data_->_tmp49_; + _data_->_tmp50_ = _data_->contact; + _data_->_tmp51_ = _data_->postal_fds; + _data_->_state_ = 5; + _edsf_persona_store_set_contact_postal_addresses (_data_->self, _data_->_tmp50_, _data_->_tmp51_, edsf_persona_store_add_persona_from_details_ready, _data_); return FALSE; - _state_3: - _edsf_persona_store_set_contact_im_fds_finish (_data_->self, _data_->_res_); - _g_object_unref0 (_data_->im_fds); + _state_5: + _edsf_persona_store_set_contact_postal_addresses_finish (_data_->self, _data_->_res_); + _g_object_unref0 (_data_->postal_fds); } else { - _data_->_tmp39_ = _data_->k; - _data_->_tmp40_ = NULL; - _data_->_tmp40_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_PHONE_NUMBERS); - if (g_strcmp0 (_data_->_tmp39_, _data_->_tmp40_) == 0) { - _data_->_tmp41_ = _data_->v; - _data_->_tmp42_ = NULL; - _data_->_tmp42_ = g_value_get_object (_data_->_tmp41_); - _data_->_tmp43_ = _g_object_ref0 (GEE_SET (_data_->_tmp42_)); - _data_->phone_numbers = _data_->_tmp43_; - _data_->_tmp44_ = _data_->contact; - _data_->_tmp45_ = _data_->phone_numbers; - _data_->_state_ = 4; - _edsf_persona_store_set_contact_attributes_string (_data_->self, _data_->_tmp44_, _data_->_tmp45_, "TEL", E_CONTACT_TEL, edsf_persona_store_add_persona_from_details_ready, _data_); + _data_->_tmp52_ = _data_->k; + _data_->_tmp53_ = NULL; + _data_->_tmp53_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_STRUCTURED_NAME); + if (g_strcmp0 (_data_->_tmp52_, _data_->_tmp53_) == 0) { + _data_->_tmp54_ = NULL; + _data_->_tmp54_ = g_value_get_object (&_data_->v); + _data_->_tmp55_ = _g_object_ref0 (FOLKS_STRUCTURED_NAME (_data_->_tmp54_)); + _data_->sname = _data_->_tmp55_; + _data_->_tmp56_ = _data_->contact; + _data_->_tmp57_ = _data_->sname; + _data_->_state_ = 6; + _edsf_persona_store_set_contact_name (_data_->self, _data_->_tmp56_, _data_->_tmp57_, edsf_persona_store_add_persona_from_details_ready, _data_); return FALSE; - _state_4: - _edsf_persona_store_set_contact_attributes_string_finish (_data_->self, _data_->_res_); - _g_object_unref0 (_data_->phone_numbers); + _state_6: + _edsf_persona_store_set_contact_name_finish (_data_->self, _data_->_res_); + _g_object_unref0 (_data_->sname); } else { - _data_->_tmp46_ = _data_->k; - _data_->_tmp47_ = NULL; - _data_->_tmp47_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_POSTAL_ADDRESSES); - if (g_strcmp0 (_data_->_tmp46_, _data_->_tmp47_) == 0) { - _data_->_tmp48_ = _data_->v; - _data_->_tmp49_ = NULL; - _data_->_tmp49_ = g_value_get_object (_data_->_tmp48_); - _data_->_tmp50_ = _g_object_ref0 (GEE_SET (_data_->_tmp49_)); - _data_->postal_fds = _data_->_tmp50_; - _data_->_tmp51_ = _data_->contact; - _data_->_tmp52_ = _data_->postal_fds; - _data_->_state_ = 5; - _edsf_persona_store_set_contact_postal_addresses (_data_->self, _data_->_tmp51_, _data_->_tmp52_, edsf_persona_store_add_persona_from_details_ready, _data_); + _data_->_tmp58_ = _data_->k; + _data_->_tmp59_ = NULL; + _data_->_tmp59_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_LOCAL_IDS); + if (g_strcmp0 (_data_->_tmp58_, _data_->_tmp59_) == 0) { + _data_->_tmp60_ = NULL; + _data_->_tmp60_ = g_value_get_object (&_data_->v); + _data_->_tmp61_ = _g_object_ref0 (GEE_SET (_data_->_tmp60_)); + _data_->local_ids = _data_->_tmp61_; + _data_->_tmp62_ = _data_->contact; + _data_->_tmp63_ = _data_->local_ids; + _data_->_state_ = 7; + _edsf_persona_store_set_contact_local_ids (_data_->self, _data_->_tmp62_, _data_->_tmp63_, edsf_persona_store_add_persona_from_details_ready, _data_); return FALSE; - _state_5: - _edsf_persona_store_set_contact_postal_addresses_finish (_data_->self, _data_->_res_); - _g_object_unref0 (_data_->postal_fds); + _state_7: + _edsf_persona_store_set_contact_local_ids_finish (_data_->self, _data_->_res_); + _g_object_unref0 (_data_->local_ids); } else { - _data_->_tmp53_ = _data_->k; - _data_->_tmp54_ = NULL; - _data_->_tmp54_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_STRUCTURED_NAME); - if (g_strcmp0 (_data_->_tmp53_, _data_->_tmp54_) == 0) { - _data_->_tmp55_ = _data_->v; - _data_->_tmp56_ = NULL; - _data_->_tmp56_ = g_value_get_object (_data_->_tmp55_); - _data_->_tmp57_ = _g_object_ref0 (FOLKS_STRUCTURED_NAME (_data_->_tmp56_)); - _data_->sname = _data_->_tmp57_; - _data_->_tmp58_ = _data_->contact; - _data_->_tmp59_ = _data_->sname; - _data_->_state_ = 6; - _edsf_persona_store_set_contact_name (_data_->self, _data_->_tmp58_, _data_->_tmp59_, edsf_persona_store_add_persona_from_details_ready, _data_); + _data_->_tmp64_ = _data_->k; + _data_->_tmp65_ = NULL; + _data_->_tmp65_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_WEB_SERVICE_ADDRESSES); + if (g_strcmp0 (_data_->_tmp64_, _data_->_tmp65_) == 0) { + _data_->_tmp66_ = NULL; + _data_->_tmp66_ = g_value_get_object (&_data_->v); + _data_->_tmp67_ = _g_object_ref0 (GEE_HASH_MULTI_MAP (_data_->_tmp66_)); + _data_->web_service_addresses = _data_->_tmp67_; + _data_->_tmp68_ = _data_->contact; + _data_->_tmp69_ = _data_->web_service_addresses; + _data_->_state_ = 8; + _edsf_persona_store_set_contact_web_service_addresses (_data_->self, _data_->_tmp68_, (GeeMultiMap*) _data_->_tmp69_, edsf_persona_store_add_persona_from_details_ready, _data_); return FALSE; - _state_6: - _edsf_persona_store_set_contact_name_finish (_data_->self, _data_->_res_); - _g_object_unref0 (_data_->sname); + _state_8: + _edsf_persona_store_set_contact_web_service_addresses_finish (_data_->self, _data_->_res_); + _g_object_unref0 (_data_->web_service_addresses); } else { - _data_->_tmp60_ = _data_->k; - _data_->_tmp61_ = NULL; - _data_->_tmp61_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_LOCAL_IDS); - if (g_strcmp0 (_data_->_tmp60_, _data_->_tmp61_) == 0) { - _data_->_tmp62_ = _data_->v; - _data_->_tmp63_ = NULL; - _data_->_tmp63_ = g_value_get_object (_data_->_tmp62_); - _data_->_tmp64_ = _g_object_ref0 (GEE_SET (_data_->_tmp63_)); - _data_->local_ids = _data_->_tmp64_; - _data_->_tmp65_ = _data_->contact; - _data_->_tmp66_ = _data_->local_ids; - _data_->_state_ = 7; - _edsf_persona_store_set_contact_local_ids (_data_->self, _data_->_tmp65_, _data_->_tmp66_, edsf_persona_store_add_persona_from_details_ready, _data_); + _data_->_tmp70_ = _data_->k; + _data_->_tmp71_ = NULL; + _data_->_tmp71_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_NOTES); + if (g_strcmp0 (_data_->_tmp70_, _data_->_tmp71_) == 0) { + _data_->_tmp72_ = NULL; + _data_->_tmp72_ = g_value_get_object (&_data_->v); + _data_->_tmp73_ = _g_object_ref0 (GEE_HASH_SET (_data_->_tmp72_)); + _data_->notes = _data_->_tmp73_; + _data_->_tmp74_ = _data_->contact; + _data_->_tmp75_ = _data_->notes; + _data_->_state_ = 9; + _edsf_persona_store_set_contact_notes (_data_->self, _data_->_tmp74_, (GeeSet*) _data_->_tmp75_, edsf_persona_store_add_persona_from_details_ready, _data_); return FALSE; - _state_7: - _edsf_persona_store_set_contact_local_ids_finish (_data_->self, _data_->_res_); - _g_object_unref0 (_data_->local_ids); + _state_9: + _edsf_persona_store_set_contact_notes_finish (_data_->self, _data_->_res_); + _g_object_unref0 (_data_->notes); } else { - _data_->_tmp67_ = _data_->k; - _data_->_tmp68_ = NULL; - _data_->_tmp68_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_WEB_SERVICE_ADDRESSES); - if (g_strcmp0 (_data_->_tmp67_, _data_->_tmp68_) == 0) { - _data_->_tmp69_ = _data_->v; - _data_->_tmp70_ = NULL; - _data_->_tmp70_ = g_value_get_object (_data_->_tmp69_); - _data_->_tmp71_ = _g_object_ref0 (GEE_HASH_MULTI_MAP (_data_->_tmp70_)); - _data_->web_service_addresses = _data_->_tmp71_; - _data_->_tmp72_ = _data_->contact; - _data_->_tmp73_ = _data_->web_service_addresses; - _data_->_state_ = 8; - _edsf_persona_store_set_contact_web_service_addresses (_data_->self, _data_->_tmp72_, (GeeMultiMap*) _data_->_tmp73_, edsf_persona_store_add_persona_from_details_ready, _data_); + _data_->_tmp76_ = _data_->k; + _data_->_tmp77_ = NULL; + _data_->_tmp77_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_GENDER); + if (g_strcmp0 (_data_->_tmp76_, _data_->_tmp77_) == 0) { + _data_->_tmp78_ = 0; + _data_->_tmp78_ = g_value_get_enum (&_data_->v); + _data_->gender = (FolksGender) _data_->_tmp78_; + _data_->_tmp79_ = _data_->contact; + _data_->_tmp80_ = _data_->gender; + _data_->_state_ = 10; + _edsf_persona_store_set_contact_gender (_data_->self, _data_->_tmp79_, _data_->_tmp80_, edsf_persona_store_add_persona_from_details_ready, _data_); return FALSE; - _state_8: - _edsf_persona_store_set_contact_web_service_addresses_finish (_data_->self, _data_->_res_); - _g_object_unref0 (_data_->web_service_addresses); + _state_10: + _edsf_persona_store_set_contact_gender_finish (_data_->self, _data_->_res_); } else { - _data_->_tmp74_ = _data_->k; - _data_->_tmp75_ = NULL; - _data_->_tmp75_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_NOTES); - if (g_strcmp0 (_data_->_tmp74_, _data_->_tmp75_) == 0) { - _data_->_tmp76_ = _data_->v; - _data_->_tmp77_ = NULL; - _data_->_tmp77_ = g_value_get_object (_data_->_tmp76_); - _data_->_tmp78_ = _g_object_ref0 (GEE_HASH_SET (_data_->_tmp77_)); - _data_->notes = _data_->_tmp78_; - _data_->_tmp79_ = _data_->contact; - _data_->_tmp80_ = _data_->notes; - _data_->_state_ = 9; - _edsf_persona_store_set_contact_notes (_data_->self, _data_->_tmp79_, (GeeSet*) _data_->_tmp80_, edsf_persona_store_add_persona_from_details_ready, _data_); + _data_->_tmp81_ = _data_->k; + _data_->_tmp82_ = NULL; + _data_->_tmp82_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_URLS); + if (g_strcmp0 (_data_->_tmp81_, _data_->_tmp82_) == 0) { + _data_->_tmp83_ = NULL; + _data_->_tmp83_ = g_value_get_object (&_data_->v); + _data_->_tmp84_ = _g_object_ref0 (GEE_SET (_data_->_tmp83_)); + _data_->urls = _data_->_tmp84_; + _data_->_tmp85_ = _data_->contact; + _data_->_tmp86_ = _data_->urls; + _data_->_state_ = 11; + _edsf_persona_store_set_contact_urls (_data_->self, _data_->_tmp85_, _data_->_tmp86_, edsf_persona_store_add_persona_from_details_ready, _data_); return FALSE; - _state_9: - _edsf_persona_store_set_contact_notes_finish (_data_->self, _data_->_res_); - _g_object_unref0 (_data_->notes); + _state_11: + _edsf_persona_store_set_contact_urls_finish (_data_->self, _data_->_res_); + _g_object_unref0 (_data_->urls); } else { - _data_->_tmp81_ = _data_->k; - _data_->_tmp82_ = NULL; - _data_->_tmp82_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_GENDER); - if (g_strcmp0 (_data_->_tmp81_, _data_->_tmp82_) == 0) { - _data_->_tmp83_ = _data_->v; - _data_->_tmp84_ = 0; - _data_->_tmp84_ = g_value_get_enum (_data_->_tmp83_); - _data_->gender = (FolksGender) _data_->_tmp84_; - _data_->_tmp85_ = _data_->contact; - _data_->_tmp86_ = _data_->gender; - _data_->_state_ = 10; - _edsf_persona_store_set_contact_gender (_data_->self, _data_->_tmp85_, _data_->_tmp86_, edsf_persona_store_add_persona_from_details_ready, _data_); + _data_->_tmp87_ = _data_->k; + _data_->_tmp88_ = NULL; + _data_->_tmp88_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_BIRTHDAY); + if (g_strcmp0 (_data_->_tmp87_, _data_->_tmp88_) == 0) { + _data_->_tmp89_ = NULL; + _data_->_tmp89_ = g_value_get_boxed (&_data_->v); + _data_->_tmp90_ = _g_date_time_ref0 ((GDateTime*) _data_->_tmp89_); + _data_->birthday = _data_->_tmp90_; + _data_->_tmp91_ = _data_->contact; + _data_->_tmp92_ = _data_->birthday; + _data_->_state_ = 12; + _edsf_persona_store_set_contact_birthday (_data_->self, _data_->_tmp91_, _data_->_tmp92_, edsf_persona_store_add_persona_from_details_ready, _data_); return FALSE; - _state_10: - _edsf_persona_store_set_contact_gender_finish (_data_->self, _data_->_res_); + _state_12: + _edsf_persona_store_set_contact_birthday_finish (_data_->self, _data_->_res_); + _g_date_time_unref0 (_data_->birthday); } else { - _data_->_tmp87_ = _data_->k; - _data_->_tmp88_ = NULL; - _data_->_tmp88_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_URLS); - if (g_strcmp0 (_data_->_tmp87_, _data_->_tmp88_) == 0) { - _data_->_tmp89_ = _data_->v; - _data_->_tmp90_ = NULL; - _data_->_tmp90_ = g_value_get_object (_data_->_tmp89_); - _data_->_tmp91_ = _g_object_ref0 (GEE_SET (_data_->_tmp90_)); - _data_->urls = _data_->_tmp91_; - _data_->_tmp92_ = _data_->contact; - _data_->_tmp93_ = _data_->urls; - _data_->_state_ = 11; - _edsf_persona_store_set_contact_urls (_data_->self, _data_->_tmp92_, _data_->_tmp93_, edsf_persona_store_add_persona_from_details_ready, _data_); + _data_->_tmp93_ = _data_->k; + _data_->_tmp94_ = NULL; + _data_->_tmp94_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_ROLES); + if (g_strcmp0 (_data_->_tmp93_, _data_->_tmp94_) == 0) { + _data_->_tmp95_ = NULL; + _data_->_tmp95_ = g_value_get_object (&_data_->v); + _data_->_tmp96_ = _g_object_ref0 (GEE_SET (_data_->_tmp95_)); + _data_->roles = _data_->_tmp96_; + _data_->_tmp97_ = _data_->contact; + _data_->_tmp98_ = _data_->roles; + _data_->_state_ = 13; + _edsf_persona_store_set_contact_roles (_data_->self, _data_->_tmp97_, _data_->_tmp98_, edsf_persona_store_add_persona_from_details_ready, _data_); return FALSE; - _state_11: - _edsf_persona_store_set_contact_urls_finish (_data_->self, _data_->_res_); - _g_object_unref0 (_data_->urls); + _state_13: + _edsf_persona_store_set_contact_roles_finish (_data_->self, _data_->_res_); + _g_object_unref0 (_data_->roles); } else { - _data_->_tmp94_ = _data_->k; - _data_->_tmp95_ = NULL; - _data_->_tmp95_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_BIRTHDAY); - if (g_strcmp0 (_data_->_tmp94_, _data_->_tmp95_) == 0) { - _data_->_tmp96_ = _data_->v; - _data_->_tmp97_ = NULL; - _data_->_tmp97_ = g_value_get_boxed (_data_->_tmp96_); - _data_->_tmp98_ = _g_date_time_ref0 ((GDateTime*) _data_->_tmp97_); - _data_->birthday = _data_->_tmp98_; - _data_->_tmp99_ = _data_->contact; - _data_->_tmp100_ = _data_->birthday; - _data_->_state_ = 12; - _edsf_persona_store_set_contact_birthday (_data_->self, _data_->_tmp99_, _data_->_tmp100_, edsf_persona_store_add_persona_from_details_ready, _data_); + _data_->_tmp99_ = _data_->k; + _data_->_tmp100_ = NULL; + _data_->_tmp100_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_IS_FAVOURITE); + if (g_strcmp0 (_data_->_tmp99_, _data_->_tmp100_) == 0) { + _data_->_tmp101_ = FALSE; + _data_->_tmp101_ = g_value_get_boolean (&_data_->v); + _data_->is_fav = _data_->_tmp101_; + _data_->_tmp102_ = _data_->contact; + _data_->_tmp103_ = _data_->is_fav; + _data_->_state_ = 14; + _edsf_persona_store_set_contact_is_favourite (_data_->self, _data_->_tmp102_, _data_->_tmp103_, edsf_persona_store_add_persona_from_details_ready, _data_); return FALSE; - _state_12: - _edsf_persona_store_set_contact_birthday_finish (_data_->self, _data_->_res_); - _g_date_time_unref0 (_data_->birthday); - } else { - _data_->_tmp101_ = _data_->k; - _data_->_tmp102_ = NULL; - _data_->_tmp102_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_ROLES); - if (g_strcmp0 (_data_->_tmp101_, _data_->_tmp102_) == 0) { - _data_->_tmp103_ = _data_->v; - _data_->_tmp104_ = NULL; - _data_->_tmp104_ = g_value_get_object (_data_->_tmp103_); - _data_->_tmp105_ = _g_object_ref0 (GEE_SET (_data_->_tmp104_)); - _data_->roles = _data_->_tmp105_; - _data_->_tmp106_ = _data_->contact; - _data_->_tmp107_ = _data_->roles; - _data_->_state_ = 13; - _edsf_persona_store_set_contact_roles (_data_->self, _data_->_tmp106_, _data_->_tmp107_, edsf_persona_store_add_persona_from_details_ready, _data_); - return FALSE; - _state_13: - _edsf_persona_store_set_contact_roles_finish (_data_->self, _data_->_res_); - _g_object_unref0 (_data_->roles); - } else { - _data_->_tmp108_ = _data_->k; - _data_->_tmp109_ = NULL; - _data_->_tmp109_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_IS_FAVOURITE); - if (g_strcmp0 (_data_->_tmp108_, _data_->_tmp109_) == 0) { - _data_->_tmp110_ = _data_->v; - _data_->_tmp111_ = FALSE; - _data_->_tmp111_ = g_value_get_boolean (_data_->_tmp110_); - _data_->is_fav = _data_->_tmp111_; - _data_->_tmp112_ = _data_->contact; - _data_->_tmp113_ = _data_->is_fav; - _data_->_state_ = 14; - _edsf_persona_store_set_contact_is_favourite (_data_->self, _data_->_tmp112_, _data_->_tmp113_, edsf_persona_store_add_persona_from_details_ready, _data_); - return FALSE; - _state_14: - _edsf_persona_store_set_contact_is_favourite_finish (_data_->self, _data_->_res_); - } - } + _state_14: + _edsf_persona_store_set_contact_is_favourite_finish (_data_->self, _data_->_res_); } } } @@ -2648,80 +2702,83 @@ } } } - __vala_GValue_free0 (_data_->v); } } - _g_list_free0 (_data_->k_collection); } - _data_->persona = NULL; + _data_->_persona = NULL; { - _data_->_tmp114_ = _data_->self->priv->_addressbook; - _data_->_tmp115_ = _data_->contact; - _data_->_tmp116_ = NULL; + _data_->_tmp104_ = _data_->self->priv->_addressbook; + _data_->_tmp105_ = _data_->contact; + _data_->_tmp106_ = NULL; _data_->_state_ = 15; - e_book_client_add_contact (_data_->_tmp114_, _data_->_tmp115_, NULL, edsf_persona_store_add_persona_from_details_ready, _data_); + e_book_client_add_contact (E_BOOK_CLIENT (_data_->_tmp104_), _data_->_tmp105_, NULL, edsf_persona_store_add_persona_from_details_ready, _data_); return FALSE; _state_15: - _data_->_tmp117_ = FALSE; - _data_->_tmp117_ = e_book_client_add_contact_finish (_data_->_tmp114_, _data_->_res_, &_data_->_tmp116_, &_data_->_inner_error_); + _data_->_tmp107_ = FALSE; + _data_->_tmp107_ = e_book_client_add_contact_finish (E_BOOK_CLIENT (_data_->_tmp104_), _data_->_res_, &_data_->_tmp106_, &_data_->_inner_error_); _g_free0 (_data_->added_uid); - _data_->added_uid = _data_->_tmp116_; - _data_->_result_ = _data_->_tmp117_; + _data_->added_uid = _data_->_tmp106_; + _data_->_result_ = _data_->_tmp107_; if (_data_->_inner_error_ != NULL) { _g_free0 (_data_->added_uid); goto __catch7_g_error; } - _data_->_tmp118_ = _data_->_result_; - if (_data_->_tmp118_) { - _data_->_tmp119_ = _data_->added_uid; - g_debug ("edsf-persona-store.vala:420: Created contact with uid: %s\n", _data_->_tmp119_); + _data_->_tmp108_ = _data_->_result_; + if (_data_->_tmp108_) { + _data_->_tmp109_ = _data_->added_uid; + g_debug ("edsf-persona-store.vala:445: Created contact with uid: %s\n", _data_->_tmp109_); { - _data_->_tmp120_ = _data_->self->priv->_personas; + _data_->_tmp110_ = _data_->self->priv->_personas; g_static_rec_mutex_lock (&_data_->self->priv->__lock__personas); { - _data_->_tmp121_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); - _data_->_tmp122_ = _data_->_tmp121_; - _data_->_tmp123_ = _data_->added_uid; - _data_->_tmp124_ = NULL; - _data_->_tmp124_ = edsf_persona_build_iid (_data_->_tmp122_, _data_->_tmp123_); - _data_->iid = _data_->_tmp124_; - _data_->_tmp125_ = _data_->self->priv->_personas; - _data_->_tmp126_ = _data_->iid; - _data_->_tmp127_ = NULL; - _data_->_tmp127_ = gee_abstract_map_get ((GeeAbstractMap*) _data_->_tmp125_, _data_->_tmp126_); - _g_object_unref0 (_data_->persona); - _data_->persona = (EdsfPersona*) _data_->_tmp127_; - _data_->_tmp128_ = _data_->persona; - if (_data_->_tmp128_ == NULL) { - _data_->_tmp129_ = _data_->contact; - _data_->_tmp130_ = 0; - _data_->_tmp130_ = e_contact_field_id ("id"); - _data_->_tmp131_ = _data_->added_uid; - e_contact_set (_data_->_tmp129_, _data_->_tmp130_, _data_->_tmp131_); - _data_->_tmp132_ = _data_->contact; - _data_->_tmp133_ = edsf_persona_new (_data_->self, _data_->_tmp132_); + _data_->_tmp111_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); + _data_->_tmp112_ = _data_->_tmp111_; + _data_->_tmp113_ = _data_->added_uid; + _data_->_tmp114_ = NULL; + _data_->_tmp114_ = edsf_persona_build_iid (_data_->_tmp112_, _data_->_tmp113_); + _data_->iid = _data_->_tmp114_; + _data_->_tmp115_ = _data_->self->priv->_personas; + _data_->_tmp116_ = _data_->iid; + _data_->_tmp117_ = NULL; + _data_->_tmp117_ = gee_abstract_map_get ((GeeAbstractMap*) _data_->_tmp115_, _data_->_tmp116_); + _g_object_unref0 (_data_->_persona); + _data_->_persona = (EdsfPersona*) _data_->_tmp117_; + _data_->_tmp118_ = _data_->_persona; + if (_data_->_tmp118_ == NULL) { + _data_->_tmp119_ = _data_->contact; + _data_->_tmp120_ = 0; + _data_->_tmp120_ = e_contact_field_id ("id"); + _data_->_tmp121_ = _data_->added_uid; + e_contact_set (_data_->_tmp119_, _data_->_tmp120_, _data_->_tmp121_); + _data_->_tmp122_ = _data_->contact; + _data_->_tmp123_ = edsf_persona_new (_data_->self, _data_->_tmp122_); _g_object_unref0 (_data_->persona); - _data_->persona = _data_->_tmp133_; - _data_->_tmp134_ = _data_->self->priv->_personas; - _data_->_tmp135_ = _data_->persona; - _data_->_tmp136_ = folks_persona_get_iid ((FolksPersona*) _data_->_tmp135_); - _data_->_tmp137_ = _data_->_tmp136_; - _data_->_tmp138_ = _data_->persona; - gee_abstract_map_set ((GeeAbstractMap*) _data_->_tmp134_, _data_->_tmp137_, _data_->_tmp138_); - _data_->_tmp139_ = gee_hash_set_new (EDSF_TYPE_PERSONA, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); - _data_->added_personas = _data_->_tmp139_; - _data_->_tmp140_ = _data_->added_personas; - _data_->_tmp141_ = _data_->persona; - gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp140_, _data_->_tmp141_); - _data_->_tmp142_ = _data_->added_personas; - _folks_persona_store_emit_personas_changed ((FolksPersonaStore*) _data_->self, (GeeSet*) _data_->_tmp142_, NULL, NULL, NULL, FOLKS_GROUP_DETAILS_CHANGE_REASON_NONE); + _data_->persona = _data_->_tmp123_; + _data_->_tmp124_ = _data_->self->priv->_personas; + _data_->_tmp125_ = _data_->persona; + _data_->_tmp126_ = folks_persona_get_iid ((FolksPersona*) _data_->_tmp125_); + _data_->_tmp127_ = _data_->_tmp126_; + _data_->_tmp128_ = _data_->persona; + gee_abstract_map_set ((GeeAbstractMap*) _data_->_tmp124_, _data_->_tmp127_, _data_->_tmp128_); + _data_->_tmp129_ = gee_hash_set_new (EDSF_TYPE_PERSONA, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); + _data_->added_personas = _data_->_tmp129_; + _data_->_tmp130_ = _data_->added_personas; + _data_->_tmp131_ = _data_->persona; + gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp130_, _data_->_tmp131_); + _data_->_tmp132_ = _data_->added_personas; + _folks_persona_store_emit_personas_changed ((FolksPersonaStore*) _data_->self, (GeeSet*) _data_->_tmp132_, NULL, NULL, NULL, FOLKS_GROUP_DETAILS_CHANGE_REASON_NONE); + _data_->_tmp133_ = _data_->persona; + _data_->_tmp134_ = _g_object_ref0 (_data_->_tmp133_); + _g_object_unref0 (_data_->_persona); + _data_->_persona = _data_->_tmp134_; _g_object_unref0 (_data_->added_personas); + _g_object_unref0 (_data_->persona); } _g_free0 (_data_->iid); } __finally8: { - _data_->_tmp143_ = _data_->self->priv->_personas; + _data_->_tmp135_ = _data_->self->priv->_personas; g_static_rec_mutex_unlock (&_data_->self->priv->__lock__personas); } if (_data_->_inner_error_ != NULL) { @@ -2730,8 +2787,8 @@ } } } else { - _data_->_tmp144_ = g_error_new_literal (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_CREATE_FAILED, "BookClient.add_contact () failed."); - _data_->_inner_error_ = _data_->_tmp144_; + _data_->_tmp136_ = g_error_new_literal (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_CREATE_FAILED, "BookClient.add_contact () failed."); + _data_->_inner_error_ = _data_->_tmp136_; _g_free0 (_data_->added_uid); goto __catch7_g_error; } @@ -2742,9 +2799,9 @@ { _data_->e = _data_->_inner_error_; _data_->_inner_error_ = NULL; - _data_->_tmp145_ = _data_->e; - _data_->_tmp146_ = _data_->_tmp145_->message; - g_warning ("edsf-persona-store.vala:444: add_persona_from_details: %s\n", _data_->_tmp146_); + _data_->_tmp137_ = _data_->e; + _data_->_tmp138_ = _data_->_tmp137_->message; + g_warning ("edsf-persona-store.vala:473: add_persona_from_details: %s\n", _data_->_tmp138_); _g_error_free0 (_data_->e); } __finally7: @@ -2752,7 +2809,7 @@ if (_data_->_inner_error_->domain == FOLKS_PERSONA_STORE_ERROR) { g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); g_error_free (_data_->_inner_error_); - _g_object_unref0 (_data_->persona); + _g_object_unref0 (_data_->_persona); _g_object_unref0 (_data_->contact); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); @@ -2762,14 +2819,14 @@ g_object_unref (_data_->_async_result); return FALSE; } else { - _g_object_unref0 (_data_->persona); + _g_object_unref0 (_data_->_persona); _g_object_unref0 (_data_->contact); g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); g_clear_error (&_data_->_inner_error_); return FALSE; } } - _data_->result = (FolksPersona*) _data_->persona; + _data_->result = (FolksPersona*) _data_->_persona; _g_object_unref0 (_data_->contact); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); @@ -2778,7 +2835,7 @@ } g_object_unref (_data_->_async_result); return FALSE; - _g_object_unref0 (_data_->persona); + _g_object_unref0 (_data_->_persona); _g_object_unref0 (_data_->contact); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); @@ -2855,16 +2912,36 @@ g_assert_not_reached (); } _state_0: + _data_->_tmp0_ = _data_->self->priv->_is_prepared; + if (!_data_->_tmp0_) { + _data_->_tmp1_ = g_error_new_literal (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_STORE_OFFLINE, "Persona store has not yet been prepared."); + _data_->_inner_error_ = _data_->_tmp1_; + if (_data_->_inner_error_->domain == FOLKS_PERSONA_STORE_ERROR) { + g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); + g_error_free (_data_->_inner_error_); + if (_data_->_state_ == 0) { + g_simple_async_result_complete_in_idle (_data_->_async_result); + } else { + g_simple_async_result_complete (_data_->_async_result); + } + g_object_unref (_data_->_async_result); + return FALSE; + } else { + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); + g_clear_error (&_data_->_inner_error_); + return FALSE; + } + } { - _data_->_tmp0_ = _data_->self->priv->_addressbook; - _data_->_tmp1_ = _data_->persona; - _data_->_tmp2_ = edsf_persona_get_contact (EDSF_PERSONA (_data_->_tmp1_)); - _data_->_tmp3_ = _data_->_tmp2_; + _data_->_tmp2_ = _data_->self->priv->_addressbook; + _data_->_tmp3_ = _data_->persona; + _data_->_tmp4_ = edsf_persona_get_contact (EDSF_PERSONA (_data_->_tmp3_)); + _data_->_tmp5_ = _data_->_tmp4_; _data_->_state_ = 1; - e_book_client_remove_contact (_data_->_tmp0_, _data_->_tmp3_, NULL, edsf_persona_store_remove_persona_ready, _data_); + e_book_client_remove_contact (E_BOOK_CLIENT (_data_->_tmp2_), _data_->_tmp5_, NULL, edsf_persona_store_remove_persona_ready, _data_); return FALSE; _state_1: - e_book_client_remove_contact_finish (_data_->_tmp0_, _data_->_res_, &_data_->_inner_error_); + e_book_client_remove_contact_finish (E_BOOK_CLIENT (_data_->_tmp2_), _data_->_res_, &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { goto __catch9_g_error; } @@ -2874,14 +2951,14 @@ { _data_->e = _data_->_inner_error_; _data_->_inner_error_ = NULL; - _data_->_tmp4_ = _data_->e; - _data_->_tmp5_ = _data_->_tmp4_->domain; - _data_->_tmp6_ = 0U; - _data_->_tmp6_ = e_book_client_error_quark (); - if (_data_->_tmp5_ == _data_->_tmp6_) { - _data_->_tmp7_ = _data_->e; - _data_->_tmp8_ = _data_->_tmp7_->code; - switch ((EBookClientError) _data_->_tmp8_) { + _data_->_tmp6_ = _data_->e; + _data_->_tmp7_ = _data_->_tmp6_->domain; + _data_->_tmp8_ = 0U; + _data_->_tmp8_ = e_book_client_error_quark (); + if (_data_->_tmp7_ == _data_->_tmp8_) { + _data_->_tmp9_ = _data_->e; + _data_->_tmp10_ = _data_->_tmp9_->code; + switch ((EBookClientError) _data_->_tmp10_) { case E_BOOK_CLIENT_ERROR_CONTACT_NOT_FOUND: { _g_error_free0 (_data_->e); @@ -2903,50 +2980,50 @@ } } } else { - _data_->_tmp9_ = _data_->e; - _data_->_tmp10_ = _data_->_tmp9_->domain; - _data_->_tmp11_ = 0U; - _data_->_tmp11_ = e_client_error_quark (); - if (_data_->_tmp10_ == _data_->_tmp11_) { - _data_->_tmp12_ = _data_->e; - _data_->_tmp13_ = _data_->_tmp12_->code; - switch ((EClientError) _data_->_tmp13_) { + _data_->_tmp11_ = _data_->e; + _data_->_tmp12_ = _data_->_tmp11_->domain; + _data_->_tmp13_ = 0U; + _data_->_tmp13_ = e_client_error_quark (); + if (_data_->_tmp12_ == _data_->_tmp13_) { + _data_->_tmp14_ = _data_->e; + _data_->_tmp15_ = _data_->_tmp14_->code; + switch ((EClientError) _data_->_tmp15_) { case E_CLIENT_ERROR_REPOSITORY_OFFLINE: { - _data_->_tmp14_ = NULL; - _data_->_tmp14_ = _ ("Address book ‘%s’ is offline, so contact ‘%s’ cannot be removed."); - _data_->_tmp15_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); - _data_->_tmp16_ = _data_->_tmp15_; - _data_->_tmp17_ = _data_->persona; - _data_->_tmp18_ = folks_persona_get_uid (_data_->_tmp17_); - _data_->_tmp19_ = _data_->_tmp18_; - _data_->_tmp20_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_STORE_OFFLINE, _data_->_tmp14_, _data_->_tmp16_, _data_->_tmp19_); - _data_->_inner_error_ = _data_->_tmp20_; + _data_->_tmp16_ = NULL; + _data_->_tmp16_ = _ ("Address book ‘%s’ is offline, so contact ‘%s’ cannot be removed."); + _data_->_tmp17_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); + _data_->_tmp18_ = _data_->_tmp17_; + _data_->_tmp19_ = _data_->persona; + _data_->_tmp20_ = folks_persona_get_uid (_data_->_tmp19_); + _data_->_tmp21_ = _data_->_tmp20_; + _data_->_tmp22_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_STORE_OFFLINE, _data_->_tmp16_, _data_->_tmp18_, _data_->_tmp21_); + _data_->_inner_error_ = _data_->_tmp22_; _g_error_free0 (_data_->e); goto __finally9; } case E_CLIENT_ERROR_PERMISSION_DENIED: { - _data_->_tmp21_ = NULL; - _data_->_tmp21_ = _ ("Permission denied to remove contact ‘%s’: %s"); - _data_->_tmp22_ = _data_->persona; - _data_->_tmp23_ = folks_persona_get_uid (_data_->_tmp22_); - _data_->_tmp24_ = _data_->_tmp23_; - _data_->_tmp25_ = _data_->e; - _data_->_tmp26_ = _data_->_tmp25_->message; - _data_->_tmp27_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_PERMISSION_DENIED, _data_->_tmp21_, _data_->_tmp24_, _data_->_tmp26_); - _data_->_inner_error_ = _data_->_tmp27_; + _data_->_tmp23_ = NULL; + _data_->_tmp23_ = _ ("Permission denied to remove contact ‘%s’: %s"); + _data_->_tmp24_ = _data_->persona; + _data_->_tmp25_ = folks_persona_get_uid (_data_->_tmp24_); + _data_->_tmp26_ = _data_->_tmp25_; + _data_->_tmp27_ = _data_->e; + _data_->_tmp28_ = _data_->_tmp27_->message; + _data_->_tmp29_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_PERMISSION_DENIED, _data_->_tmp23_, _data_->_tmp26_, _data_->_tmp28_); + _data_->_inner_error_ = _data_->_tmp29_; _g_error_free0 (_data_->e); goto __finally9; } case E_CLIENT_ERROR_NOT_SUPPORTED: { - _data_->_tmp28_ = NULL; - _data_->_tmp28_ = _ ("Removing contacts isn't supported by this persona store: %s"); - _data_->_tmp29_ = _data_->e; - _data_->_tmp30_ = _data_->_tmp29_->message; - _data_->_tmp31_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_READ_ONLY, _data_->_tmp28_, _data_->_tmp30_); - _data_->_inner_error_ = _data_->_tmp31_; + _data_->_tmp30_ = NULL; + _data_->_tmp30_ = _ ("Removing contacts isn't supported by this persona store: %s"); + _data_->_tmp31_ = _data_->e; + _data_->_tmp32_ = _data_->_tmp31_->message; + _data_->_tmp33_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_READ_ONLY, _data_->_tmp30_, _data_->_tmp32_); + _data_->_inner_error_ = _data_->_tmp33_; _g_error_free0 (_data_->e); goto __finally9; } @@ -2971,15 +3048,15 @@ } } } - _data_->_tmp32_ = NULL; - _data_->_tmp32_ = _ ("Can't remove contact ‘%s’: %s"); - _data_->_tmp33_ = _data_->persona; - _data_->_tmp34_ = folks_persona_get_uid (_data_->_tmp33_); - _data_->_tmp35_ = _data_->_tmp34_; - _data_->_tmp36_ = _data_->e; - _data_->_tmp37_ = _data_->_tmp36_->message; - _data_->_tmp38_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_REMOVE_FAILED, _data_->_tmp32_, _data_->_tmp35_, _data_->_tmp37_); - _data_->_inner_error_ = _data_->_tmp38_; + _data_->_tmp34_ = NULL; + _data_->_tmp34_ = _ ("Can't remove contact ‘%s’: %s"); + _data_->_tmp35_ = _data_->persona; + _data_->_tmp36_ = folks_persona_get_uid (_data_->_tmp35_); + _data_->_tmp37_ = _data_->_tmp36_; + _data_->_tmp38_ = _data_->e; + _data_->_tmp39_ = _data_->_tmp38_->message; + _data_->_tmp40_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_REMOVE_FAILED, _data_->_tmp34_, _data_->_tmp37_, _data_->_tmp39_); + _data_->_inner_error_ = _data_->_tmp40_; _g_error_free0 (_data_->e); goto __finally9; } @@ -3120,7 +3197,7 @@ goto __catch11_g_error; } _data_->_tmp7_ = _data_->self->priv->_source_list; - g_signal_connect_object (_data_->_tmp7_, "changed", (GCallback) __edsf_persona_store_source_list_changed_cb_e_source_list_changed, _data_->self, 0); + g_signal_connect_object (E_SOURCE_LIST (_data_->_tmp7_), "changed", (GCallback) __edsf_persona_store_source_list_changed_cb_e_source_list_changed, _data_->self, 0); _data_->_tmp8_ = _data_->self->priv->_source; _data_->_tmp9_ = e_book_client_new (_data_->_tmp8_, &_data_->_inner_error_); _data_->_tmp10_ = _data_->_tmp9_; @@ -3130,16 +3207,21 @@ _g_object_unref0 (_data_->self->priv->_addressbook); _data_->self->priv->_addressbook = _data_->_tmp10_; _data_->_tmp11_ = _data_->self->priv->_addressbook; - g_signal_connect_object ((GObject*) _data_->_tmp11_, "notify::readonly", (GCallback) __edsf_persona_store_address_book_notify_read_only_cb_g_object_notify, _data_->self, 0); + g_signal_connect_object ((GObject*) E_BOOK_CLIENT (_data_->_tmp11_), "notify::readonly", (GCallback) __edsf_persona_store_address_book_notify_read_only_cb_g_object_notify, _data_->self, 0); _data_->_tmp12_ = _data_->self->priv->_addressbook; + g_signal_connect_object ((EClient*) E_BOOK_CLIENT (_data_->_tmp12_), "authenticate", (GCallback) __edsf_persona_store_address_book_authenticate_cb_e_client_authenticate, _data_->self, 0); _data_->_state_ = 1; - e_client_open ((EClient*) _data_->_tmp12_, FALSE, NULL, edsf_persona_store_prepare_ready, _data_); + _edsf_persona_store_open_address_book (_data_->self, edsf_persona_store_prepare_ready, _data_); return FALSE; _state_1: - e_client_open_finish ((EClient*) _data_->_tmp12_, _data_->_res_, &_data_->_inner_error_); + _edsf_persona_store_open_address_book_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { goto __catch11_g_error; } + _data_->_tmp13_ = _data_->self->priv->_addressbook; + _data_->_tmp14_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); + _data_->_tmp15_ = _data_->_tmp14_; + g_debug ("Successfully finished opening address book %p for " "persona store ‘%s’ (%p).", _data_->_tmp13_, _data_->_tmp15_, _data_->self); _edsf_persona_store_update_trust_level (_data_->self); } goto __finally11; @@ -3148,14 +3230,14 @@ _data_->e1 = _data_->_inner_error_; _data_->_inner_error_ = NULL; g_signal_emit_by_name ((FolksPersonaStore*) _data_->self, "removed"); - _data_->_tmp13_ = _data_->e1; - _data_->_tmp14_ = _data_->_tmp13_->domain; - _data_->_tmp15_ = 0U; - _data_->_tmp15_ = e_book_client_error_quark (); - if (_data_->_tmp14_ == _data_->_tmp15_) { - _data_->_tmp16_ = _data_->e1; - _data_->_tmp17_ = _data_->_tmp16_->code; - switch ((EBookClientError) _data_->_tmp17_) { + _data_->_tmp16_ = _data_->e1; + _data_->_tmp17_ = _data_->_tmp16_->domain; + _data_->_tmp18_ = 0U; + _data_->_tmp18_ = e_book_client_error_quark (); + if (_data_->_tmp17_ == _data_->_tmp18_) { + _data_->_tmp19_ = _data_->e1; + _data_->_tmp20_ = _data_->_tmp19_->code; + switch ((EBookClientError) _data_->_tmp20_) { default: case E_BOOK_CLIENT_ERROR_NO_SUCH_BOOK: case E_BOOK_CLIENT_ERROR_NO_SUCH_SOURCE: @@ -3167,35 +3249,35 @@ } } } else { - _data_->_tmp18_ = _data_->e1; - _data_->_tmp19_ = _data_->_tmp18_->domain; - _data_->_tmp20_ = 0U; - _data_->_tmp20_ = e_client_error_quark (); - if (_data_->_tmp19_ == _data_->_tmp20_) { - _data_->_tmp21_ = _data_->e1; - _data_->_tmp22_ = _data_->_tmp21_->code; - switch ((EClientError) _data_->_tmp22_) { + _data_->_tmp21_ = _data_->e1; + _data_->_tmp22_ = _data_->_tmp21_->domain; + _data_->_tmp23_ = 0U; + _data_->_tmp23_ = e_client_error_quark (); + if (_data_->_tmp22_ == _data_->_tmp23_) { + _data_->_tmp24_ = _data_->e1; + _data_->_tmp25_ = _data_->_tmp24_->code; + switch ((EClientError) _data_->_tmp25_) { case E_CLIENT_ERROR_REPOSITORY_OFFLINE: { - _data_->_tmp23_ = NULL; - _data_->_tmp23_ = _ ("Address book ‘%s’ is offline."); - _data_->_tmp24_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); - _data_->_tmp25_ = _data_->_tmp24_; - _data_->_tmp26_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_STORE_OFFLINE, _data_->_tmp23_, _data_->_tmp25_); - _data_->_inner_error_ = _data_->_tmp26_; + _data_->_tmp26_ = NULL; + _data_->_tmp26_ = _ ("Address book ‘%s’ is offline."); + _data_->_tmp27_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); + _data_->_tmp28_ = _data_->_tmp27_; + _data_->_tmp29_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_STORE_OFFLINE, _data_->_tmp26_, _data_->_tmp28_); + _data_->_inner_error_ = _data_->_tmp29_; _g_error_free0 (_data_->e1); goto __finally11; } case E_CLIENT_ERROR_PERMISSION_DENIED: { - _data_->_tmp27_ = NULL; - _data_->_tmp27_ = _ ("Permission denied to open address book ‘%s’: %s"); - _data_->_tmp28_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); - _data_->_tmp29_ = _data_->_tmp28_; - _data_->_tmp30_ = _data_->e1; - _data_->_tmp31_ = _data_->_tmp30_->message; - _data_->_tmp32_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_PERMISSION_DENIED, _data_->_tmp27_, _data_->_tmp29_, _data_->_tmp31_); - _data_->_inner_error_ = _data_->_tmp32_; + _data_->_tmp30_ = NULL; + _data_->_tmp30_ = _ ("Permission denied to open address book ‘%s’: %s"); + _data_->_tmp31_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); + _data_->_tmp32_ = _data_->_tmp31_; + _data_->_tmp33_ = _data_->e1; + _data_->_tmp34_ = _data_->_tmp33_->message; + _data_->_tmp35_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_PERMISSION_DENIED, _data_->_tmp30_, _data_->_tmp32_, _data_->_tmp34_); + _data_->_inner_error_ = _data_->_tmp35_; _g_error_free0 (_data_->e1); goto __finally11; } @@ -3221,14 +3303,14 @@ } } } - _data_->_tmp33_ = NULL; - _data_->_tmp33_ = _ ("Couldn't open address book ‘%s’: %s"); - _data_->_tmp34_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); - _data_->_tmp35_ = _data_->_tmp34_; - _data_->_tmp36_ = _data_->e1; - _data_->_tmp37_ = _data_->_tmp36_->message; - _data_->_tmp38_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_INVALID_ARGUMENT, _data_->_tmp33_, _data_->_tmp35_, _data_->_tmp37_); - _data_->_inner_error_ = _data_->_tmp38_; + _data_->_tmp36_ = NULL; + _data_->_tmp36_ = _ ("Couldn't open address book ‘%s’: %s"); + _data_->_tmp37_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); + _data_->_tmp38_ = _data_->_tmp37_; + _data_->_tmp39_ = _data_->e1; + _data_->_tmp40_ = _data_->_tmp39_->message; + _data_->_tmp41_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_INVALID_ARGUMENT, _data_->_tmp36_, _data_->_tmp38_, _data_->_tmp40_); + _data_->_inner_error_ = _data_->_tmp41_; _g_error_free0 (_data_->e1); goto __finally11; } @@ -3239,84 +3321,72 @@ if (_data_->_inner_error_ != NULL) { goto __finally10; } - _data_->_tmp39_ = _data_->self->priv->_addressbook; - _data_->_tmp40_ = FALSE; - _data_->_tmp40_ = e_client_is_opened ((EClient*) _data_->_tmp39_); - if (_data_->_tmp40_ == FALSE) { - g_signal_emit_by_name ((FolksPersonaStore*) _data_->self, "removed"); - _data_->self->priv->_prepare_pending = FALSE; - _data_->_tmp41_ = NULL; - _data_->_tmp41_ = _ ("Couldn't open address book ‘%s’."); - _data_->_tmp42_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); - _data_->_tmp43_ = _data_->_tmp42_; - _data_->_tmp44_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_INVALID_ARGUMENT, _data_->_tmp41_, _data_->_tmp43_); - _data_->_inner_error_ = _data_->_tmp44_; - goto __finally10; - } { - _data_->_tmp45_ = _data_->self->priv->_addressbook; - _data_->_tmp46_ = NULL; + _data_->supported_fields = NULL; + _data_->_tmp42_ = _data_->self->priv->_addressbook; + _data_->_tmp43_ = NULL; _data_->_state_ = 2; - e_client_get_backend_property ((EClient*) _data_->_tmp45_, "supported-fields", NULL, edsf_persona_store_prepare_ready, _data_); + e_client_get_backend_property ((EClient*) E_BOOK_CLIENT (_data_->_tmp42_), "supported-fields", NULL, edsf_persona_store_prepare_ready, _data_); return FALSE; _state_2: - e_client_get_backend_property_finish ((EClient*) _data_->_tmp45_, _data_->_res_, &_data_->_tmp46_, &_data_->_inner_error_); + e_client_get_backend_property_finish ((EClient*) E_BOOK_CLIENT (_data_->_tmp42_), _data_->_res_, &_data_->_tmp43_, &_data_->_inner_error_); _g_free0 (_data_->supported_fields); - _data_->supported_fields = _data_->_tmp46_; + _data_->supported_fields = _data_->_tmp43_; if (_data_->_inner_error_ != NULL) { + _g_free0 (_data_->supported_fields); goto __catch12_g_error; } - _data_->_tmp47_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL); - _data_->prop_set = _data_->_tmp47_; - _data_->_tmp48_ = _data_->supported_fields; - if (_data_->_tmp48_ != NULL) { - _data_->_tmp49_ = _data_->supported_fields; - _data_->_tmp51_ = NULL; - _data_->_tmp51_ = _data_->_tmp50_ = g_strsplit (_data_->_tmp49_, ",", 0); - _data_->fields = _data_->_tmp51_; - _data_->fields_length1 = _vala_array_length (_data_->_tmp50_); + _data_->_tmp44_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL); + _data_->prop_set = _data_->_tmp44_; + _data_->_tmp45_ = _data_->supported_fields; + if (_data_->_tmp45_ != NULL) { + _data_->_tmp46_ = _data_->supported_fields; + _data_->_tmp48_ = NULL; + _data_->_tmp48_ = _data_->_tmp47_ = g_strsplit ((const gchar*) _data_->_tmp46_, ",", 0); + _data_->fields = _data_->_tmp48_; + _data_->fields_length1 = _vala_array_length (_data_->_tmp47_); _data_->_fields_size_ = _data_->fields_length1; - _data_->_tmp52_ = _data_->prop_set; - _data_->_tmp53_ = NULL; - _data_->_tmp53_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_LOCAL_IDS); - gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp52_, _data_->_tmp53_); - _data_->_tmp54_ = _data_->prop_set; - _data_->_tmp55_ = NULL; - _data_->_tmp55_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_WEB_SERVICE_ADDRESSES); - gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp54_, _data_->_tmp55_); - _data_->_tmp56_ = _data_->prop_set; - _data_->_tmp57_ = NULL; - _data_->_tmp57_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_GENDER); - gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp56_, _data_->_tmp57_); - _data_->_tmp58_ = _data_->prop_set; - _data_->_tmp59_ = NULL; - _data_->_tmp59_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_IS_FAVOURITE); - gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp58_, _data_->_tmp59_); - _data_->_tmp60_ = _data_->fields; - _data_->_tmp60__length1 = _data_->fields_length1; + _data_->_tmp49_ = _data_->prop_set; + _data_->_tmp50_ = NULL; + _data_->_tmp50_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_LOCAL_IDS); + gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp49_, (const gchar*) _data_->_tmp50_); + _data_->_tmp51_ = _data_->prop_set; + _data_->_tmp52_ = NULL; + _data_->_tmp52_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_WEB_SERVICE_ADDRESSES); + gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp51_, (const gchar*) _data_->_tmp52_); + _data_->_tmp53_ = _data_->prop_set; + _data_->_tmp54_ = NULL; + _data_->_tmp54_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_GENDER); + gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp53_, (const gchar*) _data_->_tmp54_); + _data_->_tmp55_ = _data_->prop_set; + _data_->_tmp56_ = NULL; + _data_->_tmp56_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_IS_FAVOURITE); + gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp55_, (const gchar*) _data_->_tmp56_); + _data_->_tmp57_ = _data_->fields; + _data_->_tmp57__length1 = _data_->fields_length1; { _data_->field_collection_length1 = 0; _data_->_field_collection_size_ = 0; - _data_->field_collection = _data_->_tmp60_; - _data_->field_collection_length1 = _data_->_tmp60__length1; - for (_data_->field_it = 0; _data_->field_it < _data_->_tmp60__length1; _data_->field_it = _data_->field_it + 1) { + _data_->field_collection = _data_->_tmp57_; + _data_->field_collection_length1 = _data_->_tmp57__length1; + for (_data_->field_it = 0; _data_->field_it < _data_->_tmp57__length1; _data_->field_it = _data_->field_it + 1) { _data_->field = _data_->field_collection[_data_->field_it]; { - _data_->_tmp61_ = _data_->field; - _data_->_tmp62_ = 0; - _data_->_tmp62_ = _edsf_persona_store_eds_field_name_to_folks_persona_detail (_data_->self, _data_->_tmp61_); - _data_->_tmp63_ = NULL; - _data_->_tmp63_ = folks_persona_store_detail_key (_data_->_tmp62_); - _data_->_tmp64_ = g_strdup (_data_->_tmp63_); - _data_->prop = _data_->_tmp64_; - _data_->_tmp65_ = _data_->prop; - if (_data_->_tmp65_ != NULL) { - _data_->_tmp66_ = _data_->prop_set; - _data_->_tmp67_ = _data_->prop; + _data_->_tmp58_ = _data_->field; + _data_->_tmp59_ = 0; + _data_->_tmp59_ = _edsf_persona_store_eds_field_name_to_folks_persona_detail (_data_->self, _data_->_tmp58_); + _data_->_tmp60_ = NULL; + _data_->_tmp60_ = folks_persona_store_detail_key (_data_->_tmp59_); + _data_->_tmp61_ = g_strdup (_data_->_tmp60_); + _data_->prop = _data_->_tmp61_; + _data_->_tmp62_ = _data_->prop; + if (_data_->_tmp62_ != NULL) { + _data_->_tmp63_ = _data_->prop_set; + _data_->_tmp64_ = _data_->prop; _data_->prop = NULL; - _data_->_tmp68_ = _data_->_tmp67_; - gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp66_, _data_->_tmp68_); - _g_free0 (_data_->_tmp68_); + _data_->_tmp65_ = (gchar*) _data_->_tmp64_; + gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp63_, _data_->_tmp65_); + _g_free0 (_data_->_tmp65_); } _g_free0 (_data_->prop); } @@ -3324,52 +3394,47 @@ } _data_->fields = (_vala_array_free (_data_->fields, _data_->fields_length1, (GDestroyNotify) g_free), NULL); } - _data_->_tmp69_ = _data_->prop_set; - _data_->_tmp70_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp69_); - _data_->_tmp71_ = _data_->_tmp70_; - _data_->_tmp72_ = NULL; - _data_->_tmp72_ = g_new0 (gchar*, (_data_->_tmp71_ + 1) + 1); + _data_->_tmp66_ = _data_->prop_set; + _data_->_tmp67_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp66_); + _data_->_tmp68_ = _data_->_tmp67_; + _data_->_tmp69_ = NULL; + _data_->_tmp69_ = g_new0 (gchar*, _data_->_tmp68_ + 1); _data_->self->priv->_always_writeable_properties = (_vala_array_free (_data_->self->priv->_always_writeable_properties, _data_->self->priv->_always_writeable_properties_length1, (GDestroyNotify) g_free), NULL); - _data_->self->priv->_always_writeable_properties = _data_->_tmp72_; - _data_->self->priv->_always_writeable_properties_length1 = _data_->_tmp71_ + 1; + _data_->self->priv->_always_writeable_properties = _data_->_tmp69_; + _data_->self->priv->_always_writeable_properties_length1 = _data_->_tmp68_; _data_->self->priv->__always_writeable_properties_size_ = _data_->self->priv->_always_writeable_properties_length1; _data_->i = (guint) 0; { - _data_->_tmp73_ = _data_->prop_set; - _data_->_tmp74_ = NULL; - _data_->_tmp74_ = gee_abstract_collection_iterator ((GeeAbstractCollection*) _data_->_tmp73_); - _data_->_final_prop_it = _data_->_tmp74_; + _data_->_tmp70_ = _data_->prop_set; + _data_->_tmp71_ = NULL; + _data_->_tmp71_ = gee_abstract_collection_iterator ((GeeAbstractCollection*) _data_->_tmp70_); + _data_->_final_prop_it = _data_->_tmp71_; while (TRUE) { - _data_->_tmp75_ = _data_->_final_prop_it; - _data_->_tmp76_ = FALSE; - _data_->_tmp76_ = gee_iterator_next (_data_->_tmp75_); - if (!_data_->_tmp76_) { + _data_->_tmp72_ = _data_->_final_prop_it; + _data_->_tmp73_ = FALSE; + _data_->_tmp73_ = gee_iterator_next (_data_->_tmp72_); + if (!_data_->_tmp73_) { break; } - _data_->_tmp77_ = _data_->_final_prop_it; - _data_->_tmp78_ = NULL; - _data_->_tmp78_ = gee_iterator_get (_data_->_tmp77_); - _data_->final_prop = (gchar*) _data_->_tmp78_; - _data_->_tmp79_ = _data_->self->priv->_always_writeable_properties; - _data_->_tmp79__length1 = _data_->self->priv->_always_writeable_properties_length1; - _data_->_tmp80_ = _data_->i; - _data_->i = _data_->_tmp80_ + 1; - _data_->_tmp81_ = _data_->final_prop; - _data_->_tmp82_ = g_strdup (_data_->_tmp81_); - _g_free0 (_data_->_tmp79_[_data_->_tmp80_]); - _data_->_tmp79_[_data_->_tmp80_] = _data_->_tmp82_; - _data_->_tmp83_ = _data_->_tmp79_[_data_->_tmp80_]; + _data_->_tmp74_ = _data_->_final_prop_it; + _data_->_tmp75_ = NULL; + _data_->_tmp75_ = gee_iterator_get (_data_->_tmp74_); + _data_->final_prop = (gchar*) _data_->_tmp75_; + _data_->_tmp76_ = _data_->self->priv->_always_writeable_properties; + _data_->_tmp76__length1 = _data_->self->priv->_always_writeable_properties_length1; + _data_->_tmp77_ = _data_->i; + _data_->i = _data_->_tmp77_ + 1; + _data_->_tmp78_ = _data_->final_prop; + _data_->_tmp79_ = g_strdup (_data_->_tmp78_); + _g_free0 (_data_->_tmp76_[_data_->_tmp77_]); + _data_->_tmp76_[_data_->_tmp77_] = _data_->_tmp79_; + _data_->_tmp80_ = _data_->_tmp76_[_data_->_tmp77_]; _g_free0 (_data_->final_prop); } _g_object_unref0 (_data_->_final_prop_it); } - _data_->_tmp84_ = _data_->self->priv->_always_writeable_properties; - _data_->_tmp84__length1 = _data_->self->priv->_always_writeable_properties_length1; - _data_->_tmp85_ = _data_->i; - _g_free0 (_data_->_tmp84_[_data_->_tmp85_]); - _data_->_tmp84_[_data_->_tmp85_] = NULL; - _data_->_tmp86_ = _data_->_tmp84_[_data_->_tmp85_]; _g_object_unref0 (_data_->prop_set); + _g_free0 (_data_->supported_fields); } goto __finally12; __catch12_g_error: @@ -3377,12 +3442,12 @@ _data_->e2 = _data_->_inner_error_; _data_->_inner_error_ = NULL; g_signal_emit_by_name ((FolksPersonaStore*) _data_->self, "removed"); - _data_->_tmp87_ = NULL; - _data_->_tmp87_ = _ ("Couldn't get address book capabilities: %s"); - _data_->_tmp88_ = _data_->e2; - _data_->_tmp89_ = _data_->_tmp88_->message; - _data_->_tmp90_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_INVALID_ARGUMENT, _data_->_tmp87_, _data_->_tmp89_); - _data_->_inner_error_ = _data_->_tmp90_; + _data_->_tmp81_ = NULL; + _data_->_tmp81_ = _ ("Couldn't get address book capabilities: %s"); + _data_->_tmp82_ = _data_->e2; + _data_->_tmp83_ = _data_->_tmp82_->message; + _data_->_tmp84_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_INVALID_ARGUMENT, _data_->_tmp81_, _data_->_tmp83_); + _data_->_inner_error_ = _data_->_tmp84_; _g_error_free0 (_data_->e2); goto __finally12; } @@ -3391,35 +3456,35 @@ _data_->self->priv->_prepare_pending = FALSE; } if (_data_->_inner_error_ != NULL) { - _g_free0 (_data_->supported_fields); goto __finally10; } _data_->do_initial_query = FALSE; { - _data_->_tmp91_ = _data_->self->priv->_addressbook; - _data_->_tmp92_ = NULL; + _data_->capabilities = NULL; + _data_->_tmp85_ = _data_->self->priv->_addressbook; + _data_->_tmp86_ = NULL; _data_->_state_ = 3; - e_client_get_backend_property ((EClient*) _data_->_tmp91_, "capabilities", NULL, edsf_persona_store_prepare_ready, _data_); + e_client_get_backend_property ((EClient*) E_BOOK_CLIENT (_data_->_tmp85_), "capabilities", NULL, edsf_persona_store_prepare_ready, _data_); return FALSE; _state_3: - e_client_get_backend_property_finish ((EClient*) _data_->_tmp91_, _data_->_res_, &_data_->_tmp92_, &_data_->_inner_error_); + e_client_get_backend_property_finish ((EClient*) E_BOOK_CLIENT (_data_->_tmp85_), _data_->_res_, &_data_->_tmp86_, &_data_->_inner_error_); _g_free0 (_data_->capabilities); - _data_->capabilities = _data_->_tmp92_; + _data_->capabilities = _data_->_tmp86_; if (_data_->_inner_error_ != NULL) { _g_free0 (_data_->capabilities); goto __catch13_g_error; } - _data_->_tmp93_ = _data_->capabilities; - if (_data_->_tmp93_ != NULL) { - _data_->_tmp94_ = _data_->capabilities; - _data_->_tmp96_ = NULL; - _data_->_tmp96_ = _data_->_tmp95_ = g_strsplit (_data_->_tmp94_, ",", 0); - _data_->caps = _data_->_tmp96_; - _data_->caps_length1 = _vala_array_length (_data_->_tmp95_); + _data_->_tmp87_ = _data_->capabilities; + if (_data_->_tmp87_ != NULL) { + _data_->_tmp88_ = _data_->capabilities; + _data_->_tmp90_ = NULL; + _data_->_tmp90_ = _data_->_tmp89_ = g_strsplit ((const gchar*) _data_->_tmp88_, ",", 0); + _data_->caps = _data_->_tmp90_; + _data_->caps_length1 = _vala_array_length (_data_->_tmp89_); _data_->_caps_size_ = _data_->caps_length1; - _data_->_tmp97_ = _data_->caps; - _data_->_tmp97__length1 = _data_->caps_length1; - _data_->do_initial_query = _vala_string_array_contains (_data_->_tmp97_, _data_->_tmp97__length1, "do-initial-query"); + _data_->_tmp91_ = _data_->caps; + _data_->_tmp91__length1 = _data_->caps_length1; + _data_->do_initial_query = _vala_string_array_contains (_data_->_tmp91_, _data_->_tmp91__length1, "do-initial-query"); _data_->caps = (_vala_array_free (_data_->caps, _data_->caps_length1, (GDestroyNotify) g_free), NULL); } _g_free0 (_data_->capabilities); @@ -3430,12 +3495,12 @@ _data_->e4 = _data_->_inner_error_; _data_->_inner_error_ = NULL; g_signal_emit_by_name ((FolksPersonaStore*) _data_->self, "removed"); - _data_->_tmp98_ = NULL; - _data_->_tmp98_ = _ ("Couldn't get address book capabilities: %s"); - _data_->_tmp99_ = _data_->e4; - _data_->_tmp100_ = _data_->_tmp99_->message; - _data_->_tmp101_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_INVALID_ARGUMENT, _data_->_tmp98_, _data_->_tmp100_); - _data_->_inner_error_ = _data_->_tmp101_; + _data_->_tmp92_ = NULL; + _data_->_tmp92_ = _ ("Couldn't get address book capabilities: %s"); + _data_->_tmp93_ = _data_->e4; + _data_->_tmp94_ = _data_->_tmp93_->message; + _data_->_tmp95_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_INVALID_ARGUMENT, _data_->_tmp92_, _data_->_tmp94_); + _data_->_inner_error_ = _data_->_tmp95_; _g_error_free0 (_data_->e4); goto __finally13; } @@ -3444,45 +3509,46 @@ _data_->self->priv->_prepare_pending = FALSE; } if (_data_->_inner_error_ != NULL) { - _g_free0 (_data_->supported_fields); goto __finally10; } _data_->got_view = FALSE; { - _data_->_tmp102_ = _data_->self->priv->_addressbook; - _data_->_tmp103_ = _data_->self->priv->_query_str; - _data_->_tmp104_ = NULL; + _data_->_tmp96_ = _data_->self->priv->_addressbook; + _data_->_tmp97_ = _data_->self->priv->_query_str; + _data_->_tmp98_ = NULL; _data_->_state_ = 4; - e_book_client_get_view (_data_->_tmp102_, _data_->_tmp103_, NULL, edsf_persona_store_prepare_ready, _data_); + e_book_client_get_view (E_BOOK_CLIENT (_data_->_tmp96_), _data_->_tmp97_, NULL, edsf_persona_store_prepare_ready, _data_); return FALSE; _state_4: - _data_->_tmp105_ = FALSE; - _data_->_tmp105_ = e_book_client_get_view_finish (_data_->_tmp102_, _data_->_res_, &_data_->_tmp104_, &_data_->_inner_error_); + _data_->_tmp99_ = FALSE; + _data_->_tmp99_ = e_book_client_get_view_finish (E_BOOK_CLIENT (_data_->_tmp96_), _data_->_res_, &_data_->_tmp98_, &_data_->_inner_error_); _g_object_unref0 (_data_->self->priv->_ebookview); - _data_->self->priv->_ebookview = _data_->_tmp104_; - _data_->_tmp106_ = _data_->_tmp105_; + _data_->self->priv->_ebookview = _data_->_tmp98_; + _data_->_tmp100_ = _data_->_tmp99_; if (_data_->_inner_error_ != NULL) { goto __catch14_g_error; } - _data_->got_view = _data_->_tmp106_; - _data_->_tmp107_ = _data_->got_view; - if (_data_->_tmp107_ == FALSE) { - _data_->_tmp108_ = NULL; - _data_->_tmp108_ = _ ("Couldn't get view for address book ‘%s’."); - _data_->_tmp109_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); - _data_->_tmp110_ = _data_->_tmp109_; - _data_->_tmp111_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_INVALID_ARGUMENT, _data_->_tmp108_, _data_->_tmp110_); - _data_->_inner_error_ = _data_->_tmp111_; + _data_->got_view = _data_->_tmp100_; + _data_->_tmp101_ = _data_->got_view; + if (_data_->_tmp101_ == FALSE) { + _data_->_tmp102_ = NULL; + _data_->_tmp102_ = _ ("Couldn't get view for address book ‘%s’."); + _data_->_tmp103_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); + _data_->_tmp104_ = _data_->_tmp103_; + _data_->_tmp105_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_INVALID_ARGUMENT, _data_->_tmp102_, _data_->_tmp104_); + _data_->_inner_error_ = _data_->_tmp105_; goto __catch14_g_error; } - _data_->_tmp112_ = _data_->self->priv->_ebookview; - g_signal_connect_object (_data_->_tmp112_, "objects-added", (GCallback) __edsf_persona_store_contacts_added_cb_e_book_client_view_objects_added, _data_->self, 0); - _data_->_tmp113_ = _data_->self->priv->_ebookview; - g_signal_connect_object (_data_->_tmp113_, "objects-removed", (GCallback) __edsf_persona_store_contacts_removed_cb_e_book_client_view_objects_removed, _data_->self, 0); - _data_->_tmp114_ = _data_->self->priv->_ebookview; - g_signal_connect_object (_data_->_tmp114_, "objects-modified", (GCallback) __edsf_persona_store_contacts_changed_cb_e_book_client_view_objects_modified, _data_->self, 0); - _data_->_tmp115_ = _data_->self->priv->_ebookview; - e_book_client_view_start (_data_->_tmp115_, &_data_->_inner_error_); + _data_->_tmp106_ = _data_->self->priv->_ebookview; + g_signal_connect_object (E_BOOK_CLIENT_VIEW (_data_->_tmp106_), "objects-added", (GCallback) __edsf_persona_store_contacts_added_cb_e_book_client_view_objects_added, _data_->self, 0); + _data_->_tmp107_ = _data_->self->priv->_ebookview; + g_signal_connect_object (E_BOOK_CLIENT_VIEW (_data_->_tmp107_), "objects-removed", (GCallback) __edsf_persona_store_contacts_removed_cb_e_book_client_view_objects_removed, _data_->self, 0); + _data_->_tmp108_ = _data_->self->priv->_ebookview; + g_signal_connect_object (E_BOOK_CLIENT_VIEW (_data_->_tmp108_), "objects-modified", (GCallback) __edsf_persona_store_contacts_changed_cb_e_book_client_view_objects_modified, _data_->self, 0); + _data_->_tmp109_ = _data_->self->priv->_ebookview; + g_signal_connect_object (E_BOOK_CLIENT_VIEW (_data_->_tmp109_), "complete", (GCallback) __edsf_persona_store_contacts_complete_cb_e_book_client_view_complete, _data_->self, 0); + _data_->_tmp110_ = _data_->self->priv->_ebookview; + e_book_client_view_start (E_BOOK_CLIENT_VIEW (_data_->_tmp110_), &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { goto __catch14_g_error; } @@ -3493,14 +3559,14 @@ _data_->e3 = _data_->_inner_error_; _data_->_inner_error_ = NULL; g_signal_emit_by_name ((FolksPersonaStore*) _data_->self, "removed"); - _data_->_tmp116_ = _data_->e3; - _data_->_tmp117_ = _data_->_tmp116_->domain; - _data_->_tmp118_ = 0U; - _data_->_tmp118_ = e_book_client_error_quark (); - if (_data_->_tmp117_ == _data_->_tmp118_) { - _data_->_tmp119_ = _data_->e3; - _data_->_tmp120_ = _data_->_tmp119_->code; - switch ((EBookClientError) _data_->_tmp120_) { + _data_->_tmp111_ = _data_->e3; + _data_->_tmp112_ = _data_->_tmp111_->domain; + _data_->_tmp113_ = 0U; + _data_->_tmp113_ = e_book_client_error_quark (); + if (_data_->_tmp112_ == _data_->_tmp113_) { + _data_->_tmp114_ = _data_->e3; + _data_->_tmp115_ = _data_->_tmp114_->code; + switch ((EBookClientError) _data_->_tmp115_) { default: case E_BOOK_CLIENT_ERROR_NO_SUCH_BOOK: case E_BOOK_CLIENT_ERROR_NO_SUCH_SOURCE: @@ -3512,35 +3578,35 @@ } } } else { - _data_->_tmp121_ = _data_->e3; - _data_->_tmp122_ = _data_->_tmp121_->domain; - _data_->_tmp123_ = 0U; - _data_->_tmp123_ = e_client_error_quark (); - if (_data_->_tmp122_ == _data_->_tmp123_) { - _data_->_tmp124_ = _data_->e3; - _data_->_tmp125_ = _data_->_tmp124_->code; - switch ((EClientError) _data_->_tmp125_) { + _data_->_tmp116_ = _data_->e3; + _data_->_tmp117_ = _data_->_tmp116_->domain; + _data_->_tmp118_ = 0U; + _data_->_tmp118_ = e_client_error_quark (); + if (_data_->_tmp117_ == _data_->_tmp118_) { + _data_->_tmp119_ = _data_->e3; + _data_->_tmp120_ = _data_->_tmp119_->code; + switch ((EClientError) _data_->_tmp120_) { case E_CLIENT_ERROR_REPOSITORY_OFFLINE: { - _data_->_tmp126_ = NULL; - _data_->_tmp126_ = _ ("Address book ‘%s’ is offline."); - _data_->_tmp127_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); - _data_->_tmp128_ = _data_->_tmp127_; - _data_->_tmp129_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_STORE_OFFLINE, _data_->_tmp126_, _data_->_tmp128_); - _data_->_inner_error_ = _data_->_tmp129_; + _data_->_tmp121_ = NULL; + _data_->_tmp121_ = _ ("Address book ‘%s’ is offline."); + _data_->_tmp122_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); + _data_->_tmp123_ = _data_->_tmp122_; + _data_->_tmp124_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_STORE_OFFLINE, _data_->_tmp121_, _data_->_tmp123_); + _data_->_inner_error_ = _data_->_tmp124_; _g_error_free0 (_data_->e3); goto __finally14; } case E_CLIENT_ERROR_PERMISSION_DENIED: { - _data_->_tmp130_ = NULL; - _data_->_tmp130_ = _ ("Permission denied to open address book ‘%s’: %s"); - _data_->_tmp131_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); - _data_->_tmp132_ = _data_->_tmp131_; - _data_->_tmp133_ = _data_->e3; - _data_->_tmp134_ = _data_->_tmp133_->message; - _data_->_tmp135_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_PERMISSION_DENIED, _data_->_tmp130_, _data_->_tmp132_, _data_->_tmp134_); - _data_->_inner_error_ = _data_->_tmp135_; + _data_->_tmp125_ = NULL; + _data_->_tmp125_ = _ ("Permission denied to open address book ‘%s’: %s"); + _data_->_tmp126_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); + _data_->_tmp127_ = _data_->_tmp126_; + _data_->_tmp128_ = _data_->e3; + _data_->_tmp129_ = _data_->_tmp128_->message; + _data_->_tmp130_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_PERMISSION_DENIED, _data_->_tmp125_, _data_->_tmp127_, _data_->_tmp129_); + _data_->_inner_error_ = _data_->_tmp130_; _g_error_free0 (_data_->e3); goto __finally14; } @@ -3566,14 +3632,14 @@ } } } - _data_->_tmp136_ = NULL; - _data_->_tmp136_ = _ ("Couldn't get view for address book ‘%s’: %s"); - _data_->_tmp137_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); - _data_->_tmp138_ = _data_->_tmp137_; - _data_->_tmp139_ = _data_->e3; - _data_->_tmp140_ = _data_->_tmp139_->message; - _data_->_tmp141_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_INVALID_ARGUMENT, _data_->_tmp136_, _data_->_tmp138_, _data_->_tmp140_); - _data_->_inner_error_ = _data_->_tmp141_; + _data_->_tmp131_ = NULL; + _data_->_tmp131_ = _ ("Couldn't get view for address book ‘%s’: %s"); + _data_->_tmp132_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); + _data_->_tmp133_ = _data_->_tmp132_; + _data_->_tmp134_ = _data_->e3; + _data_->_tmp135_ = _data_->_tmp134_->message; + _data_->_tmp136_ = g_error_new (FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_INVALID_ARGUMENT, _data_->_tmp131_, _data_->_tmp133_, _data_->_tmp135_); + _data_->_inner_error_ = _data_->_tmp136_; _g_error_free0 (_data_->e3); goto __finally14; } @@ -3582,49 +3648,251 @@ _data_->self->priv->_prepare_pending = FALSE; } if (_data_->_inner_error_ != NULL) { - _g_free0 (_data_->supported_fields); goto __finally10; } _data_->self->priv->_is_prepared = TRUE; _data_->self->priv->_prepare_pending = FALSE; g_object_notify ((GObject*) _data_->self, "is-prepared"); - _data_->_tmp143_ = _data_->do_initial_query; - if (_data_->_tmp143_ == FALSE) { - _data_->_tmp144_ = _data_->self->priv->_is_quiescent; - _data_->_tmp142_ = _data_->_tmp144_ == FALSE; + _data_->_tmp138_ = _data_->do_initial_query; + if (_data_->_tmp138_ == FALSE) { + _data_->_tmp139_ = _data_->self->priv->_is_quiescent; + _data_->_tmp137_ = _data_->_tmp139_ == FALSE; } else { - _data_->_tmp142_ = FALSE; + _data_->_tmp137_ = FALSE; } - _data_->_tmp145_ = _data_->_tmp142_; - if (_data_->_tmp145_) { + _data_->_tmp140_ = _data_->_tmp137_; + if (_data_->_tmp140_) { _data_->self->priv->_is_quiescent = TRUE; g_object_notify ((GObject*) _data_->self, "is-quiescent"); } - _g_free0 (_data_->supported_fields); } - __finally10: - { - _data_->_tmp146_ = _data_->self->priv->_is_prepared; - g_static_rec_mutex_unlock (&_data_->self->priv->__lock__is_prepared); + __finally10: + { + _data_->_tmp141_ = _data_->self->priv->_is_prepared; + g_static_rec_mutex_unlock (&_data_->self->priv->__lock__is_prepared); + } + if (_data_->_inner_error_ != NULL) { + if (_data_->_inner_error_->domain == FOLKS_PERSONA_STORE_ERROR) { + g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); + g_error_free (_data_->_inner_error_); + if (_data_->_state_ == 0) { + g_simple_async_result_complete_in_idle (_data_->_async_result); + } else { + g_simple_async_result_complete (_data_->_async_result); + } + g_object_unref (_data_->_async_result); + return FALSE; + } else { + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); + g_clear_error (&_data_->_inner_error_); + return FALSE; + } + } + } + if (_data_->_state_ == 0) { + g_simple_async_result_complete_in_idle (_data_->_async_result); + } else { + g_simple_async_result_complete (_data_->_async_result); + } + g_object_unref (_data_->_async_result); + return FALSE; +} + + +static gboolean _edsf_persona_store_address_book_authenticate_cb (EdsfPersonaStore* self, EClient* address_book, void* credentials) { + gboolean result = FALSE; + g_return_val_if_fail (self != NULL, FALSE); + g_return_val_if_fail (address_book != NULL, FALSE); + result = FALSE; + return result; +} + + +static void _edsf_persona_store_open_address_book_data_free (gpointer _data) { + EdsfPersonaStoreOpenAddressBookData* _data_; + _data_ = _data; + _g_object_unref0 (_data_->self); + g_slice_free (EdsfPersonaStoreOpenAddressBookData, _data_); +} + + +static void _edsf_persona_store_open_address_book (EdsfPersonaStore* self, GAsyncReadyCallback _callback_, gpointer _user_data_) { + EdsfPersonaStoreOpenAddressBookData* _data_; + EdsfPersonaStore* _tmp0_; + _data_ = g_slice_new0 (EdsfPersonaStoreOpenAddressBookData); + _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _edsf_persona_store_open_address_book); + g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _edsf_persona_store_open_address_book_data_free); + _tmp0_ = _g_object_ref0 (self); + _data_->self = _tmp0_; + _edsf_persona_store_open_address_book_co (_data_); +} + + +static void _edsf_persona_store_open_address_book_finish (EdsfPersonaStore* self, GAsyncResult* _res_, GError** error) { + EdsfPersonaStoreOpenAddressBookData* _data_; + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { + return; + } + _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); +} + + +static void _edsf_persona_store_open_address_book_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { + EdsfPersonaStoreOpenAddressBookData* _data_; + _data_ = _user_data_; + _data_->_source_object_ = source_object; + _data_->_res_ = _res_; + _edsf_persona_store_open_address_book_co (_data_); +} + + +static gpointer _g_error_copy0 (gpointer self) { + return self ? g_error_copy (self) : NULL; +} + + +static gboolean __edsf_persona_store_open_address_book_co_gsource_func (gpointer self) { + gboolean result; + result = _edsf_persona_store_open_address_book_co (self); + return result; +} + + +static gboolean _edsf_persona_store_open_address_book_co (EdsfPersonaStoreOpenAddressBookData* _data_) { + switch (_data_->_state_) { + case 0: + goto _state_0; + case 1: + goto _state_1; + case 2: + goto _state_2; + default: + g_assert_not_reached (); + } + _state_0: + _data_->err_out = NULL; + _data_->_tmp0_ = _data_->self->priv->_addressbook; + _data_->_tmp1_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); + _data_->_tmp2_ = _data_->_tmp1_; + g_debug ("edsf-persona-store.vala:928: Opening address book %p for persona store" \ +" ‘%s’ (%p)", _data_->_tmp0_, _data_->_tmp2_, _data_->self); + _data_->_tmp3_ = _data_->self->priv->_addressbook; + _data_->_tmp4_ = 0UL; + _data_->_tmp4_ = g_signal_connect_swapped (E_BOOK_CLIENT (_data_->_tmp3_), "opened", (GCallback) _edsf_persona_store_address_book_opened_cb, _data_->self); + _data_->signal_id = _data_->_tmp4_; + { + _g_error_free0 (_data_->self->priv->_open_address_book_error); + _data_->self->priv->_open_address_book_error = NULL; + _data_->_tmp5_ = _data_->self->priv->_addressbook; + _data_->_state_ = 1; + e_client_open ((EClient*) E_BOOK_CLIENT (_data_->_tmp5_), FALSE, NULL, _edsf_persona_store_open_address_book_ready, _data_); + return FALSE; + _state_1: + e_client_open_finish ((EClient*) E_BOOK_CLIENT (_data_->_tmp5_), _data_->_res_, &_data_->_inner_error_); + if (_data_->_inner_error_ != NULL) { + goto __catch15_g_error; + } + _data_->_tmp6_ = _data_->self->priv->_open_address_book_error; + if (_data_->_tmp6_ != NULL) { + _data_->_tmp7_ = _data_->self->priv->_open_address_book_error; + _data_->_tmp8_ = _g_error_copy0 (_data_->_tmp7_); + _data_->_inner_error_ = _data_->_tmp8_; + goto __catch15_g_error; } - if (_data_->_inner_error_ != NULL) { - if (_data_->_inner_error_->domain == FOLKS_PERSONA_STORE_ERROR) { - g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); - g_error_free (_data_->_inner_error_); - if (_data_->_state_ == 0) { - g_simple_async_result_complete_in_idle (_data_->_async_result); - } else { - g_simple_async_result_complete (_data_->_async_result); - } - g_object_unref (_data_->_async_result); - return FALSE; - } else { - g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); - g_clear_error (&_data_->_inner_error_); - return FALSE; - } + } + goto __finally15; + __catch15_g_error: + { + _data_->e1 = _data_->_inner_error_; + _data_->_inner_error_ = NULL; + _data_->_tmp10_ = _data_->e1; + _data_->_tmp11_ = _data_->_tmp10_->domain; + _data_->_tmp12_ = 0U; + _data_->_tmp12_ = e_client_error_quark (); + if (_data_->_tmp11_ == _data_->_tmp12_) { + _data_->_tmp13_ = _data_->e1; + _data_->_tmp14_ = _data_->_tmp13_->code; + _data_->_tmp9_ = ((EClientError) _data_->_tmp14_) == E_CLIENT_ERROR_BUSY; + } else { + _data_->_tmp9_ = FALSE; + } + _data_->_tmp15_ = _data_->_tmp9_; + if (_data_->_tmp15_) { + (_data_->self->priv->_open_address_book_callback_target_destroy_notify == NULL) ? NULL : (_data_->self->priv->_open_address_book_callback_target_destroy_notify (_data_->self->priv->_open_address_book_callback_target), NULL); + _data_->self->priv->_open_address_book_callback = NULL; + _data_->self->priv->_open_address_book_callback_target = NULL; + _data_->self->priv->_open_address_book_callback_target_destroy_notify = NULL; + _data_->self->priv->_open_address_book_callback = __edsf_persona_store_open_address_book_co_gsource_func; + _data_->self->priv->_open_address_book_callback_target = _data_; + _data_->self->priv->_open_address_book_callback_target_destroy_notify = NULL; + _g_error_free0 (_data_->self->priv->_open_address_book_error); + _data_->self->priv->_open_address_book_error = NULL; + _data_->_tmp16_ = _data_->self->priv->_addressbook; + _data_->_tmp17_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); + _data_->_tmp18_ = _data_->_tmp17_; + g_debug ("Yielding on opening address book %p for persona store " "‘%s’ (%p)", _data_->_tmp16_, _data_->_tmp18_, _data_->self); + _data_->_state_ = 2; + return FALSE; + _state_2: + ; + _data_->_tmp19_ = _data_->self->priv->_open_address_book_error; + _data_->_tmp20_ = _g_error_copy0 (_data_->_tmp19_); + _g_error_free0 (_data_->err_out); + _data_->err_out = _data_->_tmp20_; + } else { + _data_->_tmp21_ = _data_->e1; + _data_->_tmp22_ = _g_error_copy0 (_data_->_tmp21_); + _g_error_free0 (_data_->err_out); + _data_->err_out = _data_->_tmp22_; + } + _data_->_tmp23_ = _data_->err_out; + if (_data_->_tmp23_ != NULL) { + _data_->_tmp24_ = _data_->err_out; + _data_->_tmp25_ = _g_error_copy0 (_data_->_tmp24_); + _data_->_inner_error_ = _data_->_tmp25_; + _g_error_free0 (_data_->e1); + goto __finally15; + } + _g_error_free0 (_data_->e1); + } + __finally15: + { + _data_->_tmp26_ = _data_->self->priv->_addressbook; + _data_->_tmp27_ = _data_->signal_id; + g_signal_handler_disconnect ((GObject*) E_BOOK_CLIENT (_data_->_tmp26_), _data_->_tmp27_); + _data_->_tmp29_ = _data_->self->priv->_addressbook; + _data_->_tmp30_ = FALSE; + _data_->_tmp30_ = e_client_is_opened ((EClient*) E_BOOK_CLIENT (_data_->_tmp29_)); + if (_data_->_tmp30_ == FALSE) { + _data_->_tmp31_ = _data_->err_out; + _data_->_tmp28_ = _data_->_tmp31_ == NULL; + } else { + _data_->_tmp28_ = FALSE; + } + _data_->_tmp32_ = _data_->_tmp28_; + if (_data_->_tmp32_) { + _data_->_tmp33_ = 0U; + _data_->_tmp33_ = e_client_error_quark (); + _data_->_tmp34_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); + _data_->_tmp35_ = _data_->_tmp34_; + _data_->_tmp36_ = g_error_new (_data_->_tmp33_, (gint) E_CLIENT_ERROR_OTHER_ERROR, "Misbehaving EDS backend: %s.", _data_->_tmp35_); + _g_error_free0 (_data_->err_out); + _data_->err_out = _data_->_tmp36_; + } + } + if (_data_->_inner_error_ != NULL) { + g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); + g_error_free (_data_->_inner_error_); + _g_error_free0 (_data_->err_out); + if (_data_->_state_ == 0) { + g_simple_async_result_complete_in_idle (_data_->_async_result); + } else { + g_simple_async_result_complete (_data_->_async_result); } + g_object_unref (_data_->_async_result); + return FALSE; } + _g_error_free0 (_data_->err_out); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); } else { @@ -3635,6 +3903,38 @@ } +static void _edsf_persona_store_address_book_opened_cb (EdsfPersonaStore* self, GError* err, EBookClient* address_book) { + const gchar* _tmp0_; + const gchar* _tmp1_; + EBookClient* _tmp2_; + GError* _tmp3_; + GError* _tmp4_; + GError* _tmp5_; + GSourceFunc _tmp6_; + void* _tmp6__target; + g_return_if_fail (self != NULL); + g_return_if_fail (address_book != NULL); + _tmp0_ = folks_persona_store_get_id ((FolksPersonaStore*) self); + _tmp1_ = _tmp0_; + _tmp2_ = address_book; + _tmp3_ = err; + g_debug ("_address_book_opened_cb for store ‘%s’ (%p), address book %p " "and error %p", _tmp1_, self, _tmp2_, (void*) _tmp3_); + _tmp4_ = err; + _tmp5_ = _g_error_copy0 (_tmp4_); + _g_error_free0 (self->priv->_open_address_book_error); + self->priv->_open_address_book_error = _tmp5_; + _tmp6_ = self->priv->_open_address_book_callback; + _tmp6__target = self->priv->_open_address_book_callback_target; + if (_tmp6_ != NULL) { + GSourceFunc _tmp7_; + void* _tmp7__target; + _tmp7_ = self->priv->_open_address_book_callback; + _tmp7__target = self->priv->_open_address_book_callback_target; + _tmp7_ (_tmp7__target); + } +} + + static FolksPersonaDetail _edsf_persona_store_eds_field_name_to_folks_persona_detail (EdsfPersonaStore* self, const gchar* eds_field_name) { FolksPersonaDetail result = 0; const gchar* _tmp0_; @@ -3655,6 +3955,7 @@ } case E_CONTACT_GIVEN_NAME: case E_CONTACT_FAMILY_NAME: + case E_CONTACT_NAME: { result = FOLKS_PERSONA_DETAIL_STRUCTURED_NAME; return result; @@ -3795,6 +4096,13 @@ case E_CONTACT_IM_SKYPE_WORK_2: case E_CONTACT_IM_SKYPE_WORK_3: case E_CONTACT_IM_SKYPE: + case E_CONTACT_IM_GOOGLE_TALK_HOME_1: + case E_CONTACT_IM_GOOGLE_TALK_HOME_2: + case E_CONTACT_IM_GOOGLE_TALK_HOME_3: + case E_CONTACT_IM_GOOGLE_TALK_WORK_1: + case E_CONTACT_IM_GOOGLE_TALK_WORK_2: + case E_CONTACT_IM_GOOGLE_TALK_WORK_3: + case E_CONTACT_IM_GOOGLE_TALK: { result = FOLKS_PERSONA_DETAIL_IM_ADDRESSES; return result; @@ -3809,18 +4117,21 @@ result = FOLKS_PERSONA_DETAIL_BIRTHDAY; return result; } - default: case E_CONTACT_UID: - case E_CONTACT_FILE_AS: + case E_CONTACT_REV: case E_CONTACT_BOOK_URI: + case E_CONTACT_NAME_OR_ORG: + { + result = FOLKS_PERSONA_DETAIL_INVALID; + return result; + } + default: + case E_CONTACT_FILE_AS: case E_CONTACT_MAILER: case E_CONTACT_CALENDAR_URI: case E_CONTACT_ICS_CALENDAR: case E_CONTACT_SPOUSE: - case E_CONTACT_REV: - case E_CONTACT_NAME_OR_ORG: case E_CONTACT_LOGO: - case E_CONTACT_NAME: case E_CONTACT_WANTS_HTML: case E_CONTACT_IS_LIST: case E_CONTACT_LIST_SHOW_ADDRESSES: @@ -3830,7 +4141,7 @@ { const gchar* _tmp3_; _tmp3_ = eds_field_name; - g_debug ("edsf-persona-store.vala:1016: Unsupported/Unknown EDS field name '%s'.", _tmp3_); + g_debug ("edsf-persona-store.vala:1176: Unsupported/Unknown EDS field name '%s'.", _tmp3_); result = FOLKS_PERSONA_DETAIL_INVALID; return result; } @@ -3854,7 +4165,7 @@ EdsfPersona* _tmp1_; EdsfPersona* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; _data_ = g_slice_new0 (EdsfPersonaStoreCommitModifiedPropertyData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _edsf_persona_store_commit_modified_property); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _edsf_persona_store_commit_modified_property_data_free); @@ -3887,7 +4198,9 @@ static void block2_data_unref (Block2Data* _data2_) { if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { - _g_object_unref0 (_data2_->self); + EdsfPersonaStore * self; + self = _data2_->self; + _g_object_unref0 (self); g_slice_free (Block2Data, _data2_); } } @@ -3901,6 +4214,8 @@ static void block3_data_unref (Block3Data* _data3_) { if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { + EdsfPersonaStore * self; + self = _data3_->_data2_->self; block2_data_unref (_data3_->_data2_); _data3_->_data2_ = NULL; g_slice_free (Block3Data, _data3_); @@ -3908,7 +4223,7 @@ } -static void ___lambda5_ (Block3Data* _data3_, GObject* obj, GParamSpec* pspec) { +static void ___lambda6_ (Block3Data* _data3_, GObject* obj, GParamSpec* pspec) { Block2Data* _data2_; EdsfPersonaStore * self; gboolean _tmp0_; @@ -3924,8 +4239,8 @@ } -static void ____lambda5__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { - ___lambda5_ (self, _sender, pspec); +static void ____lambda6__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + ___lambda6_ (self, _sender, pspec); } @@ -3938,7 +4253,7 @@ } -static gboolean ___lambda6_ (Block3Data* _data3_) { +static gboolean ___lambda7_ (Block3Data* _data3_) { Block2Data* _data2_; EdsfPersonaStore * self; gboolean result = FALSE; @@ -3954,9 +4269,9 @@ } -static gboolean ____lambda6__gsource_func (gpointer self) { +static gboolean ____lambda7__gsource_func (gpointer self) { gboolean result; - result = ___lambda6_ (self); + result = ___lambda7_ (self); return result; } @@ -3977,11 +4292,13 @@ _data_->_data2_->_ref_count_ = 1; _data_->_data2_->self = g_object_ref (_data_->self); _data_->_data2_->_async_data_ = _data_; - _data_->_tmp0_ = _data_->persona; - _data_->_tmp1_ = edsf_persona_get_contact (_data_->_tmp0_); - _data_->_tmp2_ = _data_->_tmp1_; - _data_->_tmp3_ = _g_object_ref0 (_data_->_tmp2_); - _data_->contact = _data_->_tmp3_; + _data_->_tmp0_ = _data_->self->priv->_addressbook; + g_assert (_data_->_tmp0_ != NULL); + _data_->_tmp1_ = _data_->persona; + _data_->_tmp2_ = edsf_persona_get_contact (_data_->_tmp1_); + _data_->_tmp3_ = _data_->_tmp2_; + _data_->_tmp4_ = _g_object_ref0 (_data_->_tmp3_); + _data_->contact = _data_->_tmp4_; _data_->signal_id = (gulong) 0; _data_->timeout_id = (guint) 0; { @@ -3990,70 +4307,70 @@ _data_->_data3_->_data2_ = block2_data_ref (_data_->_data2_); _data_->_data3_->received_notification = FALSE; _data_->_data3_->has_yielded = FALSE; - _data_->_tmp4_ = _data_->persona; - _data_->_tmp5_ = _data_->property_name; - _data_->_tmp6_ = g_strconcat ("notify::", _data_->_tmp5_, NULL); - _data_->_tmp7_ = 0UL; - _data_->_tmp7_ = g_signal_connect_data ((GObject*) _data_->_tmp4_, _data_->_tmp6_, (GCallback) ____lambda5__g_object_notify, block3_data_ref (_data_->_data3_), (GClosureNotify) block3_data_unref, 0); - _data_->signal_id = _data_->_tmp7_; - _g_free0 (_data_->_tmp6_); - _data_->_tmp8_ = _data_->self->priv->_addressbook; - _data_->_tmp9_ = _data_->contact; + _data_->_tmp5_ = _data_->persona; + _data_->_tmp6_ = _data_->property_name; + _data_->_tmp7_ = g_strconcat ("notify::", _data_->_tmp6_, NULL); + _data_->_tmp8_ = 0UL; + _data_->_tmp8_ = g_signal_connect_data ((GObject*) _data_->_tmp5_, _data_->_tmp7_, (GCallback) ____lambda6__g_object_notify, block3_data_ref (_data_->_data3_), (GClosureNotify) block3_data_unref, 0); + _data_->signal_id = _data_->_tmp8_; + _g_free0 (_data_->_tmp7_); + _data_->_tmp9_ = _data_->self->priv->_addressbook; + _data_->_tmp10_ = _data_->contact; _data_->_state_ = 1; - e_book_client_modify_contact (_data_->_tmp8_, _data_->_tmp9_, NULL, _edsf_persona_store_commit_modified_property_ready, _data_); + e_book_client_modify_contact (E_BOOK_CLIENT (_data_->_tmp9_), _data_->_tmp10_, NULL, _edsf_persona_store_commit_modified_property_ready, _data_); return FALSE; _state_1: - e_book_client_modify_contact_finish (_data_->_tmp8_, _data_->_res_, &_data_->_inner_error_); + e_book_client_modify_contact_finish (E_BOOK_CLIENT (_data_->_tmp9_), _data_->_res_, &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { block3_data_unref (_data_->_data3_); _data_->_data3_ = NULL; - goto __catch15_g_error; + goto __catch16_g_error; } - _data_->_tmp10_ = 0U; - _data_->_tmp10_ = g_timeout_add_seconds_full (G_PRIORITY_LOW, EDSF_PERSONA_STORE__property_change_timeout, ____lambda6__gsource_func, block3_data_ref (_data_->_data3_), block3_data_unref); - _data_->timeout_id = _data_->_tmp10_; - _data_->_tmp11_ = _data_->_data3_->received_notification; - if (_data_->_tmp11_ == FALSE) { + _data_->_tmp11_ = 0U; + _data_->_tmp11_ = g_timeout_add_seconds_full (G_PRIORITY_LOW, EDSF_PERSONA_STORE__property_change_timeout, ____lambda7__gsource_func, block3_data_ref (_data_->_data3_), block3_data_unref); + _data_->timeout_id = _data_->_tmp11_; + _data_->_tmp12_ = _data_->_data3_->received_notification; + if (_data_->_tmp12_ == FALSE) { _data_->_data3_->has_yielded = TRUE; _data_->_state_ = 2; return FALSE; _state_2: ; } - _data_->_tmp12_ = _data_->_data3_->received_notification; - if (_data_->_tmp12_ == FALSE) { - _data_->_tmp13_ = NULL; - _data_->_tmp13_ = _ ("Changing the ‘%s’ property failed due to reaching the timeout."); - _data_->_tmp14_ = _data_->property_name; - _data_->_tmp15_ = g_error_new (FOLKS_PROPERTY_ERROR, FOLKS_PROPERTY_ERROR_UNKNOWN_ERROR, _data_->_tmp13_, _data_->_tmp14_); - _data_->_inner_error_ = _data_->_tmp15_; + _data_->_tmp13_ = _data_->_data3_->received_notification; + if (_data_->_tmp13_ == FALSE) { + _data_->_tmp14_ = NULL; + _data_->_tmp14_ = _ ("Changing the ‘%s’ property failed due to reaching the timeout."); + _data_->_tmp15_ = _data_->property_name; + _data_->_tmp16_ = g_error_new (FOLKS_PROPERTY_ERROR, FOLKS_PROPERTY_ERROR_UNKNOWN_ERROR, _data_->_tmp14_, _data_->_tmp15_); + _data_->_inner_error_ = _data_->_tmp16_; block3_data_unref (_data_->_data3_); _data_->_data3_ = NULL; - goto __catch15_g_error; + goto __catch16_g_error; } block3_data_unref (_data_->_data3_); _data_->_data3_ = NULL; } - goto __finally15; - __catch15_g_error: + goto __finally16; + __catch16_g_error: { _data_->e = _data_->_inner_error_; _data_->_inner_error_ = NULL; - _data_->_tmp16_ = _data_->property_name; - _data_->_tmp17_ = _data_->e; - _data_->_tmp18_ = NULL; - _data_->_tmp18_ = edsf_persona_store_e_client_error_to_property_error (_data_->self, _data_->_tmp16_, _data_->_tmp17_); - _data_->_inner_error_ = _data_->_tmp18_; + _data_->_tmp17_ = _data_->property_name; + _data_->_tmp18_ = _data_->e; + _data_->_tmp19_ = NULL; + _data_->_tmp19_ = edsf_persona_store_e_client_error_to_property_error (_data_->self, _data_->_tmp17_, _data_->_tmp18_); + _data_->_inner_error_ = _data_->_tmp19_; _g_error_free0 (_data_->e); - goto __finally15; + goto __finally16; } - __finally15: + __finally16: { - _data_->_tmp19_ = _data_->persona; - _data_->_tmp20_ = _data_->signal_id; - g_signal_handler_disconnect ((GObject*) _data_->_tmp19_, _data_->_tmp20_); - _data_->_tmp21_ = _data_->timeout_id; - g_source_remove (_data_->_tmp21_); + _data_->_tmp20_ = _data_->persona; + _data_->_tmp21_ = _data_->signal_id; + g_signal_handler_disconnect ((GObject*) _data_->_tmp20_, _data_->_tmp21_); + _data_->_tmp22_ = _data_->timeout_id; + g_source_remove (_data_->_tmp22_); } if (_data_->_inner_error_ != NULL) { if (_data_->_inner_error_->domain == FOLKS_PROPERTY_ERROR) { @@ -4091,6 +4408,30 @@ } +static void _edsf_persona_store_remove_attribute (EdsfPersonaStore* self, EContact* contact, const gchar* attr_name) { + EContact* _tmp0_; + const gchar* _tmp1_; + EVCardAttribute* _tmp2_ = NULL; + EVCardAttribute* attr; + EVCardAttribute* _tmp3_; + g_return_if_fail (self != NULL); + g_return_if_fail (contact != NULL); + g_return_if_fail (attr_name != NULL); + _tmp0_ = contact; + _tmp1_ = attr_name; + _tmp2_ = e_vcard_get_attribute ((EVCard*) _tmp0_, _tmp1_); + attr = _tmp2_; + _tmp3_ = attr; + if (_tmp3_ != NULL) { + EContact* _tmp4_; + EVCardAttribute* _tmp5_; + _tmp4_ = contact; + _tmp5_ = attr; + e_vcard_remove_attribute ((EVCard*) _tmp4_, (EVCardAttribute*) _tmp5_); + } +} + + static void _edsf_persona_store_set_avatar_data_free (gpointer _data) { EdsfPersonaStoreSetAvatarData* _data_; _data_ = _data; @@ -4198,7 +4539,7 @@ _data_->_tmp16_ = _data_->_tmp15_; _data_->_tmp17_ = _data_->avatar; _data_->_tmp18_ = FALSE; - _data_->_tmp18_ = g_icon_equal ((GIcon*) _data_->_tmp16_, (GIcon*) _data_->_tmp17_); + _data_->_tmp18_ = g_icon_equal ((GIcon*) G_LOADABLE_ICON (_data_->_tmp16_), (GIcon*) _data_->_tmp17_); _data_->_tmp10_ = _data_->_tmp18_; } else { _data_->_tmp10_ = FALSE; @@ -4484,85 +4825,77 @@ } _state_0: _data_->_tmp0_ = _data_->contact; - _data_->_tmp1_ = NULL; - _data_->_tmp1_ = e_vcard_get_attribute ((EVCard*) _data_->_tmp0_, "X-FOLKS-WEB-SERVICES-IDS"); - _data_->attr = _data_->_tmp1_; - _data_->_tmp2_ = _data_->attr; - if (_data_->_tmp2_ != NULL) { - _data_->_tmp3_ = _data_->contact; - _data_->_tmp4_ = _data_->attr; - e_vcard_remove_attribute ((EVCard*) _data_->_tmp3_, _data_->_tmp4_); - } - _data_->_tmp5_ = e_vcard_attribute_new (NULL, "X-FOLKS-WEB-SERVICES-IDS"); - _data_->attr_n = _data_->_tmp5_; + _edsf_persona_store_remove_attribute (_data_->self, _data_->_tmp0_, "X-FOLKS-WEB-SERVICES-IDS"); + _data_->_tmp1_ = e_vcard_attribute_new (NULL, "X-FOLKS-WEB-SERVICES-IDS"); + _data_->attr_n = _data_->_tmp1_; { - _data_->_tmp6_ = _data_->web_service_addresses; - _data_->_tmp7_ = NULL; - _data_->_tmp7_ = gee_multi_map_get_keys (_data_->_tmp6_); - _data_->_tmp8_ = _data_->_tmp7_; - _data_->_tmp9_ = NULL; - _data_->_tmp9_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp8_); - _data_->_tmp10_ = _data_->_tmp9_; - _g_object_unref0 (_data_->_tmp8_); - _data_->_service_it = _data_->_tmp10_; + _data_->_tmp2_ = _data_->web_service_addresses; + _data_->_tmp3_ = NULL; + _data_->_tmp3_ = gee_multi_map_get_keys (_data_->_tmp2_); + _data_->_tmp4_ = _data_->_tmp3_; + _data_->_tmp5_ = NULL; + _data_->_tmp5_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp4_); + _data_->_tmp6_ = _data_->_tmp5_; + _g_object_unref0 (_data_->_tmp4_); + _data_->_service_it = _data_->_tmp6_; while (TRUE) { - _data_->_tmp11_ = _data_->_service_it; - _data_->_tmp12_ = FALSE; - _data_->_tmp12_ = gee_iterator_next (_data_->_tmp11_); - if (!_data_->_tmp12_) { + _data_->_tmp7_ = _data_->_service_it; + _data_->_tmp8_ = FALSE; + _data_->_tmp8_ = gee_iterator_next (_data_->_tmp7_); + if (!_data_->_tmp8_) { break; } - _data_->_tmp13_ = _data_->_service_it; - _data_->_tmp14_ = NULL; - _data_->_tmp14_ = gee_iterator_get (_data_->_tmp13_); - _data_->service = (gchar*) _data_->_tmp14_; - _data_->_tmp15_ = _data_->service; - _data_->_tmp16_ = e_vcard_attribute_param_new (_data_->_tmp15_); - _data_->param = _data_->_tmp16_; + _data_->_tmp9_ = _data_->_service_it; + _data_->_tmp10_ = NULL; + _data_->_tmp10_ = gee_iterator_get (_data_->_tmp9_); + _data_->service = (gchar*) _data_->_tmp10_; + _data_->_tmp11_ = _data_->service; + _data_->_tmp12_ = e_vcard_attribute_param_new (_data_->_tmp11_); + _data_->param = _data_->_tmp12_; { - _data_->_tmp17_ = _data_->web_service_addresses; - _data_->_tmp18_ = _data_->service; - _data_->_tmp19_ = NULL; - _data_->_tmp19_ = gee_multi_map_get (_data_->_tmp17_, _data_->_tmp18_); - _data_->_tmp20_ = _data_->_tmp19_; - _data_->_tmp21_ = NULL; - _data_->_tmp21_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp20_); - _data_->_tmp22_ = _data_->_tmp21_; - _g_object_unref0 (_data_->_tmp20_); - _data_->_ws_fd_it = _data_->_tmp22_; + _data_->_tmp13_ = _data_->web_service_addresses; + _data_->_tmp14_ = _data_->service; + _data_->_tmp15_ = NULL; + _data_->_tmp15_ = gee_multi_map_get (_data_->_tmp13_, _data_->_tmp14_); + _data_->_tmp16_ = _data_->_tmp15_; + _data_->_tmp17_ = NULL; + _data_->_tmp17_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp16_); + _data_->_tmp18_ = _data_->_tmp17_; + _g_object_unref0 (_data_->_tmp16_); + _data_->_ws_fd_it = _data_->_tmp18_; while (TRUE) { - _data_->_tmp23_ = _data_->_ws_fd_it; - _data_->_tmp24_ = FALSE; - _data_->_tmp24_ = gee_iterator_next (_data_->_tmp23_); - if (!_data_->_tmp24_) { + _data_->_tmp19_ = _data_->_ws_fd_it; + _data_->_tmp20_ = FALSE; + _data_->_tmp20_ = gee_iterator_next (_data_->_tmp19_); + if (!_data_->_tmp20_) { break; } - _data_->_tmp25_ = _data_->_ws_fd_it; - _data_->_tmp26_ = NULL; - _data_->_tmp26_ = gee_iterator_get (_data_->_tmp25_); - _data_->ws_fd = (FolksWebServiceFieldDetails*) _data_->_tmp26_; - _data_->_tmp27_ = _data_->param; - _data_->_tmp28_ = _data_->ws_fd; - _data_->_tmp29_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _data_->_tmp28_); - _data_->_tmp30_ = _data_->_tmp29_; - e_vcard_attribute_param_add_value (_data_->_tmp27_, (const gchar*) _data_->_tmp30_); + _data_->_tmp21_ = _data_->_ws_fd_it; + _data_->_tmp22_ = NULL; + _data_->_tmp22_ = gee_iterator_get (_data_->_tmp21_); + _data_->ws_fd = (FolksWebServiceFieldDetails*) _data_->_tmp22_; + _data_->_tmp23_ = _data_->param; + _data_->_tmp24_ = _data_->ws_fd; + _data_->_tmp25_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _data_->_tmp24_); + _data_->_tmp26_ = _data_->_tmp25_; + e_vcard_attribute_param_add_value (_data_->_tmp23_, (const gchar*) _data_->_tmp26_); _g_object_unref0 (_data_->ws_fd); } _g_object_unref0 (_data_->_ws_fd_it); } - _data_->_tmp31_ = _data_->attr_n; - _data_->_tmp32_ = _data_->param; - _data_->_tmp33_ = __vala_EVCardAttributeParam_copy0 (_data_->_tmp32_); - e_vcard_attribute_add_param (_data_->_tmp31_, _data_->_tmp33_); + _data_->_tmp27_ = _data_->attr_n; + _data_->_tmp28_ = _data_->param; + _data_->_tmp29_ = __vala_EVCardAttributeParam_copy0 (_data_->_tmp28_); + e_vcard_attribute_add_param (_data_->_tmp27_, _data_->_tmp29_); __vala_EVCardAttributeParam_free0 (_data_->param); _g_free0 (_data_->service); } _g_object_unref0 (_data_->_service_it); } - _data_->_tmp34_ = _data_->contact; - _data_->_tmp35_ = _data_->attr_n; + _data_->_tmp30_ = _data_->contact; + _data_->_tmp31_ = _data_->attr_n; _data_->attr_n = NULL; - e_vcard_add_attribute ((EVCard*) _data_->_tmp34_, _data_->_tmp35_); + e_vcard_add_attribute ((EVCard*) _data_->_tmp30_, _data_->_tmp31_); __vala_EVCardAttribute_free0 (_data_->attr_n); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); @@ -5108,44 +5441,36 @@ } _state_0: _data_->_tmp0_ = _data_->contact; - _data_->_tmp1_ = NULL; - _data_->_tmp1_ = e_vcard_get_attribute ((EVCard*) _data_->_tmp0_, "X-FOLKS-CONTACTS-IDS"); - _data_->attr = _data_->_tmp1_; - _data_->_tmp2_ = _data_->attr; - if (_data_->_tmp2_ != NULL) { - _data_->_tmp3_ = _data_->contact; - _data_->_tmp4_ = _data_->attr; - e_vcard_remove_attribute ((EVCard*) _data_->_tmp3_, _data_->_tmp4_); - } - _data_->_tmp5_ = e_vcard_attribute_new (NULL, "X-FOLKS-CONTACTS-IDS"); - _data_->new_attr = _data_->_tmp5_; + _edsf_persona_store_remove_attribute (_data_->self, _data_->_tmp0_, "X-FOLKS-CONTACTS-IDS"); + _data_->_tmp1_ = e_vcard_attribute_new (NULL, "X-FOLKS-CONTACTS-IDS"); + _data_->new_attr = _data_->_tmp1_; { - _data_->_tmp6_ = _data_->local_ids; - _data_->_tmp7_ = NULL; - _data_->_tmp7_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp6_); - _data_->_local_id_it = _data_->_tmp7_; + _data_->_tmp2_ = _data_->local_ids; + _data_->_tmp3_ = NULL; + _data_->_tmp3_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp2_); + _data_->_local_id_it = _data_->_tmp3_; while (TRUE) { - _data_->_tmp8_ = _data_->_local_id_it; - _data_->_tmp9_ = FALSE; - _data_->_tmp9_ = gee_iterator_next (_data_->_tmp8_); - if (!_data_->_tmp9_) { + _data_->_tmp4_ = _data_->_local_id_it; + _data_->_tmp5_ = FALSE; + _data_->_tmp5_ = gee_iterator_next (_data_->_tmp4_); + if (!_data_->_tmp5_) { break; } - _data_->_tmp10_ = _data_->_local_id_it; - _data_->_tmp11_ = NULL; - _data_->_tmp11_ = gee_iterator_get (_data_->_tmp10_); - _data_->local_id = (gchar*) _data_->_tmp11_; - _data_->_tmp12_ = _data_->new_attr; - _data_->_tmp13_ = _data_->local_id; - e_vcard_attribute_add_value (_data_->_tmp12_, _data_->_tmp13_); + _data_->_tmp6_ = _data_->_local_id_it; + _data_->_tmp7_ = NULL; + _data_->_tmp7_ = gee_iterator_get (_data_->_tmp6_); + _data_->local_id = (gchar*) _data_->_tmp7_; + _data_->_tmp8_ = _data_->new_attr; + _data_->_tmp9_ = _data_->local_id; + e_vcard_attribute_add_value (_data_->_tmp8_, _data_->_tmp9_); _g_free0 (_data_->local_id); } _g_object_unref0 (_data_->_local_id_it); } - _data_->_tmp14_ = _data_->contact; - _data_->_tmp15_ = _data_->new_attr; + _data_->_tmp10_ = _data_->contact; + _data_->_tmp11_ = _data_->new_attr; _data_->new_attr = NULL; - e_vcard_add_attribute ((EVCard*) _data_->_tmp14_, _data_->_tmp15_); + e_vcard_add_attribute ((EVCard*) _data_->_tmp10_, _data_->_tmp11_); __vala_EVCardAttribute_free0 (_data_->new_attr); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); @@ -5325,25 +5650,17 @@ } _state_0: _data_->_tmp0_ = _data_->contact; - _data_->_tmp1_ = NULL; - _data_->_tmp1_ = e_vcard_get_attribute ((EVCard*) _data_->_tmp0_, "X-FOLKS-FAVOURITE"); - _data_->attr = _data_->_tmp1_; - _data_->_tmp2_ = _data_->attr; - if (_data_->_tmp2_ != NULL) { - _data_->_tmp3_ = _data_->contact; - _data_->_tmp4_ = _data_->attr; - e_vcard_remove_attribute ((EVCard*) _data_->_tmp3_, _data_->_tmp4_); - } - _data_->_tmp5_ = _data_->is_favourite; - if (_data_->_tmp5_) { - _data_->_tmp6_ = e_vcard_attribute_new (NULL, "X-FOLKS-FAVOURITE"); - _data_->new_attr = _data_->_tmp6_; - _data_->_tmp7_ = _data_->new_attr; - e_vcard_attribute_add_value (_data_->_tmp7_, "true"); - _data_->_tmp8_ = _data_->contact; - _data_->_tmp9_ = _data_->new_attr; + _edsf_persona_store_remove_attribute (_data_->self, _data_->_tmp0_, "X-FOLKS-FAVOURITE"); + _data_->_tmp1_ = _data_->is_favourite; + if (_data_->_tmp1_) { + _data_->_tmp2_ = e_vcard_attribute_new (NULL, "X-FOLKS-FAVOURITE"); + _data_->new_attr = _data_->_tmp2_; + _data_->_tmp3_ = _data_->new_attr; + e_vcard_attribute_add_value (_data_->_tmp3_, "true"); + _data_->_tmp4_ = _data_->contact; + _data_->_tmp5_ = _data_->new_attr; _data_->new_attr = NULL; - e_vcard_add_attribute ((EVCard*) _data_->_tmp8_, _data_->_tmp9_); + e_vcard_add_attribute ((EVCard*) _data_->_tmp4_, _data_->_tmp5_); __vala_EVCardAttribute_free0 (_data_->new_attr); } if (_data_->_state_ == 0) { @@ -5426,133 +5743,118 @@ _data_->_tmp0_ = _data_->avatar; if (_data_->_tmp0_ == NULL) { _data_->_tmp1_ = _data_->contact; - _data_->_tmp2_ = NULL; - _data_->_tmp2_ = e_vcard_get_attribute ((EVCard*) _data_->_tmp1_, "PHOTO"); - _data_->attr = _data_->_tmp2_; - _data_->_tmp3_ = _data_->attr; - if (_data_->_tmp3_ != NULL) { - _data_->_tmp4_ = _data_->contact; - _data_->_tmp5_ = _data_->attr; - e_vcard_remove_attribute ((EVCard*) _data_->_tmp4_, _data_->_tmp5_); - } + _edsf_persona_store_remove_attribute (_data_->self, _data_->_tmp1_, "PHOTO"); } else { { - _data_->_tmp6_ = e_contact_photo_new (); - _data_->cp = _data_->_tmp6_; - _data_->_tmp7_ = _data_->cp; - _data_->_tmp7_->type = E_CONTACT_PHOTO_TYPE_INLINED; - _data_->_tmp8_ = _data_->avatar; + _data_->_tmp2_ = e_contact_photo_new (); + _data_->cp = _data_->_tmp2_; + _data_->_tmp3_ = _data_->cp; + _data_->_tmp3_->type = E_CONTACT_PHOTO_TYPE_INLINED; + _data_->_tmp4_ = _data_->avatar; _data_->_state_ = 1; - g_loadable_icon_load_async (_data_->_tmp8_, -1, NULL, _edsf_persona_store_set_contact_avatar_ready, _data_); + g_loadable_icon_load_async (G_LOADABLE_ICON (_data_->_tmp4_), -1, NULL, _edsf_persona_store_set_contact_avatar_ready, _data_); return FALSE; _state_1: - _data_->_tmp9_ = NULL; - _data_->_tmp9_ = g_loadable_icon_load_finish (_data_->_tmp8_, _data_->_res_, NULL, &_data_->_inner_error_); - _data_->input_s = _data_->_tmp9_; + _data_->_tmp5_ = NULL; + _data_->_tmp5_ = g_loadable_icon_load_finish (G_LOADABLE_ICON (_data_->_tmp4_), _data_->_res_, NULL, &_data_->_inner_error_); + _data_->input_s = _data_->_tmp5_; if (_data_->_inner_error_ != NULL) { __vala_EContactPhoto_free0 (_data_->cp); - goto __catch16_g_error; + goto __catch17_g_error; } - _data_->_tmp10_ = NULL; - _data_->_tmp10_ = g_new0 (guint8, 0); - _data_->image_data = _data_->_tmp10_; + _data_->_tmp6_ = NULL; + _data_->_tmp6_ = g_new0 (guint8, 0); + _data_->image_data = _data_->_tmp6_; _data_->image_data_length1 = 0; _data_->_image_data_size_ = _data_->image_data_length1; - _data_->_tmp11_ = NULL; - _data_->_tmp11_ = g_new0 (guint8, 4096); - _data_->buffer = _data_->_tmp11_; + _data_->_tmp7_ = NULL; + _data_->_tmp7_ = g_new0 (guint8, 4096); + _data_->buffer = _data_->_tmp7_; _data_->buffer_length1 = 4096; _data_->_buffer_size_ = _data_->buffer_length1; while (TRUE) { - _data_->_tmp12_ = _data_->input_s; - _data_->_tmp13_ = _data_->buffer; - _data_->_tmp13__length1 = _data_->buffer_length1; + _data_->_tmp8_ = _data_->input_s; + _data_->_tmp9_ = _data_->buffer; + _data_->_tmp9__length1 = _data_->buffer_length1; _data_->_state_ = 2; - g_input_stream_read_async (_data_->_tmp12_, _data_->_tmp13_, (gsize) _data_->_tmp13__length1, G_PRIORITY_DEFAULT, NULL, _edsf_persona_store_set_contact_avatar_ready, _data_); + g_input_stream_read_async (_data_->_tmp8_, _data_->_tmp9_, (gsize) _data_->_tmp9__length1, G_PRIORITY_DEFAULT, NULL, _edsf_persona_store_set_contact_avatar_ready, _data_); return FALSE; _state_2: - _data_->_tmp14_ = 0L; - _data_->_tmp14_ = g_input_stream_read_finish (_data_->_tmp12_, _data_->_res_, &_data_->_inner_error_); - _data_->size_read = _data_->_tmp14_; + _data_->_tmp10_ = 0L; + _data_->_tmp10_ = g_input_stream_read_finish (_data_->_tmp8_, _data_->_res_, &_data_->_inner_error_); + _data_->size_read = _data_->_tmp10_; if (_data_->_inner_error_ != NULL) { _data_->buffer = (g_free (_data_->buffer), NULL); _data_->image_data = (g_free (_data_->image_data), NULL); _g_object_unref0 (_data_->input_s); __vala_EContactPhoto_free0 (_data_->cp); - goto __catch16_g_error; + goto __catch17_g_error; } - _data_->_tmp15_ = _data_->size_read; - if (_data_->_tmp15_ <= ((gssize) 0)) { + _data_->_tmp11_ = _data_->size_read; + if (_data_->_tmp11_ <= ((gssize) 0)) { break; } + _data_->_tmp12_ = _data_->image_data; + _data_->_tmp12__length1 = _data_->image_data_length1; + _data_->read_cur = _data_->_tmp12__length1; + _data_->_tmp13_ = _data_->read_cur; + _data_->_tmp14_ = _data_->size_read; + _data_->_tmp15_ = 0; + _data_->_tmp15_ = _data_->_tmp13_ + ((gint) _data_->_tmp14_); + _data_->image_data = g_renew (guint8, _data_->image_data, _data_->_tmp13_ + ((gint) _data_->_tmp14_)); + (_data_->_tmp15_ > _data_->image_data_length1) ? memset (_data_->image_data + _data_->image_data_length1, 0, sizeof (guint8) * (_data_->_tmp15_ - _data_->image_data_length1)) : NULL; + _data_->image_data_length1 = _data_->_tmp15_; + _data_->_image_data_size_ = _data_->_tmp15_; _data_->_tmp16_ = _data_->image_data; _data_->_tmp16__length1 = _data_->image_data_length1; - _data_->read_cur = _data_->_tmp16__length1; _data_->_tmp17_ = _data_->read_cur; - _data_->_tmp18_ = _data_->size_read; - _data_->_tmp19_ = 0; - _data_->_tmp19_ = _data_->_tmp17_ + ((gint) _data_->_tmp18_); - _data_->image_data = g_renew (guint8, _data_->image_data, _data_->_tmp17_ + ((gint) _data_->_tmp18_)); - (_data_->_tmp19_ > _data_->image_data_length1) ? memset (_data_->image_data + _data_->image_data_length1, 0, sizeof (guint8) * (_data_->_tmp19_ - _data_->image_data_length1)) : NULL; - _data_->image_data_length1 = _data_->_tmp19_; - _data_->_image_data_size_ = _data_->_tmp19_; - _data_->_tmp20_ = _data_->image_data; - _data_->_tmp20__length1 = _data_->image_data_length1; - _data_->_tmp21_ = _data_->read_cur; - _data_->_tmp22_ = _data_->buffer; - _data_->_tmp22__length1 = _data_->buffer_length1; - _data_->_tmp23_ = _data_->size_read; - memcpy (&_data_->_tmp20_[_data_->_tmp21_], _data_->_tmp22_, (gsize) _data_->_tmp23_); - } - _data_->_tmp24_ = _data_->cp; - _data_->_tmp25_ = _data_->image_data; - _data_->_tmp25__length1 = _data_->image_data_length1; - e_contact_photo_set_inlined (_data_->_tmp24_, _data_->_tmp25_, (gsize) _data_->_tmp25__length1); + _data_->_tmp18_ = _data_->buffer; + _data_->_tmp18__length1 = _data_->buffer_length1; + _data_->_tmp19_ = _data_->size_read; + memcpy (&_data_->_tmp16_[_data_->_tmp17_], _data_->_tmp18_, (gsize) _data_->_tmp19_); + } + _data_->_tmp20_ = _data_->cp; + _data_->_tmp21_ = _data_->image_data; + _data_->_tmp21__length1 = _data_->image_data_length1; + e_contact_photo_set_inlined (_data_->_tmp20_, _data_->_tmp21_, (gsize) _data_->_tmp21__length1); _data_->uncertain = FALSE; - _data_->_tmp26_ = _data_->image_data; - _data_->_tmp26__length1 = _data_->image_data_length1; - _data_->_tmp27_ = FALSE; - _data_->_tmp28_ = NULL; - _data_->_tmp28_ = g_content_type_guess (NULL, _data_->_tmp26_, _data_->_tmp26__length1, &_data_->_tmp27_); - _data_->uncertain = _data_->_tmp27_; - _data_->mime_type = _data_->_tmp28_; - _data_->_tmp30_ = _data_->mime_type; - if (_data_->_tmp30_ != NULL) { - _data_->_tmp31_ = _data_->uncertain; - _data_->_tmp29_ = !_data_->_tmp31_; - } else { - _data_->_tmp29_ = FALSE; - } - _data_->_tmp32_ = _data_->_tmp29_; - if (_data_->_tmp32_) { - _data_->_tmp33_ = _data_->cp; - _data_->_tmp34_ = _data_->mime_type; - e_contact_photo_set_mime_type (_data_->_tmp33_, _data_->_tmp34_); - } - _data_->_tmp35_ = _data_->contact; - _data_->_tmp36_ = _data_->cp; - e_contact_set (_data_->_tmp35_, E_CONTACT_PHOTO, _data_->_tmp36_); + _data_->_tmp22_ = _data_->image_data; + _data_->_tmp22__length1 = _data_->image_data_length1; + _data_->_tmp23_ = FALSE; + _data_->_tmp24_ = NULL; + _data_->_tmp24_ = g_content_type_guess (NULL, _data_->_tmp22_, (gsize) _data_->_tmp22__length1, &_data_->_tmp23_); + _data_->uncertain = _data_->_tmp23_; + _data_->mime_type = _data_->_tmp24_; + _data_->_tmp25_ = _data_->uncertain; + if (!_data_->_tmp25_) { + _data_->_tmp26_ = _data_->cp; + _data_->_tmp27_ = _data_->mime_type; + e_contact_photo_set_mime_type (_data_->_tmp26_, _data_->_tmp27_); + } + _data_->_tmp28_ = _data_->contact; + _data_->_tmp29_ = _data_->cp; + e_contact_set (_data_->_tmp28_, E_CONTACT_PHOTO, _data_->_tmp29_); _g_free0 (_data_->mime_type); _data_->buffer = (g_free (_data_->buffer), NULL); _data_->image_data = (g_free (_data_->image_data), NULL); _g_object_unref0 (_data_->input_s); __vala_EContactPhoto_free0 (_data_->cp); } - goto __finally16; - __catch16_g_error: + goto __finally17; + __catch17_g_error: { _data_->e1 = _data_->_inner_error_; _data_->_inner_error_ = NULL; - _data_->_tmp37_ = NULL; - _data_->_tmp37_ = _ ("Can't update avatar: %s"); - _data_->_tmp38_ = _data_->e1; - _data_->_tmp39_ = _data_->_tmp38_->message; - _data_->_tmp40_ = g_error_new (FOLKS_PROPERTY_ERROR, FOLKS_PROPERTY_ERROR_INVALID_VALUE, _data_->_tmp37_, _data_->_tmp39_); - _data_->_inner_error_ = _data_->_tmp40_; + _data_->_tmp30_ = NULL; + _data_->_tmp30_ = _ ("Can't update avatar: %s"); + _data_->_tmp31_ = _data_->e1; + _data_->_tmp32_ = _data_->_tmp31_->message; + _data_->_tmp33_ = g_error_new (FOLKS_PROPERTY_ERROR, FOLKS_PROPERTY_ERROR_INVALID_VALUE, _data_->_tmp30_, _data_->_tmp32_); + _data_->_inner_error_ = _data_->_tmp33_; _g_error_free0 (_data_->e1); - goto __finally16; + goto __finally17; } - __finally16: + __finally17: if (_data_->_inner_error_ != NULL) { if (_data_->_inner_error_->domain == FOLKS_PROPERTY_ERROR) { g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); @@ -6131,7 +6433,7 @@ EdsfPersonaStoreFieldToAttribute _tmp5_; void* _tmp5__target; const gchar* _tmp6_; - const gchar* _tmp7_; + gchar* _tmp7_; EContactField _tmp8_; _data_ = g_slice_new0 (EdsfPersonaStoreSetContactAttributesData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _edsf_persona_store_set_contact_attributes); @@ -6325,7 +6627,7 @@ GeeSet* _tmp3_; GeeSet* _tmp4_; const gchar* _tmp5_; - const gchar* _tmp6_; + gchar* _tmp6_; EContactField _tmp7_; _data_ = g_slice_new0 (EdsfPersonaStoreSetContactAttributesStringData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _edsf_persona_store_set_contact_attributes_string); @@ -6408,7 +6710,7 @@ EdsfPersona* _tmp1_; EdsfPersona* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; _data_ = g_slice_new0 (EdsfPersonaStoreSetFullNameData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _edsf_persona_store_set_full_name); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _edsf_persona_store_set_full_name_data_free); @@ -6476,14 +6778,19 @@ } } _data_->_tmp3_ = _data_->full_name; - if (g_strcmp0 (_data_->_tmp3_, "") == 0) { - _data_->full_name = NULL; - } - _data_->_tmp4_ = _data_->persona; - _data_->_tmp5_ = folks_name_details_get_full_name ((FolksNameDetails*) _data_->_tmp4_); - _data_->_tmp6_ = _data_->_tmp5_; - _data_->_tmp7_ = _data_->full_name; - if (g_strcmp0 (_data_->_tmp6_, _data_->_tmp7_) == 0) { + _data_->_tmp4_ = g_strdup (_data_->_tmp3_); + _data_->_full_name = _data_->_tmp4_; + _data_->_tmp5_ = _data_->full_name; + if (g_strcmp0 (_data_->_tmp5_, "") == 0) { + _g_free0 (_data_->_full_name); + _data_->_full_name = NULL; + } + _data_->_tmp6_ = _data_->persona; + _data_->_tmp7_ = folks_name_details_get_full_name ((FolksNameDetails*) _data_->_tmp6_); + _data_->_tmp8_ = _data_->_tmp7_; + _data_->_tmp9_ = _data_->_full_name; + if (g_strcmp0 (_data_->_tmp8_, _data_->_tmp9_) == 0) { + _g_free0 (_data_->_full_name); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); } else { @@ -6492,16 +6799,16 @@ g_object_unref (_data_->_async_result); return FALSE; } - _data_->_tmp8_ = _data_->persona; - _data_->_tmp9_ = edsf_persona_get_contact (_data_->_tmp8_); - _data_->_tmp10_ = _data_->_tmp9_; - _data_->_tmp11_ = 0; - _data_->_tmp11_ = e_contact_field_id ("full_name"); - _data_->_tmp12_ = _data_->full_name; - e_contact_set (_data_->_tmp10_, _data_->_tmp11_, _data_->_tmp12_); - _data_->_tmp13_ = _data_->persona; + _data_->_tmp10_ = _data_->persona; + _data_->_tmp11_ = edsf_persona_get_contact (_data_->_tmp10_); + _data_->_tmp12_ = _data_->_tmp11_; + _data_->_tmp13_ = 0; + _data_->_tmp13_ = e_contact_field_id ("full_name"); + _data_->_tmp14_ = _data_->_full_name; + e_contact_set (_data_->_tmp12_, _data_->_tmp13_, _data_->_tmp14_); + _data_->_tmp15_ = _data_->persona; _data_->_state_ = 1; - _edsf_persona_store_commit_modified_property (_data_->self, _data_->_tmp13_, "full-name", _edsf_persona_store_set_full_name_ready, _data_); + _edsf_persona_store_commit_modified_property (_data_->self, _data_->_tmp15_, "full-name", _edsf_persona_store_set_full_name_ready, _data_); return FALSE; _state_1: _edsf_persona_store_commit_modified_property_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -6509,6 +6816,7 @@ if (_data_->_inner_error_->domain == FOLKS_PROPERTY_ERROR) { g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); g_error_free (_data_->_inner_error_); + _g_free0 (_data_->_full_name); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); } else { @@ -6517,11 +6825,13 @@ g_object_unref (_data_->_async_result); return FALSE; } else { + _g_free0 (_data_->_full_name); g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); g_clear_error (&_data_->_inner_error_); return FALSE; } } + _g_free0 (_data_->_full_name); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); } else { @@ -6548,7 +6858,7 @@ EdsfPersona* _tmp1_; EdsfPersona* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; _data_ = g_slice_new0 (EdsfPersonaStoreSetNicknameData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _edsf_persona_store_set_nickname); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _edsf_persona_store_set_nickname_data_free); @@ -6616,14 +6926,19 @@ } } _data_->_tmp3_ = _data_->nickname; - if (g_strcmp0 (_data_->_tmp3_, "") == 0) { - _data_->nickname = NULL; - } - _data_->_tmp4_ = _data_->persona; - _data_->_tmp5_ = folks_name_details_get_nickname ((FolksNameDetails*) _data_->_tmp4_); - _data_->_tmp6_ = _data_->_tmp5_; - _data_->_tmp7_ = _data_->nickname; - if (g_strcmp0 (_data_->_tmp6_, _data_->_tmp7_) == 0) { + _data_->_tmp4_ = g_strdup (_data_->_tmp3_); + _data_->_nickname = _data_->_tmp4_; + _data_->_tmp5_ = _data_->nickname; + if (g_strcmp0 (_data_->_tmp5_, "") == 0) { + _g_free0 (_data_->_nickname); + _data_->_nickname = NULL; + } + _data_->_tmp6_ = _data_->persona; + _data_->_tmp7_ = folks_name_details_get_nickname ((FolksNameDetails*) _data_->_tmp6_); + _data_->_tmp8_ = _data_->_tmp7_; + _data_->_tmp9_ = _data_->_nickname; + if (g_strcmp0 (_data_->_tmp8_, _data_->_tmp9_) == 0) { + _g_free0 (_data_->_nickname); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); } else { @@ -6632,16 +6947,16 @@ g_object_unref (_data_->_async_result); return FALSE; } - _data_->_tmp8_ = _data_->persona; - _data_->_tmp9_ = edsf_persona_get_contact (_data_->_tmp8_); - _data_->_tmp10_ = _data_->_tmp9_; - _data_->_tmp11_ = 0; - _data_->_tmp11_ = e_contact_field_id ("nickname"); - _data_->_tmp12_ = _data_->nickname; - e_contact_set (_data_->_tmp10_, _data_->_tmp11_, _data_->_tmp12_); - _data_->_tmp13_ = _data_->persona; + _data_->_tmp10_ = _data_->persona; + _data_->_tmp11_ = edsf_persona_get_contact (_data_->_tmp10_); + _data_->_tmp12_ = _data_->_tmp11_; + _data_->_tmp13_ = 0; + _data_->_tmp13_ = e_contact_field_id ("nickname"); + _data_->_tmp14_ = _data_->_nickname; + e_contact_set (_data_->_tmp12_, _data_->_tmp13_, _data_->_tmp14_); + _data_->_tmp15_ = _data_->persona; _data_->_state_ = 1; - _edsf_persona_store_commit_modified_property (_data_->self, _data_->_tmp13_, "nickname", _edsf_persona_store_set_nickname_ready, _data_); + _edsf_persona_store_commit_modified_property (_data_->self, _data_->_tmp15_, "nickname", _edsf_persona_store_set_nickname_ready, _data_); return FALSE; _state_1: _edsf_persona_store_commit_modified_property_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -6649,6 +6964,7 @@ if (_data_->_inner_error_->domain == FOLKS_PROPERTY_ERROR) { g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); g_error_free (_data_->_inner_error_); + _g_free0 (_data_->_nickname); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); } else { @@ -6657,11 +6973,13 @@ g_object_unref (_data_->_async_result); return FALSE; } else { + _g_free0 (_data_->_nickname); g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); g_clear_error (&_data_->_inner_error_); return FALSE; } } + _g_free0 (_data_->_nickname); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); } else { @@ -6998,7 +7316,7 @@ _data_->_tmp12_ = _data_->_tmp11_; _data_->_tmp13_ = _data_->bday; _data_->_tmp14_ = FALSE; - _data_->_tmp14_ = g_date_time_equal (_data_->_tmp12_, _data_->_tmp13_); + _data_->_tmp14_ = g_date_time_equal ((GDateTime*) _data_->_tmp12_, (GDateTime*) _data_->_tmp13_); _data_->_tmp3_ = _data_->_tmp14_; } else { _data_->_tmp3_ = FALSE; @@ -7078,13 +7396,13 @@ EdsfPersonaStoreSetContactBirthdayData* _data_; _data_ = _data; _g_object_unref0 (_data_->contact); - _g_date_time_unref0 (_data_->bday); + _g_date_time_unref0 (_data_->_bday); _g_object_unref0 (_data_->self); g_slice_free (EdsfPersonaStoreSetContactBirthdayData, _data_); } -static void _edsf_persona_store_set_contact_birthday (EdsfPersonaStore* self, EContact* contact, GDateTime* bday, GAsyncReadyCallback _callback_, gpointer _user_data_) { +static void _edsf_persona_store_set_contact_birthday (EdsfPersonaStore* self, EContact* contact, GDateTime* _bday, GAsyncReadyCallback _callback_, gpointer _user_data_) { EdsfPersonaStoreSetContactBirthdayData* _data_; EdsfPersonaStore* _tmp0_; EContact* _tmp1_; @@ -7099,9 +7417,9 @@ _tmp1_ = contact; _tmp2_ = _g_object_ref0 (_tmp1_); _data_->contact = _tmp2_; - _tmp3_ = bday; + _tmp3_ = _bday; _tmp4_ = _g_date_time_ref0 (_tmp3_); - _data_->bday = _tmp4_; + _data_->_bday = _tmp4_; _edsf_persona_store_set_contact_birthday_co (_data_); } @@ -7117,6 +7435,16 @@ } +static EContactDate* _vala_EContactDate_copy (EContactDate* self) { + return g_boxed_copy (e_contact_date_get_type (), self); +} + + +static gpointer __vala_EContactDate_copy0 (gpointer self) { + return self ? _vala_EContactDate_copy (self) : NULL; +} + + static gboolean _edsf_persona_store_set_contact_birthday_co (EdsfPersonaStoreSetContactBirthdayData* _data_) { switch (_data_->_state_) { case 0: @@ -7125,34 +7453,43 @@ g_assert_not_reached (); } _state_0: - _data_->contact_bday = NULL; - _data_->_tmp0_ = _data_->bday; + _data_->_contact_bday = NULL; + _data_->_tmp0_ = _data_->_bday; if (_data_->_tmp0_ != NULL) { - _data_->_tmp1_ = e_contact_date_new (); + _data_->_tmp1_ = _data_->_bday; + _data_->_tmp2_ = _g_date_time_ref0 ((GDateTime*) _data_->_tmp1_); + _data_->bday = _data_->_tmp2_; + _data_->_tmp3_ = e_contact_date_new (); + __vala_EContactDate_free0 (_data_->contact_bday); + _data_->contact_bday = _data_->_tmp3_; + _data_->_tmp4_ = _data_->contact_bday; + _data_->_tmp5_ = _data_->bday; + _data_->_tmp6_ = 0; + _data_->_tmp6_ = g_date_time_get_year (_data_->_tmp5_); + _data_->_tmp4_->year = (guint) _data_->_tmp6_; + _data_->_tmp7_ = _data_->contact_bday; + _data_->_tmp8_ = _data_->bday; + _data_->_tmp9_ = 0; + _data_->_tmp9_ = g_date_time_get_month (_data_->_tmp8_); + _data_->_tmp7_->month = (guint) _data_->_tmp9_; + _data_->_tmp10_ = _data_->contact_bday; + _data_->_tmp11_ = _data_->bday; + _data_->_tmp12_ = 0; + _data_->_tmp12_ = g_date_time_get_day_of_month (_data_->_tmp11_); + _data_->_tmp10_->day = (guint) _data_->_tmp12_; + _data_->_tmp13_ = _data_->contact_bday; + _data_->_tmp14_ = __vala_EContactDate_copy0 (_data_->_tmp13_); + __vala_EContactDate_free0 (_data_->_contact_bday); + _data_->_contact_bday = _data_->_tmp14_; __vala_EContactDate_free0 (_data_->contact_bday); - _data_->contact_bday = _data_->_tmp1_; - _data_->_tmp2_ = _data_->contact_bday; - _data_->_tmp3_ = _data_->bday; - _data_->_tmp4_ = 0; - _data_->_tmp4_ = g_date_time_get_year (_data_->_tmp3_); - _data_->_tmp2_->year = (guint) _data_->_tmp4_; - _data_->_tmp5_ = _data_->contact_bday; - _data_->_tmp6_ = _data_->bday; - _data_->_tmp7_ = 0; - _data_->_tmp7_ = g_date_time_get_month (_data_->_tmp6_); - _data_->_tmp5_->month = (guint) _data_->_tmp7_; - _data_->_tmp8_ = _data_->contact_bday; - _data_->_tmp9_ = _data_->bday; - _data_->_tmp10_ = 0; - _data_->_tmp10_ = g_date_time_get_day_of_month (_data_->_tmp9_); - _data_->_tmp8_->day = (guint) _data_->_tmp10_; - } - _data_->_tmp11_ = _data_->contact; - _data_->_tmp12_ = 0; - _data_->_tmp12_ = e_contact_field_id ("birth_date"); - _data_->_tmp13_ = _data_->contact_bday; - e_contact_set (_data_->_tmp11_, _data_->_tmp12_, _data_->_tmp13_); - __vala_EContactDate_free0 (_data_->contact_bday); + _g_date_time_unref0 (_data_->bday); + } + _data_->_tmp15_ = _data_->contact; + _data_->_tmp16_ = 0; + _data_->_tmp16_ = e_contact_field_id ("birth_date"); + _data_->_tmp17_ = _data_->_contact_bday; + e_contact_set (_data_->_tmp15_, _data_->_tmp16_, _data_->_tmp17_); + __vala_EContactDate_free0 (_data_->_contact_bday); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); } else { @@ -7413,7 +7750,7 @@ _data_->_tmp31_ = _data_->org_unit_values; if (_data_->_tmp31_ != NULL) { _data_->_tmp32_ = _data_->org_unit_values; - _data_->_tmp33_ = gee_collection_get_size (_data_->_tmp32_); + _data_->_tmp33_ = gee_collection_get_size (GEE_COLLECTION (_data_->_tmp32_)); _data_->_tmp34_ = _data_->_tmp33_; _data_->_tmp30_ = _data_->_tmp34_ > 0; } else { @@ -7424,7 +7761,7 @@ _data_->_tmp36_ = _data_->org_unit_values; _data_->_tmp37_ = 0; _data_->_tmp38_ = NULL; - _data_->_tmp38_ = gee_collection_to_array (_data_->_tmp36_, &_data_->_tmp37_); + _data_->_tmp38_ = gee_collection_to_array (GEE_COLLECTION (_data_->_tmp36_), &_data_->_tmp37_); _data_->_tmp39_ = _data_->_tmp38_; _data_->_tmp39__length1 = _data_->_tmp37_; _data_->_tmp40_ = _data_->_tmp39_[0]; @@ -7440,7 +7777,7 @@ _data_->_tmp45_ = _data_->office_values; if (_data_->_tmp45_ != NULL) { _data_->_tmp46_ = _data_->office_values; - _data_->_tmp47_ = gee_collection_get_size (_data_->_tmp46_); + _data_->_tmp47_ = gee_collection_get_size (GEE_COLLECTION (_data_->_tmp46_)); _data_->_tmp48_ = _data_->_tmp47_; _data_->_tmp44_ = _data_->_tmp48_ > 0; } else { @@ -7451,7 +7788,7 @@ _data_->_tmp50_ = _data_->office_values; _data_->_tmp51_ = 0; _data_->_tmp52_ = NULL; - _data_->_tmp52_ = gee_collection_to_array (_data_->_tmp50_, &_data_->_tmp51_); + _data_->_tmp52_ = gee_collection_to_array (GEE_COLLECTION (_data_->_tmp50_), &_data_->_tmp51_); _data_->_tmp53_ = _data_->_tmp52_; _data_->_tmp53__length1 = _data_->_tmp51_; _data_->_tmp54_ = _data_->_tmp53_[0]; @@ -7467,7 +7804,7 @@ _data_->_tmp59_ = _data_->manager_values; if (_data_->_tmp59_ != NULL) { _data_->_tmp60_ = _data_->manager_values; - _data_->_tmp61_ = gee_collection_get_size (_data_->_tmp60_); + _data_->_tmp61_ = gee_collection_get_size (GEE_COLLECTION (_data_->_tmp60_)); _data_->_tmp62_ = _data_->_tmp61_; _data_->_tmp58_ = _data_->_tmp62_ > 0; } else { @@ -7478,7 +7815,7 @@ _data_->_tmp64_ = _data_->manager_values; _data_->_tmp65_ = 0; _data_->_tmp66_ = NULL; - _data_->_tmp66_ = gee_collection_to_array (_data_->_tmp64_, &_data_->_tmp65_); + _data_->_tmp66_ = gee_collection_to_array (GEE_COLLECTION (_data_->_tmp64_), &_data_->_tmp65_); _data_->_tmp67_ = _data_->_tmp66_; _data_->_tmp67__length1 = _data_->_tmp65_; _data_->_tmp68_ = _data_->_tmp67_[0]; @@ -7494,7 +7831,7 @@ _data_->_tmp73_ = _data_->assistant_values; if (_data_->_tmp73_ != NULL) { _data_->_tmp74_ = _data_->assistant_values; - _data_->_tmp75_ = gee_collection_get_size (_data_->_tmp74_); + _data_->_tmp75_ = gee_collection_get_size (GEE_COLLECTION (_data_->_tmp74_)); _data_->_tmp76_ = _data_->_tmp75_; _data_->_tmp72_ = _data_->_tmp76_ > 0; } else { @@ -7505,7 +7842,7 @@ _data_->_tmp78_ = _data_->assistant_values; _data_->_tmp79_ = 0; _data_->_tmp80_ = NULL; - _data_->_tmp80_ = gee_collection_to_array (_data_->_tmp78_, &_data_->_tmp79_); + _data_->_tmp80_ = gee_collection_to_array (GEE_COLLECTION (_data_->_tmp78_), &_data_->_tmp79_); _data_->_tmp81_ = _data_->_tmp80_; _data_->_tmp81__length1 = _data_->_tmp79_; _data_->_tmp82_ = _data_->_tmp81_[0]; @@ -7777,22 +8114,48 @@ return FALSE; } } - _data_->_tmp4_ = _data_->persona; - _data_->_tmp5_ = folks_name_details_get_structured_name ((FolksNameDetails*) _data_->_tmp4_); - _data_->_tmp6_ = _data_->_tmp5_; - if (_data_->_tmp6_ != NULL) { - _data_->_tmp7_ = _data_->persona; - _data_->_tmp8_ = folks_name_details_get_structured_name ((FolksNameDetails*) _data_->_tmp7_); - _data_->_tmp9_ = _data_->_tmp8_; - _data_->_tmp10_ = _data_->sname; - _data_->_tmp11_ = FALSE; - _data_->_tmp11_ = folks_structured_name_equal (_data_->_tmp9_, _data_->_tmp10_); - _data_->_tmp3_ = _data_->_tmp11_; + _data_->_tmp5_ = _data_->persona; + _data_->_tmp6_ = folks_name_details_get_structured_name ((FolksNameDetails*) _data_->_tmp5_); + _data_->_tmp7_ = _data_->_tmp6_; + if (_data_->_tmp7_ != NULL) { + _data_->_tmp8_ = _data_->sname; + _data_->_tmp4_ = _data_->_tmp8_ != NULL; + } else { + _data_->_tmp4_ = FALSE; + } + _data_->_tmp9_ = _data_->_tmp4_; + if (_data_->_tmp9_) { + _data_->_tmp10_ = _data_->persona; + _data_->_tmp11_ = folks_name_details_get_structured_name ((FolksNameDetails*) _data_->_tmp10_); + _data_->_tmp12_ = _data_->_tmp11_; + _data_->_tmp13_ = _data_->sname; + _data_->_tmp14_ = FALSE; + _data_->_tmp14_ = folks_structured_name_equal (FOLKS_STRUCTURED_NAME (_data_->_tmp12_), FOLKS_STRUCTURED_NAME (_data_->_tmp13_)); + _data_->_tmp3_ = _data_->_tmp14_; } else { _data_->_tmp3_ = FALSE; } - _data_->_tmp12_ = _data_->_tmp3_; - if (_data_->_tmp12_) { + _data_->_tmp15_ = _data_->_tmp3_; + if (_data_->_tmp15_) { + if (_data_->_state_ == 0) { + g_simple_async_result_complete_in_idle (_data_->_async_result); + } else { + g_simple_async_result_complete (_data_->_async_result); + } + g_object_unref (_data_->_async_result); + return FALSE; + } + _data_->_tmp17_ = _data_->persona; + _data_->_tmp18_ = folks_name_details_get_structured_name ((FolksNameDetails*) _data_->_tmp17_); + _data_->_tmp19_ = _data_->_tmp18_; + if (_data_->_tmp19_ == NULL) { + _data_->_tmp20_ = _data_->sname; + _data_->_tmp16_ = _data_->_tmp20_ == NULL; + } else { + _data_->_tmp16_ = FALSE; + } + _data_->_tmp21_ = _data_->_tmp16_; + if (_data_->_tmp21_) { if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); } else { @@ -7801,18 +8164,18 @@ g_object_unref (_data_->_async_result); return FALSE; } - _data_->_tmp13_ = _data_->persona; - _data_->_tmp14_ = edsf_persona_get_contact (_data_->_tmp13_); - _data_->_tmp15_ = _data_->_tmp14_; - _data_->_tmp16_ = _data_->sname; + _data_->_tmp22_ = _data_->persona; + _data_->_tmp23_ = edsf_persona_get_contact (_data_->_tmp22_); + _data_->_tmp24_ = _data_->_tmp23_; + _data_->_tmp25_ = _data_->sname; _data_->_state_ = 1; - _edsf_persona_store_set_contact_name (_data_->self, _data_->_tmp15_, _data_->_tmp16_, _edsf_persona_store_set_structured_name_ready, _data_); + _edsf_persona_store_set_contact_name (_data_->self, _data_->_tmp24_, _data_->_tmp25_, _edsf_persona_store_set_structured_name_ready, _data_); return FALSE; _state_1: _edsf_persona_store_set_contact_name_finish (_data_->self, _data_->_res_); - _data_->_tmp17_ = _data_->persona; + _data_->_tmp26_ = _data_->persona; _data_->_state_ = 2; - _edsf_persona_store_commit_modified_property (_data_->self, _data_->_tmp17_, "structured-name", _edsf_persona_store_set_structured_name_ready, _data_); + _edsf_persona_store_commit_modified_property (_data_->self, _data_->_tmp26_, "structured-name", _edsf_persona_store_set_structured_name_ready, _data_); return FALSE; _state_2: _edsf_persona_store_commit_modified_property_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -7847,13 +8210,13 @@ EdsfPersonaStoreSetContactNameData* _data_; _data_ = _data; _g_object_unref0 (_data_->contact); - _g_object_unref0 (_data_->sname); + _g_object_unref0 (_data_->_sname); _g_object_unref0 (_data_->self); g_slice_free (EdsfPersonaStoreSetContactNameData, _data_); } -static void _edsf_persona_store_set_contact_name (EdsfPersonaStore* self, EContact* contact, FolksStructuredName* sname, GAsyncReadyCallback _callback_, gpointer _user_data_) { +static void _edsf_persona_store_set_contact_name (EdsfPersonaStore* self, EContact* contact, FolksStructuredName* _sname, GAsyncReadyCallback _callback_, gpointer _user_data_) { EdsfPersonaStoreSetContactNameData* _data_; EdsfPersonaStore* _tmp0_; EContact* _tmp1_; @@ -7868,9 +8231,9 @@ _tmp1_ = contact; _tmp2_ = _g_object_ref0 (_tmp1_); _data_->contact = _tmp2_; - _tmp3_ = sname; + _tmp3_ = _sname; _tmp4_ = _g_object_ref0 (_tmp3_); - _data_->sname = _tmp4_; + _data_->_sname = _tmp4_; _edsf_persona_store_set_contact_name_co (_data_); } @@ -7896,49 +8259,53 @@ _state_0: _data_->_tmp0_ = e_contact_name_new (); _data_->contact_name = _data_->_tmp0_; - _data_->_tmp1_ = _data_->sname; + _data_->_tmp1_ = _data_->_sname; if (_data_->_tmp1_ != NULL) { - _data_->_tmp2_ = _data_->contact_name; - _data_->_tmp3_ = _data_->sname; - _data_->_tmp4_ = folks_structured_name_get_family_name (_data_->_tmp3_); - _data_->_tmp5_ = _data_->_tmp4_; - _data_->_tmp6_ = g_strdup (_data_->_tmp5_); - _g_free0 (_data_->_tmp2_->family); - _data_->_tmp2_->family = _data_->_tmp6_; - _data_->_tmp7_ = _data_->contact_name; - _data_->_tmp8_ = _data_->sname; - _data_->_tmp9_ = folks_structured_name_get_given_name (_data_->_tmp8_); - _data_->_tmp10_ = _data_->_tmp9_; - _data_->_tmp11_ = g_strdup (_data_->_tmp10_); - _g_free0 (_data_->_tmp7_->given); - _data_->_tmp7_->given = _data_->_tmp11_; - _data_->_tmp12_ = _data_->contact_name; - _data_->_tmp13_ = _data_->sname; - _data_->_tmp14_ = folks_structured_name_get_additional_names (_data_->_tmp13_); - _data_->_tmp15_ = _data_->_tmp14_; - _data_->_tmp16_ = g_strdup (_data_->_tmp15_); - _g_free0 (_data_->_tmp12_->additional); - _data_->_tmp12_->additional = _data_->_tmp16_; - _data_->_tmp17_ = _data_->contact_name; - _data_->_tmp18_ = _data_->sname; - _data_->_tmp19_ = folks_structured_name_get_suffixes (_data_->_tmp18_); - _data_->_tmp20_ = _data_->_tmp19_; - _data_->_tmp21_ = g_strdup (_data_->_tmp20_); - _g_free0 (_data_->_tmp17_->suffixes); - _data_->_tmp17_->suffixes = _data_->_tmp21_; - _data_->_tmp22_ = _data_->contact_name; - _data_->_tmp23_ = _data_->sname; - _data_->_tmp24_ = folks_structured_name_get_prefixes (_data_->_tmp23_); - _data_->_tmp25_ = _data_->_tmp24_; - _data_->_tmp26_ = g_strdup (_data_->_tmp25_); - _g_free0 (_data_->_tmp22_->prefixes); - _data_->_tmp22_->prefixes = _data_->_tmp26_; - } - _data_->_tmp27_ = _data_->contact; - _data_->_tmp28_ = 0; - _data_->_tmp28_ = e_contact_field_id ("name"); - _data_->_tmp29_ = _data_->contact_name; - e_contact_set (_data_->_tmp27_, _data_->_tmp28_, _data_->_tmp29_); + _data_->_tmp2_ = _data_->_sname; + _data_->_tmp3_ = _g_object_ref0 (FOLKS_STRUCTURED_NAME (_data_->_tmp2_)); + _data_->sname = _data_->_tmp3_; + _data_->_tmp4_ = _data_->contact_name; + _data_->_tmp5_ = _data_->sname; + _data_->_tmp6_ = folks_structured_name_get_family_name (_data_->_tmp5_); + _data_->_tmp7_ = _data_->_tmp6_; + _data_->_tmp8_ = g_strdup (_data_->_tmp7_); + _g_free0 (_data_->_tmp4_->family); + _data_->_tmp4_->family = _data_->_tmp8_; + _data_->_tmp9_ = _data_->contact_name; + _data_->_tmp10_ = _data_->sname; + _data_->_tmp11_ = folks_structured_name_get_given_name (_data_->_tmp10_); + _data_->_tmp12_ = _data_->_tmp11_; + _data_->_tmp13_ = g_strdup (_data_->_tmp12_); + _g_free0 (_data_->_tmp9_->given); + _data_->_tmp9_->given = _data_->_tmp13_; + _data_->_tmp14_ = _data_->contact_name; + _data_->_tmp15_ = _data_->sname; + _data_->_tmp16_ = folks_structured_name_get_additional_names (_data_->_tmp15_); + _data_->_tmp17_ = _data_->_tmp16_; + _data_->_tmp18_ = g_strdup (_data_->_tmp17_); + _g_free0 (_data_->_tmp14_->additional); + _data_->_tmp14_->additional = _data_->_tmp18_; + _data_->_tmp19_ = _data_->contact_name; + _data_->_tmp20_ = _data_->sname; + _data_->_tmp21_ = folks_structured_name_get_suffixes (_data_->_tmp20_); + _data_->_tmp22_ = _data_->_tmp21_; + _data_->_tmp23_ = g_strdup (_data_->_tmp22_); + _g_free0 (_data_->_tmp19_->suffixes); + _data_->_tmp19_->suffixes = _data_->_tmp23_; + _data_->_tmp24_ = _data_->contact_name; + _data_->_tmp25_ = _data_->sname; + _data_->_tmp26_ = folks_structured_name_get_prefixes (_data_->_tmp25_); + _data_->_tmp27_ = _data_->_tmp26_; + _data_->_tmp28_ = g_strdup (_data_->_tmp27_); + _g_free0 (_data_->_tmp24_->prefixes); + _data_->_tmp24_->prefixes = _data_->_tmp28_; + _g_object_unref0 (_data_->sname); + } + _data_->_tmp29_ = _data_->contact; + _data_->_tmp30_ = 0; + _data_->_tmp30_ = e_contact_field_id ("name"); + _data_->_tmp31_ = _data_->contact_name; + e_contact_set (_data_->_tmp29_, _data_->_tmp30_, _data_->_tmp31_); __vala_EContactName_free0 (_data_->contact_name); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); @@ -8652,41 +9019,33 @@ } _state_0: _data_->_tmp0_ = _data_->contact; - _data_->_tmp1_ = NULL; - _data_->_tmp1_ = e_vcard_get_attribute ((EVCard*) _data_->_tmp0_, EDSF_PERSONA_gender_attribute_name); - _data_->attr = _data_->_tmp1_; - _data_->_tmp2_ = _data_->attr; - if (_data_->_tmp2_ != NULL) { - _data_->_tmp3_ = _data_->contact; - _data_->_tmp4_ = _data_->attr; - e_vcard_remove_attribute ((EVCard*) _data_->_tmp3_, _data_->_tmp4_); - } - _data_->_tmp5_ = e_vcard_attribute_new (NULL, EDSF_PERSONA_gender_attribute_name); - _data_->new_attr = _data_->_tmp5_; - _data_->_tmp6_ = _data_->gender; - switch (_data_->_tmp6_) { + _edsf_persona_store_remove_attribute (_data_->self, _data_->_tmp0_, EDSF_PERSONA_gender_attribute_name); + _data_->_tmp1_ = e_vcard_attribute_new (NULL, EDSF_PERSONA_gender_attribute_name); + _data_->new_attr = _data_->_tmp1_; + _data_->_tmp2_ = _data_->gender; + switch (_data_->_tmp2_) { case FOLKS_GENDER_UNSPECIFIED: { break; } case FOLKS_GENDER_MALE: { - _data_->_tmp7_ = _data_->new_attr; - e_vcard_attribute_add_value (_data_->_tmp7_, EDSF_PERSONA_gender_male); - _data_->_tmp8_ = _data_->contact; - _data_->_tmp9_ = _data_->new_attr; + _data_->_tmp3_ = _data_->new_attr; + e_vcard_attribute_add_value (_data_->_tmp3_, EDSF_PERSONA_gender_male); + _data_->_tmp4_ = _data_->contact; + _data_->_tmp5_ = _data_->new_attr; _data_->new_attr = NULL; - e_vcard_add_attribute ((EVCard*) _data_->_tmp8_, _data_->_tmp9_); + e_vcard_add_attribute ((EVCard*) _data_->_tmp4_, _data_->_tmp5_); break; } case FOLKS_GENDER_FEMALE: { - _data_->_tmp10_ = _data_->new_attr; - e_vcard_attribute_add_value (_data_->_tmp10_, EDSF_PERSONA_gender_female); - _data_->_tmp11_ = _data_->contact; - _data_->_tmp12_ = _data_->new_attr; + _data_->_tmp6_ = _data_->new_attr; + e_vcard_attribute_add_value (_data_->_tmp6_, EDSF_PERSONA_gender_female); + _data_->_tmp7_ = _data_->contact; + _data_->_tmp8_ = _data_->new_attr; _data_->new_attr = NULL; - e_vcard_add_attribute ((EVCard*) _data_->_tmp11_, _data_->_tmp12_); + e_vcard_add_attribute ((EVCard*) _data_->_tmp7_, _data_->_tmp8_); break; } default: @@ -8706,10 +9065,9 @@ static void _edsf_persona_store_contacts_added_cb (EdsfPersonaStore* self, GList* contacts) { GeeHashSet* _tmp0_; GeeHashSet* added_personas; - GeeHashSet* _tmp22_; + GeeHashSet* _tmp21_; + gint _tmp22_; gint _tmp23_; - gint _tmp24_; - gboolean _tmp26_; GError * _inner_error_ = NULL; g_return_if_fail (self != NULL); _tmp0_ = gee_hash_set_new (EDSF_TYPE_PERSONA, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); @@ -8738,9 +9096,7 @@ gchar* iid; GeeHashMap* _tmp8_; const gchar* _tmp9_; - gpointer _tmp10_ = NULL; - EdsfPersona* persona; - EdsfPersona* _tmp11_; + gboolean _tmp10_ = FALSE; _tmp4_ = folks_persona_store_get_id ((FolksPersonaStore*) self); _tmp5_ = _tmp4_; _tmp6_ = c; @@ -8748,44 +9104,42 @@ iid = _tmp7_; _tmp8_ = self->priv->_personas; _tmp9_ = iid; - _tmp10_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp8_, _tmp9_); - persona = (EdsfPersona*) _tmp10_; - _tmp11_ = persona; - if (_tmp11_ == NULL) { - EContact* _tmp12_; - EdsfPersona* _tmp13_; - GeeHashMap* _tmp14_; - EdsfPersona* _tmp15_; + _tmp10_ = gee_abstract_map_has_key ((GeeAbstractMap*) _tmp8_, _tmp9_); + if (_tmp10_ == FALSE) { + EContact* _tmp11_; + EdsfPersona* _tmp12_; + EdsfPersona* persona; + GeeHashMap* _tmp13_; + EdsfPersona* _tmp14_; + const gchar* _tmp15_; const gchar* _tmp16_; - const gchar* _tmp17_; - EdsfPersona* _tmp18_; - GeeHashSet* _tmp19_; - EdsfPersona* _tmp20_; - _tmp12_ = c; - _tmp13_ = edsf_persona_new (self, _tmp12_); + EdsfPersona* _tmp17_; + GeeHashSet* _tmp18_; + EdsfPersona* _tmp19_; + _tmp11_ = c; + _tmp12_ = edsf_persona_new (self, _tmp11_); + persona = _tmp12_; + _tmp13_ = self->priv->_personas; + _tmp14_ = persona; + _tmp15_ = folks_persona_get_iid ((FolksPersona*) _tmp14_); + _tmp16_ = _tmp15_; + _tmp17_ = persona; + gee_abstract_map_set ((GeeAbstractMap*) _tmp13_, _tmp16_, _tmp17_); + _tmp18_ = added_personas; + _tmp19_ = persona; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp18_, _tmp19_); _g_object_unref0 (persona); - persona = _tmp13_; - _tmp14_ = self->priv->_personas; - _tmp15_ = persona; - _tmp16_ = folks_persona_get_iid ((FolksPersona*) _tmp15_); - _tmp17_ = _tmp16_; - _tmp18_ = persona; - gee_abstract_map_set ((GeeAbstractMap*) _tmp14_, _tmp17_, _tmp18_); - _tmp19_ = added_personas; - _tmp20_ = persona; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp19_, _tmp20_); } - _g_object_unref0 (persona); _g_free0 (iid); _g_object_unref0 (c); } } } } - __finally17: + __finally18: { - GeeHashMap* _tmp21_; - _tmp21_ = self->priv->_personas; + GeeHashMap* _tmp20_; + _tmp20_ = self->priv->_personas; g_static_rec_mutex_unlock (&self->priv->__lock__personas); } if (_inner_error_ != NULL) { @@ -8795,18 +9149,13 @@ return; } } - _tmp22_ = added_personas; - _tmp23_ = gee_collection_get_size ((GeeCollection*) _tmp22_); - _tmp24_ = _tmp23_; - if (_tmp24_ > 0) { - GeeHashSet* _tmp25_; - _tmp25_ = added_personas; - _folks_persona_store_emit_personas_changed ((FolksPersonaStore*) self, (GeeSet*) _tmp25_, NULL, NULL, NULL, FOLKS_GROUP_DETAILS_CHANGE_REASON_NONE); - } - _tmp26_ = self->priv->_is_quiescent; - if (_tmp26_ == FALSE) { - self->priv->_is_quiescent = TRUE; - g_object_notify ((GObject*) self, "is-quiescent"); + _tmp21_ = added_personas; + _tmp22_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp21_); + _tmp23_ = _tmp22_; + if (_tmp23_ > 0) { + GeeHashSet* _tmp24_; + _tmp24_ = added_personas; + _folks_persona_store_emit_personas_changed ((FolksPersonaStore*) self, (GeeSet*) _tmp24_, NULL, NULL, NULL, FOLKS_GROUP_DETAILS_CHANGE_REASON_NONE); } _g_object_unref0 (added_personas); } @@ -8851,7 +9200,7 @@ EContact* _tmp11_; _tmp10_ = persona; _tmp11_ = c; - _edsf_persona_update (_tmp10_, _tmp11_); + _edsf_persona_update (EDSF_PERSONA (_tmp10_), _tmp11_); } _g_object_unref0 (persona); _g_free0 (iid); @@ -8912,10 +9261,10 @@ const gchar* _tmp16_; _tmp11_ = removed_personas; _tmp12_ = persona; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp11_, _tmp12_); + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp11_, EDSF_PERSONA (_tmp12_)); _tmp13_ = self->priv->_personas; _tmp14_ = persona; - _tmp15_ = folks_persona_get_iid ((FolksPersona*) _tmp14_); + _tmp15_ = folks_persona_get_iid ((FolksPersona*) EDSF_PERSONA (_tmp14_)); _tmp16_ = _tmp15_; gee_abstract_map_unset ((GeeAbstractMap*) _tmp13_, _tmp16_, NULL); } @@ -8926,7 +9275,7 @@ } } _tmp17_ = removed_personas; - _tmp18_ = gee_collection_get_size ((GeeCollection*) _tmp17_); + _tmp18_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp17_); _tmp19_ = _tmp18_; if (_tmp19_ > 0) { GeeHashSet* _tmp20_; @@ -8937,6 +9286,33 @@ } +static void _edsf_persona_store_contacts_complete_cb (EdsfPersonaStore* self, GError* err) { + GError* _tmp0_; + gboolean _tmp3_; + g_return_if_fail (self != NULL); + _tmp0_ = err; + if (_tmp0_ != NULL) { + GError* _tmp1_; + const gchar* _tmp2_; + _tmp1_ = err; + _tmp2_ = _tmp1_->message; + g_warning ("edsf-persona-store.vala:2046: Error in address book view query: %s", _tmp2_); + } + _tmp3_ = self->priv->_is_quiescent; + if (_tmp3_ == FALSE) { + GError* _tmp4_; + _tmp4_ = err; + if (_tmp4_ != NULL) { + g_warning ("edsf-persona-store.vala:2056: %s", "Error is considered unrecoverable. " "Removing persona store."); + g_signal_emit_by_name ((FolksPersonaStore*) self, "removed"); + return; + } + self->priv->_is_quiescent = TRUE; + g_object_notify ((GObject*) self, "is-quiescent"); + } +} + + static GError* edsf_persona_store_e_client_error_to_property_error (EdsfPersonaStore* self, const gchar* property_name, GError* error_in) { GError* result = NULL; GError* _tmp0_; @@ -9046,45 +9422,48 @@ static gboolean _edsf_persona_store_is_in_source_list (EdsfPersonaStore* self) { gboolean result = FALSE; ESourceList* _tmp0_; - GSList* _tmp1_ = NULL; + ESourceList* _tmp1_; + GSList* _tmp2_ = NULL; GSList* groups; - GSList* _tmp2_; + GSList* _tmp3_; g_return_val_if_fail (self != NULL, FALSE); _tmp0_ = self->priv->_source_list; - _tmp1_ = e_source_list_peek_groups (_tmp0_); - groups = _tmp1_; - _tmp2_ = groups; + g_assert (_tmp0_ != NULL); + _tmp1_ = self->priv->_source_list; + _tmp2_ = e_source_list_peek_groups (E_SOURCE_LIST (_tmp1_)); + groups = _tmp2_; + _tmp3_ = groups; { GSList* g_collection = NULL; GSList* g_it = NULL; - g_collection = _tmp2_; + g_collection = _tmp3_; for (g_it = g_collection; g_it != NULL; g_it = g_it->next) { ESourceGroup* g = NULL; g = (ESourceGroup*) g_it->data; { - ESourceGroup* _tmp3_; - GSList* _tmp4_ = NULL; - _tmp3_ = g; - _tmp4_ = e_source_group_peek_sources (_tmp3_); + ESourceGroup* _tmp4_; + GSList* _tmp5_ = NULL; + _tmp4_ = g; + _tmp5_ = e_source_group_peek_sources (_tmp4_); { GSList* s_collection = NULL; GSList* s_it = NULL; - s_collection = _tmp4_; + s_collection = _tmp5_; for (s_it = s_collection; s_it != NULL; s_it = s_it->next) { - ESource* _tmp5_; + ESource* _tmp6_; ESource* s = NULL; - _tmp5_ = _g_object_ref0 ((ESource*) s_it->data); - s = _tmp5_; + _tmp6_ = _g_object_ref0 ((ESource*) s_it->data); + s = _tmp6_; { - ESource* _tmp6_; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_; + ESource* _tmp7_; + const gchar* _tmp8_ = NULL; const gchar* _tmp9_; - _tmp6_ = s; - _tmp7_ = e_source_peek_uid (_tmp6_); - _tmp8_ = folks_persona_store_get_id ((FolksPersonaStore*) self); - _tmp9_ = _tmp8_; - if (g_strcmp0 (_tmp7_, _tmp9_) == 0) { + const gchar* _tmp10_; + _tmp7_ = s; + _tmp8_ = e_source_peek_uid (_tmp7_); + _tmp9_ = folks_persona_store_get_id ((FolksPersonaStore*) self); + _tmp10_ = _tmp9_; + if (g_strcmp0 (_tmp8_, _tmp10_) == 0) { result = TRUE; _g_object_unref0 (s); return result; @@ -9147,52 +9526,45 @@ static void _edsf_persona_store_update_trust_level (EdsfPersonaStore* self) { - ESource* _tmp0_; - void* _tmp1_ = NULL; + EBookClient* _tmp0_; + ESource* _tmp1_; + void* _tmp2_ = NULL; ESourceGroup* group; - ESourceGroup* _tmp2_; - EBookClient* _tmp11_; - gboolean _tmp12_ = FALSE; - gboolean _tmp13_; + ESourceGroup* _tmp3_; + EBookClient* _tmp9_; + gboolean _tmp10_ = FALSE; + gboolean _tmp11_; g_return_if_fail (self != NULL); - _tmp0_ = self->priv->_source; - _tmp1_ = e_source_peek_group (_tmp0_); - group = E_SOURCE_GROUP (_tmp1_); - _tmp2_ = group; - if (_tmp2_ != NULL) { - ESourceGroup* _tmp3_; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_; + _tmp0_ = self->priv->_addressbook; + g_assert (_tmp0_ != NULL); + _tmp1_ = self->priv->_source; + _tmp2_ = e_source_peek_group (_tmp1_); + group = E_SOURCE_GROUP (_tmp2_); + _tmp3_ = group; + if (_tmp3_ != NULL) { + ESourceGroup* _tmp4_; + const gchar* _tmp5_ = NULL; + gchar* _tmp6_; gchar* base_uri; - gboolean _tmp6_ = FALSE; const gchar* _tmp7_; - gboolean _tmp10_; - _tmp3_ = group; - _tmp4_ = e_source_group_peek_base_uri (_tmp3_); - _tmp5_ = g_strdup (_tmp4_); - base_uri = _tmp5_; + gboolean _tmp8_ = FALSE; + _tmp4_ = group; + _tmp5_ = e_source_group_peek_base_uri (E_SOURCE_GROUP (_tmp4_)); + _tmp6_ = g_strdup (_tmp5_); + base_uri = _tmp6_; _tmp7_ = base_uri; - if (_tmp7_ != NULL) { - const gchar* _tmp8_; - gboolean _tmp9_ = FALSE; - _tmp8_ = base_uri; - _tmp9_ = g_str_has_prefix (_tmp8_, "ldap"); - _tmp6_ = _tmp9_; - } else { - _tmp6_ = FALSE; - } - _tmp10_ = _tmp6_; - if (_tmp10_) { + _tmp8_ = g_str_has_prefix (_tmp7_, "ldap"); + if (_tmp8_) { folks_persona_store_set_trust_level ((FolksPersonaStore*) self, FOLKS_PERSONA_STORE_TRUST_PARTIAL); _g_free0 (base_uri); return; } _g_free0 (base_uri); } - _tmp11_ = self->priv->_addressbook; - g_object_get ((EClient*) _tmp11_, "readonly", &_tmp12_, NULL); - _tmp13_ = _tmp12_; - if (_tmp13_) { + _tmp9_ = self->priv->_addressbook; + g_object_get ((EClient*) E_BOOK_CLIENT (_tmp9_), "readonly", &_tmp10_, NULL); + _tmp11_ = _tmp10_; + if (_tmp11_) { folks_persona_store_set_trust_level ((FolksPersonaStore*) self, FOLKS_PERSONA_STORE_TRUST_PARTIAL); } else { folks_persona_store_set_trust_level ((FolksPersonaStore*) self, FOLKS_PERSONA_STORE_TRUST_FULL); @@ -9228,7 +9600,7 @@ sources = _tmp0_; if (_inner_error_ != NULL) { _g_object_unref0 (sources); - goto __catch18_g_error; + goto __catch19_g_error; } _tmp1_ = e_source_list_peek_default_source (sources); _tmp2_ = _g_object_ref0 (_tmp1_); @@ -9242,7 +9614,7 @@ _tmp5_ = self->priv->_source; _tmp6_ = e_source_peek_uid (_tmp5_); _tmp7_ = default_source; - _tmp8_ = e_source_peek_uid (_tmp7_); + _tmp8_ = e_source_peek_uid (E_SOURCE (_tmp7_)); _tmp3_ = g_strcmp0 (_tmp6_, _tmp8_) == 0; } else { _tmp3_ = FALSE; @@ -9254,8 +9626,8 @@ _g_object_unref0 (default_source); _g_object_unref0 (sources); } - goto __finally18; - __catch18_g_error: + goto __finally19; + __catch19_g_error: { GError* e = NULL; GError* _tmp10_; @@ -9265,7 +9637,7 @@ g_warning ("Failed to get the set of ESources while looking for a " "default address book: %s", _tmp10_); _g_error_free0 (e); } - __finally18: + __finally19: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); @@ -9307,7 +9679,7 @@ return result; } _tmp2_ = self->priv->_addressbook; - g_object_get ((EClient*) _tmp2_, "readonly", &_tmp3_, NULL); + g_object_get ((EClient*) E_BOOK_CLIENT (_tmp2_), "readonly", &_tmp3_, NULL); _tmp4_ = _tmp3_; if (_tmp4_) { _tmp1_ = FOLKS_MAYBE_BOOL_FALSE; @@ -9366,7 +9738,7 @@ return result; } _tmp2_ = self->priv->_addressbook; - g_object_get ((EClient*) _tmp2_, "readonly", &_tmp3_, NULL); + g_object_get ((EClient*) E_BOOK_CLIENT (_tmp2_), "readonly", &_tmp3_, NULL); _tmp4_ = _tmp3_; if (_tmp4_) { _tmp1_ = FOLKS_MAYBE_BOOL_FALSE; @@ -9393,40 +9765,50 @@ static gchar** edsf_persona_store_real_get_always_writeable_properties (FolksPersonaStore* base, int* result_length1) { gchar** result; EdsfPersonaStore* self; - EBookClient* _tmp0_; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_; - gchar** _tmp5_; - gint _tmp5__length1; - gchar** _tmp6_; - gint _tmp6__length1; + gboolean _tmp0_ = FALSE; + EBookClient* _tmp1_; + gboolean _tmp5_; + gchar** _tmp8_; + gint _tmp8__length1; + gchar** _tmp9_; + gint _tmp9__length1; self = (EdsfPersonaStore*) base; - _tmp0_ = self->priv->_addressbook; - g_object_get ((EClient*) _tmp0_, "readonly", &_tmp1_, NULL); - _tmp2_ = _tmp1_; - if (_tmp2_ == TRUE) { - gchar** _tmp3_; - gint _tmp3__length1; - gchar** _tmp4_; - gint _tmp4__length1; - _tmp3_ = edsf_persona_store__always_writeable_properties_empty; - _tmp3__length1 = edsf_persona_store__always_writeable_properties_empty_length1; + _tmp1_ = self->priv->_addressbook; + if (_tmp1_ == NULL) { + _tmp0_ = TRUE; + } else { + EBookClient* _tmp2_; + gboolean _tmp3_ = FALSE; + gboolean _tmp4_; + _tmp2_ = self->priv->_addressbook; + g_object_get ((EClient*) E_BOOK_CLIENT (_tmp2_), "readonly", &_tmp3_, NULL); _tmp4_ = _tmp3_; - _tmp4__length1 = _tmp3__length1; + _tmp0_ = _tmp4_ == TRUE; + } + _tmp5_ = _tmp0_; + if (_tmp5_) { + gchar** _tmp6_; + gint _tmp6__length1; + gchar** _tmp7_; + gint _tmp7__length1; + _tmp6_ = edsf_persona_store__always_writeable_properties_empty; + _tmp6__length1 = edsf_persona_store__always_writeable_properties_empty_length1; + _tmp7_ = _tmp6_; + _tmp7__length1 = _tmp6__length1; if (result_length1) { - *result_length1 = _tmp4__length1; + *result_length1 = _tmp7__length1; } - result = _tmp4_; + result = _tmp7_; return result; } - _tmp5_ = self->priv->_always_writeable_properties; - _tmp5__length1 = self->priv->_always_writeable_properties_length1; - _tmp6_ = _tmp5_; - _tmp6__length1 = _tmp5__length1; + _tmp8_ = self->priv->_always_writeable_properties; + _tmp8__length1 = self->priv->_always_writeable_properties_length1; + _tmp9_ = _tmp8_; + _tmp9__length1 = _tmp8__length1; if (result_length1) { - *result_length1 = _tmp6__length1; + *result_length1 = _tmp9__length1; } - result = _tmp6_; + result = _tmp9_; return result; } @@ -9541,7 +9923,7 @@ * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_TYPE_ID, "type-id"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_TYPE_ID, g_param_spec_string ("type-id", "type-id", "type-id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can add {@link Folks.Persona}s. * @@ -9549,7 +9931,7 @@ * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_CAN_ADD_PERSONAS, "can-add-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_CAN_ADD_PERSONAS, g_param_spec_enum ("can-add-personas", "can-add-personas", "can-add-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can set the alias of {@link Folks.Persona}s. * @@ -9557,7 +9939,7 @@ * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_CAN_ALIAS_PERSONAS, "can-alias-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_CAN_ALIAS_PERSONAS, g_param_spec_enum ("can-alias-personas", "can-alias-personas", "can-alias-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can set the groups of {@link Folks.Persona}s. * @@ -9565,7 +9947,7 @@ * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_CAN_GROUP_PERSONAS, "can-group-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_CAN_GROUP_PERSONAS, g_param_spec_enum ("can-group-personas", "can-group-personas", "can-group-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can remove {@link Folks.Persona}s. * @@ -9573,7 +9955,7 @@ * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_CAN_REMOVE_PERSONAS, "can-remove-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_CAN_REMOVE_PERSONAS, g_param_spec_enum ("can-remove-personas", "can-remove-personas", "can-remove-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore has been prepared. * @@ -9581,14 +9963,14 @@ * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_IS_PREPARED, "is-prepared"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_IS_PREPARED, g_param_spec_boolean ("is-prepared", "is-prepared", "is-prepared", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} * * @since 0.6.2 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_ALWAYS_WRITEABLE_PROPERTIES, "always-writeable-properties"); - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_IS_QUIESCENT, "is-quiescent"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_ALWAYS_WRITEABLE_PROPERTIES, g_param_spec_boxed ("always-writeable-properties", "always-writeable-properties", "always-writeable-properties", G_TYPE_STRV, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_IS_QUIESCENT, g_param_spec_boolean ("is-quiescent", "is-quiescent", "is-quiescent", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * The {@link Persona}s exposed by this PersonaStore. * @@ -9596,7 +9978,7 @@ * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_PERSONAS, "personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), EDSF_PERSONA_STORE_PERSONAS, g_param_spec_object ("personas", "personas", "personas", GEE_TYPE_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * The EDS {@link E.Source} associated with this persona store. * @@ -9617,11 +9999,15 @@ self->priv->_is_prepared = FALSE; self->priv->_prepare_pending = FALSE; self->priv->_is_quiescent = FALSE; + self->priv->_addressbook = NULL; + self->priv->_ebookview = NULL; self->priv->_source_list = NULL; _tmp0_ = g_new0 (gchar*, 0 + 1); self->priv->_always_writeable_properties = _tmp0_; self->priv->_always_writeable_properties_length1 = 0; self->priv->__always_writeable_properties_size_ = self->priv->_always_writeable_properties_length1; + self->priv->_open_address_book_error = NULL; + self->priv->_open_address_book_callback = NULL; } @@ -9631,8 +10017,8 @@ self = EDSF_PERSONA_STORE (obj); { EBookClientView* _tmp0_; - EBookClient* _tmp8_; - ESourceList* _tmp12_; + EBookClient* _tmp10_; + ESourceList* _tmp16_; _tmp0_ = self->priv->_ebookview; if (_tmp0_ != NULL) { EBookClientView* _tmp1_; @@ -9642,41 +10028,51 @@ EBookClientView* _tmp5_; guint _tmp6_ = 0U; EBookClientView* _tmp7_; + guint _tmp8_ = 0U; + EBookClientView* _tmp9_; _tmp1_ = self->priv->_ebookview; g_signal_parse_name ("objects-added", e_book_client_view_get_type (), &_tmp2_, NULL, FALSE); - g_signal_handlers_disconnect_matched (_tmp1_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) __edsf_persona_store_contacts_added_cb_e_book_client_view_objects_added, self); + g_signal_handlers_disconnect_matched (E_BOOK_CLIENT_VIEW (_tmp1_), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) __edsf_persona_store_contacts_added_cb_e_book_client_view_objects_added, self); _tmp3_ = self->priv->_ebookview; g_signal_parse_name ("objects-removed", e_book_client_view_get_type (), &_tmp4_, NULL, FALSE); - g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) __edsf_persona_store_contacts_removed_cb_e_book_client_view_objects_removed, self); + g_signal_handlers_disconnect_matched (E_BOOK_CLIENT_VIEW (_tmp3_), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) __edsf_persona_store_contacts_removed_cb_e_book_client_view_objects_removed, self); _tmp5_ = self->priv->_ebookview; g_signal_parse_name ("objects-modified", e_book_client_view_get_type (), &_tmp6_, NULL, FALSE); - g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) __edsf_persona_store_contacts_changed_cb_e_book_client_view_objects_modified, self); + g_signal_handlers_disconnect_matched (E_BOOK_CLIENT_VIEW (_tmp5_), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) __edsf_persona_store_contacts_changed_cb_e_book_client_view_objects_modified, self); _tmp7_ = self->priv->_ebookview; - e_book_client_view_stop (_tmp7_, &_inner_error_); + g_signal_parse_name ("complete", e_book_client_view_get_type (), &_tmp8_, NULL, FALSE); + g_signal_handlers_disconnect_matched (E_BOOK_CLIENT_VIEW (_tmp7_), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) __edsf_persona_store_contacts_complete_cb_e_book_client_view_complete, self); + _tmp9_ = self->priv->_ebookview; + e_book_client_view_stop (E_BOOK_CLIENT_VIEW (_tmp9_), &_inner_error_); if (_inner_error_ != NULL) { goto __catch5_g_error; } _g_object_unref0 (self->priv->_ebookview); self->priv->_ebookview = NULL; } - _tmp8_ = self->priv->_addressbook; - if (_tmp8_ != NULL) { - EBookClient* _tmp9_; - guint _tmp10_ = 0U; - GQuark _tmp11_ = 0U; - _tmp9_ = self->priv->_addressbook; - g_signal_parse_name ("notify::readonly", G_TYPE_OBJECT, &_tmp10_, &_tmp11_, TRUE); - g_signal_handlers_disconnect_matched ((GObject*) _tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DETAIL | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, _tmp11_, NULL, (GCallback) __edsf_persona_store_address_book_notify_read_only_cb_g_object_notify, self); + _tmp10_ = self->priv->_addressbook; + if (_tmp10_ != NULL) { + EBookClient* _tmp11_; + guint _tmp12_ = 0U; + EBookClient* _tmp13_; + guint _tmp14_ = 0U; + GQuark _tmp15_ = 0U; + _tmp11_ = self->priv->_addressbook; + g_signal_parse_name ("authenticate", e_client_get_type (), &_tmp12_, NULL, FALSE); + g_signal_handlers_disconnect_matched ((EClient*) E_BOOK_CLIENT (_tmp11_), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) __edsf_persona_store_address_book_authenticate_cb_e_client_authenticate, self); + _tmp13_ = self->priv->_addressbook; + g_signal_parse_name ("notify::readonly", G_TYPE_OBJECT, &_tmp14_, &_tmp15_, TRUE); + g_signal_handlers_disconnect_matched ((GObject*) E_BOOK_CLIENT (_tmp13_), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DETAIL | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, _tmp15_, NULL, (GCallback) __edsf_persona_store_address_book_notify_read_only_cb_g_object_notify, self); _g_object_unref0 (self->priv->_addressbook); self->priv->_addressbook = NULL; } - _tmp12_ = self->priv->_source_list; - if (_tmp12_ != NULL) { - ESourceList* _tmp13_; - guint _tmp14_ = 0U; - _tmp13_ = self->priv->_source_list; - g_signal_parse_name ("changed", e_source_list_get_type (), &_tmp14_, NULL, FALSE); - g_signal_handlers_disconnect_matched (_tmp13_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp14_, 0, NULL, (GCallback) __edsf_persona_store_source_list_changed_cb_e_source_list_changed, self); + _tmp16_ = self->priv->_source_list; + if (_tmp16_ != NULL) { + ESourceList* _tmp17_; + guint _tmp18_ = 0U; + _tmp17_ = self->priv->_source_list; + g_signal_parse_name ("changed", e_source_list_get_type (), &_tmp18_, NULL, FALSE); + g_signal_handlers_disconnect_matched (E_SOURCE_LIST (_tmp17_), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp18_, 0, NULL, (GCallback) __edsf_persona_store_source_list_changed_cb_e_source_list_changed, self); _g_object_unref0 (self->priv->_source_list); self->priv->_source_list = NULL; } @@ -9685,13 +10081,13 @@ __catch5_g_error: { GError* e = NULL; - GError* _tmp15_; - const gchar* _tmp16_; + GError* _tmp19_; + const gchar* _tmp20_; e = _inner_error_; _inner_error_ = NULL; - _tmp15_ = e; - _tmp16_ = _tmp15_->message; - g_warning ("edsf-persona-store.vala:263: ~PersonaStore: %s\n", _tmp16_); + _tmp19_ = e; + _tmp20_ = _tmp19_->message; + g_warning ("edsf-persona-store.vala:270: ~PersonaStore: %s\n", _tmp20_); _g_error_free0 (e); } __finally5: @@ -9709,6 +10105,11 @@ _g_free0 (self->priv->_query_str); self->priv->_always_writeable_properties = (_vala_array_free (self->priv->_always_writeable_properties, self->priv->_always_writeable_properties_length1, (GDestroyNotify) g_free), NULL); _g_object_unref0 (self->priv->_source); + _g_error_free0 (self->priv->_open_address_book_error); + (self->priv->_open_address_book_callback_target_destroy_notify == NULL) ? NULL : (self->priv->_open_address_book_callback_target_destroy_notify (self->priv->_open_address_book_callback_target), NULL); + self->priv->_open_address_book_callback = NULL; + self->priv->_open_address_book_callback_target = NULL; + self->priv->_open_address_book_callback_target_destroy_notify = NULL; G_OBJECT_CLASS (edsf_persona_store_parent_class)->finalize (obj); } diff -Nru folks-0.6.6/backends/eds/lib/edsf-persona-store.vala folks-0.6.7/backends/eds/lib/edsf-persona-store.vala --- folks-0.6.6/backends/eds/lib/edsf-persona-store.vala 2011-12-13 23:35:28.000000000 +0000 +++ folks-0.6.7/backends/eds/lib/edsf-persona-store.vala 2012-02-18 00:46:31.000000000 +0000 @@ -39,9 +39,9 @@ private bool _is_prepared = false; private bool _prepare_pending = false; private bool _is_quiescent = false; - private E.BookClient _addressbook; - private E.BookClientView _ebookview; - private E.SourceList? _source_list = null; + private E.BookClient? _addressbook = null; /* null before prepare() */ + private E.BookClientView? _ebookview = null; /* null before prepare() */ + private E.SourceList? _source_list = null; /* null before prepare() */ private string _query_str; /* The timeout after which we consider a property change to have failed if we @@ -81,7 +81,8 @@ return MaybeBool.FALSE; } - return this._addressbook.readonly ? MaybeBool.FALSE : MaybeBool.TRUE; + return ((!) this._addressbook).readonly + ? MaybeBool.FALSE : MaybeBool.TRUE; } } @@ -129,7 +130,8 @@ return MaybeBool.FALSE; } - return this._addressbook.readonly ? MaybeBool.FALSE : MaybeBool.TRUE; + return ((!) this._addressbook).readonly + ? MaybeBool.FALSE : MaybeBool.TRUE; } } @@ -157,7 +159,8 @@ { get { - if (this._addressbook.readonly == true) + if (this._addressbook == null || + ((!) this._addressbook).readonly == true) { return this._always_writeable_properties_empty; } @@ -232,20 +235,24 @@ { if (this._ebookview != null) { - this._ebookview.objects_added.disconnect ( + ((!) this._ebookview).objects_added.disconnect ( this._contacts_added_cb); - this._ebookview.objects_removed.disconnect ( + ((!) this._ebookview).objects_removed.disconnect ( this._contacts_removed_cb); - this._ebookview.objects_modified.disconnect ( + ((!) this._ebookview).objects_modified.disconnect ( this._contacts_changed_cb); - this._ebookview.stop (); + ((!) this._ebookview).complete.disconnect ( + this._contacts_complete_cb); + ((!) this._ebookview).stop (); this._ebookview = null; } if (this._addressbook != null) { - this._addressbook.notify["readonly"].disconnect ( + ((!) this._addressbook).authenticate.disconnect ( + this._address_book_authenticate_cb); + ((!) this._addressbook).notify["readonly"].disconnect ( this._address_book_notify_read_only_cb); this._addressbook = null; @@ -253,7 +260,7 @@ if (this._source_list != null) { - this._source_list.changed.disconnect ( + ((!) this._source_list).changed.disconnect ( this._source_list_changed_cb); this._source_list = null; } @@ -291,16 +298,32 @@ public override async Folks.Persona? add_persona_from_details ( HashTable details) throws Folks.PersonaStoreError { + // We have to have called prepare() beforehand. + if (!this._is_prepared) + { + throw new PersonaStoreError.STORE_OFFLINE ( + "Persona store has not yet been prepared."); + } + E.Contact contact = new E.Contact (); - foreach (var k in details.get_keys ()) + var iter = HashTableIter (details); + unowned string k; + unowned Value? _v; + + while (iter.next (out k, out _v) == true) { - Value? v = details.lookup (k); + if (_v == null) + { + continue; + } + unowned Value v = (!) _v; + if (k == Folks.PersonaStore.detail_key ( PersonaDetail.FULL_NAME)) { - var full_name = v.get_string (); - if (full_name == "") + string? full_name = v.get_string (); + if (full_name != null && (!) full_name == "") { full_name = null; } @@ -406,12 +429,14 @@ } } - Edsf.Persona? persona = null; + Edsf.Persona? _persona = null; try { + /* _addressbook is guaranteed to be non-null before we ensure that + * prepare() has already been called. */ string added_uid; - var result = yield this._addressbook.add_contact (contact, + var result = yield ((!) this._addressbook).add_contact (contact, null, out added_uid); @@ -421,15 +446,19 @@ lock (this._personas) { var iid = Edsf.Persona.build_iid (this.id, added_uid); - persona = this._personas.get (iid); - if (persona == null) + _persona = this._personas.get (iid); + if (_persona == null) { + Edsf.Persona persona; + contact.set (E.Contact.field_id ("id"), added_uid); persona = new Persona (this, contact); this._personas.set (persona.iid, persona); var added_personas = new HashSet (); added_personas.add (persona); this._emit_personas_changed (added_personas, null); + + _persona = persona; } } } @@ -445,7 +474,7 @@ e.message); } - return persona; + return _persona; } /** @@ -460,9 +489,18 @@ public override async void remove_persona (Folks.Persona persona) throws Folks.PersonaStoreError { + // We have to have called prepare() beforehand. + if (!this._is_prepared) + { + throw new PersonaStoreError.STORE_OFFLINE ( + "Persona store has not yet been prepared."); + } + try { - yield this._addressbook.remove_contact ( + /* _addressbook is guaranteed to be non-null before we ensure that + * prepare() has already been called. */ + yield ((!) this._addressbook).remove_contact ( ((Edsf.Persona) persona).contact, null); } catch (GLib.Error e) @@ -561,15 +599,23 @@ * need to check if we still exist in the list, as * addressbook.open() will fail if we don't. */ E.BookClient.get_sources (out this._source_list); - this._source_list.changed.connect (this._source_list_changed_cb); + + /* We know _source_list != null because otherwise + * E.BookClient.get_sources() would've thrown an error. */ + ((!) this._source_list).changed.connect ( + this._source_list_changed_cb); /* Connect to the address book. */ this._addressbook = new E.BookClient (this.source); - this._addressbook.notify["readonly"].connect ( + ((!) this._addressbook).notify["readonly"].connect ( this._address_book_notify_read_only_cb); + ((!) this._addressbook).authenticate.connect ( + this._address_book_authenticate_cb); - yield this._addressbook.open (false, null); + yield this._open_address_book (); + debug ("Successfully finished opening address book %p for " + + "persona store ‘%s’ (%p).", this._addressbook, this.id, this); this._update_trust_level (); } @@ -647,45 +693,34 @@ this._prepare_pending = false; } - if (this._addressbook.is_opened () == false) - { - /* Remove the persona store on error */ - this.removed (); - this._prepare_pending = false; - - throw new PersonaStoreError.INVALID_ARGUMENT ( - /* Translators: the parameter is an address book URI. */ - _("Couldn't open address book ‘%s’."), this.id); - } - /* Determine which fields the address book supports. This is necessary * to work out which writeable properties we can support. * * Note: We assume this is constant over the lifetime of the address * book. This seems reasonable. */ - string supported_fields; try { - yield this._addressbook.get_backend_property ("supported-fields", - null, out supported_fields); + string? supported_fields = null; + yield ((!) this._addressbook).get_backend_property ( + "supported-fields", null, out supported_fields); var prop_set = new HashSet (); /* We get a comma-separated list of fields back. */ if (supported_fields != null) { - string[] fields = supported_fields.split (","); + string[] fields = ((!) supported_fields).split (","); /* We always support local-ids, web-service-addresses, gender * and favourite because we use custom vCard attributes for * them. */ - prop_set.add (Folks.PersonaStore.detail_key ( + prop_set.add ((!) Folks.PersonaStore.detail_key ( PersonaDetail.LOCAL_IDS)); - prop_set.add (Folks.PersonaStore.detail_key ( + prop_set.add ((!) Folks.PersonaStore.detail_key ( PersonaDetail.WEB_SERVICE_ADDRESSES)); - prop_set.add (Folks.PersonaStore.detail_key ( + prop_set.add ((!) Folks.PersonaStore.detail_key ( PersonaDetail.GENDER)); - prop_set.add (Folks.PersonaStore.detail_key ( + prop_set.add ((!) Folks.PersonaStore.detail_key ( PersonaDetail.IS_FAVOURITE)); foreach (unowned string field in fields) @@ -695,20 +730,19 @@ if (prop != null) { - prop_set.add ((owned) prop); + prop_set.add ((!) (owned) prop); } } } /* Convert the property set to an array. We can't use .to_array() * here because it fails to null-terminate the array. Sigh. */ - this._always_writeable_properties = new string[prop_set.size + 1]; + this._always_writeable_properties = new string[prop_set.size]; uint i = 0; foreach (var final_prop in prop_set) { this._always_writeable_properties[i++] = final_prop; } - this._always_writeable_properties[i] = null; } catch (GLib.Error e2) { @@ -730,13 +764,13 @@ var do_initial_query = false; try { - string capabilities; - yield this._addressbook.get_backend_property ("capabilities", - null, out capabilities); + string? capabilities = null; + yield ((!) this._addressbook).get_backend_property ( + "capabilities", null, out capabilities); if (capabilities != null) { - string[] caps = capabilities.split (","); + string[] caps = ((!) capabilities).split (","); do_initial_query = ("do-initial-query" in caps); } @@ -758,8 +792,8 @@ bool got_view = false; try { - got_view = yield this._addressbook.get_view (this._query_str, - null, out this._ebookview); + got_view = yield ((!) this._addressbook).get_view ( + this._query_str, null, out this._ebookview); if (got_view == false) { @@ -769,11 +803,16 @@ this.id); } - this._ebookview.objects_added.connect (this._contacts_added_cb); - this._ebookview.objects_removed.connect (this._contacts_removed_cb); - this._ebookview.objects_modified.connect (this._contacts_changed_cb); + ((!) this._ebookview).objects_added.connect ( + this._contacts_added_cb); + ((!) this._ebookview).objects_removed.connect ( + this._contacts_removed_cb); + ((!) this._ebookview).objects_modified.connect ( + this._contacts_changed_cb); + ((!) this._ebookview).complete.connect ( + this._contacts_complete_cb); - this._ebookview.start (); + ((!) this._ebookview).start (); } catch (GLib.Error e3) { @@ -865,6 +904,118 @@ } } + private bool _address_book_authenticate_cb (Client address_book, + void *credentials) + { + /* FIXME: Add authentication support. That's: + * https://bugzilla.gnome.org/show_bug.cgi?id=653339 + * + * For the moment, we just reject the authentication request, rather than + * leave it hanging. */ + return false; + } + + /* Temporaries for _open_address_book(). See the complaint below. */ + Error? _open_address_book_error = null; + SourceFunc? _open_address_book_callback = null; /* non-null iff yielded */ + + /* Guarantees that either the address book will be open once the method + * returns, or an error will be thrown. */ + private async void _open_address_book () throws GLib.Error + { + Error? err_out = null; + + debug ("Opening address book %p for persona store ‘%s’ (%p)", + this._addressbook, this.id, this); + + /* We have to connect to this weirdly because ‘opened’ is also a property + * name. This means we can’t use a lambda function, which in turn means + * that we need to build our own closure (or store some temporaries in + * the persona store’s private data struct). Yuck. Yuck. Yuck. */ + var signal_id = Signal.connect_swapped ((!) this._addressbook, "opened", + (Callback) this._address_book_opened_cb, this); + + try + { + this._open_address_book_error = null; + + yield ((!) this._addressbook).open (false, null); + + if (this._open_address_book_error != null) + { + throw this._open_address_book_error; + } + } + catch (GLib.Error e1) + { + if (e1.domain == Client.error_quark () && + (ClientError) e1.code == ClientError.BUSY) + { + /* If we've received a BUSY error, it means that the address book + * is already in the process of being opened by a different client + * (most likely in a completely unrelated process). Since EDS is + * kind enough not to block the open() call in this case, we have + * to handle it ourselves by waiting for the ::opened signal, + * which will be emitted once the address book is opened (or once + * opening it fails). + * + * We yield until the ::opened callback is called, at which point + * we return. The callback is a no-op if it’s called during the + * open() call above. */ + this._open_address_book_callback = + this._open_address_book.callback; + this._open_address_book_error = null; + + debug ("Yielding on opening address book %p for persona store " + + "‘%s’ (%p)", this._addressbook, this.id, this); + yield; + + /* Propagate error/success. */ + err_out = this._open_address_book_error; + } + else + { + /* Error. */ + err_out = e1; + } + + if (err_out != null) + { + throw err_out; + } + } + finally + { + /* Disconnect the ::opened signal. */ + ((!) this._addressbook).disconnect (signal_id); + + /* We should really be able to expect that either the address book is + * now open, or we have an error set. Unfortunately, this sometimes + * isn't the case, probably due to misbehaving EDS backends (though + * I haven't investigated). Just throw an error to be on the safe + * side. */ + if (((!) this._addressbook).is_opened () == false && err_out == null) + { + err_out = new Error (Client.error_quark (), + ClientError.OTHER_ERROR, "Misbehaving EDS backend: %s.", + this.id); + } + } + } + + private void _address_book_opened_cb (Error? err, BookClient address_book) + { + debug ("_address_book_opened_cb for store ‘%s’ (%p), address book %p " + + "and error %p", this.id, this, address_book, (void*) err); + + this._open_address_book_error = err; + + if (this._open_address_book_callback != null) + { + this._open_address_book_callback (); + } + } + private PersonaDetail _eds_field_name_to_folks_persona_detail ( string eds_field_name) { @@ -876,6 +1027,7 @@ return PersonaDetail.FULL_NAME; case ContactField.GIVEN_NAME: case ContactField.FAMILY_NAME: + case ContactField.NAME: return PersonaDetail.STRUCTURED_NAME; case ContactField.NICKNAME: return PersonaDetail.NICKNAME; @@ -989,23 +1141,31 @@ case ContactField.IM_SKYPE_WORK_2: case ContactField.IM_SKYPE_WORK_3: case ContactField.IM_SKYPE: + case ContactField.IM_GOOGLE_TALK_HOME_1: + case ContactField.IM_GOOGLE_TALK_HOME_2: + case ContactField.IM_GOOGLE_TALK_HOME_3: + case ContactField.IM_GOOGLE_TALK_WORK_1: + case ContactField.IM_GOOGLE_TALK_WORK_2: + case ContactField.IM_GOOGLE_TALK_WORK_3: + case ContactField.IM_GOOGLE_TALK: return PersonaDetail.IM_ADDRESSES; case ContactField.PHOTO: return PersonaDetail.AVATAR; case ContactField.BIRTH_DATE: return PersonaDetail.BIRTHDAY; + /* Irrelevant */ + case ContactField.UID: /* identifier */ + case ContactField.REV: /* revision date */ + case ContactField.BOOK_URI: /* parent identifier */ + case ContactField.NAME_OR_ORG: /* FULL_NAME or ORG; both handled */ + return PersonaDetail.INVALID; /* Unsupported */ - case ContactField.UID: case ContactField.FILE_AS: - case ContactField.BOOK_URI: case ContactField.MAILER: case ContactField.CALENDAR_URI: case ContactField.ICS_CALENDAR: case ContactField.SPOUSE: - case ContactField.REV: - case ContactField.NAME_OR_ORG: case ContactField.LOGO: - case ContactField.NAME: case ContactField.WANTS_HTML: case ContactField.IS_LIST: case ContactField.LIST_SHOW_ADDRESSES: @@ -1024,6 +1184,12 @@ private async void _commit_modified_property (Edsf.Persona persona, string property_name) throws PropertyError { + /* We require _addressbook to be non-null. This should be the case + * because we're only called from property setters, and they check whether + * the properties are writeable first. Properties shouldn't be writeable + * if _addressbook is null. */ + assert (this._addressbook != null); + var contact = persona.contact; ulong signal_id = 0; @@ -1045,8 +1211,9 @@ } }); - /* Commit the modification. */ - yield this._addressbook.modify_contact (contact, null); + /* Commit the modification. _addressbook is asserted as being non-null + * above. */ + yield ((!) this._addressbook).modify_contact (contact, null); timeout_id = Timeout.add_seconds (this._property_change_timeout, () => { @@ -1093,6 +1260,15 @@ } } + private void _remove_attribute (E.Contact contact, string attr_name) + { + unowned VCardAttribute? attr = contact.get_attribute (attr_name); + if (attr != null) + { + contact.remove_attribute ((!) attr); + } + } + internal async void _set_avatar (Edsf.Persona persona, LoadableIcon? avatar) throws PropertyError { @@ -1104,7 +1280,7 @@ /* Return early if there will be no change */ if ((persona.avatar == null && avatar == null) || - (persona.avatar != null && persona.avatar.equal (avatar))) + (persona.avatar != null && ((!) persona.avatar).equal (avatar))) { return; } @@ -1135,12 +1311,7 @@ private async void _set_contact_web_service_addresses (E.Contact contact, MultiMap web_service_addresses) { - unowned VCardAttribute attr = - contact.get_attribute ("X-FOLKS-WEB-SERVICES-IDS"); - if (attr != null) - { - contact.remove_attribute (attr); - } + this._remove_attribute (contact, "X-FOLKS-WEB-SERVICES-IDS"); var attr_n = new VCardAttribute (null, "X-FOLKS-WEB-SERVICES-IDS"); foreach (var service in web_service_addresses.get_keys ()) @@ -1249,12 +1420,7 @@ private async void _set_contact_local_ids (E.Contact contact, Set local_ids) { - unowned VCardAttribute attr = - contact.get_attribute ("X-FOLKS-CONTACTS-IDS"); - if (attr != null) - { - contact.remove_attribute (attr); - } + this._remove_attribute (contact, "X-FOLKS-CONTACTS-IDS"); var new_attr = new VCardAttribute (null, "X-FOLKS-CONTACTS-IDS"); foreach (var local_id in local_ids) @@ -1281,11 +1447,7 @@ private async void _set_contact_is_favourite (E.Contact contact, bool is_favourite) { - unowned VCardAttribute attr = contact.get_attribute ("X-FOLKS-FAVOURITE"); - if (attr != null) - { - contact.remove_attribute (attr); - } + this._remove_attribute (contact, "X-FOLKS-FAVOURITE"); if (is_favourite) { @@ -1300,11 +1462,7 @@ { if (avatar == null) { - unowned VCardAttribute attr = contact.get_attribute ("PHOTO"); - if (attr != null) - { - contact.remove_attribute (attr); - } + this._remove_attribute (contact, "PHOTO"); } else { @@ -1313,7 +1471,7 @@ /* Set the avatar on the contact */ var cp = new ContactPhoto (); cp.type = ContactPhotoType.INLINED; - var input_s = yield avatar.load_async (-1, null, null); + var input_s = yield ((!) avatar).load_async (-1, null, null); uint8[] image_data = new uint8[0]; uint8[] buffer = new uint8[4096]; @@ -1334,7 +1492,7 @@ bool uncertain = false; var mime_type = ContentType.guess (null, image_data, out uncertain); - if (mime_type != null && !uncertain) + if (!uncertain) { cp.set_mime_type (mime_type); } @@ -1455,15 +1613,16 @@ _("Full name is not writeable on this contact.")); } + string? _full_name = full_name; if (full_name == "") { - full_name = null; + _full_name = null; } - if (persona.full_name == full_name) + if (persona.full_name == _full_name) return; - persona.contact.set (E.Contact.field_id ("full_name"), full_name); + persona.contact.set (E.Contact.field_id ("full_name"), _full_name); yield this._commit_modified_property (persona, "full-name"); } @@ -1476,15 +1635,16 @@ _("Nickname is not writeable on this contact.")); } + string? _nickname = nickname; if (nickname == "") { - nickname = null; + _nickname = null; } - if (persona.nickname == nickname) + if (persona.nickname == _nickname) return; - persona.contact.set (E.Contact.field_id ("nickname"), nickname); + persona.contact.set (E.Contact.field_id ("nickname"), _nickname); yield this._commit_modified_property (persona, "nickname"); } @@ -1528,7 +1688,7 @@ if (persona.birthday != null && bday != null && - persona.birthday.equal (bday)) + ((!) persona.birthday).equal ((!) bday)) return; /* Maybe the current and new b-day are unset */ @@ -1541,19 +1701,24 @@ } private async void _set_contact_birthday (E.Contact contact, - DateTime? bday) + DateTime? _bday) { - E.ContactDate? contact_bday = null; + E.ContactDate? _contact_bday = null; - if (bday != null) + if (_bday != null) { + var bday = (!) _bday; + E.ContactDate contact_bday; + contact_bday = new E.ContactDate (); contact_bday.year = (uint) bday.get_year (); contact_bday.month = (uint) bday.get_month (); contact_bday.day = (uint) bday.get_day_of_month (); + + _contact_bday = contact_bday; } - contact.set (E.Contact.field_id ("birth_date"), contact_bday); + contact.set (E.Contact.field_id ("birth_date"), _contact_bday); } internal async void _set_roles (Edsf.Persona persona, @@ -1601,23 +1766,23 @@ /* FIXME: we are swallowing the extra parameter values */ var org_unit_values = role_fd.get_parameter_values ("org_unit"); if (org_unit_values != null && - org_unit_values.size > 0) - org_unit = org_unit_values.to_array ()[0]; + ((!) org_unit_values).size > 0) + org_unit = ((!) org_unit_values).to_array ()[0]; var office_values = role_fd.get_parameter_values ("office"); if (office_values != null && - office_values.size > 0) - office = office_values.to_array ()[0]; + ((!) office_values).size > 0) + office = ((!) office_values).to_array ()[0]; var manager_values = role_fd.get_parameter_values ("manager"); if (manager_values != null && - manager_values.size > 0) - manager = manager_values.to_array ()[0]; + ((!) manager_values).size > 0) + manager = ((!) manager_values).to_array ()[0]; var assistant_values = role_fd.get_parameter_values ("assistant"); if (assistant_values != null && - assistant_values.size > 0) - assistant = assistant_values.to_array ()[0]; + ((!) assistant_values).size > 0) + assistant = ((!) assistant_values).to_array ()[0]; } else { @@ -1666,8 +1831,12 @@ _("Structured name is not writeable on this contact.")); } - if (persona.structured_name != null && - persona.structured_name.equal (sname)) + if (persona.structured_name != null && sname != null && + ((!) persona.structured_name).equal ((!) sname)) + return; + + /* Maybe the current and new name are unset */ + if (persona.structured_name == null && sname == null) return; yield this._set_contact_name (persona.contact, sname); @@ -1675,12 +1844,14 @@ } private async void _set_contact_name (E.Contact contact, - StructuredName? sname) + StructuredName? _sname) { E.ContactName contact_name = new E.ContactName (); - if (sname != null) + if (_sname != null) { + var sname = (!) _sname; + contact_name.family = sname.family_name; contact_name.given = sname.given_name; contact_name.additional = sname.additional_names; @@ -1787,12 +1958,7 @@ private async void _set_contact_gender (E.Contact contact, Gender gender) { - unowned VCardAttribute attr = - contact.get_attribute (Edsf.Persona.gender_attribute_name); - if (attr != null) - { - contact.remove_attribute (attr); - } + this._remove_attribute (contact, Edsf.Persona.gender_attribute_name); var new_attr = new VCardAttribute (null, Edsf.Persona.gender_attribute_name); @@ -1820,10 +1986,9 @@ foreach (E.Contact c in contacts) { var iid = Edsf.Persona.build_iid_from_contact (this.id, c); - var persona = this._personas.get (iid); - if (persona == null) + if (this._personas.has_key (iid) == false) { - persona = new Persona (this, c); + var persona = new Persona (this, c); this._personas.set (persona.iid, persona); added_personas.add (persona); } @@ -1834,14 +1999,6 @@ { this._emit_personas_changed (added_personas, null); } - - /* If this is the first contacts-added notification, assume we've reached - * a quiescent state. */ - if (this._is_quiescent == false) - { - this._is_quiescent = true; - this.notify_property ("is-quiescent"); - } } private void _contacts_changed_cb (GLib.List contacts) @@ -1849,10 +2006,10 @@ foreach (E.Contact c in contacts) { var iid = Edsf.Persona.build_iid_from_contact (this.id, c); - var persona = this._personas.get (iid); + Persona? persona = this._personas.get (iid); if (persona != null) { - persona._update (c); + ((!) persona)._update (c); } } } @@ -1864,11 +2021,11 @@ foreach (string contact_id in contacts_ids) { var iid = Edsf.Persona.build_iid (this.id, contact_id); - var persona = _personas.get (iid); + Persona? persona = _personas.get (iid); if (persona != null) { - removed_personas.add (persona); - this._personas.unset (persona.iid); + removed_personas.add ((!) persona); + this._personas.unset (((!) persona).iid); } } @@ -1878,6 +2035,35 @@ } } + private void _contacts_complete_cb (Error err) + { + /* Handle errors. We treat an error in the first _contacts_complete_cb() + * callback as unrecoverable, since it's being reported from the address + * book's view creation code. Subsequent errors may be recoverable, since + * they might be transient errors in refreshing the contact list. */ + if (err != null) + { + warning ("Error in address book view query: %s", err.message); + } + + /* The initial query is complete, so signal that we've reached + * quiescence (even if there was an error). */ + if (this._is_quiescent == false) + { + /* Handle initial errors. */ + if (err != null) + { + warning ("Error is considered unrecoverable. " + + "Removing persona store."); + this.removed (); + return; + } + + this._is_quiescent = true; + this.notify_property ("is-quiescent"); + } + } + /* Convert an EClientError or EBookClientError to a Folks.PropertyError for * property modifications. */ private PropertyError e_client_error_to_property_error (string property_name, @@ -1952,8 +2138,12 @@ private bool _is_in_source_list () { + /* Should only ever be called from a callback from the source list itself, + * so we can assert that the source list is non-null. */ + assert (this._source_list != null); + unowned GLib.SList groups = - this._source_list.peek_groups (); + ((!) this._source_list).peek_groups (); foreach (var g in groups) { @@ -2003,19 +2193,23 @@ */ private void _update_trust_level () { + /* We may be called before prepare() has finished (and it may then fail), + * but _addressbook should always be non-null when we're called. */ + assert (this._addressbook != null); + unowned SourceGroup? group = (SourceGroup?) this.source.peek_group (); if (group != null) { - var base_uri = group.peek_base_uri (); + var base_uri = ((!) group).peek_base_uri (); /* base_uri should be ldap:// for LDAP based address books */ - if (base_uri != null && base_uri.has_prefix("ldap")) + if (base_uri.has_prefix ("ldap")) { this.trust_level = PersonaStoreTrust.PARTIAL; return; } } - if (this._addressbook.readonly) + if (((!) this._addressbook).readonly) this.trust_level = PersonaStoreTrust.PARTIAL; else this.trust_level = PersonaStoreTrust.FULL; @@ -2039,7 +2233,7 @@ E.BookClient.get_sources (out sources); var default_source = sources.peek_default_source (); if (default_source != null && - this.source.peek_uid () == default_source.peek_uid ()) + this.source.peek_uid () == ((!) default_source).peek_uid ()) { is_default = true; } diff -Nru folks-0.6.6/backends/eds/lib/edsf-persona.vala folks-0.6.7/backends/eds/lib/edsf-persona.vala --- folks-0.6.6/backends/eds/lib/edsf-persona.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/backends/eds/lib/edsf-persona.vala 2012-01-12 17:25:24.000000000 +0000 @@ -128,7 +128,7 @@ private Set _email_addresses_ro; private HashSet _notes; private Set _notes_ro; - private static HashTable _im_eds_map = null; + private static HashTable? _im_eds_map = null; private HashSet _postal_addresses; private Set _postal_addresses_ro; @@ -665,8 +665,8 @@ E.Contact contact) { var contact_id = - (string) Edsf.Persona._get_property_from_contact (contact, "id"); - return Edsf.Persona.build_iid (store_id, contact_id); + (string?) Edsf.Persona._get_property_from_contact (contact, "id"); + return Edsf.Persona.build_iid (store_id, (!) (contact_id ?? "")); } /** @@ -694,16 +694,17 @@ */ public Persona (PersonaStore store, E.Contact contact) { - var contact_id = - (string) Edsf.Persona._get_property_from_contact (contact, "id"); + var _contact_id = + (string?) Edsf.Persona._get_property_from_contact (contact, "id"); + var contact_id = (!) (_contact_id ?? ""); + var uid = this.build_uid (BACKEND_NAME, store.id, contact_id); var iid = Edsf.Persona.build_iid (store.id, contact_id); var is_user = BookClient.is_self (contact); - var full_name = - (string) Edsf.Persona._get_property_from_contact (contact, + var _full_name = + (string?) Edsf.Persona._get_property_from_contact (contact, "full_name"); - if (full_name == null) - full_name = ""; + var full_name = (!) (_full_name ?? ""); Object (display_id: full_name, uid: uid, @@ -873,15 +874,21 @@ if (gender_attr != null) { - var gender_str = gender_attr.get_value ().up (); - - if (gender_str == Edsf.Persona.gender_male) - { - gender = Gender.MALE; - } - else if (gender_str == Edsf.Persona.gender_female) + var val = ((!) gender_attr).get_value (); + if (val != null) { - gender = Gender.FEMALE; + switch (((!) val).up ()) + { + case Edsf.Persona.gender_male: + gender = Gender.MALE; + break; + case Edsf.Persona.gender_female: + gender = Gender.FEMALE; + break; + default: + /* Unspecified, as above */ + break; + } } } @@ -894,10 +901,12 @@ private void _update_birthday () { - E.ContactDate? bday = (E.ContactDate?) this._get_property ("birth_date"); + var _bday = (E.ContactDate?) this._get_property ("birth_date"); - if (bday != null) + if (_bday != null) { + var bday = (!) _bday; + /* Since e-d-s stores birthdays as a plain date, we take the * given date in local time and convert it to UTC as mandated * by the BirthdayDetails interface. @@ -907,7 +916,7 @@ (int) bday.year, (int) bday.month, (int) bday.day, 0, 0, 0.0); if (this._birthday == null || (this._birthday != null && - !this._birthday.equal (d.to_utc ()))) + !((!) this._birthday).equal (d.to_utc ()))) { this._birthday = d.to_utc (); this.notify_property ("birthday"); @@ -932,7 +941,7 @@ var default_role_fd = this._get_default_role (); if (default_role_fd != null) { - new_roles.add (default_role_fd); + new_roles.add ((!) default_role_fd); } var vcard = (E.VCard) this.contact; @@ -941,8 +950,14 @@ if (attr.get_name () != "X-ROLES") continue; + var val = attr.get_value (); + if (val == null || (!) val == "") + { + continue; + } + var role = new Role ("", ""); - role.role = attr.get_value (); + role.role = (!) val; var role_fd = new RoleFieldDetails (role); foreach (unowned E.VCardAttributeParam param in @@ -991,7 +1006,7 @@ private RoleFieldDetails? _get_default_role () { - RoleFieldDetails? default_role = null; + RoleFieldDetails? _default_role = null; var org = (string?) this._get_property ("org"); var org_unit = (string?) this._get_property ("org_unit"); @@ -1010,25 +1025,31 @@ assistant != null) { var new_role = new Role (title, org); - if (role != null) - new_role.role = role; + if (role != null && (!) role != "") + new_role.role = (!) role; - default_role = new RoleFieldDetails (new_role); + /* Check if it's non-empty. */ + if (!new_role.is_empty ()) + { + var default_role = new RoleFieldDetails (new_role); + + if (org_unit != null && org_unit != "") + default_role.set_parameter ("org_unit", (!) org_unit); - if (org_unit != null && org_unit != "") - default_role.set_parameter ("org_unit", org_unit); + if (office != null && office != "") + default_role.set_parameter ("office", (!) office); - if (office != null && office != "") - default_role.set_parameter ("office", office); + if (manager != null && manager != "") + default_role.set_parameter ("manager", (!) manager); - if (manager != null && manager != "") - default_role.set_parameter ("manager", manager); + if (assistant != null && manager != "") + default_role.set_parameter ("assistant", (!) assistant); - if (assistant != null && manager != "") - default_role.set_parameter ("assistant", assistant); + _default_role = default_role; + } } - return default_role; + return _default_role; } private void _update_web_services_addresses () @@ -1041,13 +1062,15 @@ var services = this.contact.get_attribute ("X-FOLKS-WEB-SERVICES-IDS"); if (services != null) { - foreach (var service in services.get_params ()) + foreach (var service in ((!) services).get_params ()) { var service_name = service.get_name ().down (); foreach (var service_id in service.get_values ()) { - if (service_id == null) - continue; + if (service_id == "") + { + continue; + } new_services.set (service_name, new WebServiceFieldDetails (service_id)); @@ -1072,7 +1095,13 @@ var attrs = this.contact.get_attributes (E.ContactField.EMAIL); foreach (var attr in attrs) { - var email_fd = new EmailFieldDetails (attr.get_value ()); + var val = attr.get_value (); + if (val == null || (!) val == "") + { + continue; + } + + var email_fd = new EmailFieldDetails ((!) val); this._update_params (email_fd, attr); new_email_addresses.add (email_fd); } @@ -1092,10 +1121,10 @@ (GLib.HashFunc) NoteFieldDetails.hash, (GLib.EqualFunc) NoteFieldDetails.equal); - string n = (string) this._get_property ("note"); + var n = (string?) this._get_property ("note"); if (n != null && n != "") { - var note = new NoteFieldDetails (n); + var note = new NoteFieldDetails ((!) n); new_notes.add (note); } @@ -1109,26 +1138,30 @@ private void _update_names () { - string full_name = (string) this._get_property ("full_name"); + var _full_name = (string?) this._get_property ("full_name"); - if (full_name == null) + if (_full_name == null) { - full_name = ""; + _full_name = ""; } + var full_name = (!) _full_name; + if (this._full_name != full_name) { this._full_name = full_name; this.notify_property ("full-name"); } - string nickname = (string) this._get_property ("nickname"); + var _nickname = (string?) this._get_property ("nickname"); - if (nickname == null) + if (_nickname == null) { - nickname = ""; + _nickname = ""; } + var nickname = (!) _nickname; + if (this._nickname != nickname) { this._nickname = nickname; @@ -1136,9 +1169,11 @@ } StructuredName? structured_name = null; - E.ContactName? cn = (E.ContactName) this._get_property ("name"); - if (cn != null) + var _cn = (E.ContactName?) this._get_property ("name"); + if (_cn != null) { + var cn = (!) _cn; + string family_name = cn.family; string given_name = cn.given; string additional_names = cn.additional; @@ -1149,9 +1184,9 @@ suffixes); } - if (structured_name != null && !structured_name.is_empty ()) + if (structured_name != null && !((!) structured_name).is_empty ()) { - this._structured_name = structured_name; + this._structured_name = (!) structured_name; this.notify_property ("structured-name"); } else if (this._structured_name != null) @@ -1161,29 +1196,34 @@ } } - private LoadableIcon? _contact_photo_to_loadable_icon (ContactPhoto? p) + private LoadableIcon? _contact_photo_to_loadable_icon (ContactPhoto? _p) { - if (p == null) + if (_p == null) { return null; } + var p = (!) _p; + switch (p.type) { case ContactPhotoType.URI: - if (p.get_uri () == null) + var uri = p.get_uri (); + if (uri == null) { return null; } - return new FileIcon (File.new_for_uri (p.get_uri ())); + return new FileIcon (File.new_for_uri ((!) uri)); case ContactPhotoType.INLINED: - if (p.get_inlined () == null) + var data = p.get_inlined (); + var mime_type = p.get_mime_type (); + if (data == null || mime_type == null) { return null; } - return new Edsf.MemoryIcon (p.get_mime_type (), p.get_inlined ()); + return new Edsf.MemoryIcon ((!) mime_type, (!) data); default: return null; } @@ -1191,7 +1231,7 @@ private void _update_avatar () { - E.ContactPhoto? p = (E.ContactPhoto) this._get_property ("photo"); + var p = (E.ContactPhoto?) this._get_property ("photo"); var cache = AvatarCache.dup (); @@ -1213,12 +1253,13 @@ this.notify_property ("avatar"); }); } - else if ((this.avatar == null && new_avatar != null) || - (this.avatar != null && new_avatar != null && - this._avatar.equal (new_avatar) == false)) - { - // Store the new avatar in the cache. - cache.store_avatar.begin (this.uid, new_avatar, (obj, res) => + else if ((this._avatar == null && new_avatar != null) || + (this._avatar != null && new_avatar != null && + ((!) this._avatar).equal (new_avatar) == false)) + { + /* Store the new avatar in the cache. new_avatar is guaranteed to be + * non-null. */ + cache.store_avatar.begin (this.uid, (!) new_avatar, (obj, res) => { try { @@ -1246,10 +1287,10 @@ var url_property = mapping.vcard_field_name; var folks_type = mapping.folks_type; - string u = (string) this._get_property (url_property); + var u = (string?) this._get_property (url_property); if (u != null && u != "") { - var fd_u = new UrlFieldDetails (u); + var fd_u = new UrlFieldDetails ((!) u); fd_u.set_parameter (fd_u.PARAM_TYPE, folks_type); new_urls.add (fd_u); } @@ -1261,7 +1302,13 @@ { if (attr.get_name () == "X-URIS") { - var url_fd = new UrlFieldDetails (attr.get_value ()); + var val = attr.get_value (); + if (val == null || (!) val == "") + { + continue; + } + + var url_fd = new UrlFieldDetails ((!) val); this._update_params (url_fd, attr); new_urls.add (url_fd); } @@ -1291,8 +1338,13 @@ try { var addr = attr.get_value (); + if (addr == null || (!) addr == "") + { + continue; + } + string normalised_addr = - (owned) ImDetails.normalise_im_address (addr, im_proto); + (owned) ImDetails.normalise_im_address ((!) addr, im_proto); var im_fd = new ImFieldDetails (normalised_addr); new_im_addresses.set (im_proto, im_fd); } @@ -1316,15 +1368,18 @@ */ foreach (var email in this.email_addresses) { - var proto = this._im_proto_from_addr (email.value); - if (proto != null) + var _proto = this._im_proto_from_addr (email.value); + if (_proto != null) { + var proto = (!) _proto; + /* Has this already been added? */ var exists = false; - var current_im_addrs = new_im_addresses.get (proto); + Collection? current_im_addrs = + new_im_addresses.get (proto); if (current_im_addrs != null) { - foreach (var cur_im in current_im_addrs) + foreach (var cur_im in (!) current_im_addrs) { if (cur_im.value == email.value) { @@ -1415,30 +1470,31 @@ */ internal static HashTable _get_im_eds_map () { + HashTable retval; + lock (Edsf.Persona._im_eds_map) { if (Edsf.Persona._im_eds_map == null) { - Edsf.Persona._im_eds_map = - new HashTable (str_hash, str_equal); - Edsf.Persona._im_eds_map.insert ("aim", ContactField.IM_AIM); - Edsf.Persona._im_eds_map.insert ("yahoo", ContactField.IM_YAHOO); - Edsf.Persona._im_eds_map.insert ("groupwise", - ContactField.IM_GROUPWISE); - Edsf.Persona._im_eds_map.insert ("jabber", - ContactField.IM_JABBER); - Edsf.Persona._im_eds_map.insert ("msn", - ContactField.IM_MSN); - Edsf.Persona._im_eds_map.insert ("icq", - ContactField.IM_ICQ); - Edsf.Persona._im_eds_map.insert ("gadugadu", - ContactField.IM_GADUGADU); - Edsf.Persona._im_eds_map.insert ("skype", - ContactField.IM_SKYPE); + var table = + new HashTable (str_hash, str_equal); + + table.insert ("aim", ContactField.IM_AIM); + table.insert ("yahoo", ContactField.IM_YAHOO); + table.insert ("groupwise", ContactField.IM_GROUPWISE); + table.insert ("jabber", ContactField.IM_JABBER); + table.insert ("msn", ContactField.IM_MSN); + table.insert ("icq", ContactField.IM_ICQ); + table.insert ("gadugadu", ContactField.IM_GADUGADU); + table.insert ("skype", ContactField.IM_SKYPE); + + Edsf.Persona._im_eds_map = table; } + + retval = (!) Edsf.Persona._im_eds_map; } - return Edsf.Persona._im_eds_map; + return retval; } private void _update_phones () @@ -1450,7 +1506,13 @@ var attrs = this.contact.get_attributes (E.ContactField.TEL); foreach (var attr in attrs) { - var phone_fd = new PhoneFieldDetails (attr.get_value ()); + var val = attr.get_value (); + if (val == null || (!) val == "") + { + continue; + } + + var phone_fd = new PhoneFieldDetails ((!) val); this._update_params (phone_fd, attr); new_phone_numbers.add (phone_fd); } @@ -1466,8 +1528,8 @@ private PostalAddress _postal_address_from_attribute (E.VCardAttribute attr) { - unowned GLib.List values = attr.get_values(); - unowned GLib.List l = values; + unowned GLib.List? values = attr.get_values(); + unowned GLib.List? l = values; var address_format = ""; var po_box = ""; @@ -1480,38 +1542,38 @@ if (l != null) { - po_box = l.data; - l = l.next; + po_box = ((!) l).data; + l = ((!) l).next; } if (l != null) { - extension = l.data; - l = l.next; + extension = ((!) l).data; + l = ((!) l).next; } if (l != null) { - street = l.data; - l = l.next; + street = ((!) l).data; + l = ((!) l).next; } if (l != null) { - locality = l.data; - l = l.next; + locality = ((!) l).data; + l = ((!) l).next; } if (l != null) { - region = l.data; - l = l.next; + region = ((!) l).data; + l = ((!) l).next; } if (l != null) { - postal_code = l.data; - l = l.next; + postal_code = ((!) l).data; + l = ((!) l).next; } if (l != null) { - country = l.data; - l = l.next; + country = ((!) l).data; + l = ((!) l).next; } return new PostalAddress (po_box, extension, street, @@ -1558,11 +1620,14 @@ var ids = this.contact.get_attribute ("X-FOLKS-CONTACTS-IDS"); if (ids != null) { - unowned GLib.List ids_v = ids.get_values (); + unowned GLib.List ids_v = ((!) ids).get_values (); foreach (var local_id in ids_v) { - new_local_ids.add (local_id); + if (local_id != "") + { + new_local_ids.add (local_id); + } } } @@ -1584,8 +1649,8 @@ var fav = this.contact.get_attribute ("X-FOLKS-FAVOURITE"); if (fav != null) { - var val = fav.get_value (); - if (val.down () == "true") + var val = ((!) fav).get_value (); + if (val != null && ((!) val).down () == "true") { is_fav = true; } @@ -1598,6 +1663,7 @@ } } + // NOTE: This may return null, but Vala doesn't allow us to express that in the type system for void* types. internal static void * _get_property_from_contact (E.Contact contact, string prop_name) { @@ -1606,6 +1672,7 @@ return prop_value; } + // NOTE: This may return null, but Vala doesn't allow us to express that in the type system for void* types. private void * _get_property (string prop_name) { return Edsf.Persona._get_property_from_contact (this.contact, diff -Nru folks-0.6.6/backends/eds/lib/folks/folks-eds.h folks-0.6.7/backends/eds/lib/folks/folks-eds.h --- folks-0.6.6/backends/eds/lib/folks/folks-eds.h 2011-12-13 23:40:50.000000000 +0000 +++ folks-0.6.7/backends/eds/lib/folks/folks-eds.h 2012-02-23 00:02:09.000000000 +0000 @@ -1,4 +1,4 @@ -/* folks-eds.h generated by valac 0.14.0.50-58097f, the Vala compiler, do not modify */ +/* folks-eds.h generated by valac 0.15.1, the Vala compiler, do not modify */ #ifndef __FOLKS_FOLKS_EDS_H__ diff -Nru folks-0.6.6/backends/eds/lib/folks-eds.vapi folks-0.6.7/backends/eds/lib/folks-eds.vapi --- folks-0.6.6/backends/eds/lib/folks-eds.vapi 2011-12-13 23:40:50.000000000 +0000 +++ folks-0.6.7/backends/eds/lib/folks-eds.vapi 2012-02-23 00:02:09.000000000 +0000 @@ -1,4 +1,4 @@ -/* folks-eds.vapi generated by valac 0.14.0.50-58097f, do not modify. */ +/* folks-eds.vapi generated by valac 0.15.1, do not modify. */ namespace Edsf { [CCode (cheader_filename = "folks/folks-eds.h")] diff -Nru folks-0.6.6/backends/eds/lib/Makefile.am folks-0.6.7/backends/eds/lib/Makefile.am --- folks-0.6.6/backends/eds/lib/Makefile.am 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/backends/eds/lib/Makefile.am 2012-01-12 17:25:24.000000000 +0000 @@ -41,6 +41,7 @@ # to factor out repetition, but automake's Vala support doesn't like it # because it assumes it can simply match every flag in any _VALAFLAGS string. libfolks_eds_la_VALAFLAGS = \ + $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ --vapidir=. \ --vapidir=$(top_srcdir)/folks \ @@ -58,6 +59,8 @@ $(NULL) libfolks_eds_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ @@ -67,6 +70,7 @@ $(NULL) libfolks_eds_la_LIBADD = \ + $(AM_LIBADD) \ $(top_builddir)/folks/libfolks.la \ $(top_builddir)/folks/libfolks-internal.la \ $(EBOOK_LIBS) \ @@ -81,6 +85,8 @@ # that vim quickfix mode (:make) doesn't interpret the libtool --mode=link # command as an error message in a bizarrely named file libfolks_eds_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \ -export-symbols-regex "^(EDSF|edsf)_.*|" \ $(NULL) diff -Nru folks-0.6.6/backends/eds/lib/Makefile.in folks-0.6.7/backends/eds/lib/Makefile.in --- folks-0.6.6/backends/eds/lib/Makefile.in 2011-12-13 23:38:37.000000000 +0000 +++ folks-0.6.7/backends/eds/lib/Makefile.in 2012-02-23 00:04:11.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -45,10 +45,11 @@ memory-icon.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -76,6 +77,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(folks_edsdir)" "$(DESTDIR)$(vapidir)" \ "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(folks_eds_includedir)" @@ -158,6 +165,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -360,6 +369,7 @@ # to factor out repetition, but automake's Vala support doesn't like it # because it assumes it can simply match every flag in any _VALAFLAGS string. libfolks_eds_la_VALAFLAGS = \ + $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ --vapidir=. \ --vapidir=$(top_srcdir)/folks \ @@ -377,6 +387,8 @@ $(NULL) libfolks_eds_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ @@ -386,6 +398,7 @@ $(NULL) libfolks_eds_la_LIBADD = \ + $(AM_LIBADD) \ $(top_builddir)/folks/libfolks.la \ $(top_builddir)/folks/libfolks-internal.la \ $(EBOOK_LIBS) \ @@ -401,6 +414,8 @@ # that vim quickfix mode (:make) doesn't interpret the libtool --mode=link # command as an error message in a bizarrely named file libfolks_eds_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \ -export-symbols-regex "^(EDSF|edsf)_.*|" \ $(NULL) @@ -517,73 +532,67 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libfolks_eds_la-edsf-persona.lo: edsf-persona.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_eds_la_CFLAGS) $(CFLAGS) -MT libfolks_eds_la-edsf-persona.lo -MD -MP -MF $(DEPDIR)/libfolks_eds_la-edsf-persona.Tpo -c -o libfolks_eds_la-edsf-persona.lo `test -f 'edsf-persona.c' || echo '$(srcdir)/'`edsf-persona.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_eds_la-edsf-persona.Tpo $(DEPDIR)/libfolks_eds_la-edsf-persona.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='edsf-persona.c' object='libfolks_eds_la-edsf-persona.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='edsf-persona.c' object='libfolks_eds_la-edsf-persona.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_eds_la_CFLAGS) $(CFLAGS) -c -o libfolks_eds_la-edsf-persona.lo `test -f 'edsf-persona.c' || echo '$(srcdir)/'`edsf-persona.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_eds_la_CFLAGS) $(CFLAGS) -c -o libfolks_eds_la-edsf-persona.lo `test -f 'edsf-persona.c' || echo '$(srcdir)/'`edsf-persona.c libfolks_eds_la-edsf-persona-store.lo: edsf-persona-store.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_eds_la_CFLAGS) $(CFLAGS) -MT libfolks_eds_la-edsf-persona-store.lo -MD -MP -MF $(DEPDIR)/libfolks_eds_la-edsf-persona-store.Tpo -c -o libfolks_eds_la-edsf-persona-store.lo `test -f 'edsf-persona-store.c' || echo '$(srcdir)/'`edsf-persona-store.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_eds_la-edsf-persona-store.Tpo $(DEPDIR)/libfolks_eds_la-edsf-persona-store.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='edsf-persona-store.c' object='libfolks_eds_la-edsf-persona-store.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='edsf-persona-store.c' object='libfolks_eds_la-edsf-persona-store.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_eds_la_CFLAGS) $(CFLAGS) -c -o libfolks_eds_la-edsf-persona-store.lo `test -f 'edsf-persona-store.c' || echo '$(srcdir)/'`edsf-persona-store.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_eds_la_CFLAGS) $(CFLAGS) -c -o libfolks_eds_la-edsf-persona-store.lo `test -f 'edsf-persona-store.c' || echo '$(srcdir)/'`edsf-persona-store.c libfolks_eds_la-memory-icon.lo: memory-icon.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_eds_la_CFLAGS) $(CFLAGS) -MT libfolks_eds_la-memory-icon.lo -MD -MP -MF $(DEPDIR)/libfolks_eds_la-memory-icon.Tpo -c -o libfolks_eds_la-memory-icon.lo `test -f 'memory-icon.c' || echo '$(srcdir)/'`memory-icon.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_eds_la-memory-icon.Tpo $(DEPDIR)/libfolks_eds_la-memory-icon.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='memory-icon.c' object='libfolks_eds_la-memory-icon.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='memory-icon.c' object='libfolks_eds_la-memory-icon.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_eds_la_CFLAGS) $(CFLAGS) -c -o libfolks_eds_la-memory-icon.lo `test -f 'memory-icon.c' || echo '$(srcdir)/'`memory-icon.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_eds_la_CFLAGS) $(CFLAGS) -c -o libfolks_eds_la-memory-icon.lo `test -f 'memory-icon.c' || echo '$(srcdir)/'`memory-icon.c $(srcdir)/edsf-persona.c: $(srcdir)/libfolks_eds_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_eds_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_eds_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_eds_la_vala.stamp; \ fi $(srcdir)/edsf-persona-store.c: $(srcdir)/libfolks_eds_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_eds_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_eds_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_eds_la_vala.stamp; \ fi $(srcdir)/memory-icon.c: $(srcdir)/libfolks_eds_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_eds_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_eds_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_eds_la_vala.stamp; \ fi $(srcdir)/folks-eds.vapi: $(srcdir)/libfolks_eds_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_eds_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_eds_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_eds_la_vala.stamp; \ fi $(srcdir)/folks/folks-eds.h: $(srcdir)/libfolks_eds_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_eds_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_eds_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_eds_la_vala.stamp; \ fi libfolks_eds_la_vala.stamp: $(libfolks_eds_la_SOURCES) @@ -612,9 +621,7 @@ @$(NORMAL_UNINSTALL) @list='$(dist_vapi_DATA)'; test -n "$(vapidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(vapidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(vapidir)" && rm -f $$files + dir='$(DESTDIR)$(vapidir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @@ -632,9 +639,7 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-folks_eds_includeHEADERS: $(folks_eds_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(folks_eds_includedir)" || $(MKDIR_P) "$(DESTDIR)$(folks_eds_includedir)" @@ -652,9 +657,7 @@ @$(NORMAL_UNINSTALL) @list='$(folks_eds_include_HEADERS)'; test -n "$(folks_eds_includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(folks_eds_includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(folks_eds_includedir)" && rm -f $$files + dir='$(DESTDIR)$(folks_eds_includedir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -755,10 +758,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/backends/eds/lib/memory-icon.c folks-0.6.7/backends/eds/lib/memory-icon.c --- folks-0.6.6/backends/eds/lib/memory-icon.c 2011-12-13 23:40:50.000000000 +0000 +++ folks-0.6.7/backends/eds/lib/memory-icon.c 2012-02-23 00:02:09.000000000 +0000 @@ -1,4 +1,4 @@ -/* memory-icon.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* memory-icon.c generated by valac 0.15.1, the Vala compiler * generated from memory-icon.vala, do not modify */ /* @@ -89,16 +89,16 @@ }; EdsfMemoryIcon* edsf_memory_icon_new (const gchar* image_type, guint8* image_data, int image_data_length1); EdsfMemoryIcon* edsf_memory_icon_construct (GType object_type, const gchar* image_type, guint8* image_data, int image_data_length1); -static guint8* _vala_array_dup1 (guint8* self, int length); +static guint8* _vala_array_dup2 (guint8* self, int length); static gboolean edsf_memory_icon_real_equal (GIcon* base, GIcon* icon2); static guint edsf_memory_icon_real_hash (GIcon* base); static GInputStream* edsf_memory_icon_real_load (GLoadableIcon* base, gint size, gchar** type, GCancellable* cancellable, GError** error); -static guint8* _vala_array_dup2 (guint8* self, int length); +static guint8* _vala_array_dup3 (guint8* self, int length); static void _g_free_gdestroy_notify (void* data); static void edsf_memory_icon_real_load_async_data_free (gpointer _data); static void edsf_memory_icon_real_load_async (GLoadableIcon* base, gint size, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_); static gboolean edsf_memory_icon_real_load_async_co (EdsfMemoryIconLoadAsyncData* _data_); -static guint8* _vala_array_dup3 (guint8* self, int length); +static guint8* _vala_array_dup4 (guint8* self, int length); static void edsf_memory_icon_finalize (GObject* obj); @@ -109,7 +109,7 @@ * @param image_data the binary data of the image * @since 0.6.0 */ -static guint8* _vala_array_dup1 (guint8* self, int length) { +static guint8* _vala_array_dup2 (guint8* self, int length) { return g_memdup (self, length * sizeof (guint8)); } @@ -125,7 +125,7 @@ self = (EdsfMemoryIcon*) g_object_new (object_type, NULL); _tmp0_ = image_data; _tmp0__length1 = image_data_length1; - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup1 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup2 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); _tmp1__length1 = _tmp0__length1; self->priv->_image_data = (g_free (self->priv->_image_data), NULL); self->priv->_image_data = _tmp1_; @@ -163,49 +163,45 @@ GIcon* _tmp0_; EdsfMemoryIcon* _tmp1_; EdsfMemoryIcon* icon; - EdsfMemoryIcon* _tmp2_; - gboolean _tmp3_ = FALSE; - guint8* _tmp4_; - gint _tmp4__length1; - EdsfMemoryIcon* _tmp5_; - guint8* _tmp6_; - gint _tmp6__length1; - gboolean _tmp12_; + gboolean _tmp2_ = FALSE; + guint8* _tmp3_; + gint _tmp3__length1; + EdsfMemoryIcon* _tmp4_; + guint8* _tmp5_; + gint _tmp5__length1; + gboolean _tmp11_; self = (EdsfMemoryIcon*) base; - g_return_val_if_fail (icon2 != NULL, FALSE); _tmp0_ = icon2; - _tmp1_ = _g_object_ref0 (EDSF_IS_MEMORY_ICON (_tmp0_) ? ((EdsfMemoryIcon*) _tmp0_) : NULL); + _tmp1_ = _g_object_ref0 (EDSF_MEMORY_ICON (G_ICON (_tmp0_))); icon = _tmp1_; - _tmp2_ = icon; - g_assert (_tmp2_ != NULL); - _tmp4_ = self->priv->_image_data; - _tmp4__length1 = self->priv->_image_data_length1; - _tmp5_ = icon; - _tmp6_ = _tmp5_->priv->_image_data; - _tmp6__length1 = _tmp5_->priv->_image_data_length1; - if (_tmp4__length1 == _tmp6__length1) { - guint8* _tmp7_; - gint _tmp7__length1; - EdsfMemoryIcon* _tmp8_; + _tmp3_ = self->priv->_image_data; + _tmp3__length1 = self->priv->_image_data_length1; + _tmp4_ = icon; + _tmp5_ = _tmp4_->priv->_image_data; + _tmp5__length1 = _tmp4_->priv->_image_data_length1; + if (_tmp3__length1 == _tmp5__length1) { + guint8* _tmp6_; + gint _tmp6__length1; + EdsfMemoryIcon* _tmp7_; + guint8* _tmp8_; + gint _tmp8__length1; guint8* _tmp9_; gint _tmp9__length1; - guint8* _tmp10_; - gint _tmp10__length1; - gint _tmp11_ = 0; - _tmp7_ = self->priv->_image_data; - _tmp7__length1 = self->priv->_image_data_length1; - _tmp8_ = icon; - _tmp9_ = _tmp8_->priv->_image_data; - _tmp9__length1 = _tmp8_->priv->_image_data_length1; - _tmp10_ = self->priv->_image_data; - _tmp10__length1 = self->priv->_image_data_length1; - _tmp11_ = memcmp (_tmp7_, _tmp9_, (gsize) _tmp10__length1); - _tmp3_ = _tmp11_ == 0; + gint _tmp10_ = 0; + _tmp6_ = self->priv->_image_data; + _tmp6__length1 = self->priv->_image_data_length1; + _tmp7_ = icon; + _tmp8_ = _tmp7_->priv->_image_data; + _tmp8__length1 = _tmp7_->priv->_image_data_length1; + _tmp9_ = self->priv->_image_data; + _tmp9__length1 = self->priv->_image_data_length1; + _tmp10_ = memcmp (_tmp6_, _tmp8_, (gsize) _tmp9__length1); + _tmp2_ = _tmp10_ == 0; } else { - _tmp3_ = FALSE; + _tmp2_ = FALSE; } - _tmp12_ = _tmp3_; - result = _tmp12_; + _tmp11_ = _tmp2_; + result = _tmp11_; _g_object_unref0 (icon); return result; } @@ -231,7 +227,7 @@ const gchar* _tmp2_; guint _tmp3_ = 0U; _tmp2_ = self->priv->_image_type; - _tmp3_ = g_str_hash (_tmp2_); + _tmp3_ = g_str_hash ((const gchar*) _tmp2_); _tmp0_ = _tmp3_; } else { _tmp0_ = (guint) 0; @@ -293,7 +289,7 @@ * @return an input stream providing access to the image data * @since 0.6.0 */ -static guint8* _vala_array_dup2 (guint8* self, int length) { +static guint8* _vala_array_dup3 (guint8* self, int length) { return g_memdup (self, length * sizeof (guint8)); } @@ -321,7 +317,7 @@ _vala_type = _tmp1_; _tmp2_ = self->priv->_image_data; _tmp2__length1 = self->priv->_image_data_length1; - _tmp3_ = (_tmp2_ != NULL) ? _vala_array_dup2 (_tmp2_, _tmp2__length1) : ((gpointer) _tmp2_); + _tmp3_ = (_tmp2_ != NULL) ? _vala_array_dup3 (_tmp2_, _tmp2__length1) : ((gpointer) _tmp2_); _tmp3__length1 = _tmp2__length1; _tmp4_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp3_, _tmp3__length1, _g_free_gdestroy_notify); result = (GInputStream*) _tmp4_; @@ -392,7 +388,7 @@ * @return an input stream providing access to the image data * @since 0.6.0 */ -static guint8* _vala_array_dup3 (guint8* self, int length) { +static guint8* _vala_array_dup4 (guint8* self, int length) { return g_memdup (self, length * sizeof (guint8)); } @@ -411,7 +407,7 @@ _data_->type = _data_->_tmp1_; _data_->_tmp2_ = _data_->self->priv->_image_data; _data_->_tmp2__length1 = _data_->self->priv->_image_data_length1; - _data_->_tmp3_ = (_data_->_tmp2_ != NULL) ? _vala_array_dup3 (_data_->_tmp2_, _data_->_tmp2__length1) : ((gpointer) _data_->_tmp2_); + _data_->_tmp3_ = (_data_->_tmp2_ != NULL) ? _vala_array_dup4 (_data_->_tmp2_, _data_->_tmp2__length1) : ((gpointer) _data_->_tmp2_); _data_->_tmp3__length1 = _data_->_tmp2__length1; _data_->_tmp4_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_data_->_tmp3_, _data_->_tmp3__length1, _g_free_gdestroy_notify); _data_->result = (GInputStream*) _data_->_tmp4_; @@ -484,7 +480,7 @@ GType edsf_memory_icon_type_id; edsf_memory_icon_type_id = g_type_register_static (G_TYPE_OBJECT, "EdsfMemoryIcon", &g_define_type_info, 0); g_type_add_interface_static (edsf_memory_icon_type_id, G_TYPE_ICON, &g_icon_info); - g_type_add_interface_static (edsf_memory_icon_type_id, G_TYPE_LOADABLE_ICON, &g_loadable_icon_info); + g_type_add_interface_static (edsf_memory_icon_type_id, g_loadable_icon_get_type (), &g_loadable_icon_info); g_once_init_leave (&edsf_memory_icon_type_id__volatile, edsf_memory_icon_type_id); } return edsf_memory_icon_type_id__volatile; diff -Nru folks-0.6.6/backends/eds/lib/memory-icon.vala folks-0.6.7/backends/eds/lib/memory-icon.vala --- folks-0.6.6/backends/eds/lib/memory-icon.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/backends/eds/lib/memory-icon.vala 2012-01-26 23:51:41.000000000 +0000 @@ -57,11 +57,15 @@ * @return `true` if the instances are equal, `false` otherwise * @since 0.6.0 */ +#if VALA_0_16 + public bool equal (Icon? icon2) +#else public bool equal (Icon icon2) +#endif { - // This type check be taken care of by the interface wrapper. - var icon = icon2 as MemoryIcon; - assert (icon != null); + /* These type and nullability checks are taken care of by the interface + * wrapper. */ + var icon = (MemoryIcon) (!) icon2; return (this._image_data.length == icon._image_data.length && Memory.cmp (this._image_data, icon._image_data, @@ -87,7 +91,7 @@ * * Basically, this is just a nul-safe version of g_str_hash(). Which is * calculated over both the image type and image data. */ - uint hash = this._image_type != null ? this._image_type.hash () : 0; + uint hash = this._image_type != null ? ((!) this._image_type).hash () : 0; for (uint i = 0; i < this._image_data.length; i++) { diff -Nru folks-0.6.6/backends/eds/Makefile.am folks-0.6.7/backends/eds/Makefile.am --- folks-0.6.6/backends/eds/Makefile.am 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/backends/eds/Makefile.am 2012-01-12 17:25:24.000000000 +0000 @@ -2,17 +2,8 @@ BACKEND_NAME = "eds" -AM_CPPFLAGS = \ - -I$(top_srcdir)/folks \ - -I$(top_srcdir)/backends/eds/lib \ - -I$(top_srcdir)/backends/eds/lib/folks \ - -include $(CONFIG_HEADER) \ - -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ - -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ - -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ - $(NULL) - VALAFLAGS += \ + $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ --vapidir=. \ --vapidir=$(top_builddir)/backends/eds/lib \ @@ -39,7 +30,19 @@ libxml-2.0 \ $(NULL) +eds_la_CPPFLAGS = \ + -I$(top_srcdir)/folks \ + -I$(top_srcdir)/backends/eds/lib \ + -I$(top_srcdir)/backends/eds/lib/folks \ + -include $(CONFIG_HEADER) \ + -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ + -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ + -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ + $(NULL) + eds_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ @@ -49,7 +52,8 @@ $(NULL) eds_la_LIBADD = \ - lib/libfolks-eds.la \ + $(AM_LIBADD) \ + $(top_builddir)/backends/eds/lib/libfolks-eds.la \ $(top_builddir)/folks/libfolks.la \ $(GIO_LIBS) \ $(GLIB_LIBS) \ @@ -59,7 +63,14 @@ $(LIBXML_LIBS) \ $(NULL) -eds_la_LDFLAGS = -shared -fPIC -module -avoid-version +eds_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ + -shared \ + -fPIC \ + -module \ + -avoid-version \ + $(NULL) GITIGNOREFILES = \ folks-backend-eds.vapi \ diff -Nru folks-0.6.6/backends/eds/Makefile.in folks-0.6.7/backends/eds/Makefile.in --- folks-0.6.6/backends/eds/Makefile.in 2011-12-13 23:38:36.000000000 +0000 +++ folks-0.6.7/backends/eds/Makefile.in 2012-02-23 00:04:11.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,10 +39,11 @@ eds-backend-factory.c eds-backend.c eds_la_vala.stamp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -70,10 +71,17 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(backenddir)" LTLIBRARIES = $(backend_LTLIBRARIES) am__DEPENDENCIES_1 = -eds_la_DEPENDENCIES = lib/libfolks-eds.la \ +eds_la_DEPENDENCIES = \ + $(top_builddir)/backends/eds/lib/libfolks-eds.la \ $(top_builddir)/folks/libfolks.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ @@ -183,6 +191,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -292,7 +302,7 @@ VALADOC = @VALADOC@ VALADOC_CFLAGS = @VALADOC_CFLAGS@ VALADOC_LIBS = @VALADOC_LIBS@ -VALAFLAGS = @VALAFLAGS@ $(ERROR_VALAFLAGS) --vapidir=. \ +VALAFLAGS = @VALAFLAGS@ $(AM_VALAFLAGS) $(ERROR_VALAFLAGS) --vapidir=. \ --vapidir=$(top_builddir)/backends/eds/lib \ --vapidir=$(top_srcdir)/folks $(addprefix --pkg ,$(eds_deps)) \ $(NULL) @@ -355,16 +365,6 @@ top_srcdir = @top_srcdir@ SUBDIRS = lib BACKEND_NAME = "eds" -AM_CPPFLAGS = \ - -I$(top_srcdir)/folks \ - -I$(top_srcdir)/backends/eds/lib \ - -I$(top_srcdir)/backends/eds/lib/folks \ - -include $(CONFIG_HEADER) \ - -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ - -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ - -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ - $(NULL) - backenddir = $(BACKEND_DIR)/eds backend_LTLIBRARIES = eds.la eds_la_SOURCES = \ @@ -383,7 +383,19 @@ libxml-2.0 \ $(NULL) +eds_la_CPPFLAGS = \ + -I$(top_srcdir)/folks \ + -I$(top_srcdir)/backends/eds/lib \ + -I$(top_srcdir)/backends/eds/lib/folks \ + -include $(CONFIG_HEADER) \ + -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ + -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ + -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ + $(NULL) + eds_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ @@ -393,7 +405,8 @@ $(NULL) eds_la_LIBADD = \ - lib/libfolks-eds.la \ + $(AM_LIBADD) \ + $(top_builddir)/backends/eds/lib/libfolks-eds.la \ $(top_builddir)/folks/libfolks.la \ $(GIO_LIBS) \ $(GLIB_LIBS) \ @@ -403,7 +416,15 @@ $(LIBXML_LIBS) \ $(NULL) -eds_la_LDFLAGS = -shared -fPIC -module -avoid-version +eds_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ + -shared \ + -fPIC \ + -module \ + -avoid-version \ + $(NULL) + GITIGNOREFILES = \ folks-backend-eds.vapi \ $(eds_la_SOURCES:.vala=.c) \ @@ -490,50 +511,45 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< eds_la-eds-backend.lo: eds-backend.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(eds_la_CFLAGS) $(CFLAGS) -MT eds_la-eds-backend.lo -MD -MP -MF $(DEPDIR)/eds_la-eds-backend.Tpo -c -o eds_la-eds-backend.lo `test -f 'eds-backend.c' || echo '$(srcdir)/'`eds-backend.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eds_la_CPPFLAGS) $(CPPFLAGS) $(eds_la_CFLAGS) $(CFLAGS) -MT eds_la-eds-backend.lo -MD -MP -MF $(DEPDIR)/eds_la-eds-backend.Tpo -c -o eds_la-eds-backend.lo `test -f 'eds-backend.c' || echo '$(srcdir)/'`eds-backend.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eds_la-eds-backend.Tpo $(DEPDIR)/eds_la-eds-backend.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eds-backend.c' object='eds_la-eds-backend.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eds-backend.c' object='eds_la-eds-backend.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(eds_la_CFLAGS) $(CFLAGS) -c -o eds_la-eds-backend.lo `test -f 'eds-backend.c' || echo '$(srcdir)/'`eds-backend.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eds_la_CPPFLAGS) $(CPPFLAGS) $(eds_la_CFLAGS) $(CFLAGS) -c -o eds_la-eds-backend.lo `test -f 'eds-backend.c' || echo '$(srcdir)/'`eds-backend.c eds_la-eds-backend-factory.lo: eds-backend-factory.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(eds_la_CFLAGS) $(CFLAGS) -MT eds_la-eds-backend-factory.lo -MD -MP -MF $(DEPDIR)/eds_la-eds-backend-factory.Tpo -c -o eds_la-eds-backend-factory.lo `test -f 'eds-backend-factory.c' || echo '$(srcdir)/'`eds-backend-factory.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eds_la_CPPFLAGS) $(CPPFLAGS) $(eds_la_CFLAGS) $(CFLAGS) -MT eds_la-eds-backend-factory.lo -MD -MP -MF $(DEPDIR)/eds_la-eds-backend-factory.Tpo -c -o eds_la-eds-backend-factory.lo `test -f 'eds-backend-factory.c' || echo '$(srcdir)/'`eds-backend-factory.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eds_la-eds-backend-factory.Tpo $(DEPDIR)/eds_la-eds-backend-factory.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='eds-backend-factory.c' object='eds_la-eds-backend-factory.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eds-backend-factory.c' object='eds_la-eds-backend-factory.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(eds_la_CFLAGS) $(CFLAGS) -c -o eds_la-eds-backend-factory.lo `test -f 'eds-backend-factory.c' || echo '$(srcdir)/'`eds-backend-factory.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eds_la_CPPFLAGS) $(CPPFLAGS) $(eds_la_CFLAGS) $(CFLAGS) -c -o eds_la-eds-backend-factory.lo `test -f 'eds-backend-factory.c' || echo '$(srcdir)/'`eds-backend-factory.c $(srcdir)/eds-backend.c: $(srcdir)/eds_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/eds_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/eds_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) eds_la_vala.stamp; \ fi $(srcdir)/eds-backend-factory.c: $(srcdir)/eds_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/eds_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/eds_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) eds_la_vala.stamp; \ fi eds_la_vala.stamp: $(eds_la_SOURCES) @@ -757,10 +773,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/backends/key-file/kf-backend.c folks-0.6.7/backends/key-file/kf-backend.c --- folks-0.6.6/backends/key-file/kf-backend.c 2011-12-13 23:40:08.000000000 +0000 +++ folks-0.6.7/backends/key-file/kf-backend.c 2012-02-23 00:02:01.000000000 +0000 @@ -1,4 +1,4 @@ -/* kf-backend.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* kf-backend.c generated by valac 0.15.1, the Vala compiler * generated from kf-backend.vala, do not modify */ /* @@ -440,7 +440,7 @@ _data_->self->priv->_prepare_pending = TRUE; { _data_->_tmp6_ = _data_->self->priv->_persona_stores; - _data_->_tmp7_ = gee_map_get_values ((GeeMap*) _data_->_tmp6_); + _data_->_tmp7_ = gee_abstract_map_get_values ((GeeMap*) _data_->_tmp6_); _data_->_tmp8_ = _data_->_tmp7_; _data_->_tmp9_ = _data_->_tmp8_; _data_->_tmp10_ = NULL; @@ -624,7 +624,7 @@ * * @since 0.3.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_BACKEND_IS_PREPARED, "is-prepared"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_BACKEND_IS_PREPARED, g_param_spec_boolean ("is-prepared", "is-prepared", "is-prepared", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this Backend has reached a quiescent state. * @@ -632,15 +632,15 @@ * * @since 0.6.2 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_BACKEND_IS_QUIESCENT, "is-quiescent"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_BACKEND_IS_QUIESCENT, g_param_spec_boolean ("is-quiescent", "is-quiescent", "is-quiescent", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_BACKEND_NAME, "name"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_BACKEND_NAME, g_param_spec_string ("name", "name", "name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_BACKEND_PERSONA_STORES, "persona-stores"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_BACKEND_PERSONA_STORES, g_param_spec_object ("persona-stores", "persona-stores", "persona-stores", GEE_TYPE_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); } diff -Nru folks-0.6.6/backends/key-file/kf-backend-factory.c folks-0.6.7/backends/key-file/kf-backend-factory.c --- folks-0.6.6/backends/key-file/kf-backend-factory.c 2011-12-13 23:40:08.000000000 +0000 +++ folks-0.6.7/backends/key-file/kf-backend-factory.c 2012-02-23 00:02:01.000000000 +0000 @@ -1,4 +1,4 @@ -/* kf-backend-factory.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* kf-backend-factory.c generated by valac 0.15.1, the Vala compiler * generated from kf-backend-factory.vala, do not modify */ /* diff -Nru folks-0.6.6/backends/key-file/kf-persona.c folks-0.6.7/backends/key-file/kf-persona.c --- folks-0.6.6/backends/key-file/kf-persona.c 2011-12-13 23:40:09.000000000 +0000 +++ folks-0.6.7/backends/key-file/kf-persona.c 2012-02-23 00:02:01.000000000 +0000 @@ -1,4 +1,4 @@ -/* kf-persona.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* kf-persona.c generated by valac 0.15.1, the Vala compiler * generated from kf-persona.vala, do not modify */ /* @@ -358,7 +358,7 @@ FolksBackendsKfPersonaChangeAliasData* _data_; FolksBackendsKfPersona* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; self = (FolksBackendsKfPersona*) base; _data_ = g_slice_new0 (FolksBackendsKfPersonaChangeAliasData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, folks_backends_kf_persona_real_change_alias); @@ -742,7 +742,7 @@ _data_->addrs_length1 = _data_->_tmp58_; _data_->_addrs_size_ = _data_->addrs_length1; _data_->_tmp60_ = _data_->normalised_addresses; - _data_->_tmp61_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp60_); + _data_->_tmp61_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp60_); _data_->_tmp62_ = _data_->_tmp61_; _data_->addrs_length1 = _data_->_tmp62_; _data_->_tmp63_ = _data_->addrs_length1; @@ -1812,27 +1812,27 @@ /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_LINKABLE_PROPERTIES, "linkable-properties"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_LINKABLE_PROPERTIES, g_param_spec_boxed ("linkable-properties", "linkable-properties", "linkable-properties", G_TYPE_STRV, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_WRITEABLE_PROPERTIES, "writeable-properties"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_WRITEABLE_PROPERTIES, g_param_spec_boxed ("writeable-properties", "writeable-properties", "writeable-properties", G_TYPE_STRV, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} * * @since 0.1.15 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_ALIAS, "alias"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_ALIAS, g_param_spec_string ("alias", "alias", "alias", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_IM_ADDRESSES, "im-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_IM_ADDRESSES, g_param_spec_object ("im-addresses", "im-addresses", "im-addresses", GEE_TYPE_MULTI_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_WEB_SERVICE_ADDRESSES, "web-service-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_WEB_SERVICE_ADDRESSES, g_param_spec_object ("web-service-addresses", "web-service-addresses", "web-service-addresses", GEE_TYPE_MULTI_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); } diff -Nru folks-0.6.6/backends/key-file/kf-persona-store.c folks-0.6.7/backends/key-file/kf-persona-store.c --- folks-0.6.6/backends/key-file/kf-persona-store.c 2011-12-13 23:40:09.000000000 +0000 +++ folks-0.6.7/backends/key-file/kf-persona-store.c 2012-02-23 00:02:01.000000000 +0000 @@ -1,4 +1,4 @@ -/* kf-persona-store.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* kf-persona-store.c generated by valac 0.15.1, the Vala compiler * generated from kf-persona-store.vala, do not modify */ /* @@ -104,7 +104,7 @@ guint8* contents; GFile* _tmp9_; guint8* _tmp10_; - gint _tmp11_; + gsize _tmp11_; guint8* _tmp12_; gchar* _tmp13_; gchar* contents_s; @@ -308,20 +308,21 @@ GCancellable* _tmp8_; GFile* _tmp9_; const gchar* _tmp10_; - const gchar* _tmp11_; - gint _tmp12_; - gint _tmp13_; - GCancellable* _tmp14_; + guint8* _tmp11_; + gint _tmp11__length1; + guint8* _tmp12_; + gint _tmp12__length1; + GCancellable* _tmp13_; GError* e; - GError* _tmp15_; - const gchar* _tmp16_; - GFile* _tmp17_; + GError* _tmp14_; + const gchar* _tmp15_; + GFile* _tmp16_; + gchar* _tmp17_; gchar* _tmp18_; - gchar* _tmp19_; - GError* _tmp20_; - const gchar* _tmp21_; + GError* _tmp19_; + const gchar* _tmp20_; + GCancellable* _tmp21_; GCancellable* _tmp22_; - GCancellable* _tmp23_; GError * _inner_error_; }; @@ -506,7 +507,7 @@ _data_->contents = NULL; _data_->_tmp9_ = _data_->self->priv->_file; _data_->_tmp10_ = NULL; - _data_->_tmp11_ = 0; + memset (&_data_->_tmp11_, 0, sizeof (gsize)); _data_->_state_ = 1; g_file_load_contents_async (_data_->_tmp9_, NULL, folks_backends_kf_persona_store_prepare_ready, _data_); return FALSE; @@ -766,7 +767,7 @@ } } _data_->_tmp66_ = _data_->self->priv->_personas; - _data_->_tmp67_ = gee_map_get_size ((GeeMap*) _data_->_tmp66_); + _data_->_tmp67_ = gee_abstract_map_get_size ((GeeMap*) _data_->_tmp66_); _data_->_tmp68_ = _data_->_tmp67_; if (_data_->_tmp68_ > 0) { _data_->_tmp69_ = _data_->added_personas; @@ -1298,6 +1299,38 @@ } +static guint8* string_get_data (const gchar* self, int* result_length1) { + guint8* result; + guint8* res; + gint res_length1; + gint _res_size_; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + guint8* _tmp3_; + gint _tmp3__length1; + guint8* _tmp4_; + gint _tmp4__length1; + g_return_val_if_fail (self != NULL, NULL); + res = (guint8*) self; + res_length1 = -1; + _res_size_ = res_length1; + _tmp0_ = strlen (self); + _tmp1_ = _tmp0_; + res_length1 = (gint) _tmp1_; + _tmp2_ = res_length1; + _tmp3_ = res; + _tmp3__length1 = res_length1; + _tmp4_ = _tmp3_; + _tmp4__length1 = _tmp3__length1; + if (result_length1) { + *result_length1 = _tmp4__length1; + } + result = _tmp4_; + return result; +} + + static void folks_backends_kf_persona_store_save_key_file_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { FolksBackendsKfPersonaStoreSaveKeyFileData* _data_; _data_ = _user_data_; @@ -1339,12 +1372,12 @@ { _data_->_tmp9_ = _data_->self->priv->_file; _data_->_tmp10_ = _data_->key_file_data; - _data_->_tmp11_ = _data_->key_file_data; - _data_->_tmp12_ = strlen (_data_->_tmp11_); - _data_->_tmp13_ = _data_->_tmp12_; - _data_->_tmp14_ = _data_->cancellable; + _data_->_tmp11_ = string_get_data (_data_->_tmp10_, &_data_->_tmp11__length1); + _data_->_tmp12_ = _data_->_tmp11_; + _data_->_tmp12__length1 = _data_->_tmp11__length1; + _data_->_tmp13_ = _data_->cancellable; _data_->_state_ = 1; - g_file_replace_contents_async (_data_->_tmp9_, _data_->_tmp10_, (gsize) _data_->_tmp13_, NULL, FALSE, G_FILE_CREATE_PRIVATE, _data_->_tmp14_, folks_backends_kf_persona_store_save_key_file_ready, _data_); + g_file_replace_contents_async (_data_->_tmp9_, _data_->_tmp12_, (gsize) _data_->_tmp12__length1, NULL, FALSE, G_FILE_CREATE_PRIVATE, _data_->_tmp13_, folks_backends_kf_persona_store_save_key_file_ready, _data_); return FALSE; _state_1: g_file_replace_contents_finish (_data_->_tmp9_, _data_->_res_, NULL, &_data_->_inner_error_); @@ -1357,18 +1390,18 @@ { _data_->e = _data_->_inner_error_; _data_->_inner_error_ = NULL; - _data_->_tmp15_ = _data_->e; - if (!g_error_matches (_data_->_tmp15_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { - _data_->_tmp16_ = NULL; - _data_->_tmp16_ = _ ("Could not write updated key file '%s': %s"); - _data_->_tmp17_ = _data_->self->priv->_file; - _data_->_tmp18_ = NULL; - _data_->_tmp18_ = g_file_get_path (_data_->_tmp17_); - _data_->_tmp19_ = _data_->_tmp18_; - _data_->_tmp20_ = _data_->e; - _data_->_tmp21_ = _data_->_tmp20_->message; - g_warning (_data_->_tmp16_, _data_->_tmp19_, _data_->_tmp21_); - _g_free0 (_data_->_tmp19_); + _data_->_tmp14_ = _data_->e; + if (!g_error_matches (_data_->_tmp14_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { + _data_->_tmp15_ = NULL; + _data_->_tmp15_ = _ ("Could not write updated key file '%s': %s"); + _data_->_tmp16_ = _data_->self->priv->_file; + _data_->_tmp17_ = NULL; + _data_->_tmp17_ = g_file_get_path (_data_->_tmp16_); + _data_->_tmp18_ = _data_->_tmp17_; + _data_->_tmp19_ = _data_->e; + _data_->_tmp20_ = _data_->_tmp19_->message; + g_warning (_data_->_tmp15_, _data_->_tmp18_, _data_->_tmp20_); + _g_free0 (_data_->_tmp18_); } _g_error_free0 (_data_->e); } @@ -1380,9 +1413,9 @@ g_clear_error (&_data_->_inner_error_); return FALSE; } - _data_->_tmp22_ = _data_->self->priv->_save_key_file_cancellable; - _data_->_tmp23_ = _data_->cancellable; - if (_data_->_tmp22_ == _data_->_tmp23_) { + _data_->_tmp21_ = _data_->self->priv->_save_key_file_cancellable; + _data_->_tmp22_ = _data_->cancellable; + if (_data_->_tmp21_ == _data_->_tmp22_) { _data_->self->priv->_save_key_file_cancellable = NULL; } _g_object_unref0 (_data_->cancellable); @@ -1564,7 +1597,7 @@ /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_TYPE_ID, "type-id"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_TYPE_ID, g_param_spec_string ("type-id", "type-id", "type-id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can add {@link Folks.Persona}s. * @@ -1572,7 +1605,7 @@ * * @since 0.3.1 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_CAN_ADD_PERSONAS, "can-add-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_CAN_ADD_PERSONAS, g_param_spec_enum ("can-add-personas", "can-add-personas", "can-add-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can set the alias of {@link Folks.Persona}s. * @@ -1580,7 +1613,7 @@ * * @since 0.3.1 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_CAN_ALIAS_PERSONAS, "can-alias-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_CAN_ALIAS_PERSONAS, g_param_spec_enum ("can-alias-personas", "can-alias-personas", "can-alias-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can set the groups of {@link Folks.Persona}s. * @@ -1588,7 +1621,7 @@ * * @since 0.3.1 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_CAN_GROUP_PERSONAS, "can-group-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_CAN_GROUP_PERSONAS, g_param_spec_enum ("can-group-personas", "can-group-personas", "can-group-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can remove {@link Folks.Persona}s. * @@ -1596,7 +1629,7 @@ * * @since 0.3.1 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_CAN_REMOVE_PERSONAS, "can-remove-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_CAN_REMOVE_PERSONAS, g_param_spec_enum ("can-remove-personas", "can-remove-personas", "can-remove-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore has been prepared. * @@ -1604,7 +1637,7 @@ * * @since 0.3.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_IS_PREPARED, "is-prepared"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_IS_PREPARED, g_param_spec_boolean ("is-prepared", "is-prepared", "is-prepared", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore has reached a quiescent state. * @@ -1612,17 +1645,17 @@ * * @since 0.6.2 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_IS_QUIESCENT, "is-quiescent"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_IS_QUIESCENT, g_param_spec_boolean ("is-quiescent", "is-quiescent", "is-quiescent", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} * * @since 0.6.2 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_ALWAYS_WRITEABLE_PROPERTIES, "always-writeable-properties"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_ALWAYS_WRITEABLE_PROPERTIES, g_param_spec_boxed ("always-writeable-properties", "always-writeable-properties", "always-writeable-properties", G_TYPE_STRV, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_PERSONAS, "personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_KF_PERSONA_STORE_PERSONAS, g_param_spec_object ("personas", "personas", "personas", GEE_TYPE_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * File containing the persona store data. * diff -Nru folks-0.6.6/backends/key-file/kf-persona-store.vala folks-0.6.7/backends/key-file/kf-persona-store.vala --- folks-0.6.6/backends/key-file/kf-persona-store.vala 2011-12-13 23:35:55.000000000 +0000 +++ folks-0.6.7/backends/key-file/kf-persona-store.vala 2012-02-17 23:39:51.000000000 +0000 @@ -443,16 +443,9 @@ try { - /* Note: We have to use key_file_data.size () here to get its length - * in _bytes_ rather than _characters_. bgo#628930. - * In Vala >= 0.11, string.size() has been deprecated in favour of - * string.length (which now returns the byte length, whereas in - * Vala <= 0.10, it returned the character length). FIXME: We need to - * take this into account until we depend explicitly on - * Vala >= 0.11. */ - yield this.file.replace_contents_async (key_file_data, - key_file_data.length, null, false, FileCreateFlags.PRIVATE, - cancellable); + yield this.file.replace_contents_async (key_file_data.data, + null, false, FileCreateFlags.PRIVATE, + cancellable, null); } catch (Error e) { diff -Nru folks-0.6.6/backends/key-file/Makefile.am folks-0.6.7/backends/key-file/Makefile.am --- folks-0.6.6/backends/key-file/Makefile.am 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/backends/key-file/Makefile.am 2012-01-12 17:25:24.000000000 +0000 @@ -1,13 +1,5 @@ BACKEND_NAME = "key-file" -AM_CPPFLAGS = \ - -I$(top_srcdir)/folks \ - -include $(CONFIG_HEADER) \ - -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ - -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ - -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ - $(NULL) - backenddir = $(BACKEND_DIR)/key-file backend_LTLIBRARIES = key-file.la @@ -19,6 +11,7 @@ $(NULL) key_file_la_VALAFLAGS = \ + $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ --vapidir=. \ --vapidir=$(top_srcdir)/folks \ @@ -28,20 +21,38 @@ --pkg gobject-2.0 \ $(NULL) +key_file_la_CPPFLAGS = \ + -I$(top_srcdir)/folks \ + -include $(CONFIG_HEADER) \ + -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ + -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ + -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ + $(NULL) + key_file_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(NULL) key_file_la_LIBADD = \ + $(AM_LIBADD) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(top_builddir)/folks/libfolks.la \ $(NULL) -key_file_la_LDFLAGS = -shared -fPIC -module -avoid-version +key_file_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ + -shared \ + -fPIC \ + -module \ + -avoid-version \ + $(NULL) GITIGNOREFILES = \ folks-backend-key-file.vapi \ diff -Nru folks-0.6.6/backends/key-file/Makefile.in folks-0.6.7/backends/key-file/Makefile.in --- folks-0.6.6/backends/key-file/Makefile.in 2011-12-13 23:38:37.000000000 +0000 +++ folks-0.6.7/backends/key-file/Makefile.in 2012-02-23 00:04:11.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -40,10 +40,11 @@ kf-persona-store.c kf-persona.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -71,6 +72,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(backenddir)" LTLIBRARIES = $(backend_LTLIBRARIES) am__DEPENDENCIES_1 = @@ -144,6 +151,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -312,14 +321,6 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ BACKEND_NAME = "key-file" -AM_CPPFLAGS = \ - -I$(top_srcdir)/folks \ - -include $(CONFIG_HEADER) \ - -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ - -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ - -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ - $(NULL) - backenddir = $(BACKEND_DIR)/key-file backend_LTLIBRARIES = key-file.la key_file_la_SOURCES = \ @@ -330,6 +331,7 @@ $(NULL) key_file_la_VALAFLAGS = \ + $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ --vapidir=. \ --vapidir=$(top_srcdir)/folks \ @@ -339,20 +341,39 @@ --pkg gobject-2.0 \ $(NULL) +key_file_la_CPPFLAGS = \ + -I$(top_srcdir)/folks \ + -include $(CONFIG_HEADER) \ + -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ + -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ + -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ + $(NULL) + key_file_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(NULL) key_file_la_LIBADD = \ + $(AM_LIBADD) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(top_builddir)/folks/libfolks.la \ $(NULL) -key_file_la_LDFLAGS = -shared -fPIC -module -avoid-version +key_file_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ + -shared \ + -fPIC \ + -module \ + -avoid-version \ + $(NULL) + GITIGNOREFILES = \ folks-backend-key-file.vapi \ $(key_file_la_SOURCES:.vala=.c) \ @@ -441,76 +462,69 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< key_file_la-kf-backend.lo: kf-backend.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(key_file_la_CFLAGS) $(CFLAGS) -MT key_file_la-kf-backend.lo -MD -MP -MF $(DEPDIR)/key_file_la-kf-backend.Tpo -c -o key_file_la-kf-backend.lo `test -f 'kf-backend.c' || echo '$(srcdir)/'`kf-backend.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(key_file_la_CPPFLAGS) $(CPPFLAGS) $(key_file_la_CFLAGS) $(CFLAGS) -MT key_file_la-kf-backend.lo -MD -MP -MF $(DEPDIR)/key_file_la-kf-backend.Tpo -c -o key_file_la-kf-backend.lo `test -f 'kf-backend.c' || echo '$(srcdir)/'`kf-backend.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/key_file_la-kf-backend.Tpo $(DEPDIR)/key_file_la-kf-backend.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kf-backend.c' object='key_file_la-kf-backend.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kf-backend.c' object='key_file_la-kf-backend.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(key_file_la_CFLAGS) $(CFLAGS) -c -o key_file_la-kf-backend.lo `test -f 'kf-backend.c' || echo '$(srcdir)/'`kf-backend.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(key_file_la_CPPFLAGS) $(CPPFLAGS) $(key_file_la_CFLAGS) $(CFLAGS) -c -o key_file_la-kf-backend.lo `test -f 'kf-backend.c' || echo '$(srcdir)/'`kf-backend.c key_file_la-kf-backend-factory.lo: kf-backend-factory.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(key_file_la_CFLAGS) $(CFLAGS) -MT key_file_la-kf-backend-factory.lo -MD -MP -MF $(DEPDIR)/key_file_la-kf-backend-factory.Tpo -c -o key_file_la-kf-backend-factory.lo `test -f 'kf-backend-factory.c' || echo '$(srcdir)/'`kf-backend-factory.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(key_file_la_CPPFLAGS) $(CPPFLAGS) $(key_file_la_CFLAGS) $(CFLAGS) -MT key_file_la-kf-backend-factory.lo -MD -MP -MF $(DEPDIR)/key_file_la-kf-backend-factory.Tpo -c -o key_file_la-kf-backend-factory.lo `test -f 'kf-backend-factory.c' || echo '$(srcdir)/'`kf-backend-factory.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/key_file_la-kf-backend-factory.Tpo $(DEPDIR)/key_file_la-kf-backend-factory.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kf-backend-factory.c' object='key_file_la-kf-backend-factory.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kf-backend-factory.c' object='key_file_la-kf-backend-factory.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(key_file_la_CFLAGS) $(CFLAGS) -c -o key_file_la-kf-backend-factory.lo `test -f 'kf-backend-factory.c' || echo '$(srcdir)/'`kf-backend-factory.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(key_file_la_CPPFLAGS) $(CPPFLAGS) $(key_file_la_CFLAGS) $(CFLAGS) -c -o key_file_la-kf-backend-factory.lo `test -f 'kf-backend-factory.c' || echo '$(srcdir)/'`kf-backend-factory.c key_file_la-kf-persona.lo: kf-persona.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(key_file_la_CFLAGS) $(CFLAGS) -MT key_file_la-kf-persona.lo -MD -MP -MF $(DEPDIR)/key_file_la-kf-persona.Tpo -c -o key_file_la-kf-persona.lo `test -f 'kf-persona.c' || echo '$(srcdir)/'`kf-persona.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(key_file_la_CPPFLAGS) $(CPPFLAGS) $(key_file_la_CFLAGS) $(CFLAGS) -MT key_file_la-kf-persona.lo -MD -MP -MF $(DEPDIR)/key_file_la-kf-persona.Tpo -c -o key_file_la-kf-persona.lo `test -f 'kf-persona.c' || echo '$(srcdir)/'`kf-persona.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/key_file_la-kf-persona.Tpo $(DEPDIR)/key_file_la-kf-persona.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kf-persona.c' object='key_file_la-kf-persona.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kf-persona.c' object='key_file_la-kf-persona.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(key_file_la_CFLAGS) $(CFLAGS) -c -o key_file_la-kf-persona.lo `test -f 'kf-persona.c' || echo '$(srcdir)/'`kf-persona.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(key_file_la_CPPFLAGS) $(CPPFLAGS) $(key_file_la_CFLAGS) $(CFLAGS) -c -o key_file_la-kf-persona.lo `test -f 'kf-persona.c' || echo '$(srcdir)/'`kf-persona.c key_file_la-kf-persona-store.lo: kf-persona-store.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(key_file_la_CFLAGS) $(CFLAGS) -MT key_file_la-kf-persona-store.lo -MD -MP -MF $(DEPDIR)/key_file_la-kf-persona-store.Tpo -c -o key_file_la-kf-persona-store.lo `test -f 'kf-persona-store.c' || echo '$(srcdir)/'`kf-persona-store.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(key_file_la_CPPFLAGS) $(CPPFLAGS) $(key_file_la_CFLAGS) $(CFLAGS) -MT key_file_la-kf-persona-store.lo -MD -MP -MF $(DEPDIR)/key_file_la-kf-persona-store.Tpo -c -o key_file_la-kf-persona-store.lo `test -f 'kf-persona-store.c' || echo '$(srcdir)/'`kf-persona-store.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/key_file_la-kf-persona-store.Tpo $(DEPDIR)/key_file_la-kf-persona-store.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='kf-persona-store.c' object='key_file_la-kf-persona-store.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='kf-persona-store.c' object='key_file_la-kf-persona-store.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(key_file_la_CFLAGS) $(CFLAGS) -c -o key_file_la-kf-persona-store.lo `test -f 'kf-persona-store.c' || echo '$(srcdir)/'`kf-persona-store.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(key_file_la_CPPFLAGS) $(CPPFLAGS) $(key_file_la_CFLAGS) $(CFLAGS) -c -o key_file_la-kf-persona-store.lo `test -f 'kf-persona-store.c' || echo '$(srcdir)/'`kf-persona-store.c $(srcdir)/kf-backend.c: $(srcdir)/key_file_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/key_file_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/key_file_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) key_file_la_vala.stamp; \ fi $(srcdir)/kf-backend-factory.c: $(srcdir)/key_file_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/key_file_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/key_file_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) key_file_la_vala.stamp; \ fi $(srcdir)/kf-persona.c: $(srcdir)/key_file_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/key_file_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/key_file_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) key_file_la_vala.stamp; \ fi $(srcdir)/kf-persona-store.c: $(srcdir)/key_file_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/key_file_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/key_file_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) key_file_la_vala.stamp; \ fi key_file_la_vala.stamp: $(key_file_la_SOURCES) @@ -622,10 +636,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/backends/libsocialweb/lib/folks/folks-libsocialweb.h folks-0.6.7/backends/libsocialweb/lib/folks/folks-libsocialweb.h --- folks-0.6.6/backends/libsocialweb/lib/folks/folks-libsocialweb.h 2011-12-13 23:40:14.000000000 +0000 +++ folks-0.6.7/backends/libsocialweb/lib/folks/folks-libsocialweb.h 2012-02-23 00:02:02.000000000 +0000 @@ -1,4 +1,4 @@ -/* folks-libsocialweb.h generated by valac 0.14.0.50-58097f, the Vala compiler, do not modify */ +/* folks-libsocialweb.h generated by valac 0.15.1, the Vala compiler, do not modify */ #ifndef __FOLKS_FOLKS_LIBSOCIALWEB_H__ diff -Nru folks-0.6.6/backends/libsocialweb/lib/folks-libsocialweb.vapi folks-0.6.7/backends/libsocialweb/lib/folks-libsocialweb.vapi --- folks-0.6.6/backends/libsocialweb/lib/folks-libsocialweb.vapi 2011-12-13 23:40:14.000000000 +0000 +++ folks-0.6.7/backends/libsocialweb/lib/folks-libsocialweb.vapi 2012-02-23 00:02:02.000000000 +0000 @@ -1,4 +1,4 @@ -/* folks-libsocialweb.vapi generated by valac 0.14.0.50-58097f, do not modify. */ +/* folks-libsocialweb.vapi generated by valac 0.15.1, do not modify. */ namespace Swf { [CCode (cheader_filename = "folks/folks-libsocialweb.h")] diff -Nru folks-0.6.6/backends/libsocialweb/lib/Makefile.am folks-0.6.7/backends/libsocialweb/lib/Makefile.am --- folks-0.6.6/backends/libsocialweb/lib/Makefile.am 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/backends/libsocialweb/lib/Makefile.am 2012-01-12 17:25:24.000000000 +0000 @@ -59,6 +59,7 @@ libfolks_libsocialweb_la_CFLAGS = \ $(GIO_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(SW_CLIENT_CFLAGS) \ @@ -74,6 +75,7 @@ libfolks_libsocialweb_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \ -export-symbols-regex "^swf_.*" \ $(NULL) diff -Nru folks-0.6.6/backends/libsocialweb/lib/Makefile.in folks-0.6.7/backends/libsocialweb/lib/Makefile.in --- folks-0.6.6/backends/libsocialweb/lib/Makefile.in 2011-12-13 23:38:38.000000000 +0000 +++ folks-0.6.7/backends/libsocialweb/lib/Makefile.in 2012-02-23 00:04:11.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -45,10 +45,11 @@ swf-persona-store.c swf-persona.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -77,6 +78,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(folks_libsocialwebdir)" \ "$(DESTDIR)$(vapidir)" "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(folks_libsocialweb_includedir)" @@ -157,6 +164,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -376,6 +385,7 @@ libfolks_libsocialweb_la_CFLAGS = \ $(GIO_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(SW_CLIENT_CFLAGS) \ @@ -390,6 +400,7 @@ $(NULL) libfolks_libsocialweb_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \ -export-symbols-regex "^swf_.*" \ $(NULL) @@ -505,60 +516,55 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libfolks_libsocialweb_la-swf-persona.lo: swf-persona.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_libsocialweb_la_CFLAGS) $(CFLAGS) -MT libfolks_libsocialweb_la-swf-persona.lo -MD -MP -MF $(DEPDIR)/libfolks_libsocialweb_la-swf-persona.Tpo -c -o libfolks_libsocialweb_la-swf-persona.lo `test -f 'swf-persona.c' || echo '$(srcdir)/'`swf-persona.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_libsocialweb_la-swf-persona.Tpo $(DEPDIR)/libfolks_libsocialweb_la-swf-persona.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='swf-persona.c' object='libfolks_libsocialweb_la-swf-persona.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='swf-persona.c' object='libfolks_libsocialweb_la-swf-persona.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_libsocialweb_la_CFLAGS) $(CFLAGS) -c -o libfolks_libsocialweb_la-swf-persona.lo `test -f 'swf-persona.c' || echo '$(srcdir)/'`swf-persona.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_libsocialweb_la_CFLAGS) $(CFLAGS) -c -o libfolks_libsocialweb_la-swf-persona.lo `test -f 'swf-persona.c' || echo '$(srcdir)/'`swf-persona.c libfolks_libsocialweb_la-swf-persona-store.lo: swf-persona-store.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_libsocialweb_la_CFLAGS) $(CFLAGS) -MT libfolks_libsocialweb_la-swf-persona-store.lo -MD -MP -MF $(DEPDIR)/libfolks_libsocialweb_la-swf-persona-store.Tpo -c -o libfolks_libsocialweb_la-swf-persona-store.lo `test -f 'swf-persona-store.c' || echo '$(srcdir)/'`swf-persona-store.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_libsocialweb_la-swf-persona-store.Tpo $(DEPDIR)/libfolks_libsocialweb_la-swf-persona-store.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='swf-persona-store.c' object='libfolks_libsocialweb_la-swf-persona-store.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='swf-persona-store.c' object='libfolks_libsocialweb_la-swf-persona-store.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_libsocialweb_la_CFLAGS) $(CFLAGS) -c -o libfolks_libsocialweb_la-swf-persona-store.lo `test -f 'swf-persona-store.c' || echo '$(srcdir)/'`swf-persona-store.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_libsocialweb_la_CFLAGS) $(CFLAGS) -c -o libfolks_libsocialweb_la-swf-persona-store.lo `test -f 'swf-persona-store.c' || echo '$(srcdir)/'`swf-persona-store.c $(srcdir)/swf-persona.c: $(srcdir)/libfolks_libsocialweb_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_libsocialweb_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_libsocialweb_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_libsocialweb_la_vala.stamp; \ fi $(srcdir)/swf-persona-store.c: $(srcdir)/libfolks_libsocialweb_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_libsocialweb_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_libsocialweb_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_libsocialweb_la_vala.stamp; \ fi $(srcdir)/folks-libsocialweb.vapi: $(srcdir)/libfolks_libsocialweb_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_libsocialweb_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_libsocialweb_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_libsocialweb_la_vala.stamp; \ fi $(srcdir)/folks/folks-libsocialweb.h: $(srcdir)/libfolks_libsocialweb_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_libsocialweb_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_libsocialweb_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_libsocialweb_la_vala.stamp; \ fi libfolks_libsocialweb_la_vala.stamp: $(libfolks_libsocialweb_la_SOURCES) @@ -587,9 +593,7 @@ @$(NORMAL_UNINSTALL) @list='$(dist_vapi_DATA)'; test -n "$(vapidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(vapidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(vapidir)" && rm -f $$files + dir='$(DESTDIR)$(vapidir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @@ -607,9 +611,7 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-folks_libsocialweb_includeHEADERS: $(folks_libsocialweb_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(folks_libsocialweb_includedir)" || $(MKDIR_P) "$(DESTDIR)$(folks_libsocialweb_includedir)" @@ -627,9 +629,7 @@ @$(NORMAL_UNINSTALL) @list='$(folks_libsocialweb_include_HEADERS)'; test -n "$(folks_libsocialweb_includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(folks_libsocialweb_includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(folks_libsocialweb_includedir)" && rm -f $$files + dir='$(DESTDIR)$(folks_libsocialweb_includedir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -730,10 +730,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/backends/libsocialweb/lib/swf-persona.c folks-0.6.7/backends/libsocialweb/lib/swf-persona.c --- folks-0.6.6/backends/libsocialweb/lib/swf-persona.c 2011-12-13 23:40:14.000000000 +0000 +++ folks-0.6.7/backends/libsocialweb/lib/swf-persona.c 2012-02-23 00:02:02.000000000 +0000 @@ -1,4 +1,4 @@ -/* swf-persona.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* swf-persona.c generated by valac 0.15.1, the Vala compiler * generated from swf-persona.vala, do not modify */ /* @@ -1076,13 +1076,13 @@ * * See {@link Folks.Persona.linkable_properties}. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_LINKABLE_PROPERTIES, "linkable-properties"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_LINKABLE_PROPERTIES, g_param_spec_boxed ("linkable-properties", "linkable-properties", "linkable-properties", G_TYPE_STRV, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_WRITEABLE_PROPERTIES, "writeable-properties"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_WRITEABLE_PROPERTIES, g_param_spec_boxed ("writeable-properties", "writeable-properties", "writeable-properties", G_TYPE_STRV, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * An avatar for the Persona. * @@ -1090,35 +1090,35 @@ * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_AVATAR, "avatar"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_AVATAR, g_param_spec_object ("avatar", "avatar", "avatar", g_loadable_icon_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STRUCTURED_NAME, "structured-name"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STRUCTURED_NAME, g_param_spec_object ("structured-name", "structured-name", "structured-name", FOLKS_TYPE_STRUCTURED_NAME, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_FULL_NAME, "full-name"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_FULL_NAME, g_param_spec_string ("full-name", "full-name", "full-name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_NICKNAME, "nickname"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_NICKNAME, g_param_spec_string ("nickname", "nickname", "nickname", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_GENDER, "gender"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_GENDER, g_param_spec_enum ("gender", "gender", "gender", FOLKS_TYPE_GENDER, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_URLS, "urls"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_URLS, g_param_spec_object ("urls", "urls", "urls", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_IM_ADDRESSES, "im-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_IM_ADDRESSES, g_param_spec_object ("im-addresses", "im-addresses", "im-addresses", GEE_TYPE_MULTI_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_WEB_SERVICE_ADDRESSES, "web-service-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_WEB_SERVICE_ADDRESSES, g_param_spec_object ("web-service-addresses", "web-service-addresses", "web-service-addresses", GEE_TYPE_MULTI_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * The Contact from libsocialweb */ diff -Nru folks-0.6.6/backends/libsocialweb/lib/swf-persona-store.c folks-0.6.7/backends/libsocialweb/lib/swf-persona-store.c --- folks-0.6.6/backends/libsocialweb/lib/swf-persona-store.c 2011-12-13 23:40:14.000000000 +0000 +++ folks-0.6.7/backends/libsocialweb/lib/swf-persona-store.c 2012-02-23 00:02:02.000000000 +0000 @@ -1,4 +1,4 @@ -/* swf-persona-store.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* swf-persona-store.c generated by valac 0.15.1, the Vala compiler * generated from swf-persona-store.vala, do not modify */ /* @@ -610,7 +610,7 @@ } } _tmp11_ = added_personas; - _tmp12_ = gee_collection_get_size ((GeeCollection*) _tmp11_); + _tmp12_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp11_); _tmp13_ = _tmp12_; if (_tmp13_ > 0) { GeeHashSet* _tmp14_; @@ -770,7 +770,7 @@ } } _tmp23_ = removed_personas; - _tmp24_ = gee_collection_get_size ((GeeCollection*) _tmp23_); + _tmp24_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp23_); _tmp25_ = _tmp24_; if (_tmp25_ > 0) { GeeHashSet* _tmp26_; @@ -953,7 +953,7 @@ * * See {@link Folks.PersonaStore.type_id}. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_TYPE_ID, "type-id"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_TYPE_ID, g_param_spec_string ("type-id", "type-id", "type-id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can add {@link Folks.Persona}s. * @@ -961,7 +961,7 @@ * * @since 0.5.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_CAN_ADD_PERSONAS, "can-add-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_CAN_ADD_PERSONAS, g_param_spec_enum ("can-add-personas", "can-add-personas", "can-add-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can set the alias of {@link Folks.Persona}s. * @@ -969,7 +969,7 @@ * * @since 0.5.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_CAN_ALIAS_PERSONAS, "can-alias-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_CAN_ALIAS_PERSONAS, g_param_spec_enum ("can-alias-personas", "can-alias-personas", "can-alias-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can set the groups of {@link Folks.Persona}s. * @@ -977,7 +977,7 @@ * * @since 0.5.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_CAN_GROUP_PERSONAS, "can-group-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_CAN_GROUP_PERSONAS, g_param_spec_enum ("can-group-personas", "can-group-personas", "can-group-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can remove {@link Folks.Persona}s. * @@ -985,7 +985,7 @@ * * @since 0.5.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_CAN_REMOVE_PERSONAS, "can-remove-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_CAN_REMOVE_PERSONAS, g_param_spec_enum ("can-remove-personas", "can-remove-personas", "can-remove-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore has been prepared. * @@ -993,20 +993,20 @@ * * @since 0.5.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_IS_PREPARED, "is-prepared"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_IS_PREPARED, g_param_spec_boolean ("is-prepared", "is-prepared", "is-prepared", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} * * @since 0.6.2 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_ALWAYS_WRITEABLE_PROPERTIES, "always-writeable-properties"); - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_IS_QUIESCENT, "is-quiescent"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_ALWAYS_WRITEABLE_PROPERTIES, g_param_spec_boxed ("always-writeable-properties", "always-writeable-properties", "always-writeable-properties", G_TYPE_STRV, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_IS_QUIESCENT, g_param_spec_boolean ("is-quiescent", "is-quiescent", "is-quiescent", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * The {@link Persona}s exposed by this PersonaStore. * * See {@link Folks.PersonaStore.personas}. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_PERSONAS, "personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), SWF_PERSONA_STORE_PERSONAS, g_param_spec_object ("personas", "personas", "personas", GEE_TYPE_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * The libsocialweb {@link SocialWebClient.ClientService} associated with the * persona store. diff -Nru folks-0.6.6/backends/libsocialweb/Makefile.am folks-0.6.7/backends/libsocialweb/Makefile.am --- folks-0.6.6/backends/libsocialweb/Makefile.am 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/backends/libsocialweb/Makefile.am 2012-01-12 17:25:24.000000000 +0000 @@ -2,17 +2,8 @@ BACKEND_NAME = "libsocialweb" -AM_CPPFLAGS = \ - -I$(top_srcdir)/folks \ - -I$(top_srcdir)/backends/libsocialweb/lib \ - -I$(top_srcdir)/backends/libsocialweb/lib/folks \ - -include $(CONFIG_HEADER) \ - -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ - -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ - -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ - $(NULL) - VALAFLAGS += \ + $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ --vapidir=. \ --vapidir=$(top_builddir)/backends/libsocialweb/lib \ @@ -30,14 +21,26 @@ libsocialweb_deps = \ folks \ - folks-libsocialweb \ + folks-libsocialweb \ gee-1.0 \ gio-2.0 \ gobject-2.0 \ libsocialweb-client \ $(NULL) +libsocialweb_la_CPPFLAGS = \ + -I$(top_srcdir)/folks \ + -I$(top_srcdir)/backends/libsocialweb/lib \ + -I$(top_srcdir)/backends/libsocialweb/lib/folks \ + -include $(CONFIG_HEADER) \ + -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ + -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ + -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ + $(NULL) + libsocialweb_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ @@ -45,6 +48,7 @@ $(NULL) libsocialweb_la_LIBADD = \ + $(AM_LIBADD) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ @@ -53,7 +57,14 @@ lib/libfolks-libsocialweb.la \ $(NULL) -libsocialweb_la_LDFLAGS = -shared -fPIC -module -avoid-version +libsocialweb_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ + -shared \ + -fPIC \ + -module \ + -avoid-version \ + $(NULL) GITIGNOREFILES = \ folks-backend-libsocialweb.vapi \ diff -Nru folks-0.6.6/backends/libsocialweb/Makefile.in folks-0.6.7/backends/libsocialweb/Makefile.in --- folks-0.6.6/backends/libsocialweb/Makefile.in 2011-12-13 23:38:37.000000000 +0000 +++ folks-0.6.7/backends/libsocialweb/Makefile.in 2012-02-23 00:04:11.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,10 +39,11 @@ libsocialweb_la_vala.stamp sw-backend-factory.c sw-backend.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -70,6 +71,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(backenddir)" LTLIBRARIES = $(backend_LTLIBRARIES) am__DEPENDENCIES_1 = @@ -183,6 +190,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -292,7 +301,7 @@ VALADOC = @VALADOC@ VALADOC_CFLAGS = @VALADOC_CFLAGS@ VALADOC_LIBS = @VALADOC_LIBS@ -VALAFLAGS = @VALAFLAGS@ $(ERROR_VALAFLAGS) --vapidir=. \ +VALAFLAGS = @VALAFLAGS@ $(AM_VALAFLAGS) $(ERROR_VALAFLAGS) --vapidir=. \ --vapidir=$(top_builddir)/backends/libsocialweb/lib \ --vapidir=$(top_srcdir)/folks $(addprefix --pkg \ ,$(libsocialweb_deps)) $(NULL) @@ -355,16 +364,6 @@ top_srcdir = @top_srcdir@ SUBDIRS = lib BACKEND_NAME = "libsocialweb" -AM_CPPFLAGS = \ - -I$(top_srcdir)/folks \ - -I$(top_srcdir)/backends/libsocialweb/lib \ - -I$(top_srcdir)/backends/libsocialweb/lib/folks \ - -include $(CONFIG_HEADER) \ - -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ - -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ - -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ - $(NULL) - backenddir = $(BACKEND_DIR)/libsocialweb backend_LTLIBRARIES = libsocialweb.la libsocialweb_la_SOURCES = \ @@ -374,14 +373,26 @@ libsocialweb_deps = \ folks \ - folks-libsocialweb \ + folks-libsocialweb \ gee-1.0 \ gio-2.0 \ gobject-2.0 \ libsocialweb-client \ $(NULL) +libsocialweb_la_CPPFLAGS = \ + -I$(top_srcdir)/folks \ + -I$(top_srcdir)/backends/libsocialweb/lib \ + -I$(top_srcdir)/backends/libsocialweb/lib/folks \ + -include $(CONFIG_HEADER) \ + -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ + -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ + -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ + $(NULL) + libsocialweb_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ @@ -389,6 +400,7 @@ $(NULL) libsocialweb_la_LIBADD = \ + $(AM_LIBADD) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ @@ -397,7 +409,15 @@ lib/libfolks-libsocialweb.la \ $(NULL) -libsocialweb_la_LDFLAGS = -shared -fPIC -module -avoid-version +libsocialweb_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ + -shared \ + -fPIC \ + -module \ + -avoid-version \ + $(NULL) + GITIGNOREFILES = \ folks-backend-libsocialweb.vapi \ $(libsocialweb_la_SOURCES:.vala=.c) \ @@ -484,50 +504,45 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libsocialweb_la-sw-backend.lo: sw-backend.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsocialweb_la_CFLAGS) $(CFLAGS) -MT libsocialweb_la-sw-backend.lo -MD -MP -MF $(DEPDIR)/libsocialweb_la-sw-backend.Tpo -c -o libsocialweb_la-sw-backend.lo `test -f 'sw-backend.c' || echo '$(srcdir)/'`sw-backend.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsocialweb_la_CPPFLAGS) $(CPPFLAGS) $(libsocialweb_la_CFLAGS) $(CFLAGS) -MT libsocialweb_la-sw-backend.lo -MD -MP -MF $(DEPDIR)/libsocialweb_la-sw-backend.Tpo -c -o libsocialweb_la-sw-backend.lo `test -f 'sw-backend.c' || echo '$(srcdir)/'`sw-backend.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsocialweb_la-sw-backend.Tpo $(DEPDIR)/libsocialweb_la-sw-backend.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sw-backend.c' object='libsocialweb_la-sw-backend.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sw-backend.c' object='libsocialweb_la-sw-backend.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsocialweb_la_CFLAGS) $(CFLAGS) -c -o libsocialweb_la-sw-backend.lo `test -f 'sw-backend.c' || echo '$(srcdir)/'`sw-backend.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsocialweb_la_CPPFLAGS) $(CPPFLAGS) $(libsocialweb_la_CFLAGS) $(CFLAGS) -c -o libsocialweb_la-sw-backend.lo `test -f 'sw-backend.c' || echo '$(srcdir)/'`sw-backend.c libsocialweb_la-sw-backend-factory.lo: sw-backend-factory.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsocialweb_la_CFLAGS) $(CFLAGS) -MT libsocialweb_la-sw-backend-factory.lo -MD -MP -MF $(DEPDIR)/libsocialweb_la-sw-backend-factory.Tpo -c -o libsocialweb_la-sw-backend-factory.lo `test -f 'sw-backend-factory.c' || echo '$(srcdir)/'`sw-backend-factory.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsocialweb_la_CPPFLAGS) $(CPPFLAGS) $(libsocialweb_la_CFLAGS) $(CFLAGS) -MT libsocialweb_la-sw-backend-factory.lo -MD -MP -MF $(DEPDIR)/libsocialweb_la-sw-backend-factory.Tpo -c -o libsocialweb_la-sw-backend-factory.lo `test -f 'sw-backend-factory.c' || echo '$(srcdir)/'`sw-backend-factory.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsocialweb_la-sw-backend-factory.Tpo $(DEPDIR)/libsocialweb_la-sw-backend-factory.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sw-backend-factory.c' object='libsocialweb_la-sw-backend-factory.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='sw-backend-factory.c' object='libsocialweb_la-sw-backend-factory.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsocialweb_la_CFLAGS) $(CFLAGS) -c -o libsocialweb_la-sw-backend-factory.lo `test -f 'sw-backend-factory.c' || echo '$(srcdir)/'`sw-backend-factory.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsocialweb_la_CPPFLAGS) $(CPPFLAGS) $(libsocialweb_la_CFLAGS) $(CFLAGS) -c -o libsocialweb_la-sw-backend-factory.lo `test -f 'sw-backend-factory.c' || echo '$(srcdir)/'`sw-backend-factory.c $(srcdir)/sw-backend.c: $(srcdir)/libsocialweb_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libsocialweb_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libsocialweb_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libsocialweb_la_vala.stamp; \ fi $(srcdir)/sw-backend-factory.c: $(srcdir)/libsocialweb_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libsocialweb_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libsocialweb_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libsocialweb_la_vala.stamp; \ fi libsocialweb_la_vala.stamp: $(libsocialweb_la_SOURCES) @@ -751,10 +766,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/backends/libsocialweb/sw-backend.c folks-0.6.7/backends/libsocialweb/sw-backend.c --- folks-0.6.6/backends/libsocialweb/sw-backend.c 2011-12-13 23:40:17.000000000 +0000 +++ folks-0.6.7/backends/libsocialweb/sw-backend.c 2012-02-23 00:02:03.000000000 +0000 @@ -1,4 +1,4 @@ -/* sw-backend.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* sw-backend.c generated by valac 0.15.1, the Vala compiler * generated from sw-backend.vala, do not modify */ /* @@ -367,7 +367,7 @@ _data_->self->priv->_prepare_pending = TRUE; { _data_->_tmp6_ = _data_->self->priv->_persona_stores; - _data_->_tmp7_ = gee_map_get_values ((GeeMap*) _data_->_tmp6_); + _data_->_tmp7_ = gee_abstract_map_get_values ((GeeMap*) _data_->_tmp6_); _data_->_tmp8_ = _data_->_tmp7_; _data_->_tmp9_ = _data_->_tmp8_; _data_->_tmp10_ = NULL; @@ -587,17 +587,17 @@ /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_SW_BACKEND_NAME, "name"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_SW_BACKEND_NAME, g_param_spec_string ("name", "name", "name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_SW_BACKEND_PERSONA_STORES, "persona-stores"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_SW_BACKEND_PERSONA_STORES, g_param_spec_object ("persona-stores", "persona-stores", "persona-stores", GEE_TYPE_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this Backend has been prepared. * * See {@link Folks.Backend.is_prepared}. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_SW_BACKEND_IS_PREPARED, "is-prepared"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_SW_BACKEND_IS_PREPARED, g_param_spec_boolean ("is-prepared", "is-prepared", "is-prepared", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this Backend has reached a quiescent state. * @@ -605,7 +605,7 @@ * * @since 0.6.2 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_SW_BACKEND_IS_QUIESCENT, "is-quiescent"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_SW_BACKEND_IS_QUIESCENT, g_param_spec_boolean ("is-quiescent", "is-quiescent", "is-quiescent", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); } diff -Nru folks-0.6.6/backends/libsocialweb/sw-backend-factory.c folks-0.6.7/backends/libsocialweb/sw-backend-factory.c --- folks-0.6.6/backends/libsocialweb/sw-backend-factory.c 2011-12-13 23:40:17.000000000 +0000 +++ folks-0.6.7/backends/libsocialweb/sw-backend-factory.c 2012-02-23 00:02:03.000000000 +0000 @@ -1,4 +1,4 @@ -/* sw-backend-factory.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* sw-backend-factory.c generated by valac 0.15.1, the Vala compiler * generated from sw-backend-factory.vala, do not modify */ /* diff -Nru folks-0.6.6/backends/Makefile.in folks-0.6.7/backends/Makefile.in --- folks-0.6.6/backends/Makefile.in 2011-12-13 23:38:35.000000000 +0000 +++ folks-0.6.7/backends/Makefile.in 2012-02-23 00:04:11.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -40,10 +40,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -118,6 +119,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -543,10 +546,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/backends/telepathy/lib/folks/folks-telepathy.h folks-0.6.7/backends/telepathy/lib/folks/folks-telepathy.h --- folks-0.6.6/backends/telepathy/lib/folks/folks-telepathy.h 2011-12-13 23:39:56.000000000 +0000 +++ folks-0.6.7/backends/telepathy/lib/folks/folks-telepathy.h 2012-02-23 00:01:57.000000000 +0000 @@ -1,4 +1,4 @@ -/* folks-telepathy.h generated by valac 0.14.0.50-58097f, the Vala compiler, do not modify */ +/* folks-telepathy.h generated by valac 0.15.1, the Vala compiler, do not modify */ #ifndef __FOLKS_FOLKS_TELEPATHY_H__ diff -Nru folks-0.6.6/backends/telepathy/lib/folks-telepathy.vapi folks-0.6.7/backends/telepathy/lib/folks-telepathy.vapi --- folks-0.6.6/backends/telepathy/lib/folks-telepathy.vapi 2011-12-13 23:39:56.000000000 +0000 +++ folks-0.6.7/backends/telepathy/lib/folks-telepathy.vapi 2012-02-23 00:01:57.000000000 +0000 @@ -1,4 +1,4 @@ -/* folks-telepathy.vapi generated by valac 0.14.0.50-58097f, do not modify. */ +/* folks-telepathy.vapi generated by valac 0.15.1, do not modify. */ namespace Tpf { [CCode (cheader_filename = "folks/folks-telepathy.h")] diff -Nru folks-0.6.6/backends/telepathy/lib/Makefile.am folks-0.6.7/backends/telepathy/lib/Makefile.am --- folks-0.6.6/backends/telepathy/lib/Makefile.am 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/backends/telepathy/lib/Makefile.am 2012-01-12 17:25:24.000000000 +0000 @@ -27,6 +27,8 @@ tp_lowlevel_headers = tp-lowlevel.h libtp_lowlevel_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(ERROR_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ @@ -38,7 +40,10 @@ # despite not being installed (it needs to be a shared library for # vala-gen-introspect) libtp_lowlevel_la_LDFLAGS = \ - -shared -rpath $(libdir) \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ + -shared \ + -rpath $(libdir) \ -avoid-version \ $(GIO_LIBS) \ $(GLIB_LIBS) \ @@ -106,6 +111,7 @@ $(NULL) libfolks_telepathy_la_VALAFLAGS = \ + $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ --vapidir=. \ --vapidir=$(top_srcdir)/folks \ @@ -122,6 +128,8 @@ $(NULL) libfolks_telepathy_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ @@ -129,6 +137,7 @@ $(NULL) libfolks_telepathy_la_LIBADD = \ + $(AM_LIBADD) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ @@ -141,6 +150,8 @@ # that vim quickfix mode (:make) doesn't interpret the libtool --mode=link # command as an error message in a bizarrely named file libfolks_telepathy_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \ -export-symbols-regex "^tpf_.*" \ $(NULL) diff -Nru folks-0.6.6/backends/telepathy/lib/Makefile.in folks-0.6.7/backends/telepathy/lib/Makefile.in --- folks-0.6.6/backends/telepathy/lib/Makefile.in 2011-12-13 23:38:38.000000000 +0000 +++ folks-0.6.7/backends/telepathy/lib/Makefile.in 2012-02-23 00:04:12.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -47,10 +47,11 @@ tpf-persona-store-cache.c tpf-persona-store.c tpf-persona.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -78,6 +79,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(folks_telepathydir)" \ "$(DESTDIR)$(vapidir)" "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(folks_telepathy_includedir)" @@ -170,6 +177,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -360,6 +369,8 @@ tp_lowlevel_headers = tp-lowlevel.h libtp_lowlevel_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(ERROR_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ @@ -372,7 +383,10 @@ # despite not being installed (it needs to be a shared library for # vala-gen-introspect) libtp_lowlevel_la_LDFLAGS = \ - -shared -rpath $(libdir) \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ + -shared \ + -rpath $(libdir) \ -avoid-version \ $(GIO_LIBS) \ $(GLIB_LIBS) \ @@ -419,6 +433,7 @@ $(NULL) libfolks_telepathy_la_VALAFLAGS = \ + $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ --vapidir=. \ --vapidir=$(top_srcdir)/folks \ @@ -435,6 +450,8 @@ $(NULL) libfolks_telepathy_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ @@ -442,6 +459,7 @@ $(NULL) libfolks_telepathy_la_LIBADD = \ + $(AM_LIBADD) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ @@ -455,6 +473,8 @@ # that vim quickfix mode (:make) doesn't interpret the libtool --mode=link # command as an error message in a bizarrely named file libfolks_telepathy_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \ -export-symbols-regex "^tpf_.*" \ $(NULL) @@ -593,105 +613,96 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libfolks_telepathy_la-tpf-persona.lo: tpf-persona.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_telepathy_la_CFLAGS) $(CFLAGS) -MT libfolks_telepathy_la-tpf-persona.lo -MD -MP -MF $(DEPDIR)/libfolks_telepathy_la-tpf-persona.Tpo -c -o libfolks_telepathy_la-tpf-persona.lo `test -f 'tpf-persona.c' || echo '$(srcdir)/'`tpf-persona.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_telepathy_la-tpf-persona.Tpo $(DEPDIR)/libfolks_telepathy_la-tpf-persona.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tpf-persona.c' object='libfolks_telepathy_la-tpf-persona.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tpf-persona.c' object='libfolks_telepathy_la-tpf-persona.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_telepathy_la_CFLAGS) $(CFLAGS) -c -o libfolks_telepathy_la-tpf-persona.lo `test -f 'tpf-persona.c' || echo '$(srcdir)/'`tpf-persona.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_telepathy_la_CFLAGS) $(CFLAGS) -c -o libfolks_telepathy_la-tpf-persona.lo `test -f 'tpf-persona.c' || echo '$(srcdir)/'`tpf-persona.c libfolks_telepathy_la-tpf-persona-store.lo: tpf-persona-store.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_telepathy_la_CFLAGS) $(CFLAGS) -MT libfolks_telepathy_la-tpf-persona-store.lo -MD -MP -MF $(DEPDIR)/libfolks_telepathy_la-tpf-persona-store.Tpo -c -o libfolks_telepathy_la-tpf-persona-store.lo `test -f 'tpf-persona-store.c' || echo '$(srcdir)/'`tpf-persona-store.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_telepathy_la-tpf-persona-store.Tpo $(DEPDIR)/libfolks_telepathy_la-tpf-persona-store.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tpf-persona-store.c' object='libfolks_telepathy_la-tpf-persona-store.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tpf-persona-store.c' object='libfolks_telepathy_la-tpf-persona-store.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_telepathy_la_CFLAGS) $(CFLAGS) -c -o libfolks_telepathy_la-tpf-persona-store.lo `test -f 'tpf-persona-store.c' || echo '$(srcdir)/'`tpf-persona-store.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_telepathy_la_CFLAGS) $(CFLAGS) -c -o libfolks_telepathy_la-tpf-persona-store.lo `test -f 'tpf-persona-store.c' || echo '$(srcdir)/'`tpf-persona-store.c libfolks_telepathy_la-tpf-logger.lo: tpf-logger.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_telepathy_la_CFLAGS) $(CFLAGS) -MT libfolks_telepathy_la-tpf-logger.lo -MD -MP -MF $(DEPDIR)/libfolks_telepathy_la-tpf-logger.Tpo -c -o libfolks_telepathy_la-tpf-logger.lo `test -f 'tpf-logger.c' || echo '$(srcdir)/'`tpf-logger.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_telepathy_la-tpf-logger.Tpo $(DEPDIR)/libfolks_telepathy_la-tpf-logger.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tpf-logger.c' object='libfolks_telepathy_la-tpf-logger.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tpf-logger.c' object='libfolks_telepathy_la-tpf-logger.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_telepathy_la_CFLAGS) $(CFLAGS) -c -o libfolks_telepathy_la-tpf-logger.lo `test -f 'tpf-logger.c' || echo '$(srcdir)/'`tpf-logger.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_telepathy_la_CFLAGS) $(CFLAGS) -c -o libfolks_telepathy_la-tpf-logger.lo `test -f 'tpf-logger.c' || echo '$(srcdir)/'`tpf-logger.c libfolks_telepathy_la-tpf-persona-store-cache.lo: tpf-persona-store-cache.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_telepathy_la_CFLAGS) $(CFLAGS) -MT libfolks_telepathy_la-tpf-persona-store-cache.lo -MD -MP -MF $(DEPDIR)/libfolks_telepathy_la-tpf-persona-store-cache.Tpo -c -o libfolks_telepathy_la-tpf-persona-store-cache.lo `test -f 'tpf-persona-store-cache.c' || echo '$(srcdir)/'`tpf-persona-store-cache.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_telepathy_la-tpf-persona-store-cache.Tpo $(DEPDIR)/libfolks_telepathy_la-tpf-persona-store-cache.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tpf-persona-store-cache.c' object='libfolks_telepathy_la-tpf-persona-store-cache.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tpf-persona-store-cache.c' object='libfolks_telepathy_la-tpf-persona-store-cache.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_telepathy_la_CFLAGS) $(CFLAGS) -c -o libfolks_telepathy_la-tpf-persona-store-cache.lo `test -f 'tpf-persona-store-cache.c' || echo '$(srcdir)/'`tpf-persona-store-cache.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_telepathy_la_CFLAGS) $(CFLAGS) -c -o libfolks_telepathy_la-tpf-persona-store-cache.lo `test -f 'tpf-persona-store-cache.c' || echo '$(srcdir)/'`tpf-persona-store-cache.c libfolks_telepathy_la-tp-lowlevel.lo: tp-lowlevel.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_telepathy_la_CFLAGS) $(CFLAGS) -MT libfolks_telepathy_la-tp-lowlevel.lo -MD -MP -MF $(DEPDIR)/libfolks_telepathy_la-tp-lowlevel.Tpo -c -o libfolks_telepathy_la-tp-lowlevel.lo `test -f 'tp-lowlevel.c' || echo '$(srcdir)/'`tp-lowlevel.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_telepathy_la-tp-lowlevel.Tpo $(DEPDIR)/libfolks_telepathy_la-tp-lowlevel.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tp-lowlevel.c' object='libfolks_telepathy_la-tp-lowlevel.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tp-lowlevel.c' object='libfolks_telepathy_la-tp-lowlevel.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_telepathy_la_CFLAGS) $(CFLAGS) -c -o libfolks_telepathy_la-tp-lowlevel.lo `test -f 'tp-lowlevel.c' || echo '$(srcdir)/'`tp-lowlevel.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_telepathy_la_CFLAGS) $(CFLAGS) -c -o libfolks_telepathy_la-tp-lowlevel.lo `test -f 'tp-lowlevel.c' || echo '$(srcdir)/'`tp-lowlevel.c libtp_lowlevel_la-tp-lowlevel.lo: tp-lowlevel.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_lowlevel_la_CFLAGS) $(CFLAGS) -MT libtp_lowlevel_la-tp-lowlevel.lo -MD -MP -MF $(DEPDIR)/libtp_lowlevel_la-tp-lowlevel.Tpo -c -o libtp_lowlevel_la-tp-lowlevel.lo `test -f 'tp-lowlevel.c' || echo '$(srcdir)/'`tp-lowlevel.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtp_lowlevel_la-tp-lowlevel.Tpo $(DEPDIR)/libtp_lowlevel_la-tp-lowlevel.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tp-lowlevel.c' object='libtp_lowlevel_la-tp-lowlevel.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tp-lowlevel.c' object='libtp_lowlevel_la-tp-lowlevel.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_lowlevel_la_CFLAGS) $(CFLAGS) -c -o libtp_lowlevel_la-tp-lowlevel.lo `test -f 'tp-lowlevel.c' || echo '$(srcdir)/'`tp-lowlevel.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_lowlevel_la_CFLAGS) $(CFLAGS) -c -o libtp_lowlevel_la-tp-lowlevel.lo `test -f 'tp-lowlevel.c' || echo '$(srcdir)/'`tp-lowlevel.c libtp_lowlevel_la_vala.stamp: $(libtp_lowlevel_la_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(libtp_lowlevel_la_SOURCES) $(AM_V_at)touch $@ $(srcdir)/tpf-persona.c: $(srcdir)/libfolks_telepathy_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_telepathy_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_telepathy_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_telepathy_la_vala.stamp; \ fi $(srcdir)/tpf-persona-store.c: $(srcdir)/libfolks_telepathy_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_telepathy_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_telepathy_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_telepathy_la_vala.stamp; \ fi $(srcdir)/tpf-logger.c: $(srcdir)/libfolks_telepathy_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_telepathy_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_telepathy_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_telepathy_la_vala.stamp; \ fi $(srcdir)/tpf-persona-store-cache.c: $(srcdir)/libfolks_telepathy_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_telepathy_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_telepathy_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_telepathy_la_vala.stamp; \ fi $(srcdir)/folks-telepathy.vapi: $(srcdir)/libfolks_telepathy_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_telepathy_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_telepathy_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_telepathy_la_vala.stamp; \ fi $(srcdir)/folks/folks-telepathy.h: $(srcdir)/libfolks_telepathy_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_telepathy_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_telepathy_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_telepathy_la_vala.stamp; \ fi libfolks_telepathy_la_vala.stamp: $(libfolks_telepathy_la_SOURCES) @@ -720,9 +731,7 @@ @$(NORMAL_UNINSTALL) @list='$(dist_vapi_DATA)'; test -n "$(vapidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(vapidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(vapidir)" && rm -f $$files + dir='$(DESTDIR)$(vapidir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @@ -740,9 +749,7 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-folks_telepathy_includeHEADERS: $(folks_telepathy_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(folks_telepathy_includedir)" || $(MKDIR_P) "$(DESTDIR)$(folks_telepathy_includedir)" @@ -760,9 +767,7 @@ @$(NORMAL_UNINSTALL) @list='$(folks_telepathy_include_HEADERS)'; test -n "$(folks_telepathy_includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(folks_telepathy_includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(folks_telepathy_includedir)" && rm -f $$files + dir='$(DESTDIR)$(folks_telepathy_includedir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -863,10 +868,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/backends/telepathy/lib/tpf-logger.c folks-0.6.7/backends/telepathy/lib/tpf-logger.c --- folks-0.6.6/backends/telepathy/lib/tpf-logger.c 2011-12-13 23:39:55.000000000 +0000 +++ folks-0.6.7/backends/telepathy/lib/tpf-logger.c 2012-02-23 00:01:57.000000000 +0000 @@ -1,4 +1,4 @@ -/* tpf-logger.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* tpf-logger.c generated by valac 0.15.1, the Vala compiler * generated from tpf-logger.vala, do not modify */ /* @@ -205,7 +205,7 @@ void account_favourites_free (AccountFavourites* self); void account_favourites_copy (const AccountFavourites* self, AccountFavourites* dest); void account_favourites_destroy (AccountFavourites* self); -static gchar** _vala_array_dup3 (gchar** self, int length); +static gchar** _vala_array_dup2 (gchar** self, int length); GType logger_iface_proxy_get_type (void) G_GNUC_CONST; guint logger_iface_register_object (void* object, GDBusConnection* connection, const gchar* path, GError** error); GType logger_iface_get_type (void) G_GNUC_CONST; @@ -260,7 +260,7 @@ gchar** logger_get_favourite_contacts_finish (Logger* self, GAsyncResult* _res_, int* result_length1, GError** error); static gboolean logger_get_favourite_contacts_co (LoggerGetFavouriteContactsData* _data_); static void logger_get_favourite_contacts_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); -static gchar** _vala_array_dup4 (gchar** self, int length); +static gchar** _vala_array_dup3 (gchar** self, int length); static void logger_add_favourite_contact_data_free (gpointer _data); void logger_add_favourite_contact (Logger* self, const gchar* id, GAsyncReadyCallback _callback_, gpointer _user_data_); void logger_add_favourite_contact_finish (Logger* self, GAsyncResult* _res_, GError** error); @@ -305,7 +305,7 @@ static const GDBusInterfaceInfo _logger_iface_dbus_interface_info = {-1, "org.freedesktop.Telepathy.Logger.DRAFT", (GDBusMethodInfo **) (&_logger_iface_dbus_method_info), (GDBusSignalInfo **) (&_logger_iface_dbus_signal_info), (GDBusPropertyInfo **) (&_logger_iface_dbus_property_info)}; static const GDBusInterfaceVTable _logger_iface_dbus_interface_vtable = {logger_iface_dbus_interface_method_call, logger_iface_dbus_interface_get_property, logger_iface_dbus_interface_set_property}; -static gchar** _vala_array_dup3 (gchar** self, int length) { +static gchar** _vala_array_dup2 (gchar** self, int length) { gchar** result; int i; result = g_new0 (gchar*, length + 1); @@ -320,7 +320,7 @@ void account_favourites_copy (const AccountFavourites* self, AccountFavourites* dest) { const char* _tmp0_; - const char* _tmp1_; + char* _tmp1_; gchar** _tmp2_; gint _tmp2__length1; gchar** _tmp3_; @@ -331,7 +331,7 @@ (*dest).account_path = _tmp1_; _tmp2_ = (*self).ids; _tmp2__length1 = (*self).ids_length1; - _tmp3_ = (_tmp2_ != NULL) ? _vala_array_dup3 (_tmp2_, _tmp2__length1) : ((gpointer) _tmp2_); + _tmp3_ = (_tmp2_ != NULL) ? _vala_array_dup2 (_tmp2_, _tmp2__length1) : ((gpointer) _tmp2_); _tmp3__length1 = _tmp2__length1; (*dest).ids = (_vala_array_free ((*dest).ids, (*dest).ids_length1, (GDestroyNotify) g_free), NULL); (*dest).ids = _tmp3_; @@ -1186,7 +1186,7 @@ } -static gchar** _vala_array_dup4 (gchar** self, int length) { +static gchar** _vala_array_dup3 (gchar** self, int length) { gchar** result; int i; result = g_new0 (gchar*, length + 1); @@ -1270,7 +1270,7 @@ _data_->_tmp13_ = _data_->account; _data_->_tmp14_ = _data_->_tmp13_.ids; _data_->_tmp14__length1 = _data_->_tmp13_.ids_length1; - _data_->_tmp15_ = (_data_->_tmp14_ != NULL) ? _vala_array_dup4 (_data_->_tmp14_, _data_->_tmp14__length1) : ((gpointer) _data_->_tmp14_); + _data_->_tmp15_ = (_data_->_tmp14_ != NULL) ? _vala_array_dup3 (_data_->_tmp14_, _data_->_tmp14__length1) : ((gpointer) _data_->_tmp14_); _data_->_tmp15__length1 = _data_->_tmp14__length1; _data_->_tmp16_ = _data_->_tmp15_; _data_->_tmp16__length1 = _data_->_tmp15__length1; @@ -1331,7 +1331,7 @@ LoggerAddFavouriteContactData* _data_; Logger* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (LoggerAddFavouriteContactData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, logger_add_favourite_contact); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, logger_add_favourite_contact_data_free); @@ -1432,7 +1432,7 @@ LoggerRemoveFavouriteContactData* _data_; Logger* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (LoggerRemoveFavouriteContactData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, logger_remove_favourite_contact); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, logger_remove_favourite_contact_data_free); diff -Nru folks-0.6.6/backends/telepathy/lib/tpf-persona.c folks-0.6.7/backends/telepathy/lib/tpf-persona.c --- folks-0.6.6/backends/telepathy/lib/tpf-persona.c 2011-12-13 23:39:55.000000000 +0000 +++ folks-0.6.7/backends/telepathy/lib/tpf-persona.c 2012-02-23 00:01:57.000000000 +0000 @@ -1,4 +1,4 @@ -/* tpf-persona.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* tpf-persona.c generated by valac 0.15.1, the Vala compiler * generated from tpf-persona.vala, do not modify */ /* @@ -527,7 +527,7 @@ TpfPersonaChangeFullNameData* _data_; TpfPersona* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; self = (TpfPersona*) base; _data_ = g_slice_new0 (TpfPersonaChangeFullNameData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, tpf_persona_real_change_full_name); @@ -890,7 +890,7 @@ TpfPersonaChangeAliasData* _data_; TpfPersona* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; self = (TpfPersona*) base; _data_ = g_slice_new0 (TpfPersonaChangeAliasData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, tpf_persona_real_change_alias); @@ -1193,7 +1193,7 @@ TpfPersonaChangeGroupData* _data_; TpfPersona* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; gboolean _tmp3_; self = (TpfPersona*) base; _data_ = g_slice_new0 (TpfPersonaChangeGroupData); @@ -1677,7 +1677,7 @@ GeeSet* _tmp3_; GeeSet* _tmp4_; const gchar* _tmp5_; - const gchar* _tmp6_; + gchar* _tmp6_; _data_ = g_slice_new0 (TpfPersonaChangeDetailsData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _tpf_persona_change_details); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _tpf_persona_change_details_data_free); @@ -3929,25 +3929,25 @@ * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_AVATAR, "avatar"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_AVATAR, g_param_spec_object ("avatar", "avatar", "avatar", g_loadable_icon_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.4 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STRUCTURED_NAME, "structured-name"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STRUCTURED_NAME, g_param_spec_object ("structured-name", "structured-name", "structured-name", FOLKS_TYPE_STRUCTURED_NAME, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.4 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_FULL_NAME, "full-name"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_FULL_NAME, g_param_spec_string ("full-name", "full-name", "full-name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.4 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_NICKNAME, "nickname"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_NICKNAME, g_param_spec_string ("nickname", "nickname", "nickname", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * @@ -3955,19 +3955,19 @@ * * @since 0.6.4 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_CALENDAR_EVENT_ID, "calendar-event-id"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_CALENDAR_EVENT_ID, g_param_spec_string ("calendar-event-id", "calendar-event-id", "calendar-event-id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.4 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_BIRTHDAY, "birthday"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_BIRTHDAY, g_param_spec_boxed ("birthday", "birthday", "birthday", G_TYPE_DATE_TIME, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * The Persona's presence type. * * See {@link Folks.PresenceDetails.presence_type}. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_PRESENCE_TYPE, "presence-type"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_PRESENCE_TYPE, g_param_spec_enum ("presence-type", "presence-type", "presence-type", FOLKS_TYPE_PRESENCE_TYPE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * The Persona's presence status. * @@ -3975,55 +3975,55 @@ * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_PRESENCE_STATUS, "presence-status"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_PRESENCE_STATUS, g_param_spec_string ("presence-status", "presence-status", "presence-status", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * The Persona's presence message. * * See {@link Folks.PresenceDetails.presence_message}. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_PRESENCE_MESSAGE, "presence-message"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_PRESENCE_MESSAGE, g_param_spec_string ("presence-message", "presence-message", "presence-message", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * The names of the Persona's linkable properties. * * See {@link Folks.Persona.linkable_properties}. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_LINKABLE_PROPERTIES, "linkable-properties"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_LINKABLE_PROPERTIES, g_param_spec_boxed ("linkable-properties", "linkable-properties", "linkable-properties", G_TYPE_STRV, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_WRITEABLE_PROPERTIES, "writeable-properties"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_WRITEABLE_PROPERTIES, g_param_spec_boxed ("writeable-properties", "writeable-properties", "writeable-properties", G_TYPE_STRV, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * An alias for the Persona. * * See {@link Folks.AliasDetails.alias}. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_ALIAS, "alias"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_ALIAS, g_param_spec_string ("alias", "alias", "alias", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * Whether this Persona is a user-defined favourite. * * See {@link Folks.FavouriteDetails.is_favourite}. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_IS_FAVOURITE, "is-favourite"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_IS_FAVOURITE, g_param_spec_boolean ("is-favourite", "is-favourite", "is-favourite", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.4 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_EMAIL_ADDRESSES, "email-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_EMAIL_ADDRESSES, g_param_spec_object ("email-addresses", "email-addresses", "email-addresses", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * A mapping of IM protocol to an (unordered) set of IM addresses. * * See {@link Folks.ImDetails.im_addresses}. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_IM_ADDRESSES, "im-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_IM_ADDRESSES, g_param_spec_object ("im-addresses", "im-addresses", "im-addresses", GEE_TYPE_MULTI_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * A mapping of group ID to whether the contact is a member. * * See {@link Folks.GroupDetails.groups}. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_GROUPS, "groups"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_GROUPS, g_param_spec_object ("groups", "groups", "groups", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * The Telepathy contact represented by this persona. * @@ -4039,13 +4039,13 @@ * * @since 0.6.4 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_PHONE_NUMBERS, "phone-numbers"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_PHONE_NUMBERS, g_param_spec_object ("phone-numbers", "phone-numbers", "phone-numbers", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.4 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_URLS, "urls"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_URLS, g_param_spec_object ("urls", "urls", "urls", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); } diff -Nru folks-0.6.6/backends/telepathy/lib/tpf-persona-store.c folks-0.6.7/backends/telepathy/lib/tpf-persona-store.c --- folks-0.6.6/backends/telepathy/lib/tpf-persona-store.c 2011-12-13 23:39:55.000000000 +0000 +++ folks-0.6.7/backends/telepathy/lib/tpf-persona-store.c 2012-02-23 00:01:57.000000000 +0000 @@ -1,4 +1,4 @@ -/* tpf-persona-store.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* tpf-persona-store.c generated by valac 0.15.1, the Vala compiler * generated from tpf-persona-store.vala, do not modify */ /* @@ -121,7 +121,7 @@ GeeMap* _personas_ro; GeeHashSet* _persona_set; GeeHashMap* _handle_persona_map; - GeeHashSet* _weakly_referenced_personas; + GeeHashMap* _weakly_referenced_contacts; GeeHashMap* _channel_group_personas_map; GeeHashMap* _channel_group_incoming_adds; GeeHashMap* _group_outgoing_adds; @@ -295,10 +295,15 @@ GeeIterator* _tmp42_; gpointer _tmp43_; TpfPersona* p; - GeeHashSet* _tmp44_; + GeeHashMap* _tmp44_; TpfPersona* _tmp45_; - GeeSet* _tmp46_; - GeeHashSet* _tmp47_; + const gchar* _tmp46_; + const gchar* _tmp47_; + TpfPersona* _tmp48_; + GeeHashSet* _tmp49_; + TpfPersona* _tmp50_; + GeeSet* _tmp51_; + GeeHashSet* _tmp52_; }; struct _TpfPersonaStoreStoreCacheData { @@ -334,51 +339,55 @@ gboolean _tmp10_; const gchar* _tmp11_; GError* _tmp12_; - TpChannel* _tmp13_; - TpfPersona* _tmp14_; + TpfPersona* _tmp13_; + TpContact* _tmp14_; TpContact* _tmp15_; - TpContact* _tmp16_; - guint _tmp17_; - guint _tmp18_; + TpfPersona* _tmp16_; + TpChannel* _tmp17_; + TpfPersona* _tmp18_; + TpContact* _tmp19_; + TpContact* _tmp20_; + guint _tmp21_; + guint _tmp22_; GError* e1; - const gchar* _tmp19_; - TpfPersona* _tmp20_; - TpContact* _tmp21_; - TpContact* _tmp22_; const gchar* _tmp23_; - const gchar* _tmp24_; - GError* _tmp25_; - const gchar* _tmp26_; - TpChannel* _tmp27_; - TpfPersona* _tmp28_; - TpContact* _tmp29_; - TpContact* _tmp30_; - guint _tmp31_; - guint _tmp32_; + TpfPersona* _tmp24_; + TpContact* _tmp25_; + TpContact* _tmp26_; + const gchar* _tmp27_; + const gchar* _tmp28_; + GError* _tmp29_; + const gchar* _tmp30_; + TpChannel* _tmp31_; + TpfPersona* _tmp32_; + TpContact* _tmp33_; + TpContact* _tmp34_; + guint _tmp35_; + guint _tmp36_; GError* e2; - const gchar* _tmp33_; - TpfPersona* _tmp34_; - TpContact* _tmp35_; - TpContact* _tmp36_; const gchar* _tmp37_; - const gchar* _tmp38_; - GError* _tmp39_; - const gchar* _tmp40_; - TpChannel* _tmp41_; - TpfPersona* _tmp42_; - TpContact* _tmp43_; - TpContact* _tmp44_; - guint _tmp45_; - guint _tmp46_; + TpfPersona* _tmp38_; + TpContact* _tmp39_; + TpContact* _tmp40_; + const gchar* _tmp41_; + const gchar* _tmp42_; + GError* _tmp43_; + const gchar* _tmp44_; + TpChannel* _tmp45_; + TpfPersona* _tmp46_; + TpContact* _tmp47_; + TpContact* _tmp48_; + guint _tmp49_; + guint _tmp50_; GError* e3; - const gchar* _tmp47_; - TpfPersona* _tmp48_; - TpContact* _tmp49_; - TpContact* _tmp50_; const gchar* _tmp51_; - const gchar* _tmp52_; - GError* _tmp53_; - const gchar* _tmp54_; + TpfPersona* _tmp52_; + TpContact* _tmp53_; + TpContact* _tmp54_; + const gchar* _tmp55_; + const gchar* _tmp56_; + GError* _tmp57_; + const gchar* _tmp58_; GError * _inner_error_; }; @@ -749,20 +758,25 @@ TpContact* _tmp4_; TpContact* _tmp5_; const gchar* _tmp6_; - const gchar* id; - gboolean _tmp7_; - Logger* _tmp8_; - const gchar* _tmp9_; - Logger* _tmp10_; + GError* _tmp7_; + FolksPersona* _tmp8_; + TpContact* _tmp9_; + TpContact* _tmp10_; const gchar* _tmp11_; - GError* e; - const gchar* _tmp12_; - FolksPersona* _tmp13_; - TpContact* _tmp14_; - TpContact* _tmp15_; + const gchar* id; + gboolean _tmp12_; + Logger* _tmp13_; + const gchar* _tmp14_; + Logger* _tmp15_; const gchar* _tmp16_; + GError* e; const gchar* _tmp17_; - GError* _tmp18_; + FolksPersona* _tmp18_; + TpContact* _tmp19_; + TpContact* _tmp20_; + const gchar* _tmp21_; + const gchar* _tmp22_; + GError* _tmp23_; GError * _inner_error_; }; @@ -778,16 +792,21 @@ TpfPersona* _tmp1_; TpContact* _tmp2_; TpContact* _tmp3_; - guint _tmp4_; - guint _tmp5_; - const gchar* _tmp6_; - TpConnection* _tmp7_; - TpfPersona* _tmp8_; - TpContact* _tmp9_; - TpContact* _tmp10_; - guint _tmp11_; - guint _tmp12_; - const gchar* _tmp13_; + TpfPersona* _tmp4_; + const gchar* _tmp5_; + TpfPersona* _tmp6_; + TpContact* _tmp7_; + TpContact* _tmp8_; + guint _tmp9_; + guint _tmp10_; + const gchar* _tmp11_; + TpConnection* _tmp12_; + TpfPersona* _tmp13_; + TpContact* _tmp14_; + TpContact* _tmp15_; + guint _tmp16_; + guint _tmp17_; + const gchar* _tmp18_; }; struct _TpfPersonaStoreChangeUserBirthdayData { @@ -1164,7 +1183,6 @@ static void _g_list_free__g_object_unref0_ (GList* self); static void _tpf_persona_store_add_new_personas_from_contacts (TpfPersonaStore* self, TpContact** contacts, int contacts_length1); static void _tpf_persona_store_create_personas_from_contact_ids_data_free (gpointer _data); -static gchar** _vala_array_dup2 (gchar** self, int length); static void _tpf_persona_store_create_personas_from_contact_ids (TpfPersonaStore* self, gchar** contact_ids, int contact_ids_length1, GAsyncReadyCallback _callback_, gpointer _user_data_); static GeeHashSet* _tpf_persona_store_create_personas_from_contact_ids_finish (TpfPersonaStore* self, GAsyncResult* _res_, GError** error); static gboolean _tpf_persona_store_create_personas_from_contact_ids_co (TpfPersonaStoreCreatePersonasFromContactIdsData* _data_); @@ -1548,7 +1566,7 @@ _g_free0 (_tmp15_); _tmp43_ = debug; _tmp44_ = self->priv->_persona_set; - _tmp45_ = gee_collection_get_size ((GeeCollection*) _tmp44_); + _tmp45_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp44_); _tmp46_ = _tmp45_; folks_debug_print_line (_tmp43_, domain, level, "%u Personas:", (guint) _tmp46_); _tmp47_ = debug; @@ -1647,7 +1665,7 @@ folks_debug_unindent (_tmp81_); _tmp82_ = debug; _tmp83_ = self->priv->_handle_persona_map; - _tmp84_ = gee_map_get_size ((GeeMap*) _tmp83_); + _tmp84_ = gee_abstract_map_get_size ((GeeMap*) _tmp83_); _tmp85_ = _tmp84_; folks_debug_print_line (_tmp82_, domain, level, "%u handle–Persona mappings:", (guint) _tmp85_); _tmp86_ = debug; @@ -1679,7 +1697,7 @@ folks_debug_unindent (_tmp96_); _tmp97_ = debug; _tmp98_ = self->priv->_channel_group_personas_map; - _tmp99_ = gee_map_get_size ((GeeMap*) _tmp98_); + _tmp99_ = gee_abstract_map_get_size ((GeeMap*) _tmp98_); _tmp100_ = _tmp99_; folks_debug_print_line (_tmp97_, domain, level, "%u channel group Persona sets:", (guint) _tmp100_); _tmp101_ = debug; @@ -1750,7 +1768,7 @@ folks_debug_unindent (_tmp122_); _tmp123_ = debug; _tmp124_ = self->priv->_channel_group_incoming_adds; - _tmp125_ = gee_map_get_size ((GeeMap*) _tmp124_); + _tmp125_ = gee_abstract_map_get_size ((GeeMap*) _tmp124_); _tmp126_ = _tmp125_; folks_debug_print_line (_tmp123_, domain, level, "%u channel group incoming handle sets:", (guint) _tmp126_); _tmp127_ = debug; @@ -1820,7 +1838,7 @@ folks_debug_unindent (_tmp148_); _tmp149_ = debug; _tmp150_ = self->priv->_group_outgoing_adds; - _tmp151_ = gee_map_get_size ((GeeMap*) _tmp150_); + _tmp151_ = gee_abstract_map_get_size ((GeeMap*) _tmp150_); _tmp152_ = _tmp151_; folks_debug_print_line (_tmp149_, domain, level, "%u group outgoing add sets:", (guint) _tmp152_); _tmp153_ = debug; @@ -1894,7 +1912,7 @@ folks_debug_unindent (_tmp175_); _tmp176_ = debug; _tmp177_ = self->priv->_group_outgoing_removes; - _tmp178_ = gee_map_get_size ((GeeMap*) _tmp177_); + _tmp178_ = gee_abstract_map_get_size ((GeeMap*) _tmp177_); _tmp179_ = _tmp178_; folks_debug_print_line (_tmp176_, domain, level, "%u group outgoing remove sets:", (guint) _tmp179_); _tmp180_ = debug; @@ -1968,7 +1986,7 @@ folks_debug_unindent (_tmp202_); _tmp203_ = debug; _tmp204_ = self->priv->_standard_channels_unready; - _tmp205_ = gee_map_get_size ((GeeMap*) _tmp204_); + _tmp205_ = gee_abstract_map_get_size ((GeeMap*) _tmp204_); _tmp206_ = _tmp205_; folks_debug_print_line (_tmp203_, domain, level, "%u unready standard channels:", (guint) _tmp206_); _tmp207_ = debug; @@ -2003,7 +2021,7 @@ folks_debug_unindent (_tmp218_); _tmp219_ = debug; _tmp220_ = self->priv->_group_channels_unready; - _tmp221_ = gee_map_get_size ((GeeMap*) _tmp220_); + _tmp221_ = gee_abstract_map_get_size ((GeeMap*) _tmp220_); _tmp222_ = _tmp221_; folks_debug_print_line (_tmp219_, domain, level, "%u unready group channels:", (guint) _tmp222_); _tmp223_ = debug; @@ -2038,7 +2056,7 @@ folks_debug_unindent (_tmp234_); _tmp235_ = debug; _tmp236_ = self->priv->_groups; - _tmp237_ = gee_map_get_size ((GeeMap*) _tmp236_); + _tmp237_ = gee_abstract_map_get_size ((GeeMap*) _tmp236_); _tmp238_ = _tmp237_; folks_debug_print_line (_tmp235_, domain, level, "%u ready group channels:", (guint) _tmp238_); _tmp239_ = debug; @@ -2073,7 +2091,7 @@ folks_debug_unindent (_tmp250_); _tmp251_ = debug; _tmp252_ = self->priv->_favourite_handles; - _tmp253_ = gee_collection_get_size ((GeeCollection*) _tmp252_); + _tmp253_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp252_); _tmp254_ = _tmp253_; folks_debug_print_line (_tmp251_, domain, level, "%u favourite handles:", (guint) _tmp254_); _tmp255_ = debug; @@ -2127,6 +2145,11 @@ } +static gpointer _g_object_ref0 (gpointer self) { + return self ? g_object_ref (self) : NULL; +} + + static void __tpf_persona_store_contact_weak_notify_cb_gweak_notify (gpointer self, GObject* object) { _tpf_persona_store_contact_weak_notify_cb (self, object); } @@ -2145,29 +2168,29 @@ GeeMap* _tmp11_; GeeHashSet* _tmp12_; TpConnection* _tmp13_; - GeeHashSet* _tmp17_; - GeeHashSet* _tmp30_; + GeeHashMap* _tmp17_; + GeeHashMap* _tmp26_; + GeeHashMap* _tmp27_; + GeeHashMap* _tmp28_; + GeeHashMap* _tmp29_; + GeeHashMap* _tmp30_; GeeHashMap* _tmp31_; - GeeHashMap* _tmp32_; - GeeHashMap* _tmp33_; - GeeHashMap* _tmp34_; - GeeHashMap* _tmp35_; + TpChannel* _tmp32_; + TpChannel* _tmp34_; TpChannel* _tmp36_; - TpChannel* _tmp38_; - TpChannel* _tmp40_; - GeeHashMap* _tmp42_; - GeeHashMap* _tmp43_; - GeeHashMap* _tmp44_; - GeeHashSet* _tmp57_; + GeeHashMap* _tmp38_; + GeeHashMap* _tmp39_; + GeeHashMap* _tmp40_; + GeeHashSet* _tmp53_; + GeeHashSet* _tmp54_; + GeeSet* _tmp55_; + GeeSet* _tmp56_; + GeeHashMap* _tmp57_; GeeHashSet* _tmp58_; - GeeSet* _tmp59_; - GeeSet* _tmp60_; - GeeHashMap* _tmp61_; - GeeHashSet* _tmp62_; g_return_if_fail (self != NULL); _tmp0_ = folks_persona_store_get_id ((FolksPersonaStore*) self); _tmp1_ = _tmp0_; - g_debug ("tpf-persona-store.vala:499: Resetting Tpf.PersonaStore %p ('%s')", self, _tmp1_); + g_debug ("tpf-persona-store.vala:502: Resetting Tpf.PersonaStore %p ('%s')", self, _tmp1_); _tmp3_ = self->priv->_account; _tmp4_ = tp_account_get_protocol (_tmp3_); if (g_strcmp0 (_tmp4_, "local-xmpp") == 0) { @@ -2207,155 +2230,143 @@ _g_object_unref0 (self->priv->_conn); self->priv->_conn = NULL; } - _tmp17_ = self->priv->_weakly_referenced_personas; + _tmp17_ = self->priv->_weakly_referenced_contacts; if (_tmp17_ != NULL) { - { - GeeHashSet* _tmp18_; - GeeIterator* _tmp19_ = NULL; - GeeIterator* _p_it; - _tmp18_ = self->priv->_weakly_referenced_personas; - _tmp19_ = gee_abstract_collection_iterator ((GeeAbstractCollection*) _tmp18_); - _p_it = _tmp19_; - while (TRUE) { - GeeIterator* _tmp20_; - gboolean _tmp21_ = FALSE; - GeeIterator* _tmp22_; - gpointer _tmp23_ = NULL; - TpfPersona* p; - TpfPersona* _tmp24_; - TpContact* _tmp25_; - TpContact* _tmp26_; - _tmp20_ = _p_it; - _tmp21_ = gee_iterator_next (_tmp20_); - if (!_tmp21_) { - break; - } - _tmp22_ = _p_it; - _tmp23_ = gee_iterator_get (_tmp22_); - p = (TpfPersona*) _tmp23_; - _tmp24_ = p; - _tmp25_ = tpf_persona_get_contact (_tmp24_); - _tmp26_ = _tmp25_; - if (_tmp26_ != NULL) { - TpfPersona* _tmp27_; - TpContact* _tmp28_; - TpContact* _tmp29_; - _tmp27_ = p; - _tmp28_ = tpf_persona_get_contact (_tmp27_); - _tmp29_ = _tmp28_; - g_object_weak_unref ((GObject*) _tmp29_, __tpf_persona_store_contact_weak_notify_cb_gweak_notify, self); - } - _g_object_unref0 (p); + GeeHashMap* _tmp18_; + GeeMapIterator* _tmp19_ = NULL; + GeeMapIterator* iter; + _tmp18_ = self->priv->_weakly_referenced_contacts; + _tmp19_ = gee_abstract_map_map_iterator ((GeeAbstractMap*) _tmp18_); + iter = _tmp19_; + while (TRUE) { + GeeMapIterator* _tmp20_; + gboolean _tmp21_ = FALSE; + GeeMapIterator* _tmp22_; + gpointer _tmp23_ = NULL; + TpContact* _tmp24_; + TpContact* contact; + TpContact* _tmp25_; + _tmp20_ = iter; + _tmp21_ = gee_map_iterator_next (_tmp20_); + if (!(_tmp21_ == TRUE)) { + break; } - _g_object_unref0 (_p_it); - } - } - _tmp30_ = gee_hash_set_new (TPF_TYPE_PERSONA, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); - _g_object_unref0 (self->priv->_weakly_referenced_personas); - self->priv->_weakly_referenced_personas = _tmp30_; - _tmp31_ = gee_hash_map_new (G_TYPE_UINT, NULL, NULL, TPF_TYPE_PERSONA, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp22_ = iter; + _tmp23_ = gee_map_iterator_get_key (_tmp22_); + _tmp24_ = _g_object_ref0 ((TpContact*) _tmp23_); + contact = _tmp24_; + _tmp25_ = contact; + g_object_weak_unref ((GObject*) _tmp25_, __tpf_persona_store_contact_weak_notify_cb_gweak_notify, self); + _g_object_unref0 (contact); + } + _g_object_unref0 (iter); + } + _tmp26_ = gee_hash_map_new (tp_contact_get_type (), NULL, NULL, G_TYPE_UINT, NULL, NULL, NULL, NULL, NULL); + _g_object_unref0 (self->priv->_weakly_referenced_contacts); + self->priv->_weakly_referenced_contacts = _tmp26_; + _tmp27_ = gee_hash_map_new (G_TYPE_UINT, NULL, NULL, TPF_TYPE_PERSONA, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); _g_object_unref0 (self->priv->_handle_persona_map); - self->priv->_handle_persona_map = _tmp31_; - _tmp32_ = gee_hash_map_new (tp_channel_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, GEE_TYPE_HASH_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + self->priv->_handle_persona_map = _tmp27_; + _tmp28_ = gee_hash_map_new (tp_channel_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, GEE_TYPE_HASH_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); _g_object_unref0 (self->priv->_channel_group_personas_map); - self->priv->_channel_group_personas_map = _tmp32_; - _tmp33_ = gee_hash_map_new (tp_channel_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, GEE_TYPE_HASH_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + self->priv->_channel_group_personas_map = _tmp28_; + _tmp29_ = gee_hash_map_new (tp_channel_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, GEE_TYPE_HASH_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); _g_object_unref0 (self->priv->_channel_group_incoming_adds); - self->priv->_channel_group_incoming_adds = _tmp33_; - _tmp34_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_HASH_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + self->priv->_channel_group_incoming_adds = _tmp29_; + _tmp30_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_HASH_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); _g_object_unref0 (self->priv->_group_outgoing_adds); - self->priv->_group_outgoing_adds = _tmp34_; - _tmp35_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_HASH_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + self->priv->_group_outgoing_adds = _tmp30_; + _tmp31_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, GEE_TYPE_HASH_SET, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); _g_object_unref0 (self->priv->_group_outgoing_removes); - self->priv->_group_outgoing_removes = _tmp35_; - _tmp36_ = self->priv->_publish; - if (_tmp36_ != NULL) { - TpChannel* _tmp37_; - _tmp37_ = self->priv->_publish; - _tpf_persona_store_disconnect_from_standard_channel (self, _tmp37_); + self->priv->_group_outgoing_removes = _tmp31_; + _tmp32_ = self->priv->_publish; + if (_tmp32_ != NULL) { + TpChannel* _tmp33_; + _tmp33_ = self->priv->_publish; + _tpf_persona_store_disconnect_from_standard_channel (self, _tmp33_); _g_object_unref0 (self->priv->_publish); self->priv->_publish = NULL; } - _tmp38_ = self->priv->_stored; - if (_tmp38_ != NULL) { - TpChannel* _tmp39_; - _tmp39_ = self->priv->_stored; - _tpf_persona_store_disconnect_from_standard_channel (self, _tmp39_); + _tmp34_ = self->priv->_stored; + if (_tmp34_ != NULL) { + TpChannel* _tmp35_; + _tmp35_ = self->priv->_stored; + _tpf_persona_store_disconnect_from_standard_channel (self, _tmp35_); _g_object_unref0 (self->priv->_stored); self->priv->_stored = NULL; } - _tmp40_ = self->priv->_subscribe; - if (_tmp40_ != NULL) { - TpChannel* _tmp41_; - _tmp41_ = self->priv->_subscribe; - _tpf_persona_store_disconnect_from_standard_channel (self, _tmp41_); + _tmp36_ = self->priv->_subscribe; + if (_tmp36_ != NULL) { + TpChannel* _tmp37_; + _tmp37_ = self->priv->_subscribe; + _tpf_persona_store_disconnect_from_standard_channel (self, _tmp37_); _g_object_unref0 (self->priv->_subscribe); self->priv->_subscribe = NULL; } - _tmp42_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, tp_channel_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _tmp38_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, tp_channel_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); _g_object_unref0 (self->priv->_standard_channels_unready); - self->priv->_standard_channels_unready = _tmp42_; - _tmp43_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, tp_channel_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + self->priv->_standard_channels_unready = _tmp38_; + _tmp39_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, tp_channel_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); _g_object_unref0 (self->priv->_group_channels_unready); - self->priv->_group_channels_unready = _tmp43_; - _tmp44_ = self->priv->_groups; - if (_tmp44_ != NULL) { + self->priv->_group_channels_unready = _tmp39_; + _tmp40_ = self->priv->_groups; + if (_tmp40_ != NULL) { { - GeeHashMap* _tmp45_; - GeeCollection* _tmp46_; - GeeCollection* _tmp47_; - GeeCollection* _tmp48_; - GeeIterator* _tmp49_ = NULL; - GeeIterator* _tmp50_; + GeeHashMap* _tmp41_; + GeeCollection* _tmp42_; + GeeCollection* _tmp43_; + GeeCollection* _tmp44_; + GeeIterator* _tmp45_ = NULL; + GeeIterator* _tmp46_; GeeIterator* _channel_it; - _tmp45_ = self->priv->_groups; - _tmp46_ = gee_map_get_values ((GeeMap*) _tmp45_); - _tmp47_ = _tmp46_; - _tmp48_ = _tmp47_; - _tmp49_ = gee_iterable_iterator ((GeeIterable*) _tmp48_); - _tmp50_ = _tmp49_; - _g_object_unref0 (_tmp48_); - _channel_it = _tmp50_; + _tmp41_ = self->priv->_groups; + _tmp42_ = gee_abstract_map_get_values ((GeeMap*) _tmp41_); + _tmp43_ = _tmp42_; + _tmp44_ = _tmp43_; + _tmp45_ = gee_iterable_iterator ((GeeIterable*) _tmp44_); + _tmp46_ = _tmp45_; + _g_object_unref0 (_tmp44_); + _channel_it = _tmp46_; while (TRUE) { - GeeIterator* _tmp51_; - gboolean _tmp52_ = FALSE; - GeeIterator* _tmp53_; - gpointer _tmp54_ = NULL; + GeeIterator* _tmp47_; + gboolean _tmp48_ = FALSE; + GeeIterator* _tmp49_; + gpointer _tmp50_ = NULL; TpChannel* channel; - TpChannel* _tmp55_; - _tmp51_ = _channel_it; - _tmp52_ = gee_iterator_next (_tmp51_); - if (!_tmp52_) { + TpChannel* _tmp51_; + _tmp47_ = _channel_it; + _tmp48_ = gee_iterator_next (_tmp47_); + if (!_tmp48_) { break; } - _tmp53_ = _channel_it; - _tmp54_ = gee_iterator_get (_tmp53_); - channel = (TpChannel*) _tmp54_; - _tmp55_ = channel; - if (_tmp55_ != NULL) { - TpChannel* _tmp56_; - _tmp56_ = channel; - _tpf_persona_store_disconnect_from_group_channel (self, _tmp56_); + _tmp49_ = _channel_it; + _tmp50_ = gee_iterator_get (_tmp49_); + channel = (TpChannel*) _tmp50_; + _tmp51_ = channel; + if (_tmp51_ != NULL) { + TpChannel* _tmp52_; + _tmp52_ = channel; + _tpf_persona_store_disconnect_from_group_channel (self, _tmp52_); } _g_object_unref0 (channel); } _g_object_unref0 (_channel_it); } } - _tmp57_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL); + _tmp53_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL); _g_object_unref0 (self->_supported_fields); - self->_supported_fields = _tmp57_; - _tmp58_ = self->_supported_fields; - _tmp59_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp58_); - _tmp60_ = _tmp59_; + self->_supported_fields = _tmp53_; + _tmp54_ = self->_supported_fields; + _tmp55_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp54_); + _tmp56_ = _tmp55_; _g_object_unref0 (self->_supported_fields_ro); - self->_supported_fields_ro = _tmp60_; - _tmp61_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, tp_channel_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + self->_supported_fields_ro = _tmp56_; + _tmp57_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, tp_channel_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); _g_object_unref0 (self->priv->_groups); - self->priv->_groups = _tmp61_; - _tmp62_ = gee_hash_set_new (G_TYPE_UINT, NULL, NULL, NULL, NULL); + self->priv->_groups = _tmp57_; + _tmp58_ = gee_hash_set_new (G_TYPE_UINT, NULL, NULL, NULL, NULL); _g_object_unref0 (self->priv->_favourite_handles); - self->priv->_favourite_handles = _tmp62_; + self->priv->_favourite_handles = _tmp58_; _g_object_unref0 (self->priv->_self_contact); self->priv->_self_contact = NULL; } @@ -2369,11 +2380,6 @@ } -static gpointer _g_object_ref0 (gpointer self) { - return self ? g_object_ref (self) : NULL; -} - - static void tpf_persona_store_real_prepare (FolksPersonaStore* base, GAsyncReadyCallback _callback_, gpointer _user_data_) { TpfPersonaStore * self; TpfPersonaStorePrepareData* _data_; @@ -2551,7 +2557,7 @@ _data_->_inner_error_ = NULL; _data_->_tmp15_ = NULL; _data_->_tmp15_ = _ ("Couldn't connect to the telepathy-logger service."); - g_warning ("tpf-persona-store.vala:633: %s", _data_->_tmp15_); + g_warning ("tpf-persona-store.vala:636: %s", _data_->_tmp15_); _g_object_unref0 (_data_->self->priv->_logger); _data_->self->priv->_logger = NULL; _g_error_free0 (_data_->e); @@ -2640,7 +2646,7 @@ g_signal_parse_name ("invalidated", TYPE_LOGGER, &_tmp1_, NULL, FALSE); g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) __tpf_persona_store_logger_invalidated_cb_logger_invalidated, self); _tmp2_ = _ ("Lost connection to the telepathy-logger service."); - g_warning ("tpf-persona-store.vala:673: %s", _tmp2_); + g_warning ("tpf-persona-store.vala:676: %s", _tmp2_); _g_object_unref0 (self->priv->_logger); self->priv->_logger = NULL; } @@ -2904,7 +2910,7 @@ gint _tmp25_; gint _tmp26_; _tmp24_ = self->priv->_handle_persona_map; - _tmp25_ = gee_map_get_size ((GeeMap*) _tmp24_); + _tmp25_ = gee_abstract_map_get_size ((GeeMap*) _tmp24_); _tmp26_ = _tmp25_; _tmp22_ = _tmp26_ > 0; } else { @@ -2923,7 +2929,7 @@ gint _tmp31_; gint _tmp32_; _tmp30_ = self->priv->_handle_persona_map; - _tmp31_ = gee_map_get_size ((GeeMap*) _tmp30_); + _tmp31_ = gee_abstract_map_get_size ((GeeMap*) _tmp30_); _tmp32_ = _tmp31_; _tmp28_ = _tmp32_ > 1; } else { @@ -3153,7 +3159,7 @@ _tmp4_ = account; _tmp5_ = tp_account_get_connection (_tmp4_); _tmp6_ = _tmp5_; - g_debug ("tpf-persona-store.vala:818: Account '%s' connection changed to %p", _tmp3_, _tmp6_); + g_debug ("tpf-persona-store.vala:821: Account '%s' connection changed to %p", _tmp3_, _tmp6_); _tmp7_ = account; _tmp8_ = tp_account_get_connection (_tmp7_); _tmp9_ = _tmp8_; @@ -3247,7 +3253,7 @@ _state_0: _data_->_tmp0_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); _data_->_tmp1_ = _data_->_tmp0_; - g_debug ("tpf-persona-store.vala:877: _notify_connection_cb_async() for Tpf.Pers" \ + g_debug ("tpf-persona-store.vala:880: _notify_connection_cb_async() for Tpf.Pers" \ "onaStore %p ('%s').", _data_->self, _data_->_tmp1_); _data_->_tmp2_ = _data_->self->priv->_account; _data_->_tmp3_ = tp_account_get_connection (_data_->_tmp2_); @@ -3610,7 +3616,7 @@ g_return_if_fail (s != NULL); _tmp0_ = folks_persona_store_get_id ((FolksPersonaStore*) self); _tmp1_ = _tmp0_; - g_debug ("tpf-persona-store.vala:903: _connection_ready_cb() for Tpf.PersonaStor" \ + g_debug ("tpf-persona-store.vala:906: _connection_ready_cb() for Tpf.PersonaStor" \ "e %p ('%s').", self, _tmp1_); _tmp2_ = s; _tmp3_ = _g_object_ref0 (TP_CONNECTION (_tmp2_)); @@ -3805,14 +3811,14 @@ } _data_->_tmp20_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); _data_->_tmp21_ = _data_->_tmp20_; - g_debug ("tpf-persona-store.vala:1050: Loading cache for Tpf.PersonaStore %p ('%" \ + g_debug ("tpf-persona-store.vala:1053: Loading cache for Tpf.PersonaStore %p ('%" \ "s').", _data_->self, _data_->_tmp21_); _data_->_tmp22_ = g_cancellable_new (); _data_->cancellable = _data_->_tmp22_; _data_->_tmp23_ = _data_->self->priv->_load_cache_cancellable; if (_data_->_tmp23_ != NULL) { _data_->_tmp24_ = _data_->self->priv->_load_cache_cancellable; - g_debug ("tpf-persona-store.vala:1056: Cancelling ongoing loading operation " \ + g_debug ("tpf-persona-store.vala:1059: Cancelling ongoing loading operation " \ "(cancellable: %p).", _data_->_tmp24_); _data_->_tmp25_ = _data_->self->priv->_load_cache_cancellable; g_cancellable_cancel (_data_->_tmp25_); @@ -3838,7 +3844,7 @@ _data_->_tmp34_ = g_cancellable_is_cancelled (_data_->_tmp33_); if (_data_->_tmp34_ == TRUE) { _data_->_tmp35_ = _data_->cancellable; - g_debug ("tpf-persona-store.vala:1071: Cancelled (cancellable: %p).", _data_->_tmp35_); + g_debug ("tpf-persona-store.vala:1074: Cancelled (cancellable: %p).", _data_->_tmp35_); _g_object_unref0 (_data_->old_personas); _g_object_unref0 (_data_->cached_personas); _g_object_unref0 (_data_->cancellable); @@ -3873,17 +3879,23 @@ _data_->_tmp43_ = NULL; _data_->_tmp43_ = gee_iterator_get (_data_->_tmp42_); _data_->p = (TpfPersona*) _data_->_tmp43_; - _data_->_tmp44_ = _data_->self->priv->_persona_set; + _data_->_tmp44_ = _data_->self->priv->_personas; _data_->_tmp45_ = _data_->p; - gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp44_, _data_->_tmp45_); + _data_->_tmp46_ = folks_persona_get_iid ((FolksPersona*) _data_->_tmp45_); + _data_->_tmp47_ = _data_->_tmp46_; + _data_->_tmp48_ = _data_->p; + gee_abstract_map_set ((GeeAbstractMap*) _data_->_tmp44_, _data_->_tmp47_, _data_->_tmp48_); + _data_->_tmp49_ = _data_->self->priv->_persona_set; + _data_->_tmp50_ = _data_->p; + gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp49_, _data_->_tmp50_); _g_object_unref0 (_data_->p); } _g_object_unref0 (_data_->_p_it); } } - _data_->_tmp46_ = _data_->cached_personas; - _data_->_tmp47_ = _data_->old_personas; - _folks_persona_store_emit_personas_changed ((FolksPersonaStore*) _data_->self, _data_->_tmp46_, (GeeSet*) _data_->_tmp47_, NULL, NULL, FOLKS_GROUP_DETAILS_CHANGE_REASON_NONE); + _data_->_tmp51_ = _data_->cached_personas; + _data_->_tmp52_ = _data_->old_personas; + _folks_persona_store_emit_personas_changed ((FolksPersonaStore*) _data_->self, _data_->_tmp51_, (GeeSet*) _data_->_tmp52_, NULL, NULL, FOLKS_GROUP_DETAILS_CHANGE_REASON_NONE); _data_->self->priv->_can_add_personas = FOLKS_MAYBE_BOOL_FALSE; _data_->self->priv->_can_alias_personas = FOLKS_MAYBE_BOOL_FALSE; _data_->self->priv->_can_group_personas = FOLKS_MAYBE_BOOL_FALSE; @@ -3952,7 +3964,7 @@ _state_0: _data_->_tmp0_ = folks_persona_store_get_id ((FolksPersonaStore*) _data_->self); _data_->_tmp1_ = _data_->_tmp0_; - g_debug ("tpf-persona-store.vala:1102: Storing cache for Tpf.PersonaStore %p ('%" \ + g_debug ("tpf-persona-store.vala:1106: Storing cache for Tpf.PersonaStore %p ('%" \ "s').", _data_->self, _data_->_tmp1_); _data_->_tmp2_ = _data_->self->priv->_cache; _data_->_tmp3_ = _data_->self->priv->_persona_set; @@ -3983,14 +3995,14 @@ g_return_if_fail (self != NULL); _tmp0_ = folks_persona_store_get_id ((FolksPersonaStore*) self); _tmp1_ = _tmp0_; - g_debug ("tpf-persona-store.vala:1113: Unloading cache for Tpf.PersonaStore %p (" \ + g_debug ("tpf-persona-store.vala:1117: Unloading cache for Tpf.PersonaStore %p (" \ "'%s').", self, _tmp1_); _tmp2_ = self->priv->_load_cache_cancellable; if (_tmp2_ != NULL) { GCancellable* _tmp3_; GCancellable* _tmp4_; _tmp3_ = self->priv->_load_cache_cancellable; - g_debug ("tpf-persona-store.vala:1118: Cancelling ongoing loading operation " \ + g_debug ("tpf-persona-store.vala:1122: Cancelling ongoing loading operation " \ "(cancellable: %p).", _tmp3_); _tmp4_ = self->priv->_load_cache_cancellable; g_cancellable_cancel (_tmp4_); @@ -4037,7 +4049,7 @@ g_warning (_tmp1_, _tmp4_, _tmp6_); return; } - g_debug ("tpf-persona-store.vala:1167: Creating persona from self-handle"); + g_debug ("tpf-persona-store.vala:1171: Creating persona from self-handle"); _tmp7_ = contacts; _tmp7__length1 = contacts_length1; _tmp8_ = _tmp7_[0]; @@ -4147,7 +4159,7 @@ if (_tmp0_ == NULL) { const gchar* _tmp1_ = NULL; _tmp1_ = _ ("Error creating channel for NewChannels signal."); - g_warning ("tpf-persona-store.vala:1193: %s", _tmp1_); + g_warning ("tpf-persona-store.vala:1197: %s", _tmp1_); return; } _tmp2_ = channel; @@ -4225,7 +4237,7 @@ _g_object_unref0 (_tmp22_); } _tmp23_ = change_maps; - _tmp24_ = gee_map_get_size ((GeeMap*) _tmp23_); + _tmp24_ = gee_abstract_map_get_size ((GeeMap*) _tmp23_); _tmp25_ = _tmp24_; if (_tmp25_ < 1) { _g_object_unref0 (change_maps); @@ -4240,7 +4252,7 @@ GeeIterator* _tmp31_; GeeIterator* _entry_it; _tmp26_ = change_maps; - _tmp27_ = gee_map_get_entries ((GeeMap*) _tmp26_); + _tmp27_ = gee_abstract_map_get_entries ((GeeMap*) _tmp26_); _tmp28_ = _tmp27_; _tmp29_ = _tmp28_; _tmp30_ = gee_iterable_iterator ((GeeIterable*) _tmp29_); @@ -4258,7 +4270,7 @@ GeeHashSet* _tmp38_; GeeHashSet* _tmp39_; GeeHashSet* changes; - GeeHashSet* _tmp72_; + GeeHashSet* _tmp82_; _tmp32_ = _entry_it; _tmp33_ = gee_iterator_next (_tmp32_); if (!_tmp33_) { @@ -4334,33 +4346,61 @@ TpfPersona* _tmp59_; TpContact* _tmp60_; TpContact* _tmp61_; - const gchar* _tmp62_; - const gchar* _tmp63_; - const gchar* _tmp64_; - _tmp58_ = _ ("Failed to add Telepathy contact ‘%s’ to group ‘%s’."); + const gchar* _tmp67_ = NULL; + const gchar* _tmp68_; + const gchar* _tmp69_; _tmp59_ = persona; _tmp60_ = tpf_persona_get_contact (_tmp59_); _tmp61_ = _tmp60_; - _tmp62_ = tp_contact_get_identifier (_tmp61_); - _tmp63_ = _tmp62_; - _tmp64_ = group; - g_warning (_tmp58_, _tmp63_, _tmp64_); + if (_tmp61_ != NULL) { + TpfPersona* _tmp62_; + TpContact* _tmp63_; + TpContact* _tmp64_; + const gchar* _tmp65_; + const gchar* _tmp66_; + _tmp62_ = persona; + _tmp63_ = tpf_persona_get_contact (_tmp62_); + _tmp64_ = _tmp63_; + _tmp65_ = tp_contact_get_identifier (_tmp64_); + _tmp66_ = _tmp65_; + _tmp58_ = _tmp66_; + } else { + _tmp58_ = "(nil)"; + } + _tmp67_ = _ ("Failed to add Telepathy contact ‘%s’ to group ‘%s’."); + _tmp68_ = _tmp58_; + _tmp69_ = group; + g_warning (_tmp67_, _tmp68_, _tmp69_); } else { - const gchar* _tmp65_ = NULL; - TpfPersona* _tmp66_; - TpContact* _tmp67_; - TpContact* _tmp68_; - const gchar* _tmp69_; - const gchar* _tmp70_; - const gchar* _tmp71_; - _tmp65_ = _ ("Failed to remove Telepathy contact ‘%s’ from group ‘%s’."); - _tmp66_ = persona; - _tmp67_ = tpf_persona_get_contact (_tmp66_); - _tmp68_ = _tmp67_; - _tmp69_ = tp_contact_get_identifier (_tmp68_); - _tmp70_ = _tmp69_; - _tmp71_ = group; - g_warning (_tmp65_, _tmp70_, _tmp71_); + const gchar* _tmp70_ = NULL; + TpfPersona* _tmp71_; + TpContact* _tmp72_; + TpContact* _tmp73_; + const gchar* _tmp79_ = NULL; + const gchar* _tmp80_; + const gchar* _tmp81_; + _tmp71_ = persona; + _tmp72_ = tpf_persona_get_contact (_tmp71_); + _tmp73_ = _tmp72_; + if (_tmp73_ != NULL) { + TpfPersona* _tmp74_; + TpContact* _tmp75_; + TpContact* _tmp76_; + const gchar* _tmp77_; + const gchar* _tmp78_; + _tmp74_ = persona; + _tmp75_ = tpf_persona_get_contact (_tmp74_); + _tmp76_ = _tmp75_; + _tmp77_ = tp_contact_get_identifier (_tmp76_); + _tmp78_ = _tmp77_; + _tmp70_ = _tmp78_; + } else { + _tmp70_ = "(nil)"; + } + _tmp79_ = _ ("Failed to remove Telepathy contact ‘%s’ from group ‘%s’."); + _tmp80_ = _tmp70_; + _tmp81_ = group; + g_warning (_tmp79_, _tmp80_, _tmp81_); } _g_error_free0 (e); } @@ -4380,8 +4420,8 @@ } _g_object_unref0 (_persona_it); } - _tmp72_ = changes; - gee_abstract_collection_clear ((GeeAbstractCollection*) _tmp72_); + _tmp82_ = changes; + gee_abstract_collection_clear ((GeeAbstractCollection*) _tmp82_); _g_object_unref0 (changes); _g_object_unref0 (entry); } @@ -4459,7 +4499,7 @@ _tmp3_ = tp_channel_get_identifier (_tmp2_); name = _tmp3_; _tmp4_ = name; - g_debug ("tpf-persona-store.vala:1264: Channel '%s' is ready.", _tmp4_); + g_debug ("tpf-persona-store.vala:1275: Channel '%s' is ready.", _tmp4_); _tmp5_ = name; if (g_strcmp0 (_tmp5_, "publish") == 0) { TpChannel* _tmp6_; @@ -4610,7 +4650,7 @@ _tmp3_ = name; _tmp4_ = folks_persona_store_get_id ((FolksPersonaStore*) self); _tmp5_ = _tmp4_; - g_debug ("tpf-persona-store.vala:1322: Disconnecting from channel '%s' for Tpf.P" \ + g_debug ("tpf-persona-store.vala:1333: Disconnecting from channel '%s' for Tpf.P" \ "ersonaStore %p ('%s').", _tmp3_, self, _tmp5_); _tmp6_ = channel; g_signal_parse_name ("invalidated", tp_proxy_get_type (), &_tmp7_, NULL, FALSE); @@ -5143,24 +5183,24 @@ guint _tmp13_; TpfPersona* _tmp14_; gboolean _tmp15_ = FALSE; - GeeHashSet* _tmp16_; - TpfPersona* _tmp17_; - gboolean _tmp18_ = FALSE; - gboolean _tmp22_; - GeeHashSet* _tmp58_; + TpfPersona* _tmp16_; + TpContact* _tmp17_; + TpContact* _tmp18_; + gboolean _tmp24_; + GeeHashSet* _tmp60_; GeeHashSet* personas; - GeeHashSet* _tmp59_; - TpfPersona* _tmp60_; GeeHashSet* _tmp61_; - const gchar* _tmp62_; - TpfPersona* _tmp63_; - FolksGroupDetailsChangeReason _tmp64_; - GeeHashMap* _tmp65_; - TpfPersona* _tmp66_; - const gchar* _tmp67_; - const gchar* _tmp68_; - GeeHashSet* _tmp69_; - TpfPersona* _tmp70_; + TpfPersona* _tmp62_; + GeeHashSet* _tmp63_; + const gchar* _tmp64_; + TpfPersona* _tmp65_; + FolksGroupDetailsChangeReason _tmp66_; + GeeHashMap* _tmp67_; + TpfPersona* _tmp68_; + const gchar* _tmp69_; + const gchar* _tmp70_; + GeeHashSet* _tmp71_; + TpfPersona* _tmp72_; g_return_if_fail (self != NULL); _tmp0_ = self->priv->_handle_persona_map; _tmp1_ = handle; @@ -5168,7 +5208,7 @@ persona = (TpfPersona*) _tmp2_; _tmp3_ = handle; _tmp4_ = persona; - g_debug ("tpf-persona-store.vala:1540: Ignoring handle %u (persona: %p)", _tmp3_, _tmp4_); + g_debug ("tpf-persona-store.vala:1551: Ignoring handle %u (persona: %p)", _tmp3_, _tmp4_); _tmp6_ = self->priv->_self_contact; if (_tmp6_ != NULL) { TpContact* _tmp7_; @@ -5196,76 +5236,80 @@ _g_object_unref0 (persona); return; } - _tmp16_ = self->priv->_weakly_referenced_personas; - _tmp17_ = persona; - _tmp18_ = gee_abstract_collection_remove ((GeeAbstractCollection*) _tmp16_, _tmp17_); - if (_tmp18_ == TRUE) { - TpfPersona* _tmp19_; - TpContact* _tmp20_; + _tmp16_ = persona; + _tmp17_ = tpf_persona_get_contact (_tmp16_); + _tmp18_ = _tmp17_; + if (_tmp18_ != NULL) { + GeeHashMap* _tmp19_; + TpfPersona* _tmp20_; TpContact* _tmp21_; - _tmp19_ = persona; - _tmp20_ = tpf_persona_get_contact (_tmp19_); - _tmp21_ = _tmp20_; - _tmp15_ = _tmp21_ != NULL; + TpContact* _tmp22_; + gboolean _tmp23_ = FALSE; + _tmp19_ = self->priv->_weakly_referenced_contacts; + _tmp20_ = persona; + _tmp21_ = tpf_persona_get_contact (_tmp20_); + _tmp22_ = _tmp21_; + _tmp23_ = gee_abstract_map_unset ((GeeAbstractMap*) _tmp19_, _tmp22_, NULL); + _tmp15_ = _tmp23_ == TRUE; } else { _tmp15_ = FALSE; } - _tmp22_ = _tmp15_; - if (_tmp22_) { - TpfPersona* _tmp23_; - TpContact* _tmp24_; - TpContact* _tmp25_; - _tmp23_ = persona; - _tmp24_ = tpf_persona_get_contact (_tmp23_); - _tmp25_ = _tmp24_; - g_object_weak_unref ((GObject*) _tmp25_, __tpf_persona_store_contact_weak_notify_cb_gweak_notify, self); + _tmp24_ = _tmp15_; + if (_tmp24_) { + TpfPersona* _tmp25_; + TpContact* _tmp26_; + TpContact* _tmp27_; + _tmp25_ = persona; + _tmp26_ = tpf_persona_get_contact (_tmp25_); + _tmp27_ = _tmp26_; + g_object_weak_unref ((GObject*) _tmp27_, __tpf_persona_store_contact_weak_notify_cb_gweak_notify, self); } { - GeeHashMap* _tmp26_; - GeeSet* _tmp27_; - GeeSet* _tmp28_; + GeeHashMap* _tmp28_; GeeSet* _tmp29_; - GeeIterator* _tmp30_ = NULL; - GeeIterator* _tmp31_; + GeeSet* _tmp30_; + GeeSet* _tmp31_; + GeeIterator* _tmp32_ = NULL; + GeeIterator* _tmp33_; GeeIterator* _channel_it; - _tmp26_ = self->priv->_channel_group_personas_map; - _tmp27_ = gee_map_get_keys ((GeeMap*) _tmp26_); - _tmp28_ = _tmp27_; - _tmp29_ = _tmp28_; - _tmp30_ = gee_iterable_iterator ((GeeIterable*) _tmp29_); + _tmp28_ = self->priv->_channel_group_personas_map; + _tmp29_ = gee_abstract_map_get_keys ((GeeMap*) _tmp28_); + _tmp30_ = _tmp29_; _tmp31_ = _tmp30_; - _g_object_unref0 (_tmp29_); - _channel_it = _tmp31_; + _tmp32_ = gee_iterable_iterator ((GeeIterable*) _tmp31_); + _tmp33_ = _tmp32_; + _g_object_unref0 (_tmp31_); + _channel_it = _tmp33_; while (TRUE) { - GeeIterator* _tmp32_; - gboolean _tmp33_ = FALSE; GeeIterator* _tmp34_; - gpointer _tmp35_ = NULL; + gboolean _tmp35_ = FALSE; + GeeIterator* _tmp36_; + gpointer _tmp37_ = NULL; TpChannel* channel; - GeeHashMap* _tmp36_; - TpChannel* _tmp37_; - gpointer _tmp38_ = NULL; + GeeHashMap* _tmp38_; + TpChannel* _tmp39_; + gpointer _tmp40_ = NULL; GeeHashSet* members; - GeeHashSet* _tmp39_; - _tmp32_ = _channel_it; - _tmp33_ = gee_iterator_next (_tmp32_); - if (!_tmp33_) { + GeeHashSet* _tmp41_; + _tmp34_ = _channel_it; + _tmp35_ = gee_iterator_next (_tmp34_); + if (!_tmp35_) { break; } - _tmp34_ = _channel_it; - _tmp35_ = gee_iterator_get (_tmp34_); - channel = (TpChannel*) _tmp35_; - _tmp36_ = self->priv->_channel_group_personas_map; - _tmp37_ = channel; - _tmp38_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp36_, _tmp37_); - members = (GeeHashSet*) _tmp38_; - _tmp39_ = members; - if (_tmp39_ != NULL) { - GeeHashSet* _tmp40_; - TpfPersona* _tmp41_; - _tmp40_ = members; - _tmp41_ = persona; - gee_abstract_collection_remove ((GeeAbstractCollection*) _tmp40_, _tmp41_); + _tmp36_ = _channel_it; + _tmp37_ = gee_iterator_get (_tmp36_); + channel = (TpChannel*) _tmp37_; + _tmp38_ = self->priv->_channel_group_personas_map; + _tmp39_ = channel; + _tmp40_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp38_, _tmp39_); + members = (GeeHashSet*) _tmp40_; + _tmp41_ = members; + if (_tmp41_ != NULL) { + GeeHashSet* _tmp42_; + TpfPersona* _tmp43_; + _tmp42_ = members; + _tmp43_ = persona; + gee_abstract_collection_remove ((GeeAbstractCollection*) _tmp42_, _tmp43_); } _g_object_unref0 (members); _g_object_unref0 (channel); @@ -5273,75 +5317,75 @@ _g_object_unref0 (_channel_it); } { - GeeHashMap* _tmp42_; - GeeSet* _tmp43_; - GeeSet* _tmp44_; + GeeHashMap* _tmp44_; GeeSet* _tmp45_; - GeeIterator* _tmp46_ = NULL; - GeeIterator* _tmp47_; + GeeSet* _tmp46_; + GeeSet* _tmp47_; + GeeIterator* _tmp48_ = NULL; + GeeIterator* _tmp49_; GeeIterator* _name_it; - _tmp42_ = self->priv->_group_outgoing_adds; - _tmp43_ = gee_map_get_keys ((GeeMap*) _tmp42_); - _tmp44_ = _tmp43_; - _tmp45_ = _tmp44_; - _tmp46_ = gee_iterable_iterator ((GeeIterable*) _tmp45_); + _tmp44_ = self->priv->_group_outgoing_adds; + _tmp45_ = gee_abstract_map_get_keys ((GeeMap*) _tmp44_); + _tmp46_ = _tmp45_; _tmp47_ = _tmp46_; - _g_object_unref0 (_tmp45_); - _name_it = _tmp47_; + _tmp48_ = gee_iterable_iterator ((GeeIterable*) _tmp47_); + _tmp49_ = _tmp48_; + _g_object_unref0 (_tmp47_); + _name_it = _tmp49_; while (TRUE) { - GeeIterator* _tmp48_; - gboolean _tmp49_ = FALSE; GeeIterator* _tmp50_; - gpointer _tmp51_ = NULL; + gboolean _tmp51_ = FALSE; + GeeIterator* _tmp52_; + gpointer _tmp53_ = NULL; gchar* name; - GeeHashMap* _tmp52_; - const gchar* _tmp53_; - gpointer _tmp54_ = NULL; + GeeHashMap* _tmp54_; + const gchar* _tmp55_; + gpointer _tmp56_ = NULL; GeeHashSet* members; - GeeHashSet* _tmp55_; - _tmp48_ = _name_it; - _tmp49_ = gee_iterator_next (_tmp48_); - if (!_tmp49_) { + GeeHashSet* _tmp57_; + _tmp50_ = _name_it; + _tmp51_ = gee_iterator_next (_tmp50_); + if (!_tmp51_) { break; } - _tmp50_ = _name_it; - _tmp51_ = gee_iterator_get (_tmp50_); - name = (gchar*) _tmp51_; - _tmp52_ = self->priv->_group_outgoing_adds; - _tmp53_ = name; - _tmp54_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp52_, _tmp53_); - members = (GeeHashSet*) _tmp54_; - _tmp55_ = members; - if (_tmp55_ != NULL) { - GeeHashSet* _tmp56_; - TpfPersona* _tmp57_; - _tmp56_ = members; - _tmp57_ = persona; - gee_abstract_collection_remove ((GeeAbstractCollection*) _tmp56_, _tmp57_); + _tmp52_ = _name_it; + _tmp53_ = gee_iterator_get (_tmp52_); + name = (gchar*) _tmp53_; + _tmp54_ = self->priv->_group_outgoing_adds; + _tmp55_ = name; + _tmp56_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp54_, _tmp55_); + members = (GeeHashSet*) _tmp56_; + _tmp57_ = members; + if (_tmp57_ != NULL) { + GeeHashSet* _tmp58_; + TpfPersona* _tmp59_; + _tmp58_ = members; + _tmp59_ = persona; + gee_abstract_collection_remove ((GeeAbstractCollection*) _tmp58_, _tmp59_); } _g_object_unref0 (members); _g_free0 (name); } _g_object_unref0 (_name_it); } - _tmp58_ = gee_hash_set_new (TPF_TYPE_PERSONA, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); - personas = _tmp58_; - _tmp59_ = personas; - _tmp60_ = persona; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp59_, _tmp60_); + _tmp60_ = gee_hash_set_new (TPF_TYPE_PERSONA, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); + personas = _tmp60_; _tmp61_ = personas; - _tmp62_ = message; - _tmp63_ = actor; - _tmp64_ = reason; - _folks_persona_store_emit_personas_changed ((FolksPersonaStore*) self, NULL, (GeeSet*) _tmp61_, _tmp62_, (FolksPersona*) _tmp63_, _tmp64_); - _tmp65_ = self->priv->_personas; - _tmp66_ = persona; - _tmp67_ = folks_persona_get_iid ((FolksPersona*) _tmp66_); - _tmp68_ = _tmp67_; - gee_abstract_map_unset ((GeeAbstractMap*) _tmp65_, _tmp68_, NULL); - _tmp69_ = self->priv->_persona_set; - _tmp70_ = persona; - gee_abstract_collection_remove ((GeeAbstractCollection*) _tmp69_, _tmp70_); + _tmp62_ = persona; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp61_, _tmp62_); + _tmp63_ = personas; + _tmp64_ = message; + _tmp65_ = actor; + _tmp66_ = reason; + _folks_persona_store_emit_personas_changed ((FolksPersonaStore*) self, NULL, (GeeSet*) _tmp63_, _tmp64_, (FolksPersona*) _tmp65_, _tmp66_); + _tmp67_ = self->priv->_personas; + _tmp68_ = persona; + _tmp69_ = folks_persona_get_iid ((FolksPersona*) _tmp68_); + _tmp70_ = _tmp69_; + gee_abstract_map_unset ((GeeAbstractMap*) _tmp67_, _tmp70_, NULL); + _tmp71_ = self->priv->_persona_set; + _tmp72_ = persona; + gee_abstract_collection_remove ((GeeAbstractCollection*) _tmp71_, _tmp72_); _g_object_unref0 (personas); _g_object_unref0 (persona); } @@ -5436,14 +5480,29 @@ return FALSE; } } + _data_->_tmp13_ = _data_->tp_persona; + _data_->_tmp14_ = tpf_persona_get_contact (_data_->_tmp13_); + _data_->_tmp15_ = _data_->_tmp14_; + if (_data_->_tmp15_ == NULL) { + _data_->_tmp16_ = _data_->tp_persona; + g_warning ("Skipping server-side removal of Tpf.Persona %p because " "it has no attached TpContact", _data_->_tmp16_); + _g_object_unref0 (_data_->tp_persona); + if (_data_->_state_ == 0) { + g_simple_async_result_complete_in_idle (_data_->_async_result); + } else { + g_simple_async_result_complete (_data_->_async_result); + } + g_object_unref (_data_->_async_result); + return FALSE; + } { - _data_->_tmp13_ = _data_->self->priv->_stored; - _data_->_tmp14_ = _data_->tp_persona; - _data_->_tmp15_ = tpf_persona_get_contact (_data_->_tmp14_); - _data_->_tmp16_ = _data_->_tmp15_; - _data_->_tmp17_ = tp_contact_get_handle (_data_->_tmp16_); - _data_->_tmp18_ = _data_->_tmp17_; - folks_tp_lowlevel_channel_group_change_membership (_data_->_tmp13_, (guint) ((TpHandle) _data_->_tmp18_), FALSE, NULL, &_data_->_inner_error_); + _data_->_tmp17_ = _data_->self->priv->_stored; + _data_->_tmp18_ = _data_->tp_persona; + _data_->_tmp19_ = tpf_persona_get_contact (_data_->_tmp18_); + _data_->_tmp20_ = _data_->_tmp19_; + _data_->_tmp21_ = tp_contact_get_handle (_data_->_tmp20_); + _data_->_tmp22_ = _data_->_tmp21_; + folks_tp_lowlevel_channel_group_change_membership (_data_->_tmp17_, (guint) ((TpHandle) _data_->_tmp22_), FALSE, NULL, &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { goto __catch14_g_error; } @@ -5453,16 +5512,16 @@ { _data_->e1 = _data_->_inner_error_; _data_->_inner_error_ = NULL; - _data_->_tmp19_ = NULL; - _data_->_tmp19_ = _ ("Failed to remove Telepathy contact ‘%s’ from ‘%s’ list: %s"); - _data_->_tmp20_ = _data_->tp_persona; - _data_->_tmp21_ = tpf_persona_get_contact (_data_->_tmp20_); - _data_->_tmp22_ = _data_->_tmp21_; - _data_->_tmp23_ = tp_contact_get_identifier (_data_->_tmp22_); - _data_->_tmp24_ = _data_->_tmp23_; - _data_->_tmp25_ = _data_->e1; - _data_->_tmp26_ = _data_->_tmp25_->message; - g_warning (_data_->_tmp19_, _data_->_tmp24_, "stored", _data_->_tmp26_); + _data_->_tmp23_ = NULL; + _data_->_tmp23_ = _ ("Failed to remove Telepathy contact ‘%s’ from ‘%s’ list: %s"); + _data_->_tmp24_ = _data_->tp_persona; + _data_->_tmp25_ = tpf_persona_get_contact (_data_->_tmp24_); + _data_->_tmp26_ = _data_->_tmp25_; + _data_->_tmp27_ = tp_contact_get_identifier (_data_->_tmp26_); + _data_->_tmp28_ = _data_->_tmp27_; + _data_->_tmp29_ = _data_->e1; + _data_->_tmp30_ = _data_->_tmp29_->message; + g_warning (_data_->_tmp23_, _data_->_tmp28_, "stored", _data_->_tmp30_); _g_error_free0 (_data_->e1); } __finally14: @@ -5486,13 +5545,13 @@ } } { - _data_->_tmp27_ = _data_->self->priv->_subscribe; - _data_->_tmp28_ = _data_->tp_persona; - _data_->_tmp29_ = tpf_persona_get_contact (_data_->_tmp28_); - _data_->_tmp30_ = _data_->_tmp29_; - _data_->_tmp31_ = tp_contact_get_handle (_data_->_tmp30_); - _data_->_tmp32_ = _data_->_tmp31_; - folks_tp_lowlevel_channel_group_change_membership (_data_->_tmp27_, (guint) ((TpHandle) _data_->_tmp32_), FALSE, NULL, &_data_->_inner_error_); + _data_->_tmp31_ = _data_->self->priv->_subscribe; + _data_->_tmp32_ = _data_->tp_persona; + _data_->_tmp33_ = tpf_persona_get_contact (_data_->_tmp32_); + _data_->_tmp34_ = _data_->_tmp33_; + _data_->_tmp35_ = tp_contact_get_handle (_data_->_tmp34_); + _data_->_tmp36_ = _data_->_tmp35_; + folks_tp_lowlevel_channel_group_change_membership (_data_->_tmp31_, (guint) ((TpHandle) _data_->_tmp36_), FALSE, NULL, &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { goto __catch15_g_error; } @@ -5502,16 +5561,16 @@ { _data_->e2 = _data_->_inner_error_; _data_->_inner_error_ = NULL; - _data_->_tmp33_ = NULL; - _data_->_tmp33_ = _ ("Failed to remove Telepathy contact ‘%s’ from ‘%s’ list: %s"); - _data_->_tmp34_ = _data_->tp_persona; - _data_->_tmp35_ = tpf_persona_get_contact (_data_->_tmp34_); - _data_->_tmp36_ = _data_->_tmp35_; - _data_->_tmp37_ = tp_contact_get_identifier (_data_->_tmp36_); - _data_->_tmp38_ = _data_->_tmp37_; - _data_->_tmp39_ = _data_->e2; - _data_->_tmp40_ = _data_->_tmp39_->message; - g_warning (_data_->_tmp33_, _data_->_tmp38_, "subscribe", _data_->_tmp40_); + _data_->_tmp37_ = NULL; + _data_->_tmp37_ = _ ("Failed to remove Telepathy contact ‘%s’ from ‘%s’ list: %s"); + _data_->_tmp38_ = _data_->tp_persona; + _data_->_tmp39_ = tpf_persona_get_contact (_data_->_tmp38_); + _data_->_tmp40_ = _data_->_tmp39_; + _data_->_tmp41_ = tp_contact_get_identifier (_data_->_tmp40_); + _data_->_tmp42_ = _data_->_tmp41_; + _data_->_tmp43_ = _data_->e2; + _data_->_tmp44_ = _data_->_tmp43_->message; + g_warning (_data_->_tmp37_, _data_->_tmp42_, "subscribe", _data_->_tmp44_); _g_error_free0 (_data_->e2); } __finally15: @@ -5535,13 +5594,13 @@ } } { - _data_->_tmp41_ = _data_->self->priv->_publish; - _data_->_tmp42_ = _data_->tp_persona; - _data_->_tmp43_ = tpf_persona_get_contact (_data_->_tmp42_); - _data_->_tmp44_ = _data_->_tmp43_; - _data_->_tmp45_ = tp_contact_get_handle (_data_->_tmp44_); - _data_->_tmp46_ = _data_->_tmp45_; - folks_tp_lowlevel_channel_group_change_membership (_data_->_tmp41_, (guint) ((TpHandle) _data_->_tmp46_), FALSE, NULL, &_data_->_inner_error_); + _data_->_tmp45_ = _data_->self->priv->_publish; + _data_->_tmp46_ = _data_->tp_persona; + _data_->_tmp47_ = tpf_persona_get_contact (_data_->_tmp46_); + _data_->_tmp48_ = _data_->_tmp47_; + _data_->_tmp49_ = tp_contact_get_handle (_data_->_tmp48_); + _data_->_tmp50_ = _data_->_tmp49_; + folks_tp_lowlevel_channel_group_change_membership (_data_->_tmp45_, (guint) ((TpHandle) _data_->_tmp50_), FALSE, NULL, &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { goto __catch16_g_error; } @@ -5551,16 +5610,16 @@ { _data_->e3 = _data_->_inner_error_; _data_->_inner_error_ = NULL; - _data_->_tmp47_ = NULL; - _data_->_tmp47_ = _ ("Failed to remove Telepathy contact ‘%s’ from ‘%s’ list: %s"); - _data_->_tmp48_ = _data_->tp_persona; - _data_->_tmp49_ = tpf_persona_get_contact (_data_->_tmp48_); - _data_->_tmp50_ = _data_->_tmp49_; - _data_->_tmp51_ = tp_contact_get_identifier (_data_->_tmp50_); - _data_->_tmp52_ = _data_->_tmp51_; - _data_->_tmp53_ = _data_->e3; - _data_->_tmp54_ = _data_->_tmp53_->message; - g_warning (_data_->_tmp47_, _data_->_tmp52_, "publish", _data_->_tmp54_); + _data_->_tmp51_ = NULL; + _data_->_tmp51_ = _ ("Failed to remove Telepathy contact ‘%s’ from ‘%s’ list: %s"); + _data_->_tmp52_ = _data_->tp_persona; + _data_->_tmp53_ = tpf_persona_get_contact (_data_->_tmp52_); + _data_->_tmp54_ = _data_->_tmp53_; + _data_->_tmp55_ = tp_contact_get_identifier (_data_->_tmp54_); + _data_->_tmp56_ = _data_->_tmp55_; + _data_->_tmp57_ = _data_->e3; + _data_->_tmp58_ = _data_->_tmp57_->message; + g_warning (_data_->_tmp51_, _data_->_tmp56_, "publish", _data_->_tmp58_); _g_error_free0 (_data_->e3); } __finally16: @@ -5880,7 +5939,7 @@ _tmp1_ = tp_channel_get_identifier (_tmp0_); _tmp2_ = g_strdup (_tmp1_); name = _tmp2_; - g_debug ("tpf-persona-store.vala:1740: Disconnecting from group channel '%s'.", name); + g_debug ("tpf-persona-store.vala:1758: Disconnecting from group channel '%s'.", name); _tmp3_ = channel; g_signal_parse_name ("group-members-changed-detailed", tp_channel_get_type (), &_tmp4_, NULL, FALSE); g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) __tpf_persona_store_channel_group_members_changed_detailed_cb_tp_channel_group_members_changed_detailed, self); @@ -5927,7 +5986,7 @@ FolksPersona* _tmp1_; FolksPersona* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; gboolean _tmp5_; _data_ = g_slice_new0 (TpfPersonaStoreChangeGroupMembershipData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _tpf_persona_store_change_group_membership); @@ -6026,6 +6085,9 @@ FolksPersona* _tmp0_; TpfPersona* _tmp1_; TpfPersona* tp_persona; + TpfPersona* _tmp2_; + TpContact* _tmp3_; + TpContact* _tmp4_; GError * _inner_error_ = NULL; g_return_if_fail (self != NULL); g_return_if_fail (channel != NULL); @@ -6033,22 +6095,34 @@ _tmp0_ = persona; _tmp1_ = _g_object_ref0 (TPF_PERSONA (_tmp0_)); tp_persona = _tmp1_; + _tmp2_ = tp_persona; + _tmp3_ = tpf_persona_get_contact (_tmp2_); + _tmp4_ = _tmp3_; + if (_tmp4_ == NULL) { + TpfPersona* _tmp5_; + _tmp5_ = tp_persona; + g_warning ("Skipping Tpf.Persona %p contact list change because it " "has no attached TpContact", _tmp5_); + _g_object_unref0 (tp_persona); + return; + } { - TpChannel* _tmp2_; - TpContact* _tmp3_; - TpContact* _tmp4_; - guint _tmp5_; - guint _tmp6_; - gboolean _tmp7_; - const gchar* _tmp8_; - _tmp2_ = channel; - _tmp3_ = tpf_persona_get_contact (tp_persona); - _tmp4_ = _tmp3_; - _tmp5_ = tp_contact_get_handle (_tmp4_); - _tmp6_ = _tmp5_; - _tmp7_ = is_member; - _tmp8_ = message; - folks_tp_lowlevel_channel_group_change_membership (_tmp2_, (guint) ((TpHandle) _tmp6_), _tmp7_, _tmp8_, &_inner_error_); + TpChannel* _tmp6_; + TpfPersona* _tmp7_; + TpContact* _tmp8_; + TpContact* _tmp9_; + guint _tmp10_; + guint _tmp11_; + gboolean _tmp12_; + const gchar* _tmp13_; + _tmp6_ = channel; + _tmp7_ = tp_persona; + _tmp8_ = tpf_persona_get_contact (_tmp7_); + _tmp9_ = _tmp8_; + _tmp10_ = tp_contact_get_handle (_tmp9_); + _tmp11_ = _tmp10_; + _tmp12_ = is_member; + _tmp13_ = message; + folks_tp_lowlevel_channel_group_change_membership (_tmp6_, (guint) ((TpHandle) _tmp11_), _tmp12_, _tmp13_, &_inner_error_); if (_inner_error_ != NULL) { goto __catch17_g_error; } @@ -6057,50 +6131,54 @@ __catch17_g_error: { GError* e = NULL; - gboolean _tmp9_; + gboolean _tmp14_; e = _inner_error_; _inner_error_ = NULL; - _tmp9_ = is_member; - if (_tmp9_ == TRUE) { - const gchar* _tmp10_ = NULL; - TpContact* _tmp11_; - TpContact* _tmp12_; - const gchar* _tmp13_; - const gchar* _tmp14_; - TpChannel* _tmp15_; - const gchar* _tmp16_ = NULL; - GError* _tmp17_; - const gchar* _tmp18_; - _tmp10_ = _ ("Failed to add Telepathy contact ‘%s’ to ‘%s’ list: %s"); - _tmp11_ = tpf_persona_get_contact (tp_persona); - _tmp12_ = _tmp11_; - _tmp13_ = tp_contact_get_identifier (_tmp12_); - _tmp14_ = _tmp13_; - _tmp15_ = channel; - _tmp16_ = tp_channel_get_identifier (_tmp15_); - _tmp17_ = e; - _tmp18_ = _tmp17_->message; - g_warning (_tmp10_, _tmp14_, _tmp16_, _tmp18_); + _tmp14_ = is_member; + if (_tmp14_ == TRUE) { + const gchar* _tmp15_ = NULL; + TpfPersona* _tmp16_; + TpContact* _tmp17_; + TpContact* _tmp18_; + const gchar* _tmp19_; + const gchar* _tmp20_; + TpChannel* _tmp21_; + const gchar* _tmp22_ = NULL; + GError* _tmp23_; + const gchar* _tmp24_; + _tmp15_ = _ ("Failed to add Telepathy contact ‘%s’ to ‘%s’ list: %s"); + _tmp16_ = tp_persona; + _tmp17_ = tpf_persona_get_contact (_tmp16_); + _tmp18_ = _tmp17_; + _tmp19_ = tp_contact_get_identifier (_tmp18_); + _tmp20_ = _tmp19_; + _tmp21_ = channel; + _tmp22_ = tp_channel_get_identifier (_tmp21_); + _tmp23_ = e; + _tmp24_ = _tmp23_->message; + g_warning (_tmp15_, _tmp20_, _tmp22_, _tmp24_); } else { - const gchar* _tmp19_ = NULL; - TpContact* _tmp20_; - TpContact* _tmp21_; - const gchar* _tmp22_; - const gchar* _tmp23_; - TpChannel* _tmp24_; const gchar* _tmp25_ = NULL; - GError* _tmp26_; - const gchar* _tmp27_; - _tmp19_ = _ ("Failed to remove Telepathy contact ‘%s’ from ‘%s’ list: %s"); - _tmp20_ = tpf_persona_get_contact (tp_persona); - _tmp21_ = _tmp20_; - _tmp22_ = tp_contact_get_identifier (_tmp21_); - _tmp23_ = _tmp22_; - _tmp24_ = channel; - _tmp25_ = tp_channel_get_identifier (_tmp24_); - _tmp26_ = e; - _tmp27_ = _tmp26_->message; - g_warning (_tmp19_, _tmp23_, _tmp25_, _tmp27_); + TpfPersona* _tmp26_; + TpContact* _tmp27_; + TpContact* _tmp28_; + const gchar* _tmp29_; + const gchar* _tmp30_; + TpChannel* _tmp31_; + const gchar* _tmp32_ = NULL; + GError* _tmp33_; + const gchar* _tmp34_; + _tmp25_ = _ ("Failed to remove Telepathy contact ‘%s’ from ‘%s’ list: %s"); + _tmp26_ = tp_persona; + _tmp27_ = tpf_persona_get_contact (_tmp26_); + _tmp28_ = _tmp27_; + _tmp29_ = tp_contact_get_identifier (_tmp28_); + _tmp30_ = _tmp29_; + _tmp31_ = channel; + _tmp32_ = tp_channel_get_identifier (_tmp31_); + _tmp33_ = e; + _tmp34_ = _tmp33_->message; + g_warning (_tmp25_, _tmp30_, _tmp32_, _tmp34_); } _g_error_free0 (e); } @@ -6132,7 +6210,7 @@ TpConnection* _tmp1_; TpConnection* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; _data_ = g_slice_new0 (TpfPersonaStoreAddStandardChannelData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _tpf_persona_store_add_standard_channel); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _tpf_persona_store_add_standard_channel_data_free); @@ -6208,7 +6286,7 @@ _data_->_tmp9_ = _data_->name; _data_->_tmp10_ = _data_->e; _data_->_tmp11_ = _data_->_tmp10_->message; - g_debug ("tpf-persona-store.vala:1843: Failed to add channel '%s': %s", _data_->_tmp9_, _data_->_tmp11_); + g_debug ("tpf-persona-store.vala:1868: Failed to add channel '%s': %s", _data_->_tmp9_, _data_->_tmp11_); _data_->self->priv->_got_stored_channel_members = TRUE; _tpf_persona_store_notify_if_is_quiescent (_data_->self); _data_->result = NULL; @@ -6374,7 +6452,7 @@ _data_->_tmp19_ = _data_->persona; _data_->_tmp20_ = folks_persona_get_uid ((FolksPersona*) _data_->_tmp19_); _data_->_tmp21_ = _data_->_tmp20_; - g_debug ("tpf-persona-store.vala:1889: Setting is-in-contact-list for '%s' to tr" \ + g_debug ("tpf-persona-store.vala:1914: Setting is-in-contact-list for '%s' to tr" \ "ue", _data_->_tmp21_); _data_->_tmp22_ = _data_->persona; tpf_persona_set_is_in_contact_list (_data_->_tmp22_, TRUE); @@ -6512,33 +6590,17 @@ static void _tpf_persona_store_create_personas_from_contact_ids_data_free (gpointer _data) { TpfPersonaStoreCreatePersonasFromContactIdsData* _data_; _data_ = _data; - _data_->contact_ids = (_vala_array_free (_data_->contact_ids, _data_->contact_ids_length1, (GDestroyNotify) g_free), NULL); _g_object_unref0 (_data_->result); _g_object_unref0 (_data_->self); g_slice_free (TpfPersonaStoreCreatePersonasFromContactIdsData, _data_); } -static gchar** _vala_array_dup2 (gchar** self, int length) { - gchar** result; - int i; - result = g_new0 (gchar*, length + 1); - for (i = 0; i < length; i++) { - gchar* _tmp0_; - _tmp0_ = g_strdup (self[i]); - result[i] = _tmp0_; - } - return result; -} - - static void _tpf_persona_store_create_personas_from_contact_ids (TpfPersonaStore* self, gchar** contact_ids, int contact_ids_length1, GAsyncReadyCallback _callback_, gpointer _user_data_) { TpfPersonaStoreCreatePersonasFromContactIdsData* _data_; TpfPersonaStore* _tmp0_; gchar** _tmp1_; gint _tmp1__length1; - gchar** _tmp2_; - gint _tmp2__length1; _data_ = g_slice_new0 (TpfPersonaStoreCreatePersonasFromContactIdsData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _tpf_persona_store_create_personas_from_contact_ids); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _tpf_persona_store_create_personas_from_contact_ids_data_free); @@ -6546,10 +6608,8 @@ _data_->self = _tmp0_; _tmp1_ = contact_ids; _tmp1__length1 = contact_ids_length1; - _tmp2_ = (_tmp1_ != NULL) ? _vala_array_dup2 (_tmp1_, _tmp1__length1) : ((gpointer) _tmp1_); - _tmp2__length1 = _tmp1__length1; - _data_->contact_ids = _tmp2_; - _data_->contact_ids_length1 = _tmp2__length1; + _data_->contact_ids = _tmp1_; + _data_->contact_ids_length1 = _tmp1__length1; _tpf_persona_store_create_personas_from_contact_ids_co (_data_); } @@ -6647,7 +6707,7 @@ _data_->_tmp15_ = _data_->contact; _data_->_tmp16_ = tp_contact_get_identifier (_data_->_tmp15_); _data_->_tmp17_ = _data_->_tmp16_; - g_debug ("tpf-persona-store.vala:1945: Creating persona from contact '%s'", _data_->_tmp17_); + g_debug ("tpf-persona-store.vala:1970: Creating persona from contact '%s'", _data_->_tmp17_); _data_->_tmp18_ = _data_->contact; _data_->_tmp19_ = NULL; _data_->_tmp19_ = _tpf_persona_store_add_persona_from_contact (_data_->self, _data_->_tmp18_, TRUE); @@ -6663,7 +6723,7 @@ } } _data_->_tmp23_ = _data_->personas; - _data_->_tmp24_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp23_); + _data_->_tmp24_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp23_); _data_->_tmp25_ = _data_->_tmp24_; if (_data_->_tmp25_ > 0) { _data_->_tmp26_ = _data_->personas; @@ -6694,14 +6754,30 @@ GObject* _tmp0_; TpContact* _tmp1_; TpContact* c; - TpHandle _tmp2_ = 0U; + GeeHashMap* _tmp2_; g_return_if_fail (self != NULL); g_return_if_fail (obj != NULL); _tmp0_ = obj; _tmp1_ = _g_object_ref0 (TP_IS_CONTACT (_tmp0_) ? ((TpContact*) _tmp0_) : NULL); c = _tmp1_; - _tmp2_ = tp_contact_get_handle (c); - _tpf_persona_store_ignore_by_handle (self, (guint) _tmp2_, NULL, NULL, FOLKS_GROUP_DETAILS_CHANGE_REASON_NONE); + _tmp2_ = self->priv->_weakly_referenced_contacts; + if (_tmp2_ != NULL) { + GeeHashMap* _tmp3_; + TpContact* _tmp4_; + gpointer _tmp5_ = NULL; + TpHandle handle; + TpHandle _tmp6_; + _tmp3_ = self->priv->_weakly_referenced_contacts; + _tmp4_ = c; + _tmp5_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp3_, _tmp4_); + handle = (TpHandle) GPOINTER_TO_UINT (_tmp5_); + _tmp6_ = handle; + if (_tmp6_ != ((TpHandle) 0)) { + TpHandle _tmp7_; + _tmp7_ = handle; + _tpf_persona_store_ignore_by_handle (self, (guint) ((TpHandle) _tmp7_), NULL, NULL, FOLKS_GROUP_DETAILS_CHANGE_REASON_NONE); + } + } _g_object_unref0 (c); } @@ -6725,11 +6801,12 @@ TpfPersona* _tmp12_ = NULL; TpfPersona* _tmp13_; TpContact* _tmp14_; - GeeHashSet* _tmp15_; - TpfPersona* _tmp16_; - GeeHashSet* _tmp17_; - GeeHashSet* personas; + GeeHashMap* _tmp15_; + TpContact* _tmp16_; + guint _tmp17_; GeeHashSet* _tmp18_; + GeeHashSet* personas; + GeeHashSet* _tmp19_; g_return_val_if_fail (self != NULL, NULL); g_return_val_if_fail (contact != NULL, NULL); _tmp0_ = contact; @@ -6766,13 +6843,14 @@ } _tmp14_ = contact; g_object_weak_ref ((GObject*) _tmp14_, __tpf_persona_store_contact_weak_notify_cb_gweak_notify, self); - _tmp15_ = self->priv->_weakly_referenced_personas; - _tmp16_ = persona; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp15_, _tmp16_); - _tmp17_ = gee_hash_set_new (TPF_TYPE_PERSONA, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); - personas = _tmp17_; - _tmp18_ = personas; - _folks_persona_store_emit_personas_changed ((FolksPersonaStore*) self, (GeeSet*) _tmp18_, NULL, NULL, NULL, FOLKS_GROUP_DETAILS_CHANGE_REASON_NONE); + _tmp15_ = self->priv->_weakly_referenced_contacts; + _tmp16_ = contact; + _tmp17_ = handle; + gee_abstract_map_set ((GeeAbstractMap*) _tmp15_, _tmp16_, GUINT_TO_POINTER (_tmp17_)); + _tmp18_ = gee_hash_set_new (TPF_TYPE_PERSONA, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); + personas = _tmp18_; + _tmp19_ = personas; + _folks_persona_store_emit_personas_changed ((FolksPersonaStore*) self, (GeeSet*) _tmp19_, NULL, NULL, NULL, FOLKS_GROUP_DETAILS_CHANGE_REASON_NONE); result = persona; _g_object_unref0 (personas); return result; @@ -6801,7 +6879,7 @@ _tmp2_ = contact; _tmp3_ = tp_contact_get_identifier (_tmp2_); _tmp4_ = _tmp3_; - g_debug ("tpf-persona-store.vala:2016: Adding persona from contact '%s'", _tmp4_); + g_debug ("tpf-persona-store.vala:2048: Adding persona from contact '%s'", _tmp4_); _tmp5_ = self->priv->_handle_persona_map; _tmp6_ = h; _tmp7_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp5_, GUINT_TO_POINTER ((guint) _tmp6_)); @@ -6852,7 +6930,7 @@ folks_favourite_details_set_is_favourite ((FolksFavouriteDetails*) _tmp21_, _tmp24_); _tmp25_ = from_contact_list; if (_tmp25_ == FALSE) { - g_debug ("tpf-persona-store.vala:2037: Setting is-in-contact-list to false"); + g_debug ("tpf-persona-store.vala:2069: Setting is-in-contact-list to false"); } _tmp26_ = persona; _tmp27_ = from_contact_list; @@ -6865,7 +6943,7 @@ gboolean _tmp30_; gboolean _tmp31_; gboolean _tmp33_; - g_debug ("tpf-persona-store.vala:2046: ...already exists."); + g_debug ("tpf-persona-store.vala:2078: ...already exists."); _tmp29_ = persona; _tmp30_ = tpf_persona_get_is_in_contact_list (_tmp29_); _tmp31_ = _tmp30_; @@ -6879,7 +6957,7 @@ _tmp33_ = _tmp28_; if (_tmp33_) { TpfPersona* _tmp34_; - g_debug ("tpf-persona-store.vala:2056: Setting is-in-contact-list to true"); + g_debug ("tpf-persona-store.vala:2088: Setting is-in-contact-list to true"); _tmp34_ = persona; tpf_persona_set_is_in_contact_list (_tmp34_, TRUE); } @@ -6939,7 +7017,7 @@ } _tpf_persona_store_channel_groups_add_new_personas (self); _tmp8_ = personas; - _tmp9_ = gee_collection_get_size ((GeeCollection*) _tmp8_); + _tmp9_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp8_); _tmp10_ = _tmp9_; if (_tmp10_ > 0) { GeeHashSet* _tmp11_; @@ -6961,7 +7039,7 @@ GeeIterator* _tmp5_; GeeIterator* _entry_it; _tmp0_ = self->priv->_channel_group_incoming_adds; - _tmp1_ = gee_map_get_entries ((GeeMap*) _tmp0_); + _tmp1_ = gee_abstract_map_get_entries ((GeeMap*) _tmp0_); _tmp2_ = _tmp1_; _tmp3_ = _tmp2_; _tmp4_ = gee_iterable_iterator ((GeeIterable*) _tmp3_); @@ -7033,7 +7111,7 @@ } _tmp19_ = channel; _tmp20_ = tp_channel_get_identifier (_tmp19_); - g_debug ("tpf-persona-store.vala:2094: Adding members to channel '%s':", _tmp20_); + g_debug ("tpf-persona-store.vala:2126: Adding members to channel '%s':", _tmp20_); _tmp21_ = entry; _tmp22_ = gee_map_entry_get_value (_tmp21_); _tmp23_ = _tmp22_; @@ -7045,7 +7123,7 @@ gint _tmp28_; gint _tmp29_; _tmp27_ = contact_handles; - _tmp28_ = gee_collection_get_size ((GeeCollection*) _tmp27_); + _tmp28_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp27_); _tmp29_ = _tmp28_; _tmp25_ = _tmp29_ > 0; } else { @@ -7101,7 +7179,7 @@ _tmp42_ = persona; _tmp43_ = folks_persona_get_uid ((FolksPersona*) _tmp42_); _tmp44_ = _tmp43_; - g_debug ("tpf-persona-store.vala:2105: %s", _tmp44_); + g_debug ("tpf-persona-store.vala:2137: %s", _tmp44_); _tmp45_ = members; _tmp46_ = persona; gee_abstract_collection_add ((GeeAbstractCollection*) _tmp45_, _tmp46_); @@ -7148,7 +7226,7 @@ _g_object_unref0 (contact_handles_added); } _tmp59_ = members; - _tmp60_ = gee_collection_get_size ((GeeCollection*) _tmp59_); + _tmp60_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp59_); _tmp61_ = _tmp60_; if (_tmp61_ > 0) { GeeHashMap* _tmp62_; @@ -7426,7 +7504,7 @@ goto __catch20_g_error; } _data_->_tmp33_ = _data_->personas; - _data_->_tmp34_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp33_); + _data_->_tmp34_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp33_); _data_->_tmp35_ = _data_->_tmp34_; if (_data_->_tmp35_ == 0) { _data_->result = NULL; @@ -7443,7 +7521,7 @@ return FALSE; } else { _data_->_tmp36_ = _data_->personas; - _data_->_tmp37_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp36_); + _data_->_tmp37_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp36_); _data_->_tmp38_ = _data_->_tmp37_; if (_data_->_tmp38_ == 1) { _data_->persona = NULL; @@ -7507,7 +7585,7 @@ return FALSE; } else { _data_->_tmp58_ = _data_->personas; - _data_->_tmp59_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp58_); + _data_->_tmp59_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp58_); _data_->_tmp60_ = _data_->_tmp59_; _data_->num_personas = _data_->_tmp60_; _data_->_tmp61_ = _data_->num_personas; @@ -7663,33 +7741,58 @@ return FALSE; } } - { - _data_->_tmp3_ = _data_->persona; - _data_->_tmp4_ = tpf_persona_get_contact (TPF_PERSONA (_data_->_tmp3_)); - _data_->_tmp5_ = _data_->_tmp4_; + _data_->_tmp3_ = _data_->persona; + _data_->_tmp4_ = tpf_persona_get_contact (TPF_PERSONA (_data_->_tmp3_)); + _data_->_tmp5_ = _data_->_tmp4_; + if (_data_->_tmp5_ == NULL) { _data_->_tmp6_ = NULL; - _data_->_tmp6_ = tp_contact_get_identifier (_data_->_tmp5_); - _data_->id = _data_->_tmp6_; - _data_->_tmp7_ = _data_->is_favourite; - if (_data_->_tmp7_) { - _data_->_tmp8_ = _data_->self->priv->_logger; - _data_->_tmp9_ = _data_->id; + _data_->_tmp6_ = _ ("Failed to change favorite status of Telepathy Persona because it has n" \ +"o attached TpContact."); + _data_->_tmp7_ = g_error_new_literal (FOLKS_PROPERTY_ERROR, FOLKS_PROPERTY_ERROR_INVALID_VALUE, _data_->_tmp6_); + _data_->_inner_error_ = _data_->_tmp7_; + if (_data_->_inner_error_->domain == FOLKS_PROPERTY_ERROR) { + g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); + g_error_free (_data_->_inner_error_); + if (_data_->_state_ == 0) { + g_simple_async_result_complete_in_idle (_data_->_async_result); + } else { + g_simple_async_result_complete (_data_->_async_result); + } + g_object_unref (_data_->_async_result); + return FALSE; + } else { + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); + g_clear_error (&_data_->_inner_error_); + return FALSE; + } + } + { + _data_->_tmp8_ = _data_->persona; + _data_->_tmp9_ = tpf_persona_get_contact (TPF_PERSONA (_data_->_tmp8_)); + _data_->_tmp10_ = _data_->_tmp9_; + _data_->_tmp11_ = NULL; + _data_->_tmp11_ = tp_contact_get_identifier (_data_->_tmp10_); + _data_->id = _data_->_tmp11_; + _data_->_tmp12_ = _data_->is_favourite; + if (_data_->_tmp12_) { + _data_->_tmp13_ = _data_->self->priv->_logger; + _data_->_tmp14_ = _data_->id; _data_->_state_ = 1; - logger_add_favourite_contact (_data_->_tmp8_, _data_->_tmp9_, tpf_persona_store_change_is_favourite_ready, _data_); + logger_add_favourite_contact (_data_->_tmp13_, _data_->_tmp14_, tpf_persona_store_change_is_favourite_ready, _data_); return FALSE; _state_1: - logger_add_favourite_contact_finish (_data_->_tmp8_, _data_->_res_, &_data_->_inner_error_); + logger_add_favourite_contact_finish (_data_->_tmp13_, _data_->_res_, &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { goto __catch21_g_error; } } else { - _data_->_tmp10_ = _data_->self->priv->_logger; - _data_->_tmp11_ = _data_->id; + _data_->_tmp15_ = _data_->self->priv->_logger; + _data_->_tmp16_ = _data_->id; _data_->_state_ = 2; - logger_remove_favourite_contact (_data_->_tmp10_, _data_->_tmp11_, tpf_persona_store_change_is_favourite_ready, _data_); + logger_remove_favourite_contact (_data_->_tmp15_, _data_->_tmp16_, tpf_persona_store_change_is_favourite_ready, _data_); return FALSE; _state_2: - logger_remove_favourite_contact_finish (_data_->_tmp10_, _data_->_res_, &_data_->_inner_error_); + logger_remove_favourite_contact_finish (_data_->_tmp15_, _data_->_res_, &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { goto __catch21_g_error; } @@ -7700,15 +7803,15 @@ { _data_->e = _data_->_inner_error_; _data_->_inner_error_ = NULL; - _data_->_tmp12_ = NULL; - _data_->_tmp12_ = _ ("Failed to change favorite status for Telepathy contact ‘%s’."); - _data_->_tmp13_ = _data_->persona; - _data_->_tmp14_ = tpf_persona_get_contact (TPF_PERSONA (_data_->_tmp13_)); - _data_->_tmp15_ = _data_->_tmp14_; - _data_->_tmp16_ = tp_contact_get_identifier (_data_->_tmp15_); - _data_->_tmp17_ = _data_->_tmp16_; - _data_->_tmp18_ = g_error_new (FOLKS_PROPERTY_ERROR, FOLKS_PROPERTY_ERROR_UNKNOWN_ERROR, _data_->_tmp12_, _data_->_tmp17_); - _data_->_inner_error_ = _data_->_tmp18_; + _data_->_tmp17_ = NULL; + _data_->_tmp17_ = _ ("Failed to change favorite status for Telepathy contact ‘%s’."); + _data_->_tmp18_ = _data_->persona; + _data_->_tmp19_ = tpf_persona_get_contact (TPF_PERSONA (_data_->_tmp18_)); + _data_->_tmp20_ = _data_->_tmp19_; + _data_->_tmp21_ = tp_contact_get_identifier (_data_->_tmp20_); + _data_->_tmp22_ = _data_->_tmp21_; + _data_->_tmp23_ = g_error_new (FOLKS_PROPERTY_ERROR, FOLKS_PROPERTY_ERROR_UNKNOWN_ERROR, _data_->_tmp17_, _data_->_tmp22_); + _data_->_inner_error_ = _data_->_tmp23_; _g_error_free0 (_data_->e); goto __finally21; } @@ -7756,7 +7859,7 @@ TpfPersona* _tmp1_; TpfPersona* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; _data_ = g_slice_new0 (TpfPersonaStoreChangeAliasData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, tpf_persona_store_change_alias); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, tpf_persona_store_change_alias_data_free); @@ -7793,18 +7896,33 @@ _data_->_tmp1_ = _data_->persona; _data_->_tmp2_ = tpf_persona_get_contact (_data_->_tmp1_); _data_->_tmp3_ = _data_->_tmp2_; - _data_->_tmp4_ = tp_contact_get_handle (_data_->_tmp3_); - _data_->_tmp5_ = _data_->_tmp4_; - _data_->_tmp6_ = _data_->alias; - g_debug ("tpf-persona-store.vala:2283: Changing alias of persona %u to '%s'.", _data_->_tmp5_, _data_->_tmp6_); - _data_->_tmp7_ = _data_->self->priv->_conn; - _data_->_tmp8_ = _data_->persona; - _data_->_tmp9_ = tpf_persona_get_contact (_data_->_tmp8_); + if (_data_->_tmp3_ == NULL) { + _data_->_tmp4_ = _data_->persona; + _data_->_tmp5_ = _data_->alias; + g_warning ("Skipping Tpf.Persona %p alias change to '%s' because it " "has no attached TpContact", _data_->_tmp4_, _data_->_tmp5_); + if (_data_->_state_ == 0) { + g_simple_async_result_complete_in_idle (_data_->_async_result); + } else { + g_simple_async_result_complete (_data_->_async_result); + } + g_object_unref (_data_->_async_result); + return FALSE; + } + _data_->_tmp6_ = _data_->persona; + _data_->_tmp7_ = tpf_persona_get_contact (_data_->_tmp6_); + _data_->_tmp8_ = _data_->_tmp7_; + _data_->_tmp9_ = tp_contact_get_handle (_data_->_tmp8_); _data_->_tmp10_ = _data_->_tmp9_; - _data_->_tmp11_ = tp_contact_get_handle (_data_->_tmp10_); - _data_->_tmp12_ = _data_->_tmp11_; - _data_->_tmp13_ = _data_->alias; - folks_tp_lowlevel_connection_set_contact_alias (_data_->_tmp7_, (guint) ((TpHandle) _data_->_tmp12_), _data_->_tmp13_); + _data_->_tmp11_ = _data_->alias; + g_debug ("tpf-persona-store.vala:2328: Changing alias of persona %u to '%s'.", _data_->_tmp10_, _data_->_tmp11_); + _data_->_tmp12_ = _data_->self->priv->_conn; + _data_->_tmp13_ = _data_->persona; + _data_->_tmp14_ = tpf_persona_get_contact (_data_->_tmp13_); + _data_->_tmp15_ = _data_->_tmp14_; + _data_->_tmp16_ = tp_contact_get_handle (_data_->_tmp15_); + _data_->_tmp17_ = _data_->_tmp16_; + _data_->_tmp18_ = _data_->alias; + folks_tp_lowlevel_connection_set_contact_alias (_data_->_tmp12_, (guint) ((TpHandle) _data_->_tmp17_), _data_->_tmp18_); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); } else { @@ -7995,7 +8113,7 @@ TpfPersona* _tmp1_; TpfPersona* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; _data_ = g_slice_new0 (TpfPersonaStoreChangeUserFullNameData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, tpf_persona_store_change_user_full_name); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, tpf_persona_store_change_user_full_name_data_free); @@ -8126,7 +8244,7 @@ GeeSet* _tmp3_; GeeSet* _tmp4_; const gchar* _tmp5_; - const gchar* _tmp6_; + gchar* _tmp6_; _data_ = g_slice_new0 (TpfPersonaStoreChangeUserDetailsData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _tpf_persona_store_change_user_details); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _tpf_persona_store_change_user_details_data_free); @@ -8706,7 +8824,7 @@ _tmp1_ = store; _tmp2_ = folks_persona_store_get_id ((FolksPersonaStore*) _tmp1_); _tmp3_ = _tmp2_; - g_debug ("tpf-persona-store.vala:2464: Adding PersonaStore %p ('%s') to map.", _tmp0_, _tmp3_); + g_debug ("tpf-persona-store.vala:2509: Adding PersonaStore %p ('%s') to map.", _tmp0_, _tmp3_); { GeeHashMap* _tmp4_; _tmp4_ = tpf_persona_store__persona_stores_by_account; @@ -8780,7 +8898,7 @@ _tmp1_ = store; _tmp2_ = folks_persona_store_get_id ((FolksPersonaStore*) _tmp1_); _tmp3_ = _tmp2_; - g_debug ("tpf-persona-store.vala:2488: Removing PersonaStore %p ('%s') from map.", _tmp0_, _tmp3_); + g_debug ("tpf-persona-store.vala:2533: Removing PersonaStore %p ('%s') from map.", _tmp0_, _tmp3_); { GeeHashMap* _tmp4_; _tmp4_ = tpf_persona_store__persona_stores_by_account; @@ -8823,7 +8941,7 @@ g_signal_parse_name ("removed", FOLKS_TYPE_PERSONA_STORE, &_tmp15_, NULL, FALSE); g_signal_handlers_disconnect_matched ((FolksPersonaStore*) _tmp14_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp15_, 0, NULL, (GCallback) __tpf_persona_store_store_removed_cb_folks_persona_store_removed, NULL); _tmp16_ = tpf_persona_store__persona_stores_by_account; - _tmp17_ = gee_map_get_size ((GeeMap*) _tmp16_); + _tmp17_ = gee_abstract_map_get_size ((GeeMap*) _tmp16_); _tmp18_ = _tmp17_; if (_tmp18_ == 0) { _g_object_unref0 (tpf_persona_store__persona_stores_by_account_ro); @@ -8869,7 +8987,7 @@ g_return_val_if_fail (account != NULL, NULL); store = NULL; _tmp0_ = account; - g_debug ("tpf-persona-store.vala:2530: Tpf.PersonaStore.dup_for_account (%p):", _tmp0_); + g_debug ("tpf-persona-store.vala:2575: Tpf.PersonaStore.dup_for_account (%p):", _tmp0_); { GeeHashMap* _tmp1_; _tmp1_ = tpf_persona_store__persona_stores_by_account; @@ -8894,7 +9012,7 @@ if (_tmp7_ == NULL) { TpAccount* _tmp8_; TpfPersonaStore* _tmp9_; - g_debug ("tpf-persona-store.vala:2546: Creating new PersonaStore."); + g_debug ("tpf-persona-store.vala:2591: Creating new PersonaStore."); _tmp8_ = account; _tmp9_ = tpf_persona_store_new (_tmp8_); _g_object_unref0 (store); @@ -8908,7 +9026,7 @@ _tmp11_ = store; _tmp12_ = folks_persona_store_get_id ((FolksPersonaStore*) _tmp11_); _tmp13_ = _tmp12_; - g_debug ("tpf-persona-store.vala:2551: Found existing PersonaStore %p ('%s')" \ + g_debug ("tpf-persona-store.vala:2596: Found existing PersonaStore %p ('%s')" \ ".", _tmp10_, _tmp13_); } } @@ -9120,7 +9238,7 @@ _tmp0_ = folks_persona_store_get_id ((FolksPersonaStore*) self); _tmp1_ = _tmp0_; _tmp2_ = self->priv->_account; - g_debug ("tpf-persona-store.vala:258: Creating new Tpf.PersonaStore %p ('%s') fo" \ + g_debug ("tpf-persona-store.vala:261: Creating new Tpf.PersonaStore %p ('%s') fo" \ "r TpAccount %p.", self, _tmp1_, _tmp2_); _tmp3_ = folks_debug_dup (); _g_object_unref0 (self->priv->_debug); @@ -9181,7 +9299,7 @@ * * See {@link Folks.PersonaStore.type_id}. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_TYPE_ID, "type-id"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_TYPE_ID, g_param_spec_string ("type-id", "type-id", "type-id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can add {@link Folks.Persona}s. * @@ -9189,7 +9307,7 @@ * * @since 0.3.1 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_CAN_ADD_PERSONAS, "can-add-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_CAN_ADD_PERSONAS, g_param_spec_enum ("can-add-personas", "can-add-personas", "can-add-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can set the alias of {@link Folks.Persona}s. * @@ -9197,7 +9315,7 @@ * * @since 0.3.1 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_CAN_ALIAS_PERSONAS, "can-alias-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_CAN_ALIAS_PERSONAS, g_param_spec_enum ("can-alias-personas", "can-alias-personas", "can-alias-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can set the groups of {@link Folks.Persona}s. * @@ -9205,7 +9323,7 @@ * * @since 0.3.1 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_CAN_GROUP_PERSONAS, "can-group-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_CAN_GROUP_PERSONAS, g_param_spec_enum ("can-group-personas", "can-group-personas", "can-group-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can remove {@link Folks.Persona}s. * @@ -9213,7 +9331,7 @@ * * @since 0.3.1 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_CAN_REMOVE_PERSONAS, "can-remove-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_CAN_REMOVE_PERSONAS, g_param_spec_enum ("can-remove-personas", "can-remove-personas", "can-remove-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore has been prepared. * @@ -9221,20 +9339,20 @@ * * @since 0.3.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_IS_PREPARED, "is-prepared"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_IS_PREPARED, g_param_spec_boolean ("is-prepared", "is-prepared", "is-prepared", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} * * @since 0.6.2 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_ALWAYS_WRITEABLE_PROPERTIES, "always-writeable-properties"); - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_IS_QUIESCENT, "is-quiescent"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_ALWAYS_WRITEABLE_PROPERTIES, g_param_spec_boxed ("always-writeable-properties", "always-writeable-properties", "always-writeable-properties", G_TYPE_STRV, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_IS_QUIESCENT, g_param_spec_boolean ("is-quiescent", "is-quiescent", "is-quiescent", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * The {@link Persona}s exposed by this PersonaStore. * * See {@link Folks.PersonaStore.personas}. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_PERSONAS, "personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_PERSONAS, g_param_spec_object ("personas", "personas", "personas", GEE_TYPE_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); g_object_class_install_property (G_OBJECT_CLASS (klass), TPF_PERSONA_STORE_SUPPORTED_FIELDS, g_param_spec_object ("supported-fields", "supported-fields", "supported-fields", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); g_signal_new ("group_members_changed", TPF_TYPE_PERSONA_STORE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_POINTER_POINTER, G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_POINTER); g_signal_new ("group_removed", TPF_TYPE_PERSONA_STORE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_POINTER, G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_POINTER); @@ -9305,7 +9423,7 @@ self = TPF_PERSONA_STORE (obj); _tmp0_ = folks_persona_store_get_id ((FolksPersonaStore*) self); _tmp1_ = _tmp0_; - g_debug ("tpf-persona-store.vala:275: Destroying Tpf.PersonaStore %p ('%s').", self, _tmp1_); + g_debug ("tpf-persona-store.vala:278: Destroying Tpf.PersonaStore %p ('%s').", self, _tmp1_); _tpf_persona_store_remove_store_from_map (self); _tmp2_ = self->priv->_debug; g_signal_parse_name ("print-status", FOLKS_TYPE_DEBUG, &_tmp3_, NULL, FALSE); @@ -9324,7 +9442,7 @@ _g_object_unref0 (self->priv->_personas_ro); _g_object_unref0 (self->priv->_persona_set); _g_object_unref0 (self->priv->_handle_persona_map); - _g_object_unref0 (self->priv->_weakly_referenced_personas); + _g_object_unref0 (self->priv->_weakly_referenced_contacts); _g_object_unref0 (self->priv->_channel_group_personas_map); _g_object_unref0 (self->priv->_channel_group_incoming_adds); _g_object_unref0 (self->priv->_group_outgoing_adds); diff -Nru folks-0.6.6/backends/telepathy/lib/tpf-persona-store-cache.c folks-0.6.7/backends/telepathy/lib/tpf-persona-store-cache.c --- folks-0.6.6/backends/telepathy/lib/tpf-persona-store-cache.c 2011-12-13 23:39:56.000000000 +0000 +++ folks-0.6.7/backends/telepathy/lib/tpf-persona-store-cache.c 2012-02-23 00:01:57.000000000 +0000 @@ -1,4 +1,4 @@ -/* tpf-persona-store-cache.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* tpf-persona-store-cache.c generated by valac 0.15.1, the Vala compiler * generated from tpf-persona-store-cache.vala, do not modify */ /* @@ -1429,10 +1429,12 @@ static void block2_data_unref (Block2Data* _data2_) { if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { - _g_object_unref0 (_data2_->self); + TpfPersonaStoreCache * self; + self = _data2_->self; _g_object_unref0 (_data2_->url_set); _g_object_unref0 (_data2_->phone_number_set); _g_object_unref0 (_data2_->email_address_set); + _g_object_unref0 (self); g_slice_free (Block2Data, _data2_); } } diff -Nru folks-0.6.6/backends/telepathy/lib/tpf-persona-store.vala folks-0.6.7/backends/telepathy/lib/tpf-persona-store.vala --- folks-0.6.6/backends/telepathy/lib/tpf-persona-store.vala 2011-12-13 23:35:55.000000000 +0000 +++ folks-0.6.7/backends/telepathy/lib/tpf-persona-store.vala 2012-02-17 23:07:32.000000000 +0000 @@ -78,7 +78,10 @@ private HashSet _persona_set; /* universal, contact owner handles (not channel-specific) */ private HashMap _handle_persona_map; - private HashSet _weakly_referenced_personas; + /* Map from weakly-referenced TpContacts to their original TpHandles; + * necessary because the handles get set to 0 before our weak_notify callback + * is called, and we need the handle to remove the contact. */ + private HashMap _weakly_referenced_contacts; private HashMap> _channel_group_personas_map; private HashMap> _channel_group_incoming_adds; private HashMap> _group_outgoing_adds; @@ -517,18 +520,18 @@ this._conn = null; } - if (this._weakly_referenced_personas != null) + if (this._weakly_referenced_contacts != null) { - foreach (var p in this._weakly_referenced_personas) + var iter = this._weakly_referenced_contacts.map_iterator (); + while (iter.next () == true) { - if (p.contact != null) - { - p.contact.weak_unref (this._contact_weak_notify_cb); - } + var contact = iter.get_key (); + contact.weak_unref (this._contact_weak_notify_cb); } } - this._weakly_referenced_personas = new HashSet (); + this._weakly_referenced_contacts = + new HashMap (); this._handle_persona_map = new HashMap (); this._channel_group_personas_map = @@ -1080,6 +1083,7 @@ { foreach (var p in cached_personas) { + this._personas.set (p.iid, p); this._persona_set.add (p); } } @@ -1230,7 +1234,10 @@ /* Translators: the parameter is a persona identifier and * the second parameter is a group name. */ warning (_("Failed to add Telepathy contact ‘%s’ to group ‘%s’."), - persona.contact.identifier, group); + persona.contact != null ? + persona.contact.identifier : + "(nil)", + group); } else { @@ -1238,7 +1245,11 @@ /* Translators: the parameter is a persona identifier * and the second parameter is a group name. */ _("Failed to remove Telepathy contact ‘%s’ from group ‘%s’."), - persona.contact.identifier, group); + + persona.contact != null ? + persona.contact.identifier : + "(nil)", + group); } } } @@ -1554,8 +1565,8 @@ return; /* If we hold a weak ref. on the persona's TpContact, release that. */ - if (this._weakly_referenced_personas.remove (persona) == true && - persona.contact != null) + if (persona.contact != null && + this._weakly_referenced_contacts.unset (persona.contact) == true) { persona.contact.weak_unref (this._contact_weak_notify_cb); } @@ -1602,6 +1613,13 @@ _("Telepathy contacts representing the local user may not be removed.")); } + if (tp_persona.contact == null) + { + warning ("Skipping server-side removal of Tpf.Persona %p because " + + "it has no attached TpContact", tp_persona); + return; + } + try { FolksTpLowlevel.channel_group_change_membership (this._stored, @@ -1794,6 +1812,13 @@ { var tp_persona = (Tpf.Persona) persona; + if (tp_persona.contact == null) + { + warning ("Skipping Tpf.Persona %p contact list change because it " + + "has no attached TpContact", tp_persona); + return; + } + try { FolksTpLowlevel.channel_group_change_membership (channel, @@ -1960,8 +1985,15 @@ private void _contact_weak_notify_cb (Object obj) { var c = obj as Contact; - this._ignore_by_handle (c.get_handle (), null, null, - GroupDetails.ChangeReason.NONE); + if (this._weakly_referenced_contacts != null) + { + Handle handle = this._weakly_referenced_contacts.get (c); + if (handle != 0) + { + this._ignore_by_handle ((!) handle, null, null, + GroupDetails.ChangeReason.NONE); + } + } } internal Tpf.Persona? _ensure_persona_from_contact (Contact contact) @@ -1998,7 +2030,7 @@ /* Weak ref. on the contact. */ contact.weak_ref (this._contact_weak_notify_cb); - this._weakly_referenced_personas.add (persona); + this._weakly_referenced_contacts.set (contact, handle); /* Signal the addition of the new persona. */ var personas = new HashSet (); @@ -2252,6 +2284,12 @@ _("Failed to change favorite without a connection to the telepathy-logger service.")); } + if (((Tpf.Persona) persona).contact == null) + { + throw new PropertyError.INVALID_VALUE ( + _("Failed to change favorite status of Telepathy Persona because it has no attached TpContact.")); + } + try { /* Add or remove the persona to the list of favourites as @@ -2280,6 +2318,13 @@ alias = ""; } + if (persona.contact == null) + { + warning ("Skipping Tpf.Persona %p alias change to '%s' because it " + + "has no attached TpContact", persona, alias); + return; + } + debug ("Changing alias of persona %u to '%s'.", persona.contact.handle, alias); FolksTpLowlevel.connection_set_contact_alias (this._conn, diff -Nru folks-0.6.6/backends/telepathy/lib/tpf-persona.vala folks-0.6.7/backends/telepathy/lib/tpf-persona.vala --- folks-0.6.6/backends/telepathy/lib/tpf-persona.vala 2011-12-13 23:35:55.000000000 +0000 +++ folks-0.6.7/backends/telepathy/lib/tpf-persona.vala 2012-02-17 23:07:32.000000000 +0000 @@ -228,7 +228,7 @@ * * See {@link Folks.PresenceDetails.presence_type}. */ - public Folks.PresenceType presence_type { get; private set; } + public Folks.PresenceType presence_type { get; set; } /** * The Persona's presence status. @@ -237,14 +237,14 @@ * * @since 0.6.0 */ - public string presence_status { get; private set; } + public string presence_status { get; set; } /** * The Persona's presence message. * * See {@link Folks.PresenceDetails.presence_message}. */ - public string presence_message { get; private set; } + public string presence_message { get; set; } /** * The names of the Persona's linkable properties. diff -Nru folks-0.6.6/backends/telepathy/lib/tp-lowlevel.c folks-0.6.7/backends/telepathy/lib/tp-lowlevel.c --- folks-0.6.6/backends/telepathy/lib/tp-lowlevel.c 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/backends/telepathy/lib/tp-lowlevel.c 2011-12-22 18:18:11.000000000 +0000 @@ -19,6 +19,10 @@ * Xavier Claessens */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include diff -Nru folks-0.6.6/backends/telepathy/lib/tp-lowlevel.vapi folks-0.6.7/backends/telepathy/lib/tp-lowlevel.vapi --- folks-0.6.6/backends/telepathy/lib/tp-lowlevel.vapi 2011-12-13 23:39:54.000000000 +0000 +++ folks-0.6.7/backends/telepathy/lib/tp-lowlevel.vapi 2012-02-23 00:01:56.000000000 +0000 @@ -5,8 +5,7 @@ [CCode (cheader_filename = "tp-lowlevel.h", cprefix = "FOLKS_TP_LOWLEVEL_ERROR_INVALID_")] public errordomain Error { [CCode (cname = "FOLKS_TP_LOWLEVEL_ERROR_INVALID_ARGUMENT")] - ERROR_INVALID_ARGUMENT; - public static GLib.Quark quark (); + ERROR_INVALID_ARGUMENT } [CCode (cheader_filename = "tp-lowlevel.h", instance_pos = 2.9)] public delegate void NewGroupChannelsCallback (TelepathyGLib.Channel? channel, GLib.AsyncResult result); @@ -28,4 +27,6 @@ public static async unowned TelepathyGLib.Channel connection_open_contact_list_channel_async (TelepathyGLib.Connection conn, string name) throws GLib.Error; [CCode (cheader_filename = "tp-lowlevel.h")] public static void connection_set_contact_alias (TelepathyGLib.Connection conn, uint handle, string alias); + [CCode (cheader_filename = "tp-lowlevel.h")] + public static GLib.Quark error_quark (); } diff -Nru folks-0.6.6/backends/telepathy/Makefile.am folks-0.6.7/backends/telepathy/Makefile.am --- folks-0.6.6/backends/telepathy/Makefile.am 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/backends/telepathy/Makefile.am 2012-01-12 17:25:24.000000000 +0000 @@ -2,17 +2,8 @@ BACKEND_NAME = "telepathy" -AM_CPPFLAGS = \ - -I$(top_srcdir)/folks \ - -I$(top_srcdir)/backends/telepathy/lib \ - -I$(top_srcdir)/backends/telepathy/lib/folks \ - -include $(CONFIG_HEADER) \ - -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ - -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ - -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ - $(NULL) - VALAFLAGS += \ + $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ --vapidir=. \ --vapidir=$(top_builddir)/backends/telepathy/lib \ @@ -37,7 +28,19 @@ telepathy-glib \ $(NULL) +telepathy_la_CPPFLAGS = \ + -I$(top_srcdir)/folks \ + -I$(top_srcdir)/backends/telepathy/lib \ + -I$(top_srcdir)/backends/telepathy/lib/folks \ + -include $(CONFIG_HEADER) \ + -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ + -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ + -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ + $(NULL) + telepathy_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ @@ -45,6 +48,7 @@ $(NULL) telepathy_la_LIBADD = \ + $(AM_LIBADD) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ @@ -53,7 +57,14 @@ lib/libfolks-telepathy.la \ $(NULL) -telepathy_la_LDFLAGS = -shared -fPIC -module -avoid-version +telepathy_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ + -shared \ + -fPIC \ + -module \ + -avoid-version \ + $(NULL) GITIGNOREFILES = \ folks-backend-telepathy.vapi \ diff -Nru folks-0.6.6/backends/telepathy/Makefile.in folks-0.6.7/backends/telepathy/Makefile.in --- folks-0.6.6/backends/telepathy/Makefile.in 2011-12-13 23:38:38.000000000 +0000 +++ folks-0.6.7/backends/telepathy/Makefile.in 2012-02-23 00:04:11.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,10 +39,11 @@ telepathy_la_vala.stamp tp-backend-factory.c tp-backend.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -70,6 +71,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(backenddir)" LTLIBRARIES = $(backend_LTLIBRARIES) am__DEPENDENCIES_1 = @@ -182,6 +189,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -291,7 +300,7 @@ VALADOC = @VALADOC@ VALADOC_CFLAGS = @VALADOC_CFLAGS@ VALADOC_LIBS = @VALADOC_LIBS@ -VALAFLAGS = @VALAFLAGS@ $(ERROR_VALAFLAGS) --vapidir=. \ +VALAFLAGS = @VALAFLAGS@ $(AM_VALAFLAGS) $(ERROR_VALAFLAGS) --vapidir=. \ --vapidir=$(top_builddir)/backends/telepathy/lib \ --vapidir=$(top_srcdir)/folks $(addprefix --pkg \ ,$(telepathy_deps)) $(NULL) @@ -354,16 +363,6 @@ top_srcdir = @top_srcdir@ SUBDIRS = lib BACKEND_NAME = "telepathy" -AM_CPPFLAGS = \ - -I$(top_srcdir)/folks \ - -I$(top_srcdir)/backends/telepathy/lib \ - -I$(top_srcdir)/backends/telepathy/lib/folks \ - -include $(CONFIG_HEADER) \ - -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ - -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ - -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ - $(NULL) - backenddir = $(BACKEND_DIR)/telepathy backend_LTLIBRARIES = telepathy.la telepathy_la_SOURCES = \ @@ -380,7 +379,19 @@ telepathy-glib \ $(NULL) +telepathy_la_CPPFLAGS = \ + -I$(top_srcdir)/folks \ + -I$(top_srcdir)/backends/telepathy/lib \ + -I$(top_srcdir)/backends/telepathy/lib/folks \ + -include $(CONFIG_HEADER) \ + -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ + -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ + -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ + $(NULL) + telepathy_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ @@ -388,6 +399,7 @@ $(NULL) telepathy_la_LIBADD = \ + $(AM_LIBADD) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ @@ -396,7 +408,15 @@ lib/libfolks-telepathy.la \ $(NULL) -telepathy_la_LDFLAGS = -shared -fPIC -module -avoid-version +telepathy_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ + -shared \ + -fPIC \ + -module \ + -avoid-version \ + $(NULL) + GITIGNOREFILES = \ folks-backend-telepathy.vapi \ $(telepathy_la_SOURCES:.vala=.c) \ @@ -483,50 +503,45 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< telepathy_la-tp-backend.lo: tp-backend.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(telepathy_la_CFLAGS) $(CFLAGS) -MT telepathy_la-tp-backend.lo -MD -MP -MF $(DEPDIR)/telepathy_la-tp-backend.Tpo -c -o telepathy_la-tp-backend.lo `test -f 'tp-backend.c' || echo '$(srcdir)/'`tp-backend.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(telepathy_la_CPPFLAGS) $(CPPFLAGS) $(telepathy_la_CFLAGS) $(CFLAGS) -MT telepathy_la-tp-backend.lo -MD -MP -MF $(DEPDIR)/telepathy_la-tp-backend.Tpo -c -o telepathy_la-tp-backend.lo `test -f 'tp-backend.c' || echo '$(srcdir)/'`tp-backend.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/telepathy_la-tp-backend.Tpo $(DEPDIR)/telepathy_la-tp-backend.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tp-backend.c' object='telepathy_la-tp-backend.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tp-backend.c' object='telepathy_la-tp-backend.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(telepathy_la_CFLAGS) $(CFLAGS) -c -o telepathy_la-tp-backend.lo `test -f 'tp-backend.c' || echo '$(srcdir)/'`tp-backend.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(telepathy_la_CPPFLAGS) $(CPPFLAGS) $(telepathy_la_CFLAGS) $(CFLAGS) -c -o telepathy_la-tp-backend.lo `test -f 'tp-backend.c' || echo '$(srcdir)/'`tp-backend.c telepathy_la-tp-backend-factory.lo: tp-backend-factory.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(telepathy_la_CFLAGS) $(CFLAGS) -MT telepathy_la-tp-backend-factory.lo -MD -MP -MF $(DEPDIR)/telepathy_la-tp-backend-factory.Tpo -c -o telepathy_la-tp-backend-factory.lo `test -f 'tp-backend-factory.c' || echo '$(srcdir)/'`tp-backend-factory.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(telepathy_la_CPPFLAGS) $(CPPFLAGS) $(telepathy_la_CFLAGS) $(CFLAGS) -MT telepathy_la-tp-backend-factory.lo -MD -MP -MF $(DEPDIR)/telepathy_la-tp-backend-factory.Tpo -c -o telepathy_la-tp-backend-factory.lo `test -f 'tp-backend-factory.c' || echo '$(srcdir)/'`tp-backend-factory.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/telepathy_la-tp-backend-factory.Tpo $(DEPDIR)/telepathy_la-tp-backend-factory.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tp-backend-factory.c' object='telepathy_la-tp-backend-factory.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tp-backend-factory.c' object='telepathy_la-tp-backend-factory.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(telepathy_la_CFLAGS) $(CFLAGS) -c -o telepathy_la-tp-backend-factory.lo `test -f 'tp-backend-factory.c' || echo '$(srcdir)/'`tp-backend-factory.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(telepathy_la_CPPFLAGS) $(CPPFLAGS) $(telepathy_la_CFLAGS) $(CFLAGS) -c -o telepathy_la-tp-backend-factory.lo `test -f 'tp-backend-factory.c' || echo '$(srcdir)/'`tp-backend-factory.c $(srcdir)/tp-backend.c: $(srcdir)/telepathy_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/telepathy_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/telepathy_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) telepathy_la_vala.stamp; \ fi $(srcdir)/tp-backend-factory.c: $(srcdir)/telepathy_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/telepathy_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/telepathy_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) telepathy_la_vala.stamp; \ fi telepathy_la_vala.stamp: $(telepathy_la_SOURCES) @@ -750,10 +765,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/backends/telepathy/tp-backend.c folks-0.6.7/backends/telepathy/tp-backend.c --- folks-0.6.6/backends/telepathy/tp-backend.c 2011-12-13 23:40:06.000000000 +0000 +++ folks-0.6.7/backends/telepathy/tp-backend.c 2012-02-23 00:02:00.000000000 +0000 @@ -1,4 +1,4 @@ -/* tp-backend.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* tp-backend.c generated by valac 0.15.1, the Vala compiler * generated from tp-backend.vala, do not modify */ /* @@ -557,11 +557,11 @@ /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_TP_BACKEND_NAME, "name"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_TP_BACKEND_NAME, g_param_spec_string ("name", "name", "name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_TP_BACKEND_PERSONA_STORES, "persona-stores"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_TP_BACKEND_PERSONA_STORES, g_param_spec_object ("persona-stores", "persona-stores", "persona-stores", GEE_TYPE_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this Backend has been prepared. * @@ -569,7 +569,7 @@ * * @since 0.3.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_TP_BACKEND_IS_PREPARED, "is-prepared"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_TP_BACKEND_IS_PREPARED, g_param_spec_boolean ("is-prepared", "is-prepared", "is-prepared", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this Backend has reached a quiescent state. * @@ -577,7 +577,7 @@ * * @since 0.6.2 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_TP_BACKEND_IS_QUIESCENT, "is-quiescent"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_TP_BACKEND_IS_QUIESCENT, g_param_spec_boolean ("is-quiescent", "is-quiescent", "is-quiescent", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); } diff -Nru folks-0.6.6/backends/telepathy/tp-backend-factory.c folks-0.6.7/backends/telepathy/tp-backend-factory.c --- folks-0.6.6/backends/telepathy/tp-backend-factory.c 2011-12-13 23:40:06.000000000 +0000 +++ folks-0.6.7/backends/telepathy/tp-backend-factory.c 2012-02-23 00:02:00.000000000 +0000 @@ -1,4 +1,4 @@ -/* tp-backend-factory.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* tp-backend-factory.c generated by valac 0.15.1, the Vala compiler * generated from tp-backend-factory.vala, do not modify */ /* diff -Nru folks-0.6.6/backends/tracker/lib/folks/folks-tracker.h folks-0.6.7/backends/tracker/lib/folks/folks-tracker.h --- folks-0.6.6/backends/tracker/lib/folks/folks-tracker.h 2011-12-13 23:40:21.000000000 +0000 +++ folks-0.6.7/backends/tracker/lib/folks/folks-tracker.h 2012-02-23 00:02:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* folks-tracker.h generated by valac 0.14.0.50-58097f, the Vala compiler, do not modify */ +/* folks-tracker.h generated by valac 0.15.1, the Vala compiler, do not modify */ #ifndef __FOLKS_FOLKS_TRACKER_H__ diff -Nru folks-0.6.6/backends/tracker/lib/folks-tracker.vapi folks-0.6.7/backends/tracker/lib/folks-tracker.vapi --- folks-0.6.6/backends/tracker/lib/folks-tracker.vapi 2011-12-13 23:40:21.000000000 +0000 +++ folks-0.6.7/backends/tracker/lib/folks-tracker.vapi 2012-02-23 00:02:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* folks-tracker.vapi generated by valac 0.14.0.50-58097f, do not modify. */ +/* folks-tracker.vapi generated by valac 0.15.1, do not modify. */ namespace Trf { [CCode (cheader_filename = "folks/folks-tracker.h")] diff -Nru folks-0.6.6/backends/tracker/lib/Makefile.am folks-0.6.7/backends/tracker/lib/Makefile.am --- folks-0.6.6/backends/tracker/lib/Makefile.am 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/backends/tracker/lib/Makefile.am 2012-01-12 17:25:24.000000000 +0000 @@ -1,24 +1,8 @@ BACKEND_NAME = "tracker" -AM_CPPFLAGS = \ - -I$(top_srcdir)/folks \ - -include $(CONFIG_HEADER) \ - -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ - -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ - -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ - $(NULL) - -VAPIGENFLAGS += \ - --vapidir=. \ - --vapidir=$(top_srcdir)/folks - folks_trackerdir = $(libdir) folks_tracker_LTLIBRARIES = libfolks-tracker.la -################################################################## -# Support library -################################################################## - pkgconfig_in = folks-tracker.pc.in pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(pkgconfig_in:.in=) @@ -36,6 +20,7 @@ $(NULL) libfolks_tracker_la_VALAFLAGS = \ + $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ --vapidir=. \ --vapidir=$(top_srcdir)/folks \ @@ -57,7 +42,17 @@ tracker-sparql-0.12 \ $(NULL) +libfolks_tracker_la_CPPFLAGS = \ + -I$(top_srcdir)/folks \ + -include $(CONFIG_HEADER) \ + -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ + -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ + -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ + $(NULL) + libfolks_tracker_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ @@ -65,6 +60,7 @@ $(NULL) libfolks_tracker_la_LIBADD = \ + $(AM_LIBADD) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ @@ -76,6 +72,8 @@ # that vim quickfix mode (:make) doesn't interpret the libtool --mode=link # command as an error message in a bizarrely named file libfolks_tracker_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \ -export-symbols-regex "^(TRF|trf)_.*|" \ $(NULL) diff -Nru folks-0.6.6/backends/tracker/lib/Makefile.in folks-0.6.7/backends/tracker/lib/Makefile.in --- folks-0.6.6/backends/tracker/lib/Makefile.in 2011-12-13 23:38:39.000000000 +0000 +++ folks-0.6.7/backends/tracker/lib/Makefile.in 2012-02-23 00:04:12.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -45,10 +45,11 @@ trf-persona-store.c trf-persona.c trf-util.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -76,6 +77,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(folks_trackerdir)" \ "$(DESTDIR)$(vapidir)" "$(DESTDIR)$(pkgconfigdir)" \ "$(DESTDIR)$(folks_tracker_includedir)" @@ -156,6 +163,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -268,8 +277,7 @@ VALAFLAGS = @VALAFLAGS@ VAPIDIR = @VAPIDIR@ VAPIGEN = @VAPIGEN@ -VAPIGENFLAGS = @VAPIGENFLAGS@ --vapidir=. \ - --vapidir=$(top_srcdir)/folks +VAPIGENFLAGS = @VAPIGENFLAGS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ abs_builddir = @abs_builddir@ @@ -325,20 +333,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ BACKEND_NAME = "tracker" -AM_CPPFLAGS = \ - -I$(top_srcdir)/folks \ - -include $(CONFIG_HEADER) \ - -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ - -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ - -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ - $(NULL) - folks_trackerdir = $(libdir) folks_tracker_LTLIBRARIES = libfolks-tracker.la - -################################################################## -# Support library -################################################################## pkgconfig_in = folks-tracker.pc.in pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(pkgconfig_in:.in=) @@ -353,6 +349,7 @@ $(NULL) libfolks_tracker_la_VALAFLAGS = \ + $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ --vapidir=. \ --vapidir=$(top_srcdir)/folks \ @@ -374,7 +371,17 @@ tracker-sparql-0.12 \ $(NULL) +libfolks_tracker_la_CPPFLAGS = \ + -I$(top_srcdir)/folks \ + -include $(CONFIG_HEADER) \ + -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ + -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ + -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ + $(NULL) + libfolks_tracker_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ @@ -382,6 +389,7 @@ $(NULL) libfolks_tracker_la_LIBADD = \ + $(AM_LIBADD) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ @@ -394,6 +402,8 @@ # that vim quickfix mode (:make) doesn't interpret the libtool --mode=link # command as an error message in a bizarrely named file libfolks_tracker_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" \ -export-symbols-regex "^(TRF|trf)_.*|" \ $(NULL) @@ -510,73 +520,67 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libfolks_tracker_la-trf-persona.lo: trf-persona.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_tracker_la_CFLAGS) $(CFLAGS) -MT libfolks_tracker_la-trf-persona.lo -MD -MP -MF $(DEPDIR)/libfolks_tracker_la-trf-persona.Tpo -c -o libfolks_tracker_la-trf-persona.lo `test -f 'trf-persona.c' || echo '$(srcdir)/'`trf-persona.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfolks_tracker_la_CPPFLAGS) $(CPPFLAGS) $(libfolks_tracker_la_CFLAGS) $(CFLAGS) -MT libfolks_tracker_la-trf-persona.lo -MD -MP -MF $(DEPDIR)/libfolks_tracker_la-trf-persona.Tpo -c -o libfolks_tracker_la-trf-persona.lo `test -f 'trf-persona.c' || echo '$(srcdir)/'`trf-persona.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_tracker_la-trf-persona.Tpo $(DEPDIR)/libfolks_tracker_la-trf-persona.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='trf-persona.c' object='libfolks_tracker_la-trf-persona.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='trf-persona.c' object='libfolks_tracker_la-trf-persona.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_tracker_la_CFLAGS) $(CFLAGS) -c -o libfolks_tracker_la-trf-persona.lo `test -f 'trf-persona.c' || echo '$(srcdir)/'`trf-persona.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfolks_tracker_la_CPPFLAGS) $(CPPFLAGS) $(libfolks_tracker_la_CFLAGS) $(CFLAGS) -c -o libfolks_tracker_la-trf-persona.lo `test -f 'trf-persona.c' || echo '$(srcdir)/'`trf-persona.c libfolks_tracker_la-trf-persona-store.lo: trf-persona-store.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_tracker_la_CFLAGS) $(CFLAGS) -MT libfolks_tracker_la-trf-persona-store.lo -MD -MP -MF $(DEPDIR)/libfolks_tracker_la-trf-persona-store.Tpo -c -o libfolks_tracker_la-trf-persona-store.lo `test -f 'trf-persona-store.c' || echo '$(srcdir)/'`trf-persona-store.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfolks_tracker_la_CPPFLAGS) $(CPPFLAGS) $(libfolks_tracker_la_CFLAGS) $(CFLAGS) -MT libfolks_tracker_la-trf-persona-store.lo -MD -MP -MF $(DEPDIR)/libfolks_tracker_la-trf-persona-store.Tpo -c -o libfolks_tracker_la-trf-persona-store.lo `test -f 'trf-persona-store.c' || echo '$(srcdir)/'`trf-persona-store.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_tracker_la-trf-persona-store.Tpo $(DEPDIR)/libfolks_tracker_la-trf-persona-store.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='trf-persona-store.c' object='libfolks_tracker_la-trf-persona-store.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='trf-persona-store.c' object='libfolks_tracker_la-trf-persona-store.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_tracker_la_CFLAGS) $(CFLAGS) -c -o libfolks_tracker_la-trf-persona-store.lo `test -f 'trf-persona-store.c' || echo '$(srcdir)/'`trf-persona-store.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfolks_tracker_la_CPPFLAGS) $(CPPFLAGS) $(libfolks_tracker_la_CFLAGS) $(CFLAGS) -c -o libfolks_tracker_la-trf-persona-store.lo `test -f 'trf-persona-store.c' || echo '$(srcdir)/'`trf-persona-store.c libfolks_tracker_la-trf-util.lo: trf-util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_tracker_la_CFLAGS) $(CFLAGS) -MT libfolks_tracker_la-trf-util.lo -MD -MP -MF $(DEPDIR)/libfolks_tracker_la-trf-util.Tpo -c -o libfolks_tracker_la-trf-util.lo `test -f 'trf-util.c' || echo '$(srcdir)/'`trf-util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfolks_tracker_la_CPPFLAGS) $(CPPFLAGS) $(libfolks_tracker_la_CFLAGS) $(CFLAGS) -MT libfolks_tracker_la-trf-util.lo -MD -MP -MF $(DEPDIR)/libfolks_tracker_la-trf-util.Tpo -c -o libfolks_tracker_la-trf-util.lo `test -f 'trf-util.c' || echo '$(srcdir)/'`trf-util.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_tracker_la-trf-util.Tpo $(DEPDIR)/libfolks_tracker_la-trf-util.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='trf-util.c' object='libfolks_tracker_la-trf-util.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='trf-util.c' object='libfolks_tracker_la-trf-util.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_tracker_la_CFLAGS) $(CFLAGS) -c -o libfolks_tracker_la-trf-util.lo `test -f 'trf-util.c' || echo '$(srcdir)/'`trf-util.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfolks_tracker_la_CPPFLAGS) $(CPPFLAGS) $(libfolks_tracker_la_CFLAGS) $(CFLAGS) -c -o libfolks_tracker_la-trf-util.lo `test -f 'trf-util.c' || echo '$(srcdir)/'`trf-util.c $(srcdir)/trf-persona.c: $(srcdir)/libfolks_tracker_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_tracker_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_tracker_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_tracker_la_vala.stamp; \ fi $(srcdir)/trf-persona-store.c: $(srcdir)/libfolks_tracker_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_tracker_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_tracker_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_tracker_la_vala.stamp; \ fi $(srcdir)/trf-util.c: $(srcdir)/libfolks_tracker_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_tracker_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_tracker_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_tracker_la_vala.stamp; \ fi $(srcdir)/folks-tracker.vapi: $(srcdir)/libfolks_tracker_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_tracker_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_tracker_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_tracker_la_vala.stamp; \ fi $(srcdir)/folks/folks-tracker.h: $(srcdir)/libfolks_tracker_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_tracker_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_tracker_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_tracker_la_vala.stamp; \ fi libfolks_tracker_la_vala.stamp: $(libfolks_tracker_la_SOURCES) @@ -605,9 +609,7 @@ @$(NORMAL_UNINSTALL) @list='$(dist_vapi_DATA)'; test -n "$(vapidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(vapidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(vapidir)" && rm -f $$files + dir='$(DESTDIR)$(vapidir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @@ -625,9 +627,7 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-folks_tracker_includeHEADERS: $(folks_tracker_include_HEADERS) @$(NORMAL_INSTALL) test -z "$(folks_tracker_includedir)" || $(MKDIR_P) "$(DESTDIR)$(folks_tracker_includedir)" @@ -645,9 +645,7 @@ @$(NORMAL_UNINSTALL) @list='$(folks_tracker_include_HEADERS)'; test -n "$(folks_tracker_includedir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(folks_tracker_includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(folks_tracker_includedir)" && rm -f $$files + dir='$(DESTDIR)$(folks_tracker_includedir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -748,10 +746,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/backends/tracker/lib/trf-persona.c folks-0.6.7/backends/tracker/lib/trf-persona.c --- folks-0.6.6/backends/tracker/lib/trf-persona.c 2011-12-13 23:40:20.000000000 +0000 +++ folks-0.6.7/backends/tracker/lib/trf-persona.c 2012-02-23 00:02:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* trf-persona.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* trf-persona.c generated by valac 0.15.1, the Vala compiler * generated from trf-persona.vala, do not modify */ /* @@ -629,7 +629,7 @@ TrfPersonaChangeNicknameData* _data_; TrfPersona* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; self = (TrfPersona*) base; _data_ = g_slice_new0 (TrfPersonaChangeNicknameData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, trf_persona_real_change_nickname); @@ -1024,7 +1024,7 @@ TrfPersonaChangeFullNameData* _data_; TrfPersona* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; self = (TrfPersona*) base; _data_ = g_slice_new0 (TrfPersonaChangeFullNameData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, trf_persona_real_change_full_name); @@ -2460,11 +2460,11 @@ gint _addresses_a_size_; gchar** _tmp8_; gint _tmp8__length1; - GeeHashSet* _tmp49_; - GeeHashSet* _tmp50_; GeeHashSet* _tmp51_; - GeeSet* _tmp52_; - GeeSet* _tmp53_; + GeeHashSet* _tmp52_; + GeeHashSet* _tmp53_; + GeeSet* _tmp54_; + GeeSet* _tmp55_; g_return_if_fail (self != NULL); _tmp0_ = self->priv->_cursor; _tmp1_ = tracker_sparql_cursor_get_string (_tmp0_, (gint) TRF_FIELDS_POSTAL_ADDRESS, NULL); @@ -2529,14 +2529,7 @@ FolksPostalAddress* _tmp41_; FolksPostalAddress* pa; FolksPostalAddress* _tmp42_; - FolksPostalAddressFieldDetails* _tmp43_; - FolksPostalAddressFieldDetails* pafd; - FolksPostalAddressFieldDetails* _tmp44_; - gchar** _tmp45_; - gint _tmp45__length1; - const gchar* _tmp46_; - GeeHashSet* _tmp47_; - FolksPostalAddressFieldDetails* _tmp48_; + gboolean _tmp43_ = FALSE; address_empty = TRUE; _tmp10_ = a; _tmp12_ = _tmp11_ = g_strsplit (_tmp10_, "\t", 0); @@ -2628,32 +2621,45 @@ _tmp41_ = folks_postal_address_new (_tmp28_, _tmp30_, _tmp32_, _tmp34_, _tmp36_, _tmp38_, _tmp40_, NULL, NULL); pa = _tmp41_; _tmp42_ = pa; - _tmp43_ = folks_postal_address_field_details_new (_tmp42_, NULL); - pafd = _tmp43_; - _tmp44_ = pafd; - _tmp45_ = a_info; - _tmp45__length1 = a_info_length1; - _tmp46_ = _tmp45_[TRF_POSTAL_ADDRESS_FIELDS_TRACKER_ID]; - folks_abstract_field_details_set_id ((FolksAbstractFieldDetails*) _tmp44_, _tmp46_); - _tmp47_ = postal_addresses; - _tmp48_ = pafd; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp47_, _tmp48_); - _g_object_unref0 (pafd); + _tmp43_ = folks_postal_address_is_empty (_tmp42_); + if (!_tmp43_) { + FolksPostalAddress* _tmp44_; + FolksPostalAddressFieldDetails* _tmp45_; + FolksPostalAddressFieldDetails* pafd; + FolksPostalAddressFieldDetails* _tmp46_; + gchar** _tmp47_; + gint _tmp47__length1; + const gchar* _tmp48_; + GeeHashSet* _tmp49_; + FolksPostalAddressFieldDetails* _tmp50_; + _tmp44_ = pa; + _tmp45_ = folks_postal_address_field_details_new (_tmp44_, NULL); + pafd = _tmp45_; + _tmp46_ = pafd; + _tmp47_ = a_info; + _tmp47__length1 = a_info_length1; + _tmp48_ = _tmp47_[TRF_POSTAL_ADDRESS_FIELDS_TRACKER_ID]; + folks_abstract_field_details_set_id ((FolksAbstractFieldDetails*) _tmp46_, _tmp48_); + _tmp49_ = postal_addresses; + _tmp50_ = pafd; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp49_, _tmp50_); + _g_object_unref0 (pafd); + } _g_object_unref0 (pa); a_info = (_vala_array_free (a_info, a_info_length1, (GDestroyNotify) g_free), NULL); _g_free0 (a); } } } - _tmp49_ = postal_addresses; - _tmp50_ = _g_object_ref0 (_tmp49_); + _tmp51_ = postal_addresses; + _tmp52_ = _g_object_ref0 (_tmp51_); _g_object_unref0 (self->priv->_postal_addresses); - self->priv->_postal_addresses = _tmp50_; - _tmp51_ = self->priv->_postal_addresses; - _tmp52_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp51_); - _tmp53_ = _tmp52_; + self->priv->_postal_addresses = _tmp52_; + _tmp53_ = self->priv->_postal_addresses; + _tmp54_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp53_); + _tmp55_ = _tmp54_; _g_object_unref0 (self->priv->_postal_addresses_ro); - self->priv->_postal_addresses_ro = _tmp53_; + self->priv->_postal_addresses_ro = _tmp55_; g_object_notify ((GObject*) self, "postal-addresses"); addresses_a = (_vala_array_free (addresses_a, addresses_a_length1, (GDestroyNotify) g_free), NULL); _g_object_unref0 (postal_addresses); @@ -2981,11 +2987,11 @@ gint _roles_a_size_; gchar** _tmp8_; gint _tmp8__length1; - GeeHashSet* _tmp36_; - GeeHashSet* _tmp37_; GeeHashSet* _tmp38_; - GeeSet* _tmp39_; - GeeSet* _tmp40_; + GeeHashSet* _tmp39_; + GeeHashSet* _tmp40_; + GeeSet* _tmp41_; + GeeSet* _tmp42_; g_return_if_fail (self != NULL); _tmp0_ = self->priv->_cursor; _tmp1_ = tracker_sparql_cursor_get_string (_tmp0_, (gint) TRF_FIELDS_ROLES, NULL); @@ -3051,12 +3057,7 @@ FolksRole* _tmp28_; const gchar* _tmp29_; FolksRole* _tmp30_; - FolksRoleFieldDetails* _tmp31_; - FolksRoleFieldDetails* role_fd; - FolksRoleFieldDetails* _tmp32_; - const gchar* _tmp33_; - GeeHashSet* _tmp34_; - FolksRoleFieldDetails* _tmp35_; + gboolean _tmp31_ = FALSE; _tmp10_ = r; _tmp12_ = _tmp11_ = g_strsplit (_tmp10_, "\t", 0); r_info = _tmp12_; @@ -3090,15 +3091,26 @@ _tmp29_ = role; folks_role_set_role (_tmp28_, _tmp29_); _tmp30_ = new_role; - _tmp31_ = folks_role_field_details_new (_tmp30_, NULL); - role_fd = _tmp31_; - _tmp32_ = role_fd; - _tmp33_ = tracker_id; - folks_abstract_field_details_set_id ((FolksAbstractFieldDetails*) _tmp32_, _tmp33_); - _tmp34_ = role_fds; - _tmp35_ = role_fd; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp34_, _tmp35_); - _g_object_unref0 (role_fd); + _tmp31_ = folks_role_is_empty (_tmp30_); + if (!_tmp31_) { + FolksRole* _tmp32_; + FolksRoleFieldDetails* _tmp33_; + FolksRoleFieldDetails* role_fd; + FolksRoleFieldDetails* _tmp34_; + const gchar* _tmp35_; + GeeHashSet* _tmp36_; + FolksRoleFieldDetails* _tmp37_; + _tmp32_ = new_role; + _tmp33_ = folks_role_field_details_new (_tmp32_, NULL); + role_fd = _tmp33_; + _tmp34_ = role_fd; + _tmp35_ = tracker_id; + folks_abstract_field_details_set_id ((FolksAbstractFieldDetails*) _tmp34_, _tmp35_); + _tmp36_ = role_fds; + _tmp37_ = role_fd; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp36_, _tmp37_); + _g_object_unref0 (role_fd); + } _g_object_unref0 (new_role); _g_free0 (organisation); _g_free0 (title); @@ -3109,15 +3121,15 @@ } } } - _tmp36_ = role_fds; - _tmp37_ = _g_object_ref0 (_tmp36_); + _tmp38_ = role_fds; + _tmp39_ = _g_object_ref0 (_tmp38_); _g_object_unref0 (self->priv->_roles); - self->priv->_roles = _tmp37_; - _tmp38_ = self->priv->_roles; - _tmp39_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp38_); - _tmp40_ = _tmp39_; + self->priv->_roles = _tmp39_; + _tmp40_ = self->priv->_roles; + _tmp41_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp40_); + _tmp42_ = _tmp41_; _g_object_unref0 (self->priv->_roles_ro); - self->priv->_roles_ro = _tmp40_; + self->priv->_roles_ro = _tmp42_; g_object_notify ((GObject*) self, "roles"); roles_a = (_vala_array_free (roles_a, roles_a_length1, (GDestroyNotify) g_free), NULL); _g_object_unref0 (role_fds); @@ -3134,13 +3146,7 @@ FolksRole* _tmp3_; const gchar* _tmp4_; FolksRole* _tmp5_; - FolksRoleFieldDetails* _tmp6_; - FolksRoleFieldDetails* role_fd; - FolksRoleFieldDetails* _tmp7_; - const gchar* _tmp8_; - GeeHashSet* _tmp9_; - FolksRoleFieldDetails* _tmp10_; - gboolean _tmp11_ = FALSE; + gboolean _tmp6_ = FALSE; g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (tracker_id != NULL, FALSE); _tmp0_ = title; @@ -3151,23 +3157,35 @@ _tmp4_ = role; folks_role_set_role (_tmp3_, _tmp4_); _tmp5_ = new_role; - _tmp6_ = folks_role_field_details_new (_tmp5_, NULL); - role_fd = _tmp6_; - _tmp7_ = role_fd; - _tmp8_ = tracker_id; - folks_abstract_field_details_set_id ((FolksAbstractFieldDetails*) _tmp7_, _tmp8_); - _tmp9_ = self->priv->_roles; - _tmp10_ = role_fd; - _tmp11_ = gee_abstract_collection_add ((GeeAbstractCollection*) _tmp9_, _tmp10_); - if (_tmp11_) { - g_object_notify ((GObject*) self, "roles"); - result = TRUE; + _tmp6_ = folks_role_is_empty (_tmp5_); + if (!_tmp6_) { + FolksRole* _tmp7_; + FolksRoleFieldDetails* _tmp8_; + FolksRoleFieldDetails* role_fd; + FolksRoleFieldDetails* _tmp9_; + const gchar* _tmp10_; + GeeHashSet* _tmp11_; + FolksRoleFieldDetails* _tmp12_; + gboolean _tmp13_ = FALSE; + _tmp7_ = new_role; + _tmp8_ = folks_role_field_details_new (_tmp7_, NULL); + role_fd = _tmp8_; + _tmp9_ = role_fd; + _tmp10_ = tracker_id; + folks_abstract_field_details_set_id ((FolksAbstractFieldDetails*) _tmp9_, _tmp10_); + _tmp11_ = self->priv->_roles; + _tmp12_ = role_fd; + _tmp13_ = gee_abstract_collection_add ((GeeAbstractCollection*) _tmp11_, _tmp12_); + if (_tmp13_) { + g_object_notify ((GObject*) self, "roles"); + result = TRUE; + _g_object_unref0 (role_fd); + _g_object_unref0 (new_role); + return result; + } _g_object_unref0 (role_fd); - _g_object_unref0 (new_role); - return result; } result = FALSE; - _g_object_unref0 (role_fd); _g_object_unref0 (new_role); return result; } @@ -3641,7 +3659,7 @@ _inner_error_ = NULL; _tmp24_ = e; _tmp25_ = _tmp24_->message; - g_warning ("trf-persona.vala:1165: Problem when trying to normalise address: %s\n", _tmp25_); + g_warning ("trf-persona.vala:1174: Problem when trying to normalise address: %s\n", _tmp25_); _g_error_free0 (e); } __finally0: @@ -3695,7 +3713,7 @@ GeeIterator* _tmp9_; GeeIterator* _pr_it; _tmp4_ = proto_im; - _tmp5_ = gee_map_get_keys ((GeeMap*) _tmp4_); + _tmp5_ = gee_abstract_map_get_keys ((GeeMap*) _tmp4_); _tmp6_ = _tmp5_; _tmp7_ = _tmp6_; _tmp8_ = gee_iterable_iterator ((GeeIterable*) _tmp7_); @@ -5337,25 +5355,25 @@ * * See {@link Folks.NameDetails.nickname}. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_NICKNAME, "nickname"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_NICKNAME, g_param_spec_string ("nickname", "nickname", "nickname", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_PHONE_NUMBERS, "phone-numbers"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_PHONE_NUMBERS, g_param_spec_object ("phone-numbers", "phone-numbers", "phone-numbers", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_EMAIL_ADDRESSES, "email-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_EMAIL_ADDRESSES, g_param_spec_object ("email-addresses", "email-addresses", "email-addresses", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_LINKABLE_PROPERTIES, "linkable-properties"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_LINKABLE_PROPERTIES, g_param_spec_boxed ("linkable-properties", "linkable-properties", "linkable-properties", G_TYPE_STRV, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_WRITEABLE_PROPERTIES, "writeable-properties"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_WRITEABLE_PROPERTIES, g_param_spec_boxed ("writeable-properties", "writeable-properties", "writeable-properties", G_TYPE_STRV, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * An avatar for the Persona. * @@ -5363,59 +5381,59 @@ * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_AVATAR, "avatar"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_AVATAR, g_param_spec_object ("avatar", "avatar", "avatar", g_loadable_icon_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STRUCTURED_NAME, "structured-name"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STRUCTURED_NAME, g_param_spec_object ("structured-name", "structured-name", "structured-name", FOLKS_TYPE_STRUCTURED_NAME, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_FULL_NAME, "full-name"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_FULL_NAME, g_param_spec_string ("full-name", "full-name", "full-name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_GENDER, "gender"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_GENDER, g_param_spec_enum ("gender", "gender", "gender", FOLKS_TYPE_GENDER, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_BIRTHDAY, "birthday"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_BIRTHDAY, g_param_spec_boxed ("birthday", "birthday", "birthday", G_TYPE_DATE_TIME, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_CALENDAR_EVENT_ID, "calendar-event-id"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_CALENDAR_EVENT_ID, g_param_spec_string ("calendar-event-id", "calendar-event-id", "calendar-event-id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_ROLES, "roles"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_ROLES, g_param_spec_object ("roles", "roles", "roles", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_NOTES, "notes"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_NOTES, g_param_spec_object ("notes", "notes", "notes", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_URLS, "urls"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_URLS, g_param_spec_object ("urls", "urls", "urls", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_POSTAL_ADDRESSES, "postal-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_POSTAL_ADDRESSES, g_param_spec_object ("postal-addresses", "postal-addresses", "postal-addresses", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_IM_ADDRESSES, "im-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_IM_ADDRESSES, g_param_spec_object ("im-addresses", "im-addresses", "im-addresses", GEE_TYPE_MULTI_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * Whether this contact is a user-defined favourite. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_IS_FAVOURITE, "is-favourite"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_IS_FAVOURITE, g_param_spec_boolean ("is-favourite", "is-favourite", "is-favourite", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * IDs used to link {@link Trf.Persona}s. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_LOCAL_IDS, "local-ids"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_LOCAL_IDS, g_param_spec_object ("local-ids", "local-ids", "local-ids", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_WEB_SERVICE_ADDRESSES, "web-service-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_WEB_SERVICE_ADDRESSES, g_param_spec_object ("web-service-addresses", "web-service-addresses", "web-service-addresses", GEE_TYPE_MULTI_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * ID of the {@link Trf.Persona} in Tracker. * diff -Nru folks-0.6.6/backends/tracker/lib/trf-persona-store.c folks-0.6.7/backends/tracker/lib/trf-persona-store.c --- folks-0.6.6/backends/tracker/lib/trf-persona-store.c 2011-12-13 23:40:21.000000000 +0000 +++ folks-0.6.7/backends/tracker/lib/trf-persona-store.c 2012-02-23 00:02:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* trf-persona-store.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* trf-persona-store.c generated by valac 0.15.1, the Vala compiler * generated from trf-persona-store.vala, do not modify */ /* @@ -1821,42 +1821,44 @@ const gchar* _tmp81_; FolksPostalAddress* _tmp82_; FolksPostalAddress* postal_address; - TrfAfflInfo* _tmp83_; - FolksPostalAddress* _tmp84_; - FolksPostalAddressFieldDetails* _tmp85_; - TrfAfflInfo* _tmp86_; - TrackerSparqlCursor* _tmp87_; - const gchar* _tmp88_; - gchar* _tmp89_; - gchar* _tmp90_; - TrfAfflInfo* _tmp91_; - TrackerSparqlCursor* _tmp92_; - const gchar* _tmp93_; - gchar* _tmp94_; - gchar* _tmp95_; - TrfAfflInfo* _tmp96_; - TrackerSparqlCursor* _tmp97_; - const gchar* _tmp98_; - gchar* _tmp99_; - gchar* _tmp100_; - TrfAfflInfo* _tmp101_; - TrackerSparqlCursor* _tmp102_; - const gchar* _tmp103_; - gchar* _tmp104_; - gchar* _tmp105_; - TrfAfflInfo* _tmp106_; - TrackerSparqlCursor* _tmp107_; - const gchar* _tmp108_; - gchar* _tmp109_; - gchar* _tmp110_; + FolksPostalAddress* _tmp83_; + gboolean _tmp84_; + TrfAfflInfo* _tmp85_; + FolksPostalAddress* _tmp86_; + FolksPostalAddressFieldDetails* _tmp87_; + TrfAfflInfo* _tmp88_; + TrackerSparqlCursor* _tmp89_; + const gchar* _tmp90_; + gchar* _tmp91_; + gchar* _tmp92_; + TrfAfflInfo* _tmp93_; + TrackerSparqlCursor* _tmp94_; + const gchar* _tmp95_; + gchar* _tmp96_; + gchar* _tmp97_; + TrfAfflInfo* _tmp98_; + TrackerSparqlCursor* _tmp99_; + const gchar* _tmp100_; + gchar* _tmp101_; + gchar* _tmp102_; + TrfAfflInfo* _tmp103_; + TrackerSparqlCursor* _tmp104_; + const gchar* _tmp105_; + gchar* _tmp106_; + gchar* _tmp107_; + TrfAfflInfo* _tmp108_; + TrackerSparqlCursor* _tmp109_; + const gchar* _tmp110_; + gchar* _tmp111_; + gchar* _tmp112_; GError* e1; - const gchar* _tmp111_; - GError* _tmp112_; const gchar* _tmp113_; + GError* _tmp114_; + const gchar* _tmp115_; GError* e2; - const gchar* _tmp114_; - GError* _tmp115_; const gchar* _tmp116_; + GError* _tmp117_; + const gchar* _tmp118_; GError * _inner_error_; }; @@ -5044,7 +5046,7 @@ GeeSet* _tmp3_; GeeSet* _tmp4_; const gchar* _tmp5_; - const gchar* _tmp6_; + gchar* _tmp6_; TrfAttrib _tmp7_; _data_ = g_slice_new0 (TrfPersonaStoreBuildUpdateQuerySetData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_build_update_query_set); @@ -5240,7 +5242,7 @@ TrfPersonaStoreRemoveAttributesData* _data_; TrfPersonaStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; gchar _tmp3_; _data_ = g_slice_new0 (TrfPersonaStoreRemoveAttributesData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_remove_attributes); @@ -5910,7 +5912,7 @@ _data_->query = _data_->_tmp2_; { _data_->_tmp3_ = trf_persona_store__urn_prefix; - _data_->_tmp4_ = gee_map_get_keys ((GeeMap*) _data_->_tmp3_); + _data_->_tmp4_ = gee_abstract_map_get_keys ((GeeMap*) _data_->_tmp3_); _data_->_tmp5_ = _data_->_tmp4_; _data_->_tmp6_ = _data_->_tmp5_; _data_->_tmp7_ = NULL; @@ -5982,7 +5984,7 @@ _data_->i = 0; { _data_->_tmp28_ = trf_persona_store__urn_prefix; - _data_->_tmp29_ = gee_map_get_keys ((GeeMap*) _data_->_tmp28_); + _data_->_tmp29_ = gee_abstract_map_get_keys ((GeeMap*) _data_->_tmp28_); _data_->_tmp30_ = _data_->_tmp29_; _data_->_tmp31_ = _data_->_tmp30_; _data_->_tmp32_ = NULL; @@ -6448,7 +6450,7 @@ _g_free0 (_data_->p_id); } _data_->_tmp41_ = _data_->removed_personas; - _data_->_tmp42_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp41_); + _data_->_tmp42_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp41_); _data_->_tmp43_ = _data_->_tmp42_; if (_data_->_tmp43_ > 0) { _data_->_tmp44_ = _data_->removed_personas; @@ -6592,7 +6594,7 @@ _g_free0 (_data_->subject_tracker_id); } _data_->_tmp27_ = _data_->added_personas; - _data_->_tmp28_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp27_); + _data_->_tmp28_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp27_); _data_->_tmp29_ = _data_->_tmp28_; if (_data_->_tmp29_ > 0) { _data_->_tmp30_ = _data_->added_personas; @@ -6624,7 +6626,7 @@ TrfPersonaStoreDoAddContactsData* _data_; TrfPersonaStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (TrfPersonaStoreDoAddContactsData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_do_add_contacts); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_do_add_contacts_data_free); @@ -6739,7 +6741,7 @@ _g_free0 (_data_->p_id); } _data_->_tmp34_ = _data_->added_personas; - _data_->_tmp35_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp34_); + _data_->_tmp35_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp34_); _data_->_tmp36_ = _data_->_tmp35_; if (_data_->_tmp36_ > 0) { _data_->_tmp37_ = _data_->added_personas; @@ -7581,9 +7583,9 @@ TrfPersonaStore* _tmp0_; gint _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; + gchar* _tmp3_; const gchar* _tmp4_; - const gchar* _tmp5_; + gchar* _tmp5_; _data_ = g_slice_new0 (TrfPersonaStoreGetPropertyData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_get_property); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_get_property_data_free); @@ -7678,7 +7680,7 @@ TrfPersonaStore* _tmp0_; gint _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; + gchar* _tmp3_; _data_ = g_slice_new0 (TrfPersonaStoreGetNaoPropertyByPersonIdData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_get_nao_property_by_person_id); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_get_nao_property_by_person_id_data_free); @@ -7862,9 +7864,9 @@ TrfPersonaStoreGetAfflInfoData* _data_; TrfPersonaStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; _data_ = g_slice_new0 (TrfPersonaStoreGetAfflInfoData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_get_affl_info); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_get_affl_info_data_free); @@ -8082,56 +8084,61 @@ _data_->_tmp81_ = _data_->_tmp80_; _data_->_tmp82_ = folks_postal_address_new (_data_->_tmp72_, _data_->_tmp73_, _data_->_tmp74_, _data_->_tmp75_, _data_->_tmp76_, _data_->_tmp77_, _data_->_tmp78_, NULL, _data_->_tmp81_); _data_->postal_address = _data_->_tmp82_; - _data_->_tmp83_ = _data_->affl_info; - _data_->_tmp84_ = _data_->postal_address; - _data_->_tmp85_ = folks_postal_address_field_details_new (_data_->_tmp84_, NULL); - _g_object_unref0 (_data_->_tmp83_->postal_address_fd); - _data_->_tmp83_->postal_address_fd = _data_->_tmp85_; - _data_->_tmp86_ = _data_->affl_info; - _data_->_tmp87_ = _data_->cursor; - _data_->_tmp88_ = NULL; - _data_->_tmp88_ = tracker_sparql_cursor_get_string (_data_->_tmp87_, (gint) TRF_AFFL_INFO_FIELDS_AFFL_EMAIL, NULL); - _data_->_tmp89_ = NULL; - _data_->_tmp89_ = g_strdup (_data_->_tmp88_); - _data_->_tmp90_ = _data_->_tmp89_; - trf_affl_info_set_email (_data_->_tmp86_, _data_->_tmp90_); - _g_free0 (_data_->_tmp90_); - _data_->_tmp91_ = _data_->affl_info; - _data_->_tmp92_ = _data_->cursor; - _data_->_tmp93_ = NULL; - _data_->_tmp93_ = tracker_sparql_cursor_get_string (_data_->_tmp92_, (gint) TRF_AFFL_INFO_FIELDS_AFFL_PHONE, NULL); - _data_->_tmp94_ = NULL; - _data_->_tmp94_ = g_strdup (_data_->_tmp93_); - _data_->_tmp95_ = _data_->_tmp94_; - trf_affl_info_set_phone (_data_->_tmp91_, _data_->_tmp95_); - _g_free0 (_data_->_tmp95_); - _data_->_tmp96_ = _data_->affl_info; - _data_->_tmp97_ = _data_->cursor; - _data_->_tmp98_ = NULL; - _data_->_tmp98_ = tracker_sparql_cursor_get_string (_data_->_tmp97_, (gint) TRF_AFFL_INFO_FIELDS_AFFL_WEBSITE, NULL); - _data_->_tmp99_ = NULL; - _data_->_tmp99_ = g_strdup (_data_->_tmp98_); - _data_->_tmp100_ = _data_->_tmp99_; - trf_affl_info_set_website (_data_->_tmp96_, _data_->_tmp100_); - _g_free0 (_data_->_tmp100_); - _data_->_tmp101_ = _data_->affl_info; - _data_->_tmp102_ = _data_->cursor; - _data_->_tmp103_ = NULL; - _data_->_tmp103_ = tracker_sparql_cursor_get_string (_data_->_tmp102_, (gint) TRF_AFFL_INFO_FIELDS_AFFL_BLOG, NULL); - _data_->_tmp104_ = NULL; - _data_->_tmp104_ = g_strdup (_data_->_tmp103_); - _data_->_tmp105_ = _data_->_tmp104_; - trf_affl_info_set_blog (_data_->_tmp101_, _data_->_tmp105_); - _g_free0 (_data_->_tmp105_); - _data_->_tmp106_ = _data_->affl_info; - _data_->_tmp107_ = _data_->cursor; - _data_->_tmp108_ = NULL; - _data_->_tmp108_ = tracker_sparql_cursor_get_string (_data_->_tmp107_, (gint) TRF_AFFL_INFO_FIELDS_AFFL_URL, NULL); - _data_->_tmp109_ = NULL; - _data_->_tmp109_ = g_strdup (_data_->_tmp108_); - _data_->_tmp110_ = _data_->_tmp109_; - trf_affl_info_set_url (_data_->_tmp106_, _data_->_tmp110_); - _g_free0 (_data_->_tmp110_); + _data_->_tmp83_ = _data_->postal_address; + _data_->_tmp84_ = FALSE; + _data_->_tmp84_ = folks_postal_address_is_empty (_data_->_tmp83_); + if (!_data_->_tmp84_) { + _data_->_tmp85_ = _data_->affl_info; + _data_->_tmp86_ = _data_->postal_address; + _data_->_tmp87_ = folks_postal_address_field_details_new (_data_->_tmp86_, NULL); + _g_object_unref0 (_data_->_tmp85_->postal_address_fd); + _data_->_tmp85_->postal_address_fd = _data_->_tmp87_; + } + _data_->_tmp88_ = _data_->affl_info; + _data_->_tmp89_ = _data_->cursor; + _data_->_tmp90_ = NULL; + _data_->_tmp90_ = tracker_sparql_cursor_get_string (_data_->_tmp89_, (gint) TRF_AFFL_INFO_FIELDS_AFFL_EMAIL, NULL); + _data_->_tmp91_ = NULL; + _data_->_tmp91_ = g_strdup (_data_->_tmp90_); + _data_->_tmp92_ = _data_->_tmp91_; + trf_affl_info_set_email (_data_->_tmp88_, _data_->_tmp92_); + _g_free0 (_data_->_tmp92_); + _data_->_tmp93_ = _data_->affl_info; + _data_->_tmp94_ = _data_->cursor; + _data_->_tmp95_ = NULL; + _data_->_tmp95_ = tracker_sparql_cursor_get_string (_data_->_tmp94_, (gint) TRF_AFFL_INFO_FIELDS_AFFL_PHONE, NULL); + _data_->_tmp96_ = NULL; + _data_->_tmp96_ = g_strdup (_data_->_tmp95_); + _data_->_tmp97_ = _data_->_tmp96_; + trf_affl_info_set_phone (_data_->_tmp93_, _data_->_tmp97_); + _g_free0 (_data_->_tmp97_); + _data_->_tmp98_ = _data_->affl_info; + _data_->_tmp99_ = _data_->cursor; + _data_->_tmp100_ = NULL; + _data_->_tmp100_ = tracker_sparql_cursor_get_string (_data_->_tmp99_, (gint) TRF_AFFL_INFO_FIELDS_AFFL_WEBSITE, NULL); + _data_->_tmp101_ = NULL; + _data_->_tmp101_ = g_strdup (_data_->_tmp100_); + _data_->_tmp102_ = _data_->_tmp101_; + trf_affl_info_set_website (_data_->_tmp98_, _data_->_tmp102_); + _g_free0 (_data_->_tmp102_); + _data_->_tmp103_ = _data_->affl_info; + _data_->_tmp104_ = _data_->cursor; + _data_->_tmp105_ = NULL; + _data_->_tmp105_ = tracker_sparql_cursor_get_string (_data_->_tmp104_, (gint) TRF_AFFL_INFO_FIELDS_AFFL_BLOG, NULL); + _data_->_tmp106_ = NULL; + _data_->_tmp106_ = g_strdup (_data_->_tmp105_); + _data_->_tmp107_ = _data_->_tmp106_; + trf_affl_info_set_blog (_data_->_tmp103_, _data_->_tmp107_); + _g_free0 (_data_->_tmp107_); + _data_->_tmp108_ = _data_->affl_info; + _data_->_tmp109_ = _data_->cursor; + _data_->_tmp110_ = NULL; + _data_->_tmp110_ = tracker_sparql_cursor_get_string (_data_->_tmp109_, (gint) TRF_AFFL_INFO_FIELDS_AFFL_URL, NULL); + _data_->_tmp111_ = NULL; + _data_->_tmp111_ = g_strdup (_data_->_tmp110_); + _data_->_tmp112_ = _data_->_tmp111_; + trf_affl_info_set_url (_data_->_tmp108_, _data_->_tmp112_); + _g_free0 (_data_->_tmp112_); _g_object_unref0 (_data_->postal_address); _g_free0 (_data_->country); _g_free0 (_data_->postal_code); @@ -8148,10 +8155,10 @@ { _data_->e1 = _data_->_inner_error_; _data_->_inner_error_ = NULL; - _data_->_tmp111_ = _data_->query; - _data_->_tmp112_ = _data_->e1; - _data_->_tmp113_ = _data_->_tmp112_->message; - g_warning ("trf-persona-store.vala:1816: Couldn't fetch affiliation info: %s %s", _data_->_tmp111_, _data_->_tmp113_); + _data_->_tmp113_ = _data_->query; + _data_->_tmp114_ = _data_->e1; + _data_->_tmp115_ = _data_->_tmp114_->message; + g_warning ("trf-persona-store.vala:1819: Couldn't fetch affiliation info: %s %s", _data_->_tmp113_, _data_->_tmp115_); _g_error_free0 (_data_->e1); } goto __finally9; @@ -8159,10 +8166,10 @@ { _data_->e2 = _data_->_inner_error_; _data_->_inner_error_ = NULL; - _data_->_tmp114_ = _data_->query; - _data_->_tmp115_ = _data_->e2; - _data_->_tmp116_ = _data_->_tmp115_->message; - g_warning ("trf-persona-store.vala:1821: Couldn't fetch affiliation info: %s %s", _data_->_tmp114_, _data_->_tmp116_); + _data_->_tmp116_ = _data_->query; + _data_->_tmp117_ = _data_->e2; + _data_->_tmp118_ = _data_->_tmp117_->message; + g_warning ("trf-persona-store.vala:1824: Couldn't fetch affiliation info: %s %s", _data_->_tmp116_, _data_->_tmp118_); _g_error_free0 (_data_->e2); } __finally9: @@ -8209,9 +8216,9 @@ TrfPersonaStoreInsertPersonaData* _data_; TrfPersonaStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; _data_ = g_slice_new0 (TrfPersonaStoreInsertPersonaData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_insert_persona); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_insert_persona_data_free); @@ -8259,7 +8266,7 @@ _data_->contact_urn = NULL; { _data_->_tmp0_ = _data_->query; - g_debug ("trf-persona-store.vala:1835: _insert_persona: %s", _data_->_tmp0_); + g_debug ("trf-persona-store.vala:1838: _insert_persona: %s", _data_->_tmp0_); _data_->_tmp1_ = _data_->self->priv->_connection; _data_->_tmp2_ = _data_->query; _data_->_state_ = 1; @@ -8343,7 +8350,7 @@ _data_->contact_urn = NULL; _data_->_tmp17_ = _data_->e; _data_->_tmp18_ = _data_->_tmp17_->message; - g_warning ("trf-persona-store.vala:1868: Couldn't insert nco:PersonContact: %s", _data_->_tmp18_); + g_warning ("trf-persona-store.vala:1871: Couldn't insert nco:PersonContact: %s", _data_->_tmp18_); _g_error_free0 (_data_->e); } __finally10: @@ -8390,7 +8397,7 @@ TrfPersonaStoreSingleValueQueryData* _data_; TrfPersonaStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (TrfPersonaStoreSingleValueQueryData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_single_value_query); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_single_value_query_data_free); @@ -8504,7 +8511,7 @@ TrfPersonaStoreMultiValueQueryData* _data_; TrfPersonaStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (TrfPersonaStoreMultiValueQueryData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_multi_value_query); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_multi_value_query_data_free); @@ -8549,7 +8556,7 @@ _data_->_tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL); _data_->ret = _data_->_tmp0_; _data_->_tmp1_ = _data_->query; - g_debug ("trf-persona-store.vala:1888: [_multi_value_query] %s", _data_->_tmp1_); + g_debug ("trf-persona-store.vala:1891: [_multi_value_query] %s", _data_->_tmp1_); { _data_->_tmp2_ = _data_->self->priv->_connection; _data_->_tmp3_ = _data_->query; @@ -8604,7 +8611,7 @@ _data_->_tmp14_ = _data_->query; _data_->_tmp15_ = _data_->e1; _data_->_tmp16_ = _data_->_tmp15_->message; - g_warning ("trf-persona-store.vala:1902: Couldn't run query: %s %s", _data_->_tmp14_, _data_->_tmp16_); + g_warning ("trf-persona-store.vala:1905: Couldn't run query: %s %s", _data_->_tmp14_, _data_->_tmp16_); _g_error_free0 (_data_->e1); } goto __finally11; @@ -8615,7 +8622,7 @@ _data_->_tmp17_ = _data_->query; _data_->_tmp18_ = _data_->e2; _data_->_tmp19_ = _data_->_tmp18_->message; - g_warning ("trf-persona-store.vala:1906: Couldn't run query: %s %s", _data_->_tmp17_, _data_->_tmp19_); + g_warning ("trf-persona-store.vala:1909: Couldn't run query: %s %s", _data_->_tmp17_, _data_->_tmp19_); _g_error_free0 (_data_->e2); } __finally11: @@ -8658,7 +8665,7 @@ TrfPersonaStoreUrnFromTrackerIdData* _data_; TrfPersonaStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (TrfPersonaStoreUrnFromTrackerIdData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_urn_from_tracker_id); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_urn_from_tracker_id_data_free); @@ -8747,7 +8754,7 @@ TrfPersona* _tmp1_; TrfPersona* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; _data_ = g_slice_new0 (TrfPersonaStoreSetNicknameData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_set_nickname); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_set_nickname_data_free); @@ -8989,11 +8996,11 @@ TrfPersona* _tmp1_; TrfPersona* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; const gchar* _tmp5_; - const gchar* _tmp6_; + gchar* _tmp6_; const gchar* _tmp7_; - const gchar* _tmp8_; + gchar* _tmp8_; _data_ = g_slice_new0 (TrfPersonaStoreSetTrackerPropertyData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_set_tracker_property); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_set_tracker_property_data_free); @@ -10434,7 +10441,7 @@ _data_->_tmp29_ = _data_->_tmp28_; _data_->_tmp30_ = _data_->e1; _data_->_tmp31_ = _data_->_tmp30_->message; - g_warning ("trf-persona-store.vala:2305: Couldn't cache avatar for Trf.Persona '%s" \ + g_warning ("trf-persona-store.vala:2308: Couldn't cache avatar for Trf.Persona '%s" \ "': %s", _data_->_tmp29_, _data_->_tmp31_); _g_error_free0 (_data_->e1); } @@ -10626,7 +10633,7 @@ FolksPersona* _tmp1_; FolksPersona* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; _data_ = g_slice_new0 (TrfPersonaStoreSetFullNameData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_set_full_name); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_set_full_name_data_free); @@ -11107,9 +11114,9 @@ TrfPersonaStoreTrackerUpdateData* _data_; TrfPersonaStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; _data_ = g_slice_new0 (TrfPersonaStoreTrackerUpdateData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_tracker_update); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_tracker_update_data_free); @@ -11156,7 +11163,7 @@ _data_->ret = FALSE; _data_->_tmp0_ = _data_->caller; _data_->_tmp1_ = _data_->query; - g_debug ("trf-persona-store.vala:2530: %s: %s", _data_->_tmp0_, _data_->_tmp1_); + g_debug ("trf-persona-store.vala:2533: %s: %s", _data_->_tmp0_, _data_->_tmp1_); { _data_->_tmp2_ = _data_->self->priv->_connection; _data_->_tmp3_ = _data_->query; @@ -11190,7 +11197,7 @@ _data_->_tmp5_ = _data_->e1; _data_->_tmp6_ = _data_->_tmp5_->message; _data_->_tmp7_ = _data_->query; - g_warning ("trf-persona-store.vala:2539: [%s] SPARQL syntax error: %s. Query: %s", _data_->_tmp4_, _data_->_tmp6_, _data_->_tmp7_); + g_warning ("trf-persona-store.vala:2542: [%s] SPARQL syntax error: %s. Query: %s", _data_->_tmp4_, _data_->_tmp6_, _data_->_tmp7_); _g_error_free0 (_data_->e1); } goto __finally14; @@ -11201,7 +11208,7 @@ _data_->_tmp8_ = _data_->caller; _data_->_tmp9_ = _data_->e2; _data_->_tmp10_ = _data_->_tmp9_->message; - g_warning ("trf-persona-store.vala:2544: [%s] IO error: %s", _data_->_tmp8_, _data_->_tmp10_); + g_warning ("trf-persona-store.vala:2547: [%s] IO error: %s", _data_->_tmp8_, _data_->_tmp10_); _g_error_free0 (_data_->e2); } goto __finally14; @@ -11212,7 +11219,7 @@ _data_->_tmp11_ = _data_->caller; _data_->_tmp12_ = _data_->e3; _data_->_tmp13_ = _data_->_tmp12_->message; - g_warning ("trf-persona-store.vala:2549: [%s] DBus error: %s", _data_->_tmp11_, _data_->_tmp13_); + g_warning ("trf-persona-store.vala:2552: [%s] DBus error: %s", _data_->_tmp11_, _data_->_tmp13_); _g_error_free0 (_data_->e3); } __finally14: @@ -11253,7 +11260,7 @@ TrfPersonaStoreAffiliationsFromPersonaData* _data_; TrfPersonaStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (TrfPersonaStoreAffiliationsFromPersonaData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_affiliations_from_persona); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_affiliations_from_persona_data_free); @@ -11334,7 +11341,7 @@ TrfPersonaStorePhonesFromAffiliationData* _data_; TrfPersonaStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (TrfPersonaStorePhonesFromAffiliationData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_phones_from_affiliation); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_phones_from_affiliation_data_free); @@ -11415,7 +11422,7 @@ TrfPersonaStorePostalsFromAffiliationData* _data_; TrfPersonaStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (TrfPersonaStorePostalsFromAffiliationData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_postals_from_affiliation); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_postals_from_affiliation_data_free); @@ -11496,7 +11503,7 @@ TrfPersonaStoreImaddrsFromAffiliationData* _data_; TrfPersonaStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (TrfPersonaStoreImaddrsFromAffiliationData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_imaddrs_from_affiliation); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_imaddrs_from_affiliation_data_free); @@ -11577,7 +11584,7 @@ TrfPersonaStoreEmailsFromAffiliationData* _data_; TrfPersonaStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (TrfPersonaStoreEmailsFromAffiliationData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_emails_from_affiliation); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_emails_from_affiliation_data_free); @@ -11657,7 +11664,7 @@ TrfPersonaStoreResourceUsageCountData* _data_; TrfPersonaStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (TrfPersonaStoreResourceUsageCountData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_resource_usage_count); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_resource_usage_count_data_free); @@ -11754,7 +11761,7 @@ TrfPersonaStoreDeleteResourceData* _data_; TrfPersonaStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; gboolean _tmp3_; _data_ = g_slice_new0 (TrfPersonaStoreDeleteResourceData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_delete_resource); @@ -11880,11 +11887,11 @@ TrfPersonaStoreLinkedResourcesData* _data_; TrfPersonaStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; const gchar* _tmp5_; - const gchar* _tmp6_; + gchar* _tmp6_; _data_ = g_slice_new0 (TrfPersonaStoreLinkedResourcesData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_linked_resources); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_linked_resources_data_free); @@ -12079,11 +12086,11 @@ TrfPersonaStoreUrnFromPropertyData* _data_; TrfPersonaStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; const gchar* _tmp5_; - const gchar* _tmp6_; + gchar* _tmp6_; _data_ = g_slice_new0 (TrfPersonaStoreUrnFromPropertyData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _trf_persona_store_urn_from_property); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _trf_persona_store_urn_from_property_data_free); @@ -12313,7 +12320,7 @@ * * See {@link Folks.PersonaStore.type_id}. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_TYPE_ID, "type-id"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_TYPE_ID, g_param_spec_string ("type-id", "type-id", "type-id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can add {@link Folks.Persona}s. * @@ -12321,7 +12328,7 @@ * * @since 0.5.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_CAN_ADD_PERSONAS, "can-add-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_CAN_ADD_PERSONAS, g_param_spec_enum ("can-add-personas", "can-add-personas", "can-add-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can set the alias of {@link Folks.Persona}s. * @@ -12329,7 +12336,7 @@ * * @since 0.5.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_CAN_ALIAS_PERSONAS, "can-alias-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_CAN_ALIAS_PERSONAS, g_param_spec_enum ("can-alias-personas", "can-alias-personas", "can-alias-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can set the groups of {@link Folks.Persona}s. * @@ -12337,7 +12344,7 @@ * * @since 0.5.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_CAN_GROUP_PERSONAS, "can-group-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_CAN_GROUP_PERSONAS, g_param_spec_enum ("can-group-personas", "can-group-personas", "can-group-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore can remove {@link Folks.Persona}s. * @@ -12345,7 +12352,7 @@ * * @since 0.5.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_CAN_REMOVE_PERSONAS, "can-remove-personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_CAN_REMOVE_PERSONAS, g_param_spec_enum ("can-remove-personas", "can-remove-personas", "can-remove-personas", FOLKS_TYPE_MAYBE_BOOL, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this PersonaStore has been prepared. * @@ -12353,20 +12360,20 @@ * * @since 0.5.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_IS_PREPARED, "is-prepared"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_IS_PREPARED, g_param_spec_boolean ("is-prepared", "is-prepared", "is-prepared", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} * * @since 0.6.2 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_ALWAYS_WRITEABLE_PROPERTIES, "always-writeable-properties"); - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_IS_QUIESCENT, "is-quiescent"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_ALWAYS_WRITEABLE_PROPERTIES, g_param_spec_boxed ("always-writeable-properties", "always-writeable-properties", "always-writeable-properties", G_TYPE_STRV, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_IS_QUIESCENT, g_param_spec_boolean ("is-quiescent", "is-quiescent", "is-quiescent", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * The {@link Persona}s exposed by this PersonaStore. * * See {@link Folks.PersonaStore.personas}. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_PERSONAS, "personas"); + g_object_class_install_property (G_OBJECT_CLASS (klass), TRF_PERSONA_STORE_PERSONAS, g_param_spec_object ("personas", "personas", "personas", GEE_TYPE_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); } diff -Nru folks-0.6.6/backends/tracker/lib/trf-persona-store.vala folks-0.6.7/backends/tracker/lib/trf-persona-store.vala --- folks-0.6.6/backends/tracker/lib/trf-persona-store.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/backends/tracker/lib/trf-persona-store.vala 2012-02-17 23:07:32.000000000 +0000 @@ -1795,8 +1795,11 @@ var postal_address = new Folks.PostalAddress ( po_box, extension, street, locality, region, postal_code, country, null, affl_info.affl_tracker_id); - affl_info.postal_address_fd = - new Folks.PostalAddressFieldDetails (postal_address); + if (!postal_address.is_empty ()) + { + affl_info.postal_address_fd = + new Folks.PostalAddressFieldDetails (postal_address); + } affl_info.email = cursor.get_string (Trf.AfflInfoFields.AFFL_EMAIL).dup (); diff -Nru folks-0.6.6/backends/tracker/lib/trf-persona.vala folks-0.6.7/backends/tracker/lib/trf-persona.vala --- folks-0.6.6/backends/tracker/lib/trf-persona.vala 2011-12-13 23:35:55.000000000 +0000 +++ folks-0.6.7/backends/tracker/lib/trf-persona.vala 2012-02-17 23:07:32.000000000 +0000 @@ -834,10 +834,13 @@ a_info[Trf.PostalAddressFields.COUNTRY], null, null); - var pafd = new PostalAddressFieldDetails (pa); - pafd.id = a_info[Trf.PostalAddressFields.TRACKER_ID]; + if (!pa.is_empty ()) + { + var pafd = new PostalAddressFieldDetails (pa); + pafd.id = a_info[Trf.PostalAddressFields.TRACKER_ID]; - postal_addresses.add (pafd); + postal_addresses.add (pafd); + } } this._postal_addresses = postal_addresses; @@ -996,9 +999,12 @@ var new_role = new Role (title, organisation, null); new_role.role = role; - var role_fd = new RoleFieldDetails (new_role); - role_fd.id = tracker_id; - role_fds.add (role_fd); + if (!new_role.is_empty ()) + { + var role_fd = new RoleFieldDetails (new_role); + role_fd.id = tracker_id; + role_fds.add (role_fd); + } } this._roles = role_fds; @@ -1011,12 +1017,15 @@ { var new_role = new Role (title, org, null); new_role.role = role; - var role_fd = new RoleFieldDetails (new_role); - role_fd.id = tracker_id; - if (this._roles.add (role_fd)) + if (!new_role.is_empty ()) { - this.notify_property ("roles"); - return true; + var role_fd = new RoleFieldDetails (new_role); + role_fd.id = tracker_id; + if (this._roles.add (role_fd)) + { + this.notify_property ("roles"); + return true; + } } return false; } diff -Nru folks-0.6.6/backends/tracker/lib/trf-util.c folks-0.6.7/backends/tracker/lib/trf-util.c --- folks-0.6.6/backends/tracker/lib/trf-util.c 2011-12-13 23:40:21.000000000 +0000 +++ folks-0.6.7/backends/tracker/lib/trf-util.c 2012-02-23 00:02:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* trf-util.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* trf-util.c generated by valac 0.15.1, the Vala compiler * generated from trf-util.vala, do not modify */ /* diff -Nru folks-0.6.6/backends/tracker/Makefile.am folks-0.6.7/backends/tracker/Makefile.am --- folks-0.6.6/backends/tracker/Makefile.am 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/backends/tracker/Makefile.am 2012-01-12 17:25:24.000000000 +0000 @@ -2,17 +2,8 @@ BACKEND_NAME = "tracker" -AM_CPPFLAGS = \ - -I$(top_srcdir)/folks \ - -I$(top_srcdir)/backends/tracker/lib \ - -I$(top_srcdir)/backends/tracker/lib/folks \ - -include $(CONFIG_HEADER) \ - -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ - -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ - -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ - $(NULL) - VALAFLAGS += \ + $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ --vapidir=. \ --vapidir=vapi \ @@ -38,7 +29,19 @@ tracker-sparql-0.12 \ $(NULL) +tracker_la_CPPFLAGS = \ + -I$(top_srcdir)/folks \ + -I$(top_srcdir)/backends/tracker/lib \ + -I$(top_srcdir)/backends/tracker/lib/folks \ + -include $(CONFIG_HEADER) \ + -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ + -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ + -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ + $(NULL) + tracker_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ @@ -46,15 +49,23 @@ $(NULL) tracker_la_LIBADD = \ + $(AM_LIBADD) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(top_builddir)/folks/libfolks.la \ $(TRACKER_SPARQL_LIBS) \ - lib/libfolks-tracker.la \ + $(top_builddir)/backends/tracker/lib/libfolks-tracker.la \ $(NULL) -tracker_la_LDFLAGS = -shared -fPIC -module -avoid-version +tracker_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ + -shared \ + -fPIC \ + -module \ + -avoid-version \ + $(NULL) GITIGNOREFILES = \ folks-backend-tracker.vapi \ diff -Nru folks-0.6.6/backends/tracker/Makefile.in folks-0.6.7/backends/tracker/Makefile.in --- folks-0.6.6/backends/tracker/Makefile.in 2011-12-13 23:38:39.000000000 +0000 +++ folks-0.6.7/backends/tracker/Makefile.in 2012-02-23 00:04:12.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,10 +39,11 @@ tr-backend-factory.c tr-backend.c tracker_la_vala.stamp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -70,12 +71,19 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(backenddir)" LTLIBRARIES = $(backend_LTLIBRARIES) am__DEPENDENCIES_1 = tracker_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(top_builddir)/folks/libfolks.la \ - $(am__DEPENDENCIES_1) lib/libfolks-tracker.la + $(am__DEPENDENCIES_1) \ + $(top_builddir)/backends/tracker/lib/libfolks-tracker.la am_tracker_la_OBJECTS = tracker_la-tr-backend.lo \ tracker_la-tr-backend-factory.lo tracker_la_OBJECTS = $(am_tracker_la_OBJECTS) @@ -181,6 +189,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -290,8 +300,8 @@ VALADOC = @VALADOC@ VALADOC_CFLAGS = @VALADOC_CFLAGS@ VALADOC_LIBS = @VALADOC_LIBS@ -VALAFLAGS = @VALAFLAGS@ $(ERROR_VALAFLAGS) --vapidir=. --vapidir=vapi \ - --vapidir=$(top_builddir)/backends/tracker/lib \ +VALAFLAGS = @VALAFLAGS@ $(AM_VALAFLAGS) $(ERROR_VALAFLAGS) --vapidir=. \ + --vapidir=vapi --vapidir=$(top_builddir)/backends/tracker/lib \ --vapidir=$(top_srcdir)/folks $(addprefix --pkg \ ,$(tracker_deps)) $(NULL) VAPIDIR = @VAPIDIR@ @@ -353,16 +363,6 @@ top_srcdir = @top_srcdir@ SUBDIRS = lib BACKEND_NAME = "tracker" -AM_CPPFLAGS = \ - -I$(top_srcdir)/folks \ - -I$(top_srcdir)/backends/tracker/lib \ - -I$(top_srcdir)/backends/tracker/lib/folks \ - -include $(CONFIG_HEADER) \ - -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ - -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ - -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ - $(NULL) - backenddir = $(BACKEND_DIR)/tracker backend_LTLIBRARIES = tracker.la tracker_la_SOURCES = \ @@ -379,7 +379,19 @@ tracker-sparql-0.12 \ $(NULL) +tracker_la_CPPFLAGS = \ + -I$(top_srcdir)/folks \ + -I$(top_srcdir)/backends/tracker/lib \ + -I$(top_srcdir)/backends/tracker/lib/folks \ + -include $(CONFIG_HEADER) \ + -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \ + -DBACKEND_NAME=\"$(BACKEND_NAME)\" \ + -DG_LOG_DOMAIN=\"$(BACKEND_NAME)\" \ + $(NULL) + tracker_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ @@ -387,15 +399,24 @@ $(NULL) tracker_la_LIBADD = \ + $(AM_LIBADD) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(top_builddir)/folks/libfolks.la \ $(TRACKER_SPARQL_LIBS) \ - lib/libfolks-tracker.la \ + $(top_builddir)/backends/tracker/lib/libfolks-tracker.la \ + $(NULL) + +tracker_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ + -shared \ + -fPIC \ + -module \ + -avoid-version \ $(NULL) -tracker_la_LDFLAGS = -shared -fPIC -module -avoid-version GITIGNOREFILES = \ folks-backend-tracker.vapi \ $(tracker_la_SOURCES:.vala=.c) \ @@ -482,50 +503,45 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< tracker_la-tr-backend.lo: tr-backend.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tracker_la_CFLAGS) $(CFLAGS) -MT tracker_la-tr-backend.lo -MD -MP -MF $(DEPDIR)/tracker_la-tr-backend.Tpo -c -o tracker_la-tr-backend.lo `test -f 'tr-backend.c' || echo '$(srcdir)/'`tr-backend.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tracker_la_CPPFLAGS) $(CPPFLAGS) $(tracker_la_CFLAGS) $(CFLAGS) -MT tracker_la-tr-backend.lo -MD -MP -MF $(DEPDIR)/tracker_la-tr-backend.Tpo -c -o tracker_la-tr-backend.lo `test -f 'tr-backend.c' || echo '$(srcdir)/'`tr-backend.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tracker_la-tr-backend.Tpo $(DEPDIR)/tracker_la-tr-backend.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tr-backend.c' object='tracker_la-tr-backend.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tr-backend.c' object='tracker_la-tr-backend.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tracker_la_CFLAGS) $(CFLAGS) -c -o tracker_la-tr-backend.lo `test -f 'tr-backend.c' || echo '$(srcdir)/'`tr-backend.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tracker_la_CPPFLAGS) $(CPPFLAGS) $(tracker_la_CFLAGS) $(CFLAGS) -c -o tracker_la-tr-backend.lo `test -f 'tr-backend.c' || echo '$(srcdir)/'`tr-backend.c tracker_la-tr-backend-factory.lo: tr-backend-factory.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tracker_la_CFLAGS) $(CFLAGS) -MT tracker_la-tr-backend-factory.lo -MD -MP -MF $(DEPDIR)/tracker_la-tr-backend-factory.Tpo -c -o tracker_la-tr-backend-factory.lo `test -f 'tr-backend-factory.c' || echo '$(srcdir)/'`tr-backend-factory.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tracker_la_CPPFLAGS) $(CPPFLAGS) $(tracker_la_CFLAGS) $(CFLAGS) -MT tracker_la-tr-backend-factory.lo -MD -MP -MF $(DEPDIR)/tracker_la-tr-backend-factory.Tpo -c -o tracker_la-tr-backend-factory.lo `test -f 'tr-backend-factory.c' || echo '$(srcdir)/'`tr-backend-factory.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/tracker_la-tr-backend-factory.Tpo $(DEPDIR)/tracker_la-tr-backend-factory.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='tr-backend-factory.c' object='tracker_la-tr-backend-factory.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='tr-backend-factory.c' object='tracker_la-tr-backend-factory.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tracker_la_CFLAGS) $(CFLAGS) -c -o tracker_la-tr-backend-factory.lo `test -f 'tr-backend-factory.c' || echo '$(srcdir)/'`tr-backend-factory.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tracker_la_CPPFLAGS) $(CPPFLAGS) $(tracker_la_CFLAGS) $(CFLAGS) -c -o tracker_la-tr-backend-factory.lo `test -f 'tr-backend-factory.c' || echo '$(srcdir)/'`tr-backend-factory.c $(srcdir)/tr-backend.c: $(srcdir)/tracker_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tracker_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/tracker_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) tracker_la_vala.stamp; \ fi $(srcdir)/tr-backend-factory.c: $(srcdir)/tracker_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/tracker_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/tracker_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) tracker_la_vala.stamp; \ fi tracker_la_vala.stamp: $(tracker_la_SOURCES) @@ -749,10 +765,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/backends/tracker/tr-backend.c folks-0.6.7/backends/tracker/tr-backend.c --- folks-0.6.6/backends/tracker/tr-backend.c 2011-12-13 23:40:47.000000000 +0000 +++ folks-0.6.7/backends/tracker/tr-backend.c 2012-02-23 00:02:08.000000000 +0000 @@ -1,4 +1,4 @@ -/* tr-backend.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* tr-backend.c generated by valac 0.15.1, the Vala compiler * generated from tr-backend.vala, do not modify */ /* @@ -348,7 +348,7 @@ _data_->self->priv->_prepare_pending = TRUE; { _data_->_tmp6_ = _data_->self->priv->_persona_stores; - _data_->_tmp7_ = gee_map_get_values ((GeeMap*) _data_->_tmp6_); + _data_->_tmp7_ = gee_abstract_map_get_values ((GeeMap*) _data_->_tmp6_); _data_->_tmp8_ = _data_->_tmp7_; _data_->_tmp9_ = _data_->_tmp8_; _data_->_tmp10_ = NULL; @@ -454,11 +454,10 @@ FolksPersonaStore* _tmp0_; guint _tmp1_ = 0U; FolksPersonaStore* _tmp2_; - GeeMap* _tmp3_; - GeeMap* _tmp4_; - FolksPersonaStore* _tmp5_; + GeeHashMap* _tmp3_; + FolksPersonaStore* _tmp4_; + const gchar* _tmp5_; const gchar* _tmp6_; - const gchar* _tmp7_; g_return_if_fail (self != NULL); g_return_if_fail (store != NULL); _tmp0_ = store; @@ -466,12 +465,11 @@ g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) __folks_backends_tr_backend_store_removed_cb_folks_persona_store_removed, self); _tmp2_ = store; g_signal_emit_by_name ((FolksBackend*) self, "persona-store-removed", _tmp2_); - _tmp3_ = folks_backend_get_persona_stores ((FolksBackend*) self); - _tmp4_ = _tmp3_; - _tmp5_ = store; - _tmp6_ = folks_persona_store_get_id (_tmp5_); - _tmp7_ = _tmp6_; - gee_map_unset (_tmp4_, _tmp7_, NULL); + _tmp3_ = self->priv->_persona_stores; + _tmp4_ = store; + _tmp5_ = folks_persona_store_get_id (_tmp4_); + _tmp6_ = _tmp5_; + gee_abstract_map_unset ((GeeAbstractMap*) _tmp3_, _tmp6_, NULL); } @@ -557,17 +555,17 @@ /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_TR_BACKEND_NAME, "name"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_TR_BACKEND_NAME, g_param_spec_string ("name", "name", "name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_TR_BACKEND_PERSONA_STORES, "persona-stores"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_TR_BACKEND_PERSONA_STORES, g_param_spec_object ("persona-stores", "persona-stores", "persona-stores", GEE_TYPE_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this Backend has been prepared. * * See {@link Folks.Backend.is_prepared}. */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_TR_BACKEND_IS_PREPARED, "is-prepared"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_TR_BACKEND_IS_PREPARED, g_param_spec_boolean ("is-prepared", "is-prepared", "is-prepared", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); /** * Whether this Backend has reached a quiescent state. * @@ -575,7 +573,7 @@ * * @since 0.6.2 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_TR_BACKEND_IS_QUIESCENT, "is-quiescent"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_BACKENDS_TR_BACKEND_IS_QUIESCENT, g_param_spec_boolean ("is-quiescent", "is-quiescent", "is-quiescent", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); } diff -Nru folks-0.6.6/backends/tracker/tr-backend-factory.c folks-0.6.7/backends/tracker/tr-backend-factory.c --- folks-0.6.6/backends/tracker/tr-backend-factory.c 2011-12-13 23:40:47.000000000 +0000 +++ folks-0.6.7/backends/tracker/tr-backend-factory.c 2012-02-23 00:02:08.000000000 +0000 @@ -1,4 +1,4 @@ -/* tr-backend-factory.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* tr-backend-factory.c generated by valac 0.15.1, the Vala compiler * generated from tr-backend-factory.vala, do not modify */ /* diff -Nru folks-0.6.6/backends/tracker/tr-backend.vala folks-0.6.7/backends/tracker/tr-backend.vala --- folks-0.6.6/backends/tracker/tr-backend.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/backends/tracker/tr-backend.vala 2011-12-22 18:18:11.000000000 +0000 @@ -172,6 +172,6 @@ { store.removed.disconnect (this._store_removed_cb); this.persona_store_removed (store); - this.persona_stores.unset (store.id); + this._persona_stores.unset (store.id); } } diff -Nru folks-0.6.6/ChangeLog folks-0.6.7/ChangeLog --- folks-0.6.6/ChangeLog 2011-12-14 00:30:37.000000000 +0000 +++ folks-0.6.7/ChangeLog 2012-02-23 00:04:46.000000000 +0000 @@ -1,3 +1,997 @@ +commit 75da6df96b004220cf5baf25027827ef861d2839 +Author: Travis Reitter +Date: Wed Feb 22 14:18:23 2012 -0800 + + Release version 0.6.7 + + configure.ac | 10 +++++----- + folks/postal-address-details.vala | 2 +- + folks/role-details.vala | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) + +commit 7c824b4baed19420bdd1eebca774aaf9cc5c4f6e +Author: Travis Reitter +Date: Wed Feb 22 15:50:26 2012 -0800 + + Temporarily disable troublesome tests due to bgo#668415 + + tests/eds/Makefile.am | 28 ++++++++++++++++++---------- + 1 files changed, 18 insertions(+), 10 deletions(-) + +commit c0003918e4be83e13e8823e0801486f05e66227d +Author: Travis Reitter +Date: Mon Jan 30 11:23:26 2012 -0800 + + Cut invalid overly-specific type cast + + The Vala compiler now correctly warns that typeof(Foo) + is invalid, + so this stops pretending we can be that specific. + + (The generated C code can't make a GValue as specific as the + above Vala + code fragment suggests; historically, the compiler would let you get + away with this, likely with the false assumption that the generic type + would ever be considered again.) + + folks/individual-aggregator.vala | 2 +- + tests/eds/add-persona.vala | 12 ++++++------ + tests/eds/link-personas.vala | 10 +++++----- + tests/tracker/add-persona.vala | 14 +++++++------- + tests/tracker/duplicated-emails.vala | 4 ++-- + tests/tracker/duplicated-phones.vala | 4 ++-- + tests/tracker/link-personas.vala | 4 ++-- + tests/tracker/match-email-addresses.vala | 4 ++-- + tests/tracker/match-im-addresses.vala | 4 ++-- + tests/tracker/match-known-emails.vala | 4 ++-- + tests/tracker/match-phone-number.vala | 4 ++-- + tests/tracker/remove-persona.vala | 2 +- + tests/tracker/set-duplicate-email.vala | 2 +- + 13 files changed, 35 insertions(+), 35 deletions(-) + +commit 55539ee4accd29d89d28d23e6ef76ad2ab023724 +Author: Colin Walters +Date: Fri Jan 20 14:46:14 2012 -0500 + + Build with vala 0.15 + + NEWS | 1 + + backends/key-file/kf-persona-store.vala | 13 +++---------- + configure.ac | 2 +- + folks/backend-store.vala | 16 ++++++++-------- + folks/object-cache.vala | 6 +++--- + tests/folks/backend-loading.vala | 6 +++--- + tests/lib/eds/backend.vala | 2 +- + tests/libsocialweb/aggregation.vala | 10 ++++------ + tools/inspect/inspect.vala | 2 +- + 9 files changed, 25 insertions(+), 33 deletions(-) + +commit 22159d44ec6e516f4d0266b8d1efec7273ef1db8 +Author: Travis Reitter +Date: Fri Feb 17 15:03:17 2012 -0800 + + Note fix for bgo#670196 in NEWS + + NEWS | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit ee8e0871a53e0209aa081342990a200d328aee48 +Author: Marek Černocký +Date: Fri Feb 17 11:28:42 2012 +0100 + + Updated Czech translation + + po/cs.po | 160 + ++++++++++++++++++++++++++++++++----------------------------- + 1 files changed, 84 insertions(+), 76 deletions(-) + +commit c231159f4206322dabf510f938a2e3979cf4fa4e +Author: Guillaume Desmottes +Date: Thu Feb 16 10:02:49 2012 +0100 + + add missing config.h includes + + https://bugzilla.gnome.org/show_bug.cgi?id=670196 + + tests/lib/telepathy/contactlist/conn.c | 3 +++ + .../telepathy/contactlist/contact-list-manager.c | 2 ++ + 2 files changed, 5 insertions(+), 0 deletions(-) + +commit a062e90a17c303c20063b4aa912779860f2e2de0 +Author: Guillaume Desmottes +Date: Thu Feb 16 10:02:13 2012 +0100 + + Disable glib deprecated warnings + + We need GValueArray for dbus-glib, and it got deprecated in GLib + 2.31.x + + https://bugzilla.gnome.org/show_bug.cgi?id=670196 + + configure.ac | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +commit 7f0a54b8e59a1d03181c67a035e8a924a67f5b0c +Author: Automatic Mirroring +Date: Thu Feb 16 11:57:35 2012 +0000 + + Add zh_CN to LINGUAS + + po/LINGUAS | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit d067754ab6edc0db833026bdcd23da7e733fa65b +Author: Wylmer Wang +Date: Thu Feb 16 11:56:39 2012 +0000 + + Add Simplified Chinese translation. + + po/zh_CN.po | 753 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 753 insertions(+), 0 deletions(-) + +commit 3b479090475e5eb7ab1d40a2de48e3b727f50f6c +Author: Mario Blättermann +Date: Sun Feb 5 13:52:33 2012 +0100 + + [l10n] Updated German translation + + po/de.po | 342 + +++++++++++++++++++++++++++++++++++++------------------------- + 1 files changed, 203 insertions(+), 139 deletions(-) + +commit 312d2c035bf68bea78f6d3f0e11b5b1dcba88097 +Author: Piotr Drąg +Date: Thu Feb 2 19:18:29 2012 +0100 + + Updated Polish translation + + po/pl.po | 186 + +++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 94 insertions(+), 92 deletions(-) + +commit 221cb22ae55b4cf9ecab6d02969a87ad72590c8e +Author: Matej Urbančič +Date: Tue Jan 31 20:10:18 2012 +0100 + + Updated Slovenian translation + + po/sl.po | 186 + +++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 93 insertions(+), 93 deletions(-) + +commit a8f50f0b7d77e83781c7dd7433ae99f48c64a9c8 +Author: Daniel Mustieles +Date: Tue Jan 31 13:14:54 2012 +0100 + + Updated Spanish translation + + po/es.po | 205 + +++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 104 insertions(+), 101 deletions(-) + +commit 3f78e4a1c5b6cb9084608fa3a28264341d4274c7 +Author: Travis Reitter +Date: Thu Jan 26 16:27:03 2012 -0800 + + Only add non-empty Role or PostalAddress fields in Tracker backend + + This prevents some newly-exposed test failures. + + backends/tracker/lib/trf-persona-store.vala | 7 ++++- + backends/tracker/lib/trf-persona.vala | 31 + +++++++++++++++++--------- + 2 files changed, 25 insertions(+), 13 deletions(-) + +commit 50171f5392901dca6eb1af48cc76a7b0c7ad7b5b +Author: Travis Reitter +Date: Tue Jan 24 18:00:29 2012 -0800 + + Don't assume every Tpf.Persona has a contact + + backends/telepathy/lib/tpf-persona-store.vala | 38 + +++++++++++++++++++++++- + 1 files changed, 36 insertions(+), 2 deletions(-) + +commit 22e4318d3ff4a10c94d51d509553428529c9a729 +Author: Travis Reitter +Date: Tue Jan 24 17:00:58 2012 -0800 + + Fix the nullity of test functions. + + tests/folks/aggregation.vala | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit 05e72fcf261fb7a45cebf6db58c754d1b548f72f +Author: Travis Reitter +Date: Tue Jan 24 15:57:32 2012 -0800 + + Make Individual implement PresenceDetails properly + + folks/individual.vala | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit 84ada94322ade52392f386b09450d1a92ed9d02c +Author: Travis Reitter +Date: Sat Jan 21 17:24:05 2012 -0800 + + Make Tpf.Persona properly implement the PresenceDetails properties. + + backends/telepathy/lib/tpf-persona.vala | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit e407887f03f84379934391760a779109f1237cbe +Author: Alexander Larsson +Date: Mon Jan 23 16:30:58 2012 +0100 + + Match names better for PotentialMatches + + We match alias as well as full name, to e.g. match an EDS contact + (full name) + with an IM contact (alias). + + Also, we make exact name matches bring the priority to HIGH alone, + which + is needed in the IM case since the alias is the only piece of data + we have to match on. + + https://bugzilla.gnome.org/show_bug.cgi?id=668499 + + folks/potential-match.vala | 46 + ++++++++++++++++++++++++++++++++++++++++--- + 1 files changed, 42 insertions(+), 4 deletions(-) + +commit 555d2d05f103dc48056a2f83521128c567c3159d +Author: Colin Walters +Date: Thu Jan 19 15:38:35 2012 -0500 + + autogen.sh: Honor NOCONFIGURE=1 + + See http://people.gnome.org/~walters/docs/build-api.txt + + autogen.sh | 24 ++++++++++++++---------- + 1 files changed, 14 insertions(+), 10 deletions(-) + +commit 1f6ad99baf8d64b6f887c8fb2c862779118a05c0 +Author: Fran Diéguez +Date: Tue Jan 17 01:52:27 2012 +0100 + + Updated Galician translations + + po/gl.po | 250 + +++++++++++++++++++++++++++++++++----------------------------- + 1 files changed, 134 insertions(+), 116 deletions(-) + +commit b5f3bfb649ec9b86c24f870177e3648df9f5a8c0 +Author: Marek Černocký +Date: Mon Jan 16 10:02:20 2012 +0100 + + Updated Czech translation + + po/cs.po | 244 + +++++++++++++++++++++++++++++++++----------------------------- + 1 files changed, 129 insertions(+), 115 deletions(-) + +commit 8c0c98a26914f5b1014866ae889f24d461ba3877 +Author: Philip Withnall +Date: Mon Jan 9 18:24:21 2012 +0000 + + eds: Add a dummy authentication handler + + This will deny any authentication requests, which goes some way + to stopping + address books remaining in the “opening” state + indefinitely. However, it + (curiously) doesn’t entirely eliminate the problem. + + It also looks like this is a situation where the ::opened signal + can return + an error while the async open() call doesn’t. Joy. + + backends/eds/lib/edsf-persona-store.vala | 26 + +++++++++++++++++++++++++- + 1 files changed, 25 insertions(+), 1 deletions(-) + +commit 1e3cde1b510a936832b04e741f634dda72d943d3 +Author: Philip Withnall +Date: Mon Jan 9 14:47:02 2012 +0000 + + telepathy: Fix weak notification of TpContacts + + By the time our weak notification callback was called, the + TpContact’s + handle had been set to 0, which mucked things up for us. + + Closes: https://bugzilla.gnome.org/show_bug.cgi?id=667535 + + NEWS | 2 + + backends/telepathy/lib/tpf-persona-store.vala | 36 + ++++++++++++++++--------- + 2 files changed, 25 insertions(+), 13 deletions(-) + +commit bf8dfa934b1e6fa31818d51a3eba5cbb04a1632b +Author: Philip Withnall +Date: Fri Jan 6 23:08:10 2012 +0000 + + telepathy: Keep Tpf.PersonaStore.personas up to date for cached stores + + When loading a Tpf.PersonaStore from its cache, ensure Personas + are inserted + into both the set of personas _and_ the map of IIDs to personas. + + This fixes Tpf.PersonaStore.personas being empty for cached stores. + + Helps: https://bugzilla.gnome.org/show_bug.cgi?id=667410 + + backends/telepathy/lib/tpf-persona-store.vala | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit d258c86814c0dd4405a8a2b7a45f3d2a036fa1eb +Author: Philip Withnall +Date: Fri Jan 6 23:05:05 2012 +0000 + + Bug 667410 — A second aggregator instance only fetches a subset + of contacts + + This was happening because the initial BackendStore was hanging + around across + multiple IndividualAggregator instances, keeping all the Backends, + PersonaStores and Personas alive. + + The IndividualAggregator didn’t have code to deal with pre-prepared + Backends + and PersonaStores, meaning it never realised the Personas existed + (because + they weren’t announced via personas-changed signals), and thus + never created + Individuals out of them. + + This commit fixes the problem by having IndividualAggregator check for + existing Backends, PersonaStores and Personas when prepare() + is called. + + It also adds a test case to the folks test suite, based on the + one written + by Guillaume in bgo#667410. + + Closes: https://bugzilla.gnome.org/show_bug.cgi?id=667410 + + NEWS | 2 + + folks/backend.vala | 10 ++++ + folks/individual-aggregator.vala | 50 ++++++++++++++++++++- + folks/persona-store.vala | 10 ++++ + tests/folks/init.vala | 91 + ++++++++++++++++++++++++++++++++++++++ + 5 files changed, 161 insertions(+), 2 deletions(-) + +commit 93a0fa7049f9a94ff917fa3bba24b376257a7c2b +Author: Philip Withnall +Date: Mon Jan 9 11:16:09 2012 +0000 + + eds: Mark a few more contact fields as being handled + + This should prevent a few debug messages about unhandled fields. + + backends/eds/lib/edsf-persona-store.vala | 19 ++++++++++++++----- + 1 files changed, 14 insertions(+), 5 deletions(-) + +commit c34cd4b9f07b22f3813c3f26051521cb6338ea5e +Author: Philip Withnall +Date: Mon Jan 9 10:55:02 2012 +0000 + + core: Set G_MESSAGES_DEBUG when parsing debug domains + + This stops GLib from dropping all our debug output (unless the + user has + remembered to set G_MESSAGES_DEBUG manually in addition to + FOLKS_DEBUG). + + folks/debug.vala | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +commit 065de8cfbe14b819a0f3e2670060899b8cc8b9be +Author: Philip Withnall +Date: Mon Jan 9 10:12:30 2012 +0000 + + build: Add folks-internal files to MAINTAINERCLEANFILES etc. + + folks/Makefile.am | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +commit 97dce24a20534d33dbea1d9520d9e1333c4e8e56 +Author: Philip Withnall +Date: Sun Jan 8 23:43:29 2012 +0000 + + docs: Add NEWS for the previous two commits + + NEWS | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit 4acfe29de66deff09e778084dae2d9f39fdbf28e +Author: Philip Withnall +Date: Sun Jan 8 23:16:14 2012 +0000 + + build: Add lcov make targets from telepathy-glib + + Add lcov.mk, copied from telepathy-glib: + http://cgit.freedesktop.org/telepathy/telepathy-glib/tree/tools/lcov.am + with the tp-glib–specific bits removed. + + These targets are only useful if folks is compiled with + --enable-code-coverage. + + To run the test suite and generate a report, run `make lcov-check`. To + just + generate a report without running the test suite, run `make + lcov-report`. + + The .info file and generated report are only deleted by + `make maintainer-clean`, since the developer might want to refer + to them + across other cleans. + + Closes: https://bugzilla.gnome.org/show_bug.cgi?id=659610 + + Makefile.am | 15 +++++++++++++++ + lcov.mk | 23 +++++++++++++++++++++++ + 2 files changed, 38 insertions(+), 0 deletions(-) + +commit 56e69d1c2bdb2311f01b8d291f85645a356edd78 +Author: Philip Withnall +Date: Sun Jan 8 21:31:04 2012 +0000 + + Bug 657063 — Allow to pass a command to folks-inspect + + Add a non-interactive mode to folks-inspect which executes the command + given on the command line synchronously, and then exits. + + Closes: https://bugzilla.gnome.org/show_bug.cgi?id=657063 + + tools/inspect/inspect.vala | 165 + ++++++++++++++++++++++++++++++++++---------- + 1 files changed, 128 insertions(+), 37 deletions(-) + +commit ba2d3fb69a0c5145ef3fca75377a8f63137025cc +Author: Philip Withnall +Date: Sun Jan 8 19:51:25 2012 +0000 + + inspect: Set up locale in main() + + tools/inspect/Makefile.am | 3 +++ + tools/inspect/inspect.vala | 3 +++ + 2 files changed, 6 insertions(+), 0 deletions(-) + +commit 7ee89fb9376af9aa671e86c5ef4116819c5a0cdf +Author: Philip Withnall +Date: Sun Jan 8 19:19:03 2012 +0000 + + tests: Add a quiescence test for the Telepathy backend + + This just checks that an aggregator with a single Tpf.PersonaStore + reaches + quiescence in a reasonable time. + + tests/lib/Makefile.am | 25 +++++++++- + tests/lib/test-utils.vala | 44 +++++++++++++++++ + tests/telepathy/Makefile.am | 7 ++- + tests/telepathy/init.vala | 109 + +++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 182 insertions(+), 3 deletions(-) + +commit d6e9f684b0303b6c7365373dad1adb937c7e99cf +Author: Philip Withnall +Date: Sun Jan 8 17:02:40 2012 +0000 + + tests: Add a fake-tp-backend program in the Telepathy tests + + This is not an automated test, and is intended to be run manually + on a D-Bus + bus specified using the DBUS_SESSION_BUS_ADDRESS environment variable, + together with a client program (for example, a test program) to be + run against + it. + + tests/telepathy/Makefile.am | 8 +++- + tests/telepathy/fake-tp-backend.vala | 68 + ++++++++++++++++++++++++++++++++++ + 2 files changed, 75 insertions(+), 1 deletions(-) + +commit 945cb3d7301b94205ad77fb454482d07679f5037 +Author: Philip Withnall +Date: Sun Jan 8 15:58:16 2012 +0000 + + build: Add an --enable-code-coverage configure parameter + + When building with code coverage enabled, -fprofile-arcs and + -ftest-coverage + will be passed to gcc during compilation, and -lgcov will be passed + during + linking. + + Code coverage is disabled by default for the core of folks, since + it has to + turn off valac’s ‘-g’ option to output #line directives in + the generated C + code. This is necessary because lcov gets confused by execution + passing + between .vala and .c files. More useful results can be obtained + by just + looking at the code coverage of the .c files and ignoring the + boilerplate + in them. + + (More specifically, lcov reports on .vala files aren’t especially + useful + because they erroneously mark many lines as being executed which + actually + weren’t. This happens because one Vala line may be compiled + into several + lines of C, some of which will be executed unconditionally even if + the Vala + line itself isn’t executed. This will fool lcov into thinking the + Vala line + was actually executed.) + + Code coverage is automatically turned off when making a release. + + backends/eds/Makefile.am | 2 + + backends/eds/lib/Makefile.am | 2 + + backends/key-file/Makefile.am | 2 + + backends/libsocialweb/Makefile.am | 2 + + backends/libsocialweb/lib/Makefile.am | 2 + + backends/telepathy/Makefile.am | 2 + + backends/telepathy/lib/Makefile.am | 4 +++ + backends/tracker/Makefile.am | 2 + + backends/tracker/lib/Makefile.am | 2 + + configure.ac | 34 + +++++++++++++++++++++++++++++++- + folks/Makefile.am | 4 +++ + 11 files changed, 56 insertions(+), 2 deletions(-) + +commit f4b46b0cdbea0ef334ffc1fe281440654c40dfea +Author: Philip Withnall +Date: Sun Jan 8 15:50:02 2012 +0000 + + build: Tidy up use of AM_* variables in Makefile.ams + + backends/eds/Makefile.am | 33 + +++++++++++++++++++++------------ + backends/eds/lib/Makefile.am | 4 ++++ + backends/key-file/Makefile.am | 27 ++++++++++++++++++--------- + backends/libsocialweb/Makefile.am | 33 + +++++++++++++++++++++------------ + backends/telepathy/Makefile.am | 31 ++++++++++++++++++++----------- + backends/telepathy/lib/Makefile.am | 9 ++++++++- + backends/tracker/Makefile.am | 33 + +++++++++++++++++++++------------ + backends/tracker/lib/Makefile.am | 28 ++++++++++++---------------- + folks/Makefile.am | 11 +++++++++++ + tools/Makefile.am | 15 +++++++++------ + tools/inspect/Makefile.am | 8 +++++++- + 11 files changed, 152 insertions(+), 80 deletions(-) + +commit 478d8b0f9744d97600303dcd3dd7876b74949806 +Author: Philip Withnall +Date: Fri Jan 6 23:01:12 2012 +0000 + + eds: Cope with opening buggy EDS address book backends + + Turns out that almost as soon as I’d pushed the previous commit, + one of my + address books proved me wrong and returned successfully from the + async open() + call without being open (according to is_opened()) afterwards. Bother. + + This replaces the assertion that the above holds with some code + which will + throw an error instead, which should be a bit more robust in the + case of + buggy EDS address books. + + backends/eds/lib/edsf-persona-store.vala | 28 + +++++++++++++--------------- + 1 files changed, 13 insertions(+), 15 deletions(-) + +commit 9eac06d8f0fe7cb5e58a95d7540f670419d98e54 +Author: Philip Withnall +Date: Fri Jan 6 18:29:21 2012 +0000 + + eds: Handle BUSY errors when opening address books better + + If another process is in the middle of opening an address book when + we come + to try and open it, our open() call will return immediately with + a BUSY + error. + + In this case, we need to wait for the EClient::opened signal to + know when + the open operation has finished. + + Hopefully, this will fix those irritating ‘blah is busy’ errors + I frequently + get when running the EDS backend test suite. Hopefully it also won’t + introduce too many other problems. + + backends/eds/lib/edsf-persona-store.vala | 86 + +++++++++++++++++++++++++++++- + 1 files changed, 85 insertions(+), 1 deletions(-) + +commit 07bd131884ce4ae7d6e1fa9bf777da38b82b1a46 +Author: Philip Withnall +Date: Fri Jan 6 14:37:28 2012 +0000 + + tests: Fix the EDS link-personas-diff-stores test + + Due to the tightening up of checks for PersonaStores being prepared + before + PersonaStore.add_persona_from_details() is called, this test was + failing + because it didn’t wait for its persona stores to get prepared. + + This fixes the problem by waiting for quiescence before launching + into the + test code proper. + + tests/eds/link-personas-diff-stores.vala | 26 + +++++++++++++++++--------- + 1 files changed, 17 insertions(+), 9 deletions(-) + +commit d4aeea66f0719dc7a77a43372a940735cdfff4f2 +Author: Philip Withnall +Date: Fri Jan 6 14:35:01 2012 +0000 + + eds: Reach quiescence in Edsf.PersonaStore for address books with + no contacts + + It’s possible for an address book to have the “do-initial-query” + capability + yet not emit any ::objects-added signals on its view, if the address + book has + no contacts. + + This commit fixes that by listening for the ::complete signal on + the address + book view and using that to determine quiescence instead. + + This should theoretically also catch cases where the address book + encounters + an error part-way through initialisation, since that will be + reported via + the ::complete signal. + + backends/eds/lib/edsf-persona-store.vala | 41 + ++++++++++++++++++++++++------ + 1 files changed, 33 insertions(+), 8 deletions(-) + +commit 6e8949a42ebb767c3d82039365e5204422e26d50 +Author: Philip Withnall +Date: Fri Jan 6 14:33:52 2012 +0000 + + tests: Fix printerr() handler in TestCase + + It was always getting a null message due to having an extraneous extra + parameter (in its C form), meaning that stacktraces from failed + assertions + in test cases were never getting printed. + + tests/lib/test-case.vala | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +commit 33f7d0564156e766c22e8637e33f6389ae110bc6 +Author: Philip Withnall +Date: Wed Dec 28 19:17:09 2011 +0000 + + eds: Nullability fixes + + With the EDS annotation fixes in + https://bugzilla.gnome.org/show_bug.cgi?id=667388, this fixes all + of the + nullability problems found by compiling with + --enable-experimental-non-null. + + As mentioned in the previous commit, we can’t use + --enable-experimental-non-null by default yet, but the fixes should + work by + themselves. + + backends/eds/lib/edsf-persona-store.vala | 286 + ++++++++++++++++++------------ + backends/eds/lib/edsf-persona.vala | 247 ++++++++++++++----------- + backends/eds/lib/memory-icon.vala | 12 +- + folks/persona-store.vala | 9 +- + 4 files changed, 324 insertions(+), 230 deletions(-) + +commit d3385bae363651fe9588826210f79359fa820e01 +Author: Philip Withnall +Date: Wed Dec 21 23:58:39 2011 +0000 + + core: Nullability fixes + + Almost all of these are just the necessary ‘(!)’ annotations to + allow the + nullability check to pass. There were few, if any, actual bugs found + by the + check (which either means folks is perfect, or Vala's nullability + checking + is imperfect). + + This brings us down from 296 nullability errors to just below 50. + + The work was done by compiling folks with valac’s + --enable-experimental-non-null flag. We’re not ready to add the + flag to + VALAFLAGS permanently yet, since this commit depends on various + annotation + fixes in GLib (and similarly, the next one depends on several in EDS). + However, the fixes themselves should be valid without the flag. + + This depends on (at least): + • https://bugzilla.gnome.org/show_bug.cgi?id=666700 + • https://bugzilla.gnome.org/show_bug.cgi?id=666699 + + folks/abstract-field-details.vala | 4 +- + folks/avatar-cache.vala | 17 ++- + folks/backend-store.vala | 80 ++++++++++------ + folks/debug.vala | 23 +++-- + folks/email-details.vala | 4 +- + folks/im-details.vala | 28 +++--- + folks/individual-aggregator.vala | 169 + +++++++++++++++++++-------------- + folks/individual.vala | 190 + +++++++++++++++++++++--------------- + folks/note-details.vala | 12 +-- + folks/object-cache.vala | 43 +++++---- + folks/persona-store.vala | 9 +- + folks/persona.vala | 6 +- + folks/phone-details.vala | 7 +- + folks/postal-address-details.vala | 2 +- + folks/potential-match.vala | 14 ++- + folks/role-details.vala | 7 +- + folks/url-details.vala | 2 +- + folks/web-service-details.vala | 2 +- + 18 files changed, 357 insertions(+), 262 deletions(-) + +commit 9136e590ecfade421f419233bb6afc70df5b332c +Author: Matej Urbančič +Date: Wed Jan 4 20:31:26 2012 +0100 + + Updated Slovenian translation + + po/sl.po | 234 + ++++++++++++++++++++++++++++++++----------------------------- + 1 files changed, 123 insertions(+), 111 deletions(-) + +commit d8dcef46764b17771eed66cd1b53ceb4caeff082 +Author: Christian Kirbach +Date: Sun Jan 1 22:44:46 2012 +0100 + + Updated German translation + + po/de.po | 364 + ++++++++++++++++++++++++++++---------------------------------- + 1 files changed, 163 insertions(+), 201 deletions(-) + +commit ec7d34f1532a734c87eaec9ee7178c6a65c02841 +Author: Nicolás Satragno +Date: Sat Dec 31 18:49:49 2011 +0100 + + Updated Spanish translation + + po/es.po | 60 + ++++++++++++++++++++++++++++++++++++++---------------------- + 1 files changed, 38 insertions(+), 22 deletions(-) + +commit 9c6da3b5fe39eb46532ce879067b1ff55d15df9e +Author: Nicolás Satragno +Date: Thu Dec 29 15:46:42 2011 +0100 + + Updated Spanish translation + + po/es.po | 292 + +++++++++++++++++++++++++++++++++----------------------------- + 1 files changed, 156 insertions(+), 136 deletions(-) + +commit 08db22f49e991df099b0f499ce48ee1d1c3b719a +Author: Piotr Drąg +Date: Wed Dec 28 22:41:40 2011 +0100 + + Updated Polish translation + + po/pl.po | 239 + ++++++++++++++++++++++++++++++++++---------------------------- + 1 files changed, 130 insertions(+), 109 deletions(-) + +commit b108a7c8de2f35546a1e7df2e3e45b77a39db481 +Author: Philip Withnall +Date: Wed Dec 28 19:56:24 2011 +0000 + + aggregator: Expand the ‘no primary persona store’ error messages + + Try and be a little more helpful. + + folks/individual-aggregator.vala | 12 ++++++++++-- + 1 files changed, 10 insertions(+), 2 deletions(-) + +commit c7991405bb2304bc57b5af711ff733a724f1372b +Author: Philip Withnall +Date: Sun Dec 25 11:03:02 2011 +0000 + + docs: Add NEWS for commit a99f47a196bee5a5ab258a010f7dcc173bbf7a42 + + NEWS | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit e5a2b01dceb57acad6104fa75e13623be10231a5 +Author: Philip Withnall +Date: Sun Dec 25 10:58:38 2011 +0000 + + eds: Ensure the default role is non-empty + + If the default role is empty (e.g. because EDS returns empty strings + as the + contact's title, org or role; rather than null), don't add it to the + Persona. + + Helps: bgo#666540 + + backends/eds/lib/edsf-persona.vala | 24 ++++++++++++++---------- + 1 files changed, 14 insertions(+), 10 deletions(-) + +commit a99f47a196bee5a5ab258a010f7dcc173bbf7a42 +Author: Philip Withnall +Date: Sun Dec 25 10:48:14 2011 +0000 + + core: Warn on passing empty values to AbstractFieldDetails subclasses + + There are no situations where passing an empty value (string or + object) to + an AbstractFieldDetails subclass makes sense. It just introduces + potential + bugs with mishandling empty strings (etc.) in code which consumes the + AbstractFieldDetails. + + This commit adds warnings to all the AbstractFieldDetails + subclasses’ + constructors which check for empty inputs. We can't use assert()s here + because that would be an API break. + + Helps: bgo#666540 + + folks/email-details.vala | 9 +++++++-- + folks/im-details.vala | 8 +++++++- + folks/note-details.vala | 8 +++++++- + folks/phone-details.vala | 8 +++++++- + folks/postal-address-details.vala | 27 ++++++++++++++++++++++++++- + folks/role-details.vala | 22 +++++++++++++++++++++- + folks/url-details.vala | 7 ++++++- + folks/web-service-details.vala | 8 +++++++- + 8 files changed, 88 insertions(+), 9 deletions(-) + +commit 6d9b0f55ff057776c13a2a6927a853ba6e9a320d +Author: Philip Withnall +Date: Wed Dec 21 20:09:47 2011 +0000 + + Bug 666540 — Segfault on empty e-mail addresses with potential match + + Gracefully handle invalid e-mail addresses (such as empty strings + or strings + not containing an ‘@’) when searching for potential matches. + + Closes: bgo#666540 + + NEWS | 1 + + folks/potential-match.vala | 24 +++++++++++++++++++++--- + 2 files changed, 22 insertions(+), 3 deletions(-) + +commit dd743bdc54c477a8e5653b4e00d569b151199365 +Author: Philip Withnall +Date: Wed Dec 21 20:08:32 2011 +0000 + + eds: Ignore empty values when creating AbstractFieldDetails instances + + We don't want to be passing around (e.g.) empty strings as e-mail + addresses, + or we'll cause bugs like bgo#666540. + + This modifies the EDS backend to check E.VCardAttribute.get_value() + is not + null or the empty string whenever it's called, and skip the + attribute as + appropriate. + + Helps: bgo#666540 + + backends/eds/lib/edsf-persona.vala | 48 + ++++++++++++++++++++++++++++++----- + 1 files changed, 41 insertions(+), 7 deletions(-) + +commit 73b61e6a5465d9c511e0ef853e9dea7497bbcf10 +Author: Philip Withnall +Date: Wed Dec 21 17:53:04 2011 +0000 + + Bug 666528 — Can't convert from type 'GFile' to 'gchararray' + + Add pretty-printing support for a couple of new properties to + folks-inspect. + + Closes: bgo#666528 + + NEWS | 1 + + tools/inspect/utils.vala | 15 ++++++++++++++- + 2 files changed, 15 insertions(+), 1 deletions(-) + +commit c05b0a64acc35f47f8474094a1c378e22d874954 +Author: Philip Withnall +Date: Wed Dec 21 17:52:05 2011 +0000 + + inspect: Fix use of a deprecated NoteFieldDetails property + + tools/inspect/utils.vala | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit ec303b8f6c467a9c39a5a81bf5b2fc1b788208af +Author: Henrique P. Machado +Date: Mon Dec 19 15:27:01 2011 -0200 + + Added Brazilian Portuguese translation + + po/LINGUAS | 1 + + po/pt_BR.po | 758 + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 759 insertions(+), 0 deletions(-) + +commit a73c77ec7ee7bc4c1a19a93b8999e0c9a02e8205 +Author: Kjartan Maraas +Date: Mon Dec 19 09:27:57 2011 +0100 + + Add nb + + po/LINGUAS | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 20ff0c8d89b7a6b4bc50952eb6dbff95120748d4 +Author: Kjartan Maraas +Date: Mon Dec 19 09:27:51 2011 +0100 + + Added Norwegian bokmål translation + + po/nb.po | 724 + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 724 insertions(+), 0 deletions(-) + +commit 7ccaef83603d2e3ce8cba054baf9dda5d8b7d9d0 +Author: Kjartan Maraas +Date: Tue Mar 29 14:50:16 2011 +0200 + + Add missing #include to make translations work + + backends/telepathy/lib/tp-lowlevel.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +commit 675f42c0b877c1a25bff05beb91e552fd793a6d9 +Author: Philip Withnall +Date: Thu Dec 15 18:33:26 2011 +0000 + + Bug 666310 — Crash in Tracker backend by unsetting an entry in + a read-only… + + Closes: bgo#666310 + + NEWS | 1 + + backends/tracker/tr-backend.vala | 2 +- + 2 files changed, 2 insertions(+), 1 deletions(-) + +commit cd7653e952c3002087fa5dfea42910addca9263e +Author: Travis Reitter +Date: Tue Dec 13 16:51:15 2011 -0800 + + Post-release version bump. + + NEWS | 4 ++++ + configure.ac | 4 ++-- + 2 files changed, 6 insertions(+), 2 deletions(-) + commit cafc3054ad18372d03ee2308de15fade842a30b7 Author: Travis Reitter Date: Tue Dec 13 15:37:23 2011 -0800 @@ -1319,9 +2313,9 @@ Reorganize tp/individual-properties test. - tests/telepathy/individual-properties.vala | 69 + tests/telepathy/individual-properties.vala | 73 ++++++++++++++-------------- - 1 files changed, 34 insertions(+), 35 deletions(-) + 1 files changed, 36 insertions(+), 37 deletions(-) commit 8520eba7a8a7f95fba72f097988ced0b6ab1a0c9 Author: Travis Reitter @@ -2298,9 +3292,9 @@ Closes: bgo#657783 - folks/individual.vala | 72 + folks/individual.vala | 74 ++++++++++++++++++++++++++---------------------- - 1 files changed, 39 insertions(+), 33 deletions(-) + 1 files changed, 40 insertions(+), 34 deletions(-) commit 859f6c7e17b4e800fb087b9e0302f8abfa0c36ee Author: Raul Gutierrez Segales @@ -3247,9 +4241,9 @@ Closes: bgo#657783 NEWS | 1 + - folks/individual.vala | 571 + folks/individual.vala | 573 +++++++++++++++++++++++++++++-------------------- - 2 files changed, 335 insertions(+), 237 deletions(-) + 2 files changed, 336 insertions(+), 238 deletions(-) commit 23027313a91d8ee86d43d445402628378a020739 Author: Philip Withnall @@ -4091,13 +5085,13 @@ backends/telepathy/lib/tpf-persona-store.vala | 8 ++-- backends/telepathy/lib/tpf-persona.vala | 26 ++++++++-- - backends/tracker/lib/trf-persona.vala | 39 ++++++++++----- + backends/tracker/lib/trf-persona.vala | 41 ++++++++++------ folks/favourite-details.vala | 21 ++++++++ folks/individual.vala | 65 ++++++++++++++++++++----- po/POTFILES.in | 1 + po/POTFILES.skip | 1 + - 7 files changed, 124 insertions(+), 37 deletions(-) + 7 files changed, 125 insertions(+), 38 deletions(-) commit b5d1fdefc24dc5d7c5b94f1332cdb4e7dce80ade Author: Philip Withnall @@ -5443,9 +6437,9 @@ Allow for Individual replacement in the EDS add-persona test. - tests/eds/add-persona.vala | 57 - +++++++++++++++++++++++++++++++++++-------- - 1 files changed, 46 insertions(+), 11 deletions(-) + tests/eds/add-persona.vala | 59 + +++++++++++++++++++++++++++++++++++--------- + 1 files changed, 47 insertions(+), 12 deletions(-) commit b8c144844c7012fcc1c49d46a9fc28de5a100aaf Author: Travis Reitter @@ -5634,7 +6628,7 @@ support vCard-like arbitrary parameters NEWS | 4 + - backends/eds/lib/edsf-persona-store.vala | 40 +++++---- + backends/eds/lib/edsf-persona-store.vala | 42 +++++---- backends/eds/lib/edsf-persona.vala | 20 +++-- backends/tracker/lib/trf-persona-store.vala | 25 +++--- backends/tracker/lib/trf-persona.vala | 36 ++++---- @@ -5648,8 +6642,8 @@ tests/lib/eds/backend.vala | 3 +- tests/tracker/add-persona.vala | 29 ++++--- .../tracker/postal-address-details-interface.vala | 14 ++-- - tests/tracker/set-postal-addresses.vala | 54 ++++++------ - 15 files changed, 239 insertions(+), 190 deletions(-) + tests/tracker/set-postal-addresses.vala | 56 ++++++------ + 15 files changed, 241 insertions(+), 192 deletions(-) commit 13b45043d212db0efe363dd9eab4116e4d715bc7 Author: Travis Reitter @@ -8243,7 +9237,7 @@ tests/tracker/add-persona.vala | 11 +++-- tests/tracker/remove-contact.vala | 7 ++- tests/tracker/remove-persona.vala | 9 +++- - tests/tracker/set-alias.vala | 31 +++++++----- + tests/tracker/set-alias.vala | 35 ++++++++------ tests/tracker/set-avatar.vala | 6 ++- tests/tracker/set-birthday.vala | 6 ++- tests/tracker/set-duplicate-email.vala | 16 ++++--- @@ -8259,7 +9253,7 @@ tests/tracker/set-structured-name.vala | 8 ++- tests/tracker/set-urls.vala | 6 ++- tools/inspect/utils.vala | 19 ++++---- - 26 files changed, 260 insertions(+), 168 deletions(-) + 26 files changed, 262 insertions(+), 170 deletions(-) commit 1c7e4040ef1d916b93f1674efef5ebe1dcb3d0eb Author: Philip Withnall @@ -8429,8 +9423,8 @@ folks/field-details.vala | 59 ++++++++++++--------------- tests/folks/field-details.vala | 34 +++++++--------- - tests/tracker/set-urls.vala | 24 +++++++---- - 6 files changed, 72 insertions(+), 89 deletions(-) + tests/tracker/set-urls.vala | 26 +++++++----- + 6 files changed, 73 insertions(+), 90 deletions(-) commit 754541d94a53004aa38dfb163f49f9e258930ca5 Author: Philip Withnall @@ -8552,10 +9546,10 @@ tests/tracker/imaddresses-updates.vala | 14 ++-- tests/tracker/link-personas.vala | 24 ++---- tests/tracker/match-im-addresses.vala | 27 +++---- - tests/tracker/set-im-addresses.vala | 20 ++--- + tests/tracker/set-im-addresses.vala | 24 ++---- tools/import-pidgin.vala | 20 +---- tools/inspect/utils.vala | 14 ++-- - 19 files changed, 233 insertions(+), 248 deletions(-) + 19 files changed, 235 insertions(+), 250 deletions(-) commit 858e80d7649ebe7af0553531a940098f6d3c8449 Author: Philip Withnall @@ -9168,7 +10162,7 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=644867 - backends/key-file/kf-persona-store.vala | 18 +++++- + backends/key-file/kf-persona-store.vala | 20 +++++- backends/key-file/kf-persona.vala | 94 +++++++++++++++++++++++++++- backends/libsocialweb/lib/swf-persona.vala | 37 +++++++++-- @@ -9177,7 +10171,7 @@ folks/individual.vala | 55 ++++++++++++++++- folks/persona-store.vala | 2 + folks/web-service-details.vala | 49 ++++++++++++++ - 8 files changed, 293 insertions(+), 31 deletions(-) + 8 files changed, 294 insertions(+), 32 deletions(-) commit 351e41a65365f33715bbd4756fa17d1c1cf62c0d Author: Alban Crequy @@ -9303,9 +10297,9 @@ libsocialweb: check contacts capabilities and disconnect signals - backends/libsocialweb/lib/swf-persona-store.vala | 49 - +++++++++++++++------ - 1 files changed, 35 insertions(+), 14 deletions(-) + backends/libsocialweb/lib/swf-persona-store.vala | 53 + +++++++++++++++------- + 1 files changed, 37 insertions(+), 16 deletions(-) commit 30b64d46df840e23e9ecf1b486d64104577d7a66 Author: Alban Crequy @@ -10631,10 +11625,10 @@ Helps bgo#643247 - Folks needs C API documentation - configure.ac | 4 +++- - docs/Makefile.am | 53 + configure.ac | 4 ++- + docs/Makefile.am | 55 +++++++++++++++++++++++------------------------------ - 2 files changed, 26 insertions(+), 31 deletions(-) + 2 files changed, 27 insertions(+), 32 deletions(-) commit a0d19148895f74a3c1d543c3b3e9ff42594e2c5d Author: Travis Reitter @@ -11134,9 +12128,9 @@ Make the TestCase class follow our coding style. - tests/lib/test-case.vala | 141 - ++++++++++++++++++++++++--------------------- - 1 files changed, 75 insertions(+), 66 deletions(-) + tests/lib/test-case.vala | 175 + ++++++++++++++++++++++++---------------------- + 1 files changed, 92 insertions(+), 83 deletions(-) commit cea73b98512bb82a81b67fc1bbbf147543c8f046 Author: Travis Reitter @@ -13996,9 +14990,9 @@ Helps bgo#629331. - folks/backend-store.vala | 82 - +++++++++++++++++++++++++++------------------- - 1 files changed, 48 insertions(+), 34 deletions(-) + folks/backend-store.vala | 92 + ++++++++++++++++++++++++++------------------- + 1 files changed, 53 insertions(+), 39 deletions(-) commit 7d96b351e766e15e857d022b6937abdc0be05356 Author: Travis Reitter @@ -15208,8 +16202,9 @@ Refactor Individual.update_alias() to give a single notification path - folks/individual.vala | 44 +++++++++++++++++++++----------------------- - 1 files changed, 21 insertions(+), 23 deletions(-) + folks/individual.vala | 48 + +++++++++++++++++++++++------------------------- + 1 files changed, 23 insertions(+), 25 deletions(-) commit 9184070a8450d1a1707245c144d3341f241c6686 Author: Philip Withnall @@ -15877,11 +16872,11 @@ Build tp-lowlevel via gobject-introspection Makefile.am | 5 ++- - backends/telepathy/Makefile.am | 41 + backends/telepathy/Makefile.am | 43 ++++++++++++++++++------------- backends/telepathy/tp-lowlevel.metadata | 11 -------- - configure.ac | 9 +----- - 4 files changed, 29 insertions(+), 37 deletions(-) + configure.ac | 11 ++------ + 4 files changed, 31 insertions(+), 39 deletions(-) commit adc2865a30caf38d863f92773069f240a4132943 Author: Travis Reitter @@ -18175,9 +19170,9 @@ backends/telepathy/Makefile.am | 1 + backends/telepathy/tpf-logger.vala | 104 +++++++++++++++++++++++++++++ - backends/telepathy/tpf-persona-store.vala | 99 - +++++++-------------------- - 4 files changed, 132 insertions(+), 73 deletions(-) + backends/telepathy/tpf-persona-store.vala | 101 + ++++++++-------------------- + 4 files changed, 133 insertions(+), 74 deletions(-) commit 68b7a69a949405fd6325cd44ad8b9c613bebc311 Author: Philip Withnall @@ -19052,10 +20047,10 @@ Fix the way we prepare Telepathy accounts and connections (including automatically handling ones that were already open) - folks/individual-aggregator.vala | 62 ++++++++++++++++++++-------- - folks/tp-persona-store.vala | 85 + folks/individual-aggregator.vala | 62 +++++++++++++++++++------- + folks/tp-persona-store.vala | 87 ++++++++++++++++++++----------------- - 2 files changed, 91 insertions(+), 56 deletions(-) + 2 files changed, 92 insertions(+), 57 deletions(-) commit ecb8fcafe7d5c463a29b3399084d12e9feeccbab Author: Travis Reitter @@ -19246,13 +20241,13 @@ }); telepathy-people/alias.vala | 5 +- - telepathy-people/individual-aggregator.vala | 85 ++++---- - telepathy-people/individual.vala | 80 ++++--- - telepathy-people/persona-store.vala | 333 + telepathy-people/individual-aggregator.vala | 85 +++--- + telepathy-people/individual.vala | 80 +++--- + telepathy-people/persona-store.vala | 375 ++++++++++++++------------- telepathy-people/persona.vala | 13 +- telepathy-people/tp-persona.vala | 44 ++-- - 6 files changed, 286 insertions(+), 274 deletions(-) + 6 files changed, 307 insertions(+), 295 deletions(-) commit a3ca27442f9058e80318a37b773cd4e772b3b401 Author: Travis Reitter @@ -19460,11 +20455,11 @@ .gitignore | 2 + configure.ac | 8 ++ telepathy-people/Makefile.am | 56 ++++++++++++++-- - telepathy-people/persona-store.vala | 81 ++++++++++------------ + telepathy-people/persona-store.vala | 83 ++++++++++------------ telepathy-people/tp-lowlevel.c | 128 +++++++++++++++++++++++++++++++++++ telepathy-people/tp-lowlevel.h | 72 ++++++++++++++++++++ - 6 files changed, 297 insertions(+), 50 deletions(-) + 6 files changed, 298 insertions(+), 51 deletions(-) commit 6cc74287d8d42639629234a950a8b418a934a452 Author: Travis Reitter diff -Nru folks-0.6.6/compile folks-0.6.7/compile --- folks-0.6.6/compile 2011-12-13 23:38:35.000000000 +0000 +++ folks-0.6.7/compile 2012-02-23 00:03:51.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2010-11-15.09; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010 Free Software # Foundation, Inc. # Written by Tom Tromey . # @@ -29,6 +29,171 @@ # bugs to or send patches to # . +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Win32 hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as `compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l*) + lib=${1#-l} + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + set x "$@" "$dir/$lib.dll.lib" + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + set x "$@" "$dir/$lib.lib" + break + fi + done + IFS=$save_IFS + + test "$found" != yes && set x "$@" "$lib.lib" + shift + ;; + -L*) + func_file_conv "${1#-L}" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') echo "$0: No command. Try \`$0 --help' for more information." 1>&2 @@ -53,11 +218,13 @@ echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do diff -Nru folks-0.6.6/config.h.in folks-0.6.7/config.h.in --- folks-0.6.6/config.h.in 2011-12-13 23:38:34.000000000 +0000 +++ folks-0.6.7/config.h.in 2012-02-23 00:04:22.000000000 +0000 @@ -3,6 +3,9 @@ /* Define the gettext package to be used */ #undef GETTEXT_PACKAGE +/* Build with GLib deprecated */ +#undef GLIB_DISABLE_DEPRECATION_WARNINGS + /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H diff -Nru folks-0.6.6/configure folks-0.6.7/configure --- folks-0.6.6/configure 2011-12-13 23:38:31.000000000 +0000 +++ folks-0.6.7/configure 2012-02-23 00:04:11.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for folks 0.6.6. +# Generated by GNU Autoconf 2.68 for folks 0.6.7. # # Report bugs to . # @@ -633,8 +633,8 @@ # Identity of this package. PACKAGE_NAME='folks' PACKAGE_TARNAME='folks' -PACKAGE_VERSION='0.6.6' -PACKAGE_STRING='folks 0.6.6' +PACKAGE_VERSION='0.6.7' +PACKAGE_STRING='folks 0.6.7' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/browse.cgi?product=folks' PACKAGE_URL='http://telepathy.freedesktop.org/wiki/Folks' @@ -682,6 +682,8 @@ LIBOBJS ERROR_VALAFLAGS ERROR_INTROSPECTION_SCANNER_ARGS +CODE_COVERAGE_LDFLAGS +CODE_COVERAGE_CFLAGS ERROR_CFLAGS DATADIRNAME ALL_LINGUAS @@ -822,6 +824,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -924,6 +927,7 @@ enable_nls enable_debug enable_Werror +enable_code_coverage ' ac_precious_vars='build_alias host_alias @@ -1505,7 +1509,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 folks 0.6.6 to adapt to many kinds of systems. +\`configure' configures folks 0.6.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1575,7 +1579,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of folks 0.6.6:";; + short | recursive ) echo "Configuration of folks 0.6.7:";; esac cat <<\_ACEOF @@ -1607,11 +1611,12 @@ --disable-debug compile without debug code --disable-Werror compile without -Werror (normally enabled in development builds) + --enable-code-coverage compile with code coverage code Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR @@ -1742,7 +1747,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -folks configure 0.6.6 +folks configure 0.6.7 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2022,7 +2027,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by folks $as_me 0.6.6, which was +It was created by folks $as_me 0.6.7, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2858,7 +2863,7 @@ # Define the identity of the package. PACKAGE='folks' - VERSION='0.6.6' + VERSION='0.6.7' # Some tools Automake needs. @@ -2971,8 +2976,8 @@ -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to disable maintainer-specific portions of Makefiles... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval @@ -3835,6 +3840,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -3859,6 +3865,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3918,7 +3925,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -4138,8 +4145,8 @@ -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -4984,6 +4991,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -5023,7 +5035,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -5452,7 +5464,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -6093,13 +6105,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -6246,6 +6258,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -6634,7 +6647,7 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -6645,7 +6658,20 @@ case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -7285,7 +7311,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7296,6 +7328,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -7328,6 +7361,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -7349,7 +7383,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -7724,7 +7760,22 @@ # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -7802,6 +7853,10 @@ + + + + test -z "$LN_S" && LN_S="ln -s" @@ -8261,7 +8316,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -8352,18 +8409,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -8725,7 +8797,6 @@ hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -8978,8 +9049,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -9359,6 +9429,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -9404,6 +9475,7 @@ hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -9432,10 +9504,6 @@ hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -9448,7 +9516,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -9487,7 +9555,6 @@ fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -10111,11 +10178,6 @@ - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -10205,7 +10267,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -10214,7 +10276,7 @@ ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -10279,7 +10341,7 @@ ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -10418,7 +10480,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -10426,10 +10488,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -10437,7 +10495,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -10455,7 +10513,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -10475,7 +10533,7 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' @@ -10486,7 +10544,7 @@ ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -10547,7 +10605,7 @@ ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -10563,7 +10621,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -10600,9 +10658,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10696,7 +10754,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -10765,7 +10823,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10790,7 +10848,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -10814,7 +10872,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -10845,7 +10903,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -10855,7 +10913,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -11637,6 +11695,8 @@ + + ac_config_commands="$ac_config_commands libtool" @@ -11770,9 +11830,9 @@ -LT_CURRENT=30 +LT_CURRENT=31 LT_REVISION=0 -LT_AGE=5 +LT_AGE=6 @@ -12062,7 +12122,7 @@ GLIB_REQUIRED=2.24.0 TP_GLIB_REQUIRED=0.13.1 -VALA_REQUIRED=0.14.0 +VALA_REQUIRED=0.15.1 VALADOC_REQUIRED=0.3.1 TRACKER_SPARQL_MAJOR=0.12 TRACKER_SPARQL_REQUIRED=0.12.0 @@ -13430,10 +13490,10 @@ # Backends # ----------------------------------------------------------- -FOLKS_MODULE_VERSION=30 +FOLKS_MODULE_VERSION=31 -$as_echo "#define MODULE_VERSION \"30\"" >>confdefs.h +$as_echo "#define MODULE_VERSION \"31\"" >>confdefs.h BACKEND_DIR='$(libdir)/folks/$(FOLKS_MODULE_VERSION)/backends' @@ -14431,6 +14491,12 @@ # Error flags # ----------------------------------------------------------- +# Disable GLib deprecation warnings for now (#670196); GValueArray is deprecated +# but we need it for dbus-glib. Porting to GDBus will solve this (#653198) + +$as_echo "#define GLIB_DISABLE_DEPRECATION_WARNINGS 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -Wall" >&5 $as_echo_n "checking to see if compiler understands -Wall... " >&6; } @@ -14853,6 +14919,24 @@ +# ----------------------------------------------------------- +# Code coverage flags +# ----------------------------------------------------------- + +# Check whether --enable-code-coverage was given. +if test "${enable_code_coverage+set}" = set; then : + enableval=$enable_code_coverage; enable_code_coverage=$enableval +else + enable_code_coverage=no +fi + + +# Only enable code coverage if this isn't a release. + + + + + # Vala-related flags if test "x$enable_vala" = "xyes"; then : ERROR_INTROSPECTION_SCANNER_ARGS="\ @@ -14860,6 +14944,10 @@ ERROR_VALAFLAGS="$ERROR_VALAFLAGS --fatal-warnings" fi +# Disable -g if we're building with code coverage enabled, since Vala's +# insertion of #line directives into .c files confuses lcov. For the moment, +# we'll have to do with looking at code coverage of the generated C files only. +# We set the debug flags in CODE_COVERAGE_CFLAGS instead in that case. @@ -15454,7 +15542,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by folks $as_me 0.6.6, which was +This file was extended by folks $as_me 0.6.7, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15521,7 +15609,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -folks config.status 0.6.6 +folks config.status 0.6.7 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -15658,6 +15746,7 @@ enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -15740,7 +15829,6 @@ allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -15796,6 +15884,7 @@ # Quote evaled strings. for var in SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -15846,7 +15935,6 @@ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -16688,8 +16776,8 @@ # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -16743,6 +16831,9 @@ # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -17044,10 +17135,6 @@ # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -17362,7 +17449,8 @@ Vala........................: ${enable_vala} Vala Compiler...............: ${VALAC} - C Compiler Flags............: ${CFLAGS} ${ERROR_CFLAGS} + C Compiler Flags............: ${CFLAGS} ${ERROR_CFLAGS} ${CODE_COVERAGE_CFLAGS} + Linker Flags................: ${LDFLAGS} ${CODE_COVERAGE_LDFLAGS} Prefix......................: ${prefix} Bugreporting URL............: ${PACKAGE_BUGREPORT} Documentation...............: ${have_valadoc} diff -Nru folks-0.6.6/configure.ac folks-0.6.7/configure.ac --- folks-0.6.6/configure.ac 2011-12-13 23:36:37.000000000 +0000 +++ folks-0.6.7/configure.ac 2012-02-23 00:01:16.000000000 +0000 @@ -3,7 +3,7 @@ m4_define([folks_major_version], [0]) m4_define([folks_minor_version], [6]) -m4_define([folks_micro_version], [6]) +m4_define([folks_micro_version], [7]) m4_define([folks_nano_version], [0]) # If library source has changed since last release, increment revision @@ -11,9 +11,9 @@ # increment current and set revision to 0 # If public symbols have been added since last release, increment age # If public symbols have been removed since last release, set age to 0 -m4_define([folks_lt_current], [30]) +m4_define([folks_lt_current], [31]) m4_define([folks_lt_revision], [0]) -m4_define([folks_lt_age], [5]) +m4_define([folks_lt_age], [6]) # Display the nano_version only if it's not '0' m4_define([folks_base_version], @@ -146,7 +146,7 @@ GLIB_REQUIRED=2.24.0 TP_GLIB_REQUIRED=0.13.1 -VALA_REQUIRED=0.14.0 +VALA_REQUIRED=0.15.1 VALADOC_REQUIRED=0.3.1 TRACKER_SPARQL_MAJOR=0.12 TRACKER_SPARQL_REQUIRED=0.12.0 @@ -405,6 +405,10 @@ # Error flags # ----------------------------------------------------------- +# Disable GLib deprecation warnings for now (#670196); GValueArray is deprecated +# but we need it for dbus-glib. Porting to GDBus will solve this (#653198) +AC_DEFINE(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, [Build with GLib deprecated]) + AS_COMPILER_FLAG([-Wall], [ERROR_CFLAGS="-Wall"], [ERROR_CFLAGS=""]) AS_COMPILER_FLAG([-Werror], [werror=yes], [werror=no]) @@ -450,15 +454,44 @@ AC_SUBST([ERROR_CFLAGS]) +# ----------------------------------------------------------- +# Code coverage flags +# ----------------------------------------------------------- + +AC_ARG_ENABLE([code-coverage], + AS_HELP_STRING([--enable-code-coverage], + [compile with code coverage code]), + [enable_code_coverage=$enableval], [enable_code_coverage=no]) + +# Only enable code coverage if this isn't a release. +m4_if(folks_released, [1], [], + [ + if test "x$GCC" = "xyes"; then + if test "x$enable_code_coverage" = "xyes"; then + CODE_COVERAGE_CFLAGS="-fprofile-arcs -ftest-coverage -O0 -ggdb" + CODE_COVERAGE_LDFLAGS="-lgcov" + fi + fi + ]) + +AC_SUBST([CODE_COVERAGE_CFLAGS]) +AC_SUBST([CODE_COVERAGE_LDFLAGS]) + # Vala-related flags AS_IF([test "x$enable_vala" = "xyes"], [ERROR_INTROSPECTION_SCANNER_ARGS="\ $ERROR_INTROSPECTION_SCANNER_ARGS --warn-error" ERROR_VALAFLAGS="$ERROR_VALAFLAGS --fatal-warnings"]) +# Disable -g if we're building with code coverage enabled, since Vala's +# insertion of #line directives into .c files confuses lcov. For the moment, +# we'll have to do with looking at code coverage of the generated C files only. +# We set the debug flags in CODE_COVERAGE_CFLAGS instead in that case. m4_if(folks_released, [1], [], [ - ERROR_VALAFLAGS="$ERROR_VALAFLAGS -g" + if test "x$enable_code_coverage" != "xyes" -o "x$GCC" != "xyes"; then + ERROR_VALAFLAGS="$ERROR_VALAFLAGS -g" + fi ]) AC_SUBST([ERROR_INTROSPECTION_SCANNER_ARGS]) @@ -524,7 +557,8 @@ Vala........................: ${enable_vala} Vala Compiler...............: ${VALAC} - C Compiler Flags............: ${CFLAGS} ${ERROR_CFLAGS} + C Compiler Flags............: ${CFLAGS} ${ERROR_CFLAGS} ${CODE_COVERAGE_CFLAGS} + Linker Flags................: ${LDFLAGS} ${CODE_COVERAGE_LDFLAGS} Prefix......................: ${prefix} Bugreporting URL............: ${PACKAGE_BUGREPORT} Documentation...............: ${have_valadoc} diff -Nru folks-0.6.6/debian/changelog folks-0.6.7/debian/changelog --- folks-0.6.6/debian/changelog 2012-01-12 16:07:39.000000000 +0000 +++ folks-0.6.7/debian/changelog 2012-03-01 02:20:09.000000000 +0000 @@ -1,3 +1,11 @@ +folks (0.6.7-0ubuntu1) precise; urgency=low + + * New upstream release + * debian/control: Bump vala dependency to (>= 0.15.1) + * debian/libfolks25.symbols: added new symbols + + -- Rico Tzschichholz Tue, 28 Feb 2012 10:35:07 +0100 + folks (0.6.6-1ubuntu2) precise; urgency=low * Rebuild against latest evolution-data-server diff -Nru folks-0.6.6/debian/control folks-0.6.7/debian/control --- folks-0.6.6/debian/control 2012-01-12 16:07:39.000000000 +0000 +++ folks-0.6.7/debian/control 2012-02-29 21:57:19.000000000 +0000 @@ -12,8 +12,8 @@ libglib2.0-dev (>= 2.24), libtelepathy-glib-dev (>= 0.13.1), libdbus-glib-1-dev, - valac-0.14 (>= 0.13.4), - libvala-0.14-dev (>= 0.13.4), + valac-0.16 (>= 0.15.1), + libvala-0.16-dev (>= 0.15.1), libgconf2-dev (>= 2.31), gobject-introspection (>= 1.30), libgirepository1.0-dev (>= 1.30), diff -Nru folks-0.6.6/debian/libfolks25.symbols folks-0.6.7/debian/libfolks25.symbols --- folks-0.6.6/debian/libfolks25.symbols 2012-01-12 16:07:39.000000000 +0000 +++ folks-0.6.7/debian/libfolks25.symbols 2012-02-29 21:57:19.000000000 +0000 @@ -281,6 +281,7 @@ folks_postal_address_get_street@Base 0.6.0 folks_postal_address_get_type@Base 0.6.0 folks_postal_address_get_uid@Base 0.6.0 + folks_postal_address_is_empty@Base 0.6.7 folks_postal_address_new@Base 0.6.0 folks_postal_address_set_address_format@Base 0.6.0 folks_postal_address_set_country@Base 0.6.0 @@ -324,6 +325,7 @@ folks_role_get_type@Base 0.6.0 folks_role_get_uid@Base 0.6.0 folks_role_hash@Base 0.6.0 + folks_role_is_empty@Base 0.6.7 folks_role_new@Base 0.6.0 folks_role_set_organisation_name@Base 0.6.0 folks_role_set_role@Base 0.6.0 diff -Nru folks-0.6.6/depcomp folks-0.6.7/depcomp --- folks-0.6.6/depcomp 2011-12-13 23:38:45.000000000 +0000 +++ folks-0.6.7/depcomp 2012-02-23 00:03:54.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-12-04.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, +# 2011 Free Software Foundation, Inc. # 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 @@ -44,7 +44,7 @@ object Object file output by `PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -90,10 +90,18 @@ # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" + cygpath_u='sed s,\\\\,/,g' depmode=msvisualcpp fi +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -158,10 +166,12 @@ ' < "$tmpdepfile" | ## Some versions of gcc put a space before the `:'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -405,6 +415,52 @@ rm -f "$tmpdepfile" ;; +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test "$stat" = 0; then : + else + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/ \1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/ / + G + p +}' >> "$depfile" + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@ -503,7 +559,9 @@ touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation diff -Nru folks-0.6.6/docs/Makefile.in folks-0.6.7/docs/Makefile.in --- folks-0.6.6/docs/Makefile.in 2011-12-13 23:38:39.000000000 +0000 +++ folks-0.6.7/docs/Makefile.in 2012-02-23 00:04:12.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -56,10 +56,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -95,6 +96,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(folksdocdir)" \ "$(DESTDIR)$(folksedsdocdir)" "$(DESTDIR)$(folksedsgtkdocdir)" \ "$(DESTDIR)$(folksedsimgdir)" "$(DESTDIR)$(folksgtkdocdir)" \ @@ -131,6 +138,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -545,9 +554,7 @@ @$(NORMAL_UNINSTALL) @list='$(folksdoc_DATA)'; test -n "$(folksdocdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(folksdocdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(folksdocdir)" && rm -f $$files + dir='$(DESTDIR)$(folksdocdir)'; $(am__uninstall_files_from_dir) install-folksedsdocDATA: $(folksedsdoc_DATA) @$(NORMAL_INSTALL) test -z "$(folksedsdocdir)" || $(MKDIR_P) "$(DESTDIR)$(folksedsdocdir)" @@ -565,9 +572,7 @@ @$(NORMAL_UNINSTALL) @list='$(folksedsdoc_DATA)'; test -n "$(folksedsdocdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(folksedsdocdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(folksedsdocdir)" && rm -f $$files + dir='$(DESTDIR)$(folksedsdocdir)'; $(am__uninstall_files_from_dir) install-folksedsgtkdocDATA: $(folksedsgtkdoc_DATA) @$(NORMAL_INSTALL) test -z "$(folksedsgtkdocdir)" || $(MKDIR_P) "$(DESTDIR)$(folksedsgtkdocdir)" @@ -585,9 +590,7 @@ @$(NORMAL_UNINSTALL) @list='$(folksedsgtkdoc_DATA)'; test -n "$(folksedsgtkdocdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(folksedsgtkdocdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(folksedsgtkdocdir)" && rm -f $$files + dir='$(DESTDIR)$(folksedsgtkdocdir)'; $(am__uninstall_files_from_dir) install-folksedsimgDATA: $(folksedsimg_DATA) @$(NORMAL_INSTALL) test -z "$(folksedsimgdir)" || $(MKDIR_P) "$(DESTDIR)$(folksedsimgdir)" @@ -605,9 +608,7 @@ @$(NORMAL_UNINSTALL) @list='$(folksedsimg_DATA)'; test -n "$(folksedsimgdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(folksedsimgdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(folksedsimgdir)" && rm -f $$files + dir='$(DESTDIR)$(folksedsimgdir)'; $(am__uninstall_files_from_dir) install-folksgtkdocDATA: $(folksgtkdoc_DATA) @$(NORMAL_INSTALL) test -z "$(folksgtkdocdir)" || $(MKDIR_P) "$(DESTDIR)$(folksgtkdocdir)" @@ -625,9 +626,7 @@ @$(NORMAL_UNINSTALL) @list='$(folksgtkdoc_DATA)'; test -n "$(folksgtkdocdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(folksgtkdocdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(folksgtkdocdir)" && rm -f $$files + dir='$(DESTDIR)$(folksgtkdocdir)'; $(am__uninstall_files_from_dir) install-folksimgDATA: $(folksimg_DATA) @$(NORMAL_INSTALL) test -z "$(folksimgdir)" || $(MKDIR_P) "$(DESTDIR)$(folksimgdir)" @@ -645,9 +644,7 @@ @$(NORMAL_UNINSTALL) @list='$(folksimg_DATA)'; test -n "$(folksimgdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(folksimgdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(folksimgdir)" && rm -f $$files + dir='$(DESTDIR)$(folksimgdir)'; $(am__uninstall_files_from_dir) install-folkslibsocialwebdocDATA: $(folkslibsocialwebdoc_DATA) @$(NORMAL_INSTALL) test -z "$(folkslibsocialwebdocdir)" || $(MKDIR_P) "$(DESTDIR)$(folkslibsocialwebdocdir)" @@ -665,9 +662,7 @@ @$(NORMAL_UNINSTALL) @list='$(folkslibsocialwebdoc_DATA)'; test -n "$(folkslibsocialwebdocdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(folkslibsocialwebdocdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(folkslibsocialwebdocdir)" && rm -f $$files + dir='$(DESTDIR)$(folkslibsocialwebdocdir)'; $(am__uninstall_files_from_dir) install-folkslibsocialwebgtkdocDATA: $(folkslibsocialwebgtkdoc_DATA) @$(NORMAL_INSTALL) test -z "$(folkslibsocialwebgtkdocdir)" || $(MKDIR_P) "$(DESTDIR)$(folkslibsocialwebgtkdocdir)" @@ -685,9 +680,7 @@ @$(NORMAL_UNINSTALL) @list='$(folkslibsocialwebgtkdoc_DATA)'; test -n "$(folkslibsocialwebgtkdocdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(folkslibsocialwebgtkdocdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(folkslibsocialwebgtkdocdir)" && rm -f $$files + dir='$(DESTDIR)$(folkslibsocialwebgtkdocdir)'; $(am__uninstall_files_from_dir) install-folkslibsocialwebimgDATA: $(folkslibsocialwebimg_DATA) @$(NORMAL_INSTALL) test -z "$(folkslibsocialwebimgdir)" || $(MKDIR_P) "$(DESTDIR)$(folkslibsocialwebimgdir)" @@ -705,9 +698,7 @@ @$(NORMAL_UNINSTALL) @list='$(folkslibsocialwebimg_DATA)'; test -n "$(folkslibsocialwebimgdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(folkslibsocialwebimgdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(folkslibsocialwebimgdir)" && rm -f $$files + dir='$(DESTDIR)$(folkslibsocialwebimgdir)'; $(am__uninstall_files_from_dir) install-folkstelepathydocDATA: $(folkstelepathydoc_DATA) @$(NORMAL_INSTALL) test -z "$(folkstelepathydocdir)" || $(MKDIR_P) "$(DESTDIR)$(folkstelepathydocdir)" @@ -725,9 +716,7 @@ @$(NORMAL_UNINSTALL) @list='$(folkstelepathydoc_DATA)'; test -n "$(folkstelepathydocdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(folkstelepathydocdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(folkstelepathydocdir)" && rm -f $$files + dir='$(DESTDIR)$(folkstelepathydocdir)'; $(am__uninstall_files_from_dir) install-folkstelepathygtkdocDATA: $(folkstelepathygtkdoc_DATA) @$(NORMAL_INSTALL) test -z "$(folkstelepathygtkdocdir)" || $(MKDIR_P) "$(DESTDIR)$(folkstelepathygtkdocdir)" @@ -745,9 +734,7 @@ @$(NORMAL_UNINSTALL) @list='$(folkstelepathygtkdoc_DATA)'; test -n "$(folkstelepathygtkdocdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(folkstelepathygtkdocdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(folkstelepathygtkdocdir)" && rm -f $$files + dir='$(DESTDIR)$(folkstelepathygtkdocdir)'; $(am__uninstall_files_from_dir) install-folkstelepathyimgDATA: $(folkstelepathyimg_DATA) @$(NORMAL_INSTALL) test -z "$(folkstelepathyimgdir)" || $(MKDIR_P) "$(DESTDIR)$(folkstelepathyimgdir)" @@ -765,9 +752,7 @@ @$(NORMAL_UNINSTALL) @list='$(folkstelepathyimg_DATA)'; test -n "$(folkstelepathyimgdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(folkstelepathyimgdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(folkstelepathyimgdir)" && rm -f $$files + dir='$(DESTDIR)$(folkstelepathyimgdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -822,10 +807,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/folks/abstract-field-details.c folks-0.6.7/folks/abstract-field-details.c --- folks-0.6.6/folks/abstract-field-details.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/abstract-field-details.c 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* abstract-field-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* abstract-field-details.c generated by valac 0.15.1, the Vala compiler * generated from abstract-field-details.vala, do not modify */ /* diff -Nru folks-0.6.6/folks/abstract-field-details.vala folks-0.6.7/folks/abstract-field-details.vala --- folks-0.6.6/folks/abstract-field-details.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/folks/abstract-field-details.vala 2012-01-12 17:25:24.000000000 +0000 @@ -271,8 +271,8 @@ public virtual bool equal (AbstractFieldDetails that) { return (this.get_type () == that.get_type ()) && - this.values_equal (that) && - this.parameters_equal (that); + this.values_equal (that) && + this.parameters_equal (that); } /** diff -Nru folks-0.6.6/folks/alias-details.c folks-0.6.7/folks/alias-details.c --- folks-0.6.6/folks/alias-details.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/alias-details.c 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* alias-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* alias-details.c generated by valac 0.15.1, the Vala compiler * generated from alias-details.vala, do not modify */ /* @@ -99,7 +99,7 @@ FolksAliasDetailsChangeAliasData* _data_; FolksAliasDetails* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (FolksAliasDetailsChangeAliasData); _data_->_async_result = g_simple_async_result_new (NULL, _callback_, _user_data_, folks_alias_details_real_change_alias); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, folks_alias_details_real_change_alias_data_free); diff -Nru folks-0.6.6/folks/avatar-cache.c folks-0.6.7/folks/avatar-cache.c --- folks-0.6.6/folks/avatar-cache.c 2011-12-13 23:39:16.000000000 +0000 +++ folks-0.6.7/folks/avatar-cache.c 2012-02-23 00:01:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* avatar-cache.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* avatar-cache.c generated by valac 0.15.1, the Vala compiler * generated from avatar-cache.vala, do not modify */ /* @@ -215,12 +215,13 @@ { FolksAvatarCache* _tmp1_; FolksAvatarCache* _tmp2_; - FolksAvatarCache* retval; + FolksAvatarCache* _retval; + FolksAvatarCache* retval = NULL; FolksAvatarCache* _tmp3_; _tmp1_ = folks_avatar_cache__instance; _tmp2_ = _g_object_ref0 (_tmp1_); - retval = _tmp2_; - _tmp3_ = retval; + _retval = _tmp2_; + _tmp3_ = _retval; if (_tmp3_ == NULL) { FolksAvatarCache* _tmp4_; FolksAvatarCache* _tmp5_; @@ -229,19 +230,27 @@ retval = _tmp4_; _tmp5_ = retval; folks_avatar_cache__instance = _tmp5_; + } else { + FolksAvatarCache* _tmp6_; + FolksAvatarCache* _tmp7_; + _tmp6_ = _retval; + _tmp7_ = _g_object_ref0 (FOLKS_AVATAR_CACHE (_tmp6_)); + _g_object_unref0 (retval); + retval = _tmp7_; } result = retval; + _g_object_unref0 (_retval); { - FolksAvatarCache* _tmp6_; - _tmp6_ = folks_avatar_cache__instance; + FolksAvatarCache* _tmp8_; + _tmp8_ = folks_avatar_cache__instance; g_static_rec_mutex_unlock (&__lock_folks_avatar_cache__instance); } return result; } __finally31: { - FolksAvatarCache* _tmp7_; - _tmp7_ = folks_avatar_cache__instance; + FolksAvatarCache* _tmp9_; + _tmp9_ = folks_avatar_cache__instance; g_static_rec_mutex_unlock (&__lock_folks_avatar_cache__instance); } g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -265,7 +274,7 @@ FolksAvatarCacheLoadAvatarData* _data_; FolksAvatarCache* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (FolksAvatarCacheLoadAvatarData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, folks_avatar_cache_load_avatar); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, folks_avatar_cache_load_avatar_data_free); @@ -316,7 +325,7 @@ _data_->_tmp4_ = NULL; _data_->_tmp4_ = g_file_get_uri (_data_->_tmp3_); _data_->_tmp5_ = _data_->_tmp4_; - g_debug ("avatar-cache.vala:101: Loading avatar '%s' from file '%s'.", _data_->_tmp2_, _data_->_tmp5_); + g_debug ("avatar-cache.vala:106: Loading avatar '%s' from file '%s'.", _data_->_tmp2_, _data_->_tmp5_); _g_free0 (_data_->_tmp5_); _data_->_tmp6_ = _data_->avatar_file; _data_->_tmp7_ = FALSE; @@ -369,7 +378,7 @@ FolksAvatarCacheStoreAvatarData* _data_; FolksAvatarCache* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; GLoadableIcon* _tmp3_; GLoadableIcon* _tmp4_; _data_ = g_slice_new0 (FolksAvatarCacheStoreAvatarData); @@ -456,7 +465,7 @@ _data_->_tmp4_ = NULL; _data_->_tmp4_ = g_file_get_uri (_data_->_tmp3_); _data_->_tmp5_ = _data_->_tmp4_; - g_debug ("avatar-cache.vala:130: Storing avatar '%s' in file '%s'.", _data_->_tmp2_, _data_->_tmp5_); + g_debug ("avatar-cache.vala:135: Storing avatar '%s' in file '%s'.", _data_->_tmp2_, _data_->_tmp5_); _g_free0 (_data_->_tmp5_); _data_->_tmp6_ = _data_->avatar; _data_->_state_ = 1; @@ -497,19 +506,19 @@ _data_->_tmp11_ = _data_->dest_avatar_stream; _data_->_tmp12_ = _data_->src_avatar_stream; _data_->_state_ = 3; - g_output_stream_splice_async (_data_->_tmp11_, _data_->_tmp12_, G_OUTPUT_STREAM_SPLICE_NONE, G_PRIORITY_DEFAULT, NULL, folks_avatar_cache_store_avatar_ready, _data_); + g_output_stream_splice_async (G_OUTPUT_STREAM (_data_->_tmp11_), _data_->_tmp12_, G_OUTPUT_STREAM_SPLICE_NONE, G_PRIORITY_DEFAULT, NULL, folks_avatar_cache_store_avatar_ready, _data_); return FALSE; _state_3: - g_output_stream_splice_finish (_data_->_tmp11_, _data_->_res_, &_data_->_inner_error_); + g_output_stream_splice_finish (G_OUTPUT_STREAM (_data_->_tmp11_), _data_->_res_, &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { goto __catch32_g_error; } _data_->_tmp13_ = _data_->dest_avatar_stream; _data_->_state_ = 4; - g_output_stream_close_async (_data_->_tmp13_, G_PRIORITY_DEFAULT, NULL, folks_avatar_cache_store_avatar_ready, _data_); + g_output_stream_close_async (G_OUTPUT_STREAM (_data_->_tmp13_), G_PRIORITY_DEFAULT, NULL, folks_avatar_cache_store_avatar_ready, _data_); return FALSE; _state_4: - g_output_stream_close_finish (_data_->_tmp13_, _data_->_res_, &_data_->_inner_error_); + g_output_stream_close_finish (G_OUTPUT_STREAM (_data_->_tmp13_), _data_->_res_, &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { goto __catch32_g_error; } @@ -536,10 +545,10 @@ if (_data_->_tmp15_ != NULL) { _data_->_tmp16_ = _data_->dest_avatar_stream; _data_->_state_ = 5; - g_output_stream_close_async (_data_->_tmp16_, G_PRIORITY_DEFAULT, NULL, folks_avatar_cache_store_avatar_ready, _data_); + g_output_stream_close_async (G_OUTPUT_STREAM (_data_->_tmp16_), G_PRIORITY_DEFAULT, NULL, folks_avatar_cache_store_avatar_ready, _data_); return FALSE; _state_5: - g_output_stream_close_finish (_data_->_tmp16_, _data_->_res_, &_data_->_inner_error_); + g_output_stream_close_finish (G_OUTPUT_STREAM (_data_->_tmp16_), _data_->_res_, &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { _g_error_free0 (_data_->e); goto __finally32; @@ -622,7 +631,7 @@ FolksAvatarCacheRemoveAvatarData* _data_; FolksAvatarCache* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (FolksAvatarCacheRemoveAvatarData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, folks_avatar_cache_remove_avatar); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, folks_avatar_cache_remove_avatar_data_free); @@ -670,7 +679,7 @@ _data_->_tmp4_ = NULL; _data_->_tmp4_ = g_file_get_uri (_data_->_tmp3_); _data_->_tmp5_ = _data_->_tmp4_; - g_debug ("avatar-cache.vala:189: Removing avatar '%s' in file '%s'.", _data_->_tmp2_, _data_->_tmp5_); + g_debug ("avatar-cache.vala:194: Removing avatar '%s' in file '%s'.", _data_->_tmp2_, _data_->_tmp5_); _g_free0 (_data_->_tmp5_); { _data_->_tmp6_ = _data_->avatar_file; diff -Nru folks-0.6.6/folks/avatar-cache.vala folks-0.6.7/folks/avatar-cache.vala --- folks-0.6.6/folks/avatar-cache.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/folks/avatar-cache.vala 2012-01-12 17:25:24.000000000 +0000 @@ -29,7 +29,7 @@ */ public class Folks.AvatarCache : Object { - private static weak AvatarCache _instance = null; /* needs to be locked */ + private static weak AvatarCache? _instance = null; /* needs to be locked */ private File _cache_directory; /** @@ -64,14 +64,19 @@ { lock (AvatarCache._instance) { - var retval = AvatarCache._instance; + var _retval = AvatarCache._instance; + AvatarCache retval; - if (retval == null) + if (_retval == null) { /* use an intermediate variable to force a strong reference */ retval = new AvatarCache (); AvatarCache._instance = retval; } + else + { + retval = (!) _retval; + } return retval; } @@ -143,9 +148,9 @@ dest_avatar_stream = yield dest_avatar_file.replace_async (null, false, FileCreateFlags.PRIVATE); - yield dest_avatar_stream.splice_async (src_avatar_stream, + yield ((!) dest_avatar_stream).splice_async (src_avatar_stream, OutputStreamSpliceFlags.NONE); - yield dest_avatar_stream.close_async (); + yield ((!) dest_avatar_stream).close_async (); break; } @@ -161,7 +166,7 @@ if (dest_avatar_stream != null) { - yield dest_avatar_stream.close_async (); + yield ((!) dest_avatar_stream).close_async (); } throw e; diff -Nru folks-0.6.6/folks/avatar-details.c folks-0.6.7/folks/avatar-details.c --- folks-0.6.6/folks/avatar-details.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/avatar-details.c 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* avatar-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* avatar-details.c generated by valac 0.15.1, the Vala compiler * generated from avatar-details.vala, do not modify */ /* @@ -202,7 +202,7 @@ * * @since 0.6.0 */ - g_object_interface_install_property (iface, g_param_spec_object ("avatar", "avatar", "avatar", G_TYPE_LOADABLE_ICON, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); + g_object_interface_install_property (iface, g_param_spec_object ("avatar", "avatar", "avatar", g_loadable_icon_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); iface->change_avatar = folks_avatar_details_real_change_avatar; iface->change_avatar_finish = folks_avatar_details_real_change_avatar_finish; } diff -Nru folks-0.6.6/folks/backend.c folks-0.6.7/folks/backend.c --- folks-0.6.6/folks/backend.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/backend.c 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* backend.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* backend.c generated by valac 0.15.1, the Vala compiler * generated from backend.vala, do not modify */ /* @@ -79,6 +79,7 @@ FOLKS_BACKEND_NAME, FOLKS_BACKEND_PERSONA_STORES }; +const gchar* folks_backend_get_name (FolksBackend* self); void folks_backend_prepare (FolksBackend* self, GAsyncReadyCallback _callback_, gpointer _user_data_); void folks_backend_prepare_finish (FolksBackend* self, GAsyncResult* _res_, GError** error); void folks_backend_unprepare (FolksBackend* self, GAsyncReadyCallback _callback_, gpointer _user_data_); @@ -86,8 +87,9 @@ FolksBackend* folks_backend_construct (GType object_type); gboolean folks_backend_get_is_prepared (FolksBackend* self); gboolean folks_backend_get_is_quiescent (FolksBackend* self); -const gchar* folks_backend_get_name (FolksBackend* self); GeeMap* folks_backend_get_persona_stores (FolksBackend* self); +static GObject * folks_backend_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); +static void folks_backend_finalize (GObject* obj); static void _vala_folks_backend_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); @@ -142,9 +144,27 @@ } +static GObject * folks_backend_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties) { + GObject * obj; + GObjectClass * parent_class; + FolksBackend * self; + const gchar* _tmp0_; + const gchar* _tmp1_; + parent_class = G_OBJECT_CLASS (folks_backend_parent_class); + obj = parent_class->constructor (type, n_construct_properties, construct_properties); + self = FOLKS_BACKEND (obj); + _tmp0_ = folks_backend_get_name (self); + _tmp1_ = _tmp0_; + g_debug ("backend.vala:40: Constructing Backend ‘%s’ (%p)", _tmp1_, self); + return obj; +} + + static void folks_backend_class_init (FolksBackendClass * klass) { folks_backend_parent_class = g_type_class_peek_parent (klass); G_OBJECT_CLASS (klass)->get_property = _vala_folks_backend_get_property; + G_OBJECT_CLASS (klass)->constructor = folks_backend_constructor; + G_OBJECT_CLASS (klass)->finalize = folks_backend_finalize; /** * Whether {@link Backend.prepare} has successfully completed for this * backend. @@ -211,6 +231,18 @@ } +static void folks_backend_finalize (GObject* obj) { + FolksBackend * self; + const gchar* _tmp0_; + const gchar* _tmp1_; + self = FOLKS_BACKEND (obj); + _tmp0_ = folks_backend_get_name (self); + _tmp1_ = _tmp0_; + g_debug ("backend.vala:45: Destroying Backend ‘%s’ (%p)", _tmp1_, self); + G_OBJECT_CLASS (folks_backend_parent_class)->finalize (obj); +} + + /** * A single backend to libfolks, such as Telepathy or evolution-data-server. * Each backend provides {@link Persona}s which are aggregated to form diff -Nru folks-0.6.6/folks/backend-store.c folks-0.6.7/folks/backend-store.c --- folks-0.6.6/folks/backend-store.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/backend-store.c 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* backend-store.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* backend-store.c generated by valac 0.15.1, the Vala compiler * generated from backend-store.vala, do not modify */ /* @@ -163,89 +163,92 @@ FolksBackend* _tmp11_; const gchar* _tmp12_; gchar* _tmp13_; + gchar* _path; gchar* path; const gchar* _tmp14_; gchar* _tmp15_; const gchar* _tmp16_; const gchar* _tmp17_; - GeeHashMap* _tmp18_; - GeeHashMap* modules; + gchar* _tmp18_; const gchar* _tmp19_; - gchar** _tmp20_; - gchar** _tmp21_; + GeeHashMap* _tmp20_; + GeeHashMap* modules; + const gchar* _tmp21_; + gchar** _tmp22_; + gchar** _tmp23_; gchar** path_split; gint path_split_length1; gint _path_split_size_; - gchar** _tmp22_; - gint _tmp22__length1; + gchar** _tmp24_; + gint _tmp24__length1; gchar** subpath_collection; gint subpath_collection_length1; gint _subpath_collection_size_; gint subpath_it; const gchar* subpath; - const gchar* _tmp23_; - GFile* _tmp24_; + const gchar* _tmp25_; + GFile* _tmp26_; GFile* file; - GFile* _tmp25_; gboolean is_file; gboolean is_dir; - GFile* _tmp26_; - gboolean _tmp27_; + GFile* _tmp27_; gboolean _tmp28_; gboolean _tmp29_; - GeeHashMap* _tmp30_; - const gchar* _tmp31_; - GFile* _tmp32_; - gboolean _tmp33_; - GFile* _tmp34_; - GeeHashMap* _tmp35_; - GeeHashMap* cur_modules; + gboolean _tmp30_; + GeeHashMap* _tmp31_; + const gchar* _tmp32_; + GFile* _tmp33_; + gboolean _tmp34_; + GFile* _tmp35_; GeeHashMap* _tmp36_; - GeeSet* _tmp37_; - GeeSet* _tmp38_; + GeeHashMap* cur_modules; + GeeHashMap* _tmp37_; + GeeHashMap* _tmp38_; GeeSet* _tmp39_; - GeeIterator* _tmp40_; - GeeIterator* _tmp41_; - GeeIterator* _entry_it; + GeeSet* _tmp40_; + GeeSet* _tmp41_; GeeIterator* _tmp42_; - gboolean _tmp43_; + GeeIterator* _tmp43_; + GeeIterator* _entry_it; GeeIterator* _tmp44_; - gpointer _tmp45_; + gboolean _tmp45_; + GeeIterator* _tmp46_; + gpointer _tmp47_; GeeMapEntry* entry; - GeeHashMap* _tmp46_; - GeeMapEntry* _tmp47_; - gconstpointer _tmp48_; - const gchar* _tmp49_; - GeeMapEntry* _tmp50_; - gconstpointer _tmp51_; - GFile* _tmp52_; - const gchar* _tmp53_; - GeeHashMap* _tmp54_; - GeeCollection* _tmp55_; - GeeCollection* _tmp56_; + GeeHashMap* _tmp48_; + GeeMapEntry* _tmp49_; + gconstpointer _tmp50_; + const gchar* _tmp51_; + GeeMapEntry* _tmp52_; + gconstpointer _tmp53_; + GFile* _tmp54_; + const gchar* _tmp55_; + GeeHashMap* _tmp56_; GeeCollection* _tmp57_; - GeeIterator* _tmp58_; - GeeIterator* _tmp59_; - GeeIterator* _module_it; + GeeCollection* _tmp58_; + GeeCollection* _tmp59_; GeeIterator* _tmp60_; - gboolean _tmp61_; + GeeIterator* _tmp61_; + GeeIterator* _module_it; GeeIterator* _tmp62_; - gpointer _tmp63_; + gboolean _tmp63_; + GeeIterator* _tmp64_; + gpointer _tmp65_; GFile* module; - GFile* _tmp64_; - GeeHashMap* _tmp65_; - GeeCollection* _tmp66_; - GeeCollection* _tmp67_; + GFile* _tmp66_; + GeeHashMap* _tmp67_; GeeCollection* _tmp68_; - GeeIterator* _tmp69_; - GeeIterator* _tmp70_; - GeeIterator* _backend_it; + GeeCollection* _tmp69_; + GeeCollection* _tmp70_; GeeIterator* _tmp71_; - gboolean _tmp72_; + GeeIterator* _tmp72_; + GeeIterator* _backend_it; GeeIterator* _tmp73_; - gpointer _tmp74_; + gboolean _tmp74_; + GeeIterator* _tmp75_; + gpointer _tmp76_; FolksBackend* backend; - FolksBackend* _tmp75_; + FolksBackend* _tmp77_; }; struct _FolksBackendStoreBackendLoadIfNeededData { @@ -400,41 +403,44 @@ GeeHashMap* _tmp36_; GeeHashMap* modules; GeeHashMap* _tmp37_; - GeeSet* _tmp38_; + GeeHashMap* _tmp38_; GeeSet* _tmp39_; GeeSet* _tmp40_; - GeeIterator* _tmp41_; + GeeSet* _tmp41_; GeeIterator* _tmp42_; - GeeIterator* _entry_it; GeeIterator* _tmp43_; - gboolean _tmp44_; - GeeIterator* _tmp45_; - gpointer _tmp46_; + GeeIterator* _entry_it; + GeeIterator* _tmp44_; + gboolean _tmp45_; + GeeIterator* _tmp46_; + gpointer _tmp47_; GeeMapEntry* entry; - GeeHashMap* _tmp47_; - GeeMapEntry* _tmp48_; - gconstpointer _tmp49_; - const gchar* _tmp50_; - GeeMapEntry* _tmp51_; - gconstpointer _tmp52_; - GFile* _tmp53_; - gboolean _tmp54_; - const gchar* _tmp55_; - gboolean _tmp56_; + GeeHashMap* _tmp48_; + GeeMapEntry* _tmp49_; + gconstpointer _tmp50_; + const gchar* _tmp51_; + GeeMapEntry* _tmp52_; + gconstpointer _tmp53_; + GFile* _tmp54_; + gboolean _tmp55_; + const gchar* _tmp56_; gboolean _tmp57_; - GeeHashMap* _tmp58_; + gboolean _tmp58_; GFile* _tmp59_; gchar* _tmp60_; - gchar* _tmp61_; - GFile* _tmp62_; + gchar* path; + const gchar* _tmp61_; + GeeHashMap* _tmp62_; const gchar* _tmp63_; - const gchar* _tmp64_; - GFile* _tmp65_; - gchar* _tmp66_; - gchar* _tmp67_; - GFile* _tmp68_; + GFile* _tmp64_; + const gchar* _tmp65_; + const gchar* _tmp66_; + GFile* _tmp67_; + gchar* _tmp68_; gchar* _tmp69_; - gchar* _tmp70_; + GFile* _tmp70_; + gchar* _tmp71_; + gchar* _tmp72_; GError * _inner_error_; }; @@ -496,7 +502,7 @@ guint8* contents; GFile* _tmp17_; guint8* _tmp18_; - gint _tmp19_; + gsize _tmp19_; guint8* _tmp20_; gchar* _tmp21_; gchar* contents_s; @@ -531,8 +537,10 @@ gchar* _tmp3_; gchar* _tmp4_; GFile* _tmp5_; - gint _tmp6_; - gint _tmp7_; + guint8* _tmp6_; + gint _tmp6__length1; + guint8* _tmp7_; + gint _tmp7__length1; GError* e; GFile* _tmp8_; gchar* _tmp9_; @@ -690,7 +698,7 @@ return result; } _tmp3_ = folks_backend_store__instance; - _tmp4_ = _g_object_ref0 (_tmp3_); + _tmp4_ = _g_object_ref0 (FOLKS_BACKEND_STORE (_tmp3_)); result = _tmp4_; return result; } @@ -725,7 +733,7 @@ folks_debug_print_heading (_tmp0_, domain, level, "BackendStore (%p)", self); _tmp1_ = debug; _tmp2_ = self->priv->_backend_hash; - _tmp3_ = gee_map_get_size ((GeeMap*) _tmp2_); + _tmp3_ = gee_abstract_map_get_size ((GeeMap*) _tmp2_); _tmp4_ = _tmp3_; folks_debug_print_line (_tmp1_, domain, level, "%u Backends:", (guint) _tmp4_); _tmp5_ = debug; @@ -739,7 +747,7 @@ GeeIterator* _tmp11_; GeeIterator* _backend_it; _tmp6_ = self->priv->_backend_hash; - _tmp7_ = gee_map_get_values ((GeeMap*) _tmp6_); + _tmp7_ = gee_abstract_map_get_values ((GeeMap*) _tmp6_); _tmp8_ = _tmp7_; _tmp9_ = _tmp8_; _tmp10_ = gee_iterable_iterator ((GeeIterable*) _tmp9_); @@ -1166,7 +1174,7 @@ folks_backend_store_prepare_finish (_data_->self, _data_->_res_); { _data_->_tmp1_ = _data_->self->priv->_backend_hash; - _data_->_tmp2_ = gee_map_get_values ((GeeMap*) _data_->_tmp1_); + _data_->_tmp2_ = gee_abstract_map_get_values ((GeeMap*) _data_->_tmp1_); _data_->_tmp3_ = _data_->_tmp2_; _data_->_tmp4_ = _data_->_tmp3_; _data_->_tmp5_ = NULL; @@ -1198,8 +1206,8 @@ _data_->_tmp12_ = NULL; _data_->_tmp12_ = g_getenv ("FOLKS_BACKEND_PATH"); _data_->_tmp13_ = g_strdup (_data_->_tmp12_); - _data_->path = _data_->_tmp13_; - _data_->_tmp14_ = _data_->path; + _data_->_path = _data_->_tmp13_; + _data_->_tmp14_ = _data_->_path; if (_data_->_tmp14_ == NULL) { _data_->_tmp15_ = g_strdup (BACKEND_DIR); _g_free0 (_data_->path); @@ -1207,97 +1215,102 @@ _data_->_tmp16_ = _data_->path; g_debug ("Using built-in backend dir '%s' (override with " "environment variable FOLKS_BACKEND_PATH)", _data_->_tmp16_); } else { - _data_->_tmp17_ = _data_->path; - g_debug ("Using environment variable FOLKS_BACKEND_PATH = " "'%s' to look for backends", _data_->_tmp17_); - } - _data_->_tmp18_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); - _data_->modules = _data_->_tmp18_; - _data_->_tmp19_ = _data_->path; - _data_->_tmp21_ = NULL; - _data_->_tmp21_ = _data_->_tmp20_ = g_strsplit (_data_->_tmp19_, ":", 0); - _data_->path_split = _data_->_tmp21_; - _data_->path_split_length1 = _vala_array_length (_data_->_tmp20_); + _data_->_tmp17_ = _data_->_path; + _data_->_tmp18_ = g_strdup ((const gchar*) _data_->_tmp17_); + _g_free0 (_data_->path); + _data_->path = _data_->_tmp18_; + _data_->_tmp19_ = _data_->path; + g_debug ("Using environment variable FOLKS_BACKEND_PATH = " "'%s' to look for backends", _data_->_tmp19_); + } + _data_->_tmp20_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_FILE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL); + _data_->modules = _data_->_tmp20_; + _data_->_tmp21_ = _data_->path; + _data_->_tmp23_ = NULL; + _data_->_tmp23_ = _data_->_tmp22_ = g_strsplit (_data_->_tmp21_, ":", 0); + _data_->path_split = _data_->_tmp23_; + _data_->path_split_length1 = _vala_array_length (_data_->_tmp22_); _data_->_path_split_size_ = _data_->path_split_length1; - _data_->_tmp22_ = _data_->path_split; - _data_->_tmp22__length1 = _data_->path_split_length1; + _data_->_tmp24_ = _data_->path_split; + _data_->_tmp24__length1 = _data_->path_split_length1; { _data_->subpath_collection_length1 = 0; _data_->_subpath_collection_size_ = 0; - _data_->subpath_collection = _data_->_tmp22_; - _data_->subpath_collection_length1 = _data_->_tmp22__length1; - for (_data_->subpath_it = 0; _data_->subpath_it < _data_->_tmp22__length1; _data_->subpath_it = _data_->subpath_it + 1) { + _data_->subpath_collection = _data_->_tmp24_; + _data_->subpath_collection_length1 = _data_->_tmp24__length1; + for (_data_->subpath_it = 0; _data_->subpath_it < _data_->_tmp24__length1; _data_->subpath_it = _data_->subpath_it + 1) { _data_->subpath = _data_->subpath_collection[_data_->subpath_it]; { - _data_->_tmp23_ = _data_->subpath; - _data_->_tmp24_ = NULL; - _data_->_tmp24_ = g_file_new_for_path (_data_->_tmp23_); - _data_->file = _data_->_tmp24_; - _data_->_tmp25_ = _data_->file; - g_assert (_data_->_tmp25_ != NULL); - _data_->_tmp26_ = _data_->file; - _data_->_tmp27_ = FALSE; + _data_->_tmp25_ = _data_->subpath; + _data_->_tmp26_ = NULL; + _data_->_tmp26_ = g_file_new_for_path (_data_->_tmp25_); + _data_->file = _data_->_tmp26_; + _data_->_tmp27_ = _data_->file; _data_->_tmp28_ = FALSE; + _data_->_tmp29_ = FALSE; _data_->_state_ = 3; - _folks_backend_store_get_file_info (_data_->_tmp26_, folks_backend_store_load_backends_ready, _data_); + _folks_backend_store_get_file_info (_data_->_tmp27_, folks_backend_store_load_backends_ready, _data_); return FALSE; _state_3: - _folks_backend_store_get_file_info_finish (_data_->_res_, &_data_->_tmp27_, &_data_->_tmp28_); - _data_->is_file = _data_->_tmp27_; - _data_->is_dir = _data_->_tmp28_; - _data_->_tmp29_ = _data_->is_file; - if (_data_->_tmp29_) { - _data_->_tmp30_ = _data_->modules; - _data_->_tmp31_ = _data_->subpath; - _data_->_tmp32_ = _data_->file; - gee_abstract_map_set ((GeeAbstractMap*) _data_->_tmp30_, _data_->_tmp31_, _data_->_tmp32_); + _folks_backend_store_get_file_info_finish (_data_->_res_, &_data_->_tmp28_, &_data_->_tmp29_); + _data_->is_file = _data_->_tmp28_; + _data_->is_dir = _data_->_tmp29_; + _data_->_tmp30_ = _data_->is_file; + if (_data_->_tmp30_) { + _data_->_tmp31_ = _data_->modules; + _data_->_tmp32_ = _data_->subpath; + _data_->_tmp33_ = _data_->file; + gee_abstract_map_set ((GeeAbstractMap*) _data_->_tmp31_, _data_->_tmp32_, _data_->_tmp33_); } else { - _data_->_tmp33_ = _data_->is_dir; - if (_data_->_tmp33_) { - _data_->_tmp34_ = _data_->file; + _data_->_tmp34_ = _data_->is_dir; + if (_data_->_tmp34_) { + _data_->_tmp35_ = _data_->file; _data_->_state_ = 4; - _folks_backend_store_get_modules_from_dir (_data_->self, _data_->_tmp34_, folks_backend_store_load_backends_ready, _data_); + _folks_backend_store_get_modules_from_dir (_data_->self, _data_->_tmp35_, folks_backend_store_load_backends_ready, _data_); return FALSE; _state_4: - _data_->_tmp35_ = NULL; - _data_->_tmp35_ = _folks_backend_store_get_modules_from_dir_finish (_data_->self, _data_->_res_); - _data_->cur_modules = _data_->_tmp35_; - { - _data_->_tmp36_ = _data_->cur_modules; - _data_->_tmp37_ = gee_map_get_entries ((GeeMap*) _data_->_tmp36_); - _data_->_tmp38_ = _data_->_tmp37_; - _data_->_tmp39_ = _data_->_tmp38_; - _data_->_tmp40_ = NULL; - _data_->_tmp40_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp39_); - _data_->_tmp41_ = _data_->_tmp40_; - _g_object_unref0 (_data_->_tmp39_); - _data_->_entry_it = _data_->_tmp41_; - while (TRUE) { - _data_->_tmp42_ = _data_->_entry_it; - _data_->_tmp43_ = FALSE; - _data_->_tmp43_ = gee_iterator_next (_data_->_tmp42_); - if (!_data_->_tmp43_) { - break; + _data_->_tmp36_ = NULL; + _data_->_tmp36_ = _folks_backend_store_get_modules_from_dir_finish (_data_->self, _data_->_res_); + _data_->cur_modules = _data_->_tmp36_; + _data_->_tmp37_ = _data_->cur_modules; + if (_data_->_tmp37_ != NULL) { + { + _data_->_tmp38_ = _data_->cur_modules; + _data_->_tmp39_ = gee_abstract_map_get_entries ((GeeMap*) GEE_HASH_MAP (_data_->_tmp38_)); + _data_->_tmp40_ = _data_->_tmp39_; + _data_->_tmp41_ = _data_->_tmp40_; + _data_->_tmp42_ = NULL; + _data_->_tmp42_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp41_); + _data_->_tmp43_ = _data_->_tmp42_; + _g_object_unref0 (_data_->_tmp41_); + _data_->_entry_it = _data_->_tmp43_; + while (TRUE) { + _data_->_tmp44_ = _data_->_entry_it; + _data_->_tmp45_ = FALSE; + _data_->_tmp45_ = gee_iterator_next (_data_->_tmp44_); + if (!_data_->_tmp45_) { + break; + } + _data_->_tmp46_ = _data_->_entry_it; + _data_->_tmp47_ = NULL; + _data_->_tmp47_ = gee_iterator_get (_data_->_tmp46_); + _data_->entry = (GeeMapEntry*) _data_->_tmp47_; + _data_->_tmp48_ = _data_->modules; + _data_->_tmp49_ = _data_->entry; + _data_->_tmp50_ = gee_map_entry_get_key (_data_->_tmp49_); + _data_->_tmp51_ = _data_->_tmp50_; + _data_->_tmp52_ = _data_->entry; + _data_->_tmp53_ = gee_map_entry_get_value (_data_->_tmp52_); + _data_->_tmp54_ = _data_->_tmp53_; + gee_abstract_map_set ((GeeAbstractMap*) _data_->_tmp48_, (const gchar*) _data_->_tmp51_, (GFile*) _data_->_tmp54_); + _g_object_unref0 (_data_->entry); } - _data_->_tmp44_ = _data_->_entry_it; - _data_->_tmp45_ = NULL; - _data_->_tmp45_ = gee_iterator_get (_data_->_tmp44_); - _data_->entry = (GeeMapEntry*) _data_->_tmp45_; - _data_->_tmp46_ = _data_->modules; - _data_->_tmp47_ = _data_->entry; - _data_->_tmp48_ = gee_map_entry_get_key (_data_->_tmp47_); - _data_->_tmp49_ = _data_->_tmp48_; - _data_->_tmp50_ = _data_->entry; - _data_->_tmp51_ = gee_map_entry_get_value (_data_->_tmp50_); - _data_->_tmp52_ = _data_->_tmp51_; - gee_abstract_map_set ((GeeAbstractMap*) _data_->_tmp46_, (const gchar*) _data_->_tmp49_, (GFile*) _data_->_tmp52_); - _g_object_unref0 (_data_->entry); + _g_object_unref0 (_data_->_entry_it); } - _g_object_unref0 (_data_->_entry_it); } _g_object_unref0 (_data_->cur_modules); } else { - _data_->_tmp53_ = _data_->subpath; - g_critical ("FOLKS_BACKEND_PATH component '%s' is not a regular " "file or directory; ignoring...", _data_->_tmp53_); + _data_->_tmp55_ = _data_->subpath; + g_critical ("FOLKS_BACKEND_PATH component '%s' is not a regular " "file or directory; ignoring...", _data_->_tmp55_); g_assert_not_reached (); } } @@ -1306,56 +1319,56 @@ } } { - _data_->_tmp54_ = _data_->modules; - _data_->_tmp55_ = gee_map_get_values ((GeeMap*) _data_->_tmp54_); - _data_->_tmp56_ = _data_->_tmp55_; - _data_->_tmp57_ = _data_->_tmp56_; - _data_->_tmp58_ = NULL; - _data_->_tmp58_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp57_); + _data_->_tmp56_ = _data_->modules; + _data_->_tmp57_ = gee_abstract_map_get_values ((GeeMap*) _data_->_tmp56_); + _data_->_tmp58_ = _data_->_tmp57_; _data_->_tmp59_ = _data_->_tmp58_; - _g_object_unref0 (_data_->_tmp57_); - _data_->_module_it = _data_->_tmp59_; + _data_->_tmp60_ = NULL; + _data_->_tmp60_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp59_); + _data_->_tmp61_ = _data_->_tmp60_; + _g_object_unref0 (_data_->_tmp59_); + _data_->_module_it = _data_->_tmp61_; while (TRUE) { - _data_->_tmp60_ = _data_->_module_it; - _data_->_tmp61_ = FALSE; - _data_->_tmp61_ = gee_iterator_next (_data_->_tmp60_); - if (!_data_->_tmp61_) { + _data_->_tmp62_ = _data_->_module_it; + _data_->_tmp63_ = FALSE; + _data_->_tmp63_ = gee_iterator_next (_data_->_tmp62_); + if (!_data_->_tmp63_) { break; } - _data_->_tmp62_ = _data_->_module_it; - _data_->_tmp63_ = NULL; - _data_->_tmp63_ = gee_iterator_get (_data_->_tmp62_); - _data_->module = (GFile*) _data_->_tmp63_; - _data_->_tmp64_ = _data_->module; - _folks_backend_store_load_module_from_file (_data_->self, _data_->_tmp64_); + _data_->_tmp64_ = _data_->_module_it; + _data_->_tmp65_ = NULL; + _data_->_tmp65_ = gee_iterator_get (_data_->_tmp64_); + _data_->module = (GFile*) _data_->_tmp65_; + _data_->_tmp66_ = _data_->module; + _folks_backend_store_load_module_from_file (_data_->self, _data_->_tmp66_); _g_object_unref0 (_data_->module); } _g_object_unref0 (_data_->_module_it); } { - _data_->_tmp65_ = _data_->self->priv->_backend_hash; - _data_->_tmp66_ = gee_map_get_values ((GeeMap*) _data_->_tmp65_); - _data_->_tmp67_ = _data_->_tmp66_; - _data_->_tmp68_ = _data_->_tmp67_; - _data_->_tmp69_ = NULL; - _data_->_tmp69_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp68_); + _data_->_tmp67_ = _data_->self->priv->_backend_hash; + _data_->_tmp68_ = gee_abstract_map_get_values ((GeeMap*) _data_->_tmp67_); + _data_->_tmp69_ = _data_->_tmp68_; _data_->_tmp70_ = _data_->_tmp69_; - _g_object_unref0 (_data_->_tmp68_); - _data_->_backend_it = _data_->_tmp70_; + _data_->_tmp71_ = NULL; + _data_->_tmp71_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp70_); + _data_->_tmp72_ = _data_->_tmp71_; + _g_object_unref0 (_data_->_tmp70_); + _data_->_backend_it = _data_->_tmp72_; while (TRUE) { - _data_->_tmp71_ = _data_->_backend_it; - _data_->_tmp72_ = FALSE; - _data_->_tmp72_ = gee_iterator_next (_data_->_tmp71_); - if (!_data_->_tmp72_) { + _data_->_tmp73_ = _data_->_backend_it; + _data_->_tmp74_ = FALSE; + _data_->_tmp74_ = gee_iterator_next (_data_->_tmp73_); + if (!_data_->_tmp74_) { break; } - _data_->_tmp73_ = _data_->_backend_it; - _data_->_tmp74_ = NULL; - _data_->_tmp74_ = gee_iterator_get (_data_->_tmp73_); - _data_->backend = (FolksBackend*) _data_->_tmp74_; - _data_->_tmp75_ = _data_->backend; + _data_->_tmp75_ = _data_->_backend_it; + _data_->_tmp76_ = NULL; + _data_->_tmp76_ = gee_iterator_get (_data_->_tmp75_); + _data_->backend = (FolksBackend*) _data_->_tmp76_; + _data_->_tmp77_ = _data_->backend; _data_->_state_ = 5; - _folks_backend_store_backend_load_if_needed (_data_->self, _data_->_tmp75_, folks_backend_store_load_backends_ready, _data_); + _folks_backend_store_backend_load_if_needed (_data_->self, _data_->_tmp77_, folks_backend_store_load_backends_ready, _data_); return FALSE; _state_5: _folks_backend_store_backend_load_if_needed_finish (_data_->self, _data_->_res_); @@ -1366,6 +1379,7 @@ _data_->path_split = (_vala_array_free (_data_->path_split, _data_->path_split_length1, (GDestroyNotify) g_free), NULL); _g_object_unref0 (_data_->modules); _g_free0 (_data_->path); + _g_free0 (_data_->_path); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); } else { @@ -1453,7 +1467,7 @@ _data_->_tmp10_ = _data_->backend; _data_->_tmp11_ = folks_backend_get_name (_data_->_tmp10_); _data_->_tmp12_ = _data_->_tmp11_; - g_debug ("backend-store.vala:351: New backend '%s' prepared", _data_->_tmp12_); + g_debug ("backend-store.vala:358: New backend '%s' prepared", _data_->_tmp12_); _data_->_tmp13_ = _data_->self->priv->_prepared_backends; _data_->_tmp14_ = _data_->backend; _data_->_tmp15_ = folks_backend_get_name (_data_->_tmp14_); @@ -1569,10 +1583,10 @@ { _data_->_tmp10_ = _data_->backend_existing; _data_->_state_ = 1; - folks_backend_unprepare (_data_->_tmp10_, _folks_backend_store_backend_unload_if_needed_ready, _data_); + folks_backend_unprepare (FOLKS_BACKEND (_data_->_tmp10_), _folks_backend_store_backend_unload_if_needed_ready, _data_); return FALSE; _state_1: - folks_backend_unprepare_finish (_data_->_tmp10_, _data_->_res_, &_data_->_inner_error_); + folks_backend_unprepare_finish (FOLKS_BACKEND (_data_->_tmp10_), _data_->_res_, &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { goto __catch1_g_error; } @@ -1587,7 +1601,7 @@ _data_->_tmp13_ = _data_->_tmp12_; _data_->_tmp14_ = _data_->e; _data_->_tmp15_ = _data_->_tmp14_->message; - g_warning ("backend-store.vala:381: Error unpreparing Backend '%s': %s", _data_->_tmp13_, _data_->_tmp15_); + g_warning ("backend-store.vala:388: Error unpreparing Backend '%s': %s", _data_->_tmp13_, _data_->_tmp15_); _g_error_free0 (_data_->e); } __finally1: @@ -1599,7 +1613,7 @@ } _data_->_tmp16_ = _data_->self->priv->_prepared_backends; _data_->_tmp17_ = _data_->backend_existing; - _data_->_tmp18_ = folks_backend_get_name (_data_->_tmp17_); + _data_->_tmp18_ = folks_backend_get_name (FOLKS_BACKEND (_data_->_tmp17_)); _data_->_tmp19_ = _data_->_tmp18_; gee_abstract_map_unset ((GeeAbstractMap*) _data_->_tmp16_, _data_->_tmp19_, NULL); _data_->unloaded = TRUE; @@ -1674,10 +1688,10 @@ const gchar* _tmp13_; const gchar* _tmp14_; _tmp10_ = backend_existing; - folks_backend_unprepare (_tmp10_, NULL, NULL); + folks_backend_unprepare (FOLKS_BACKEND (_tmp10_), NULL, NULL); _tmp11_ = self->priv->_prepared_backends; _tmp12_ = backend_existing; - _tmp13_ = folks_backend_get_name (_tmp12_); + _tmp13_ = folks_backend_get_name (FOLKS_BACKEND (_tmp12_)); _tmp14_ = _tmp13_; gee_abstract_map_unset ((GeeAbstractMap*) _tmp11_, _tmp14_, NULL); } @@ -1908,7 +1922,7 @@ GeeCollection* _tmp6_; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = self->priv->_backend_hash; - _tmp1_ = gee_map_get_values ((GeeMap*) _tmp0_); + _tmp1_ = gee_abstract_map_get_values ((GeeMap*) _tmp0_); _tmp2_ = _tmp1_; _tmp3_ = _tmp2_; _tmp4_ = gee_collection_get_read_only_view (_tmp3_); @@ -1933,7 +1947,7 @@ FolksBackendStoreEnableBackendData* _data_; FolksBackendStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (FolksBackendStoreEnableBackendData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, folks_backend_store_enable_backend); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, folks_backend_store_enable_backend_data_free); @@ -2012,7 +2026,7 @@ FolksBackendStoreDisableBackendData* _data_; FolksBackendStore* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (FolksBackendStoreDisableBackendData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, folks_backend_store_disable_backend); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, folks_backend_store_disable_backend_data_free); @@ -2153,7 +2167,7 @@ _data_->_tmp1_ = NULL; _data_->_tmp1_ = g_file_get_path (_data_->_tmp0_); _data_->_tmp2_ = _data_->_tmp1_; - g_debug ("backend-store.vala:530: Searching for modules in folder '%s' ..", _data_->_tmp2_); + g_debug ("backend-store.vala:537: Searching for modules in folder '%s' ..", _data_->_tmp2_); _g_free0 (_data_->_tmp2_); _data_->_tmp3_ = g_strdup (G_FILE_ATTRIBUTE_STANDARD_NAME "," G_FILE_ATTRIBUTE_STANDARD_TYPE "," G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK "," G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE); _data_->attributes = _data_->_tmp3_; @@ -2266,70 +2280,77 @@ _data_->_tmp36_ = NULL; _data_->_tmp36_ = _folks_backend_store_get_modules_from_dir_finish (_data_->self, _data_->_res_); _data_->modules = _data_->_tmp36_; - { - _data_->_tmp37_ = _data_->modules; - _data_->_tmp38_ = gee_map_get_entries ((GeeMap*) _data_->_tmp37_); - _data_->_tmp39_ = _data_->_tmp38_; - _data_->_tmp40_ = _data_->_tmp39_; - _data_->_tmp41_ = NULL; - _data_->_tmp41_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp40_); - _data_->_tmp42_ = _data_->_tmp41_; - _g_object_unref0 (_data_->_tmp40_); - _data_->_entry_it = _data_->_tmp42_; - while (TRUE) { - _data_->_tmp43_ = _data_->_entry_it; - _data_->_tmp44_ = FALSE; - _data_->_tmp44_ = gee_iterator_next (_data_->_tmp43_); - if (!_data_->_tmp44_) { - break; + _data_->_tmp37_ = _data_->modules; + if (_data_->_tmp37_ != NULL) { + { + _data_->_tmp38_ = _data_->modules; + _data_->_tmp39_ = gee_abstract_map_get_entries ((GeeMap*) GEE_HASH_MAP (_data_->_tmp38_)); + _data_->_tmp40_ = _data_->_tmp39_; + _data_->_tmp41_ = _data_->_tmp40_; + _data_->_tmp42_ = NULL; + _data_->_tmp42_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp41_); + _data_->_tmp43_ = _data_->_tmp42_; + _g_object_unref0 (_data_->_tmp41_); + _data_->_entry_it = _data_->_tmp43_; + while (TRUE) { + _data_->_tmp44_ = _data_->_entry_it; + _data_->_tmp45_ = FALSE; + _data_->_tmp45_ = gee_iterator_next (_data_->_tmp44_); + if (!_data_->_tmp45_) { + break; + } + _data_->_tmp46_ = _data_->_entry_it; + _data_->_tmp47_ = NULL; + _data_->_tmp47_ = gee_iterator_get (_data_->_tmp46_); + _data_->entry = (GeeMapEntry*) _data_->_tmp47_; + _data_->_tmp48_ = _data_->modules_final; + _data_->_tmp49_ = _data_->entry; + _data_->_tmp50_ = gee_map_entry_get_key (_data_->_tmp49_); + _data_->_tmp51_ = _data_->_tmp50_; + _data_->_tmp52_ = _data_->entry; + _data_->_tmp53_ = gee_map_entry_get_value (_data_->_tmp52_); + _data_->_tmp54_ = _data_->_tmp53_; + gee_abstract_map_set ((GeeAbstractMap*) _data_->_tmp48_, (const gchar*) _data_->_tmp51_, (GFile*) _data_->_tmp54_); + _g_object_unref0 (_data_->entry); } - _data_->_tmp45_ = _data_->_entry_it; - _data_->_tmp46_ = NULL; - _data_->_tmp46_ = gee_iterator_get (_data_->_tmp45_); - _data_->entry = (GeeMapEntry*) _data_->_tmp46_; - _data_->_tmp47_ = _data_->modules_final; - _data_->_tmp48_ = _data_->entry; - _data_->_tmp49_ = gee_map_entry_get_key (_data_->_tmp48_); - _data_->_tmp50_ = _data_->_tmp49_; - _data_->_tmp51_ = _data_->entry; - _data_->_tmp52_ = gee_map_entry_get_value (_data_->_tmp51_); - _data_->_tmp53_ = _data_->_tmp52_; - gee_abstract_map_set ((GeeAbstractMap*) _data_->_tmp47_, (const gchar*) _data_->_tmp50_, (GFile*) _data_->_tmp53_); - _g_object_unref0 (_data_->entry); + _g_object_unref0 (_data_->_entry_it); } - _g_object_unref0 (_data_->_entry_it); } _g_object_unref0 (_data_->modules); } else { - _data_->_tmp55_ = _data_->mime; - if (g_strcmp0 (_data_->_tmp55_, "application/x-sharedlib") == 0) { - _data_->_tmp56_ = _data_->is_symlink; - _data_->_tmp54_ = !_data_->_tmp56_; + _data_->_tmp56_ = _data_->mime; + if (g_strcmp0 (_data_->_tmp56_, "application/x-sharedlib") == 0) { + _data_->_tmp57_ = _data_->is_symlink; + _data_->_tmp55_ = !_data_->_tmp57_; } else { - _data_->_tmp54_ = FALSE; + _data_->_tmp55_ = FALSE; } - _data_->_tmp57_ = _data_->_tmp54_; - if (_data_->_tmp57_) { - _data_->_tmp58_ = _data_->modules_final; + _data_->_tmp58_ = _data_->_tmp55_; + if (_data_->_tmp58_) { _data_->_tmp59_ = _data_->file; _data_->_tmp60_ = NULL; _data_->_tmp60_ = g_file_get_path (_data_->_tmp59_); - _data_->_tmp61_ = _data_->_tmp60_; - _data_->_tmp62_ = _data_->file; - gee_abstract_map_set ((GeeAbstractMap*) _data_->_tmp58_, _data_->_tmp61_, _data_->_tmp62_); - _g_free0 (_data_->_tmp61_); + _data_->path = _data_->_tmp60_; + _data_->_tmp61_ = _data_->path; + if (_data_->_tmp61_ != NULL) { + _data_->_tmp62_ = _data_->modules_final; + _data_->_tmp63_ = _data_->path; + _data_->_tmp64_ = _data_->file; + gee_abstract_map_set ((GeeAbstractMap*) _data_->_tmp62_, (const gchar*) _data_->_tmp63_, _data_->_tmp64_); + } + _g_free0 (_data_->path); } else { - _data_->_tmp63_ = _data_->mime; - if (_data_->_tmp63_ == NULL) { - _data_->_tmp64_ = NULL; - _data_->_tmp64_ = _ ("The content type of '%s' could not be determined. Have you installed s" \ -"hared-mime-info?"); - _data_->_tmp65_ = _data_->file; + _data_->_tmp65_ = _data_->mime; + if (_data_->_tmp65_ == NULL) { _data_->_tmp66_ = NULL; - _data_->_tmp66_ = g_file_get_path (_data_->_tmp65_); - _data_->_tmp67_ = _data_->_tmp66_; - g_warning (_data_->_tmp64_, _data_->_tmp67_); - _g_free0 (_data_->_tmp67_); + _data_->_tmp66_ = _ ("The content type of '%s' could not be determined. Have you installed s" \ +"hared-mime-info?"); + _data_->_tmp67_ = _data_->file; + _data_->_tmp68_ = NULL; + _data_->_tmp68_ = g_file_get_path (_data_->_tmp67_); + _data_->_tmp69_ = _data_->_tmp68_; + g_warning (_data_->_tmp66_, _data_->_tmp69_); + _g_free0 (_data_->_tmp69_); } } } @@ -2339,12 +2360,12 @@ } } } - _data_->_tmp68_ = _data_->dir; - _data_->_tmp69_ = NULL; - _data_->_tmp69_ = g_file_get_path (_data_->_tmp68_); - _data_->_tmp70_ = _data_->_tmp69_; - g_debug ("backend-store.vala:590: Finished searching for modules in folder '%s'", _data_->_tmp70_); - _g_free0 (_data_->_tmp70_); + _data_->_tmp70_ = _data_->dir; + _data_->_tmp71_ = NULL; + _data_->_tmp71_ = g_file_get_path (_data_->_tmp70_); + _data_->_tmp72_ = _data_->_tmp71_; + g_debug ("backend-store.vala:606: Finished searching for modules in folder '%s'", _data_->_tmp72_); + _g_free0 (_data_->_tmp72_); _data_->result = _data_->modules_final; __g_list_free__g_object_unref0_0 (_data_->infos); _g_free0 (_data_->attributes); @@ -2371,88 +2392,108 @@ static void _folks_backend_store_load_module_from_file (FolksBackendStore* self, GFile* file) { GFile* _tmp0_; gchar* _tmp1_ = NULL; - gchar* file_path; - GeeHashMap* _tmp2_; + gchar* _file_path; + const gchar* _tmp2_; const gchar* _tmp3_; - gboolean _tmp4_ = FALSE; - const gchar* _tmp5_; - GModule* _tmp6_ = NULL; + gchar* _tmp4_; + gchar* file_path; + GeeHashMap* _tmp5_; + const gchar* _tmp6_; + gboolean _tmp7_ = FALSE; + const gchar* _tmp8_; + GModule* _tmp9_ = NULL; + GModule* _module; + GModule* _tmp10_; + GModule* _tmp14_; GModule* module; - GModule* _tmp7_; void* function = NULL; - GModule* _tmp11_; - void* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - void* _tmp17_; + GModule* _tmp15_; + void* _tmp16_ = NULL; + gboolean _tmp17_ = FALSE; + void* _tmp21_; FolksBackendStoreModuleInitFunc module_init; - FolksBackendStoreModuleInitFunc _tmp18_; - GeeHashMap* _tmp19_; - const gchar* _tmp20_; - GModule* _tmp21_; - GModule* _tmp22_; - FolksBackendStoreModuleInitFunc _tmp23_; - GModule* _tmp24_; - const gchar* _tmp25_ = NULL; + FolksBackendStoreModuleInitFunc _tmp22_; + GeeHashMap* _tmp23_; + const gchar* _tmp24_; + GModule* _tmp25_; + GModule* _tmp26_; + FolksBackendStoreModuleInitFunc _tmp27_; + GModule* _tmp28_; + const gchar* _tmp29_ = NULL; g_return_if_fail (self != NULL); g_return_if_fail (file != NULL); _tmp0_ = file; _tmp1_ = g_file_get_path (_tmp0_); - file_path = _tmp1_; - _tmp2_ = self->priv->_modules; - _tmp3_ = file_path; - _tmp4_ = gee_abstract_map_has_key ((GeeAbstractMap*) _tmp2_, _tmp3_); - if (_tmp4_) { + _file_path = _tmp1_; + _tmp2_ = _file_path; + if (_tmp2_ == NULL) { + _g_free0 (_file_path); + return; + } + _tmp3_ = _file_path; + _tmp4_ = g_strdup ((const gchar*) _tmp3_); + file_path = _tmp4_; + _tmp5_ = self->priv->_modules; + _tmp6_ = file_path; + _tmp7_ = gee_abstract_map_has_key ((GeeAbstractMap*) _tmp5_, _tmp6_); + if (_tmp7_) { _g_free0 (file_path); + _g_free0 (_file_path); return; } - _tmp5_ = file_path; - _tmp6_ = g_module_open (_tmp5_, G_MODULE_BIND_LOCAL); - module = _tmp6_; - _tmp7_ = module; - if (_tmp7_ == NULL) { - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_; - const gchar* _tmp10_ = NULL; - _tmp8_ = _ ("Failed to load module from path '%s': %s"); - _tmp9_ = file_path; - _tmp10_ = g_module_error (); - g_warning (_tmp8_, _tmp9_, _tmp10_); - _g_module_close0 (module); + _tmp8_ = file_path; + _tmp9_ = g_module_open (_tmp8_, G_MODULE_BIND_LOCAL); + _module = _tmp9_; + _tmp10_ = _module; + if (_tmp10_ == NULL) { + const gchar* _tmp11_ = NULL; + const gchar* _tmp12_; + const gchar* _tmp13_ = NULL; + _tmp11_ = _ ("Failed to load module from path '%s': %s"); + _tmp12_ = file_path; + _tmp13_ = g_module_error (); + g_warning (_tmp11_, _tmp12_, _tmp13_); + _g_module_close0 (_module); _g_free0 (file_path); + _g_free0 (_file_path); return; } - _tmp11_ = module; - _tmp13_ = g_module_symbol (_tmp11_, "module_init", &_tmp12_); - function = _tmp12_; - if (!_tmp13_) { - const gchar* _tmp14_ = NULL; - const gchar* _tmp15_; - const gchar* _tmp16_ = NULL; - _tmp14_ = _ ("Failed to find entry point function '%s' in '%s': %s"); - _tmp15_ = file_path; - _tmp16_ = g_module_error (); - g_warning (_tmp14_, "module_init", _tmp15_, _tmp16_); - _g_module_close0 (module); + _tmp14_ = _module; + module = (GModule*) _tmp14_; + _tmp15_ = module; + _tmp17_ = g_module_symbol (_tmp15_, "module_init", &_tmp16_); + function = _tmp16_; + if (!_tmp17_) { + const gchar* _tmp18_ = NULL; + const gchar* _tmp19_; + const gchar* _tmp20_ = NULL; + _tmp18_ = _ ("Failed to find entry point function '%s' in '%s': %s"); + _tmp19_ = file_path; + _tmp20_ = g_module_error (); + g_warning (_tmp18_, "module_init", _tmp19_, _tmp20_); + _g_module_close0 (_module); _g_free0 (file_path); + _g_free0 (_file_path); return; } - _tmp17_ = function; - module_init = (FolksBackendStoreModuleInitFunc) _tmp17_; - _tmp18_ = module_init; - g_assert (_tmp18_ != NULL); - _tmp19_ = self->priv->_modules; - _tmp20_ = file_path; - _tmp21_ = module; - gee_abstract_map_set ((GeeAbstractMap*) _tmp19_, _tmp20_, _tmp21_); - _tmp22_ = module; - g_module_make_resident (_tmp22_); - _tmp23_ = module_init; - _tmp23_ (self); - _tmp24_ = module; - _tmp25_ = g_module_name (_tmp24_); - g_debug ("backend-store.vala:641: Loaded module source: '%s'", _tmp25_); - _g_module_close0 (module); + _tmp21_ = function; + module_init = (FolksBackendStoreModuleInitFunc) _tmp21_; + _tmp22_ = module_init; + g_assert (_tmp22_ != NULL); + _tmp23_ = self->priv->_modules; + _tmp24_ = file_path; + _tmp25_ = module; + gee_abstract_map_set ((GeeAbstractMap*) _tmp23_, _tmp24_, _tmp25_); + _tmp26_ = module; + g_module_make_resident (_tmp26_); + _tmp27_ = module_init; + _tmp27_ (self); + _tmp28_ = module; + _tmp29_ = g_module_name (_tmp28_); + g_debug ("backend-store.vala:663: Loaded module source: '%s'", _tmp29_); + _g_module_close0 (_module); _g_free0 (file_path); + _g_free0 (_file_path); } @@ -2662,11 +2703,11 @@ } else { _data_->_tmp11_ = _data_->path; _data_->_tmp12_ = NULL; - _data_->_tmp12_ = g_file_new_for_path (_data_->_tmp11_); + _data_->_tmp12_ = g_file_new_for_path ((const gchar*) _data_->_tmp11_); _g_object_unref0 (_data_->file); _data_->file = _data_->_tmp12_; _data_->_tmp13_ = _data_->path; - g_debug ("Using environment variable " "FOLKS_BACKEND_STORE_KEY_FILE_PATH = '%s' to load the backends " "key file.", _data_->_tmp13_); + g_debug ("Using environment variable " "FOLKS_BACKEND_STORE_KEY_FILE_PATH = '%s' to load the backends " "key file.", (const gchar*) _data_->_tmp13_); } _data_->_tmp14_ = _data_->file; _data_->_tmp15_ = _g_object_ref0 (_data_->_tmp14_); @@ -2679,7 +2720,7 @@ _data_->contents = NULL; _data_->_tmp17_ = _data_->file; _data_->_tmp18_ = NULL; - _data_->_tmp19_ = 0; + memset (&_data_->_tmp19_, 0, sizeof (gsize)); _data_->_state_ = 1; g_file_load_contents_async (_data_->_tmp17_, NULL, _folks_backend_store_load_disabled_backend_names_ready, _data_); return FALSE; @@ -2722,7 +2763,7 @@ _data_->_tmp33_ = _data_->_tmp32_; _data_->_tmp34_ = _data_->e1; _data_->_tmp35_ = _data_->_tmp34_->message; - g_warning ("backend-store.vala:725: The backends key file '%s' could not be loaded" \ + g_warning ("backend-store.vala:747: The backends key file '%s' could not be loaded" \ ": %s", _data_->_tmp33_, _data_->_tmp35_); _g_free0 (_data_->_tmp33_); _g_error_free0 (_data_->e1); @@ -2781,6 +2822,38 @@ } +static guint8* string_get_data (const gchar* self, int* result_length1) { + guint8* result; + guint8* res; + gint res_length1; + gint _res_size_; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + guint8* _tmp3_; + gint _tmp3__length1; + guint8* _tmp4_; + gint _tmp4__length1; + g_return_val_if_fail (self != NULL, NULL); + res = (guint8*) self; + res_length1 = -1; + _res_size_ = res_length1; + _tmp0_ = strlen (self); + _tmp1_ = _tmp0_; + res_length1 = (gint) _tmp1_; + _tmp2_ = res_length1; + _tmp3_ = res; + _tmp3__length1 = res_length1; + _tmp4_ = _tmp3_; + _tmp4__length1 = _tmp3__length1; + if (result_length1) { + *result_length1 = _tmp4__length1; + } + result = _tmp4_; + return result; +} + + static void _folks_backend_store_save_key_file_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { FolksBackendStoreSaveKeyFileData* _data_; _data_ = _user_data_; @@ -2808,14 +2881,15 @@ _data_->_tmp3_ = NULL; _data_->_tmp3_ = g_file_get_path (_data_->_tmp2_); _data_->_tmp4_ = _data_->_tmp3_; - g_debug ("backend-store.vala:736: Saving backend key file '%s'.", _data_->_tmp4_); + g_debug ("backend-store.vala:758: Saving backend key file '%s'.", _data_->_tmp4_); _g_free0 (_data_->_tmp4_); { _data_->_tmp5_ = _data_->self->priv->_config_file; - _data_->_tmp6_ = strlen (_data_->key_file_data); + _data_->_tmp6_ = string_get_data (_data_->key_file_data, &_data_->_tmp6__length1); _data_->_tmp7_ = _data_->_tmp6_; + _data_->_tmp7__length1 = _data_->_tmp6__length1; _data_->_state_ = 1; - g_file_replace_contents_async (_data_->_tmp5_, _data_->key_file_data, (gsize) _data_->_tmp7_, NULL, FALSE, G_FILE_CREATE_PRIVATE, NULL, _folks_backend_store_save_key_file_ready, _data_); + g_file_replace_contents_async (_data_->_tmp5_, _data_->_tmp7_, (gsize) _data_->_tmp7__length1, NULL, FALSE, G_FILE_CREATE_PRIVATE, NULL, _folks_backend_store_save_key_file_ready, _data_); return FALSE; _state_1: g_file_replace_contents_finish (_data_->_tmp5_, _data_->_res_, NULL, &_data_->_inner_error_); @@ -2834,7 +2908,7 @@ _data_->_tmp10_ = _data_->_tmp9_; _data_->_tmp11_ = _data_->e; _data_->_tmp12_ = _data_->_tmp11_->message; - g_warning ("backend-store.vala:753: Could not write updated backend key file '%s':" \ + g_warning ("backend-store.vala:775: Could not write updated backend key file '%s':" \ " %s", _data_->_tmp10_, _data_->_tmp12_); _g_free0 (_data_->_tmp10_); _g_error_free0 (_data_->e); @@ -3027,7 +3101,7 @@ GeeIterator* _tmp5_; GeeIterator* _module_it; _tmp0_ = self->priv->_modules; - _tmp1_ = gee_map_get_values ((GeeMap*) _tmp0_); + _tmp1_ = gee_abstract_map_get_values ((GeeMap*) _tmp0_); _tmp2_ = _tmp1_; _tmp3_ = _tmp2_; _tmp4_ = gee_iterable_iterator ((GeeIterable*) _tmp3_); @@ -3070,8 +3144,6 @@ _tmp15_ = self->priv->_debug; g_signal_parse_name ("print-status", FOLKS_TYPE_DEBUG, &_tmp16_, NULL, FALSE); g_signal_handlers_disconnect_matched (_tmp15_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp16_, 0, NULL, (GCallback) __folks_backend_store_debug_print_status_folks_debug_print_status, self); - _g_object_unref0 (self->priv->_debug); - self->priv->_debug = NULL; folks_backend_store__instance = NULL; _g_object_unref0 (self->priv->_backend_hash); _g_object_unref0 (self->priv->_prepared_backends); diff -Nru folks-0.6.6/folks/backend-store.vala folks-0.6.7/folks/backend-store.vala --- folks-0.6.6/folks/backend-store.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/folks/backend-store.vala 2012-02-18 00:14:19.000000000 +0000 @@ -48,7 +48,7 @@ private File _config_file; private GLib.KeyFile _backends_key_file; private HashMap _modules; - private static weak BackendStore _instance; + private static weak BackendStore? _instance = null; private bool _is_prepared = false; private Debug _debug; @@ -116,16 +116,16 @@ */ public static BackendStore dup () { - if (_instance == null) + if (BackendStore._instance == null) { /* use an intermediate variable to force a strong reference */ var new_instance = new BackendStore (); - _instance = new_instance; + BackendStore._instance = new_instance; return new_instance; } - return _instance; + return (!) BackendStore._instance; } private BackendStore () @@ -168,10 +168,9 @@ /* Disconnect from the debug handler */ this._debug.print_status.disconnect (this._debug_print_status); - this._debug = null; /* manually clear the singleton instance */ - _instance = null; + BackendStore._instance = null; } private void _debug_print_status (Debug debug) @@ -201,7 +200,7 @@ foreach (var persona_store in backend.persona_stores.values) { - string trust_level = null; + string? trust_level = null; switch (persona_store.trust_level) { @@ -284,8 +283,10 @@ yield this._backend_unload_if_needed (backend_existing); } - var path = Environment.get_variable ("FOLKS_BACKEND_PATH"); - if (path == null) + string? _path = Environment.get_variable ("FOLKS_BACKEND_PATH"); + string path; + + if (_path == null) { path = BuildConf.BACKEND_DIR; @@ -294,16 +295,17 @@ } else { + path = (!) _path; + debug ("Using environment variable FOLKS_BACKEND_PATH = " + "'%s' to look for backends", path); } - var modules = new HashMap (); + var modules = new HashMap (); var path_split = path.split (":"); foreach (unowned string subpath in path_split) { var file = File.new_for_path (subpath); - assert (file != null); bool is_file; bool is_dir; @@ -315,8 +317,13 @@ else if (is_dir) { var cur_modules = yield this._get_modules_from_dir (file); - foreach (var entry in cur_modules.entries) - modules.set (entry.key, entry.value); + if (cur_modules != null) + { + foreach (var entry in ((!) cur_modules).entries) + { + modules.set (entry.key, entry.value); + } + } } else { @@ -369,12 +376,12 @@ if (!this._backend_is_enabled (backend.name)) { - var backend_existing = this._backend_hash.get (backend.name); + Backend? backend_existing = this._backend_hash.get (backend.name); if (backend_existing != null) { try { - yield backend_existing.unprepare (); + yield ((!) backend_existing).unprepare (); } catch (GLib.Error e) { @@ -382,7 +389,7 @@ e.message); } - this._prepared_backends.unset (backend_existing.name); + this._prepared_backends.unset (((!) backend_existing).name); unloaded = true; } @@ -399,11 +406,11 @@ public void add_backend (Backend backend) { /* Purge any other backend with the same name; re-add if enabled */ - var backend_existing = this._backend_hash.get (backend.name); + Backend? backend_existing = this._backend_hash.get (backend.name); if (backend_existing != null && backend_existing != backend) { - backend_existing.unprepare (); - this._prepared_backends.unset (backend_existing.name); + ((!) backend_existing).unprepare (); + this._prepared_backends.unset (((!) backend_existing).name); } this._debug._register_domain (backend.name); @@ -530,10 +537,10 @@ debug ("Searching for modules in folder '%s' ..", dir.get_path ()); var attributes = - FILE_ATTRIBUTE_STANDARD_NAME + "," + - FILE_ATTRIBUTE_STANDARD_TYPE + "," + - FILE_ATTRIBUTE_STANDARD_IS_SYMLINK + "," + - FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE; + FileAttribute.STANDARD_NAME + "," + + FileAttribute.STANDARD_TYPE + "," + + FileAttribute.STANDARD_IS_SYMLINK + "," + + FileAttribute.STANDARD_CONTENT_TYPE; GLib.List infos; try @@ -566,17 +573,26 @@ * aliases */ var is_symlink = info.get_is_symlink (); - string mime = ContentType.get_mime_type (content_type); + string? mime = ContentType.get_mime_type (content_type); if (file_type == FileType.DIRECTORY) { var modules = yield this._get_modules_from_dir (file); - foreach (var entry in modules.entries) - modules_final.set (entry.key, entry.value); + if (modules != null) + { + foreach (var entry in ((!) modules).entries) + { + modules_final.set (entry.key, entry.value); + } + } } else if (mime == "application/x-sharedlib" && !is_symlink) { - modules_final.set (file.get_path (), file); + var path = file.get_path (); + if (path != null) + { + modules_final.set ((!) path, file); + } } else if (mime == null) { @@ -595,13 +611,18 @@ private void _load_module_from_file (File file) { - var file_path = file.get_path (); + var _file_path = file.get_path (); + if (_file_path == null) + { + return; + } + var file_path = (!) _file_path; if (this._modules.has_key (file_path)) return; - Module module = Module.open (file_path, ModuleFlags.BIND_LOCAL); - if (module == null) + var _module = Module.open (file_path, ModuleFlags.BIND_LOCAL); + if (_module == null) { /* Translators: the first parameter is a filename and the second is an * error message. */ @@ -610,6 +631,7 @@ return; } + unowned Module module = (!) _module; void* function; @@ -653,7 +675,7 @@ { /* Query for the MIME type; if the file doesn't exist, we'll get an * appropriate error back, so this also checks for existence. */ - file_info = yield file.query_info_async (FILE_ATTRIBUTE_STANDARD_TYPE, + file_info = yield file.query_info_async (FileAttribute.STANDARD_TYPE, FileQueryInfoFlags.NONE, Priority.DEFAULT, null); } catch (Error error) @@ -681,7 +703,7 @@ private async void _load_disabled_backend_names () { File file; - unowned string path = Environment.get_variable ( + unowned string? path = Environment.get_variable ( "FOLKS_BACKEND_STORE_KEY_FILE_PATH"); if (path == null) { @@ -695,10 +717,10 @@ } else { - file = File.new_for_path (path); + file = File.new_for_path ((!) path); debug ("Using environment variable " + "FOLKS_BACKEND_STORE_KEY_FILE_PATH = '%s' to load the backends " + - "key file.", path); + "key file.", (!) path); } this._config_file = file; @@ -744,9 +766,9 @@ * Vala <= 0.10, it returned the character length). FIXME: We need to * take this into account until we depend explicitly on * Vala >= 0.11. */ - yield this._config_file.replace_contents_async (key_file_data, - key_file_data.length, null, false, FileCreateFlags.PRIVATE, - null); + yield this._config_file.replace_contents_async (key_file_data.data, + null, false, FileCreateFlags.PRIVATE, + null, null); } catch (Error e) { diff -Nru folks-0.6.6/folks/backend.vala folks-0.6.7/folks/backend.vala --- folks-0.6.6/folks/backend.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/folks/backend.vala 2012-01-12 17:25:24.000000000 +0000 @@ -35,6 +35,16 @@ */ public abstract class Folks.Backend : Object { + construct + { + debug ("Constructing Backend ‘%s’ (%p)", this.name, this); + } + + ~Backend () + { + debug ("Destroying Backend ‘%s’ (%p)", this.name, this); + } + /** * Whether {@link Backend.prepare} has successfully completed for this * backend. diff -Nru folks-0.6.6/folks/birthday-details.c folks-0.6.7/folks/birthday-details.c --- folks-0.6.6/folks/birthday-details.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/birthday-details.c 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* birthday-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* birthday-details.c generated by valac 0.15.1, the Vala compiler * generated from birthday-details.vala, do not modify */ /* @@ -223,7 +223,7 @@ FolksBirthdayDetailsChangeCalendarEventIdData* _data_; FolksBirthdayDetails* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (FolksBirthdayDetailsChangeCalendarEventIdData); _data_->_async_result = g_simple_async_result_new (NULL, _callback_, _user_data_, folks_birthday_details_real_change_calendar_event_id); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, folks_birthday_details_real_change_calendar_event_id_data_free); diff -Nru folks-0.6.6/folks/debug.c folks-0.6.7/folks/debug.c --- folks-0.6.6/folks/debug.c 2011-12-13 23:39:16.000000000 +0000 +++ folks-0.6.7/folks/debug.c 2012-02-23 00:01:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* debug.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* debug.c generated by valac 0.15.1, the Vala compiler * generated from debug.vala, do not modify */ /* @@ -284,12 +284,13 @@ { FolksDebug* _tmp1_; FolksDebug* _tmp2_; - FolksDebug* retval; + FolksDebug* _retval; + FolksDebug* retval = NULL; FolksDebug* _tmp3_; _tmp1_ = folks_debug__instance; _tmp2_ = _g_object_ref0 (_tmp1_); - retval = _tmp2_; - _tmp3_ = retval; + _retval = _tmp2_; + _tmp3_ = _retval; if (_tmp3_ == NULL) { FolksDebug* _tmp4_; FolksDebug* _tmp5_; @@ -298,19 +299,27 @@ retval = _tmp4_; _tmp5_ = retval; folks_debug__instance = _tmp5_; + } else { + FolksDebug* _tmp6_; + FolksDebug* _tmp7_; + _tmp6_ = _retval; + _tmp7_ = _g_object_ref0 (FOLKS_DEBUG (_tmp6_)); + _g_object_unref0 (retval); + retval = _tmp7_; } result = retval; + _g_object_unref0 (_retval); { - FolksDebug* _tmp6_; - _tmp6_ = folks_debug__instance; + FolksDebug* _tmp8_; + _tmp8_ = folks_debug__instance; g_static_rec_mutex_unlock (&__lock_folks_debug__instance); } return result; } __finally24: { - FolksDebug* _tmp7_; - _tmp7_ = folks_debug__instance; + FolksDebug* _tmp9_; + _tmp9_ = folks_debug__instance; g_static_rec_mutex_unlock (&__lock_folks_debug__instance); } g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -384,7 +393,7 @@ gchar** _tmp15_; gint _tmp15__length1; _tmp12_ = debug_flags; - _tmp14_ = _tmp13_ = g_strsplit (_tmp12_, ",", 0); + _tmp14_ = _tmp13_ = g_strsplit ((const gchar*) _tmp12_, ",", 0); domains_split = _tmp14_; domains_split_length1 = _vala_array_length (_tmp13_); _domains_split_size_ = domains_split_length1; @@ -454,6 +463,7 @@ _tmp28_ = retval; _tmp29_ = colour_enabled; folks_debug_set_colour_enabled (_tmp28_, _tmp29_); + g_setenv ("G_MESSAGES_DEBUG", "all", TRUE); result = retval; return result; } @@ -480,6 +490,7 @@ GeeHashSet* _tmp4_; const gchar* _tmp5_; g_return_if_fail (self != NULL); + g_return_if_fail (domain != NULL); _tmp0_ = domain; _folks_debug_remove_handler (self, _tmp0_, FALSE); _tmp1_ = domain; @@ -714,7 +725,7 @@ } } _tmp8_ = input; - _tmp9_ = g_strdup (_tmp8_); + _tmp9_ = g_strdup ((const gchar*) _tmp8_); result = _tmp9_; return result; } @@ -762,8 +773,8 @@ gint lines_length1; gint _lines_size_; guint max_key_length; - FolksDebugKeyValuePair* _tmp17_; - gint _tmp17__length1; + FolksDebugKeyValuePair* _tmp19_; + gint _tmp19__length1; g_return_if_fail (self != NULL); g_return_if_fail (domain != NULL); va_start (valist, level); @@ -775,105 +786,112 @@ while (TRUE) { const gchar* _tmp1_ = NULL; gchar* _tmp2_; - gchar* key; + gchar* _key; const gchar* _tmp3_; - const gchar* _tmp4_ = NULL; + const gchar* _tmp4_; gchar* _tmp5_; + gchar* key; + const gchar* _tmp6_ = NULL; + gchar* _tmp7_; gchar* val; - const gchar* _tmp6_; - gint _tmp7_; - gint _tmp8_; - guint _tmp9_; - guint _tmp10_ = 0U; - FolksDebugKeyValuePair* _tmp11_; - gint _tmp11__length1; - const gchar* _tmp12_; - gchar* _tmp13_; + const gchar* _tmp8_; + gint _tmp9_; + gint _tmp10_; + guint _tmp11_; + guint _tmp12_ = 0U; + FolksDebugKeyValuePair* _tmp13_; + gint _tmp13__length1; const gchar* _tmp14_; gchar* _tmp15_; - FolksDebugKeyValuePair _tmp16_ = {0}; + const gchar* _tmp16_; + gchar* _tmp17_; + FolksDebugKeyValuePair _tmp18_ = {0}; _tmp1_ = va_arg (valist, gchar*); _tmp2_ = g_strdup (_tmp1_); - key = _tmp2_; - _tmp3_ = key; + _key = _tmp2_; + _tmp3_ = _key; if (_tmp3_ == NULL) { - _g_free0 (key); + _g_free0 (_key); break; } - _tmp4_ = va_arg (valist, gchar*); - _tmp5_ = g_strdup (_tmp4_); - val = _tmp5_; - _tmp6_ = key; - _tmp7_ = strlen (_tmp6_); - _tmp8_ = _tmp7_; - _tmp9_ = max_key_length; - _tmp10_ = MAX ((guint) _tmp8_, _tmp9_); - max_key_length = _tmp10_; - _tmp11_ = lines; - _tmp11__length1 = lines_length1; - _tmp12_ = key; - _tmp13_ = g_strdup (_tmp12_); - _tmp14_ = val; + _tmp4_ = _key; + _tmp5_ = g_strdup ((const gchar*) _tmp4_); + key = _tmp5_; + _tmp6_ = va_arg (valist, gchar*); + _tmp7_ = g_strdup (_tmp6_); + val = _tmp7_; + _tmp8_ = key; + _tmp9_ = strlen (_tmp8_); + _tmp10_ = _tmp9_; + _tmp11_ = max_key_length; + _tmp12_ = MAX ((guint) _tmp10_, _tmp11_); + max_key_length = _tmp12_; + _tmp13_ = lines; + _tmp13__length1 = lines_length1; + _tmp14_ = key; _tmp15_ = g_strdup (_tmp14_); - memset (&_tmp16_, 0, sizeof (FolksDebugKeyValuePair)); - _g_free0 (_tmp16_.key); - _tmp16_.key = _tmp13_; - _g_free0 (_tmp16_.val); - _tmp16_.val = _tmp15_; - _vala_array_add1 (&lines, &lines_length1, &_lines_size_, &_tmp16_); + _tmp16_ = val; + _tmp17_ = g_strdup (_tmp16_); + memset (&_tmp18_, 0, sizeof (FolksDebugKeyValuePair)); + _g_free0 (_tmp18_.key); + _tmp18_.key = _tmp15_; + _g_free0 (_tmp18_.val); + _tmp18_.val = _tmp17_; + _vala_array_add1 (&lines, &lines_length1, &_lines_size_, &_tmp18_); _g_free0 (val); _g_free0 (key); + _g_free0 (_key); } folks_debug_indent (self); - _tmp17_ = lines; - _tmp17__length1 = lines_length1; + _tmp19_ = lines; + _tmp19__length1 = lines_length1; { FolksDebugKeyValuePair* line_collection = NULL; gint line_collection_length1 = 0; gint _line_collection_size_ = 0; gint line_it = 0; - line_collection = _tmp17_; - line_collection_length1 = _tmp17__length1; - for (line_it = 0; line_it < _tmp17__length1; line_it = line_it + 1) { - FolksDebugKeyValuePair _tmp18_ = {0}; + line_collection = _tmp19_; + line_collection_length1 = _tmp19__length1; + for (line_it = 0; line_it < _tmp19__length1; line_it = line_it + 1) { + FolksDebugKeyValuePair _tmp20_ = {0}; FolksDebugKeyValuePair line = {0}; - folks_debug_key_value_pair_copy (&line_collection[line_it], &_tmp18_); - line = _tmp18_; + folks_debug_key_value_pair_copy (&line_collection[line_it], &_tmp20_); + line = _tmp20_; { - guint _tmp19_; - FolksDebugKeyValuePair _tmp20_; - const gchar* _tmp21_; - gint _tmp22_; - gint _tmp23_; - gchar* _tmp24_ = NULL; + guint _tmp21_; + FolksDebugKeyValuePair _tmp22_; + const gchar* _tmp23_; + gint _tmp24_; + gint _tmp25_; + gchar* _tmp26_ = NULL; gchar* padding; - const gchar* _tmp25_; - GLogLevelFlags _tmp26_; - FolksDebugKeyValuePair _tmp27_; - const gchar* _tmp28_; - const gchar* _tmp29_; - FolksDebugKeyValuePair _tmp30_; + const gchar* _tmp27_; + GLogLevelFlags _tmp28_; + FolksDebugKeyValuePair _tmp29_; + const gchar* _tmp30_; const gchar* _tmp31_; - gchar* _tmp32_ = NULL; - gchar* _tmp33_; - _tmp19_ = max_key_length; - _tmp20_ = line; - _tmp21_ = _tmp20_.key; - _tmp22_ = strlen (_tmp21_); - _tmp23_ = _tmp22_; - _tmp24_ = g_strnfill ((gsize) (_tmp19_ - _tmp23_), ' '); - padding = _tmp24_; - _tmp25_ = domain; - _tmp26_ = level; - _tmp27_ = line; - _tmp28_ = _tmp27_.key; - _tmp29_ = padding; - _tmp30_ = line; - _tmp31_ = _tmp30_.val; - _tmp32_ = _folks_debug_format_nullable_string (self, _tmp31_); - _tmp33_ = _tmp32_; - folks_debug_print_line (self, _tmp25_, _tmp26_, "%s: %s%s", _tmp28_, _tmp29_, _tmp33_); - _g_free0 (_tmp33_); + FolksDebugKeyValuePair _tmp32_; + const gchar* _tmp33_; + gchar* _tmp34_ = NULL; + gchar* _tmp35_; + _tmp21_ = max_key_length; + _tmp22_ = line; + _tmp23_ = _tmp22_.key; + _tmp24_ = strlen (_tmp23_); + _tmp25_ = _tmp24_; + _tmp26_ = g_strnfill ((gsize) (_tmp21_ - _tmp25_), ' '); + padding = _tmp26_; + _tmp27_ = domain; + _tmp28_ = level; + _tmp29_ = line; + _tmp30_ = _tmp29_.key; + _tmp31_ = padding; + _tmp32_ = line; + _tmp33_ = _tmp32_.val; + _tmp34_ = _folks_debug_format_nullable_string (self, _tmp33_); + _tmp35_ = _tmp34_; + folks_debug_print_line (self, _tmp27_, _tmp28_, "%s: %s%s", _tmp30_, _tmp31_, _tmp35_); + _g_free0 (_tmp35_); _g_free0 (padding); folks_debug_key_value_pair_destroy (&line); } @@ -1028,9 +1046,9 @@ static void folks_debug_key_value_pair_copy (const FolksDebugKeyValuePair* self, FolksDebugKeyValuePair* dest) { const gchar* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; + gchar* _tmp3_; _tmp0_ = (*self).key; _tmp1_ = g_strdup (_tmp0_); _g_free0 ((*dest).key); diff -Nru folks-0.6.6/folks/debug.vala folks-0.6.7/folks/debug.vala --- folks-0.6.6/folks/debug.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/folks/debug.vala 2012-01-12 17:25:24.000000000 +0000 @@ -48,7 +48,8 @@ KEY_FILE_BACKEND = 1 << 2 } - private static weak Debug _instance; /* needs to be locked when accessed */ + /* Needs to be locked when accessed: */ + private static weak Debug? _instance = null; private HashSet _domains; /* needs to be locked when accessed */ private bool _all = false; /* needs _domains to be locked when accessed */ @@ -196,14 +197,19 @@ { lock (Debug._instance) { - var retval = Debug._instance; + Debug? _retval = Debug._instance; + Debug retval; - if (retval == null) + if (_retval == null) { /* use an intermediate variable to force a strong reference */ retval = new Debug (); Debug._instance = retval; } + else + { + retval = (!) _retval; + } return retval; } @@ -234,7 +240,7 @@ if (debug_flags != null && debug_flags != "") { - var domains_split = debug_flags.split (","); + var domains_split = ((!) debug_flags).split (","); foreach (var domain in domains_split) { var domain_lower = domain.down (); @@ -249,6 +255,11 @@ retval.colour_enabled = colour_enabled; + /* Unconditionally enable all G_MESSAGES_DEBUG domains, or GLib's default + * log handler will drop all our output. We don't spawn any subprocesses, + * so this shouldn't leak and cause problems elsewhere. */ + Environment.set_variable ("G_MESSAGES_DEBUG", "all", true); + return retval; } @@ -283,7 +294,7 @@ } private void _set_handler ( - string? domain, + string domain, LogLevelFlags flags, LogFunc log_func) { @@ -429,7 +440,7 @@ return "(null)"; } - return input; + return (!) input; } struct KeyValuePair @@ -465,11 +476,12 @@ * purposes */ while (true) { - string? key = valist.arg (); - if (key == null) + string? _key = valist.arg (); + if (_key == null) { break; } + var key = (!) _key; string? val = valist.arg (); diff -Nru folks-0.6.6/folks/email-details.c folks-0.6.7/folks/email-details.c --- folks-0.6.6/folks/email-details.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/email-details.c 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* email-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* email-details.c generated by valac 0.15.1, the Vala compiler * generated from email-details.vala, do not modify */ /* @@ -149,12 +149,12 @@ /** * Create a new EmailFieldDetails. * - * @param value the value of the field + * @param value the value of the field, which should be a valid, non-empty + * e-mail address * @param parameters initial parameters. See * {@link AbstractFieldDetails.parameters}. A `null` value is equivalent to an * empty map of parameters. * - * * @return a new EmailFieldDetails * * @since 0.6.0 @@ -162,16 +162,22 @@ FolksEmailFieldDetails* folks_email_field_details_construct (GType object_type, const gchar* value, GeeMultiMap* parameters) { FolksEmailFieldDetails * self = NULL; const gchar* _tmp0_; - GeeMultiMap* _tmp1_; + const gchar* _tmp1_; + GeeMultiMap* _tmp2_; g_return_val_if_fail (value != NULL, NULL); self = (FolksEmailFieldDetails*) folks_abstract_field_details_construct (object_type, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free); _tmp0_ = value; - folks_abstract_field_details_set_value ((FolksAbstractFieldDetails*) self, _tmp0_); - _tmp1_ = parameters; - if (_tmp1_ != NULL) { - GeeMultiMap* _tmp2_; - _tmp2_ = parameters; - folks_abstract_field_details_set_parameters ((FolksAbstractFieldDetails*) self, _tmp2_); + if (g_strcmp0 (_tmp0_, "") == 0) { + g_warning ("email-details.vala:55: Empty e-mail address passed to EmailFieldDetail" \ +"s."); + } + _tmp1_ = value; + folks_abstract_field_details_set_value ((FolksAbstractFieldDetails*) self, _tmp1_); + _tmp2_ = parameters; + if (_tmp2_ != NULL) { + GeeMultiMap* _tmp3_; + _tmp3_ = parameters; + folks_abstract_field_details_set_parameters ((FolksAbstractFieldDetails*) self, GEE_MULTI_MAP (_tmp3_)); } return self; } diff -Nru folks-0.6.6/folks/email-details.vala folks-0.6.7/folks/email-details.vala --- folks-0.6.6/folks/email-details.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/folks/email-details.vala 2012-01-12 17:25:24.000000000 +0000 @@ -37,12 +37,12 @@ /** * Create a new EmailFieldDetails. * - * @param value the value of the field + * @param value the value of the field, which should be a valid, non-empty + * e-mail address * @param parameters initial parameters. See * {@link AbstractFieldDetails.parameters}. A `null` value is equivalent to an * empty map of parameters. * - * * @return a new EmailFieldDetails * * @since 0.6.0 @@ -50,9 +50,14 @@ public EmailFieldDetails (string value, MultiMap? parameters = null) { + if (value == "") + { + warning ("Empty e-mail address passed to EmailFieldDetails."); + } + this.value = value; if (parameters != null) - this.parameters = parameters; + this.parameters = (!) parameters; } /** @@ -62,7 +67,7 @@ */ public override bool equal (AbstractFieldDetails that) { - return base.equal (that); + return base.equal (that); } /** diff -Nru folks-0.6.6/folks/favourite-details.c folks-0.6.7/folks/favourite-details.c --- folks-0.6.6/folks/favourite-details.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/favourite-details.c 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* favourite-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* favourite-details.c generated by valac 0.15.1, the Vala compiler * generated from favourite-details.vala, do not modify */ /* diff -Nru folks-0.6.6/folks/Folks-0.6.gir folks-0.6.7/folks/Folks-0.6.gir --- folks-0.6.6/folks/Folks-0.6.gir 2011-12-13 23:39:16.000000000 +0000 +++ folks-0.6.7/folks/Folks-0.6.gir 2012-02-23 00:01:48.000000000 +0000 @@ -1009,6 +1009,11 @@ + + + + + @@ -1113,6 +1118,11 @@ + + + + + diff -Nru folks-0.6.6/folks/folks.h folks-0.6.7/folks/folks.h --- folks-0.6.6/folks/folks.h 2011-12-13 23:39:16.000000000 +0000 +++ folks-0.6.7/folks/folks.h 2012-02-23 00:01:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* folks.h generated by valac 0.14.0.50-58097f, the Vala compiler, do not modify */ +/* folks.h generated by valac 0.15.1, the Vala compiler, do not modify */ #ifndef __FOLKS_H__ @@ -1105,6 +1105,7 @@ GType folks_postal_address_get_type (void) G_GNUC_CONST; FolksPostalAddress* folks_postal_address_new (const gchar* po_box, const gchar* extension, const gchar* street, const gchar* locality, const gchar* region, const gchar* postal_code, const gchar* country, const gchar* address_format, const gchar* uid); FolksPostalAddress* folks_postal_address_construct (GType object_type, const gchar* po_box, const gchar* extension, const gchar* street, const gchar* locality, const gchar* region, const gchar* postal_code, const gchar* country, const gchar* address_format, const gchar* uid); +gboolean folks_postal_address_is_empty (FolksPostalAddress* self); gboolean folks_postal_address_equal (FolksPostalAddress* self, FolksPostalAddress* with); gchar* folks_postal_address_to_string (FolksPostalAddress* self); const gchar* folks_postal_address_get_po_box (FolksPostalAddress* self); @@ -1146,6 +1147,7 @@ GType folks_role_get_type (void) G_GNUC_CONST; FolksRole* folks_role_new (const gchar* title, const gchar* organisation_name, const gchar* uid); FolksRole* folks_role_construct (GType object_type, const gchar* title, const gchar* organisation_name, const gchar* uid); +gboolean folks_role_is_empty (FolksRole* self); gboolean folks_role_equal (FolksRole* a, FolksRole* b); guint folks_role_hash (FolksRole* r); gchar* folks_role_to_string (FolksRole* self); diff -Nru folks-0.6.6/folks/folks-internal.h folks-0.6.7/folks/folks-internal.h --- folks-0.6.6/folks/folks-internal.h 2011-12-13 23:39:12.000000000 +0000 +++ folks-0.6.7/folks/folks-internal.h 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* folks-internal.h generated by valac 0.14.0.50-58097f, the Vala compiler, do not modify */ +/* folks-internal.h generated by valac 0.15.1, the Vala compiler, do not modify */ #ifndef __FOLKS_INTERNAL_H__ diff -Nru folks-0.6.6/folks/folks-internal.vapi folks-0.6.7/folks/folks-internal.vapi --- folks-0.6.6/folks/folks-internal.vapi 2011-12-13 23:39:12.000000000 +0000 +++ folks-0.6.7/folks/folks-internal.vapi 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* folks-internal.vapi generated by valac 0.14.0.50-58097f, do not modify. */ +/* folks-internal.vapi generated by valac 0.15.1, do not modify. */ namespace Folks { namespace Internal { diff -Nru folks-0.6.6/folks/folks.vapi folks-0.6.7/folks/folks.vapi --- folks-0.6.6/folks/folks.vapi 2011-12-13 23:39:16.000000000 +0000 +++ folks-0.6.7/folks/folks.vapi 2012-02-23 00:01:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* folks.vapi generated by valac 0.14.0.50-58097f, do not modify. */ +/* folks.vapi generated by valac 0.15.1, do not modify. */ namespace Folks { [CCode (cheader_filename = "folks/folks.h")] @@ -112,7 +112,7 @@ public bool is_prepared { get; } public bool is_quiescent { get; } public Folks.PersonaStore? primary_store { get; } - public Folks.Individual user { get; private set; } + public Folks.Individual? user { get; private set; } [Deprecated (replacement = "IndividualAggregator.individuals_changed_detailed", since = "0.6.2")] public signal void individuals_changed (Gee.Set added, Gee.Set removed, string? message, Folks.Persona? actor, Folks.GroupDetails.ChangeReason reason); public signal void individuals_changed_detailed (Gee.MultiMap changes); @@ -198,6 +198,7 @@ public class PostalAddress : GLib.Object { public PostalAddress (string? po_box, string? extension, string? street, string? locality, string? region, string? postal_code, string? country, string? address_format, string? uid); public bool equal (Folks.PostalAddress with); + public bool is_empty (); public string to_string (); public string address_format { get; set construct; } public string country { get; set construct; } @@ -229,6 +230,7 @@ public Role (string? title = null, string? organisation_name = null, string? uid = null); public static bool equal (Folks.Role a, Folks.Role b); public static uint hash (Folks.Role r); + public bool is_empty (); public string to_string (); public string organisation_name { get; set; } public string role { get; set; } diff -Nru folks-0.6.6/folks/gender-details.c folks-0.6.7/folks/gender-details.c --- folks-0.6.6/folks/gender-details.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/gender-details.c 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* gender-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* gender-details.c generated by valac 0.15.1, the Vala compiler * generated from gender-details.vala, do not modify */ /* diff -Nru folks-0.6.6/folks/group-details.c folks-0.6.7/folks/group-details.c --- folks-0.6.6/folks/group-details.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/group-details.c 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* group-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* group-details.c generated by valac 0.15.1, the Vala compiler * generated from group-details.vala, do not modify */ /* diff -Nru folks-0.6.6/folks/im-details.c folks-0.6.7/folks/im-details.c --- folks-0.6.6/folks/im-details.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/im-details.c 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* im-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* im-details.c generated by valac 0.15.1, the Vala compiler * generated from im-details.vala, do not modify */ /* @@ -168,7 +168,8 @@ /** * Create a new ImFieldDetails. * - * @param value the value of the field + * @param value the value of the field, which should be a valid, non-empty + * IM address * @param parameters initial parameters. See * {@link AbstractFieldDetails.parameters}. A `null` value is equivalent to an * empty map of parameters. @@ -180,16 +181,21 @@ FolksImFieldDetails* folks_im_field_details_construct (GType object_type, const gchar* value, GeeMultiMap* parameters) { FolksImFieldDetails * self = NULL; const gchar* _tmp0_; - GeeMultiMap* _tmp1_; + const gchar* _tmp1_; + GeeMultiMap* _tmp2_; g_return_val_if_fail (value != NULL, NULL); self = (FolksImFieldDetails*) folks_abstract_field_details_construct (object_type, G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free); _tmp0_ = value; - folks_abstract_field_details_set_value ((FolksAbstractFieldDetails*) self, _tmp0_); - _tmp1_ = parameters; - if (_tmp1_ != NULL) { - GeeMultiMap* _tmp2_; - _tmp2_ = parameters; - folks_abstract_field_details_set_parameters ((FolksAbstractFieldDetails*) self, _tmp2_); + if (g_strcmp0 (_tmp0_, "") == 0) { + g_warning ("im-details.vala:64: Empty IM address passed to ImFieldDetails."); + } + _tmp1_ = value; + folks_abstract_field_details_set_value ((FolksAbstractFieldDetails*) self, _tmp1_); + _tmp2_ = parameters; + if (_tmp2_ != NULL) { + GeeMultiMap* _tmp3_; + _tmp3_ = parameters; + folks_abstract_field_details_set_parameters ((FolksAbstractFieldDetails*) self, GEE_MULTI_MAP (_tmp3_)); } return self; } @@ -557,7 +563,7 @@ gchar** _tmp42_; gint _tmp42__length1; gchar* node = NULL; - gchar* domain = NULL; + gchar* _domain = NULL; gchar** _tmp46_; gint _tmp46__length1; gboolean _tmp56_ = FALSE; @@ -569,6 +575,7 @@ gboolean _tmp71_; const gchar* _tmp75_; gchar* _tmp76_ = NULL; + gchar* domain; const gchar* _tmp77_; gchar* normalised; gboolean _tmp80_ = FALSE; @@ -669,8 +676,8 @@ _tmp50__length1 = parts_length1; _tmp51_ = _tmp50_[1]; _tmp52_ = g_strdup (_tmp51_); - _g_free0 (domain); - domain = _tmp52_; + _g_free0 (_domain); + _domain = _tmp52_; } else { gchar** _tmp53_; gint _tmp53__length1; @@ -682,8 +689,8 @@ _tmp53__length1 = parts_length1; _tmp54_ = _tmp53_[0]; _tmp55_ = g_strdup (_tmp54_); - _g_free0 (domain); - domain = _tmp55_; + _g_free0 (_domain); + _domain = _tmp55_; } _tmp59_ = node; if (_tmp59_ != NULL) { @@ -700,12 +707,12 @@ gboolean _tmp62_ = FALSE; const gchar* _tmp63_; gboolean _tmp65_; - _tmp63_ = domain; + _tmp63_ = _domain; if (_tmp63_ == NULL) { _tmp62_ = TRUE; } else { const gchar* _tmp64_; - _tmp64_ = domain; + _tmp64_ = _domain; _tmp62_ = g_strcmp0 (_tmp64_, "") == 0; } _tmp65_ = _tmp62_; @@ -740,13 +747,13 @@ _inner_error_ = _tmp74_; if (_inner_error_->domain == FOLKS_IM_DETAILS_ERROR) { g_propagate_error (error, _inner_error_); - _g_free0 (domain); + _g_free0 (_domain); _g_free0 (node); _g_free0 (resource); parts = (_vala_array_free (parts, parts_length1, (GDestroyNotify) g_free), NULL); return NULL; } else { - _g_free0 (domain); + _g_free0 (_domain); _g_free0 (node); _g_free0 (resource); parts = (_vala_array_free (parts, parts_length1, (GDestroyNotify) g_free), NULL); @@ -755,16 +762,15 @@ return NULL; } } - _tmp75_ = domain; - _tmp76_ = g_utf8_strdown (_tmp75_, (gssize) (-1)); - _g_free0 (domain); + _tmp75_ = _domain; + _tmp76_ = g_utf8_strdown ((const gchar*) _tmp75_, (gssize) (-1)); domain = _tmp76_; _tmp77_ = node; if (_tmp77_ != NULL) { const gchar* _tmp78_; gchar* _tmp79_ = NULL; _tmp78_ = node; - _tmp79_ = g_utf8_strdown (_tmp78_, (gssize) (-1)); + _tmp79_ = g_utf8_strdown ((const gchar*) _tmp78_, (gssize) (-1)); _g_free0 (node); node = _tmp79_; } @@ -786,7 +792,7 @@ _tmp84_ = node; _tmp85_ = domain; _tmp86_ = resource; - _tmp87_ = g_strdup_printf ("%s@%s/%s", _tmp84_, _tmp85_, _tmp86_); + _tmp87_ = g_strdup_printf ("%s@%s/%s", (const gchar*) _tmp84_, _tmp85_, (const gchar*) _tmp86_); _g_free0 (normalised); normalised = _tmp87_; } else { @@ -798,7 +804,7 @@ gchar* _tmp91_ = NULL; _tmp89_ = node; _tmp90_ = domain; - _tmp91_ = g_strdup_printf ("%s@%s", _tmp89_, _tmp90_); + _tmp91_ = g_strdup_printf ("%s@%s", (const gchar*) _tmp89_, _tmp90_); _g_free0 (normalised); normalised = _tmp91_; } else { @@ -810,7 +816,7 @@ gchar* _tmp95_ = NULL; _tmp93_ = domain; _tmp94_ = resource; - _tmp95_ = g_strdup_printf ("%s/%s", _tmp93_, _tmp94_); + _tmp95_ = g_strdup_printf ("%s/%s", _tmp93_, (const gchar*) _tmp94_); _g_free0 (normalised); normalised = _tmp95_; } else { @@ -825,6 +831,7 @@ g_propagate_error (error, _inner_error_); _g_free0 (normalised); _g_free0 (domain); + _g_free0 (_domain); _g_free0 (node); _g_free0 (resource); parts = (_vala_array_free (parts, parts_length1, (GDestroyNotify) g_free), NULL); @@ -832,6 +839,7 @@ } else { _g_free0 (normalised); _g_free0 (domain); + _g_free0 (_domain); _g_free0 (node); _g_free0 (resource); parts = (_vala_array_free (parts, parts_length1, (GDestroyNotify) g_free), NULL); @@ -843,10 +851,11 @@ } } _tmp99_ = normalised; - _tmp100_ = g_utf8_normalize (_tmp99_, (gssize) (-1), G_NORMALIZE_NFKC); + _tmp100_ = g_utf8_normalize ((const gchar*) _tmp99_, (gssize) (-1), G_NORMALIZE_NFKC); result = _tmp100_; _g_free0 (normalised); _g_free0 (domain); + _g_free0 (_domain); _g_free0 (node); _g_free0 (resource); parts = (_vala_array_free (parts, parts_length1, (GDestroyNotify) g_free), NULL); diff -Nru folks-0.6.6/folks/im-details.vala folks-0.6.7/folks/im-details.vala --- folks-0.6.6/folks/im-details.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/folks/im-details.vala 2012-01-12 17:25:24.000000000 +0000 @@ -46,7 +46,8 @@ /** * Create a new ImFieldDetails. * - * @param value the value of the field + * @param value the value of the field, which should be a valid, non-empty + * IM address * @param parameters initial parameters. See * {@link AbstractFieldDetails.parameters}. A `null` value is equivalent to an * empty map of parameters. @@ -58,9 +59,14 @@ public ImFieldDetails (string value, MultiMap? parameters = null) { + if (value == "") + { + warning ("Empty IM address passed to ImFieldDetails."); + } + this.value = value; if (parameters != null) - this.parameters = parameters; + this.parameters = (!) parameters; } /** @@ -70,7 +76,7 @@ */ public override bool equal (AbstractFieldDetails that) { - return base.equal (that); + return base.equal (that); } /** @@ -173,7 +179,7 @@ im_address); } - string resource = null; + string? resource = null; if (parts.length == 2) resource = parts[1]; @@ -187,20 +193,20 @@ im_address); } - string node, domain; + string? node, _domain; if (parts.length == 2) { node = parts[0]; - domain = parts[1]; + _domain = parts[1]; } else { node = null; - domain = parts[0]; + _domain = parts[0]; } if ((node != null && node == "") || - (domain == null || domain == "") || + (_domain == null || _domain == "") || (resource != null && resource == "")) { throw new ImDetailsError.INVALID_IM_ADDRESS ( @@ -209,24 +215,24 @@ im_address); } - domain = domain.down (); + string domain = ((!) _domain).down (); if (node != null) - node = node.down (); + node = ((!) node).down (); /* Build a new JID */ - string normalised = null; + string? normalised = null; if (node != null && resource != null) { - normalised = "%s@%s/%s".printf (node, domain, resource); + normalised = "%s@%s/%s".printf ((!) node, domain, (!) resource); } else if (node != null) { - normalised = "%s@%s".printf (node, domain); + normalised = "%s@%s".printf ((!) node, domain); } else if (resource != null) { - normalised = "%s/%s".printf (domain, resource); + normalised = "%s/%s".printf (domain, (!) resource); } else { @@ -236,7 +242,7 @@ im_address); } - return normalised.normalize (-1, NormalizeMode.NFKC); + return ((!) normalised).normalize (-1, NormalizeMode.NFKC); } else { diff -Nru folks-0.6.6/folks/individual-aggregator.c folks-0.6.7/folks/individual-aggregator.c --- folks-0.6.6/folks/individual-aggregator.c 2011-12-13 23:39:16.000000000 +0000 +++ folks-0.6.7/folks/individual-aggregator.c 2012-02-23 00:01:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* individual-aggregator.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* individual-aggregator.c generated by valac 0.15.1, the Vala compiler * generated from individual-aggregator.vala, do not modify */ /* @@ -256,7 +256,25 @@ gboolean _tmp4_; gboolean _tmp5_; FolksBackendStore* _tmp6_; - gboolean _tmp7_; + FolksBackendStore* _tmp7_; + GeeMap* _tmp8_; + GeeMap* _tmp9_; + GeeCollection* _tmp10_; + GeeCollection* _tmp11_; + GeeCollection* backends; + GeeCollection* _tmp12_; + GeeIterator* _tmp13_; + GeeIterator* _backend_it; + GeeIterator* _tmp14_; + gboolean _tmp15_; + GeeIterator* _tmp16_; + gpointer _tmp17_; + FolksBackend* backend; + FolksBackendStore* _tmp18_; + FolksBackend* _tmp19_; + FolksBackendStore* _tmp20_; + gboolean _tmp21_; + gboolean _tmp22_; GError * _inner_error_; }; @@ -532,154 +550,167 @@ GeeSet* personas; FolksPersonaStore* _tmp0_; const gchar* _tmp1_; - GError* _tmp2_; - GeeSet* _tmp3_; - gint _tmp4_; - gint _tmp5_; - gboolean _tmp6_; - FolksPersonaStore* _tmp7_; - const gchar* _tmp8_; + gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; const gchar* _tmp9_; - const gchar* _tmp10_; - GeeHashMultiMap* _tmp11_; + gchar* _tmp10_; + gchar* _tmp11_; + const gchar* _tmp12_; + const gchar* _tmp13_; + GError* _tmp14_; + GError* _tmp15_; + GeeSet* _tmp16_; + gint _tmp17_; + gint _tmp18_; + gboolean _tmp19_; + FolksPersonaStore* _tmp20_; + const gchar* _tmp21_; + const gchar* _tmp22_; + const gchar* _tmp23_; + GeeHashMultiMap* _tmp24_; GeeHashMultiMap* protocols_addrs_set; - GeeHashMultiMap* _tmp12_; + GeeHashMultiMap* _tmp25_; GeeHashMultiMap* web_service_addrs_set; - GeeHashSet* _tmp13_; + GeeHashSet* _tmp26_; GeeHashSet* local_ids; - GeeSet* _tmp14_; - GeeIterator* _tmp15_; - GeeIterator* _persona_it; - GeeIterator* _tmp16_; - gboolean _tmp17_; - GeeIterator* _tmp18_; - gpointer _tmp19_; - FolksPersona* persona; - FolksPersona* _tmp20_; - FolksPersona* _tmp21_; - FolksImDetails* _tmp22_; - FolksImDetails* im_details; - FolksImDetails* _tmp23_; - GeeMultiMap* _tmp24_; - GeeMultiMap* _tmp25_; - GeeSet* _tmp26_; GeeSet* _tmp27_; GeeIterator* _tmp28_; + GeeIterator* _persona_it; GeeIterator* _tmp29_; + gboolean _tmp30_; + GeeIterator* _tmp31_; + gpointer _tmp32_; + FolksPersona* persona; + FolksPersona* _tmp33_; + FolksPersona* _tmp34_; + FolksImDetails* _tmp35_; + FolksImDetails* im_details; + FolksImDetails* _tmp36_; + GeeMultiMap* _tmp37_; + GeeMultiMap* _tmp38_; + GeeSet* _tmp39_; + GeeSet* _tmp40_; + GeeIterator* _tmp41_; + GeeIterator* _tmp42_; GeeIterator* _protocol_it; - GeeIterator* _tmp30_; - gboolean _tmp31_; - GeeIterator* _tmp32_; - gpointer _tmp33_; + GeeIterator* _tmp43_; + gboolean _tmp44_; + GeeIterator* _tmp45_; + gpointer _tmp46_; gchar* protocol; - FolksImDetails* _tmp34_; - GeeMultiMap* _tmp35_; - GeeMultiMap* _tmp36_; - const gchar* _tmp37_; - GeeCollection* _tmp38_; + FolksImDetails* _tmp47_; + GeeMultiMap* _tmp48_; + GeeMultiMap* _tmp49_; + const gchar* _tmp50_; + GeeCollection* _tmp51_; GeeCollection* im_addresses; - GeeCollection* _tmp39_; - GeeIterator* _tmp40_; + GeeCollection* _tmp52_; + GeeIterator* _tmp53_; GeeIterator* _im_address_it; - GeeIterator* _tmp41_; - gboolean _tmp42_; - GeeIterator* _tmp43_; - gpointer _tmp44_; + GeeIterator* _tmp54_; + gboolean _tmp55_; + GeeIterator* _tmp56_; + gpointer _tmp57_; FolksImFieldDetails* im_address; - GeeHashMultiMap* _tmp45_; - const gchar* _tmp46_; - FolksImFieldDetails* _tmp47_; - FolksPersona* _tmp48_; - FolksPersona* _tmp49_; - FolksWebServiceDetails* _tmp50_; + GeeHashMultiMap* _tmp58_; + const gchar* _tmp59_; + FolksImFieldDetails* _tmp60_; + FolksPersona* _tmp61_; + FolksPersona* _tmp62_; + FolksWebServiceDetails* _tmp63_; FolksWebServiceDetails* ws_details; - FolksWebServiceDetails* _tmp51_; - GeeMultiMap* _tmp52_; - GeeMultiMap* _tmp53_; - GeeSet* _tmp54_; - GeeSet* _tmp55_; - GeeIterator* _tmp56_; - GeeIterator* _tmp57_; + FolksWebServiceDetails* _tmp64_; + GeeMultiMap* _tmp65_; + GeeMultiMap* _tmp66_; + GeeSet* _tmp67_; + GeeSet* _tmp68_; + GeeIterator* _tmp69_; + GeeIterator* _tmp70_; GeeIterator* _web_service_it; - GeeIterator* _tmp58_; - gboolean _tmp59_; - GeeIterator* _tmp60_; - gpointer _tmp61_; + GeeIterator* _tmp71_; + gboolean _tmp72_; + GeeIterator* _tmp73_; + gpointer _tmp74_; gchar* web_service; - FolksWebServiceDetails* _tmp62_; - GeeMultiMap* _tmp63_; - GeeMultiMap* _tmp64_; - const gchar* _tmp65_; - GeeCollection* _tmp66_; + FolksWebServiceDetails* _tmp75_; + GeeMultiMap* _tmp76_; + GeeMultiMap* _tmp77_; + const gchar* _tmp78_; + GeeCollection* _tmp79_; GeeCollection* ws_addresses; - GeeCollection* _tmp67_; - GeeIterator* _tmp68_; + GeeCollection* _tmp80_; + GeeIterator* _tmp81_; GeeIterator* _ws_fd_it; - GeeIterator* _tmp69_; - gboolean _tmp70_; - GeeIterator* _tmp71_; - gpointer _tmp72_; + GeeIterator* _tmp82_; + gboolean _tmp83_; + GeeIterator* _tmp84_; + gpointer _tmp85_; FolksWebServiceFieldDetails* ws_fd; - GeeHashMultiMap* _tmp73_; - const gchar* _tmp74_; - FolksWebServiceFieldDetails* _tmp75_; - FolksPersona* _tmp76_; - FolksPersona* _tmp77_; - GeeSet* _tmp78_; - GeeSet* _tmp79_; - GeeIterator* _tmp80_; + GeeHashMultiMap* _tmp86_; + const gchar* _tmp87_; + FolksWebServiceFieldDetails* _tmp88_; + FolksPersona* _tmp89_; + FolksPersona* _tmp90_; + GeeSet* _tmp91_; + GeeSet* _tmp92_; + GeeIterator* _tmp93_; GeeIterator* _id_it; - GeeIterator* _tmp81_; - gboolean _tmp82_; - GeeIterator* _tmp83_; - gpointer _tmp84_; + GeeIterator* _tmp94_; + gboolean _tmp95_; + GeeIterator* _tmp96_; + gpointer _tmp97_; gchar* id; - GeeHashSet* _tmp85_; - const gchar* _tmp86_; - GHashFunc _tmp87_; - GEqualFunc _tmp88_; - GHashTable* _tmp89_; + GeeHashSet* _tmp98_; + const gchar* _tmp99_; + GHashFunc _tmp100_; + GEqualFunc _tmp101_; + GHashTable* _tmp102_; GHashTable* details; - GeeHashMultiMap* _tmp90_; - gint _tmp91_; - gint _tmp92_; - GValue _tmp93_; + GeeHashMultiMap* _tmp103_; + gint _tmp104_; + gint _tmp105_; + GValue _tmp106_; GValue im_addresses_value; - GeeHashMultiMap* _tmp94_; - GHashTable* _tmp95_; - const gchar* _tmp96_; - gchar* _tmp97_; - GValue _tmp98_; - GValue _tmp99_; - GValue* _tmp100_; - GeeHashMultiMap* _tmp101_; - gint _tmp102_; - gint _tmp103_; - GValue _tmp104_; + GeeHashMultiMap* _tmp107_; + GHashTable* _tmp108_; + const gchar* _tmp109_; + gchar* _tmp110_; + GValue _tmp111_; + GValue _tmp112_; + GValue* _tmp113_; + GeeHashMultiMap* _tmp114_; + gint _tmp115_; + gint _tmp116_; + GValue _tmp117_; GValue web_service_addresses_value; - GeeHashMultiMap* _tmp105_; - GHashTable* _tmp106_; - const gchar* _tmp107_; - gchar* _tmp108_; - GValue _tmp109_; - GValue _tmp110_; - GValue* _tmp111_; - GeeHashSet* _tmp112_; - gint _tmp113_; - gint _tmp114_; - GValue _tmp115_; + GeeHashMultiMap* _tmp118_; + GHashTable* _tmp119_; + const gchar* _tmp120_; + gchar* _tmp121_; + GValue _tmp122_; + GValue _tmp123_; + GValue* _tmp124_; + GeeHashSet* _tmp125_; + gint _tmp126_; + gint _tmp127_; + GValue _tmp128_; GValue local_ids_value; - GeeHashSet* _tmp116_; - GHashTable* _tmp117_; - const gchar* _tmp118_; - gchar* _tmp119_; - GValue _tmp120_; - GValue _tmp121_; - GValue* _tmp122_; - FolksPersonaStore* _tmp123_; - GHashTable* _tmp124_; - FolksPersona* _tmp125_; - FolksPersona* _tmp126_; + GeeHashSet* _tmp129_; + GHashTable* _tmp130_; + const gchar* _tmp131_; + gchar* _tmp132_; + GValue _tmp133_; + GValue _tmp134_; + GValue* _tmp135_; + FolksPersonaStore* _tmp136_; + GHashTable* _tmp137_; + FolksPersona* _tmp138_; + FolksPersona* _tmp139_; GError * _inner_error_; }; @@ -826,29 +857,44 @@ FolksPersonaStore* _tmp61_; gboolean _tmp62_; const gchar* _tmp63_; - GError* _tmp64_; - FolksPersona* _tmp65_; + gchar* _tmp64_; + gchar* _tmp65_; const gchar* _tmp66_; - const gchar* _tmp67_; - GError* _tmp68_; - GeeHashSet* _tmp69_; + gchar* _tmp67_; + gchar* _tmp68_; + gchar* _tmp69_; + gchar* _tmp70_; + const gchar* _tmp71_; + gchar* _tmp72_; + gchar* _tmp73_; + const gchar* _tmp74_; + const gchar* _tmp75_; + GError* _tmp76_; + GError* _tmp77_; + FolksPersona* _tmp78_; + const gchar* _tmp79_; + const gchar* _tmp80_; + GError* _tmp81_; + GeeHashSet* _tmp82_; GeeHashSet* linking_personas; - GeeHashSet* _tmp70_; - FolksPersona* _tmp71_; - FolksIndividual* _tmp72_; - GeeSet* _tmp73_; - GeeSet* _tmp74_; - GeeIterator* _tmp75_; + GeeHashSet* _tmp83_; + FolksPersona* _tmp84_; + FolksIndividual* _tmp85_; + GeeSet* _tmp86_; + GeeSet* _tmp87_; + GeeIterator* _tmp88_; GeeIterator* _p2_it; - GeeIterator* _tmp76_; - gboolean _tmp77_; - GeeIterator* _tmp78_; - gpointer _tmp79_; + GeeIterator* _tmp89_; + gboolean _tmp90_; + GeeIterator* _tmp91_; + gpointer _tmp92_; FolksPersona* p2; - GeeHashSet* _tmp80_; - FolksPersona* _tmp81_; - const gchar* _tmp82_; - GeeHashSet* _tmp83_; + GeeHashSet* _tmp93_; + FolksPersona* _tmp94_; + const gchar* _tmp95_; + GeeHashSet* _tmp96_; + FolksPersona* _tmp97_; + FolksPersona* _tmp98_; GError * _inner_error_; }; @@ -900,9 +946,11 @@ void folks_individual_aggregator_prepare (FolksIndividualAggregator* self, GAsyncReadyCallback _callback_, gpointer _user_data_); void folks_individual_aggregator_prepare_finish (FolksIndividualAggregator* self, GAsyncResult* _res_, GError** error); static gboolean folks_individual_aggregator_prepare_co (FolksIndividualAggregatorPrepareData* _data_); +GeeMap* folks_backend_store_get_enabled_backends (FolksBackendStore* self); void folks_backend_store_load_backends (FolksBackendStore* self, GAsyncReadyCallback _callback_, gpointer _user_data_); void folks_backend_store_load_backends_finish (FolksBackendStore* self, GAsyncResult* _res_, GError** error); static void folks_individual_aggregator_prepare_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); +static void _folks_individual_aggregator_notify_if_is_quiescent (FolksIndividualAggregator* self); GType folks_match_result_get_type (void) G_GNUC_CONST; GeeMap* folks_individual_aggregator_get_potential_matches (FolksIndividualAggregator* self, FolksIndividual* matchee, FolksMatchResult min_threshold); FolksPotentialMatch* folks_potential_match_new (void); @@ -928,6 +976,7 @@ void folks_persona_store_set_is_primary_store (FolksPersonaStore* self, gboolean value); static Block2Data* block2_data_ref (Block2Data* _data2_); static void block2_data_unref (Block2Data* _data2_); +const gchar* folks_backend_get_name (FolksBackend* self); static gchar* _folks_individual_aggregator_get_store_full_id (FolksIndividualAggregator* self, const gchar* type_id, const gchar* id); static gboolean _folks_individual_aggregator_maybe_configure_as_primary (FolksIndividualAggregator* self, FolksPersonaStore* store); GType folks_group_details_change_reason_get_type (void) G_GNUC_CONST; @@ -940,11 +989,11 @@ static void _folks_individual_aggregator_persona_store_is_user_set_default_changed_cb (FolksIndividualAggregator* self, GObject* obj, GParamSpec* pspec); static void __folks_individual_aggregator_persona_store_is_user_set_default_changed_cb_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); gboolean folks_persona_store_get_is_quiescent (FolksPersonaStore* self); +GeeMap* folks_persona_store_get_personas (FolksPersonaStore* self); void folks_persona_store_prepare (FolksPersonaStore* self, GAsyncReadyCallback _callback_, gpointer _user_data_); void folks_persona_store_prepare_finish (FolksPersonaStore* self, GAsyncResult* _res_, GError** error); static void __lambda36_ (Block2Data* _data2_, GObject* obj, GAsyncResult* _result_); static void ___lambda36__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); -static void _folks_individual_aggregator_notify_if_is_quiescent (FolksIndividualAggregator* self); static void _folks_individual_aggregator_emit_individuals_changed (FolksIndividualAggregator* self, GeeSet* added, GeeSet* removed, GeeMultiMap* changes, const gchar* message, FolksPersona* actor, FolksGroupDetailsChangeReason reason); gboolean folks_debug_get_debug_output_enabled (FolksDebug* self); static void _folks_individual_aggregator_connect_to_individual (FolksIndividualAggregator* self, FolksIndividual* individual); @@ -1136,7 +1185,7 @@ g_return_if_fail (self != NULL); g_return_if_fail (store_config_ids != NULL); _tmp0_ = store_config_ids; - g_debug ("individual-aggregator.vala:364: _configure_primary_store to '%s'", _tmp0_); + g_debug ("individual-aggregator.vala:370: _configure_primary_store to '%s'", _tmp0_); self->priv->_user_configured_primary_store = TRUE; _tmp1_ = store_config_ids; _tmp2_ = string_index_of (_tmp1_, ":", 0); @@ -1630,16 +1679,53 @@ { _data_->self->priv->_prepare_pending = TRUE; _data_->_tmp6_ = _data_->self->priv->_backend_store; + g_signal_connect_object (_data_->_tmp6_, "backend-available", (GCallback) __folks_individual_aggregator_backend_available_cb_folks_backend_store_backend_available, _data_->self, 0); + _data_->_tmp7_ = _data_->self->priv->_backend_store; + _data_->_tmp8_ = folks_backend_store_get_enabled_backends (_data_->_tmp7_); + _data_->_tmp9_ = _data_->_tmp8_; + _data_->_tmp10_ = gee_map_get_values (_data_->_tmp9_); + _data_->_tmp11_ = _data_->_tmp10_; + _data_->backends = _data_->_tmp11_; + { + _data_->_tmp12_ = _data_->backends; + _data_->_tmp13_ = NULL; + _data_->_tmp13_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp12_); + _data_->_backend_it = _data_->_tmp13_; + while (TRUE) { + _data_->_tmp14_ = _data_->_backend_it; + _data_->_tmp15_ = FALSE; + _data_->_tmp15_ = gee_iterator_next (_data_->_tmp14_); + if (!_data_->_tmp15_) { + break; + } + _data_->_tmp16_ = _data_->_backend_it; + _data_->_tmp17_ = NULL; + _data_->_tmp17_ = gee_iterator_get (_data_->_tmp16_); + _data_->backend = (FolksBackend*) _data_->_tmp17_; + _data_->_tmp18_ = _data_->self->priv->_backend_store; + _data_->_tmp19_ = _data_->backend; + _folks_individual_aggregator_backend_available_cb (_data_->self, _data_->_tmp18_, _data_->_tmp19_); + _g_object_unref0 (_data_->backend); + } + _g_object_unref0 (_data_->_backend_it); + } + _data_->_tmp20_ = _data_->self->priv->_backend_store; _data_->_state_ = 1; - folks_backend_store_load_backends (_data_->_tmp6_, folks_individual_aggregator_prepare_ready, _data_); + folks_backend_store_load_backends (_data_->_tmp20_, folks_individual_aggregator_prepare_ready, _data_); return FALSE; _state_1: - folks_backend_store_load_backends_finish (_data_->_tmp6_, _data_->_res_, &_data_->_inner_error_); + folks_backend_store_load_backends_finish (_data_->_tmp20_, _data_->_res_, &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { + _g_object_unref0 (_data_->backends); goto __finally15; } _data_->self->priv->_is_prepared = TRUE; g_object_notify ((GObject*) _data_->self, "is-prepared"); + _data_->_tmp21_ = _data_->self->priv->_is_quiescent; + if (_data_->_tmp21_ == FALSE) { + _folks_individual_aggregator_notify_if_is_quiescent (_data_->self); + } + _g_object_unref0 (_data_->backends); } __finally15: { @@ -1651,7 +1737,7 @@ } __finally14: { - _data_->_tmp7_ = _data_->self->priv->_is_prepared; + _data_->_tmp22_ = _data_->self->priv->_is_prepared; g_static_rec_mutex_unlock (&_data_->self->priv->__lock__is_prepared); } if (_data_->_inner_error_ != NULL) { @@ -1842,7 +1928,8 @@ GeeHashMap* _tmp18_; FolksIndividual* _tmp19_; gpointer _tmp20_ = NULL; - GeeHashMap* matches_a; + GeeHashMap* _matches_a; + GeeHashMap* matches_a = NULL; GeeHashMap* _tmp21_; _tmp10_ = _tmp9_; if (!_tmp10_) { @@ -1866,8 +1953,8 @@ _tmp18_ = matches; _tmp19_ = a; _tmp20_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp18_, _tmp19_); - matches_a = (GeeHashMap*) _tmp20_; - _tmp21_ = matches_a; + _matches_a = (GeeHashMap*) _tmp20_; + _tmp21_ = _matches_a; if (_tmp21_ == NULL) { GeeHashMap* _tmp22_; GeeHashMap* _tmp23_; @@ -1880,104 +1967,121 @@ _tmp24_ = a; _tmp25_ = matches_a; gee_abstract_map_set ((GeeAbstractMap*) _tmp23_, _tmp24_, _tmp25_); + } else { + GeeHashMap* _tmp26_; + GeeHashMap* _tmp27_; + _tmp26_ = _matches_a; + _tmp27_ = _g_object_ref0 (GEE_HASH_MAP (_tmp26_)); + _g_object_unref0 (matches_a); + matches_a = _tmp27_; } { - gint _tmp26_; + gint _tmp28_; gint f; - _tmp26_ = i; - f = _tmp26_ + 1; + _tmp28_ = i; + f = _tmp28_ + 1; { - gboolean _tmp27_; - _tmp27_ = TRUE; + gboolean _tmp29_; + _tmp29_ = TRUE; while (TRUE) { - gboolean _tmp28_; - gint _tmp30_; - FolksIndividual** _tmp31_; - gint _tmp31__length1; - FolksIndividual** _tmp32_; - gint _tmp32__length1; - gint _tmp33_; - FolksIndividual* _tmp34_; - FolksIndividual* _tmp35_; - FolksIndividual* b; - GeeHashMap* _tmp36_; + gboolean _tmp30_; + gint _tmp32_; + FolksIndividual** _tmp33_; + gint _tmp33__length1; + FolksIndividual** _tmp34_; + gint _tmp34__length1; + gint _tmp35_; + FolksIndividual* _tmp36_; FolksIndividual* _tmp37_; - gpointer _tmp38_ = NULL; - GeeHashMap* matches_b; - GeeHashMap* _tmp39_; - FolksPotentialMatch* _tmp44_; - FolksIndividual* _tmp45_; - FolksIndividual* _tmp46_; - FolksMatchResult _tmp47_ = 0; + FolksIndividual* b; + GeeHashMap* _tmp38_; + FolksIndividual* _tmp39_; + gpointer _tmp40_ = NULL; + GeeHashMap* _matches_b; + GeeHashMap* matches_b = NULL; + GeeHashMap* _tmp41_; + FolksPotentialMatch* _tmp48_; + FolksIndividual* _tmp49_; + FolksIndividual* _tmp50_; + FolksMatchResult _tmp51_ = 0; FolksMatchResult _result_; - FolksMatchResult _tmp48_; - FolksMatchResult _tmp49_; - _tmp28_ = _tmp27_; - if (!_tmp28_) { - gint _tmp29_; - _tmp29_ = f; - f = _tmp29_ + 1; + FolksMatchResult _tmp52_; + FolksMatchResult _tmp53_; + _tmp30_ = _tmp29_; + if (!_tmp30_) { + gint _tmp31_; + _tmp31_ = f; + f = _tmp31_ + 1; } - _tmp27_ = FALSE; - _tmp30_ = f; - _tmp31_ = individuals; - _tmp31__length1 = individuals_length1; - if (!(_tmp30_ < _tmp31__length1)) { + _tmp29_ = FALSE; + _tmp32_ = f; + _tmp33_ = individuals; + _tmp33__length1 = individuals_length1; + if (!(_tmp32_ < _tmp33__length1)) { break; } - _tmp32_ = individuals; - _tmp32__length1 = individuals_length1; - _tmp33_ = f; - _tmp34_ = _tmp32_[_tmp33_]; - _tmp35_ = _g_object_ref0 (_tmp34_); - b = _tmp35_; - _tmp36_ = matches; - _tmp37_ = b; - _tmp38_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp36_, _tmp37_); - matches_b = (GeeHashMap*) _tmp38_; - _tmp39_ = matches_b; - if (_tmp39_ == NULL) { - GeeHashMap* _tmp40_; - GeeHashMap* _tmp41_; - FolksIndividual* _tmp42_; + _tmp34_ = individuals; + _tmp34__length1 = individuals_length1; + _tmp35_ = f; + _tmp36_ = _tmp34_[_tmp35_]; + _tmp37_ = _g_object_ref0 (_tmp36_); + b = _tmp37_; + _tmp38_ = matches; + _tmp39_ = b; + _tmp40_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp38_, _tmp39_); + _matches_b = (GeeHashMap*) _tmp40_; + _tmp41_ = _matches_b; + if (_tmp41_ == NULL) { + GeeHashMap* _tmp42_; GeeHashMap* _tmp43_; - _tmp40_ = gee_hash_map_new (FOLKS_TYPE_INDIVIDUAL, (GBoxedCopyFunc) g_object_ref, g_object_unref, FOLKS_TYPE_MATCH_RESULT, NULL, NULL, NULL, NULL, NULL); + FolksIndividual* _tmp44_; + GeeHashMap* _tmp45_; + _tmp42_ = gee_hash_map_new (FOLKS_TYPE_INDIVIDUAL, (GBoxedCopyFunc) g_object_ref, g_object_unref, FOLKS_TYPE_MATCH_RESULT, NULL, NULL, NULL, NULL, NULL); _g_object_unref0 (matches_b); - matches_b = _tmp40_; - _tmp41_ = matches; - _tmp42_ = b; - _tmp43_ = matches_b; - gee_abstract_map_set ((GeeAbstractMap*) _tmp41_, _tmp42_, _tmp43_); + matches_b = _tmp42_; + _tmp43_ = matches; + _tmp44_ = b; + _tmp45_ = matches_b; + gee_abstract_map_set ((GeeAbstractMap*) _tmp43_, _tmp44_, _tmp45_); + } else { + GeeHashMap* _tmp46_; + GeeHashMap* _tmp47_; + _tmp46_ = _matches_b; + _tmp47_ = _g_object_ref0 (GEE_HASH_MAP (_tmp46_)); + _g_object_unref0 (matches_b); + matches_b = _tmp47_; } - _tmp44_ = matchObj; - _tmp45_ = a; - _tmp46_ = b; - _tmp47_ = folks_potential_match_potential_match (_tmp44_, _tmp45_, _tmp46_); - _result_ = _tmp47_; - _tmp48_ = _result_; - _tmp49_ = min_threshold; - if (_tmp48_ >= _tmp49_) { - GeeHashMap* _tmp50_; - FolksIndividual* _tmp51_; - FolksMatchResult _tmp52_; - GeeHashMap* _tmp53_; - FolksIndividual* _tmp54_; - FolksMatchResult _tmp55_; - _tmp50_ = matches_a; - _tmp51_ = b; - _tmp52_ = _result_; - gee_abstract_map_set ((GeeAbstractMap*) _tmp50_, _tmp51_, GINT_TO_POINTER (_tmp52_)); - _tmp53_ = matches_b; - _tmp54_ = a; - _tmp55_ = _result_; - gee_abstract_map_set ((GeeAbstractMap*) _tmp53_, _tmp54_, GINT_TO_POINTER (_tmp55_)); + _tmp48_ = matchObj; + _tmp49_ = a; + _tmp50_ = b; + _tmp51_ = folks_potential_match_potential_match (_tmp48_, _tmp49_, _tmp50_); + _result_ = _tmp51_; + _tmp52_ = _result_; + _tmp53_ = min_threshold; + if (_tmp52_ >= _tmp53_) { + GeeHashMap* _tmp54_; + FolksIndividual* _tmp55_; + FolksMatchResult _tmp56_; + GeeHashMap* _tmp57_; + FolksIndividual* _tmp58_; + FolksMatchResult _tmp59_; + _tmp54_ = matches_a; + _tmp55_ = b; + _tmp56_ = _result_; + gee_abstract_map_set ((GeeAbstractMap*) _tmp54_, _tmp55_, GINT_TO_POINTER (_tmp56_)); + _tmp57_ = matches_b; + _tmp58_ = a; + _tmp59_ = _result_; + gee_abstract_map_set ((GeeAbstractMap*) _tmp57_, _tmp58_, GINT_TO_POINTER (_tmp59_)); } _g_object_unref0 (matches_b); + _g_object_unref0 (_matches_b); _g_object_unref0 (b); } } } _g_object_unref0 (matches_a); + _g_object_unref0 (_matches_a); _g_object_unref0 (a); } } @@ -2133,7 +2237,7 @@ const gchar* _tmp5_; g_return_if_fail (self != NULL); g_return_if_fail (store != NULL); - g_debug ("individual-aggregator.vala:644: _set_primary_store()"); + g_debug ("individual-aggregator.vala:685: _set_primary_store()"); _tmp0_ = self->priv->_primary_store; _tmp1_ = store; if (_tmp0_ == _tmp1_) { @@ -2200,33 +2304,33 @@ _tmp22_ = store; _tmp23_ = folks_persona_store_get_id (_tmp22_); _tmp24_ = _tmp23_; - g_debug ("individual-aggregator.vala:661: Setting primary store to %p (type ID: " \ + g_debug ("individual-aggregator.vala:702: Setting primary store to %p (type ID: " \ "%s, ID: %s)", _tmp18_, _tmp21_, _tmp24_); _tmp25_ = self->priv->_primary_store; _tmp26_ = _g_object_ref0 (_tmp25_); previous_store = _tmp26_; _tmp27_ = store; self->priv->_primary_store = _tmp27_; - _tmp28_ = self->priv->_primary_store; + _tmp28_ = store; g_object_freeze_notify ((GObject*) _tmp28_); _tmp29_ = previous_store; if (_tmp29_ != NULL) { FolksPersonaStore* _tmp30_; FolksPersonaStore* _tmp31_; _tmp30_ = previous_store; - g_object_freeze_notify ((GObject*) _tmp30_); + g_object_freeze_notify ((GObject*) FOLKS_PERSONA_STORE (_tmp30_)); _tmp31_ = previous_store; - folks_persona_store_set_is_primary_store (_tmp31_, FALSE); + folks_persona_store_set_is_primary_store (FOLKS_PERSONA_STORE (_tmp31_), FALSE); } - _tmp32_ = self->priv->_primary_store; + _tmp32_ = store; folks_persona_store_set_is_primary_store (_tmp32_, TRUE); _tmp33_ = previous_store; if (_tmp33_ != NULL) { FolksPersonaStore* _tmp34_; _tmp34_ = previous_store; - g_object_thaw_notify ((GObject*) _tmp34_); + g_object_thaw_notify ((GObject*) FOLKS_PERSONA_STORE (_tmp34_)); } - _tmp35_ = self->priv->_primary_store; + _tmp35_ = store; g_object_thaw_notify ((GObject*) _tmp35_); g_object_notify ((GObject*) self, "primary-store"); _g_object_unref0 (previous_store); @@ -2243,9 +2347,11 @@ static void block2_data_unref (Block2Data* _data2_) { if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { - _g_object_unref0 (_data2_->self); + FolksIndividualAggregator * self; + self = _data2_->self; _g_free0 (_data2_->store_id); _g_object_unref0 (_data2_->store); + _g_object_unref0 (self); g_slice_free (Block2Data, _data2_); } } @@ -2322,26 +2428,38 @@ Block2Data* _data2_; FolksPersonaStore* _tmp0_; FolksPersonaStore* _tmp1_; - FolksPersonaStore* _tmp2_; + FolksBackend* _tmp2_; const gchar* _tmp3_; const gchar* _tmp4_; FolksPersonaStore* _tmp5_; const gchar* _tmp6_; const gchar* _tmp7_; - gchar* _tmp8_ = NULL; + FolksPersonaStore* _tmp8_; FolksPersonaStore* _tmp9_; - FolksPersonaStore* _tmp10_; - GeeHashMap* _tmp11_; - const gchar* _tmp12_; - FolksPersonaStore* _tmp13_; - FolksPersonaStore* _tmp14_; - FolksPersonaStore* _tmp15_; + const gchar* _tmp10_; + const gchar* _tmp11_; + FolksPersonaStore* _tmp12_; + const gchar* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_ = NULL; FolksPersonaStore* _tmp16_; FolksPersonaStore* _tmp17_; - FolksPersonaStore* _tmp18_; - gboolean _tmp19_; - gboolean _tmp20_; + GeeHashMap* _tmp18_; + const gchar* _tmp19_; + FolksPersonaStore* _tmp20_; + FolksPersonaStore* _tmp21_; FolksPersonaStore* _tmp22_; + FolksPersonaStore* _tmp23_; + FolksPersonaStore* _tmp24_; + FolksPersonaStore* _tmp25_; + gboolean _tmp26_; + gboolean _tmp27_; + FolksPersonaStore* _tmp29_; + GeeMap* _tmp30_; + GeeMap* _tmp31_; + gint _tmp32_; + gint _tmp33_; + FolksPersonaStore* _tmp53_; g_return_if_fail (self != NULL); g_return_if_fail (backend != NULL); g_return_if_fail (store != NULL); @@ -2351,40 +2469,114 @@ _tmp0_ = store; _tmp1_ = _g_object_ref0 (_tmp0_); _data2_->store = _tmp1_; - _tmp2_ = _data2_->store; - _tmp3_ = folks_persona_store_get_type_id (_tmp2_); + _tmp2_ = backend; + _tmp3_ = folks_backend_get_name (_tmp2_); _tmp4_ = _tmp3_; _tmp5_ = _data2_->store; _tmp6_ = folks_persona_store_get_id (_tmp5_); _tmp7_ = _tmp6_; - _tmp8_ = _folks_individual_aggregator_get_store_full_id (self, _tmp4_, _tmp7_); - _data2_->store_id = _tmp8_; + _tmp8_ = _data2_->store; + g_debug ("individual-aggregator.vala:727: _backend_persona_store_added_cb(): bac" \ +"kend: %s, store: %s (%p)", _tmp4_, _tmp7_, _tmp8_); _tmp9_ = _data2_->store; - _folks_individual_aggregator_maybe_configure_as_primary (self, _tmp9_); - _tmp10_ = _data2_->store; - _folks_individual_aggregator_set_primary_store (self, _tmp10_); - _tmp11_ = self->priv->_stores; - _tmp12_ = _data2_->store_id; - _tmp13_ = _data2_->store; - gee_abstract_map_set ((GeeAbstractMap*) _tmp11_, _tmp12_, _tmp13_); - _tmp14_ = _data2_->store; - g_signal_connect_object (_tmp14_, "personas-changed", (GCallback) __folks_individual_aggregator_personas_changed_cb_folks_persona_store_personas_changed, self, 0); - _tmp15_ = _data2_->store; - g_signal_connect_object ((GObject*) _tmp15_, "notify::is-primary-store", (GCallback) __folks_individual_aggregator_is_primary_store_changed_cb_g_object_notify, self, 0); + _tmp10_ = folks_persona_store_get_type_id (_tmp9_); + _tmp11_ = _tmp10_; + _tmp12_ = _data2_->store; + _tmp13_ = folks_persona_store_get_id (_tmp12_); + _tmp14_ = _tmp13_; + _tmp15_ = _folks_individual_aggregator_get_store_full_id (self, _tmp11_, _tmp14_); + _data2_->store_id = _tmp15_; _tmp16_ = _data2_->store; - g_signal_connect_object ((GObject*) _tmp16_, "notify::is-quiescent", (GCallback) __folks_individual_aggregator_persona_store_is_quiescent_changed_cb_g_object_notify, self, 0); + _folks_individual_aggregator_maybe_configure_as_primary (self, _tmp16_); _tmp17_ = _data2_->store; - g_signal_connect_object ((GObject*) _tmp17_, "notify::is-user-set-default", (GCallback) __folks_individual_aggregator_persona_store_is_user_set_default_changed_cb_g_object_notify, self, 0); - _tmp18_ = _data2_->store; - _tmp19_ = folks_persona_store_get_is_quiescent (_tmp18_); - _tmp20_ = _tmp19_; - if (_tmp20_ == FALSE) { - guint _tmp21_; - _tmp21_ = self->priv->_non_quiescent_persona_store_count; - self->priv->_non_quiescent_persona_store_count = _tmp21_ + 1; - } + _folks_individual_aggregator_set_primary_store (self, _tmp17_); + _tmp18_ = self->priv->_stores; + _tmp19_ = _data2_->store_id; + _tmp20_ = _data2_->store; + gee_abstract_map_set ((GeeAbstractMap*) _tmp18_, _tmp19_, _tmp20_); + _tmp21_ = _data2_->store; + g_signal_connect_object (_tmp21_, "personas-changed", (GCallback) __folks_individual_aggregator_personas_changed_cb_folks_persona_store_personas_changed, self, 0); _tmp22_ = _data2_->store; - folks_persona_store_prepare (_tmp22_, ___lambda36__gasync_ready_callback, block2_data_ref (_data2_)); + g_signal_connect_object ((GObject*) _tmp22_, "notify::is-primary-store", (GCallback) __folks_individual_aggregator_is_primary_store_changed_cb_g_object_notify, self, 0); + _tmp23_ = _data2_->store; + g_signal_connect_object ((GObject*) _tmp23_, "notify::is-quiescent", (GCallback) __folks_individual_aggregator_persona_store_is_quiescent_changed_cb_g_object_notify, self, 0); + _tmp24_ = _data2_->store; + g_signal_connect_object ((GObject*) _tmp24_, "notify::is-user-set-default", (GCallback) __folks_individual_aggregator_persona_store_is_user_set_default_changed_cb_g_object_notify, self, 0); + _tmp25_ = _data2_->store; + _tmp26_ = folks_persona_store_get_is_quiescent (_tmp25_); + _tmp27_ = _tmp26_; + if (_tmp27_ == FALSE) { + guint _tmp28_; + _tmp28_ = self->priv->_non_quiescent_persona_store_count; + self->priv->_non_quiescent_persona_store_count = _tmp28_ + 1; + } + _tmp29_ = _data2_->store; + _tmp30_ = folks_persona_store_get_personas (_tmp29_); + _tmp31_ = _tmp30_; + _tmp32_ = gee_map_get_size (_tmp31_); + _tmp33_ = _tmp32_; + if (_tmp33_ > 0) { + GeeHashSet* _tmp34_; + GeeHashSet* persona_set; + FolksPersonaStore* _tmp49_; + GeeHashSet* _tmp50_; + GeeHashSet* _tmp51_; + GeeHashSet* _tmp52_; + _tmp34_ = gee_hash_set_new (FOLKS_TYPE_PERSONA, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); + persona_set = _tmp34_; + { + FolksPersonaStore* _tmp35_; + GeeMap* _tmp36_; + GeeMap* _tmp37_; + GeeCollection* _tmp38_; + GeeCollection* _tmp39_; + GeeCollection* _tmp40_; + GeeIterator* _tmp41_ = NULL; + GeeIterator* _tmp42_; + GeeIterator* _p_it; + _tmp35_ = _data2_->store; + _tmp36_ = folks_persona_store_get_personas (_tmp35_); + _tmp37_ = _tmp36_; + _tmp38_ = gee_map_get_values (_tmp37_); + _tmp39_ = _tmp38_; + _tmp40_ = _tmp39_; + _tmp41_ = gee_iterable_iterator ((GeeIterable*) _tmp40_); + _tmp42_ = _tmp41_; + _g_object_unref0 (_tmp40_); + _p_it = _tmp42_; + while (TRUE) { + GeeIterator* _tmp43_; + gboolean _tmp44_ = FALSE; + GeeIterator* _tmp45_; + gpointer _tmp46_ = NULL; + FolksPersona* p; + GeeHashSet* _tmp47_; + FolksPersona* _tmp48_; + _tmp43_ = _p_it; + _tmp44_ = gee_iterator_next (_tmp43_); + if (!_tmp44_) { + break; + } + _tmp45_ = _p_it; + _tmp46_ = gee_iterator_get (_tmp45_); + p = (FolksPersona*) _tmp46_; + _tmp47_ = persona_set; + _tmp48_ = p; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp47_, _tmp48_); + _g_object_unref0 (p); + } + _g_object_unref0 (_p_it); + } + _tmp49_ = _data2_->store; + _tmp50_ = persona_set; + _tmp51_ = gee_hash_set_new (FOLKS_TYPE_PERSONA, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); + _tmp52_ = _tmp51_; + _folks_individual_aggregator_personas_changed_cb (self, _tmp49_, (GeeSet*) _tmp50_, (GeeSet*) _tmp52_, NULL, NULL, FOLKS_GROUP_DETAILS_CHANGE_REASON_NONE); + _g_object_unref0 (_tmp52_); + _g_object_unref0 (persona_set); + } + _tmp53_ = _data2_->store; + folks_persona_store_prepare (_tmp53_, ___lambda36__gasync_ready_callback, block2_data_ref (_data2_)); block2_data_unref (_data2_); _data2_ = NULL; } @@ -2509,325 +2701,342 @@ static void _folks_individual_aggregator_emit_individuals_changed (FolksIndividualAggregator* self, GeeSet* added, GeeSet* removed, GeeMultiMap* changes, const gchar* message, FolksPersona* actor, FolksGroupDetailsChangeReason reason) { - GeeSet* _tmp0_; - GeeSet* _tmp1_; - GeeSet* _added; - GeeSet* _tmp2_; + GeeSet* _added = NULL; + GeeSet* _removed = NULL; + GeeMultiMap* _changes = NULL; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; + gboolean _tmp2_ = FALSE; GeeSet* _tmp3_; - GeeSet* _removed; - GeeMultiMap* _tmp4_; - GeeMultiMap* _tmp5_; - GeeMultiMap* _changes; - gboolean _tmp6_ = FALSE; - gboolean _tmp7_ = FALSE; - gboolean _tmp8_ = FALSE; - GeeSet* _tmp9_; - gboolean _tmp13_; - gboolean _tmp20_; - gboolean _tmp27_; - FolksDebug* _tmp34_; - gboolean _tmp35_; - gboolean _tmp36_; - GeeSet* _tmp99_; - GeeSet* _tmp100_; - GeeSet* _tmp101_; - GeeSet* _tmp102_; - GeeSet* _tmp103_; - GeeSet* _tmp104_; + gboolean _tmp7_; + gboolean _tmp14_; + gboolean _tmp21_; + GeeSet* _tmp22_ = NULL; + GeeSet* _tmp23_; + GeeSet* _tmp27_; + GeeSet* _tmp28_; + GeeSet* _tmp29_ = NULL; + GeeSet* _tmp30_; + GeeSet* _tmp34_; + GeeSet* _tmp35_; + GeeMultiMap* _tmp36_; + FolksDebug* _tmp40_; + gboolean _tmp41_; + gboolean _tmp42_; GeeSet* _tmp105_; GeeSet* _tmp106_; - const gchar* _tmp107_; - FolksPersona* _tmp108_; - FolksGroupDetailsChangeReason _tmp109_; - GeeMultiMap* _tmp110_; + GeeSet* _tmp107_; + GeeSet* _tmp108_; + GeeSet* _tmp109_; + GeeSet* _tmp110_; + GeeSet* _tmp111_; + GeeSet* _tmp112_; + const gchar* _tmp113_; + FolksPersona* _tmp114_; + FolksGroupDetailsChangeReason _tmp115_; + GeeMultiMap* _tmp116_; g_return_if_fail (self != NULL); - _tmp0_ = added; - _tmp1_ = _g_object_ref0 (_tmp0_); - _added = _tmp1_; - _tmp2_ = removed; - _tmp3_ = _g_object_ref0 (_tmp2_); - _removed = _tmp3_; - _tmp4_ = changes; - _tmp5_ = _g_object_ref0 (_tmp4_); - _changes = _tmp5_; - _tmp9_ = added; - if (_tmp9_ == NULL) { - _tmp8_ = TRUE; + _tmp3_ = added; + if (_tmp3_ == NULL) { + _tmp2_ = TRUE; } else { - GeeSet* _tmp10_; - gint _tmp11_; - gint _tmp12_; - _tmp10_ = added; - _tmp11_ = gee_collection_get_size ((GeeCollection*) _tmp10_); - _tmp12_ = _tmp11_; - _tmp8_ = _tmp12_ == 0; - } - _tmp13_ = _tmp8_; - if (_tmp13_) { - gboolean _tmp14_ = FALSE; - GeeSet* _tmp15_; - gboolean _tmp19_; - _tmp15_ = removed; - if (_tmp15_ == NULL) { - _tmp14_ = TRUE; + GeeSet* _tmp4_; + gint _tmp5_; + gint _tmp6_; + _tmp4_ = added; + _tmp5_ = gee_collection_get_size ((GeeCollection*) GEE_SET (_tmp4_)); + _tmp6_ = _tmp5_; + _tmp2_ = _tmp6_ == 0; + } + _tmp7_ = _tmp2_; + if (_tmp7_) { + gboolean _tmp8_ = FALSE; + GeeSet* _tmp9_; + gboolean _tmp13_; + _tmp9_ = removed; + if (_tmp9_ == NULL) { + _tmp8_ = TRUE; } else { - GeeSet* _tmp16_; - gint _tmp17_; - gint _tmp18_; - _tmp16_ = removed; - _tmp17_ = gee_collection_get_size ((GeeCollection*) _tmp16_); - _tmp18_ = _tmp17_; - _tmp14_ = _tmp18_ == 0; + GeeSet* _tmp10_; + gint _tmp11_; + gint _tmp12_; + _tmp10_ = removed; + _tmp11_ = gee_collection_get_size ((GeeCollection*) GEE_SET (_tmp10_)); + _tmp12_ = _tmp11_; + _tmp8_ = _tmp12_ == 0; } - _tmp19_ = _tmp14_; - _tmp7_ = _tmp19_; + _tmp13_ = _tmp8_; + _tmp1_ = _tmp13_; } else { - _tmp7_ = FALSE; + _tmp1_ = FALSE; } - _tmp20_ = _tmp7_; - if (_tmp20_) { - gboolean _tmp21_ = FALSE; - GeeMultiMap* _tmp22_; - gboolean _tmp26_; - _tmp22_ = changes; - if (_tmp22_ == NULL) { - _tmp21_ = TRUE; + _tmp14_ = _tmp1_; + if (_tmp14_) { + gboolean _tmp15_ = FALSE; + GeeMultiMap* _tmp16_; + gboolean _tmp20_; + _tmp16_ = changes; + if (_tmp16_ == NULL) { + _tmp15_ = TRUE; } else { - GeeMultiMap* _tmp23_; - gint _tmp24_; - gint _tmp25_; - _tmp23_ = changes; - _tmp24_ = gee_multi_map_get_size (_tmp23_); - _tmp25_ = _tmp24_; - _tmp21_ = _tmp25_ == 0; + GeeMultiMap* _tmp17_; + gint _tmp18_; + gint _tmp19_; + _tmp17_ = changes; + _tmp18_ = gee_multi_map_get_size (GEE_MULTI_MAP (_tmp17_)); + _tmp19_ = _tmp18_; + _tmp15_ = _tmp19_ == 0; } - _tmp26_ = _tmp21_; - _tmp6_ = _tmp26_; + _tmp20_ = _tmp15_; + _tmp0_ = _tmp20_; } else { - _tmp6_ = FALSE; + _tmp0_ = FALSE; } - _tmp27_ = _tmp6_; - if (_tmp27_) { + _tmp21_ = _tmp0_; + if (_tmp21_) { _g_object_unref0 (_changes); _g_object_unref0 (_removed); _g_object_unref0 (_added); return; + } + _tmp23_ = added; + if (_tmp23_ != NULL) { + GeeSet* _tmp24_; + GeeSet* _tmp25_; + _tmp24_ = added; + _tmp25_ = _g_object_ref0 (GEE_SET (_tmp24_)); + _g_object_unref0 (_tmp22_); + _tmp22_ = _tmp25_; } else { - GeeSet* _tmp28_; - _tmp28_ = added; - if (_tmp28_ == NULL) { - GeeHashSet* _tmp29_; - _tmp29_ = gee_hash_set_new (FOLKS_TYPE_INDIVIDUAL, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); - _g_object_unref0 (_added); - _added = (GeeSet*) _tmp29_; - } else { - GeeSet* _tmp30_; - _tmp30_ = removed; - if (_tmp30_ == NULL) { - GeeHashSet* _tmp31_; - _tmp31_ = gee_hash_set_new (FOLKS_TYPE_INDIVIDUAL, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); - _g_object_unref0 (_removed); - _removed = (GeeSet*) _tmp31_; - } else { - GeeMultiMap* _tmp32_; - _tmp32_ = changes; - if (_tmp32_ == NULL) { - GeeHashMultiMap* _tmp33_; - _tmp33_ = gee_hash_multi_map_new (FOLKS_TYPE_INDIVIDUAL, (GBoxedCopyFunc) g_object_ref, g_object_unref, FOLKS_TYPE_INDIVIDUAL, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL); - _g_object_unref0 (_changes); - _changes = (GeeMultiMap*) _tmp33_; - } - } - } + GeeHashSet* _tmp26_; + _tmp26_ = gee_hash_set_new (FOLKS_TYPE_INDIVIDUAL, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); + _g_object_unref0 (_tmp22_); + _tmp22_ = (GeeSet*) _tmp26_; + } + _tmp27_ = _tmp22_; + _tmp28_ = _g_object_ref0 (_tmp27_); + _g_object_unref0 (_added); + _added = _tmp28_; + _tmp30_ = removed; + if (_tmp30_ != NULL) { + GeeSet* _tmp31_; + GeeSet* _tmp32_; + _tmp31_ = removed; + _tmp32_ = _g_object_ref0 (GEE_SET (_tmp31_)); + _g_object_unref0 (_tmp29_); + _tmp29_ = _tmp32_; + } else { + GeeHashSet* _tmp33_; + _tmp33_ = gee_hash_set_new (FOLKS_TYPE_INDIVIDUAL, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); + _g_object_unref0 (_tmp29_); + _tmp29_ = (GeeSet*) _tmp33_; } - _tmp34_ = self->priv->_debug; - _tmp35_ = folks_debug_get_debug_output_enabled (_tmp34_); - _tmp36_ = _tmp35_; - if (_tmp36_ == TRUE) { + _tmp34_ = _tmp29_; + _tmp35_ = _g_object_ref0 (_tmp34_); + _g_object_unref0 (_removed); + _removed = _tmp35_; + _tmp36_ = changes; + if (_tmp36_ != NULL) { GeeMultiMap* _tmp37_; - gint _tmp38_; - gint _tmp39_; - _tmp37_ = _changes; - _tmp38_ = gee_multi_map_get_size (_tmp37_); - _tmp39_ = _tmp38_; - g_debug ("individual-aggregator.vala:801: Emitting individuals-changed-detailed " \ -"with %u mappings:", (guint) _tmp39_); + GeeMultiMap* _tmp38_; + _tmp37_ = changes; + _tmp38_ = _g_object_ref0 (GEE_MULTI_MAP (_tmp37_)); + _g_object_unref0 (_changes); + _changes = _tmp38_; + } else { + GeeHashMultiMap* _tmp39_; + _tmp39_ = gee_hash_multi_map_new (FOLKS_TYPE_INDIVIDUAL, (GBoxedCopyFunc) g_object_ref, g_object_unref, FOLKS_TYPE_INDIVIDUAL, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL); + _g_object_unref0 (_changes); + _changes = (GeeMultiMap*) _tmp39_; + } + _tmp40_ = self->priv->_debug; + _tmp41_ = folks_debug_get_debug_output_enabled (_tmp40_); + _tmp42_ = _tmp41_; + if (_tmp42_ == TRUE) { + GeeMultiMap* _tmp43_; + gint _tmp44_; + gint _tmp45_; + _tmp43_ = _changes; + _tmp44_ = gee_multi_map_get_size (_tmp43_); + _tmp45_ = _tmp44_; + g_debug ("individual-aggregator.vala:863: Emitting individuals-changed-detailed " \ +"with %u mappings:", (guint) _tmp45_); { - GeeMultiMap* _tmp40_; - GeeSet* _tmp41_ = NULL; - GeeSet* _tmp42_; - GeeIterator* _tmp43_ = NULL; - GeeIterator* _tmp44_; + GeeMultiMap* _tmp46_; + GeeSet* _tmp47_ = NULL; + GeeSet* _tmp48_; + GeeIterator* _tmp49_ = NULL; + GeeIterator* _tmp50_; GeeIterator* _removed_ind_it; - _tmp40_ = _changes; - _tmp41_ = gee_multi_map_get_keys (_tmp40_); - _tmp42_ = _tmp41_; - _tmp43_ = gee_iterable_iterator ((GeeIterable*) _tmp42_); - _tmp44_ = _tmp43_; - _g_object_unref0 (_tmp42_); - _removed_ind_it = _tmp44_; + _tmp46_ = _changes; + _tmp47_ = gee_multi_map_get_keys (_tmp46_); + _tmp48_ = _tmp47_; + _tmp49_ = gee_iterable_iterator ((GeeIterable*) _tmp48_); + _tmp50_ = _tmp49_; + _g_object_unref0 (_tmp48_); + _removed_ind_it = _tmp50_; while (TRUE) { - GeeIterator* _tmp45_; - gboolean _tmp46_ = FALSE; - GeeIterator* _tmp47_; - gpointer _tmp48_ = NULL; + GeeIterator* _tmp51_; + gboolean _tmp52_ = FALSE; + GeeIterator* _tmp53_; + gpointer _tmp54_ = NULL; FolksIndividual* removed_ind; - _tmp45_ = _removed_ind_it; - _tmp46_ = gee_iterator_next (_tmp45_); - if (!_tmp46_) { + _tmp51_ = _removed_ind_it; + _tmp52_ = gee_iterator_next (_tmp51_); + if (!_tmp52_) { break; } - _tmp47_ = _removed_ind_it; - _tmp48_ = gee_iterator_get (_tmp47_); - removed_ind = (FolksIndividual*) _tmp48_; + _tmp53_ = _removed_ind_it; + _tmp54_ = gee_iterator_get (_tmp53_); + removed_ind = (FolksIndividual*) _tmp54_; { - GeeMultiMap* _tmp49_; - FolksIndividual* _tmp50_; - GeeCollection* _tmp51_ = NULL; - GeeCollection* _tmp52_; - GeeIterator* _tmp53_ = NULL; - GeeIterator* _tmp54_; + GeeMultiMap* _tmp55_; + FolksIndividual* _tmp56_; + GeeCollection* _tmp57_ = NULL; + GeeCollection* _tmp58_; + GeeIterator* _tmp59_ = NULL; + GeeIterator* _tmp60_; GeeIterator* _added_ind_it; - _tmp49_ = _changes; - _tmp50_ = removed_ind; - _tmp51_ = gee_multi_map_get (_tmp49_, _tmp50_); - _tmp52_ = _tmp51_; - _tmp53_ = gee_iterable_iterator ((GeeIterable*) _tmp52_); - _tmp54_ = _tmp53_; - _g_object_unref0 (_tmp52_); - _added_ind_it = _tmp54_; + _tmp55_ = _changes; + _tmp56_ = removed_ind; + _tmp57_ = gee_multi_map_get (_tmp55_, _tmp56_); + _tmp58_ = _tmp57_; + _tmp59_ = gee_iterable_iterator ((GeeIterable*) _tmp58_); + _tmp60_ = _tmp59_; + _g_object_unref0 (_tmp58_); + _added_ind_it = _tmp60_; while (TRUE) { - GeeIterator* _tmp55_; - gboolean _tmp56_ = FALSE; - GeeIterator* _tmp57_; - gpointer _tmp58_ = NULL; + GeeIterator* _tmp61_; + gboolean _tmp62_ = FALSE; + GeeIterator* _tmp63_; + gpointer _tmp64_ = NULL; FolksIndividual* added_ind; - const gchar* _tmp59_ = NULL; - FolksIndividual* _tmp60_; - const gchar* _tmp64_ = NULL; - FolksIndividual* _tmp65_; - const gchar* _tmp69_; - FolksIndividual* _tmp70_; - const gchar* _tmp71_; - FolksIndividual* _tmp72_; - FolksIndividual* _tmp73_; - FolksIndividual* _tmp86_; - _tmp55_ = _added_ind_it; - _tmp56_ = gee_iterator_next (_tmp55_); - if (!_tmp56_) { + const gchar* _tmp65_ = NULL; + FolksIndividual* _tmp66_; + const gchar* _tmp70_ = NULL; + FolksIndividual* _tmp71_; + const gchar* _tmp75_; + FolksIndividual* _tmp76_; + const gchar* _tmp77_; + FolksIndividual* _tmp78_; + FolksIndividual* _tmp79_; + FolksIndividual* _tmp92_; + _tmp61_ = _added_ind_it; + _tmp62_ = gee_iterator_next (_tmp61_); + if (!_tmp62_) { break; } - _tmp57_ = _added_ind_it; - _tmp58_ = gee_iterator_get (_tmp57_); - added_ind = (FolksIndividual*) _tmp58_; - _tmp60_ = removed_ind; - if (_tmp60_ != NULL) { - FolksIndividual* _tmp61_; - const gchar* _tmp62_; - const gchar* _tmp63_; - _tmp61_ = removed_ind; - _tmp62_ = folks_individual_get_id (_tmp61_); - _tmp63_ = _tmp62_; - _tmp59_ = _tmp63_; + _tmp63_ = _added_ind_it; + _tmp64_ = gee_iterator_get (_tmp63_); + added_ind = (FolksIndividual*) _tmp64_; + _tmp66_ = removed_ind; + if (_tmp66_ != NULL) { + FolksIndividual* _tmp67_; + const gchar* _tmp68_; + const gchar* _tmp69_; + _tmp67_ = removed_ind; + _tmp68_ = folks_individual_get_id (FOLKS_INDIVIDUAL (_tmp67_)); + _tmp69_ = _tmp68_; + _tmp65_ = _tmp69_; } else { - _tmp59_ = ""; + _tmp65_ = ""; } - _tmp65_ = added_ind; - if (_tmp65_ != NULL) { - FolksIndividual* _tmp66_; - const gchar* _tmp67_; - const gchar* _tmp68_; - _tmp66_ = added_ind; - _tmp67_ = folks_individual_get_id (_tmp66_); - _tmp68_ = _tmp67_; - _tmp64_ = _tmp68_; + _tmp71_ = added_ind; + if (_tmp71_ != NULL) { + FolksIndividual* _tmp72_; + const gchar* _tmp73_; + const gchar* _tmp74_; + _tmp72_ = added_ind; + _tmp73_ = folks_individual_get_id (FOLKS_INDIVIDUAL (_tmp72_)); + _tmp74_ = _tmp73_; + _tmp70_ = _tmp74_; } else { - _tmp64_ = ""; + _tmp70_ = ""; } - _tmp69_ = _tmp59_; - _tmp70_ = removed_ind; - _tmp71_ = _tmp64_; - _tmp72_ = added_ind; - g_debug ("individual-aggregator.vala:808: %s (%p) → %s (%p)", _tmp69_, _tmp70_, _tmp71_, _tmp72_); - _tmp73_ = removed_ind; - if (_tmp73_ != NULL) { - g_debug ("individual-aggregator.vala:814: Removed individual's personas:"); + _tmp75_ = _tmp65_; + _tmp76_ = removed_ind; + _tmp77_ = _tmp70_; + _tmp78_ = added_ind; + g_debug ("individual-aggregator.vala:870: %s (%p) → %s (%p)", _tmp75_, _tmp76_, _tmp77_, _tmp78_); + _tmp79_ = removed_ind; + if (_tmp79_ != NULL) { + g_debug ("individual-aggregator.vala:877: Removed individual's personas:"); { - FolksIndividual* _tmp74_; - GeeSet* _tmp75_; - GeeSet* _tmp76_; - GeeIterator* _tmp77_ = NULL; + FolksIndividual* _tmp80_; + GeeSet* _tmp81_; + GeeSet* _tmp82_; + GeeIterator* _tmp83_ = NULL; GeeIterator* _p_it; - _tmp74_ = removed_ind; - _tmp75_ = folks_individual_get_personas (_tmp74_); - _tmp76_ = _tmp75_; - _tmp77_ = gee_iterable_iterator ((GeeIterable*) _tmp76_); - _p_it = _tmp77_; + _tmp80_ = removed_ind; + _tmp81_ = folks_individual_get_personas (FOLKS_INDIVIDUAL (_tmp80_)); + _tmp82_ = _tmp81_; + _tmp83_ = gee_iterable_iterator ((GeeIterable*) _tmp82_); + _p_it = _tmp83_; while (TRUE) { - GeeIterator* _tmp78_; - gboolean _tmp79_ = FALSE; - GeeIterator* _tmp80_; - gpointer _tmp81_ = NULL; + GeeIterator* _tmp84_; + gboolean _tmp85_ = FALSE; + GeeIterator* _tmp86_; + gpointer _tmp87_ = NULL; FolksPersona* p; - FolksPersona* _tmp82_; - const gchar* _tmp83_; - const gchar* _tmp84_; - FolksPersona* _tmp85_; - _tmp78_ = _p_it; - _tmp79_ = gee_iterator_next (_tmp78_); - if (!_tmp79_) { + FolksPersona* _tmp88_; + const gchar* _tmp89_; + const gchar* _tmp90_; + FolksPersona* _tmp91_; + _tmp84_ = _p_it; + _tmp85_ = gee_iterator_next (_tmp84_); + if (!_tmp85_) { break; } - _tmp80_ = _p_it; - _tmp81_ = gee_iterator_get (_tmp80_); - p = (FolksPersona*) _tmp81_; - _tmp82_ = p; - _tmp83_ = folks_persona_get_uid (_tmp82_); - _tmp84_ = _tmp83_; - _tmp85_ = p; - g_debug ("individual-aggregator.vala:818: %s (%p)", _tmp84_, _tmp85_); + _tmp86_ = _p_it; + _tmp87_ = gee_iterator_get (_tmp86_); + p = (FolksPersona*) _tmp87_; + _tmp88_ = p; + _tmp89_ = folks_persona_get_uid (_tmp88_); + _tmp90_ = _tmp89_; + _tmp91_ = p; + g_debug ("individual-aggregator.vala:881: %s (%p)", _tmp90_, _tmp91_); _g_object_unref0 (p); } _g_object_unref0 (_p_it); } } - _tmp86_ = added_ind; - if (_tmp86_ != NULL) { - g_debug ("individual-aggregator.vala:824: Added individual's personas:"); + _tmp92_ = added_ind; + if (_tmp92_ != NULL) { + g_debug ("individual-aggregator.vala:887: Added individual's personas:"); { - FolksIndividual* _tmp87_; - GeeSet* _tmp88_; - GeeSet* _tmp89_; - GeeIterator* _tmp90_ = NULL; + FolksIndividual* _tmp93_; + GeeSet* _tmp94_; + GeeSet* _tmp95_; + GeeIterator* _tmp96_ = NULL; GeeIterator* _p_it; - _tmp87_ = added_ind; - _tmp88_ = folks_individual_get_personas (_tmp87_); - _tmp89_ = _tmp88_; - _tmp90_ = gee_iterable_iterator ((GeeIterable*) _tmp89_); - _p_it = _tmp90_; + _tmp93_ = added_ind; + _tmp94_ = folks_individual_get_personas (FOLKS_INDIVIDUAL (_tmp93_)); + _tmp95_ = _tmp94_; + _tmp96_ = gee_iterable_iterator ((GeeIterable*) _tmp95_); + _p_it = _tmp96_; while (TRUE) { - GeeIterator* _tmp91_; - gboolean _tmp92_ = FALSE; - GeeIterator* _tmp93_; - gpointer _tmp94_ = NULL; + GeeIterator* _tmp97_; + gboolean _tmp98_ = FALSE; + GeeIterator* _tmp99_; + gpointer _tmp100_ = NULL; FolksPersona* p; - FolksPersona* _tmp95_; - const gchar* _tmp96_; - const gchar* _tmp97_; - FolksPersona* _tmp98_; - _tmp91_ = _p_it; - _tmp92_ = gee_iterator_next (_tmp91_); - if (!_tmp92_) { + FolksPersona* _tmp101_; + const gchar* _tmp102_; + const gchar* _tmp103_; + FolksPersona* _tmp104_; + _tmp97_ = _p_it; + _tmp98_ = gee_iterator_next (_tmp97_); + if (!_tmp98_) { break; } - _tmp93_ = _p_it; - _tmp94_ = gee_iterator_get (_tmp93_); - p = (FolksPersona*) _tmp94_; - _tmp95_ = p; - _tmp96_ = folks_persona_get_uid (_tmp95_); - _tmp97_ = _tmp96_; - _tmp98_ = p; - g_debug ("individual-aggregator.vala:828: %s (%p)", _tmp97_, _tmp98_); + _tmp99_ = _p_it; + _tmp100_ = gee_iterator_get (_tmp99_); + p = (FolksPersona*) _tmp100_; + _tmp101_ = p; + _tmp102_ = folks_persona_get_uid (_tmp101_); + _tmp103_ = _tmp102_; + _tmp104_ = p; + g_debug ("individual-aggregator.vala:891: %s (%p)", _tmp103_, _tmp104_); _g_object_unref0 (p); } _g_object_unref0 (_p_it); @@ -2842,22 +3051,24 @@ _g_object_unref0 (_removed_ind_it); } } - _tmp99_ = _added; - _tmp100_ = gee_set_get_read_only_view (_tmp99_); - _tmp101_ = _tmp100_; - _tmp102_ = _tmp101_; - _tmp103_ = _removed; - _tmp104_ = gee_set_get_read_only_view (_tmp103_); - _tmp105_ = _tmp104_; - _tmp106_ = _tmp105_; - _tmp107_ = message; - _tmp108_ = actor; - _tmp109_ = reason; - g_signal_emit_by_name (self, "individuals-changed", _tmp102_, _tmp106_, _tmp107_, _tmp108_, _tmp109_); - _g_object_unref0 (_tmp106_); - _g_object_unref0 (_tmp102_); - _tmp110_ = _changes; - g_signal_emit_by_name (self, "individuals-changed-detailed", _tmp110_); + _tmp105_ = _added; + _tmp106_ = gee_set_get_read_only_view (_tmp105_); + _tmp107_ = _tmp106_; + _tmp108_ = _tmp107_; + _tmp109_ = _removed; + _tmp110_ = gee_set_get_read_only_view (_tmp109_); + _tmp111_ = _tmp110_; + _tmp112_ = _tmp111_; + _tmp113_ = message; + _tmp114_ = actor; + _tmp115_ = reason; + g_signal_emit_by_name (self, "individuals-changed", _tmp108_, _tmp112_, _tmp113_, _tmp114_, _tmp115_); + _g_object_unref0 (_tmp112_); + _g_object_unref0 (_tmp108_); + _tmp116_ = _changes; + g_signal_emit_by_name (self, "individuals-changed-detailed", _tmp116_); + _g_object_unref0 (_tmp29_); + _g_object_unref0 (_tmp22_); _g_object_unref0 (_changes); _g_object_unref0 (_removed); _g_object_unref0 (_added); @@ -2917,8 +3128,10 @@ static void block3_data_unref (Block3Data* _data3_) { if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { - _g_object_unref0 (_data3_->self); + FolksIndividualAggregator * self; + self = _data3_->self; _g_object_unref0 (_data3_->candidate_inds); + _g_object_unref0 (self); g_slice_free (Block3Data, _data3_); } } @@ -2932,6 +3145,8 @@ static void block4_data_unref (Block4Data* _data4_) { if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) { + FolksIndividualAggregator * self; + self = _data4_->_data3_->self; block3_data_unref (_data4_->_data3_); _data4_->_data3_ = NULL; g_slice_free (Block4Data, _data4_); @@ -2970,7 +3185,7 @@ FolksTrustLevel _tmp9_; FolksTrustLevel _tmp10_; _tmp8_ = candidate_ind; - _tmp9_ = folks_individual_get_trust_level (_tmp8_); + _tmp9_ = folks_individual_get_trust_level (FOLKS_INDIVIDUAL (_tmp8_)); _tmp10_ = _tmp9_; _tmp6_ = _tmp10_ != FOLKS_TRUST_LEVEL_NONE; } else { @@ -2983,7 +3198,7 @@ gboolean _tmp14_ = FALSE; _tmp12_ = _data3_->candidate_inds; _tmp13_ = candidate_ind; - _tmp14_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp12_, _tmp13_); + _tmp14_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp12_, FOLKS_INDIVIDUAL (_tmp13_)); _tmp5_ = !_tmp14_; } else { _tmp5_ = FALSE; @@ -2998,14 +3213,14 @@ GeeHashSet* _tmp21_; FolksIndividual* _tmp22_; _tmp16_ = candidate_ind; - _tmp17_ = folks_individual_get_id (_tmp16_); + _tmp17_ = folks_individual_get_id (FOLKS_INDIVIDUAL (_tmp16_)); _tmp18_ = _tmp17_; _tmp19_ = _data4_->prop_name; _tmp20_ = prop_linking_value; g_debug (" Found candidate individual '%s' by " "linkable property '%s' = '%s'.", _tmp18_, _tmp19_, _tmp20_); _tmp21_ = _data3_->candidate_inds; _tmp22_ = candidate_ind; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp21_, _tmp22_); + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp21_, FOLKS_INDIVIDUAL (_tmp22_)); } _g_object_unref0 (candidate_ind); } @@ -3019,8 +3234,7 @@ static void _folks_individual_aggregator_add_personas (FolksIndividualAggregator* self, GeeSet* added, FolksIndividual** user, GeeHashMultiMap** individuals_changes) { g_return_if_fail (self != NULL); g_return_if_fail (added != NULL); - g_return_if_fail (user != NULL); - g_return_if_fail (individuals_changes != NULL); + g_return_if_fail (*individuals_changes != NULL); { GeeSet* _tmp0_; GeeIterator* _tmp1_ = NULL; @@ -3044,7 +3258,6 @@ GeeHashSet* _tmp11_; GeeHashSet* _tmp12_; GeeHashSet* final_personas; - FolksIndividual* final_individual; FolksPersona* _tmp13_; const gchar* _tmp14_; const gchar* _tmp15_; @@ -3071,6 +3284,7 @@ gboolean _tmp81_; GeeHashSet* _tmp95_; FolksIndividual* _tmp96_; + FolksIndividual* final_individual; FolksIndividual* _tmp97_; const gchar* _tmp98_; const gchar* _tmp99_; @@ -3103,14 +3317,13 @@ _data3_->candidate_inds = _tmp11_; _tmp12_ = gee_hash_set_new (FOLKS_TYPE_PERSONA, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); final_personas = _tmp12_; - final_individual = NULL; _tmp13_ = persona; _tmp14_ = folks_persona_get_uid (_tmp13_); _tmp15_ = _tmp14_; _tmp16_ = persona; _tmp17_ = folks_persona_get_iid (_tmp16_); _tmp18_ = _tmp17_; - g_debug ("individual-aggregator.vala:872: Aggregating persona '%s' on '%s'.", _tmp15_, _tmp18_); + g_debug ("individual-aggregator.vala:934: Aggregating persona '%s' on '%s'.", _tmp15_, _tmp18_); _tmp20_ = persona; _tmp21_ = folks_persona_get_is_user (_tmp20_); _tmp22_ = _tmp21_; @@ -3129,13 +3342,13 @@ GeeHashSet* _tmp28_; FolksIndividual* _tmp29_; _tmp25_ = *user; - _tmp26_ = folks_individual_get_id (_tmp25_); + _tmp26_ = folks_individual_get_id (FOLKS_INDIVIDUAL (_tmp25_)); _tmp27_ = _tmp26_; - g_debug ("individual-aggregator.vala:878: Found candidate individual '%s' as" \ + g_debug ("individual-aggregator.vala:940: Found candidate individual '%s' as" \ " user.", _tmp27_); _tmp28_ = _data3_->candidate_inds; _tmp29_ = *user; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp28_, _tmp29_); + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp28_, FOLKS_INDIVIDUAL (_tmp29_)); } _tmp30_ = trust_level; if (_tmp30_ != FOLKS_PERSONA_STORE_TRUST_NONE) { @@ -3164,7 +3377,7 @@ FolksTrustLevel _tmp41_; FolksTrustLevel _tmp42_; _tmp40_ = candidate_ind; - _tmp41_ = folks_individual_get_trust_level (_tmp40_); + _tmp41_ = folks_individual_get_trust_level (FOLKS_INDIVIDUAL (_tmp40_)); _tmp42_ = _tmp41_; _tmp38_ = _tmp42_ != FOLKS_TRUST_LEVEL_NONE; } else { @@ -3177,7 +3390,7 @@ gboolean _tmp46_ = FALSE; _tmp44_ = _data3_->candidate_inds; _tmp45_ = candidate_ind; - _tmp46_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp44_, _tmp45_); + _tmp46_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp44_, FOLKS_INDIVIDUAL (_tmp45_)); _tmp37_ = !_tmp46_; } else { _tmp37_ = FALSE; @@ -3193,16 +3406,16 @@ GeeHashSet* _tmp54_; FolksIndividual* _tmp55_; _tmp48_ = candidate_ind; - _tmp49_ = folks_individual_get_id (_tmp48_); + _tmp49_ = folks_individual_get_id (FOLKS_INDIVIDUAL (_tmp48_)); _tmp50_ = _tmp49_; _tmp51_ = persona; _tmp52_ = folks_persona_get_iid (_tmp51_); _tmp53_ = _tmp52_; - g_debug ("individual-aggregator.vala:891: Found candidate individual '%s' by" \ + g_debug ("individual-aggregator.vala:954: Found candidate individual '%s' by" \ " IID '%s'.", _tmp50_, _tmp53_); _tmp54_ = _data3_->candidate_inds; _tmp55_ = candidate_ind; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp54_, _tmp55_); + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp54_, FOLKS_INDIVIDUAL (_tmp55_)); } _g_object_unref0 (candidate_ind); } @@ -3276,7 +3489,7 @@ _tmp75_ = persona; gee_abstract_collection_add ((GeeAbstractCollection*) _tmp74_, _tmp75_); _tmp77_ = _data3_->candidate_inds; - _tmp78_ = gee_collection_get_size ((GeeCollection*) _tmp77_); + _tmp78_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp77_); _tmp79_ = _tmp78_; if (_tmp79_ > 0) { gboolean _tmp80_; @@ -3326,25 +3539,24 @@ gint _tmp93_; gint _tmp94_; _tmp92_ = _data3_->candidate_inds; - _tmp93_ = gee_collection_get_size ((GeeCollection*) _tmp92_); + _tmp93_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp92_); _tmp94_ = _tmp93_; if (_tmp94_ > 0) { - g_debug ("individual-aggregator.vala:955: Linking disabled."); + g_debug ("individual-aggregator.vala:1019: Linking disabled."); } else { - g_debug ("individual-aggregator.vala:959: Did not find any candidate individ" \ -"uals."); + g_debug ("individual-aggregator.vala:1023: Did not find any candidate indivi" \ +"duals."); } } _tmp95_ = final_personas; _tmp96_ = folks_individual_new ((GeeSet*) _tmp95_); - _g_object_unref0 (final_individual); final_individual = _tmp96_; _tmp97_ = final_individual; _tmp98_ = folks_individual_get_id (_tmp97_); _tmp99_ = _tmp98_; _tmp100_ = final_individual; - g_debug ("individual-aggregator.vala:964: Created new individual '%s' (%p) w" \ -"ith personas:", _tmp99_, _tmp100_); + g_debug ("individual-aggregator.vala:1028: Created new individual '%s' (%p) " \ +"with personas:", _tmp99_, _tmp100_); { GeeHashSet* _tmp101_; GeeIterator* _tmp102_ = NULL; @@ -3376,7 +3588,7 @@ _tmp108_ = folks_persona_get_uid (_tmp107_); _tmp109_ = _tmp108_; _tmp110_ = p; - g_debug ("individual-aggregator.vala:968: %s (%p)", _tmp109_, _tmp110_); + g_debug ("individual-aggregator.vala:1032: %s (%p)", _tmp109_, _tmp110_); _tmp111_ = p; _tmp112_ = final_individual; _folks_individual_aggregator_add_persona_to_link_map (self, _tmp111_, _tmp112_); @@ -3516,7 +3728,7 @@ _g_object_unref0 (_k_it); } _tmp153_ = transitive_updates; - _tmp154_ = gee_collection_get_size ((GeeCollection*) _tmp153_); + _tmp154_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp153_); _tmp155_ = _tmp154_; if (_tmp155_ == 0) { GeeHashMultiMap* _tmp156_; @@ -3592,7 +3804,7 @@ g_return_if_fail (obj != NULL); g_return_if_fail (pspec != NULL); _tmp0_ = obj; - _tmp1_ = _g_object_ref0 (FOLKS_IS_PERSONA (_tmp0_) ? ((FolksPersona*) _tmp0_) : NULL); + _tmp1_ = _g_object_ref0 (FOLKS_PERSONA (FOLKS_IS_PERSONA (_tmp0_) ? ((FolksPersona*) _tmp0_) : NULL)); persona = _tmp1_; _tmp3_ = persona; _tmp4_ = folks_persona_get_is_user (_tmp3_); @@ -3721,8 +3933,10 @@ static void block5_data_unref (Block5Data* _data5_) { if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) { - _g_object_unref0 (_data5_->self); + FolksIndividualAggregator * self; + self = _data5_->self; _g_object_unref0 (_data5_->individual); + _g_object_unref0 (self); g_slice_free (Block5Data, _data5_); } } @@ -3740,7 +3954,7 @@ g_return_if_fail (l != NULL); _tmp0_ = l; prop_linking_value = _tmp0_; - g_debug ("individual-aggregator.vala:1105: %s", prop_linking_value); + g_debug ("individual-aggregator.vala:1169: %s", prop_linking_value); _tmp1_ = self->priv->_link_map; _tmp2_ = g_strdup (prop_linking_value); _tmp3_ = _data5_->individual; @@ -3808,12 +4022,12 @@ _tmp10_ = persona; _tmp11_ = folks_persona_get_iid (_tmp10_); _tmp12_ = _tmp11_; - g_debug ("individual-aggregator.vala:1069: Connecting to Persona: %s (is user: %" \ + g_debug ("individual-aggregator.vala:1133: Connecting to Persona: %s (is user: %" \ "s, IID: %s)", _tmp8_, _tmp9_, _tmp12_); _tmp13_ = _data5_->individual; _tmp14_ = folks_individual_get_id (_tmp13_); _tmp15_ = _tmp14_; - g_debug ("individual-aggregator.vala:1071: Mapping to Individual: %s", _tmp15_); + g_debug ("individual-aggregator.vala:1135: Mapping to Individual: %s", _tmp15_); _tmp16_ = self->priv->_link_map; _tmp17_ = persona; _tmp18_ = folks_persona_get_iid (_tmp17_); @@ -3833,7 +4047,7 @@ gint _tmp29__length1; gchar** _tmp30_; gint _tmp30__length1; - g_debug ("individual-aggregator.vala:1082: Inserting links:"); + g_debug ("individual-aggregator.vala:1146: Inserting links:"); _tmp28_ = persona; _tmp29_ = folks_persona_get_linkable_properties (_tmp28_, &_tmp29__length1); _tmp30_ = _tmp29_; @@ -3859,7 +4073,7 @@ FolksPersona* _tmp39_; const gchar* _tmp40_; _tmp31_ = prop_name; - g_debug ("individual-aggregator.vala:1088: %s", _tmp31_); + g_debug ("individual-aggregator.vala:1152: %s", _tmp31_); _tmp32_ = persona; _tmp33_ = G_OBJECT_GET_CLASS ((GObject*) _tmp32_); pclass = _tmp33_; @@ -3899,7 +4113,7 @@ _tmp0_ = individual; _tmp1_ = folks_individual_get_id (_tmp0_); _tmp2_ = _tmp1_; - g_debug ("individual-aggregator.vala:1120: Removing Individual '%s' from the lin" \ + g_debug ("individual-aggregator.vala:1184: Removing Individual '%s' from the lin" \ "k map.", _tmp2_); _tmp3_ = self->priv->_link_map; g_hash_table_iter_init (&iter, _tmp3_); @@ -3934,7 +4148,7 @@ _tmp13_ = folks_individual_get_id (_tmp12_); _tmp14_ = _tmp13_; _tmp15_ = link_individual; - g_debug ("individual-aggregator.vala:1130: %s → %s (%p)", _tmp11_, _tmp14_, _tmp15_); + g_debug ("individual-aggregator.vala:1194: %s → %s (%p)", _tmp11_, _tmp14_, _tmp15_); g_hash_table_iter_remove (&iter); } } @@ -3966,9 +4180,9 @@ GeeHashMap* _tmp189_; GeeMapIterator* _tmp190_ = NULL; GeeMapIterator* iter; - FolksDebug* _tmp210_; - gboolean _tmp211_; - gboolean _tmp212_; + FolksDebug* _tmp207_; + gboolean _tmp208_; + gboolean _tmp209_; g_return_if_fail (self != NULL); g_return_if_fail (store != NULL); g_return_if_fail (added != NULL); @@ -3984,7 +4198,7 @@ _tmp4_ = self->priv->_user; _tmp5_ = _g_object_ref0 (_tmp4_); user = _tmp5_; - g_debug ("individual-aggregator.vala:1155: Removing Personas:"); + g_debug ("individual-aggregator.vala:1219: Removing Personas:"); { GeeSet* _tmp6_; GeeIterator* _tmp7_ = NULL; @@ -4041,7 +4255,7 @@ _tmp20_ = persona; _tmp21_ = folks_persona_get_iid (_tmp20_); _tmp22_ = _tmp21_; - g_debug ("individual-aggregator.vala:1159: %s (is user: %s, IID: %s)", _tmp18_, _tmp19_, _tmp22_); + g_debug ("individual-aggregator.vala:1223: %s (is user: %s, IID: %s)", _tmp18_, _tmp19_, _tmp22_); _tmp23_ = self->priv->_link_map; _tmp24_ = persona; _tmp25_ = folks_persona_get_iid (_tmp24_); @@ -4055,7 +4269,7 @@ FolksIndividual* _tmp31_; _tmp30_ = removed_individuals; _tmp31_ = ind; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp30_, _tmp31_); + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp30_, FOLKS_INDIVIDUAL (_tmp31_)); } _tmp32_ = persona; _folks_individual_aggregator_disconnect_from_persona (self, _tmp32_); @@ -4064,7 +4278,7 @@ } _g_object_unref0 (_persona_it); } - g_debug ("individual-aggregator.vala:1183: Removing Individuals due to removed l" \ + g_debug ("individual-aggregator.vala:1247: Removing Individuals due to removed l" \ "inks:"); { GeeHashSet* _tmp33_; @@ -4111,7 +4325,7 @@ _tmp44_ = individual; _tmp45_ = folks_individual_get_id (_tmp44_); _tmp46_ = _tmp45_; - g_debug ("individual-aggregator.vala:1190: %s", _tmp46_); + g_debug ("individual-aggregator.vala:1254: %s", _tmp46_); { FolksIndividual* _tmp47_; GeeSet* _tmp48_; @@ -4184,7 +4398,7 @@ } _g_object_unref0 (_individual_it); } - g_debug ("individual-aggregator.vala:1212: Adding Personas:"); + g_debug ("individual-aggregator.vala:1276: Adding Personas:"); { GeeSet* _tmp69_; GeeIterator* _tmp70_ = NULL; @@ -4233,7 +4447,7 @@ _tmp83_ = persona; _tmp84_ = folks_persona_get_iid (_tmp83_); _tmp85_ = _tmp84_; - g_debug ("individual-aggregator.vala:1215: %s (is user: %s, IID: %s)", _tmp81_, _tmp82_, _tmp85_); + g_debug ("individual-aggregator.vala:1279: %s (is user: %s, IID: %s)", _tmp81_, _tmp82_, _tmp85_); _tmp86_ = persona; _folks_individual_aggregator_connect_to_persona (self, _tmp86_); _g_object_unref0 (persona); @@ -4248,7 +4462,7 @@ _tmp90_ = added; _folks_individual_aggregator_add_personas (self, _tmp90_, &user, &individuals_changes); } - g_debug ("individual-aggregator.vala:1228: Relinking Personas:"); + g_debug ("individual-aggregator.vala:1292: Relinking Personas:"); { GeeHashSet* _tmp91_; GeeIterator* _tmp92_ = NULL; @@ -4296,7 +4510,7 @@ _tmp105_ = persona; _tmp106_ = folks_persona_get_iid (_tmp105_); _tmp107_ = _tmp106_; - g_debug ("individual-aggregator.vala:1231: %s (is user: %s, IID: %s)", _tmp103_, _tmp104_, _tmp107_); + g_debug ("individual-aggregator.vala:1295: %s (is user: %s, IID: %s)", _tmp103_, _tmp104_, _tmp107_); _g_object_unref0 (persona); } _g_object_unref0 (_persona_it); @@ -4509,7 +4723,7 @@ FolksIndividual* _tmp174_; _tmp173_ = removed_individuals; _tmp174_ = old_ind; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp173_, _tmp174_); + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp173_, FOLKS_INDIVIDUAL (_tmp174_)); } _tmp175_ = new_ind; if (_tmp175_ != NULL) { @@ -4518,9 +4732,9 @@ FolksIndividual* _tmp178_; _tmp176_ = added_individuals; _tmp177_ = new_ind; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp176_, _tmp177_); + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp176_, FOLKS_INDIVIDUAL (_tmp177_)); _tmp178_ = new_ind; - _folks_individual_aggregator_connect_to_individual (self, _tmp178_); + _folks_individual_aggregator_connect_to_individual (self, FOLKS_INDIVIDUAL (_tmp178_)); } _tmp180_ = old_ind; if (_tmp180_ != NULL) { @@ -4538,7 +4752,7 @@ _tmp183_ = replaced_individuals; _tmp184_ = old_ind; _tmp185_ = new_ind; - gee_abstract_map_set ((GeeAbstractMap*) _tmp183_, _tmp184_, _tmp185_); + gee_abstract_map_set ((GeeAbstractMap*) _tmp183_, FOLKS_INDIVIDUAL (_tmp184_), FOLKS_INDIVIDUAL (_tmp185_)); } _g_object_unref0 (new_ind); } @@ -4554,7 +4768,7 @@ _folks_individual_aggregator_emit_individuals_changed (self, (GeeSet*) _tmp186_, (GeeSet*) _tmp187_, (GeeMultiMap*) _tmp188_, NULL, NULL, FOLKS_GROUP_DETAILS_CHANGE_REASON_NONE); _g_object_unref0 (added_individuals); } - g_debug ("individual-aggregator.vala:1304: Replacing Individuals due to linking:"); + g_debug ("individual-aggregator.vala:1368: Replacing Individuals due to linking:"); _tmp189_ = replaced_individuals; _tmp190_ = gee_abstract_map_map_iterator ((GeeAbstractMap*) _tmp189_); iter = _tmp190_; @@ -4567,16 +4781,16 @@ GeeMapIterator* _tmp195_; gpointer _tmp196_ = NULL; FolksIndividual* new_ind; - const gchar* _tmp197_ = NULL; - FolksIndividual* _tmp198_; - FolksIndividual* _tmp202_; + FolksIndividual* _tmp197_; + const gchar* _tmp198_; + const gchar* _tmp199_; + FolksIndividual* _tmp200_; + FolksIndividual* _tmp201_; + const gchar* _tmp202_; const gchar* _tmp203_; - const gchar* _tmp204_; + FolksIndividual* _tmp204_; FolksIndividual* _tmp205_; - const gchar* _tmp206_; - FolksIndividual* _tmp207_; - FolksIndividual* _tmp208_; - FolksIndividual* _tmp209_; + FolksIndividual* _tmp206_; _tmp191_ = iter; _tmp192_ = gee_map_iterator_next (_tmp191_); if (!(_tmp192_ == TRUE)) { @@ -4588,129 +4802,119 @@ _tmp195_ = iter; _tmp196_ = gee_map_iterator_get_value (_tmp195_); new_ind = (FolksIndividual*) _tmp196_; - _tmp198_ = new_ind; - if (_tmp198_ != NULL) { - FolksIndividual* _tmp199_; - const gchar* _tmp200_; - const gchar* _tmp201_; - _tmp199_ = new_ind; - _tmp200_ = folks_individual_get_id (_tmp199_); - _tmp201_ = _tmp200_; - _tmp197_ = _tmp201_; - } else { - _tmp197_ = ""; - } - _tmp202_ = old_ind; - _tmp203_ = folks_individual_get_id (_tmp202_); - _tmp204_ = _tmp203_; + _tmp197_ = old_ind; + _tmp198_ = folks_individual_get_id (_tmp197_); + _tmp199_ = _tmp198_; + _tmp200_ = old_ind; + _tmp201_ = new_ind; + _tmp202_ = folks_individual_get_id (_tmp201_); + _tmp203_ = _tmp202_; + _tmp204_ = new_ind; + g_debug ("individual-aggregator.vala:1375: %s (%p) → %s (%p)", _tmp199_, _tmp200_, _tmp203_, _tmp204_); _tmp205_ = old_ind; - _tmp206_ = _tmp197_; - _tmp207_ = new_ind; - g_debug ("individual-aggregator.vala:1311: %s (%p) → %s (%p)", _tmp204_, _tmp205_, _tmp206_, _tmp207_); - _tmp208_ = old_ind; - _tmp209_ = new_ind; - folks_individual_replace (_tmp208_, _tmp209_); + _tmp206_ = new_ind; + folks_individual_replace (_tmp205_, _tmp206_); _g_object_unref0 (new_ind); _g_object_unref0 (old_ind); } - _tmp210_ = self->priv->_debug; - _tmp211_ = folks_debug_get_debug_output_enabled (_tmp210_); - _tmp212_ = _tmp211_; - if (_tmp212_ == TRUE) { - GHashTable* _tmp213_; + _tmp207_ = self->priv->_debug; + _tmp208_ = folks_debug_get_debug_output_enabled (_tmp207_); + _tmp209_ = _tmp208_; + if (_tmp209_ == TRUE) { + GHashTable* _tmp210_; GHashTableIter iter2 = {0}; gchar* link_key = NULL; FolksIndividual* individual = NULL; - _tmp213_ = self->priv->_link_map; - g_hash_table_iter_init (&iter2, _tmp213_); + _tmp210_ = self->priv->_link_map; + g_hash_table_iter_init (&iter2, _tmp210_); while (TRUE) { - gconstpointer _tmp214_ = NULL; - gconstpointer _tmp215_ = NULL; - gboolean _tmp216_ = FALSE; - gchar* _tmp217_; - FolksIndividual* _tmp218_; - GeeMap* _tmp219_; - FolksIndividual* _tmp220_; - const gchar* _tmp221_; - const gchar* _tmp222_; - gpointer _tmp223_ = NULL; - FolksIndividual* _tmp224_; - FolksIndividual* _tmp225_; - gboolean _tmp226_; - _tmp216_ = g_hash_table_iter_next (&iter2, &_tmp214_, &_tmp215_); + gconstpointer _tmp211_ = NULL; + gconstpointer _tmp212_ = NULL; + gboolean _tmp213_ = FALSE; + gchar* _tmp214_; + FolksIndividual* _tmp215_; + GeeMap* _tmp216_; + FolksIndividual* _tmp217_; + const gchar* _tmp218_; + const gchar* _tmp219_; + gpointer _tmp220_ = NULL; + FolksIndividual* _tmp221_; + FolksIndividual* _tmp222_; + gboolean _tmp223_; + _tmp213_ = g_hash_table_iter_next (&iter2, &_tmp211_, &_tmp212_); _g_free0 (link_key); - _tmp217_ = g_strdup (_tmp214_); - link_key = _tmp217_; + _tmp214_ = g_strdup (_tmp211_); + link_key = _tmp214_; _g_object_unref0 (individual); - _tmp218_ = _g_object_ref0 (_tmp215_); - individual = _tmp218_; - if (!(_tmp216_ == TRUE)) { + _tmp215_ = _g_object_ref0 (_tmp212_); + individual = _tmp215_; + if (!(_tmp213_ == TRUE)) { break; } - _tmp219_ = self->priv->_individuals; - _tmp220_ = individual; - _tmp221_ = folks_individual_get_id (_tmp220_); - _tmp222_ = _tmp221_; - _tmp223_ = gee_map_get (_tmp219_, _tmp222_); - _tmp224_ = (FolksIndividual*) _tmp223_; - _tmp225_ = individual; - _tmp226_ = _tmp224_ != _tmp225_; - _g_object_unref0 (_tmp224_); - if (_tmp226_) { + _tmp216_ = self->priv->_individuals; + _tmp217_ = individual; + _tmp218_ = folks_individual_get_id (_tmp217_); + _tmp219_ = _tmp218_; + _tmp220_ = gee_map_get (_tmp216_, _tmp219_); + _tmp221_ = (FolksIndividual*) _tmp220_; + _tmp222_ = individual; + _tmp223_ = _tmp221_ != _tmp222_; + _g_object_unref0 (_tmp221_); + if (_tmp223_) { + const gchar* _tmp224_; + FolksIndividual* _tmp225_; + const gchar* _tmp226_; const gchar* _tmp227_; FolksIndividual* _tmp228_; - const gchar* _tmp229_; + FolksIndividual* _tmp229_; const gchar* _tmp230_; - FolksIndividual* _tmp231_; + const gchar* _tmp231_; FolksIndividual* _tmp232_; - const gchar* _tmp233_; - const gchar* _tmp234_; - FolksIndividual* _tmp235_; - _tmp227_ = link_key; + _tmp224_ = link_key; + _tmp225_ = individual; + _tmp226_ = folks_individual_get_id (_tmp225_); + _tmp227_ = _tmp226_; _tmp228_ = individual; - _tmp229_ = folks_individual_get_id (_tmp228_); - _tmp230_ = _tmp229_; - _tmp231_ = individual; - g_warning ("Link map contains invalid mapping:\n" " %s → %s (%p)", _tmp227_, _tmp230_, _tmp231_); + g_warning ("Link map contains invalid mapping:\n" " %s → %s (%p)", _tmp224_, _tmp227_, _tmp228_); + _tmp229_ = individual; + _tmp230_ = folks_individual_get_id (_tmp229_); + _tmp231_ = _tmp230_; _tmp232_ = individual; - _tmp233_ = folks_individual_get_id (_tmp232_); - _tmp234_ = _tmp233_; - _tmp235_ = individual; - g_warning ("individual-aggregator.vala:1331: Individual %s (%p) personas:", _tmp234_, _tmp235_); + g_warning ("individual-aggregator.vala:1395: Individual %s (%p) personas:", _tmp231_, _tmp232_); { - FolksIndividual* _tmp236_; - GeeSet* _tmp237_; - GeeSet* _tmp238_; - GeeIterator* _tmp239_ = NULL; + FolksIndividual* _tmp233_; + GeeSet* _tmp234_; + GeeSet* _tmp235_; + GeeIterator* _tmp236_ = NULL; GeeIterator* _p_it; - _tmp236_ = individual; - _tmp237_ = folks_individual_get_personas (_tmp236_); - _tmp238_ = _tmp237_; - _tmp239_ = gee_iterable_iterator ((GeeIterable*) _tmp238_); - _p_it = _tmp239_; + _tmp233_ = individual; + _tmp234_ = folks_individual_get_personas (_tmp233_); + _tmp235_ = _tmp234_; + _tmp236_ = gee_iterable_iterator ((GeeIterable*) _tmp235_); + _p_it = _tmp236_; while (TRUE) { - GeeIterator* _tmp240_; - gboolean _tmp241_ = FALSE; - GeeIterator* _tmp242_; - gpointer _tmp243_ = NULL; + GeeIterator* _tmp237_; + gboolean _tmp238_ = FALSE; + GeeIterator* _tmp239_; + gpointer _tmp240_ = NULL; FolksPersona* p; + FolksPersona* _tmp241_; + const gchar* _tmp242_; + const gchar* _tmp243_; FolksPersona* _tmp244_; - const gchar* _tmp245_; - const gchar* _tmp246_; - FolksPersona* _tmp247_; - _tmp240_ = _p_it; - _tmp241_ = gee_iterator_next (_tmp240_); - if (!_tmp241_) { + _tmp237_ = _p_it; + _tmp238_ = gee_iterator_next (_tmp237_); + if (!_tmp238_) { break; } - _tmp242_ = _p_it; - _tmp243_ = gee_iterator_get (_tmp242_); - p = (FolksPersona*) _tmp243_; + _tmp239_ = _p_it; + _tmp240_ = gee_iterator_get (_tmp239_); + p = (FolksPersona*) _tmp240_; + _tmp241_ = p; + _tmp242_ = folks_persona_get_uid (_tmp241_); + _tmp243_ = _tmp242_; _tmp244_ = p; - _tmp245_ = folks_persona_get_uid (_tmp244_); - _tmp246_ = _tmp245_; - _tmp247_ = p; - g_warning ("individual-aggregator.vala:1335: %s (%p)", _tmp246_, _tmp247_); + g_warning ("individual-aggregator.vala:1399: %s (%p)", _tmp243_, _tmp244_); _g_object_unref0 (p); } _g_object_unref0 (_p_it); @@ -4918,7 +5122,7 @@ gboolean _tmp5_; g_return_val_if_fail (self != NULL, FALSE); g_return_val_if_fail (store != NULL, FALSE); - g_debug ("individual-aggregator.vala:1411: _maybe_configure_as_primary()"); + g_debug ("individual-aggregator.vala:1475: _maybe_configure_as_primary()"); configured = FALSE; _tmp1_ = self->priv->_user_configured_primary_store; if (!_tmp1_) { @@ -4954,7 +5158,7 @@ _tmp9_ = store; _tmp10_ = folks_persona_store_get_id (_tmp9_); _tmp11_ = _tmp10_; - g_debug ("individual-aggregator.vala:1418: Setting primary store IDs to '%s' and" \ + g_debug ("individual-aggregator.vala:1482: Setting primary store IDs to '%s' and" \ " '%s'.", _tmp8_, _tmp11_); _tmp12_ = store; _tmp13_ = folks_persona_store_get_type_id (_tmp12_); @@ -5024,9 +5228,9 @@ _tmp12_ = folks_individual_get_id (_tmp11_); _tmp13_ = _tmp12_; _tmp14_ = replacement; - _tmp15_ = folks_individual_get_id (_tmp14_); + _tmp15_ = folks_individual_get_id (FOLKS_INDIVIDUAL (_tmp14_)); _tmp16_ = _tmp15_; - g_debug ("individual-aggregator.vala:1440: Individual '%s' removed (replaced by " \ + g_debug ("individual-aggregator.vala:1504: Individual '%s' removed (replaced by " \ "'%s')", _tmp13_, _tmp16_); } else { FolksIndividual* _tmp17_; @@ -5035,7 +5239,7 @@ _tmp17_ = i; _tmp18_ = folks_individual_get_id (_tmp17_); _tmp19_ = _tmp18_; - g_debug ("individual-aggregator.vala:1445: Individual '%s' removed (not replaced" \ + g_debug ("individual-aggregator.vala:1509: Individual '%s' removed (not replaced" \ ")", _tmp19_); } _tmp20_ = i; @@ -5278,10 +5482,10 @@ _data_->_tmp25_ = _data_->_tmp22_; if (_data_->_tmp25_) { _data_->_tmp26_ = _data_->parent; - _data_->_tmp27_ = folks_individual_get_personas (_data_->_tmp26_); + _data_->_tmp27_ = folks_individual_get_personas (FOLKS_INDIVIDUAL (_data_->_tmp26_)); _data_->_tmp28_ = _data_->_tmp27_; _data_->_tmp29_ = _data_->persona; - gee_collection_add ((GeeCollection*) _data_->_tmp28_, _data_->_tmp29_); + gee_collection_add ((GeeCollection*) _data_->_tmp28_, FOLKS_PERSONA (_data_->_tmp29_)); } _data_->result = _data_->persona; if (_data_->_state_ == 0) { @@ -5310,8 +5514,10 @@ static void block6_data_unref (Block6Data* _data6_) { if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) { - _g_object_unref0 (_data6_->self); + FolksIndividualAggregator * self; + self = _data6_->self; _g_hash_table_unref0 (_data6_->retval); + _g_object_unref0 (self); g_slice_free (Block6Data, _data6_); } } @@ -5696,9 +5902,30 @@ _data_->_tmp0_ = _data_->self->priv->_primary_store; if (_data_->_tmp0_ == NULL) { _data_->_tmp1_ = NULL; - _data_->_tmp1_ = _ ("Can't link personas with no primary store."); - _data_->_tmp2_ = g_error_new_literal (FOLKS_INDIVIDUAL_AGGREGATOR_ERROR, FOLKS_INDIVIDUAL_AGGREGATOR_ERROR_NO_PRIMARY_STORE, _data_->_tmp1_); - _data_->_inner_error_ = _data_->_tmp2_; + _data_->_tmp1_ = _ ("Can’t link personas with no primary store."); + _data_->_tmp2_ = g_strconcat (_data_->_tmp1_, "\n", NULL); + _data_->_tmp3_ = _data_->_tmp2_; + _data_->_tmp4_ = NULL; + _data_->_tmp4_ = _ ("Persona store ‘%s:%s’ is configured as primary, but could not be found" \ +" or failed to load."); + _data_->_tmp5_ = g_strconcat (_data_->_tmp3_, _data_->_tmp4_, NULL); + _data_->_tmp6_ = _data_->_tmp5_; + _data_->_tmp7_ = g_strconcat (_data_->_tmp6_, "\n", NULL); + _data_->_tmp8_ = _data_->_tmp7_; + _data_->_tmp9_ = NULL; + _data_->_tmp9_ = _ ("Check the service providing the persona store is running, or change th" \ +"e default store in that service or using the “%s” GConf key."); + _data_->_tmp10_ = g_strconcat (_data_->_tmp8_, _data_->_tmp9_, NULL); + _data_->_tmp11_ = _data_->_tmp10_; + _data_->_tmp12_ = _data_->self->priv->_configured_primary_store_type_id; + _data_->_tmp13_ = _data_->self->priv->_configured_primary_store_id; + _data_->_tmp14_ = g_error_new (FOLKS_INDIVIDUAL_AGGREGATOR_ERROR, FOLKS_INDIVIDUAL_AGGREGATOR_ERROR_NO_PRIMARY_STORE, _data_->_tmp11_, _data_->_tmp12_, _data_->_tmp13_, FOLKS_INDIVIDUAL_AGGREGATOR__FOLKS_CONFIG_KEY); + _data_->_tmp15_ = _data_->_tmp14_; + _g_free0 (_data_->_tmp11_); + _g_free0 (_data_->_tmp8_); + _g_free0 (_data_->_tmp6_); + _g_free0 (_data_->_tmp3_); + _data_->_inner_error_ = _data_->_tmp15_; if (_data_->_inner_error_->domain == FOLKS_INDIVIDUAL_AGGREGATOR_ERROR) { g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); g_error_free (_data_->_inner_error_); @@ -5715,10 +5942,10 @@ return FALSE; } } - _data_->_tmp3_ = _data_->personas; - _data_->_tmp4_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp3_); - _data_->_tmp5_ = _data_->_tmp4_; - if (_data_->_tmp5_ <= 1) { + _data_->_tmp16_ = _data_->personas; + _data_->_tmp17_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp16_); + _data_->_tmp18_ = _data_->_tmp17_; + if (_data_->_tmp18_ <= 1) { if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); } else { @@ -5727,9 +5954,9 @@ g_object_unref (_data_->_async_result); return FALSE; } - _data_->_tmp6_ = _data_->self->priv->_linking_enabled; - if (_data_->_tmp6_ == FALSE) { - g_debug ("individual-aggregator.vala:1607: Can't link Personas: linking disabled" \ + _data_->_tmp19_ = _data_->self->priv->_linking_enabled; + if (_data_->_tmp19_ == FALSE) { + g_debug ("individual-aggregator.vala:1675: Can't link Personas: linking disabled" \ "."); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); @@ -5739,88 +5966,88 @@ g_object_unref (_data_->_async_result); return FALSE; } - _data_->_tmp7_ = _data_->self->priv->_primary_store; - _data_->_tmp8_ = folks_persona_store_get_type_id (_data_->_tmp7_); - _data_->_tmp9_ = _data_->_tmp8_; - _data_->_tmp10_ = _data_->self->priv->_configured_primary_store_type_id; - g_assert (g_strcmp0 (_data_->_tmp9_, _data_->_tmp10_) == 0); - _data_->_tmp11_ = gee_hash_multi_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, FOLKS_TYPE_IM_FIELD_DETAILS, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, (GHashFunc) folks_abstract_field_details_hash, (GEqualFunc) folks_abstract_field_details_equal); - _data_->protocols_addrs_set = _data_->_tmp11_; - _data_->_tmp12_ = gee_hash_multi_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, FOLKS_TYPE_WEB_SERVICE_FIELD_DETAILS, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, (GHashFunc) folks_abstract_field_details_hash, (GEqualFunc) folks_abstract_field_details_equal); - _data_->web_service_addrs_set = _data_->_tmp12_; - _data_->_tmp13_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL); - _data_->local_ids = _data_->_tmp13_; + _data_->_tmp20_ = _data_->self->priv->_primary_store; + _data_->_tmp21_ = folks_persona_store_get_type_id (FOLKS_PERSONA_STORE (_data_->_tmp20_)); + _data_->_tmp22_ = _data_->_tmp21_; + _data_->_tmp23_ = _data_->self->priv->_configured_primary_store_type_id; + g_assert (g_strcmp0 (_data_->_tmp22_, _data_->_tmp23_) == 0); + _data_->_tmp24_ = gee_hash_multi_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, FOLKS_TYPE_IM_FIELD_DETAILS, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, (GHashFunc) folks_abstract_field_details_hash, (GEqualFunc) folks_abstract_field_details_equal); + _data_->protocols_addrs_set = _data_->_tmp24_; + _data_->_tmp25_ = gee_hash_multi_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, FOLKS_TYPE_WEB_SERVICE_FIELD_DETAILS, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, (GHashFunc) folks_abstract_field_details_hash, (GEqualFunc) folks_abstract_field_details_equal); + _data_->web_service_addrs_set = _data_->_tmp25_; + _data_->_tmp26_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL); + _data_->local_ids = _data_->_tmp26_; { - _data_->_tmp14_ = _data_->personas; - _data_->_tmp15_ = NULL; - _data_->_tmp15_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp14_); - _data_->_persona_it = _data_->_tmp15_; + _data_->_tmp27_ = _data_->personas; + _data_->_tmp28_ = NULL; + _data_->_tmp28_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp27_); + _data_->_persona_it = _data_->_tmp28_; while (TRUE) { - _data_->_tmp16_ = _data_->_persona_it; - _data_->_tmp17_ = FALSE; - _data_->_tmp17_ = gee_iterator_next (_data_->_tmp16_); - if (!_data_->_tmp17_) { + _data_->_tmp29_ = _data_->_persona_it; + _data_->_tmp30_ = FALSE; + _data_->_tmp30_ = gee_iterator_next (_data_->_tmp29_); + if (!_data_->_tmp30_) { break; } - _data_->_tmp18_ = _data_->_persona_it; - _data_->_tmp19_ = NULL; - _data_->_tmp19_ = gee_iterator_get (_data_->_tmp18_); - _data_->persona = (FolksPersona*) _data_->_tmp19_; - _data_->_tmp20_ = _data_->persona; - if (FOLKS_IS_IM_DETAILS (_data_->_tmp20_)) { - _data_->_tmp21_ = _data_->persona; - _data_->_tmp22_ = _g_object_ref0 (FOLKS_IM_DETAILS (_data_->_tmp21_)); - _data_->im_details = _data_->_tmp22_; + _data_->_tmp31_ = _data_->_persona_it; + _data_->_tmp32_ = NULL; + _data_->_tmp32_ = gee_iterator_get (_data_->_tmp31_); + _data_->persona = (FolksPersona*) _data_->_tmp32_; + _data_->_tmp33_ = _data_->persona; + if (FOLKS_IS_IM_DETAILS (_data_->_tmp33_)) { + _data_->_tmp34_ = _data_->persona; + _data_->_tmp35_ = _g_object_ref0 (FOLKS_IM_DETAILS (_data_->_tmp34_)); + _data_->im_details = _data_->_tmp35_; { - _data_->_tmp23_ = _data_->im_details; - _data_->_tmp24_ = folks_im_details_get_im_addresses (_data_->_tmp23_); - _data_->_tmp25_ = _data_->_tmp24_; - _data_->_tmp26_ = NULL; - _data_->_tmp26_ = gee_multi_map_get_keys (_data_->_tmp25_); - _data_->_tmp27_ = _data_->_tmp26_; - _data_->_tmp28_ = NULL; - _data_->_tmp28_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp27_); - _data_->_tmp29_ = _data_->_tmp28_; - _g_object_unref0 (_data_->_tmp27_); - _data_->_protocol_it = _data_->_tmp29_; + _data_->_tmp36_ = _data_->im_details; + _data_->_tmp37_ = folks_im_details_get_im_addresses (_data_->_tmp36_); + _data_->_tmp38_ = _data_->_tmp37_; + _data_->_tmp39_ = NULL; + _data_->_tmp39_ = gee_multi_map_get_keys (_data_->_tmp38_); + _data_->_tmp40_ = _data_->_tmp39_; + _data_->_tmp41_ = NULL; + _data_->_tmp41_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp40_); + _data_->_tmp42_ = _data_->_tmp41_; + _g_object_unref0 (_data_->_tmp40_); + _data_->_protocol_it = _data_->_tmp42_; while (TRUE) { - _data_->_tmp30_ = _data_->_protocol_it; - _data_->_tmp31_ = FALSE; - _data_->_tmp31_ = gee_iterator_next (_data_->_tmp30_); - if (!_data_->_tmp31_) { + _data_->_tmp43_ = _data_->_protocol_it; + _data_->_tmp44_ = FALSE; + _data_->_tmp44_ = gee_iterator_next (_data_->_tmp43_); + if (!_data_->_tmp44_) { break; } - _data_->_tmp32_ = _data_->_protocol_it; - _data_->_tmp33_ = NULL; - _data_->_tmp33_ = gee_iterator_get (_data_->_tmp32_); - _data_->protocol = (gchar*) _data_->_tmp33_; - _data_->_tmp34_ = _data_->im_details; - _data_->_tmp35_ = folks_im_details_get_im_addresses (_data_->_tmp34_); - _data_->_tmp36_ = _data_->_tmp35_; - _data_->_tmp37_ = _data_->protocol; - _data_->_tmp38_ = NULL; - _data_->_tmp38_ = gee_multi_map_get (_data_->_tmp36_, _data_->_tmp37_); - _data_->im_addresses = _data_->_tmp38_; + _data_->_tmp45_ = _data_->_protocol_it; + _data_->_tmp46_ = NULL; + _data_->_tmp46_ = gee_iterator_get (_data_->_tmp45_); + _data_->protocol = (gchar*) _data_->_tmp46_; + _data_->_tmp47_ = _data_->im_details; + _data_->_tmp48_ = folks_im_details_get_im_addresses (_data_->_tmp47_); + _data_->_tmp49_ = _data_->_tmp48_; + _data_->_tmp50_ = _data_->protocol; + _data_->_tmp51_ = NULL; + _data_->_tmp51_ = gee_multi_map_get (_data_->_tmp49_, _data_->_tmp50_); + _data_->im_addresses = _data_->_tmp51_; { - _data_->_tmp39_ = _data_->im_addresses; - _data_->_tmp40_ = NULL; - _data_->_tmp40_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp39_); - _data_->_im_address_it = _data_->_tmp40_; + _data_->_tmp52_ = _data_->im_addresses; + _data_->_tmp53_ = NULL; + _data_->_tmp53_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp52_); + _data_->_im_address_it = _data_->_tmp53_; while (TRUE) { - _data_->_tmp41_ = _data_->_im_address_it; - _data_->_tmp42_ = FALSE; - _data_->_tmp42_ = gee_iterator_next (_data_->_tmp41_); - if (!_data_->_tmp42_) { + _data_->_tmp54_ = _data_->_im_address_it; + _data_->_tmp55_ = FALSE; + _data_->_tmp55_ = gee_iterator_next (_data_->_tmp54_); + if (!_data_->_tmp55_) { break; } - _data_->_tmp43_ = _data_->_im_address_it; - _data_->_tmp44_ = NULL; - _data_->_tmp44_ = gee_iterator_get (_data_->_tmp43_); - _data_->im_address = (FolksImFieldDetails*) _data_->_tmp44_; - _data_->_tmp45_ = _data_->protocols_addrs_set; - _data_->_tmp46_ = _data_->protocol; - _data_->_tmp47_ = _data_->im_address; - gee_multi_map_set ((GeeMultiMap*) _data_->_tmp45_, _data_->_tmp46_, _data_->_tmp47_); + _data_->_tmp56_ = _data_->_im_address_it; + _data_->_tmp57_ = NULL; + _data_->_tmp57_ = gee_iterator_get (_data_->_tmp56_); + _data_->im_address = (FolksImFieldDetails*) _data_->_tmp57_; + _data_->_tmp58_ = _data_->protocols_addrs_set; + _data_->_tmp59_ = _data_->protocol; + _data_->_tmp60_ = _data_->im_address; + gee_multi_map_set ((GeeMultiMap*) _data_->_tmp58_, _data_->_tmp59_, _data_->_tmp60_); _g_object_unref0 (_data_->im_address); } _g_object_unref0 (_data_->_im_address_it); @@ -5832,61 +6059,61 @@ } _g_object_unref0 (_data_->im_details); } - _data_->_tmp48_ = _data_->persona; - if (FOLKS_IS_WEB_SERVICE_DETAILS (_data_->_tmp48_)) { - _data_->_tmp49_ = _data_->persona; - _data_->_tmp50_ = _g_object_ref0 (FOLKS_WEB_SERVICE_DETAILS (_data_->_tmp49_)); - _data_->ws_details = _data_->_tmp50_; + _data_->_tmp61_ = _data_->persona; + if (FOLKS_IS_WEB_SERVICE_DETAILS (_data_->_tmp61_)) { + _data_->_tmp62_ = _data_->persona; + _data_->_tmp63_ = _g_object_ref0 (FOLKS_WEB_SERVICE_DETAILS (_data_->_tmp62_)); + _data_->ws_details = _data_->_tmp63_; { - _data_->_tmp51_ = _data_->ws_details; - _data_->_tmp52_ = folks_web_service_details_get_web_service_addresses (_data_->_tmp51_); - _data_->_tmp53_ = _data_->_tmp52_; - _data_->_tmp54_ = NULL; - _data_->_tmp54_ = gee_multi_map_get_keys (_data_->_tmp53_); - _data_->_tmp55_ = _data_->_tmp54_; - _data_->_tmp56_ = NULL; - _data_->_tmp56_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp55_); - _data_->_tmp57_ = _data_->_tmp56_; - _g_object_unref0 (_data_->_tmp55_); - _data_->_web_service_it = _data_->_tmp57_; + _data_->_tmp64_ = _data_->ws_details; + _data_->_tmp65_ = folks_web_service_details_get_web_service_addresses (_data_->_tmp64_); + _data_->_tmp66_ = _data_->_tmp65_; + _data_->_tmp67_ = NULL; + _data_->_tmp67_ = gee_multi_map_get_keys (_data_->_tmp66_); + _data_->_tmp68_ = _data_->_tmp67_; + _data_->_tmp69_ = NULL; + _data_->_tmp69_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp68_); + _data_->_tmp70_ = _data_->_tmp69_; + _g_object_unref0 (_data_->_tmp68_); + _data_->_web_service_it = _data_->_tmp70_; while (TRUE) { - _data_->_tmp58_ = _data_->_web_service_it; - _data_->_tmp59_ = FALSE; - _data_->_tmp59_ = gee_iterator_next (_data_->_tmp58_); - if (!_data_->_tmp59_) { + _data_->_tmp71_ = _data_->_web_service_it; + _data_->_tmp72_ = FALSE; + _data_->_tmp72_ = gee_iterator_next (_data_->_tmp71_); + if (!_data_->_tmp72_) { break; } - _data_->_tmp60_ = _data_->_web_service_it; - _data_->_tmp61_ = NULL; - _data_->_tmp61_ = gee_iterator_get (_data_->_tmp60_); - _data_->web_service = (gchar*) _data_->_tmp61_; - _data_->_tmp62_ = _data_->ws_details; - _data_->_tmp63_ = folks_web_service_details_get_web_service_addresses (_data_->_tmp62_); - _data_->_tmp64_ = _data_->_tmp63_; - _data_->_tmp65_ = _data_->web_service; - _data_->_tmp66_ = NULL; - _data_->_tmp66_ = gee_multi_map_get (_data_->_tmp64_, _data_->_tmp65_); - _data_->ws_addresses = _data_->_tmp66_; + _data_->_tmp73_ = _data_->_web_service_it; + _data_->_tmp74_ = NULL; + _data_->_tmp74_ = gee_iterator_get (_data_->_tmp73_); + _data_->web_service = (gchar*) _data_->_tmp74_; + _data_->_tmp75_ = _data_->ws_details; + _data_->_tmp76_ = folks_web_service_details_get_web_service_addresses (_data_->_tmp75_); + _data_->_tmp77_ = _data_->_tmp76_; + _data_->_tmp78_ = _data_->web_service; + _data_->_tmp79_ = NULL; + _data_->_tmp79_ = gee_multi_map_get (_data_->_tmp77_, _data_->_tmp78_); + _data_->ws_addresses = _data_->_tmp79_; { - _data_->_tmp67_ = _data_->ws_addresses; - _data_->_tmp68_ = NULL; - _data_->_tmp68_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp67_); - _data_->_ws_fd_it = _data_->_tmp68_; + _data_->_tmp80_ = _data_->ws_addresses; + _data_->_tmp81_ = NULL; + _data_->_tmp81_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp80_); + _data_->_ws_fd_it = _data_->_tmp81_; while (TRUE) { - _data_->_tmp69_ = _data_->_ws_fd_it; - _data_->_tmp70_ = FALSE; - _data_->_tmp70_ = gee_iterator_next (_data_->_tmp69_); - if (!_data_->_tmp70_) { + _data_->_tmp82_ = _data_->_ws_fd_it; + _data_->_tmp83_ = FALSE; + _data_->_tmp83_ = gee_iterator_next (_data_->_tmp82_); + if (!_data_->_tmp83_) { break; } - _data_->_tmp71_ = _data_->_ws_fd_it; - _data_->_tmp72_ = NULL; - _data_->_tmp72_ = gee_iterator_get (_data_->_tmp71_); - _data_->ws_fd = (FolksWebServiceFieldDetails*) _data_->_tmp72_; - _data_->_tmp73_ = _data_->web_service_addrs_set; - _data_->_tmp74_ = _data_->web_service; - _data_->_tmp75_ = _data_->ws_fd; - gee_multi_map_set ((GeeMultiMap*) _data_->_tmp73_, _data_->_tmp74_, _data_->_tmp75_); + _data_->_tmp84_ = _data_->_ws_fd_it; + _data_->_tmp85_ = NULL; + _data_->_tmp85_ = gee_iterator_get (_data_->_tmp84_); + _data_->ws_fd = (FolksWebServiceFieldDetails*) _data_->_tmp85_; + _data_->_tmp86_ = _data_->web_service_addrs_set; + _data_->_tmp87_ = _data_->web_service; + _data_->_tmp88_ = _data_->ws_fd; + gee_multi_map_set ((GeeMultiMap*) _data_->_tmp86_, _data_->_tmp87_, _data_->_tmp88_); _g_object_unref0 (_data_->ws_fd); } _g_object_unref0 (_data_->_ws_fd_it); @@ -5898,29 +6125,29 @@ } _g_object_unref0 (_data_->ws_details); } - _data_->_tmp76_ = _data_->persona; - if (FOLKS_IS_LOCAL_ID_DETAILS (_data_->_tmp76_)) { + _data_->_tmp89_ = _data_->persona; + if (FOLKS_IS_LOCAL_ID_DETAILS (_data_->_tmp89_)) { { - _data_->_tmp77_ = _data_->persona; - _data_->_tmp78_ = folks_local_id_details_get_local_ids (FOLKS_LOCAL_ID_DETAILS (_data_->_tmp77_)); - _data_->_tmp79_ = _data_->_tmp78_; - _data_->_tmp80_ = NULL; - _data_->_tmp80_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp79_); - _data_->_id_it = _data_->_tmp80_; + _data_->_tmp90_ = _data_->persona; + _data_->_tmp91_ = folks_local_id_details_get_local_ids (FOLKS_LOCAL_ID_DETAILS (_data_->_tmp90_)); + _data_->_tmp92_ = _data_->_tmp91_; + _data_->_tmp93_ = NULL; + _data_->_tmp93_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp92_); + _data_->_id_it = _data_->_tmp93_; while (TRUE) { - _data_->_tmp81_ = _data_->_id_it; - _data_->_tmp82_ = FALSE; - _data_->_tmp82_ = gee_iterator_next (_data_->_tmp81_); - if (!_data_->_tmp82_) { + _data_->_tmp94_ = _data_->_id_it; + _data_->_tmp95_ = FALSE; + _data_->_tmp95_ = gee_iterator_next (_data_->_tmp94_); + if (!_data_->_tmp95_) { break; } - _data_->_tmp83_ = _data_->_id_it; - _data_->_tmp84_ = NULL; - _data_->_tmp84_ = gee_iterator_get (_data_->_tmp83_); - _data_->id = (gchar*) _data_->_tmp84_; - _data_->_tmp85_ = _data_->local_ids; - _data_->_tmp86_ = _data_->id; - gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp85_, _data_->_tmp86_); + _data_->_tmp96_ = _data_->_id_it; + _data_->_tmp97_ = NULL; + _data_->_tmp97_ = gee_iterator_get (_data_->_tmp96_); + _data_->id = (gchar*) _data_->_tmp97_; + _data_->_tmp98_ = _data_->local_ids; + _data_->_tmp99_ = _data_->id; + gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp98_, _data_->_tmp99_); _g_free0 (_data_->id); } _g_object_unref0 (_data_->_id_it); @@ -5930,77 +6157,77 @@ } _g_object_unref0 (_data_->_persona_it); } - _data_->_tmp87_ = g_str_hash; - _data_->_tmp88_ = g_str_equal; - _data_->_tmp89_ = g_hash_table_new_full (_data_->_tmp87_, _data_->_tmp88_, _g_free0_, __vala_GValue_free0_); - _data_->details = _data_->_tmp89_; - _data_->_tmp90_ = _data_->protocols_addrs_set; - _data_->_tmp91_ = gee_multi_map_get_size ((GeeMultiMap*) _data_->_tmp90_); - _data_->_tmp92_ = _data_->_tmp91_; - if (_data_->_tmp92_ > 0) { - memset (&_data_->_tmp93_, 0, sizeof (GValue)); - g_value_init (&_data_->_tmp93_, GEE_TYPE_MULTI_MAP); - _data_->im_addresses_value = _data_->_tmp93_; - _data_->_tmp94_ = _data_->protocols_addrs_set; - g_value_set_object (&_data_->im_addresses_value, (GObject*) _data_->_tmp94_); - _data_->_tmp95_ = _data_->details; - _data_->_tmp96_ = NULL; - _data_->_tmp96_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_IM_ADDRESSES); - _data_->_tmp97_ = g_strdup (_data_->_tmp96_); - _data_->_tmp98_ = _data_->im_addresses_value; - _data_->_tmp99_ = _data_->_tmp98_; - _data_->_tmp100_ = __g_value_dup0 (&_data_->_tmp99_); - g_hash_table_insert (_data_->_tmp95_, _data_->_tmp97_, _data_->_tmp100_); + _data_->_tmp100_ = g_str_hash; + _data_->_tmp101_ = g_str_equal; + _data_->_tmp102_ = g_hash_table_new_full (_data_->_tmp100_, _data_->_tmp101_, _g_free0_, __vala_GValue_free0_); + _data_->details = _data_->_tmp102_; + _data_->_tmp103_ = _data_->protocols_addrs_set; + _data_->_tmp104_ = gee_multi_map_get_size ((GeeMultiMap*) _data_->_tmp103_); + _data_->_tmp105_ = _data_->_tmp104_; + if (_data_->_tmp105_ > 0) { + memset (&_data_->_tmp106_, 0, sizeof (GValue)); + g_value_init (&_data_->_tmp106_, GEE_TYPE_MULTI_MAP); + _data_->im_addresses_value = _data_->_tmp106_; + _data_->_tmp107_ = _data_->protocols_addrs_set; + g_value_set_object (&_data_->im_addresses_value, (GObject*) _data_->_tmp107_); + _data_->_tmp108_ = _data_->details; + _data_->_tmp109_ = NULL; + _data_->_tmp109_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_IM_ADDRESSES); + _data_->_tmp110_ = g_strdup ((const gchar*) _data_->_tmp109_); + _data_->_tmp111_ = _data_->im_addresses_value; + _data_->_tmp112_ = _data_->_tmp111_; + _data_->_tmp113_ = __g_value_dup0 (&_data_->_tmp112_); + g_hash_table_insert (_data_->_tmp108_, _data_->_tmp110_, _data_->_tmp113_); G_IS_VALUE (&_data_->im_addresses_value) ? (g_value_unset (&_data_->im_addresses_value), NULL) : NULL; } - _data_->_tmp101_ = _data_->web_service_addrs_set; - _data_->_tmp102_ = gee_multi_map_get_size ((GeeMultiMap*) _data_->_tmp101_); - _data_->_tmp103_ = _data_->_tmp102_; - if (_data_->_tmp103_ > 0) { - memset (&_data_->_tmp104_, 0, sizeof (GValue)); - g_value_init (&_data_->_tmp104_, GEE_TYPE_MULTI_MAP); - _data_->web_service_addresses_value = _data_->_tmp104_; - _data_->_tmp105_ = _data_->web_service_addrs_set; - g_value_set_object (&_data_->web_service_addresses_value, (GObject*) _data_->_tmp105_); - _data_->_tmp106_ = _data_->details; - _data_->_tmp107_ = NULL; - _data_->_tmp107_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_WEB_SERVICE_ADDRESSES); - _data_->_tmp108_ = g_strdup (_data_->_tmp107_); - _data_->_tmp109_ = _data_->web_service_addresses_value; - _data_->_tmp110_ = _data_->_tmp109_; - _data_->_tmp111_ = __g_value_dup0 (&_data_->_tmp110_); - g_hash_table_insert (_data_->_tmp106_, _data_->_tmp108_, _data_->_tmp111_); + _data_->_tmp114_ = _data_->web_service_addrs_set; + _data_->_tmp115_ = gee_multi_map_get_size ((GeeMultiMap*) _data_->_tmp114_); + _data_->_tmp116_ = _data_->_tmp115_; + if (_data_->_tmp116_ > 0) { + memset (&_data_->_tmp117_, 0, sizeof (GValue)); + g_value_init (&_data_->_tmp117_, GEE_TYPE_MULTI_MAP); + _data_->web_service_addresses_value = _data_->_tmp117_; + _data_->_tmp118_ = _data_->web_service_addrs_set; + g_value_set_object (&_data_->web_service_addresses_value, (GObject*) _data_->_tmp118_); + _data_->_tmp119_ = _data_->details; + _data_->_tmp120_ = NULL; + _data_->_tmp120_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_WEB_SERVICE_ADDRESSES); + _data_->_tmp121_ = g_strdup ((const gchar*) _data_->_tmp120_); + _data_->_tmp122_ = _data_->web_service_addresses_value; + _data_->_tmp123_ = _data_->_tmp122_; + _data_->_tmp124_ = __g_value_dup0 (&_data_->_tmp123_); + g_hash_table_insert (_data_->_tmp119_, _data_->_tmp121_, _data_->_tmp124_); G_IS_VALUE (&_data_->web_service_addresses_value) ? (g_value_unset (&_data_->web_service_addresses_value), NULL) : NULL; } - _data_->_tmp112_ = _data_->local_ids; - _data_->_tmp113_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp112_); - _data_->_tmp114_ = _data_->_tmp113_; - if (_data_->_tmp114_ > 0) { - memset (&_data_->_tmp115_, 0, sizeof (GValue)); - g_value_init (&_data_->_tmp115_, GEE_TYPE_SET); - _data_->local_ids_value = _data_->_tmp115_; - _data_->_tmp116_ = _data_->local_ids; - g_value_set_object (&_data_->local_ids_value, (GObject*) _data_->_tmp116_); - _data_->_tmp117_ = _data_->details; - _data_->_tmp118_ = NULL; - _data_->_tmp118_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_LOCAL_IDS); - _data_->_tmp119_ = g_strdup (_data_->_tmp118_); - _data_->_tmp120_ = _data_->local_ids_value; - _data_->_tmp121_ = _data_->_tmp120_; - _data_->_tmp122_ = __g_value_dup0 (&_data_->_tmp121_); - g_hash_table_insert (_data_->_tmp117_, _data_->_tmp119_, _data_->_tmp122_); + _data_->_tmp125_ = _data_->local_ids; + _data_->_tmp126_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp125_); + _data_->_tmp127_ = _data_->_tmp126_; + if (_data_->_tmp127_ > 0) { + memset (&_data_->_tmp128_, 0, sizeof (GValue)); + g_value_init (&_data_->_tmp128_, GEE_TYPE_SET); + _data_->local_ids_value = _data_->_tmp128_; + _data_->_tmp129_ = _data_->local_ids; + g_value_set_object (&_data_->local_ids_value, (GObject*) _data_->_tmp129_); + _data_->_tmp130_ = _data_->details; + _data_->_tmp131_ = NULL; + _data_->_tmp131_ = folks_persona_store_detail_key (FOLKS_PERSONA_DETAIL_LOCAL_IDS); + _data_->_tmp132_ = g_strdup ((const gchar*) _data_->_tmp131_); + _data_->_tmp133_ = _data_->local_ids_value; + _data_->_tmp134_ = _data_->_tmp133_; + _data_->_tmp135_ = __g_value_dup0 (&_data_->_tmp134_); + g_hash_table_insert (_data_->_tmp130_, _data_->_tmp132_, _data_->_tmp135_); G_IS_VALUE (&_data_->local_ids_value) ? (g_value_unset (&_data_->local_ids_value), NULL) : NULL; } - _data_->_tmp123_ = _data_->self->priv->_primary_store; - _data_->_tmp124_ = _data_->details; + _data_->_tmp136_ = _data_->self->priv->_primary_store; + _data_->_tmp137_ = _data_->details; _data_->_state_ = 1; - folks_individual_aggregator_add_persona_from_details (_data_->self, NULL, _data_->_tmp123_, _data_->_tmp124_, folks_individual_aggregator_link_personas_ready, _data_); + folks_individual_aggregator_add_persona_from_details (_data_->self, NULL, FOLKS_PERSONA_STORE (_data_->_tmp136_), _data_->_tmp137_, folks_individual_aggregator_link_personas_ready, _data_); return FALSE; _state_1: - _data_->_tmp125_ = NULL; - _data_->_tmp125_ = folks_individual_aggregator_add_persona_from_details_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); - _data_->_tmp126_ = _data_->_tmp125_; - _g_object_unref0 (_data_->_tmp126_); + _data_->_tmp138_ = NULL; + _data_->_tmp138_ = folks_individual_aggregator_add_persona_from_details_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); + _data_->_tmp139_ = _data_->_tmp138_; + _g_object_unref0 (_data_->_tmp139_); if (_data_->_inner_error_ != NULL) { if (_data_->_inner_error_->domain == FOLKS_INDIVIDUAL_AGGREGATOR_ERROR) { g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); @@ -6118,7 +6345,7 @@ _data_->_tmp1_ = _data_->individual; _data_->_tmp2_ = folks_individual_get_id (_data_->_tmp1_); _data_->_tmp3_ = _data_->_tmp2_; - g_debug ("individual-aggregator.vala:1728: Can't unlink Individual '%s': linking" \ + g_debug ("individual-aggregator.vala:1797: Can't unlink Individual '%s': linking" \ " disabled.", _data_->_tmp3_); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); @@ -6131,7 +6358,7 @@ _data_->_tmp4_ = _data_->individual; _data_->_tmp5_ = folks_individual_get_id (_data_->_tmp4_); _data_->_tmp6_ = _data_->_tmp5_; - g_debug ("individual-aggregator.vala:1733: Unlinking Individual '%s', deleting P" \ + g_debug ("individual-aggregator.vala:1802: Unlinking Individual '%s', deleting P" \ "ersonas:", _data_->_tmp6_); _data_->_tmp7_ = gee_hash_set_new (FOLKS_TYPE_PERSONA, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); _data_->personas = _data_->_tmp7_; @@ -6196,14 +6423,14 @@ _data_->_tmp36_ = _data_->persona; _data_->_tmp37_ = folks_persona_get_iid (_data_->_tmp36_); _data_->_tmp38_ = _data_->_tmp37_; - g_debug ("individual-aggregator.vala:1751: %s (is user: %s, IID: %s)", _data_->_tmp34_, _data_->_tmp35_, _data_->_tmp38_); + g_debug ("individual-aggregator.vala:1822: %s (is user: %s, IID: %s)", _data_->_tmp34_, _data_->_tmp35_, _data_->_tmp38_); _data_->_tmp39_ = _data_->self->priv->_primary_store; _data_->_tmp40_ = _data_->persona; _data_->_state_ = 1; - folks_persona_store_remove_persona (_data_->_tmp39_, _data_->_tmp40_, folks_individual_aggregator_unlink_individual_ready, _data_); + folks_persona_store_remove_persona (FOLKS_PERSONA_STORE (_data_->_tmp39_), _data_->_tmp40_, folks_individual_aggregator_unlink_individual_ready, _data_); return FALSE; _state_1: - folks_persona_store_remove_persona_finish (_data_->_tmp39_, _data_->_res_, &_data_->_inner_error_); + folks_persona_store_remove_persona_finish (FOLKS_PERSONA_STORE (_data_->_tmp39_), _data_->_res_, &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); g_error_free (_data_->_inner_error_); @@ -6251,7 +6478,7 @@ FolksIndividual* _tmp1_; FolksIndividual* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; _data_ = g_slice_new0 (FolksIndividualAggregatorEnsureIndividualPropertyWriteableData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, folks_individual_aggregator_ensure_individual_property_writeable); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, folks_individual_aggregator_ensure_individual_property_writeable_data_free); @@ -6345,7 +6572,7 @@ _data_->_tmp1_ = folks_individual_get_id (_data_->_tmp0_); _data_->_tmp2_ = _data_->_tmp1_; _data_->_tmp3_ = _data_->property_name; - g_debug ("individual-aggregator.vala:1789: ensure_individual_property_writeable:" \ + g_debug ("individual-aggregator.vala:1860: ensure_individual_property_writeable:" \ " %s, %s", _data_->_tmp2_, _data_->_tmp3_); { _data_->_tmp4_ = _data_->individual; @@ -6374,7 +6601,7 @@ _data_->_tmp16_ = _data_->p1; _data_->_tmp17_ = folks_persona_get_uid (_data_->_tmp16_); _data_->_tmp18_ = _data_->_tmp17_; - g_debug ("individual-aggregator.vala:1797: Returning existing persona: %s", _data_->_tmp18_); + g_debug ("individual-aggregator.vala:1868: Returning existing persona: %s", _data_->_tmp18_); _data_->result = _data_->p1; _g_object_unref0 (_data_->_p1_it); if (_data_->_state_ == 0) { @@ -6398,7 +6625,7 @@ if (_data_->_tmp23_ != NULL) { _data_->_tmp24_ = _data_->property_name; _data_->_tmp25_ = _data_->self->priv->_primary_store; - _data_->_tmp26_ = folks_persona_store_get_always_writeable_properties (_data_->_tmp25_, &_data_->_tmp26__length1); + _data_->_tmp26_ = folks_persona_store_get_always_writeable_properties (FOLKS_PERSONA_STORE (_data_->_tmp25_), &_data_->_tmp26__length1); _data_->_tmp27_ = _data_->_tmp26_; _data_->_tmp27__length1 = _data_->_tmp26__length1; _data_->_tmp22_ = _vala_string_array_contains (_data_->_tmp27_, _data_->_tmp27__length1, _data_->_tmp24_); @@ -6408,11 +6635,11 @@ _data_->_tmp28_ = _data_->_tmp22_; if (_data_->_tmp28_) { { - g_debug ("individual-aggregator.vala:1813: Using writeable store"); + g_debug ("individual-aggregator.vala:1885: Using writeable store"); _data_->_tmp29_ = _data_->self->priv->_primary_store; _data_->_tmp30_ = _data_->details; _data_->_state_ = 1; - folks_individual_aggregator_add_persona_from_details (_data_->self, NULL, _data_->_tmp29_, _data_->_tmp30_, folks_individual_aggregator_ensure_individual_property_writeable_ready, _data_); + folks_individual_aggregator_add_persona_from_details (_data_->self, NULL, FOLKS_PERSONA_STORE (_data_->_tmp29_), _data_->_tmp30_, folks_individual_aggregator_ensure_individual_property_writeable_ready, _data_); return FALSE; _state_1: _data_->_tmp31_ = NULL; @@ -6467,7 +6694,7 @@ if (_data_->_tmp33_ == NULL) { { _data_->_tmp34_ = _data_->self->priv->_stores; - _data_->_tmp35_ = gee_map_get_values ((GeeMap*) _data_->_tmp34_); + _data_->_tmp35_ = gee_abstract_map_get_values ((GeeMap*) _data_->_tmp34_); _data_->_tmp36_ = _data_->_tmp35_; _data_->_tmp37_ = _data_->_tmp36_; _data_->_tmp38_ = NULL; @@ -6507,7 +6734,7 @@ _data_->_tmp52_ = _data_->s; _data_->_tmp53_ = folks_persona_store_get_id (_data_->_tmp52_); _data_->_tmp54_ = _data_->_tmp53_; - g_debug ("individual-aggregator.vala:1837: Using store %s", _data_->_tmp54_); + g_debug ("individual-aggregator.vala:1909: Using store %s", _data_->_tmp54_); _data_->_tmp55_ = _data_->s; _data_->_tmp56_ = _data_->details; _data_->_state_ = 2; @@ -6584,9 +6811,30 @@ _data_->_tmp62_ = _data_->_tmp59_; if (_data_->_tmp62_) { _data_->_tmp63_ = NULL; - _data_->_tmp63_ = _ ("Can't add personas with no primary store."); - _data_->_tmp64_ = g_error_new_literal (FOLKS_INDIVIDUAL_AGGREGATOR_ERROR, FOLKS_INDIVIDUAL_AGGREGATOR_ERROR_NO_PRIMARY_STORE, _data_->_tmp63_); - _data_->_inner_error_ = _data_->_tmp64_; + _data_->_tmp63_ = _ ("Can’t add personas with no primary store."); + _data_->_tmp64_ = g_strconcat (_data_->_tmp63_, "\n", NULL); + _data_->_tmp65_ = _data_->_tmp64_; + _data_->_tmp66_ = NULL; + _data_->_tmp66_ = _ ("Persona store ‘%s:%s’ is configured as primary, but could not be found" \ +" or failed to load."); + _data_->_tmp67_ = g_strconcat (_data_->_tmp65_, _data_->_tmp66_, NULL); + _data_->_tmp68_ = _data_->_tmp67_; + _data_->_tmp69_ = g_strconcat (_data_->_tmp68_, "\n", NULL); + _data_->_tmp70_ = _data_->_tmp69_; + _data_->_tmp71_ = NULL; + _data_->_tmp71_ = _ ("Check the service providing the persona store is running, or change th" \ +"e default store in that service or using the “%s” GConf key."); + _data_->_tmp72_ = g_strconcat (_data_->_tmp70_, _data_->_tmp71_, NULL); + _data_->_tmp73_ = _data_->_tmp72_; + _data_->_tmp74_ = _data_->self->priv->_configured_primary_store_type_id; + _data_->_tmp75_ = _data_->self->priv->_configured_primary_store_id; + _data_->_tmp76_ = g_error_new (FOLKS_INDIVIDUAL_AGGREGATOR_ERROR, FOLKS_INDIVIDUAL_AGGREGATOR_ERROR_NO_PRIMARY_STORE, _data_->_tmp73_, _data_->_tmp74_, _data_->_tmp75_, FOLKS_INDIVIDUAL_AGGREGATOR__FOLKS_CONFIG_KEY); + _data_->_tmp77_ = _data_->_tmp76_; + _g_free0 (_data_->_tmp73_); + _g_free0 (_data_->_tmp70_); + _g_free0 (_data_->_tmp68_); + _g_free0 (_data_->_tmp65_); + _data_->_inner_error_ = _data_->_tmp77_; if (_data_->_inner_error_->domain == FOLKS_INDIVIDUAL_AGGREGATOR_ERROR) { g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); g_error_free (_data_->_inner_error_); @@ -6607,13 +6855,13 @@ return FALSE; } } else { - _data_->_tmp65_ = _data_->new_persona; - if (_data_->_tmp65_ == NULL) { - _data_->_tmp66_ = NULL; - _data_->_tmp66_ = _ ("Can't write to requested property (“%s”) of the writeable store."); - _data_->_tmp67_ = _data_->property_name; - _data_->_tmp68_ = g_error_new (FOLKS_INDIVIDUAL_AGGREGATOR_ERROR, FOLKS_INDIVIDUAL_AGGREGATOR_ERROR_PROPERTY_NOT_WRITEABLE, _data_->_tmp66_, _data_->_tmp67_); - _data_->_inner_error_ = _data_->_tmp68_; + _data_->_tmp78_ = _data_->new_persona; + if (_data_->_tmp78_ == NULL) { + _data_->_tmp79_ = NULL; + _data_->_tmp79_ = _ ("Can't write to requested property (“%s”) of the writeable store."); + _data_->_tmp80_ = _data_->property_name; + _data_->_tmp81_ = g_error_new (FOLKS_INDIVIDUAL_AGGREGATOR_ERROR, FOLKS_INDIVIDUAL_AGGREGATOR_ERROR_PROPERTY_NOT_WRITEABLE, _data_->_tmp79_, _data_->_tmp80_); + _data_->_inner_error_ = _data_->_tmp81_; if (_data_->_inner_error_->domain == FOLKS_INDIVIDUAL_AGGREGATOR_ERROR) { g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); g_error_free (_data_->_inner_error_); @@ -6635,42 +6883,42 @@ } } } - _data_->_tmp69_ = gee_hash_set_new (FOLKS_TYPE_PERSONA, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); - _data_->linking_personas = _data_->_tmp69_; - _data_->_tmp70_ = _data_->linking_personas; - _data_->_tmp71_ = _data_->new_persona; - gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp70_, _data_->_tmp71_); + _data_->_tmp82_ = gee_hash_set_new (FOLKS_TYPE_PERSONA, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); + _data_->linking_personas = _data_->_tmp82_; + _data_->_tmp83_ = _data_->linking_personas; + _data_->_tmp84_ = _data_->new_persona; + gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp83_, FOLKS_PERSONA (_data_->_tmp84_)); { - _data_->_tmp72_ = _data_->individual; - _data_->_tmp73_ = folks_individual_get_personas (_data_->_tmp72_); - _data_->_tmp74_ = _data_->_tmp73_; - _data_->_tmp75_ = NULL; - _data_->_tmp75_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp74_); - _data_->_p2_it = _data_->_tmp75_; + _data_->_tmp85_ = _data_->individual; + _data_->_tmp86_ = folks_individual_get_personas (_data_->_tmp85_); + _data_->_tmp87_ = _data_->_tmp86_; + _data_->_tmp88_ = NULL; + _data_->_tmp88_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp87_); + _data_->_p2_it = _data_->_tmp88_; while (TRUE) { - _data_->_tmp76_ = _data_->_p2_it; - _data_->_tmp77_ = FALSE; - _data_->_tmp77_ = gee_iterator_next (_data_->_tmp76_); - if (!_data_->_tmp77_) { + _data_->_tmp89_ = _data_->_p2_it; + _data_->_tmp90_ = FALSE; + _data_->_tmp90_ = gee_iterator_next (_data_->_tmp89_); + if (!_data_->_tmp90_) { break; } - _data_->_tmp78_ = _data_->_p2_it; - _data_->_tmp79_ = NULL; - _data_->_tmp79_ = gee_iterator_get (_data_->_tmp78_); - _data_->p2 = (FolksPersona*) _data_->_tmp79_; - _data_->_tmp80_ = _data_->linking_personas; - _data_->_tmp81_ = _data_->p2; - gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp80_, _data_->_tmp81_); + _data_->_tmp91_ = _data_->_p2_it; + _data_->_tmp92_ = NULL; + _data_->_tmp92_ = gee_iterator_get (_data_->_tmp91_); + _data_->p2 = (FolksPersona*) _data_->_tmp92_; + _data_->_tmp93_ = _data_->linking_personas; + _data_->_tmp94_ = _data_->p2; + gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp93_, _data_->_tmp94_); _g_object_unref0 (_data_->p2); } _g_object_unref0 (_data_->_p2_it); } - _data_->_tmp82_ = _data_->property_name; - g_debug ("individual-aggregator.vala:1872: Linking personas to ensure %s pro" \ -"perty is writeable.", _data_->_tmp82_); - _data_->_tmp83_ = _data_->linking_personas; + _data_->_tmp95_ = _data_->property_name; + g_debug ("individual-aggregator.vala:1949: Linking personas to ensure %s pro" \ +"perty is writeable.", _data_->_tmp95_); + _data_->_tmp96_ = _data_->linking_personas; _data_->_state_ = 3; - folks_individual_aggregator_link_personas (_data_->self, (GeeSet*) _data_->_tmp83_, folks_individual_aggregator_ensure_individual_property_writeable_ready, _data_); + folks_individual_aggregator_link_personas (_data_->self, (GeeSet*) _data_->_tmp96_, folks_individual_aggregator_ensure_individual_property_writeable_ready, _data_); return FALSE; _state_3: folks_individual_aggregator_link_personas_finish (_data_->self, _data_->_res_, &_data_->_inner_error_); @@ -6697,8 +6945,11 @@ return FALSE; } } - _data_->result = _data_->new_persona; + _data_->_tmp97_ = _data_->new_persona; + _data_->_tmp98_ = _g_object_ref0 (FOLKS_PERSONA (_data_->_tmp97_)); + _data_->result = _data_->_tmp98_; _g_object_unref0 (_data_->linking_personas); + _g_object_unref0 (_data_->new_persona); _g_hash_table_unref0 (_data_->details); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); @@ -6862,19 +7113,18 @@ gchar* store_config_ids; const gchar* _tmp13_; const gchar* _tmp21_; - const gchar* _tmp34_; - const gchar* _tmp35_; - const gchar* _tmp36_ = NULL; - gchar* _tmp37_; - gchar* disable_linking; + const gchar* _tmp37_; const gchar* _tmp38_; - gboolean _tmp43_ = FALSE; - gboolean _tmp44_ = FALSE; - const gchar* _tmp45_; - gboolean _tmp47_; - gboolean _tmp49_; - FolksBackendStore* _tmp50_ = NULL; - FolksBackendStore* _tmp51_; + const gchar* _tmp39_ = NULL; + gchar* _tmp40_; + gchar* disable_linking; + const gchar* _tmp41_; + gboolean _tmp46_ = FALSE; + gboolean _tmp47_ = FALSE; + const gchar* _tmp48_; + gboolean _tmp50_; + gboolean _tmp52_; + FolksBackendStore* _tmp53_ = NULL; GError * _inner_error_ = NULL; parent_class = G_OBJECT_CLASS (folks_individual_aggregator_parent_class); obj = parent_class->constructor (type, n_construct_properties, construct_properties); @@ -6939,7 +7189,7 @@ g_debug ("individual-aggregator.vala:305: Setting primary store IDs from environ" \ "ment variable."); _tmp22_ = store_config_ids; - _folks_individual_aggregator_configure_primary_store (self, _tmp22_); + _folks_individual_aggregator_configure_primary_store (self, (const gchar*) _tmp22_); } else { gboolean _tmp23_; g_debug ("individual-aggregator.vala:310: Setting primary store IDs to defaults."); @@ -6982,10 +7232,21 @@ if (_tmp31_ != NULL) { GConfValue* _tmp32_; const gchar* _tmp33_ = NULL; - g_debug ("individual-aggregator.vala:328: Setting primary store IDs from GConf."); + gchar* _tmp34_; + gchar* val_str; + const gchar* _tmp35_; _tmp32_ = val; - _tmp33_ = gconf_value_get_string (_tmp32_); - _folks_individual_aggregator_configure_primary_store (self, _tmp33_); + _tmp33_ = gconf_value_get_string ((GConfValue*) _tmp32_); + _tmp34_ = g_strdup (_tmp33_); + val_str = _tmp34_; + _tmp35_ = val_str; + if (_tmp35_ != NULL) { + const gchar* _tmp36_; + g_debug ("individual-aggregator.vala:332: Setting primary store IDs from GConf."); + _tmp36_ = val_str; + _folks_individual_aggregator_configure_primary_store (self, (const gchar*) _tmp36_); + } + _g_free0 (val_str); } _gconf_value_free0 (val); } @@ -7004,49 +7265,48 @@ g_clear_error (&_inner_error_); } } - _tmp34_ = self->priv->_configured_primary_store_type_id; - _tmp35_ = self->priv->_configured_primary_store_id; - g_debug ("individual-aggregator.vala:338: Primary store IDs are '%s' and '%s'.", _tmp34_, _tmp35_); - _tmp36_ = g_getenv ("FOLKS_DISABLE_LINKING"); - _tmp37_ = g_strdup (_tmp36_); - disable_linking = _tmp37_; - _tmp38_ = disable_linking; - if (_tmp38_ != NULL) { - const gchar* _tmp39_; - gchar* _tmp40_ = NULL; - gchar* _tmp41_; - gchar* _tmp42_ = NULL; - _tmp39_ = disable_linking; - _tmp40_ = string_strip (_tmp39_); - _tmp41_ = _tmp40_; - _tmp42_ = g_utf8_strdown (_tmp41_, (gssize) (-1)); + _tmp37_ = self->priv->_configured_primary_store_type_id; + _tmp38_ = self->priv->_configured_primary_store_id; + g_debug ("individual-aggregator.vala:343: Primary store IDs are '%s' and '%s'.", _tmp37_, _tmp38_); + _tmp39_ = g_getenv ("FOLKS_DISABLE_LINKING"); + _tmp40_ = g_strdup (_tmp39_); + disable_linking = _tmp40_; + _tmp41_ = disable_linking; + if (_tmp41_ != NULL) { + const gchar* _tmp42_; + gchar* _tmp43_ = NULL; + gchar* _tmp44_; + gchar* _tmp45_ = NULL; + _tmp42_ = disable_linking; + _tmp43_ = string_strip ((const gchar*) _tmp42_); + _tmp44_ = _tmp43_; + _tmp45_ = g_utf8_strdown (_tmp44_, (gssize) (-1)); _g_free0 (disable_linking); - disable_linking = _tmp42_; - _g_free0 (_tmp41_); + disable_linking = _tmp45_; + _g_free0 (_tmp44_); } - _tmp45_ = disable_linking; - if (_tmp45_ == NULL) { - _tmp44_ = TRUE; + _tmp48_ = disable_linking; + if (_tmp48_ == NULL) { + _tmp47_ = TRUE; } else { - const gchar* _tmp46_; - _tmp46_ = disable_linking; - _tmp44_ = g_strcmp0 (_tmp46_, "no") == 0; - } - _tmp47_ = _tmp44_; - if (_tmp47_) { - _tmp43_ = TRUE; + const gchar* _tmp49_; + _tmp49_ = disable_linking; + _tmp47_ = g_strcmp0 (_tmp49_, "no") == 0; + } + _tmp50_ = _tmp47_; + if (_tmp50_) { + _tmp46_ = TRUE; } else { - const gchar* _tmp48_; - _tmp48_ = disable_linking; - _tmp43_ = g_strcmp0 (_tmp48_, "0") == 0; - } - _tmp49_ = _tmp43_; - self->priv->_linking_enabled = _tmp49_; - _tmp50_ = folks_backend_store_dup (); + const gchar* _tmp51_; + _tmp51_ = disable_linking; + _tmp46_ = g_strcmp0 (_tmp51_, "0") == 0; + } + _tmp52_ = _tmp46_; + self->priv->_linking_enabled = _tmp52_; + _tmp53_ = folks_backend_store_dup (); _g_object_unref0 (self->priv->_backend_store); - self->priv->_backend_store = _tmp50_; - _tmp51_ = self->priv->_backend_store; - g_signal_connect_object (_tmp51_, "backend-available", (GCallback) __folks_individual_aggregator_backend_available_cb_folks_backend_store_backend_available, self, 0); + self->priv->_backend_store = _tmp53_; + g_debug ("individual-aggregator.vala:355: Constructing IndividualAggregator %p", self); _g_free0 (disable_linking); _g_free0 (store_config_ids); return obj; @@ -7198,11 +7458,10 @@ FolksDebug* _tmp2_; guint _tmp3_ = 0U; self = FOLKS_INDIVIDUAL_AGGREGATOR (obj); + g_debug ("individual-aggregator.vala:360: Destroying IndividualAggregator %p", self); _tmp0_ = self->priv->_backend_store; g_signal_parse_name ("backend-available", FOLKS_TYPE_BACKEND_STORE, &_tmp1_, NULL, FALSE); g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) __folks_individual_aggregator_backend_available_cb_folks_backend_store_backend_available, self); - _g_object_unref0 (self->priv->_backend_store); - self->priv->_backend_store = NULL; _tmp2_ = self->priv->_debug; g_signal_parse_name ("print-status", FOLKS_TYPE_DEBUG, &_tmp3_, NULL, FALSE); g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) __folks_individual_aggregator_debug_print_status_folks_debug_print_status, self); diff -Nru folks-0.6.6/folks/individual-aggregator.vala folks-0.6.7/folks/individual-aggregator.vala --- folks-0.6.6/folks/individual-aggregator.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/folks/individual-aggregator.vala 2012-02-18 00:14:19.000000000 +0000 @@ -185,7 +185,7 @@ * * @since 0.3.0 */ - public Individual user { get; private set; } + public Individual? user { get; private set; } /** * Emitted when one or more {@link Individual}s are added to or removed from @@ -303,7 +303,7 @@ if (store_config_ids != null) { debug ("Setting primary store IDs from environment variable."); - this._configure_primary_store (store_config_ids); + this._configure_primary_store ((!) store_config_ids); } else { @@ -325,8 +325,13 @@ GConf.Value? val = client.get (this._FOLKS_CONFIG_KEY); if (val != null) { - debug ("Setting primary store IDs from GConf."); - this._configure_primary_store (val.get_string ()); + string? val_str = ((!) val).get_string (); + + if (val_str != null) + { + debug ("Setting primary store IDs from GConf."); + this._configure_primary_store ((!) val_str); + } } } catch (GLib.Error e) @@ -341,20 +346,21 @@ var disable_linking = Environment.get_variable ("FOLKS_DISABLE_LINKING"); if (disable_linking != null) - disable_linking = disable_linking.strip ().down (); + disable_linking = ((!) disable_linking).strip ().down (); this._linking_enabled = (disable_linking == null || disable_linking == "no" || disable_linking == "0"); this._backend_store = BackendStore.dup (); - this._backend_store.backend_available.connect ( - this._backend_available_cb); + + debug ("Constructing IndividualAggregator %p", this); } ~IndividualAggregator () { + debug ("Destroying IndividualAggregator %p", this); + this._backend_store.backend_available.disconnect ( this._backend_available_cb); - this._backend_store = null; this._debug.print_status.disconnect (this._debug_print_status); } @@ -403,7 +409,7 @@ foreach (var individual in this.individuals.values) { - string trust_level = null; + string? trust_level = null; switch (individual.trust_level) { @@ -501,10 +507,33 @@ { this._prepare_pending = true; + this._backend_store.backend_available.connect ( + this._backend_available_cb); + + /* Load any backends which already exist. This could happen if the + * BackendStore has stayed alive after being used by a previous + * IndividualAggregator instance. */ + var backends = this._backend_store.enabled_backends.values; + foreach (var backend in backends) + { + this._backend_available_cb (this._backend_store, backend); + } + + /* Load any backends which haven't been loaded already. (Typically + * all of them.) */ yield this._backend_store.load_backends (); this._is_prepared = true; this.notify_property ("is-prepared"); + + /* Mark the aggregator as having reached a quiescent state if + * appropriate. This will typically only happen here in cases + * where the stores were all prepared and quiescent before the + * aggregator was created. */ + if (this._is_quiescent == false) + { + this._notify_if_is_quiescent (); + } } finally { @@ -569,22 +598,34 @@ for (var i = 0; i < individuals.length; i++) { var a = individuals[i]; - var matches_a = matches.get (a); - if (matches_a == null) + + HashMap? _matches_a = matches.get (a); + HashMap matches_a; + if (_matches_a == null) { matches_a = new HashMap (); matches.set (a, matches_a); } + else + { + matches_a = (!) _matches_a; + } for (var f = i + 1; f < individuals.length; f++) { var b = individuals[f]; - var matches_b = matches.get (b); - if (matches_b == null) + + HashMap? _matches_b = matches.get (b); + HashMap matches_b; + if (_matches_b == null) { matches_b = new HashMap (); matches.set (b, matches_b); } + else + { + matches_b = (!) _matches_b; + } var result = matchObj.potential_match (a, b); @@ -664,16 +705,16 @@ var previous_store = this._primary_store; this._primary_store = store; - this._primary_store.freeze_notify (); + store.freeze_notify (); if (previous_store != null) { - previous_store.freeze_notify (); - previous_store.is_primary_store = false; + ((!) previous_store).freeze_notify (); + ((!) previous_store).is_primary_store = false; } - this._primary_store.is_primary_store = true; + store.is_primary_store = true; if (previous_store != null) - previous_store.thaw_notify (); - this._primary_store.thaw_notify (); + ((!) previous_store).thaw_notify (); + store.thaw_notify (); this.notify_property ("primary-store"); } @@ -683,6 +724,9 @@ private void _backend_persona_store_added_cb (Backend backend, PersonaStore store) { + debug ("_backend_persona_store_added_cb(): backend: %s, store: %s (%p)", + backend.name, store.id, store); + var store_id = this._get_store_full_id (store.type_id, store.id); this._maybe_configure_as_primary (store); @@ -707,6 +751,24 @@ this._non_quiescent_persona_store_count++; } + /* Handle any pre-existing personas in the store. This can happen if the + * store existed (and was prepared) before this IndividualAggregator was + * constructed. */ + if (store.personas.size > 0) + { + var persona_set = new HashSet (); + foreach (var p in store.personas.values) + { + persona_set.add (p); + } + + this._personas_changed_cb (store, persona_set, + new HashSet (), null, null, + GroupDetails.ChangeReason.NONE); + } + + /* Prepare the store and receive a load of other personas-changed + * signals. */ store.prepare.begin ((obj, result) => { try @@ -771,26 +833,26 @@ Persona? actor = null, GroupDetails.ChangeReason reason = GroupDetails.ChangeReason.NONE) { - var _added = added; - var _removed = removed; - var _changes = changes; - - if ((added == null || added.size == 0) && - (removed == null || removed.size == 0) && - (changes == null || changes.size == 0)) + Set _added; + Set _removed; + MultiMap _changes; + + if ((added == null || ((!) added).size == 0) && + (removed == null || ((!) removed).size == 0) && + (changes == null || ((!) changes).size == 0)) { /* Don't bother emitting it if nothing's changed */ return; } - else if (added == null) - { - _added = new HashSet (); - } - else if (removed == null) + + _added = (added != null) ? (!) added : new HashSet (); + _removed = (removed != null) ? (!) removed : new HashSet (); + + if (changes != null) { - _removed = new HashSet (); + _changes = (!) changes; } - else if (changes == null) + else { _changes = new HashMultiMap (); } @@ -806,14 +868,15 @@ foreach (var added_ind in _changes.get (removed_ind)) { debug (" %s (%p) → %s (%p)", - (removed_ind != null) ? removed_ind.id : "", removed_ind, - (added_ind != null) ? added_ind.id : "", added_ind); + (removed_ind != null) ? ((!) removed_ind).id : "", + removed_ind, + (added_ind != null) ? ((!) added_ind).id : "", added_ind); if (removed_ind != null) { debug (" Removed individual's personas:"); - foreach (var p in removed_ind.personas) + foreach (var p in ((!) removed_ind).personas) { debug (" %s (%p)", p.uid, p); } @@ -823,7 +886,7 @@ { debug (" Added individual's personas:"); - foreach (var p in added_ind.personas) + foreach (var p in ((!) added_ind).personas) { debug (" %s (%p)", p.uid, p); } @@ -849,7 +912,7 @@ individual.removed.disconnect (this._individual_removed_cb); } - private void _add_personas (Set added, ref Individual user, + private void _add_personas (Set added, ref Individual? user, ref HashMultiMap individuals_changes) { foreach (var persona in added) @@ -867,7 +930,6 @@ HashSet candidate_inds = new HashSet (); var final_personas = new HashSet (); - Individual final_individual = null; debug ("Aggregating persona '%s' on '%s'.", persona.uid, persona.iid); @@ -875,22 +937,23 @@ * existing this.user. */ if (persona.is_user == true && user != null) { - debug (" Found candidate individual '%s' as user.", user.id); - candidate_inds.add (user); + debug (" Found candidate individual '%s' as user.", + ((!) user).id); + candidate_inds.add ((!) user); } /* If we don't trust the PersonaStore at all, we can't link the * Persona to any existing Individual */ if (trust_level != PersonaStoreTrust.NONE) { - var candidate_ind = this._link_map.lookup (persona.iid); + Individual? candidate_ind = this._link_map.lookup (persona.iid); if (candidate_ind != null && - candidate_ind.trust_level != TrustLevel.NONE && - !candidate_inds.contains (candidate_ind)) + ((!) candidate_ind).trust_level != TrustLevel.NONE && + !candidate_inds.contains ((!) candidate_ind)) { debug (" Found candidate individual '%s' by IID '%s'.", - candidate_ind.id, persona.iid); - candidate_inds.add (candidate_ind); + ((!) candidate_ind).id, persona.iid); + candidate_inds.add ((!) candidate_ind); } } @@ -919,17 +982,18 @@ persona.linkable_property_to_links (prop_name, (l) => { unowned string prop_linking_value = l; - var candidate_ind = + Individual? candidate_ind = this._link_map.lookup (prop_linking_value); if (candidate_ind != null && - candidate_ind.trust_level != TrustLevel.NONE && - !candidate_inds.contains (candidate_ind)) + ((!) candidate_ind).trust_level != TrustLevel.NONE && + !candidate_inds.contains ((!) candidate_ind)) { debug (" Found candidate individual '%s' by " + "linkable property '%s' = '%s'.", - candidate_ind.id, prop_name, prop_linking_value); - candidate_inds.add (candidate_ind); + ((!) candidate_ind).id, prop_name, + prop_linking_value); + candidate_inds.add ((!) candidate_ind); } }); } @@ -960,7 +1024,7 @@ } /* Create the final linked Individual */ - final_individual = new Individual (final_personas); + var final_individual = new Individual (final_personas); debug (" Created new individual '%s' (%p) with personas:", final_individual.id, final_individual); foreach (var p in final_personas) @@ -976,7 +1040,7 @@ /* Transitively update the individuals_changes. We have to do this * in two stages as we can't modify individuals_changes while * iterating over it. */ - var transitive_updates = new HashSet (); + var transitive_updates = new HashSet (); foreach (var k in individuals_changes.get_keys ()) { @@ -1033,7 +1097,7 @@ * changed, so that persona might require re-linking. We do this in a * simplistic and hacky way (which should work) by simply treating the * persona as if it's been removed and re-added. */ - var persona = obj as Persona; + var persona = (!) (obj as Persona); debug ("Linkable property '%s' changed for persona '%s' " + "(is user: %s, IID: %s).", pspec.name, persona.uid, @@ -1162,10 +1226,10 @@ /* Find the Individual containing the Persona (if any) and mark them * for removal (any other Personas they have which aren't being * removed will be re-linked into other Individuals). */ - var ind = this._link_map.lookup (persona.iid); + Individual? ind = this._link_map.lookup (persona.iid); if (ind != null) { - removed_individuals.add (ind); + removed_individuals.add ((!) ind); } /* Stop listening to notifications about the persona's linkable @@ -1279,18 +1343,18 @@ if (old_ind != null) { - removed_individuals.add (old_ind); + removed_individuals.add ((!) old_ind); } if (new_ind != null) { - added_individuals.add (new_ind); - this._connect_to_individual (new_ind); + added_individuals.add ((!) new_ind); + this._connect_to_individual ((!) new_ind); } if (old_ind != null && new_ind != null) { - replaced_individuals.set (old_ind, new_ind); + replaced_individuals.set ((!) old_ind, (!) new_ind); } } } @@ -1309,7 +1373,7 @@ var new_ind = iter.get_value (); debug (" %s (%p) → %s (%p)", old_ind.id, old_ind, - (new_ind != null) ? new_ind.id : "", new_ind); + new_ind.id, new_ind); old_ind.replace (new_ind); } @@ -1438,7 +1502,7 @@ if (replacement != null) { debug ("Individual '%s' removed (replaced by '%s')", i.id, - replacement.id); + ((!) replacement).id); } else { @@ -1493,7 +1557,7 @@ PersonaStore persona_store, HashTable details) throws IndividualAggregatorError { - Persona persona = null; + Persona? persona = null; try { var details_copy = this._asv_copy (details); @@ -1520,7 +1584,7 @@ if (parent != null && persona != null) { - parent.personas.add (persona); + ((!) parent).personas.add ((!) persona); } return persona; @@ -1594,7 +1658,11 @@ if (this._primary_store == null) { throw new IndividualAggregatorError.NO_PRIMARY_STORE ( - _("Can't link personas with no primary store.")); + _("Can’t link personas with no primary store.") + "\n" + + _("Persona store ‘%s:%s’ is configured as primary, but could not be found or failed to load.") + "\n" + + _("Check the service providing the persona store is running, or change the default store in that service or using the “%s” GConf key."), + this._configured_primary_store_type_id, + this._configured_primary_store_id, this._FOLKS_CONFIG_KEY); } /* Don't bother linking if it's just one Persona */ @@ -1610,7 +1678,7 @@ /* Create a new persona in the primary store which links together the * given personas */ - assert (this._primary_store.type_id == + assert (((!) this._primary_store).type_id == this._configured_primary_store_type_id); /* `protocols_addrs_set` will be passed to the new Kf.Persona */ @@ -1676,7 +1744,8 @@ { var im_addresses_value = Value (typeof (MultiMap)); im_addresses_value.set_object (protocols_addrs_set); - details.insert (PersonaStore.detail_key (PersonaDetail.IM_ADDRESSES), + details.insert ( + (!) PersonaStore.detail_key (PersonaDetail.IM_ADDRESSES), im_addresses_value); } @@ -1684,22 +1753,22 @@ { var web_service_addresses_value = Value (typeof (MultiMap)); web_service_addresses_value.set_object (web_service_addrs_set); - details.insert (PersonaStore.detail_key - (PersonaDetail.WEB_SERVICE_ADDRESSES), + details.insert ( + (!) PersonaStore.detail_key (PersonaDetail.WEB_SERVICE_ADDRESSES), web_service_addresses_value); } if (local_ids.size > 0) { - var local_ids_value = Value (typeof (Set)); + var local_ids_value = Value (typeof (Set)); local_ids_value.set_object (local_ids); details.insert ( - Folks.PersonaStore.detail_key (PersonaDetail.LOCAL_IDS), + (!) Folks.PersonaStore.detail_key (PersonaDetail.LOCAL_IDS), local_ids_value); } yield this.add_persona_from_details (null, - this._primary_store, details); + (!) this._primary_store, details); } /** @@ -1746,11 +1815,13 @@ foreach (var persona in personas) { + /* Since persona.store != null, we know that + * this._primary_store != null. */ if (persona.store == this._primary_store) { debug (" %s (is user: %s, IID: %s)", persona.uid, persona.is_user ? "yes" : "no", persona.iid); - yield this._primary_store.remove_persona (persona); + yield ((!) this._primary_store).remove_persona (persona); } } } @@ -1806,13 +1877,14 @@ Persona? new_persona = null; if (this._primary_store != null && - property_name in this._primary_store.always_writeable_properties) + property_name in + ((!) this._primary_store).always_writeable_properties) { try { debug (" Using writeable store"); new_persona = yield this.add_persona_from_details (null, - this._primary_store, details); + (!) this._primary_store, details); } catch (IndividualAggregatorError e1) { @@ -1851,7 +1923,11 @@ if (new_persona == null && this._primary_store == null) { throw new IndividualAggregatorError.NO_PRIMARY_STORE ( - _("Can't add personas with no primary store.")); + _("Can’t add personas with no primary store.") + "\n" + + _("Persona store ‘%s:%s’ is configured as primary, but could not be found or failed to load.") + "\n" + + _("Check the service providing the persona store is running, or change the default store in that service or using the “%s” GConf key."), + this._configured_primary_store_type_id, + this._configured_primary_store_id, this._FOLKS_CONFIG_KEY); } else if (new_persona == null) { @@ -1860,9 +1936,10 @@ property_name); } - /* Link the persona to the existing individual */ + /* Link the persona to the existing individual. We can guarantee + * new_persona != null because we'd have bailed out above otherwise. */ var linking_personas = new HashSet (); - linking_personas.add (new_persona); + linking_personas.add ((!) new_persona); foreach (var p2 in individual.personas) { @@ -1873,6 +1950,6 @@ property_name); yield this.link_personas (linking_personas); - return new_persona; + return (!) new_persona; } } diff -Nru folks-0.6.6/folks/individual.c folks-0.6.7/folks/individual.c --- folks-0.6.6/folks/individual.c 2011-12-13 23:39:15.000000000 +0000 +++ folks-0.6.7/folks/individual.c 2012-02-23 00:01:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* individual.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* individual.c generated by valac 0.15.1, the Vala compiler * generated from individual.vala, do not modify */ /* @@ -583,15 +583,16 @@ FolksPersona* p; FolksPersona* _tmp20_; FolksAvatarDetails* _tmp21_; - FolksAvatarDetails* a; - gboolean _tmp22_; + FolksAvatarDetails* _a; + FolksAvatarDetails* _tmp22_; FolksAvatarDetails* _tmp23_; - FolksPersona* _tmp24_; - gchar** _tmp25_; - gint _tmp25__length1; + FolksAvatarDetails* _tmp24_; + FolksAvatarDetails* a; + FolksPersona* _tmp25_; gchar** _tmp26_; gint _tmp26__length1; - gboolean _tmp27_; + gchar** _tmp27_; + gint _tmp27__length1; FolksAvatarDetails* _tmp28_; GLoadableIcon* _tmp29_; FolksPersona* _tmp30_; @@ -631,15 +632,16 @@ FolksPersona* p; FolksPersona* _tmp10_; FolksAliasDetails* _tmp11_; - FolksAliasDetails* a; - gboolean _tmp12_; + FolksAliasDetails* _a; + FolksAliasDetails* _tmp12_; FolksAliasDetails* _tmp13_; - FolksPersona* _tmp14_; - gchar** _tmp15_; - gint _tmp15__length1; + FolksAliasDetails* _tmp14_; + FolksAliasDetails* a; + FolksPersona* _tmp15_; gchar** _tmp16_; gint _tmp16__length1; - gboolean _tmp17_; + gchar** _tmp17_; + gint _tmp17__length1; FolksAliasDetails* _tmp18_; const gchar* _tmp19_; FolksPersona* _tmp20_; @@ -682,15 +684,16 @@ FolksPersona* p; FolksPersona* _tmp11_; FolksNameDetails* _tmp12_; - FolksNameDetails* n; - gboolean _tmp13_; + FolksNameDetails* _n; + FolksNameDetails* _tmp13_; FolksNameDetails* _tmp14_; - FolksPersona* _tmp15_; - gchar** _tmp16_; - gint _tmp16__length1; + FolksNameDetails* _tmp15_; + FolksNameDetails* n; + FolksPersona* _tmp16_; gchar** _tmp17_; gint _tmp17__length1; - gboolean _tmp18_; + gchar** _tmp18_; + gint _tmp18__length1; FolksNameDetails* _tmp19_; const gchar* _tmp20_; FolksPersona* _tmp21_; @@ -734,15 +737,16 @@ FolksPersona* p; FolksPersona* _tmp12_; FolksFavouriteDetails* _tmp13_; - FolksFavouriteDetails* a; - gboolean _tmp14_; + FolksFavouriteDetails* _a; + FolksFavouriteDetails* _tmp14_; FolksFavouriteDetails* _tmp15_; - FolksPersona* _tmp16_; - gchar** _tmp17_; - gint _tmp17__length1; + FolksFavouriteDetails* _tmp16_; + FolksFavouriteDetails* a; + FolksPersona* _tmp17_; gchar** _tmp18_; gint _tmp18__length1; - gboolean _tmp19_; + gchar** _tmp19_; + gint _tmp19__length1; FolksFavouriteDetails* _tmp20_; gboolean _tmp21_; FolksPersona* _tmp22_; @@ -780,15 +784,16 @@ FolksPersona* p; FolksPersona* _tmp7_; FolksGroupDetails* _tmp8_; - FolksGroupDetails* g; - gboolean _tmp9_; + FolksGroupDetails* _g; + FolksGroupDetails* _tmp9_; FolksGroupDetails* _tmp10_; - FolksPersona* _tmp11_; - gchar** _tmp12_; - gint _tmp12__length1; + FolksGroupDetails* _tmp11_; + FolksGroupDetails* g; + FolksPersona* _tmp12_; gchar** _tmp13_; gint _tmp13__length1; - gboolean _tmp14_; + gchar** _tmp14_; + gint _tmp14__length1; FolksGroupDetails* _tmp15_; GeeSet* _tmp16_; FolksPersona* _tmp17_; @@ -1332,7 +1337,7 @@ _data_->_tmp3_ = _data_->self->priv->_avatar; _data_->_tmp4_ = _data_->avatar; _data_->_tmp5_ = FALSE; - _data_->_tmp5_ = g_icon_equal ((GIcon*) _data_->_tmp3_, (GIcon*) _data_->_tmp4_); + _data_->_tmp5_ = g_icon_equal ((GIcon*) G_LOADABLE_ICON (_data_->_tmp3_), (GIcon*) _data_->_tmp4_); _data_->_tmp1_ = _data_->_tmp5_; } else { _data_->_tmp1_ = FALSE; @@ -1384,19 +1389,21 @@ _data_->p = (FolksPersona*) _data_->_tmp19_; _data_->_tmp20_ = _data_->p; _data_->_tmp21_ = _g_object_ref0 (FOLKS_IS_AVATAR_DETAILS (_data_->_tmp20_) ? ((FolksAvatarDetails*) _data_->_tmp20_) : NULL); - _data_->a = _data_->_tmp21_; - _data_->_tmp23_ = _data_->a; - if (_data_->_tmp23_ != NULL) { - _data_->_tmp24_ = _data_->p; - _data_->_tmp25_ = folks_persona_get_writeable_properties (_data_->_tmp24_, &_data_->_tmp25__length1); - _data_->_tmp26_ = _data_->_tmp25_; - _data_->_tmp26__length1 = _data_->_tmp25__length1; - _data_->_tmp22_ = _vala_string_array_contains (_data_->_tmp26_, _data_->_tmp26__length1, "avatar"); - } else { - _data_->_tmp22_ = FALSE; - } - _data_->_tmp27_ = _data_->_tmp22_; - if (_data_->_tmp27_) { + _data_->_a = _data_->_tmp21_; + _data_->_tmp22_ = _data_->_a; + if (_data_->_tmp22_ == NULL) { + _g_object_unref0 (_data_->_a); + _g_object_unref0 (_data_->p); + continue; + } + _data_->_tmp23_ = _data_->_a; + _data_->_tmp24_ = _g_object_ref0 (FOLKS_AVATAR_DETAILS (_data_->_tmp23_)); + _data_->a = _data_->_tmp24_; + _data_->_tmp25_ = _data_->p; + _data_->_tmp26_ = folks_persona_get_writeable_properties (_data_->_tmp25_, &_data_->_tmp26__length1); + _data_->_tmp27_ = _data_->_tmp26_; + _data_->_tmp27__length1 = _data_->_tmp26__length1; + if (_vala_string_array_contains (_data_->_tmp27_, _data_->_tmp27__length1, "avatar")) { { _data_->_tmp28_ = _data_->a; _data_->_tmp29_ = _data_->avatar; @@ -1410,6 +1417,7 @@ goto __catch9_folks_property_error; } _g_object_unref0 (_data_->a); + _g_object_unref0 (_data_->_a); _g_object_unref0 (_data_->p); _g_object_unref0 (_data_->_p_it); _g_error_free0 (_data_->persona_error); @@ -1420,7 +1428,7 @@ _data_->_tmp30_ = _data_->p; _data_->_tmp31_ = folks_persona_get_uid (_data_->_tmp30_); _data_->_tmp32_ = _data_->_tmp31_; - g_debug ("individual.vala:183: written to writeable persona '%s'", _data_->_tmp32_); + g_debug ("individual.vala:189: written to writeable persona '%s'", _data_->_tmp32_); _data_->avatar_changed = TRUE; } goto __finally9; @@ -1443,6 +1451,7 @@ g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); g_error_free (_data_->_inner_error_); _g_object_unref0 (_data_->a); + _g_object_unref0 (_data_->_a); _g_object_unref0 (_data_->p); _g_object_unref0 (_data_->_p_it); _g_error_free0 (_data_->persona_error); @@ -1455,6 +1464,7 @@ return FALSE; } else { _g_object_unref0 (_data_->a); + _g_object_unref0 (_data_->_a); _g_object_unref0 (_data_->p); _g_object_unref0 (_data_->_p_it); _g_error_free0 (_data_->persona_error); @@ -1465,6 +1475,7 @@ } } _g_object_unref0 (_data_->a); + _g_object_unref0 (_data_->_a); _g_object_unref0 (_data_->p); } _g_object_unref0 (_data_->_p_it); @@ -1519,7 +1530,7 @@ FolksIndividualChangeAliasData* _data_; FolksIndividual* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; self = (FolksIndividual*) base; _data_ = g_slice_new0 (FolksIndividualChangeAliasData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, folks_individual_real_change_alias); @@ -1579,7 +1590,7 @@ } _data_->_tmp2_ = _data_->self->priv->_id; _data_->_tmp3_ = _data_->alias; - g_debug ("individual.vala:304: Setting alias of individual '%s' to '%s'…", _data_->_tmp2_, _data_->_tmp3_); + g_debug ("individual.vala:310: Setting alias of individual '%s' to '%s'…", _data_->_tmp2_, _data_->_tmp3_); _data_->persona_error = NULL; _data_->alias_changed = FALSE; { @@ -1600,19 +1611,21 @@ _data_->p = (FolksPersona*) _data_->_tmp9_; _data_->_tmp10_ = _data_->p; _data_->_tmp11_ = _g_object_ref0 (FOLKS_IS_ALIAS_DETAILS (_data_->_tmp10_) ? ((FolksAliasDetails*) _data_->_tmp10_) : NULL); - _data_->a = _data_->_tmp11_; - _data_->_tmp13_ = _data_->a; - if (_data_->_tmp13_ != NULL) { - _data_->_tmp14_ = _data_->p; - _data_->_tmp15_ = folks_persona_get_writeable_properties (_data_->_tmp14_, &_data_->_tmp15__length1); - _data_->_tmp16_ = _data_->_tmp15_; - _data_->_tmp16__length1 = _data_->_tmp15__length1; - _data_->_tmp12_ = _vala_string_array_contains (_data_->_tmp16_, _data_->_tmp16__length1, "alias"); - } else { - _data_->_tmp12_ = FALSE; - } - _data_->_tmp17_ = _data_->_tmp12_; - if (_data_->_tmp17_) { + _data_->_a = _data_->_tmp11_; + _data_->_tmp12_ = _data_->_a; + if (_data_->_tmp12_ == NULL) { + _g_object_unref0 (_data_->_a); + _g_object_unref0 (_data_->p); + continue; + } + _data_->_tmp13_ = _data_->_a; + _data_->_tmp14_ = _g_object_ref0 (FOLKS_ALIAS_DETAILS (_data_->_tmp13_)); + _data_->a = _data_->_tmp14_; + _data_->_tmp15_ = _data_->p; + _data_->_tmp16_ = folks_persona_get_writeable_properties (_data_->_tmp15_, &_data_->_tmp16__length1); + _data_->_tmp17_ = _data_->_tmp16_; + _data_->_tmp17__length1 = _data_->_tmp16__length1; + if (_vala_string_array_contains (_data_->_tmp17_, _data_->_tmp17__length1, "alias")) { { _data_->_tmp18_ = _data_->a; _data_->_tmp19_ = _data_->alias; @@ -1626,6 +1639,7 @@ goto __catch10_folks_property_error; } _g_object_unref0 (_data_->a); + _g_object_unref0 (_data_->_a); _g_object_unref0 (_data_->p); _g_object_unref0 (_data_->_p_it); _g_error_free0 (_data_->persona_error); @@ -1636,7 +1650,7 @@ _data_->_tmp20_ = _data_->p; _data_->_tmp21_ = folks_persona_get_uid (_data_->_tmp20_); _data_->_tmp22_ = _data_->_tmp21_; - g_debug ("individual.vala:319: written to writeable persona '%s'", _data_->_tmp22_); + g_debug ("individual.vala:331: written to writeable persona '%s'", _data_->_tmp22_); _data_->alias_changed = TRUE; } goto __finally10; @@ -1659,6 +1673,7 @@ g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); g_error_free (_data_->_inner_error_); _g_object_unref0 (_data_->a); + _g_object_unref0 (_data_->_a); _g_object_unref0 (_data_->p); _g_object_unref0 (_data_->_p_it); _g_error_free0 (_data_->persona_error); @@ -1671,6 +1686,7 @@ return FALSE; } else { _g_object_unref0 (_data_->a); + _g_object_unref0 (_data_->_a); _g_object_unref0 (_data_->p); _g_object_unref0 (_data_->_p_it); _g_error_free0 (_data_->persona_error); @@ -1681,6 +1697,7 @@ } } _g_object_unref0 (_data_->a); + _g_object_unref0 (_data_->_a); _g_object_unref0 (_data_->p); } _g_object_unref0 (_data_->_p_it); @@ -1740,7 +1757,7 @@ FolksIndividualChangeNicknameData* _data_; FolksIndividual* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; self = (FolksIndividual*) base; _data_ = g_slice_new0 (FolksIndividualChangeNicknameData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, folks_individual_real_change_nickname); @@ -1804,7 +1821,7 @@ } _data_->_tmp3_ = _data_->self->priv->_id; _data_->_tmp4_ = _data_->nickname; - g_debug ("individual.vala:400: Setting nickname of individual '%s' to '%s'…", _data_->_tmp3_, _data_->_tmp4_); + g_debug ("individual.vala:412: Setting nickname of individual '%s' to '%s'…", _data_->_tmp3_, _data_->_tmp4_); _data_->persona_error = NULL; _data_->nickname_changed = FALSE; { @@ -1825,19 +1842,21 @@ _data_->p = (FolksPersona*) _data_->_tmp10_; _data_->_tmp11_ = _data_->p; _data_->_tmp12_ = _g_object_ref0 (FOLKS_IS_NAME_DETAILS (_data_->_tmp11_) ? ((FolksNameDetails*) _data_->_tmp11_) : NULL); - _data_->n = _data_->_tmp12_; - _data_->_tmp14_ = _data_->n; - if (_data_->_tmp14_ != NULL) { - _data_->_tmp15_ = _data_->p; - _data_->_tmp16_ = folks_persona_get_writeable_properties (_data_->_tmp15_, &_data_->_tmp16__length1); - _data_->_tmp17_ = _data_->_tmp16_; - _data_->_tmp17__length1 = _data_->_tmp16__length1; - _data_->_tmp13_ = _vala_string_array_contains (_data_->_tmp17_, _data_->_tmp17__length1, "nickname"); - } else { - _data_->_tmp13_ = FALSE; - } - _data_->_tmp18_ = _data_->_tmp13_; - if (_data_->_tmp18_) { + _data_->_n = _data_->_tmp12_; + _data_->_tmp13_ = _data_->_n; + if (_data_->_tmp13_ == NULL) { + _g_object_unref0 (_data_->_n); + _g_object_unref0 (_data_->p); + continue; + } + _data_->_tmp14_ = _data_->_n; + _data_->_tmp15_ = _g_object_ref0 (FOLKS_NAME_DETAILS (_data_->_tmp14_)); + _data_->n = _data_->_tmp15_; + _data_->_tmp16_ = _data_->p; + _data_->_tmp17_ = folks_persona_get_writeable_properties (_data_->_tmp16_, &_data_->_tmp17__length1); + _data_->_tmp18_ = _data_->_tmp17_; + _data_->_tmp18__length1 = _data_->_tmp17__length1; + if (_vala_string_array_contains (_data_->_tmp18_, _data_->_tmp18__length1, "nickname")) { { _data_->_tmp19_ = _data_->n; _data_->_tmp20_ = _data_->nickname; @@ -1851,6 +1870,7 @@ goto __catch11_folks_property_error; } _g_object_unref0 (_data_->n); + _g_object_unref0 (_data_->_n); _g_object_unref0 (_data_->p); _g_object_unref0 (_data_->_p_it); _g_error_free0 (_data_->persona_error); @@ -1861,7 +1881,7 @@ _data_->_tmp21_ = _data_->p; _data_->_tmp22_ = folks_persona_get_uid (_data_->_tmp21_); _data_->_tmp23_ = _data_->_tmp22_; - g_debug ("individual.vala:415: written to writeable persona '%s'", _data_->_tmp23_); + g_debug ("individual.vala:433: written to writeable persona '%s'", _data_->_tmp23_); _data_->nickname_changed = TRUE; } goto __finally11; @@ -1884,6 +1904,7 @@ g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); g_error_free (_data_->_inner_error_); _g_object_unref0 (_data_->n); + _g_object_unref0 (_data_->_n); _g_object_unref0 (_data_->p); _g_object_unref0 (_data_->_p_it); _g_error_free0 (_data_->persona_error); @@ -1896,6 +1917,7 @@ return FALSE; } else { _g_object_unref0 (_data_->n); + _g_object_unref0 (_data_->_n); _g_object_unref0 (_data_->p); _g_object_unref0 (_data_->_p_it); _g_error_free0 (_data_->persona_error); @@ -1906,6 +1928,7 @@ } } _g_object_unref0 (_data_->n); + _g_object_unref0 (_data_->_n); _g_object_unref0 (_data_->p); } _g_object_unref0 (_data_->_p_it); @@ -2028,7 +2051,7 @@ } _data_->_tmp4_ = _data_->self->priv->_id; _data_->_tmp5_ = _data_->_tmp2_; - g_debug ("individual.vala:610: Setting '%s' favourite status to %s…", _data_->_tmp4_, _data_->_tmp5_); + g_debug ("individual.vala:628: Setting '%s' favourite status to %s…", _data_->_tmp4_, _data_->_tmp5_); _data_->persona_error = NULL; _data_->is_favourite_changed = FALSE; { @@ -2049,19 +2072,21 @@ _data_->p = (FolksPersona*) _data_->_tmp11_; _data_->_tmp12_ = _data_->p; _data_->_tmp13_ = _g_object_ref0 (FOLKS_IS_FAVOURITE_DETAILS (_data_->_tmp12_) ? ((FolksFavouriteDetails*) _data_->_tmp12_) : NULL); - _data_->a = _data_->_tmp13_; - _data_->_tmp15_ = _data_->a; - if (_data_->_tmp15_ != NULL) { - _data_->_tmp16_ = _data_->p; - _data_->_tmp17_ = folks_persona_get_writeable_properties (_data_->_tmp16_, &_data_->_tmp17__length1); - _data_->_tmp18_ = _data_->_tmp17_; - _data_->_tmp18__length1 = _data_->_tmp17__length1; - _data_->_tmp14_ = _vala_string_array_contains (_data_->_tmp18_, _data_->_tmp18__length1, "is-favourite"); - } else { - _data_->_tmp14_ = FALSE; - } - _data_->_tmp19_ = _data_->_tmp14_; - if (_data_->_tmp19_) { + _data_->_a = _data_->_tmp13_; + _data_->_tmp14_ = _data_->_a; + if (_data_->_tmp14_ == NULL) { + _g_object_unref0 (_data_->_a); + _g_object_unref0 (_data_->p); + continue; + } + _data_->_tmp15_ = _data_->_a; + _data_->_tmp16_ = _g_object_ref0 (FOLKS_FAVOURITE_DETAILS (_data_->_tmp15_)); + _data_->a = _data_->_tmp16_; + _data_->_tmp17_ = _data_->p; + _data_->_tmp18_ = folks_persona_get_writeable_properties (_data_->_tmp17_, &_data_->_tmp18__length1); + _data_->_tmp19_ = _data_->_tmp18_; + _data_->_tmp19__length1 = _data_->_tmp18__length1; + if (_vala_string_array_contains (_data_->_tmp19_, _data_->_tmp19__length1, "is-favourite")) { { _data_->_tmp20_ = _data_->a; _data_->_tmp21_ = _data_->is_favourite; @@ -2075,6 +2100,7 @@ goto __catch12_folks_property_error; } _g_object_unref0 (_data_->a); + _g_object_unref0 (_data_->_a); _g_object_unref0 (_data_->p); _g_object_unref0 (_data_->_p_it); _g_error_free0 (_data_->persona_error); @@ -2085,7 +2111,7 @@ _data_->_tmp22_ = _data_->p; _data_->_tmp23_ = folks_persona_get_uid (_data_->_tmp22_); _data_->_tmp24_ = _data_->_tmp23_; - g_debug ("individual.vala:630: written to persona '%s'", _data_->_tmp24_); + g_debug ("individual.vala:654: written to persona '%s'", _data_->_tmp24_); _data_->is_favourite_changed = TRUE; } goto __finally12; @@ -2108,6 +2134,7 @@ g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); g_error_free (_data_->_inner_error_); _g_object_unref0 (_data_->a); + _g_object_unref0 (_data_->_a); _g_object_unref0 (_data_->p); _g_object_unref0 (_data_->_p_it); _g_error_free0 (_data_->persona_error); @@ -2120,6 +2147,7 @@ return FALSE; } else { _g_object_unref0 (_data_->a); + _g_object_unref0 (_data_->_a); _g_object_unref0 (_data_->p); _g_object_unref0 (_data_->_p_it); _g_error_free0 (_data_->persona_error); @@ -2130,6 +2158,7 @@ } } _g_object_unref0 (_data_->a); + _g_object_unref0 (_data_->_a); _g_object_unref0 (_data_->p); } _g_object_unref0 (_data_->_p_it); @@ -2235,7 +2264,7 @@ } _state_0: _data_->_tmp0_ = _data_->self->priv->_id; - g_debug ("individual.vala:677: Setting '%s' groups…", _data_->_tmp0_); + g_debug ("individual.vala:701: Setting '%s' groups…", _data_->_tmp0_); _data_->persona_error = NULL; _data_->groups_changed = FALSE; { @@ -2256,19 +2285,21 @@ _data_->p = (FolksPersona*) _data_->_tmp6_; _data_->_tmp7_ = _data_->p; _data_->_tmp8_ = _g_object_ref0 (FOLKS_IS_GROUP_DETAILS (_data_->_tmp7_) ? ((FolksGroupDetails*) _data_->_tmp7_) : NULL); - _data_->g = _data_->_tmp8_; - _data_->_tmp10_ = _data_->g; - if (_data_->_tmp10_ != NULL) { - _data_->_tmp11_ = _data_->p; - _data_->_tmp12_ = folks_persona_get_writeable_properties (_data_->_tmp11_, &_data_->_tmp12__length1); - _data_->_tmp13_ = _data_->_tmp12_; - _data_->_tmp13__length1 = _data_->_tmp12__length1; - _data_->_tmp9_ = _vala_string_array_contains (_data_->_tmp13_, _data_->_tmp13__length1, "groups"); - } else { - _data_->_tmp9_ = FALSE; - } - _data_->_tmp14_ = _data_->_tmp9_; - if (_data_->_tmp14_) { + _data_->_g = _data_->_tmp8_; + _data_->_tmp9_ = _data_->_g; + if (_data_->_tmp9_ == NULL) { + _g_object_unref0 (_data_->_g); + _g_object_unref0 (_data_->p); + continue; + } + _data_->_tmp10_ = _data_->_g; + _data_->_tmp11_ = _g_object_ref0 (FOLKS_GROUP_DETAILS (_data_->_tmp10_)); + _data_->g = _data_->_tmp11_; + _data_->_tmp12_ = _data_->p; + _data_->_tmp13_ = folks_persona_get_writeable_properties (_data_->_tmp12_, &_data_->_tmp13__length1); + _data_->_tmp14_ = _data_->_tmp13_; + _data_->_tmp14__length1 = _data_->_tmp13__length1; + if (_vala_string_array_contains (_data_->_tmp14_, _data_->_tmp14__length1, "groups")) { { _data_->_tmp15_ = _data_->g; _data_->_tmp16_ = _data_->groups; @@ -2282,6 +2313,7 @@ goto __catch13_folks_property_error; } _g_object_unref0 (_data_->g); + _g_object_unref0 (_data_->_g); _g_object_unref0 (_data_->p); _g_object_unref0 (_data_->_p_it); _g_error_free0 (_data_->persona_error); @@ -2292,7 +2324,7 @@ _data_->_tmp17_ = _data_->p; _data_->_tmp18_ = folks_persona_get_uid (_data_->_tmp17_); _data_->_tmp19_ = _data_->_tmp18_; - g_debug ("individual.vala:692: written to persona '%s'", _data_->_tmp19_); + g_debug ("individual.vala:722: written to persona '%s'", _data_->_tmp19_); _data_->groups_changed = TRUE; } goto __finally13; @@ -2315,6 +2347,7 @@ g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); g_error_free (_data_->_inner_error_); _g_object_unref0 (_data_->g); + _g_object_unref0 (_data_->_g); _g_object_unref0 (_data_->p); _g_object_unref0 (_data_->_p_it); _g_error_free0 (_data_->persona_error); @@ -2327,6 +2360,7 @@ return FALSE; } else { _g_object_unref0 (_data_->g); + _g_object_unref0 (_data_->_g); _g_object_unref0 (_data_->p); _g_object_unref0 (_data_->_p_it); _g_error_free0 (_data_->persona_error); @@ -2337,6 +2371,7 @@ } } _g_object_unref0 (_data_->g); + _g_object_unref0 (_data_->_g); _g_object_unref0 (_data_->p); } _g_object_unref0 (_data_->_p_it); @@ -2487,7 +2522,7 @@ FolksIndividualChangeGroupData* _data_; FolksIndividual* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; gboolean _tmp3_; self = (FolksIndividual*) base; _data_ = g_slice_new0 (FolksIndividualChangeGroupData); @@ -2662,7 +2697,7 @@ gint _tmp8_; gint _tmp9_; _tmp7_ = added; - _tmp8_ = gee_collection_get_size ((GeeCollection*) _tmp7_); + _tmp8_ = gee_collection_get_size ((GeeCollection*) GEE_SET (_tmp7_)); _tmp9_ = _tmp8_; _tmp5_ = _tmp9_ == 0; } @@ -2679,7 +2714,7 @@ gint _tmp14_; gint _tmp15_; _tmp13_ = removed; - _tmp14_ = gee_collection_get_size ((GeeCollection*) _tmp13_); + _tmp14_ = gee_collection_get_size ((GeeCollection*) GEE_SET (_tmp13_)); _tmp15_ = _tmp14_; _tmp11_ = _tmp15_ == 0; } @@ -2713,11 +2748,11 @@ } } _tmp22_ = _added; - _tmp23_ = gee_set_get_read_only_view (_tmp22_); + _tmp23_ = gee_set_get_read_only_view (GEE_SET (_tmp22_)); _tmp24_ = _tmp23_; _tmp25_ = _tmp24_; _tmp26_ = _removed; - _tmp27_ = gee_set_get_read_only_view (_tmp26_); + _tmp27_ = gee_set_get_read_only_view (GEE_SET (_tmp26_)); _tmp28_ = _tmp27_; _tmp29_ = _tmp28_; g_signal_emit_by_name (self, "personas-changed", _tmp25_, _tmp29_); @@ -2869,8 +2904,10 @@ static void block1_data_unref (Block1Data* _data1_) { if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { - _g_object_unref0 (_data1_->self); + FolksIndividual * self; + self = _data1_->self; _g_free0 (_data1_->prop_name); + _g_object_unref0 (self); g_slice_free (Block1Data, _data1_); } } @@ -3091,7 +3128,7 @@ void* _tmp0__target; GCompareFunc _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; + gchar* _tmp3_; GCompareDataFunc primary_compare_func; void* primary_compare_func_target; GDestroyNotify primary_compare_func_target_destroy_notify; @@ -3163,7 +3200,7 @@ _tmp16__target = primary_compare_func_target; _tmp17_ = p; _tmp18_ = candidate_p; - _tmp19_ = _tmp16_ (_tmp17_, _tmp18_, _tmp16__target); + _tmp19_ = _tmp16_ (_tmp17_, FOLKS_PERSONA (_tmp18_), _tmp16__target); _tmp14_ = _tmp19_ > 0; } _tmp20_ = _tmp14_; @@ -3358,7 +3395,7 @@ _tmp36_ = gee_iterator_get (_tmp35_); g = (gchar*) _tmp36_; _tmp37_ = g; - g_debug ("individual.vala:1181: %s", _tmp37_); + g_debug ("individual.vala:1213: %s", _tmp37_); _g_free0 (g); } _g_object_unref0 (_g_it); @@ -3423,7 +3460,7 @@ FolksPresenceType _tmp2_; g_return_val_if_fail (p != NULL, FALSE); _tmp0_ = p; - _tmp1_ = folks_presence_details_get_presence_type (FOLKS_IS_PRESENCE_DETAILS (_tmp0_) ? ((FolksPresenceDetails*) _tmp0_) : NULL); + _tmp1_ = folks_presence_details_get_presence_type (FOLKS_PRESENCE_DETAILS (_tmp0_)); _tmp2_ = _tmp1_; result = _tmp2_ != FOLKS_PRESENCE_TYPE_UNSET; return result; @@ -3451,11 +3488,11 @@ g_return_val_if_fail (a != NULL, 0); g_return_val_if_fail (b != NULL, 0); _tmp0_ = a; - _tmp1_ = folks_presence_details_get_presence_type (FOLKS_IS_PRESENCE_DETAILS (_tmp0_) ? ((FolksPresenceDetails*) _tmp0_) : NULL); + _tmp1_ = folks_presence_details_get_presence_type (FOLKS_PRESENCE_DETAILS (_tmp0_)); _tmp2_ = _tmp1_; a_presence = _tmp2_; _tmp3_ = b; - _tmp4_ = folks_presence_details_get_presence_type (FOLKS_IS_PRESENCE_DETAILS (_tmp3_) ? ((FolksPresenceDetails*) _tmp3_) : NULL); + _tmp4_ = folks_presence_details_get_presence_type (FOLKS_PRESENCE_DETAILS (_tmp3_)); _tmp5_ = _tmp4_; b_presence = _tmp5_; _tmp6_ = folks_presence_details_typecmp (a_presence, b_presence); @@ -3504,17 +3541,17 @@ const gchar* _tmp12_; gchar* _tmp13_; _tmp3_ = p; - _tmp4_ = folks_presence_details_get_presence_type (FOLKS_IS_PRESENCE_DETAILS (_tmp3_) ? ((FolksPresenceDetails*) _tmp3_) : NULL); + _tmp4_ = folks_presence_details_get_presence_type (FOLKS_PRESENCE_DETAILS (_tmp3_)); _tmp5_ = _tmp4_; presence_type = _tmp5_; _tmp6_ = p; - _tmp7_ = folks_presence_details_get_presence_message (FOLKS_IS_PRESENCE_DETAILS (_tmp6_) ? ((FolksPresenceDetails*) _tmp6_) : NULL); + _tmp7_ = folks_presence_details_get_presence_message (FOLKS_PRESENCE_DETAILS (_tmp6_)); _tmp8_ = _tmp7_; _tmp9_ = g_strdup (_tmp8_); _g_free0 (presence_message); presence_message = _tmp9_; _tmp10_ = p; - _tmp11_ = folks_presence_details_get_presence_status (FOLKS_IS_PRESENCE_DETAILS (_tmp10_) ? ((FolksPresenceDetails*) _tmp10_) : NULL); + _tmp11_ = folks_presence_details_get_presence_status (FOLKS_PRESENCE_DETAILS (_tmp10_)); _tmp12_ = _tmp11_; _tmp13_ = g_strdup (_tmp12_); _g_free0 (presence_status); @@ -3610,11 +3647,11 @@ g_return_val_if_fail (a != NULL, 0); g_return_val_if_fail (b != NULL, 0); _tmp0_ = a; - _tmp1_ = folks_favourite_details_get_is_favourite (FOLKS_IS_FAVOURITE_DETAILS (_tmp0_) ? ((FolksFavouriteDetails*) _tmp0_) : NULL); + _tmp1_ = folks_favourite_details_get_is_favourite (FOLKS_FAVOURITE_DETAILS (_tmp0_)); _tmp2_ = _tmp1_; a_is_favourite = _tmp2_; _tmp3_ = b; - _tmp4_ = folks_favourite_details_get_is_favourite (FOLKS_IS_FAVOURITE_DETAILS (_tmp3_) ? ((FolksFavouriteDetails*) _tmp3_) : NULL); + _tmp4_ = folks_favourite_details_get_is_favourite (FOLKS_FAVOURITE_DETAILS (_tmp3_)); _tmp5_ = _tmp4_; b_is_favourite = _tmp5_; _tmp7_ = a_is_favourite; @@ -3655,7 +3692,7 @@ gboolean _tmp2_; gboolean _tmp3_; _tmp1_ = p; - _tmp2_ = folks_favourite_details_get_is_favourite (FOLKS_IS_FAVOURITE_DETAILS (_tmp1_) ? ((FolksFavouriteDetails*) _tmp1_) : NULL); + _tmp2_ = folks_favourite_details_get_is_favourite (FOLKS_FAVOURITE_DETAILS (_tmp1_)); _tmp3_ = _tmp2_; favourite = _tmp3_; } @@ -3708,7 +3745,7 @@ gboolean _tmp6_; g_return_val_if_fail (p != NULL, FALSE); _tmp0_ = p; - _tmp1_ = folks_alias_details_get_alias (FOLKS_IS_ALIAS_DETAILS (_tmp0_) ? ((FolksAliasDetails*) _tmp0_) : NULL); + _tmp1_ = folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (_tmp0_)); _tmp2_ = _tmp1_; _tmp3_ = g_strdup (_tmp2_); alias = _tmp3_; @@ -3778,12 +3815,12 @@ g_return_val_if_fail (a != NULL, 0); g_return_val_if_fail (b != NULL, 0); _tmp0_ = a; - _tmp1_ = folks_alias_details_get_alias (FOLKS_IS_ALIAS_DETAILS (_tmp0_) ? ((FolksAliasDetails*) _tmp0_) : NULL); + _tmp1_ = folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (_tmp0_)); _tmp2_ = _tmp1_; _tmp3_ = g_strdup (_tmp2_); a_alias = _tmp3_; _tmp4_ = b; - _tmp5_ = folks_alias_details_get_alias (FOLKS_IS_ALIAS_DETAILS (_tmp4_) ? ((FolksAliasDetails*) _tmp4_) : NULL); + _tmp5_ = folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (_tmp4_)); _tmp6_ = _tmp5_; _tmp7_ = g_strdup (_tmp6_); b_alias = _tmp7_; @@ -3869,7 +3906,7 @@ const gchar* _tmp4_; gchar* _tmp5_ = NULL; _tmp2_ = p; - _tmp3_ = folks_alias_details_get_alias (FOLKS_IS_ALIAS_DETAILS (_tmp2_) ? ((FolksAliasDetails*) _tmp2_) : NULL); + _tmp3_ = folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (_tmp2_)); _tmp4_ = _tmp3_; _tmp5_ = string_strip (_tmp4_); _g_free0 (alias); @@ -3908,7 +3945,7 @@ GLoadableIcon* _tmp2_; g_return_val_if_fail (p != NULL, FALSE); _tmp0_ = p; - _tmp1_ = folks_avatar_details_get_avatar (FOLKS_IS_AVATAR_DETAILS (_tmp0_) ? ((FolksAvatarDetails*) _tmp0_) : NULL); + _tmp1_ = folks_avatar_details_get_avatar (FOLKS_AVATAR_DETAILS (_tmp0_)); _tmp2_ = _tmp1_; result = _tmp2_ != NULL; return result; @@ -3954,7 +3991,7 @@ GLoadableIcon* _tmp3_; GLoadableIcon* _tmp4_; _tmp1_ = p; - _tmp2_ = folks_avatar_details_get_avatar (FOLKS_IS_AVATAR_DETAILS (_tmp1_) ? ((FolksAvatarDetails*) _tmp1_) : NULL); + _tmp2_ = folks_avatar_details_get_avatar (FOLKS_AVATAR_DETAILS (_tmp1_)); _tmp3_ = _tmp2_; _tmp4_ = _g_object_ref0 (_tmp3_); _g_object_unref0 (avatar); @@ -3989,7 +4026,7 @@ gboolean _tmp16_ = FALSE; _tmp14_ = self->priv->_avatar; _tmp15_ = avatar; - _tmp16_ = g_icon_equal ((GIcon*) _tmp14_, (GIcon*) _tmp15_); + _tmp16_ = g_icon_equal ((GIcon*) G_LOADABLE_ICON (_tmp14_), (GIcon*) _tmp15_); _tmp12_ = !_tmp16_; } _tmp17_ = _tmp12_; @@ -4527,7 +4564,7 @@ gboolean _tmp8_; g_return_val_if_fail (p != NULL, FALSE); _tmp0_ = p; - _tmp1_ = folks_name_details_get_structured_name (FOLKS_IS_NAME_DETAILS (_tmp0_) ? ((FolksNameDetails*) _tmp0_) : NULL); + _tmp1_ = folks_name_details_get_structured_name (FOLKS_NAME_DETAILS (_tmp0_)); _tmp2_ = _tmp1_; _tmp3_ = _g_object_ref0 (_tmp2_); name = _tmp3_; @@ -4536,7 +4573,7 @@ FolksStructuredName* _tmp6_; gboolean _tmp7_ = FALSE; _tmp6_ = name; - _tmp7_ = folks_structured_name_is_empty (_tmp6_); + _tmp7_ = folks_structured_name_is_empty (FOLKS_STRUCTURED_NAME (_tmp6_)); _tmp4_ = !_tmp7_; } else { _tmp4_ = FALSE; @@ -4590,7 +4627,7 @@ FolksStructuredName* _tmp6_; gboolean _tmp9_; _tmp1_ = p; - _tmp2_ = folks_name_details_get_structured_name (FOLKS_IS_NAME_DETAILS (_tmp1_) ? ((FolksNameDetails*) _tmp1_) : NULL); + _tmp2_ = folks_name_details_get_structured_name (FOLKS_NAME_DETAILS (_tmp1_)); _tmp3_ = _tmp2_; _tmp4_ = _g_object_ref0 (_tmp3_); _g_object_unref0 (name); @@ -4600,7 +4637,7 @@ FolksStructuredName* _tmp7_; gboolean _tmp8_ = FALSE; _tmp7_ = name; - _tmp8_ = folks_structured_name_is_empty (_tmp7_); + _tmp8_ = folks_structured_name_is_empty (FOLKS_STRUCTURED_NAME (_tmp7_)); _tmp5_ = _tmp8_; } else { _tmp5_ = FALSE; @@ -4640,7 +4677,7 @@ gboolean _tmp21_ = FALSE; _tmp19_ = self->priv->_structured_name; _tmp20_ = name; - _tmp21_ = folks_structured_name_equal (_tmp19_, _tmp20_); + _tmp21_ = folks_structured_name_equal (FOLKS_STRUCTURED_NAME (_tmp19_), FOLKS_STRUCTURED_NAME (_tmp20_)); _tmp17_ = !_tmp21_; } _tmp22_ = _tmp17_; @@ -4688,7 +4725,7 @@ gboolean _tmp6_; g_return_val_if_fail (p != NULL, FALSE); _tmp0_ = p; - _tmp1_ = folks_name_details_get_full_name (FOLKS_IS_NAME_DETAILS (_tmp0_) ? ((FolksNameDetails*) _tmp0_) : NULL); + _tmp1_ = folks_name_details_get_full_name (FOLKS_NAME_DETAILS (_tmp0_)); _tmp2_ = _tmp1_; _tmp3_ = g_strdup (_tmp2_); name = _tmp3_; @@ -4741,7 +4778,7 @@ const gchar* _tmp4_; gchar* _tmp5_ = NULL; _tmp2_ = p; - _tmp3_ = folks_name_details_get_full_name (FOLKS_IS_NAME_DETAILS (_tmp2_) ? ((FolksNameDetails*) _tmp2_) : NULL); + _tmp3_ = folks_name_details_get_full_name (FOLKS_NAME_DETAILS (_tmp2_)); _tmp4_ = _tmp3_; _tmp5_ = string_strip (_tmp4_); _g_free0 (new_full_name); @@ -4785,7 +4822,7 @@ gboolean _tmp6_; g_return_val_if_fail (p != NULL, FALSE); _tmp0_ = p; - _tmp1_ = folks_name_details_get_nickname (FOLKS_IS_NAME_DETAILS (_tmp0_) ? ((FolksNameDetails*) _tmp0_) : NULL); + _tmp1_ = folks_name_details_get_nickname (FOLKS_NAME_DETAILS (_tmp0_)); _tmp2_ = _tmp1_; _tmp3_ = g_strdup (_tmp2_); nickname = _tmp3_; @@ -4838,7 +4875,7 @@ const gchar* _tmp4_; gchar* _tmp5_ = NULL; _tmp2_ = p; - _tmp3_ = folks_name_details_get_nickname (FOLKS_IS_NAME_DETAILS (_tmp2_) ? ((FolksNameDetails*) _tmp2_) : NULL); + _tmp3_ = folks_name_details_get_nickname (FOLKS_NAME_DETAILS (_tmp2_)); _tmp4_ = _tmp3_; _tmp5_ = string_strip (_tmp4_); _g_free0 (new_nickname); @@ -5014,7 +5051,7 @@ FolksPersona* _tmp68_; gboolean _tmp69_ = FALSE; _tmp65_ = replacement_individual; - _tmp66_ = folks_individual_get_personas (_tmp65_); + _tmp66_ = folks_individual_get_personas (FOLKS_INDIVIDUAL (_tmp65_)); _tmp67_ = _tmp66_; _tmp68_ = persona; _tmp69_ = gee_collection_contains ((GeeCollection*) _tmp67_, _tmp68_); @@ -5045,7 +5082,7 @@ FolksGender _tmp2_; g_return_val_if_fail (p != NULL, FALSE); _tmp0_ = p; - _tmp1_ = folks_gender_details_get_gender (FOLKS_IS_GENDER_DETAILS (_tmp0_) ? ((FolksGenderDetails*) _tmp0_) : NULL); + _tmp1_ = folks_gender_details_get_gender (FOLKS_GENDER_DETAILS (_tmp0_)); _tmp2_ = _tmp1_; result = _tmp2_ != FOLKS_GENDER_UNSPECIFIED; return result; @@ -5088,7 +5125,7 @@ FolksGender _tmp2_; FolksGender _tmp3_; _tmp1_ = p; - _tmp2_ = folks_gender_details_get_gender (FOLKS_IS_GENDER_DETAILS (_tmp1_) ? ((FolksGenderDetails*) _tmp1_) : NULL); + _tmp2_ = folks_gender_details_get_gender (FOLKS_GENDER_DETAILS (_tmp1_)); _tmp3_ = _tmp2_; new_gender = _tmp3_; } @@ -5161,7 +5198,7 @@ GeeIterator* _tmp14_ = NULL; GeeIterator* _url_fd_it; _tmp11_ = url_details; - _tmp12_ = folks_url_details_get_urls (_tmp11_); + _tmp12_ = folks_url_details_get_urls (FOLKS_URL_DETAILS (_tmp11_)); _tmp13_ = _tmp12_; _tmp14_ = gee_iterable_iterator ((GeeIterable*) _tmp13_); _url_fd_it = _tmp14_; @@ -5171,17 +5208,14 @@ GeeIterator* _tmp17_; gpointer _tmp18_ = NULL; FolksUrlFieldDetails* url_fd; - FolksUrlFieldDetails* _tmp19_; - gconstpointer _tmp20_; - const gchar* _tmp21_; - GeeHashMap* _tmp22_; - FolksUrlFieldDetails* _tmp23_; - gconstpointer _tmp24_; - const gchar* _tmp25_; - gpointer _tmp26_ = NULL; - FolksUrlFieldDetails* _tmp27_; + GeeHashMap* _tmp19_; + FolksUrlFieldDetails* _tmp20_; + gconstpointer _tmp21_; + const gchar* _tmp22_; + gpointer _tmp23_ = NULL; + FolksUrlFieldDetails* _tmp24_; FolksUrlFieldDetails* existing; - FolksUrlFieldDetails* _tmp28_; + FolksUrlFieldDetails* _tmp25_; _tmp15_ = _url_fd_it; _tmp16_ = gee_iterator_next (_tmp15_); if (!_tmp16_) { @@ -5190,67 +5224,60 @@ _tmp17_ = _url_fd_it; _tmp18_ = gee_iterator_get (_tmp17_); url_fd = (FolksUrlFieldDetails*) _tmp18_; - _tmp19_ = url_fd; - _tmp20_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp19_); - _tmp21_ = _tmp20_; - if (((const gchar*) _tmp21_) == NULL) { - _g_object_unref0 (url_fd); - continue; - } - _tmp22_ = urls_set; - _tmp23_ = url_fd; - _tmp24_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp23_); - _tmp25_ = _tmp24_; - _tmp26_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp22_, (const gchar*) _tmp25_); - _tmp27_ = _g_object_ref0 ((FolksUrlFieldDetails*) _tmp26_); - existing = _tmp27_; - _tmp28_ = existing; - if (_tmp28_ != NULL) { - FolksUrlFieldDetails* _tmp29_; - FolksUrlFieldDetails* _tmp30_; - GeeMultiMap* _tmp31_; - GeeMultiMap* _tmp32_; - _tmp29_ = existing; - _tmp30_ = url_fd; - _tmp31_ = folks_abstract_field_details_get_parameters ((FolksAbstractFieldDetails*) _tmp30_); - _tmp32_ = _tmp31_; - folks_abstract_field_details_extend_parameters ((FolksAbstractFieldDetails*) _tmp29_, _tmp32_); + _tmp19_ = urls_set; + _tmp20_ = url_fd; + _tmp21_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp20_); + _tmp22_ = _tmp21_; + _tmp23_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp19_, (const gchar*) _tmp22_); + _tmp24_ = _g_object_ref0 ((FolksUrlFieldDetails*) _tmp23_); + existing = _tmp24_; + _tmp25_ = existing; + if (_tmp25_ != NULL) { + FolksUrlFieldDetails* _tmp26_; + FolksUrlFieldDetails* _tmp27_; + GeeMultiMap* _tmp28_; + GeeMultiMap* _tmp29_; + _tmp26_ = existing; + _tmp27_ = url_fd; + _tmp28_ = folks_abstract_field_details_get_parameters ((FolksAbstractFieldDetails*) _tmp27_); + _tmp29_ = _tmp28_; + folks_abstract_field_details_extend_parameters ((FolksAbstractFieldDetails*) _tmp26_, _tmp29_); } else { + FolksUrlFieldDetails* _tmp30_; + gconstpointer _tmp31_; + const gchar* _tmp32_; FolksUrlFieldDetails* _tmp33_; - gconstpointer _tmp34_; - const gchar* _tmp35_; - FolksUrlFieldDetails* _tmp36_; FolksUrlFieldDetails* new_url_fd; - FolksUrlFieldDetails* _tmp37_; - FolksUrlFieldDetails* _tmp38_; - GeeMultiMap* _tmp39_; - GeeMultiMap* _tmp40_; - GeeHashMap* _tmp41_; + FolksUrlFieldDetails* _tmp34_; + FolksUrlFieldDetails* _tmp35_; + GeeMultiMap* _tmp36_; + GeeMultiMap* _tmp37_; + GeeHashMap* _tmp38_; + FolksUrlFieldDetails* _tmp39_; + gconstpointer _tmp40_; + const gchar* _tmp41_; FolksUrlFieldDetails* _tmp42_; - gconstpointer _tmp43_; - const gchar* _tmp44_; - FolksUrlFieldDetails* _tmp45_; - GeeHashSet* _tmp46_; - FolksUrlFieldDetails* _tmp47_; - _tmp33_ = url_fd; - _tmp34_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp33_); - _tmp35_ = _tmp34_; - _tmp36_ = folks_url_field_details_new ((const gchar*) _tmp35_, NULL); - new_url_fd = _tmp36_; - _tmp37_ = new_url_fd; - _tmp38_ = url_fd; - _tmp39_ = folks_abstract_field_details_get_parameters ((FolksAbstractFieldDetails*) _tmp38_); - _tmp40_ = _tmp39_; - folks_abstract_field_details_extend_parameters ((FolksAbstractFieldDetails*) _tmp37_, _tmp40_); - _tmp41_ = urls_set; - _tmp42_ = url_fd; - _tmp43_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp42_); - _tmp44_ = _tmp43_; - _tmp45_ = new_url_fd; - gee_abstract_map_set ((GeeAbstractMap*) _tmp41_, (const gchar*) _tmp44_, _tmp45_); - _tmp46_ = self->priv->_urls; - _tmp47_ = new_url_fd; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp46_, _tmp47_); + GeeHashSet* _tmp43_; + FolksUrlFieldDetails* _tmp44_; + _tmp30_ = url_fd; + _tmp31_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp30_); + _tmp32_ = _tmp31_; + _tmp33_ = folks_url_field_details_new ((const gchar*) _tmp32_, NULL); + new_url_fd = _tmp33_; + _tmp34_ = new_url_fd; + _tmp35_ = url_fd; + _tmp36_ = folks_abstract_field_details_get_parameters ((FolksAbstractFieldDetails*) _tmp35_); + _tmp37_ = _tmp36_; + folks_abstract_field_details_extend_parameters ((FolksAbstractFieldDetails*) _tmp34_, _tmp37_); + _tmp38_ = urls_set; + _tmp39_ = url_fd; + _tmp40_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp39_); + _tmp41_ = _tmp40_; + _tmp42_ = new_url_fd; + gee_abstract_map_set ((GeeAbstractMap*) _tmp38_, (const gchar*) _tmp41_, _tmp42_); + _tmp43_ = self->priv->_urls; + _tmp44_ = new_url_fd; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp43_, _tmp44_); _g_object_unref0 (new_url_fd); } _g_object_unref0 (existing); @@ -5315,7 +5342,7 @@ GeeIterator* _tmp14_ = NULL; GeeIterator* _phone_fd_it; _tmp11_ = phone_details; - _tmp12_ = folks_phone_details_get_phone_numbers (_tmp11_); + _tmp12_ = folks_phone_details_get_phone_numbers (FOLKS_PHONE_DETAILS (_tmp11_)); _tmp13_ = _tmp12_; _tmp14_ = gee_iterable_iterator ((GeeIterable*) _tmp13_); _phone_fd_it = _tmp14_; @@ -5325,17 +5352,14 @@ GeeIterator* _tmp17_; gpointer _tmp18_ = NULL; FolksPhoneFieldDetails* phone_fd; - FolksPhoneFieldDetails* _tmp19_; - gconstpointer _tmp20_; - const gchar* _tmp21_; - GeeHashMap* _tmp22_; - FolksPhoneFieldDetails* _tmp23_; - gconstpointer _tmp24_; - const gchar* _tmp25_; - gpointer _tmp26_ = NULL; - FolksPhoneFieldDetails* _tmp27_; + GeeHashMap* _tmp19_; + FolksPhoneFieldDetails* _tmp20_; + gconstpointer _tmp21_; + const gchar* _tmp22_; + gpointer _tmp23_ = NULL; + FolksPhoneFieldDetails* _tmp24_; FolksPhoneFieldDetails* existing; - FolksPhoneFieldDetails* _tmp28_; + FolksPhoneFieldDetails* _tmp25_; _tmp15_ = _phone_fd_it; _tmp16_ = gee_iterator_next (_tmp15_); if (!_tmp16_) { @@ -5344,67 +5368,60 @@ _tmp17_ = _phone_fd_it; _tmp18_ = gee_iterator_get (_tmp17_); phone_fd = (FolksPhoneFieldDetails*) _tmp18_; - _tmp19_ = phone_fd; - _tmp20_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp19_); - _tmp21_ = _tmp20_; - if (((const gchar*) _tmp21_) == NULL) { - _g_object_unref0 (phone_fd); - continue; - } - _tmp22_ = phone_numbers_set; - _tmp23_ = phone_fd; - _tmp24_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp23_); - _tmp25_ = _tmp24_; - _tmp26_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp22_, (const gchar*) _tmp25_); - _tmp27_ = _g_object_ref0 ((FolksPhoneFieldDetails*) _tmp26_); - existing = _tmp27_; - _tmp28_ = existing; - if (_tmp28_ != NULL) { - FolksPhoneFieldDetails* _tmp29_; - FolksPhoneFieldDetails* _tmp30_; - GeeMultiMap* _tmp31_; - GeeMultiMap* _tmp32_; - _tmp29_ = existing; - _tmp30_ = phone_fd; - _tmp31_ = folks_abstract_field_details_get_parameters ((FolksAbstractFieldDetails*) _tmp30_); - _tmp32_ = _tmp31_; - folks_abstract_field_details_extend_parameters ((FolksAbstractFieldDetails*) _tmp29_, _tmp32_); + _tmp19_ = phone_numbers_set; + _tmp20_ = phone_fd; + _tmp21_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp20_); + _tmp22_ = _tmp21_; + _tmp23_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp19_, (const gchar*) _tmp22_); + _tmp24_ = _g_object_ref0 ((FolksPhoneFieldDetails*) _tmp23_); + existing = _tmp24_; + _tmp25_ = existing; + if (_tmp25_ != NULL) { + FolksPhoneFieldDetails* _tmp26_; + FolksPhoneFieldDetails* _tmp27_; + GeeMultiMap* _tmp28_; + GeeMultiMap* _tmp29_; + _tmp26_ = existing; + _tmp27_ = phone_fd; + _tmp28_ = folks_abstract_field_details_get_parameters ((FolksAbstractFieldDetails*) _tmp27_); + _tmp29_ = _tmp28_; + folks_abstract_field_details_extend_parameters ((FolksAbstractFieldDetails*) _tmp26_, _tmp29_); } else { + FolksPhoneFieldDetails* _tmp30_; + gconstpointer _tmp31_; + const gchar* _tmp32_; FolksPhoneFieldDetails* _tmp33_; - gconstpointer _tmp34_; - const gchar* _tmp35_; - FolksPhoneFieldDetails* _tmp36_; FolksPhoneFieldDetails* new_fd; - FolksPhoneFieldDetails* _tmp37_; - FolksPhoneFieldDetails* _tmp38_; - GeeMultiMap* _tmp39_; - GeeMultiMap* _tmp40_; - GeeHashMap* _tmp41_; + FolksPhoneFieldDetails* _tmp34_; + FolksPhoneFieldDetails* _tmp35_; + GeeMultiMap* _tmp36_; + GeeMultiMap* _tmp37_; + GeeHashMap* _tmp38_; + FolksPhoneFieldDetails* _tmp39_; + gconstpointer _tmp40_; + const gchar* _tmp41_; FolksPhoneFieldDetails* _tmp42_; - gconstpointer _tmp43_; - const gchar* _tmp44_; - FolksPhoneFieldDetails* _tmp45_; - GeeHashSet* _tmp46_; - FolksPhoneFieldDetails* _tmp47_; - _tmp33_ = phone_fd; - _tmp34_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp33_); - _tmp35_ = _tmp34_; - _tmp36_ = folks_phone_field_details_new ((const gchar*) _tmp35_, NULL); - new_fd = _tmp36_; - _tmp37_ = new_fd; - _tmp38_ = phone_fd; - _tmp39_ = folks_abstract_field_details_get_parameters ((FolksAbstractFieldDetails*) _tmp38_); - _tmp40_ = _tmp39_; - folks_abstract_field_details_extend_parameters ((FolksAbstractFieldDetails*) _tmp37_, _tmp40_); - _tmp41_ = phone_numbers_set; - _tmp42_ = phone_fd; - _tmp43_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp42_); - _tmp44_ = _tmp43_; - _tmp45_ = new_fd; - gee_abstract_map_set ((GeeAbstractMap*) _tmp41_, (const gchar*) _tmp44_, _tmp45_); - _tmp46_ = self->priv->_phone_numbers; - _tmp47_ = new_fd; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp46_, _tmp47_); + GeeHashSet* _tmp43_; + FolksPhoneFieldDetails* _tmp44_; + _tmp30_ = phone_fd; + _tmp31_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp30_); + _tmp32_ = _tmp31_; + _tmp33_ = folks_phone_field_details_new ((const gchar*) _tmp32_, NULL); + new_fd = _tmp33_; + _tmp34_ = new_fd; + _tmp35_ = phone_fd; + _tmp36_ = folks_abstract_field_details_get_parameters ((FolksAbstractFieldDetails*) _tmp35_); + _tmp37_ = _tmp36_; + folks_abstract_field_details_extend_parameters ((FolksAbstractFieldDetails*) _tmp34_, _tmp37_); + _tmp38_ = phone_numbers_set; + _tmp39_ = phone_fd; + _tmp40_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp39_); + _tmp41_ = _tmp40_; + _tmp42_ = new_fd; + gee_abstract_map_set ((GeeAbstractMap*) _tmp38_, (const gchar*) _tmp41_, _tmp42_); + _tmp43_ = self->priv->_phone_numbers; + _tmp44_ = new_fd; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp43_, _tmp44_); _g_object_unref0 (new_fd); } _g_object_unref0 (existing); @@ -5469,7 +5486,7 @@ GeeIterator* _tmp14_ = NULL; GeeIterator* _email_fd_it; _tmp11_ = email_details; - _tmp12_ = folks_email_details_get_email_addresses (_tmp11_); + _tmp12_ = folks_email_details_get_email_addresses (FOLKS_EMAIL_DETAILS (_tmp11_)); _tmp13_ = _tmp12_; _tmp14_ = gee_iterable_iterator ((GeeIterable*) _tmp13_); _email_fd_it = _tmp14_; @@ -5479,17 +5496,14 @@ GeeIterator* _tmp17_; gpointer _tmp18_ = NULL; FolksEmailFieldDetails* email_fd; - FolksEmailFieldDetails* _tmp19_; - gconstpointer _tmp20_; - const gchar* _tmp21_; - GeeHashMap* _tmp22_; - FolksEmailFieldDetails* _tmp23_; - gconstpointer _tmp24_; - const gchar* _tmp25_; - gpointer _tmp26_ = NULL; - FolksEmailFieldDetails* _tmp27_; + GeeHashMap* _tmp19_; + FolksEmailFieldDetails* _tmp20_; + gconstpointer _tmp21_; + const gchar* _tmp22_; + gpointer _tmp23_ = NULL; + FolksEmailFieldDetails* _tmp24_; FolksEmailFieldDetails* existing; - FolksEmailFieldDetails* _tmp28_; + FolksEmailFieldDetails* _tmp25_; _tmp15_ = _email_fd_it; _tmp16_ = gee_iterator_next (_tmp15_); if (!_tmp16_) { @@ -5498,64 +5512,57 @@ _tmp17_ = _email_fd_it; _tmp18_ = gee_iterator_get (_tmp17_); email_fd = (FolksEmailFieldDetails*) _tmp18_; - _tmp19_ = email_fd; - _tmp20_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp19_); - _tmp21_ = _tmp20_; - if (((const gchar*) _tmp21_) == NULL) { - _g_object_unref0 (email_fd); - continue; - } - _tmp22_ = emails_set; - _tmp23_ = email_fd; - _tmp24_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp23_); - _tmp25_ = _tmp24_; - _tmp26_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp22_, (const gchar*) _tmp25_); - _tmp27_ = _g_object_ref0 ((FolksEmailFieldDetails*) _tmp26_); - existing = _tmp27_; - _tmp28_ = existing; - if (_tmp28_ != NULL) { - FolksEmailFieldDetails* _tmp29_; - FolksEmailFieldDetails* _tmp30_; - GeeMultiMap* _tmp31_; - GeeMultiMap* _tmp32_; - _tmp29_ = existing; - _tmp30_ = email_fd; - _tmp31_ = folks_abstract_field_details_get_parameters ((FolksAbstractFieldDetails*) _tmp30_); - _tmp32_ = _tmp31_; - folks_abstract_field_details_extend_parameters ((FolksAbstractFieldDetails*) _tmp29_, _tmp32_); + _tmp19_ = emails_set; + _tmp20_ = email_fd; + _tmp21_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp20_); + _tmp22_ = _tmp21_; + _tmp23_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp19_, (const gchar*) _tmp22_); + _tmp24_ = _g_object_ref0 ((FolksEmailFieldDetails*) _tmp23_); + existing = _tmp24_; + _tmp25_ = existing; + if (_tmp25_ != NULL) { + FolksEmailFieldDetails* _tmp26_; + FolksEmailFieldDetails* _tmp27_; + GeeMultiMap* _tmp28_; + GeeMultiMap* _tmp29_; + _tmp26_ = existing; + _tmp27_ = email_fd; + _tmp28_ = folks_abstract_field_details_get_parameters ((FolksAbstractFieldDetails*) _tmp27_); + _tmp29_ = _tmp28_; + folks_abstract_field_details_extend_parameters ((FolksAbstractFieldDetails*) _tmp26_, _tmp29_); } else { + FolksEmailFieldDetails* _tmp30_; + gconstpointer _tmp31_; + const gchar* _tmp32_; FolksEmailFieldDetails* _tmp33_; - gconstpointer _tmp34_; - const gchar* _tmp35_; + GeeMultiMap* _tmp34_; + GeeMultiMap* _tmp35_; FolksEmailFieldDetails* _tmp36_; - GeeMultiMap* _tmp37_; - GeeMultiMap* _tmp38_; - FolksEmailFieldDetails* _tmp39_; FolksEmailFieldDetails* new_email_fd; - GeeHashMap* _tmp40_; + GeeHashMap* _tmp37_; + FolksEmailFieldDetails* _tmp38_; + gconstpointer _tmp39_; + const gchar* _tmp40_; FolksEmailFieldDetails* _tmp41_; - gconstpointer _tmp42_; - const gchar* _tmp43_; - FolksEmailFieldDetails* _tmp44_; - GeeHashSet* _tmp45_; - FolksEmailFieldDetails* _tmp46_; + GeeHashSet* _tmp42_; + FolksEmailFieldDetails* _tmp43_; + _tmp30_ = email_fd; + _tmp31_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp30_); + _tmp32_ = _tmp31_; _tmp33_ = email_fd; - _tmp34_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp33_); + _tmp34_ = folks_abstract_field_details_get_parameters ((FolksAbstractFieldDetails*) _tmp33_); _tmp35_ = _tmp34_; - _tmp36_ = email_fd; - _tmp37_ = folks_abstract_field_details_get_parameters ((FolksAbstractFieldDetails*) _tmp36_); - _tmp38_ = _tmp37_; - _tmp39_ = folks_email_field_details_new ((const gchar*) _tmp35_, _tmp38_); - new_email_fd = _tmp39_; - _tmp40_ = emails_set; - _tmp41_ = email_fd; - _tmp42_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp41_); - _tmp43_ = _tmp42_; - _tmp44_ = new_email_fd; - gee_abstract_map_set ((GeeAbstractMap*) _tmp40_, (const gchar*) _tmp43_, _tmp44_); - _tmp45_ = self->priv->_email_addresses; - _tmp46_ = new_email_fd; - gee_abstract_collection_add ((GeeAbstractCollection*) _tmp45_, _tmp46_); + _tmp36_ = folks_email_field_details_new ((const gchar*) _tmp32_, _tmp35_); + new_email_fd = _tmp36_; + _tmp37_ = emails_set; + _tmp38_ = email_fd; + _tmp39_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp38_); + _tmp40_ = _tmp39_; + _tmp41_ = new_email_fd; + gee_abstract_map_set ((GeeAbstractMap*) _tmp37_, (const gchar*) _tmp40_, _tmp41_); + _tmp42_ = self->priv->_email_addresses; + _tmp43_ = new_email_fd; + gee_abstract_collection_add ((GeeAbstractCollection*) _tmp42_, _tmp43_); _g_object_unref0 (new_email_fd); } _g_object_unref0 (existing); @@ -5616,7 +5623,7 @@ GeeIterator* _tmp13_ = NULL; GeeIterator* _role_fd_it; _tmp10_ = role_details; - _tmp11_ = folks_role_details_get_roles (_tmp10_); + _tmp11_ = folks_role_details_get_roles (FOLKS_ROLE_DETAILS (_tmp10_)); _tmp12_ = _tmp11_; _tmp13_ = gee_iterable_iterator ((GeeIterable*) _tmp12_); _role_fd_it = _tmp13_; @@ -5695,7 +5702,7 @@ GeeIterator* _tmp13_ = NULL; GeeIterator* _id_it; _tmp10_ = local_ids_details; - _tmp11_ = folks_local_id_details_get_local_ids (_tmp10_); + _tmp11_ = folks_local_id_details_get_local_ids (FOLKS_LOCAL_ID_DETAILS (_tmp10_)); _tmp12_ = _tmp11_; _tmp13_ = gee_iterable_iterator ((GeeIterable*) _tmp12_); _id_it = _tmp13_; @@ -5774,7 +5781,7 @@ GeeIterator* _tmp13_ = NULL; GeeIterator* _pafd_it; _tmp10_ = address_details; - _tmp11_ = folks_postal_address_details_get_postal_addresses (_tmp10_); + _tmp11_ = folks_postal_address_details_get_postal_addresses (FOLKS_POSTAL_ADDRESS_DETAILS (_tmp10_)); _tmp12_ = _tmp11_; _tmp13_ = gee_iterable_iterator ((GeeIterable*) _tmp12_); _pafd_it = _tmp13_; @@ -5823,7 +5830,7 @@ gboolean _tmp9_; g_return_val_if_fail (p != NULL, FALSE); _tmp0_ = p; - _tmp1_ = _g_object_ref0 (FOLKS_IS_BIRTHDAY_DETAILS (_tmp0_) ? ((FolksBirthdayDetails*) _tmp0_) : NULL); + _tmp1_ = _g_object_ref0 (FOLKS_BIRTHDAY_DETAILS (_tmp0_)); details = _tmp1_; _tmp3_ = details; _tmp4_ = folks_birthday_details_get_birthday (_tmp3_); @@ -5902,22 +5909,22 @@ g_return_val_if_fail (a != NULL, 0); g_return_val_if_fail (b != NULL, 0); _tmp0_ = a; - _tmp1_ = folks_birthday_details_get_birthday (FOLKS_IS_BIRTHDAY_DETAILS (_tmp0_) ? ((FolksBirthdayDetails*) _tmp0_) : NULL); + _tmp1_ = folks_birthday_details_get_birthday (FOLKS_BIRTHDAY_DETAILS (_tmp0_)); _tmp2_ = _tmp1_; _tmp3_ = _g_date_time_ref0 (_tmp2_); a_birthday = _tmp3_; _tmp4_ = b; - _tmp5_ = folks_birthday_details_get_birthday (FOLKS_IS_BIRTHDAY_DETAILS (_tmp4_) ? ((FolksBirthdayDetails*) _tmp4_) : NULL); + _tmp5_ = folks_birthday_details_get_birthday (FOLKS_BIRTHDAY_DETAILS (_tmp4_)); _tmp6_ = _tmp5_; _tmp7_ = _g_date_time_ref0 (_tmp6_); b_birthday = _tmp7_; _tmp8_ = a; - _tmp9_ = folks_birthday_details_get_calendar_event_id (FOLKS_IS_BIRTHDAY_DETAILS (_tmp8_) ? ((FolksBirthdayDetails*) _tmp8_) : NULL); + _tmp9_ = folks_birthday_details_get_calendar_event_id (FOLKS_BIRTHDAY_DETAILS (_tmp8_)); _tmp10_ = _tmp9_; _tmp11_ = g_strdup (_tmp10_); a_event_id = _tmp11_; _tmp12_ = b; - _tmp13_ = folks_birthday_details_get_calendar_event_id (FOLKS_IS_BIRTHDAY_DETAILS (_tmp12_) ? ((FolksBirthdayDetails*) _tmp12_) : NULL); + _tmp13_ = folks_birthday_details_get_calendar_event_id (FOLKS_BIRTHDAY_DETAILS (_tmp12_)); _tmp14_ = _tmp13_; _tmp15_ = g_strdup (_tmp14_); b_event_id = _tmp15_; @@ -5994,11 +6001,11 @@ const gchar* _tmp5_; const gchar* _tmp6_; _tmp1_ = p; - _tmp2_ = folks_birthday_details_get_birthday (FOLKS_IS_BIRTHDAY_DETAILS (_tmp1_) ? ((FolksBirthdayDetails*) _tmp1_) : NULL); + _tmp2_ = folks_birthday_details_get_birthday (FOLKS_BIRTHDAY_DETAILS (_tmp1_)); _tmp3_ = _tmp2_; bday = _tmp3_; _tmp4_ = p; - _tmp5_ = folks_birthday_details_get_calendar_event_id (FOLKS_IS_BIRTHDAY_DETAILS (_tmp4_) ? ((FolksBirthdayDetails*) _tmp4_) : NULL); + _tmp5_ = folks_birthday_details_get_calendar_event_id (FOLKS_BIRTHDAY_DETAILS (_tmp4_)); _tmp6_ = _tmp5_; calendar_event_id = _tmp6_; } @@ -6031,7 +6038,7 @@ gboolean _tmp19_ = FALSE; _tmp17_ = self->priv->_birthday; _tmp18_ = bday; - _tmp19_ = g_date_time_equal (_tmp17_, _tmp18_); + _tmp19_ = g_date_time_equal ((GDateTime*) _tmp17_, (GDateTime*) _tmp18_); _tmp15_ = !_tmp19_; } _tmp20_ = _tmp15_; @@ -6127,7 +6134,7 @@ GeeIterator* _tmp13_ = NULL; GeeIterator* _n_it; _tmp10_ = note_details; - _tmp11_ = folks_note_details_get_notes (_tmp10_); + _tmp11_ = folks_note_details_get_notes (FOLKS_NOTE_DETAILS (_tmp10_)); _tmp12_ = _tmp11_; _tmp13_ = gee_iterable_iterator ((GeeIterable*) _tmp12_); _n_it = _tmp13_; @@ -6222,7 +6229,7 @@ GeeIterator* _tmp8_ = NULL; GeeIterator* _p_it; _tmp7_ = personas; - _tmp8_ = gee_iterable_iterator ((GeeIterable*) _tmp7_); + _tmp8_ = gee_iterable_iterator ((GeeIterable*) GEE_SET (_tmp7_)); _p_it = _tmp8_; while (TRUE) { GeeIterator* _tmp9_; @@ -6346,7 +6353,7 @@ gboolean _tmp50_ = FALSE; _tmp48_ = personas; _tmp49_ = p; - _tmp50_ = gee_collection_contains ((GeeCollection*) _tmp48_, _tmp49_); + _tmp50_ = gee_collection_contains ((GeeCollection*) GEE_SET (_tmp48_), _tmp49_); _tmp46_ = !_tmp50_; } _tmp51_ = _tmp46_; @@ -6443,7 +6450,7 @@ folks_individual_set_is_user (self, _tmp85_); } _tmp86_ = self->priv->_persona_set; - _tmp87_ = gee_collection_get_size ((GeeCollection*) _tmp86_); + _tmp87_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp86_); _tmp88_ = _tmp87_; if (_tmp88_ < 1) { FolksIndividual* _tmp89_; @@ -6455,15 +6462,15 @@ return; } _tmp90_ = self->priv->_persona_set; - _tmp91_ = gee_collection_get_size ((GeeCollection*) _tmp90_); + _tmp91_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp90_); _tmp92_ = _tmp91_; if (_tmp92_ > 0) { FolksPersona* chosen_persona; - FolksPersona* _tmp176_; - const gchar* _tmp177_; - const gchar* _tmp178_; - gchar* _tmp179_ = NULL; - gchar* _tmp180_; + FolksPersona* _tmp178_; + const gchar* _tmp179_; + const gchar* _tmp180_; + gchar* _tmp181_ = NULL; + gchar* _tmp182_; chosen_persona = NULL; { GeeHashSet* _tmp93_; @@ -6478,13 +6485,21 @@ GeeIterator* _tmp97_; gpointer _tmp98_ = NULL; FolksPersona* persona; - gboolean _tmp99_ = FALSE; - gboolean _tmp100_ = FALSE; - gboolean _tmp101_ = FALSE; + FolksPersona* _tmp99_; FolksPersona* _tmp102_; - gboolean _tmp115_; - gboolean _tmp138_; - gboolean _tmp173_; + FolksPersona* _tmp103_; + FolksPersona* _chosen_persona; + gboolean _tmp104_ = FALSE; + gboolean _tmp105_ = FALSE; + gboolean _tmp106_ = FALSE; + FolksPersona* _tmp107_; + FolksPersonaStore* _tmp108_; + FolksPersonaStore* _tmp109_; + gboolean _tmp110_; + gboolean _tmp111_; + gboolean _tmp117_; + gboolean _tmp140_; + gboolean _tmp175_; _tmp95_ = _persona_it; _tmp96_ = gee_iterator_next (_tmp95_); if (!_tmp96_) { @@ -6493,196 +6508,197 @@ _tmp97_ = _persona_it; _tmp98_ = gee_iterator_get (_tmp97_); persona = (FolksPersona*) _tmp98_; + _tmp99_ = chosen_persona; + if (_tmp99_ == NULL) { + FolksPersona* _tmp100_; + FolksPersona* _tmp101_; + _tmp100_ = persona; + _tmp101_ = _g_object_ref0 (_tmp100_); + _g_object_unref0 (chosen_persona); + chosen_persona = _tmp101_; + _g_object_unref0 (persona); + continue; + } _tmp102_ = chosen_persona; - if (_tmp102_ == NULL) { - _tmp101_ = TRUE; + _tmp103_ = _g_object_ref0 (FOLKS_PERSONA (_tmp102_)); + _chosen_persona = _tmp103_; + _tmp107_ = _chosen_persona; + _tmp108_ = folks_persona_get_store (_tmp107_); + _tmp109_ = _tmp108_; + _tmp110_ = folks_persona_store_get_is_primary_store (_tmp109_); + _tmp111_ = _tmp110_; + if (_tmp111_ == FALSE) { + FolksPersona* _tmp112_; + FolksPersonaStore* _tmp113_; + FolksPersonaStore* _tmp114_; + gboolean _tmp115_; + gboolean _tmp116_; + _tmp112_ = persona; + _tmp113_ = folks_persona_get_store (_tmp112_); + _tmp114_ = _tmp113_; + _tmp115_ = folks_persona_store_get_is_primary_store (_tmp114_); + _tmp116_ = _tmp115_; + _tmp106_ = _tmp116_ == TRUE; } else { - gboolean _tmp103_ = FALSE; - FolksPersona* _tmp104_; - FolksPersonaStore* _tmp105_; - FolksPersonaStore* _tmp106_; - gboolean _tmp107_; - gboolean _tmp108_; - gboolean _tmp114_; - _tmp104_ = chosen_persona; - _tmp105_ = folks_persona_get_store (_tmp104_); - _tmp106_ = _tmp105_; - _tmp107_ = folks_persona_store_get_is_primary_store (_tmp106_); - _tmp108_ = _tmp107_; - if (_tmp108_ == FALSE) { - FolksPersona* _tmp109_; - FolksPersonaStore* _tmp110_; - FolksPersonaStore* _tmp111_; - gboolean _tmp112_; - gboolean _tmp113_; - _tmp109_ = persona; - _tmp110_ = folks_persona_get_store (_tmp109_); - _tmp111_ = _tmp110_; - _tmp112_ = folks_persona_store_get_is_primary_store (_tmp111_); - _tmp113_ = _tmp112_; - _tmp103_ = _tmp113_ == TRUE; - } else { - _tmp103_ = FALSE; - } - _tmp114_ = _tmp103_; - _tmp101_ = _tmp114_; + _tmp106_ = FALSE; } - _tmp115_ = _tmp101_; - if (_tmp115_) { - _tmp100_ = TRUE; + _tmp117_ = _tmp106_; + if (_tmp117_) { + _tmp105_ = TRUE; } else { - gboolean _tmp116_ = FALSE; - FolksPersona* _tmp117_; - FolksPersonaStore* _tmp118_; - FolksPersonaStore* _tmp119_; - gboolean _tmp120_; - gboolean _tmp121_; - FolksPersona* _tmp122_; - FolksPersonaStore* _tmp123_; - FolksPersonaStore* _tmp124_; - gboolean _tmp125_; - gboolean _tmp126_; - gboolean _tmp137_; - _tmp117_ = chosen_persona; - _tmp118_ = folks_persona_get_store (_tmp117_); - _tmp119_ = _tmp118_; - _tmp120_ = folks_persona_store_get_is_primary_store (_tmp119_); + gboolean _tmp118_ = FALSE; + FolksPersona* _tmp119_; + FolksPersonaStore* _tmp120_; + FolksPersonaStore* _tmp121_; + gboolean _tmp122_; + gboolean _tmp123_; + FolksPersona* _tmp124_; + FolksPersonaStore* _tmp125_; + FolksPersonaStore* _tmp126_; + gboolean _tmp127_; + gboolean _tmp128_; + gboolean _tmp139_; + _tmp119_ = _chosen_persona; + _tmp120_ = folks_persona_get_store (_tmp119_); _tmp121_ = _tmp120_; - _tmp122_ = persona; - _tmp123_ = folks_persona_get_store (_tmp122_); - _tmp124_ = _tmp123_; - _tmp125_ = folks_persona_store_get_is_primary_store (_tmp124_); + _tmp122_ = folks_persona_store_get_is_primary_store (_tmp121_); + _tmp123_ = _tmp122_; + _tmp124_ = persona; + _tmp125_ = folks_persona_get_store (_tmp124_); _tmp126_ = _tmp125_; - if (_tmp121_ == _tmp126_) { - FolksPersona* _tmp127_; - FolksPersonaStore* _tmp128_; - FolksPersonaStore* _tmp129_; - FolksPersonaStoreTrust _tmp130_; - FolksPersonaStoreTrust _tmp131_; - FolksPersona* _tmp132_; - FolksPersonaStore* _tmp133_; - FolksPersonaStore* _tmp134_; - FolksPersonaStoreTrust _tmp135_; - FolksPersonaStoreTrust _tmp136_; - _tmp127_ = chosen_persona; - _tmp128_ = folks_persona_get_store (_tmp127_); - _tmp129_ = _tmp128_; - _tmp130_ = folks_persona_store_get_trust_level (_tmp129_); + _tmp127_ = folks_persona_store_get_is_primary_store (_tmp126_); + _tmp128_ = _tmp127_; + if (_tmp123_ == _tmp128_) { + FolksPersona* _tmp129_; + FolksPersonaStore* _tmp130_; + FolksPersonaStore* _tmp131_; + FolksPersonaStoreTrust _tmp132_; + FolksPersonaStoreTrust _tmp133_; + FolksPersona* _tmp134_; + FolksPersonaStore* _tmp135_; + FolksPersonaStore* _tmp136_; + FolksPersonaStoreTrust _tmp137_; + FolksPersonaStoreTrust _tmp138_; + _tmp129_ = _chosen_persona; + _tmp130_ = folks_persona_get_store (_tmp129_); _tmp131_ = _tmp130_; - _tmp132_ = persona; - _tmp133_ = folks_persona_get_store (_tmp132_); - _tmp134_ = _tmp133_; - _tmp135_ = folks_persona_store_get_trust_level (_tmp134_); + _tmp132_ = folks_persona_store_get_trust_level (_tmp131_); + _tmp133_ = _tmp132_; + _tmp134_ = persona; + _tmp135_ = folks_persona_get_store (_tmp134_); _tmp136_ = _tmp135_; - _tmp116_ = _tmp131_ > _tmp136_; + _tmp137_ = folks_persona_store_get_trust_level (_tmp136_); + _tmp138_ = _tmp137_; + _tmp118_ = _tmp133_ > _tmp138_; } else { - _tmp116_ = FALSE; + _tmp118_ = FALSE; } - _tmp137_ = _tmp116_; - _tmp100_ = _tmp137_; + _tmp139_ = _tmp118_; + _tmp105_ = _tmp139_; } - _tmp138_ = _tmp100_; - if (_tmp138_) { - _tmp99_ = TRUE; + _tmp140_ = _tmp105_; + if (_tmp140_) { + _tmp104_ = TRUE; } else { - gboolean _tmp139_ = FALSE; - gboolean _tmp140_ = FALSE; - FolksPersona* _tmp141_; - FolksPersonaStore* _tmp142_; - FolksPersonaStore* _tmp143_; - gboolean _tmp144_; - gboolean _tmp145_; - FolksPersona* _tmp146_; - FolksPersonaStore* _tmp147_; - FolksPersonaStore* _tmp148_; - gboolean _tmp149_; - gboolean _tmp150_; - gboolean _tmp161_; - gboolean _tmp172_; - _tmp141_ = chosen_persona; - _tmp142_ = folks_persona_get_store (_tmp141_); - _tmp143_ = _tmp142_; - _tmp144_ = folks_persona_store_get_is_primary_store (_tmp143_); + gboolean _tmp141_ = FALSE; + gboolean _tmp142_ = FALSE; + FolksPersona* _tmp143_; + FolksPersonaStore* _tmp144_; + FolksPersonaStore* _tmp145_; + gboolean _tmp146_; + gboolean _tmp147_; + FolksPersona* _tmp148_; + FolksPersonaStore* _tmp149_; + FolksPersonaStore* _tmp150_; + gboolean _tmp151_; + gboolean _tmp152_; + gboolean _tmp163_; + gboolean _tmp174_; + _tmp143_ = _chosen_persona; + _tmp144_ = folks_persona_get_store (_tmp143_); _tmp145_ = _tmp144_; - _tmp146_ = persona; - _tmp147_ = folks_persona_get_store (_tmp146_); - _tmp148_ = _tmp147_; - _tmp149_ = folks_persona_store_get_is_primary_store (_tmp148_); + _tmp146_ = folks_persona_store_get_is_primary_store (_tmp145_); + _tmp147_ = _tmp146_; + _tmp148_ = persona; + _tmp149_ = folks_persona_get_store (_tmp148_); _tmp150_ = _tmp149_; - if (_tmp145_ == _tmp150_) { - FolksPersona* _tmp151_; - FolksPersonaStore* _tmp152_; - FolksPersonaStore* _tmp153_; - FolksPersonaStoreTrust _tmp154_; - FolksPersonaStoreTrust _tmp155_; - FolksPersona* _tmp156_; - FolksPersonaStore* _tmp157_; - FolksPersonaStore* _tmp158_; - FolksPersonaStoreTrust _tmp159_; - FolksPersonaStoreTrust _tmp160_; - _tmp151_ = chosen_persona; - _tmp152_ = folks_persona_get_store (_tmp151_); - _tmp153_ = _tmp152_; - _tmp154_ = folks_persona_store_get_trust_level (_tmp153_); + _tmp151_ = folks_persona_store_get_is_primary_store (_tmp150_); + _tmp152_ = _tmp151_; + if (_tmp147_ == _tmp152_) { + FolksPersona* _tmp153_; + FolksPersonaStore* _tmp154_; + FolksPersonaStore* _tmp155_; + FolksPersonaStoreTrust _tmp156_; + FolksPersonaStoreTrust _tmp157_; + FolksPersona* _tmp158_; + FolksPersonaStore* _tmp159_; + FolksPersonaStore* _tmp160_; + FolksPersonaStoreTrust _tmp161_; + FolksPersonaStoreTrust _tmp162_; + _tmp153_ = _chosen_persona; + _tmp154_ = folks_persona_get_store (_tmp153_); _tmp155_ = _tmp154_; - _tmp156_ = persona; - _tmp157_ = folks_persona_get_store (_tmp156_); - _tmp158_ = _tmp157_; - _tmp159_ = folks_persona_store_get_trust_level (_tmp158_); + _tmp156_ = folks_persona_store_get_trust_level (_tmp155_); + _tmp157_ = _tmp156_; + _tmp158_ = persona; + _tmp159_ = folks_persona_get_store (_tmp158_); _tmp160_ = _tmp159_; - _tmp140_ = _tmp155_ == _tmp160_; + _tmp161_ = folks_persona_store_get_trust_level (_tmp160_); + _tmp162_ = _tmp161_; + _tmp142_ = _tmp157_ == _tmp162_; } else { - _tmp140_ = FALSE; + _tmp142_ = FALSE; } - _tmp161_ = _tmp140_; - if (_tmp161_) { - FolksPersona* _tmp162_; - FolksPersonaStore* _tmp163_; - FolksPersonaStore* _tmp164_; - const gchar* _tmp165_; - const gchar* _tmp166_; - FolksPersona* _tmp167_; - FolksPersonaStore* _tmp168_; - FolksPersonaStore* _tmp169_; - const gchar* _tmp170_; - const gchar* _tmp171_; - _tmp162_ = chosen_persona; - _tmp163_ = folks_persona_get_store (_tmp162_); - _tmp164_ = _tmp163_; - _tmp165_ = folks_persona_store_get_id (_tmp164_); + _tmp163_ = _tmp142_; + if (_tmp163_) { + FolksPersona* _tmp164_; + FolksPersonaStore* _tmp165_; + FolksPersonaStore* _tmp166_; + const gchar* _tmp167_; + const gchar* _tmp168_; + FolksPersona* _tmp169_; + FolksPersonaStore* _tmp170_; + FolksPersonaStore* _tmp171_; + const gchar* _tmp172_; + const gchar* _tmp173_; + _tmp164_ = _chosen_persona; + _tmp165_ = folks_persona_get_store (_tmp164_); _tmp166_ = _tmp165_; - _tmp167_ = persona; - _tmp168_ = folks_persona_get_store (_tmp167_); - _tmp169_ = _tmp168_; - _tmp170_ = folks_persona_store_get_id (_tmp169_); + _tmp167_ = folks_persona_store_get_id (_tmp166_); + _tmp168_ = _tmp167_; + _tmp169_ = persona; + _tmp170_ = folks_persona_get_store (_tmp169_); _tmp171_ = _tmp170_; - _tmp139_ = g_strcmp0 (_tmp166_, _tmp171_) > 0; + _tmp172_ = folks_persona_store_get_id (_tmp171_); + _tmp173_ = _tmp172_; + _tmp141_ = g_strcmp0 (_tmp168_, _tmp173_) > 0; } else { - _tmp139_ = FALSE; + _tmp141_ = FALSE; } - _tmp172_ = _tmp139_; - _tmp99_ = _tmp172_; + _tmp174_ = _tmp141_; + _tmp104_ = _tmp174_; } - _tmp173_ = _tmp99_; - if (_tmp173_) { - FolksPersona* _tmp174_; - FolksPersona* _tmp175_; - _tmp174_ = persona; - _tmp175_ = _g_object_ref0 (_tmp174_); + _tmp175_ = _tmp104_; + if (_tmp175_) { + FolksPersona* _tmp176_; + FolksPersona* _tmp177_; + _tmp176_ = persona; + _tmp177_ = _g_object_ref0 (_tmp176_); _g_object_unref0 (chosen_persona); - chosen_persona = _tmp175_; + chosen_persona = _tmp177_; } + _g_object_unref0 (_chosen_persona); _g_object_unref0 (persona); } _g_object_unref0 (_persona_it); } - _tmp176_ = chosen_persona; - _tmp177_ = folks_persona_get_uid (_tmp176_); - _tmp178_ = _tmp177_; - _tmp179_ = g_compute_checksum_for_string (G_CHECKSUM_SHA1, _tmp178_, (gsize) (-1)); + _tmp178_ = chosen_persona; + _tmp179_ = folks_persona_get_uid (FOLKS_PERSONA (_tmp178_)); _tmp180_ = _tmp179_; - folks_individual_set_id (self, _tmp180_); - _g_free0 (_tmp180_); + _tmp181_ = g_compute_checksum_for_string (G_CHECKSUM_SHA1, _tmp180_, (gsize) (-1)); + _tmp182_ = _tmp181_; + folks_individual_set_id (self, _tmp182_); + _g_free0 (_tmp182_); _g_object_unref0 (chosen_persona); } _folks_individual_update_fields (self); @@ -7253,102 +7269,88 @@ GObject * obj; GObjectClass * parent_class; FolksIndividual * self; - gint _tmp0_ = 0; - GeeSet* _tmp1_; - GeeSet* _tmp2_; - gint _tmp7_; - GeeHashSet* _tmp8_; - GeeSet* _tmp9_; + GeeHashSet* _tmp0_; + gint _tmp1_; + gint _tmp2_; + GeeHashSet* _tmp3_; + GeeSet* _tmp4_; + GeeSet* _tmp5_; + GeeHashSet* _tmp6_; + GeeSet* _tmp7_; + GeeSet* _tmp8_; + GeeHashSet* _tmp9_; GeeSet* _tmp10_; - GeeHashSet* _tmp11_; - GeeSet* _tmp12_; + GeeSet* _tmp11_; + GeeHashSet* _tmp12_; GeeSet* _tmp13_; - GeeHashSet* _tmp14_; - GeeSet* _tmp15_; + GeeSet* _tmp14_; + GeeHashSet* _tmp15_; GeeSet* _tmp16_; - GeeHashSet* _tmp17_; - GeeSet* _tmp18_; + GeeSet* _tmp17_; + GeeHashSet* _tmp18_; GeeSet* _tmp19_; - GeeHashSet* _tmp20_; - GeeSet* _tmp21_; + GeeSet* _tmp20_; + GeeHashSet* _tmp21_; GeeSet* _tmp22_; - GeeHashSet* _tmp23_; - GeeSet* _tmp24_; + GeeSet* _tmp23_; + GeeHashSet* _tmp24_; GeeSet* _tmp25_; - GeeHashSet* _tmp26_; - GeeSet* _tmp27_; + GeeSet* _tmp26_; + GeeHashSet* _tmp27_; GeeSet* _tmp28_; - GeeHashSet* _tmp29_; - GeeSet* _tmp30_; - GeeSet* _tmp31_; - GeeHashSet* _tmp32_; - GeeSet* _tmp33_; - GeeSet* _tmp34_; + GeeSet* _tmp29_; parent_class = G_OBJECT_CLASS (folks_individual_parent_class); obj = parent_class->constructor (type, n_construct_properties, construct_properties); self = FOLKS_INDIVIDUAL (obj); - _tmp1_ = folks_individual_get_personas (self); + _tmp0_ = self->priv->_persona_set; + _tmp1_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp0_); _tmp2_ = _tmp1_; - if (_tmp2_ != NULL) { - GeeSet* _tmp3_; - GeeSet* _tmp4_; - gint _tmp5_; - gint _tmp6_; - _tmp3_ = folks_individual_get_personas (self); - _tmp4_ = _tmp3_; - _tmp5_ = gee_collection_get_size ((GeeCollection*) _tmp4_); - _tmp6_ = _tmp5_; - _tmp0_ = _tmp6_; - } else { - _tmp0_ = 0; - } - _tmp7_ = _tmp0_; - g_debug ("individual.vala:925: Creating new Individual with %u Personas: %p", (guint) _tmp7_, self); - _tmp8_ = self->priv->_persona_set; - _tmp9_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp8_); - _tmp10_ = _tmp9_; + g_debug ("individual.vala:955: Creating new Individual with %u Personas: %p", (guint) _tmp2_, self); + _tmp3_ = self->priv->_persona_set; + _tmp4_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp3_); + _tmp5_ = _tmp4_; _g_object_unref0 (self->priv->_persona_set_ro); - self->priv->_persona_set_ro = _tmp10_; - _tmp11_ = self->priv->_urls; - _tmp12_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp11_); - _tmp13_ = _tmp12_; + self->priv->_persona_set_ro = _tmp5_; + _tmp6_ = self->priv->_urls; + _tmp7_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp6_); + _tmp8_ = _tmp7_; _g_object_unref0 (self->priv->_urls_ro); - self->priv->_urls_ro = _tmp13_; - _tmp14_ = self->priv->_phone_numbers; - _tmp15_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp14_); - _tmp16_ = _tmp15_; + self->priv->_urls_ro = _tmp8_; + _tmp9_ = self->priv->_phone_numbers; + _tmp10_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp9_); + _tmp11_ = _tmp10_; _g_object_unref0 (self->priv->_phone_numbers_ro); - self->priv->_phone_numbers_ro = _tmp16_; - _tmp17_ = self->priv->_email_addresses; - _tmp18_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp17_); - _tmp19_ = _tmp18_; + self->priv->_phone_numbers_ro = _tmp11_; + _tmp12_ = self->priv->_email_addresses; + _tmp13_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp12_); + _tmp14_ = _tmp13_; _g_object_unref0 (self->priv->_email_addresses_ro); - self->priv->_email_addresses_ro = _tmp19_; - _tmp20_ = self->priv->_roles; - _tmp21_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp20_); - _tmp22_ = _tmp21_; + self->priv->_email_addresses_ro = _tmp14_; + _tmp15_ = self->priv->_roles; + _tmp16_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp15_); + _tmp17_ = _tmp16_; _g_object_unref0 (self->priv->_roles_ro); - self->priv->_roles_ro = _tmp22_; - _tmp23_ = self->priv->_local_ids; - _tmp24_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp23_); - _tmp25_ = _tmp24_; + self->priv->_roles_ro = _tmp17_; + _tmp18_ = self->priv->_local_ids; + _tmp19_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp18_); + _tmp20_ = _tmp19_; _g_object_unref0 (self->priv->_local_ids_ro); - self->priv->_local_ids_ro = _tmp25_; - _tmp26_ = self->priv->_postal_addresses; - _tmp27_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp26_); - _tmp28_ = _tmp27_; + self->priv->_local_ids_ro = _tmp20_; + _tmp21_ = self->priv->_postal_addresses; + _tmp22_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp21_); + _tmp23_ = _tmp22_; _g_object_unref0 (self->priv->_postal_addresses_ro); - self->priv->_postal_addresses_ro = _tmp28_; - _tmp29_ = self->priv->_notes; - _tmp30_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp29_); - _tmp31_ = _tmp30_; + self->priv->_postal_addresses_ro = _tmp23_; + _tmp24_ = self->priv->_notes; + _tmp25_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp24_); + _tmp26_ = _tmp25_; _g_object_unref0 (self->priv->_notes_ro); - self->priv->_notes_ro = _tmp31_; - _tmp32_ = self->priv->_groups; - _tmp33_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp32_); - _tmp34_ = _tmp33_; + self->priv->_notes_ro = _tmp26_; + _tmp27_ = self->priv->_groups; + _tmp28_ = gee_abstract_set_get_read_only_view ((GeeAbstractSet*) _tmp27_); + _tmp29_ = _tmp28_; _g_object_unref0 (self->priv->_groups_ro); - self->priv->_groups_ro = _tmp34_; + self->priv->_groups_ro = _tmp29_; return obj; } @@ -7377,21 +7379,21 @@ * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_AVATAR, "avatar"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_AVATAR, g_param_spec_object ("avatar", "avatar", "avatar", g_loadable_icon_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_PRESENCE_TYPE, "presence-type"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_PRESENCE_TYPE, g_param_spec_enum ("presence-type", "presence-type", "presence-type", FOLKS_TYPE_PRESENCE_TYPE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} * * @since 0.6.0 */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_PRESENCE_STATUS, "presence-status"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_PRESENCE_STATUS, g_param_spec_string ("presence-status", "presence-status", "presence-status", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_PRESENCE_MESSAGE, "presence-message"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_PRESENCE_MESSAGE, g_param_spec_string ("presence-message", "presence-message", "presence-message", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * Whether the Individual is the user. * @@ -7437,78 +7439,78 @@ /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_ALIAS, "alias"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_ALIAS, g_param_spec_string ("alias", "alias", "alias", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_STRUCTURED_NAME, "structured-name"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_STRUCTURED_NAME, g_param_spec_object ("structured-name", "structured-name", "structured-name", FOLKS_TYPE_STRUCTURED_NAME, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_FULL_NAME, "full-name"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_FULL_NAME, g_param_spec_string ("full-name", "full-name", "full-name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_NICKNAME, "nickname"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_NICKNAME, g_param_spec_string ("nickname", "nickname", "nickname", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_GENDER, "gender"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_GENDER, g_param_spec_enum ("gender", "gender", "gender", FOLKS_TYPE_GENDER, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_URLS, "urls"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_URLS, g_param_spec_object ("urls", "urls", "urls", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_PHONE_NUMBERS, "phone-numbers"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_PHONE_NUMBERS, g_param_spec_object ("phone-numbers", "phone-numbers", "phone-numbers", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_EMAIL_ADDRESSES, "email-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_EMAIL_ADDRESSES, g_param_spec_object ("email-addresses", "email-addresses", "email-addresses", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_ROLES, "roles"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_ROLES, g_param_spec_object ("roles", "roles", "roles", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_LOCAL_IDS, "local-ids"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_LOCAL_IDS, g_param_spec_object ("local-ids", "local-ids", "local-ids", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_BIRTHDAY, "birthday"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_BIRTHDAY, g_param_spec_boxed ("birthday", "birthday", "birthday", G_TYPE_DATE_TIME, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_CALENDAR_EVENT_ID, "calendar-event-id"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_CALENDAR_EVENT_ID, g_param_spec_string ("calendar-event-id", "calendar-event-id", "calendar-event-id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_NOTES, "notes"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_NOTES, g_param_spec_object ("notes", "notes", "notes", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_POSTAL_ADDRESSES, "postal-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_POSTAL_ADDRESSES, g_param_spec_object ("postal-addresses", "postal-addresses", "postal-addresses", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * Whether this Individual is a user-defined favourite. * * This property is `true` if any of this Individual's {@link Persona}s are * favourites). */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_IS_FAVOURITE, "is-favourite"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_IS_FAVOURITE, g_param_spec_boolean ("is-favourite", "is-favourite", "is-favourite", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_GROUPS, "groups"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_GROUPS, g_param_spec_object ("groups", "groups", "groups", GEE_TYPE_SET, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_IM_ADDRESSES, "im-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_IM_ADDRESSES, g_param_spec_object ("im-addresses", "im-addresses", "im-addresses", GEE_TYPE_MULTI_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_WEB_SERVICE_ADDRESSES, "web-service-addresses"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_INDIVIDUAL_WEB_SERVICE_ADDRESSES, g_param_spec_object ("web-service-addresses", "web-service-addresses", "web-service-addresses", GEE_TYPE_MULTI_MAP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * The set of {@link Persona}s encapsulated by this Individual. * @@ -7761,7 +7763,7 @@ const gchar* _tmp0_; self = FOLKS_INDIVIDUAL (obj); _tmp0_ = self->priv->_id; - g_debug ("individual.vala:941: Destroying Individual '%s': %p", _tmp0_, self); + g_debug ("individual.vala:971: Destroying Individual '%s': %p", _tmp0_, self); _g_object_unref0 (self->priv->_persona_set); _g_object_unref0 (self->priv->_persona_set_ro); _g_object_unref0 (self->priv->_stores); diff -Nru folks-0.6.6/folks/individual.vala folks-0.6.7/folks/individual.vala --- folks-0.6.6/folks/individual.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/folks/individual.vala 2012-02-17 23:07:32.000000000 +0000 @@ -159,7 +159,7 @@ */ public async void change_avatar (LoadableIcon? avatar) throws PropertyError { - if ((this._avatar != null && this._avatar.equal (avatar)) || + if ((this._avatar != null && ((!) this._avatar).equal (avatar)) || (this._avatar == null && avatar == null)) { return; @@ -174,8 +174,14 @@ * "avatar" property as writeable. */ foreach (var p in this._persona_set) { - var a = p as AvatarDetails; - if (a != null && "avatar" in p.writeable_properties) + var _a = p as AvatarDetails; + if (_a == null) + { + continue; + } + var a = (!) _a; + + if ("avatar" in p.writeable_properties) { try { @@ -206,19 +212,19 @@ /** * {@inheritDoc} */ - public Folks.PresenceType presence_type { get; private set; } + public Folks.PresenceType presence_type { get; set; } /** * {@inheritDoc} * * @since 0.6.0 */ - public string presence_status { get; private set; } + public string presence_status { get; set; } /** * {@inheritDoc} */ - public string presence_message { get; private set; } + public string presence_message { get; set; } /** * Whether the Individual is the user. @@ -310,8 +316,14 @@ * as a writeable property. */ foreach (var p in this._persona_set) { - var a = p as AliasDetails; - if (a != null && "alias" in p.writeable_properties) + var _a = p as AliasDetails; + if (_a == null) + { + continue; + } + var a = (!) _a; + + if ("alias" in p.writeable_properties) { try { @@ -406,8 +418,14 @@ * as a writeable property. */ foreach (var p in this._persona_set) { - var n = p as NameDetails; - if (n != null && "nickname" in p.writeable_properties) + var _n = p as NameDetails; + if (_n == null) + { + continue; + } + var n = (!) _n; + + if ("nickname" in p.writeable_properties) { try { @@ -621,8 +639,14 @@ * is one property which is harmless to propagate. */ foreach (var p in this._persona_set) { - var a = p as FavouriteDetails; - if (a != null && "is-favourite" in p.writeable_properties) + var _a = p as FavouriteDetails; + if (_a == null) + { + continue; + } + var a = (!) _a; + + if ("is-favourite" in p.writeable_properties) { try { @@ -683,8 +707,14 @@ * writeable property. */ foreach (var p in this._persona_set) { - var g = p as GroupDetails; - if (g != null && "groups" in p.writeable_properties) + var _g = p as GroupDetails; + if (_g == null) + { + continue; + } + var g = (!) _g; + + if ("groups" in p.writeable_properties) { try { @@ -923,7 +953,7 @@ construct { debug ("Creating new Individual with %u Personas: %p", - (this.personas != null ? this.personas.size : 0), this); + this._persona_set.size, this); this._persona_set_ro = this._persona_set.read_only_view; this._urls_ro = this._urls.read_only_view; @@ -950,8 +980,8 @@ var _added = added; var _removed = removed; - if ((added == null || added.size == 0) && - (removed == null || removed.size == 0)) + if ((added == null || ((!) added).size == 0) && + (removed == null || ((!) removed).size == 0)) { /* Emitting it with no added or removed personas is pointless */ return; @@ -965,7 +995,9 @@ _removed = new HashSet (); } - this.personas_changed (_added.read_only_view, _removed.read_only_view); + // We've now guaranteed that both _added and _removed are non-null. + this.personas_changed (((!) _added).read_only_view, + ((!) _removed).read_only_view); } private void _store_removed_cb (PersonaStore store) @@ -1136,7 +1168,7 @@ if (p.get_type ().is_a (interface_type)) { if (candidate_p == null || - primary_compare_func (p, candidate_p) > 0) + primary_compare_func (p, (!) candidate_p) > 0) { candidate_p = p; } @@ -1205,11 +1237,11 @@ { this._update_single_valued_property (typeof (PresenceDetails), (p) => { - return (p as PresenceDetails).presence_type != PresenceType.UNSET; + return ((PresenceDetails) p).presence_type != PresenceType.UNSET; }, (a, b) => { - var a_presence = (a as PresenceDetails).presence_type; - var b_presence = (b as PresenceDetails).presence_type; + var a_presence = ((PresenceDetails) a).presence_type; + var b_presence = ((PresenceDetails) b).presence_type; return PresenceDetails.typecmp (a_presence, b_presence); }, "presence", (p) => @@ -1220,9 +1252,9 @@ if (p != null) { - presence_type = (p as PresenceDetails).presence_type; - presence_message = (p as PresenceDetails).presence_message; - presence_status = (p as PresenceDetails).presence_status; + presence_type = ((PresenceDetails) p).presence_type; + presence_message = ((PresenceDetails) p).presence_message; + presence_status = ((PresenceDetails) p).presence_status; } /* Only notify if any of the values have changed. */ @@ -1246,8 +1278,8 @@ return true; }, (a, b) => { - var a_is_favourite = (a as FavouriteDetails).is_favourite; - var b_is_favourite = (b as FavouriteDetails).is_favourite; + var a_is_favourite = ((FavouriteDetails) a).is_favourite; + var b_is_favourite = ((FavouriteDetails) b).is_favourite; return ((a_is_favourite == true) ? 1 : 0) - ((b_is_favourite == true) ? 1 : 0); @@ -1257,7 +1289,7 @@ if (p != null) { - favourite = (p as FavouriteDetails).is_favourite; + favourite = ((FavouriteDetails) p).is_favourite; } /* Only notify if the value has changed. We have to set the private @@ -1275,14 +1307,14 @@ { this._update_single_valued_property (typeof (AliasDetails), (p) => { - var alias = (p as AliasDetails).alias; + var alias = ((AliasDetails) p).alias; assert (alias != null); return (alias.strip () != ""); /* empty aliases are unset */ }, (a, b) => { - var a_alias = (a as AliasDetails).alias; - var b_alias = (b as AliasDetails).alias; + var a_alias = ((AliasDetails) a).alias; + var b_alias = ((AliasDetails) b).alias; assert (a_alias != null); assert (b_alias != null); @@ -1305,7 +1337,7 @@ if (p != null) { - alias = (p as AliasDetails).alias.strip (); + alias = ((AliasDetails) p).alias.strip (); } /* Only notify if the value has changed. We have to set the private @@ -1324,7 +1356,7 @@ { this._update_single_valued_property (typeof (AvatarDetails), (p) => { - return (p as AvatarDetails).avatar != null; + return ((AvatarDetails) p).avatar != null; }, (a, b) => { /* We can't compare two set avatars efficiently. See: bgo#652721. */ @@ -1335,13 +1367,13 @@ if (p != null) { - avatar = (p as AvatarDetails).avatar; + avatar = ((AvatarDetails) p).avatar; } /* only notify if the value has changed */ if ((this._avatar == null && avatar != null) || (this._avatar != null && - (avatar == null || !this._avatar.equal (avatar)))) + (avatar == null || !((!) this._avatar).equal (avatar)))) { this._avatar = avatar; this.notify_property ("avatar"); @@ -1456,8 +1488,8 @@ { this._update_single_valued_property (typeof (NameDetails), (p) => { - var name = (p as NameDetails).structured_name; - return (name != null && !name.is_empty ()); + var name = ((NameDetails) p).structured_name; + return (name != null && !((!) name).is_empty ()); }, (a, b) => { /* Can't compare two set names. */ @@ -1468,9 +1500,9 @@ if (p != null) { - name = (p as NameDetails).structured_name; + name = ((NameDetails) p).structured_name; - if (name != null && name.is_empty ()) + if (name != null && ((!) name).is_empty ()) { name = null; } @@ -1478,7 +1510,7 @@ if ((this._structured_name == null && name != null) || (this._structured_name != null && - (name == null || !this._structured_name.equal (name)))) + (name == null || !((!) this._structured_name).equal ((!) name)))) { this._structured_name = name; this.notify_property ("structured-name"); @@ -1490,7 +1522,7 @@ { this._update_single_valued_property (typeof (NameDetails), (p) => { - var name = (p as NameDetails).full_name; + var name = ((NameDetails) p).full_name; assert (name != null); return (name.strip () != ""); /* empty names are unset */ @@ -1504,7 +1536,7 @@ if (p != null) { - new_full_name = (p as NameDetails).full_name.strip (); + new_full_name = ((NameDetails) p).full_name.strip (); } if (new_full_name != this._full_name) @@ -1519,7 +1551,7 @@ { this._update_single_valued_property (typeof (NameDetails), (p) => { - var nickname = (p as NameDetails).nickname; + var nickname = ((NameDetails) p).nickname; assert (nickname != null); return (nickname.strip () != ""); /* empty names are unset */ @@ -1533,7 +1565,7 @@ if (p != null) { - new_nickname = (p as NameDetails).nickname.strip (); + new_nickname = ((NameDetails) p).nickname.strip (); } if (new_nickname != this._nickname) @@ -1597,7 +1629,7 @@ * doesn't contain this persona). In this case, we need to set the * persona's individual to null. */ if (replacement_individual != null && - persona in replacement_individual.personas) + persona in ((!) replacement_individual).personas) { persona.individual = replacement_individual; } @@ -1612,7 +1644,7 @@ { this._update_single_valued_property (typeof (GenderDetails), (p) => { - return (p as GenderDetails).gender != Gender.UNSPECIFIED; + return ((GenderDetails) p).gender != Gender.UNSPECIFIED; }, (a, b) => { /* It would be sexist to rank one gender over another. @@ -1625,7 +1657,7 @@ if (p != null) { - new_gender = (p as GenderDetails).gender; + new_gender = ((GenderDetails) p).gender; } if (new_gender != this.gender) @@ -1650,11 +1682,8 @@ var url_details = persona as UrlDetails; if (url_details != null) { - foreach (var url_fd in url_details.urls) + foreach (var url_fd in ((!) url_details).urls) { - if (url_fd.value == null) - continue; - var existing = urls_set.get (url_fd.value); if (existing != null) existing.extend_parameters (url_fd.parameters); @@ -1687,11 +1716,8 @@ var phone_details = persona as PhoneDetails; if (phone_details != null) { - foreach (var phone_fd in phone_details.phone_numbers) + foreach (var phone_fd in ((!) phone_details).phone_numbers) { - if (phone_fd.value == null) - continue; - var existing = phone_numbers_set.get (phone_fd.value); if (existing != null) existing.extend_parameters (phone_fd.parameters); @@ -1723,11 +1749,8 @@ var email_details = persona as EmailDetails; if (email_details != null) { - foreach (var email_fd in email_details.email_addresses) + foreach (var email_fd in ((!) email_details).email_addresses) { - if (email_fd.value == null) - continue; - var existing = emails_set.get (email_fd.value); if (existing != null) existing.extend_parameters (email_fd.parameters); @@ -1754,7 +1777,7 @@ var role_details = persona as RoleDetails; if (role_details != null) { - foreach (var role_fd in role_details.roles) + foreach (var role_fd in ((!) role_details).roles) { this._roles.add (role_fd); } @@ -1773,7 +1796,7 @@ var local_ids_details = persona as LocalIdDetails; if (local_ids_details != null) { - foreach (var id in local_ids_details.local_ids) + foreach (var id in ((!) local_ids_details).local_ids) { this._local_ids.add (id); } @@ -1793,7 +1816,7 @@ var address_details = persona as PostalAddressDetails; if (address_details != null) { - foreach (var pafd in address_details.postal_addresses) + foreach (var pafd in ((!) address_details).postal_addresses) this._postal_addresses.add (pafd); } } @@ -1805,14 +1828,14 @@ { this._update_single_valued_property (typeof (BirthdayDetails), (p) => { - var details = (p as BirthdayDetails); + var details = ((BirthdayDetails) p); return details.birthday != null && details.calendar_event_id != null; }, (a, b) => { - var a_birthday = (a as BirthdayDetails).birthday; - var b_birthday = (b as BirthdayDetails).birthday; - var a_event_id = (a as BirthdayDetails).calendar_event_id; - var b_event_id = (b as BirthdayDetails).calendar_event_id; + var a_birthday = ((BirthdayDetails) a).birthday; + var b_birthday = ((BirthdayDetails) b).birthday; + var a_event_id = ((BirthdayDetails) a).calendar_event_id; + var b_event_id = ((BirthdayDetails) b).calendar_event_id; var a_birthday_is_set = (a_birthday != null) ? 1 : 0; var b_birthday_is_set = (b_birthday != null) ? 1 : 0; @@ -1833,13 +1856,13 @@ if (p != null) { - bday = (p as BirthdayDetails).birthday; - calendar_event_id = (p as BirthdayDetails).calendar_event_id; + bday = ((BirthdayDetails) p).birthday; + calendar_event_id = ((BirthdayDetails) p).calendar_event_id; } if ((this._birthday == null && bday != null) || (this._birthday != null && - (bday == null || !this._birthday.equal (bday))) || + (bday == null || !((!) this._birthday).equal ((!) bday))) || (this._calendar_event_id != calendar_event_id)) { this._birthday = bday; @@ -1862,7 +1885,7 @@ var note_details = persona as NoteDetails; if (note_details != null) { - foreach (var n in note_details.notes) + foreach (var n in ((!) note_details).notes) { this._notes.add (n); } @@ -1884,7 +1907,7 @@ * assume it's an empty set. */ if (personas != null) { - foreach (var p in personas) + foreach (var p in (!) personas) { if (!this._persona_set.contains (p)) { @@ -1922,7 +1945,7 @@ { var p = iter.get (); - if (personas == null || !personas.contains (p)) + if (personas == null || !((!) personas).contains (p)) { /* Keep track of how many Personas are users */ if (p.is_user) @@ -1992,27 +2015,36 @@ foreach (var persona in this._persona_set) { - if (chosen_persona == null || - (chosen_persona.store.is_primary_store == false && + if (chosen_persona == null) + { + chosen_persona = persona; + continue; + } + + var _chosen_persona = (!) chosen_persona; + + if ((_chosen_persona.store.is_primary_store == false && persona.store.is_primary_store == true) || - (chosen_persona.store.is_primary_store == + (_chosen_persona.store.is_primary_store == persona.store.is_primary_store && - chosen_persona.store.trust_level > + _chosen_persona.store.trust_level > persona.store.trust_level) || - (chosen_persona.store.is_primary_store == + (_chosen_persona.store.is_primary_store == persona.store.is_primary_store && - chosen_persona.store.trust_level == + _chosen_persona.store.trust_level == persona.store.trust_level && - chosen_persona.store.id > persona.store.id) + _chosen_persona.store.id > persona.store.id) ) { chosen_persona = persona; } } - // Hash the chosen persona's UID + /* Hash the chosen persona's UID. We can guarantee chosen_persona is + * non-null here because it's at least set to the first element of + * this._persona_set, which we've checked is non-empty. */ this.id = Checksum.compute_for_string (ChecksumType.SHA1, - chosen_persona.uid); + ((!) chosen_persona).uid); } /* Update our aggregated fields and notify the changes */ diff -Nru folks-0.6.6/folks/internal.c folks-0.6.7/folks/internal.c --- folks-0.6.6/folks/internal.c 2011-12-13 23:39:12.000000000 +0000 +++ folks-0.6.7/folks/internal.c 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* internal.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* internal.c generated by valac 0.15.1, the Vala compiler * generated from internal.vala, do not modify */ /* @@ -25,7 +25,7 @@ #include #include -#define _g_destroy_func0(var) NULL +#define _g_destroy_func0(var) (((var == NULL) || (g_destroy_func == NULL)) ? NULL : (var = (g_destroy_func (var), NULL))) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) diff -Nru folks-0.6.6/folks/local-id-details.c folks-0.6.7/folks/local-id-details.c --- folks-0.6.6/folks/local-id-details.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/local-id-details.c 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* local-id-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* local-id-details.c generated by valac 0.15.1, the Vala compiler * generated from local-id-details.vala, do not modify */ /* diff -Nru folks-0.6.6/folks/Makefile.am folks-0.6.7/folks/Makefile.am --- folks-0.6.6/folks/Makefile.am 2011-12-13 23:32:35.000000000 +0000 +++ folks-0.6.7/folks/Makefile.am 2012-01-12 17:25:24.000000000 +0000 @@ -19,6 +19,7 @@ $(NULL) libfolks_internal_la_VALAFLAGS = \ + $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ --library=folks-internal \ --vapidir=. \ @@ -29,11 +30,19 @@ $(NULL) libfolks_internal_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(NULL) +libfolks_internal_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ + $(NULL) + libfolks_internal_la_LIBADD = \ + $(AM_LIBADD) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(NULL) @@ -82,6 +91,7 @@ endif libfolks_la_VALAFLAGS = \ + $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ --gir=Folks-$(API_VERSION).gir \ --library=folks \ @@ -100,6 +110,8 @@ $(NULL) libfolks_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GMODULE_CFLAGS) \ @@ -108,6 +120,7 @@ $(NULL) libfolks_la_LIBADD = \ + $(AM_LIBADD) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GMODULE_LIBS) \ @@ -120,6 +133,8 @@ # that vim quickfix mode (:make) doesn't interpret the libtool --mode=link # command as an error message in a bizarrely named file libfolks_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" folksdir = $(includedir)/folks @@ -145,6 +160,8 @@ $(NULL) BUILT_SOURCES = \ + folks-internal.h \ + folks-internal.vapi \ folks.h \ folks.vapi \ $(NULL) @@ -152,6 +169,8 @@ GITIGNOREFILES = \ $(libfolks_la_SOURCES:.vala=.c) \ libfolks_la_vala.stamp \ + $(libfolks_internal_la_SOURCES:.vala=.c) \ + libfolks_internal_la_vala.stamp \ $(NULL) CLEANFILES = diff -Nru folks-0.6.6/folks/Makefile.in folks-0.6.7/folks/Makefile.in --- folks-0.6.6/folks/Makefile.in 2011-12-13 23:38:40.000000000 +0000 +++ folks-0.6.7/folks/Makefile.in 2012-02-23 00:04:12.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -56,10 +56,11 @@ web-service-details.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -87,6 +88,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(girdir)" \ "$(DESTDIR)$(vapidir)" "$(DESTDIR)$(typelibdir)" \ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(folksdir)" @@ -101,8 +108,8 @@ am__v_lt_0 = --silent libfolks_internal_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(libfolks_internal_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ + $(libfolks_internal_la_CFLAGS) $(CFLAGS) \ + $(libfolks_internal_la_LDFLAGS) $(LDFLAGS) -o $@ libfolks_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) libfolks-internal.la @@ -189,6 +196,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -376,6 +385,7 @@ $(NULL) libfolks_internal_la_VALAFLAGS = \ + $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ --library=folks-internal \ --vapidir=. \ @@ -386,11 +396,19 @@ $(NULL) libfolks_internal_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(NULL) +libfolks_internal_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ + $(NULL) + libfolks_internal_la_LIBADD = \ + $(AM_LIBADD) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(NULL) @@ -430,6 +448,7 @@ @ENABLE_EDS_TRUE@EDS_FLAGS = -D ENABLE_EDS libfolks_la_VALAFLAGS = \ + $(AM_VALAFLAGS) \ $(ERROR_VALAFLAGS) \ --gir=Folks-$(API_VERSION).gir \ --library=folks \ @@ -448,6 +467,8 @@ $(NULL) libfolks_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(CODE_COVERAGE_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GMODULE_CFLAGS) \ @@ -456,6 +477,7 @@ $(NULL) libfolks_la_LIBADD = \ + $(AM_LIBADD) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GMODULE_LIBS) \ @@ -469,6 +491,8 @@ # that vim quickfix mode (:make) doesn't interpret the libtool --mode=link # command as an error message in a bizarrely named file libfolks_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + $(CODE_COVERAGE_LDFLAGS) \ -version-info "$(LT_CURRENT)":"$(LT_REVISION)":"$(LT_AGE)" folksdir = $(includedir)/folks @@ -492,6 +516,8 @@ $(NULL) BUILT_SOURCES = \ + folks-internal.h \ + folks-internal.vapi \ folks.h \ folks.vapi \ $(NULL) @@ -499,6 +525,8 @@ GITIGNOREFILES = \ $(libfolks_la_SOURCES:.vala=.c) \ libfolks_la_vala.stamp \ + $(libfolks_internal_la_SOURCES:.vala=.c) \ + libfolks_internal_la_vala.stamp \ $(NULL) CLEANFILES = $(am__append_2) @@ -642,450 +670,416 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libfolks_internal_la-internal.lo: internal.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_internal_la_CFLAGS) $(CFLAGS) -MT libfolks_internal_la-internal.lo -MD -MP -MF $(DEPDIR)/libfolks_internal_la-internal.Tpo -c -o libfolks_internal_la-internal.lo `test -f 'internal.c' || echo '$(srcdir)/'`internal.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_internal_la-internal.Tpo $(DEPDIR)/libfolks_internal_la-internal.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='internal.c' object='libfolks_internal_la-internal.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='internal.c' object='libfolks_internal_la-internal.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_internal_la_CFLAGS) $(CFLAGS) -c -o libfolks_internal_la-internal.lo `test -f 'internal.c' || echo '$(srcdir)/'`internal.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_internal_la_CFLAGS) $(CFLAGS) -c -o libfolks_internal_la-internal.lo `test -f 'internal.c' || echo '$(srcdir)/'`internal.c libfolks_la-abstract-field-details.lo: abstract-field-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-abstract-field-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-abstract-field-details.Tpo -c -o libfolks_la-abstract-field-details.lo `test -f 'abstract-field-details.c' || echo '$(srcdir)/'`abstract-field-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-abstract-field-details.Tpo $(DEPDIR)/libfolks_la-abstract-field-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='abstract-field-details.c' object='libfolks_la-abstract-field-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='abstract-field-details.c' object='libfolks_la-abstract-field-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-abstract-field-details.lo `test -f 'abstract-field-details.c' || echo '$(srcdir)/'`abstract-field-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-abstract-field-details.lo `test -f 'abstract-field-details.c' || echo '$(srcdir)/'`abstract-field-details.c libfolks_la-alias-details.lo: alias-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-alias-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-alias-details.Tpo -c -o libfolks_la-alias-details.lo `test -f 'alias-details.c' || echo '$(srcdir)/'`alias-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-alias-details.Tpo $(DEPDIR)/libfolks_la-alias-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='alias-details.c' object='libfolks_la-alias-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='alias-details.c' object='libfolks_la-alias-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-alias-details.lo `test -f 'alias-details.c' || echo '$(srcdir)/'`alias-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-alias-details.lo `test -f 'alias-details.c' || echo '$(srcdir)/'`alias-details.c libfolks_la-avatar-details.lo: avatar-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-avatar-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-avatar-details.Tpo -c -o libfolks_la-avatar-details.lo `test -f 'avatar-details.c' || echo '$(srcdir)/'`avatar-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-avatar-details.Tpo $(DEPDIR)/libfolks_la-avatar-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='avatar-details.c' object='libfolks_la-avatar-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avatar-details.c' object='libfolks_la-avatar-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-avatar-details.lo `test -f 'avatar-details.c' || echo '$(srcdir)/'`avatar-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-avatar-details.lo `test -f 'avatar-details.c' || echo '$(srcdir)/'`avatar-details.c libfolks_la-backend.lo: backend.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-backend.lo -MD -MP -MF $(DEPDIR)/libfolks_la-backend.Tpo -c -o libfolks_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-backend.Tpo $(DEPDIR)/libfolks_la-backend.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='backend.c' object='libfolks_la-backend.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='backend.c' object='libfolks_la-backend.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c libfolks_la-backend-store.lo: backend-store.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-backend-store.lo -MD -MP -MF $(DEPDIR)/libfolks_la-backend-store.Tpo -c -o libfolks_la-backend-store.lo `test -f 'backend-store.c' || echo '$(srcdir)/'`backend-store.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-backend-store.Tpo $(DEPDIR)/libfolks_la-backend-store.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='backend-store.c' object='libfolks_la-backend-store.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='backend-store.c' object='libfolks_la-backend-store.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-backend-store.lo `test -f 'backend-store.c' || echo '$(srcdir)/'`backend-store.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-backend-store.lo `test -f 'backend-store.c' || echo '$(srcdir)/'`backend-store.c libfolks_la-birthday-details.lo: birthday-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-birthday-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-birthday-details.Tpo -c -o libfolks_la-birthday-details.lo `test -f 'birthday-details.c' || echo '$(srcdir)/'`birthday-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-birthday-details.Tpo $(DEPDIR)/libfolks_la-birthday-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='birthday-details.c' object='libfolks_la-birthday-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='birthday-details.c' object='libfolks_la-birthday-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-birthday-details.lo `test -f 'birthday-details.c' || echo '$(srcdir)/'`birthday-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-birthday-details.lo `test -f 'birthday-details.c' || echo '$(srcdir)/'`birthday-details.c libfolks_la-email-details.lo: email-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-email-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-email-details.Tpo -c -o libfolks_la-email-details.lo `test -f 'email-details.c' || echo '$(srcdir)/'`email-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-email-details.Tpo $(DEPDIR)/libfolks_la-email-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='email-details.c' object='libfolks_la-email-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='email-details.c' object='libfolks_la-email-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-email-details.lo `test -f 'email-details.c' || echo '$(srcdir)/'`email-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-email-details.lo `test -f 'email-details.c' || echo '$(srcdir)/'`email-details.c libfolks_la-favourite-details.lo: favourite-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-favourite-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-favourite-details.Tpo -c -o libfolks_la-favourite-details.lo `test -f 'favourite-details.c' || echo '$(srcdir)/'`favourite-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-favourite-details.Tpo $(DEPDIR)/libfolks_la-favourite-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='favourite-details.c' object='libfolks_la-favourite-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='favourite-details.c' object='libfolks_la-favourite-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-favourite-details.lo `test -f 'favourite-details.c' || echo '$(srcdir)/'`favourite-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-favourite-details.lo `test -f 'favourite-details.c' || echo '$(srcdir)/'`favourite-details.c libfolks_la-gender-details.lo: gender-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-gender-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-gender-details.Tpo -c -o libfolks_la-gender-details.lo `test -f 'gender-details.c' || echo '$(srcdir)/'`gender-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-gender-details.Tpo $(DEPDIR)/libfolks_la-gender-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gender-details.c' object='libfolks_la-gender-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gender-details.c' object='libfolks_la-gender-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-gender-details.lo `test -f 'gender-details.c' || echo '$(srcdir)/'`gender-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-gender-details.lo `test -f 'gender-details.c' || echo '$(srcdir)/'`gender-details.c libfolks_la-group-details.lo: group-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-group-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-group-details.Tpo -c -o libfolks_la-group-details.lo `test -f 'group-details.c' || echo '$(srcdir)/'`group-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-group-details.Tpo $(DEPDIR)/libfolks_la-group-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='group-details.c' object='libfolks_la-group-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='group-details.c' object='libfolks_la-group-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-group-details.lo `test -f 'group-details.c' || echo '$(srcdir)/'`group-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-group-details.lo `test -f 'group-details.c' || echo '$(srcdir)/'`group-details.c libfolks_la-web-service-details.lo: web-service-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-web-service-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-web-service-details.Tpo -c -o libfolks_la-web-service-details.lo `test -f 'web-service-details.c' || echo '$(srcdir)/'`web-service-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-web-service-details.Tpo $(DEPDIR)/libfolks_la-web-service-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='web-service-details.c' object='libfolks_la-web-service-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='web-service-details.c' object='libfolks_la-web-service-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-web-service-details.lo `test -f 'web-service-details.c' || echo '$(srcdir)/'`web-service-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-web-service-details.lo `test -f 'web-service-details.c' || echo '$(srcdir)/'`web-service-details.c libfolks_la-im-details.lo: im-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-im-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-im-details.Tpo -c -o libfolks_la-im-details.lo `test -f 'im-details.c' || echo '$(srcdir)/'`im-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-im-details.Tpo $(DEPDIR)/libfolks_la-im-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='im-details.c' object='libfolks_la-im-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='im-details.c' object='libfolks_la-im-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-im-details.lo `test -f 'im-details.c' || echo '$(srcdir)/'`im-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-im-details.lo `test -f 'im-details.c' || echo '$(srcdir)/'`im-details.c libfolks_la-local-id-details.lo: local-id-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-local-id-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-local-id-details.Tpo -c -o libfolks_la-local-id-details.lo `test -f 'local-id-details.c' || echo '$(srcdir)/'`local-id-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-local-id-details.Tpo $(DEPDIR)/libfolks_la-local-id-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='local-id-details.c' object='libfolks_la-local-id-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='local-id-details.c' object='libfolks_la-local-id-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-local-id-details.lo `test -f 'local-id-details.c' || echo '$(srcdir)/'`local-id-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-local-id-details.lo `test -f 'local-id-details.c' || echo '$(srcdir)/'`local-id-details.c libfolks_la-name-details.lo: name-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-name-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-name-details.Tpo -c -o libfolks_la-name-details.lo `test -f 'name-details.c' || echo '$(srcdir)/'`name-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-name-details.Tpo $(DEPDIR)/libfolks_la-name-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='name-details.c' object='libfolks_la-name-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='name-details.c' object='libfolks_la-name-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-name-details.lo `test -f 'name-details.c' || echo '$(srcdir)/'`name-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-name-details.lo `test -f 'name-details.c' || echo '$(srcdir)/'`name-details.c libfolks_la-note-details.lo: note-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-note-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-note-details.Tpo -c -o libfolks_la-note-details.lo `test -f 'note-details.c' || echo '$(srcdir)/'`note-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-note-details.Tpo $(DEPDIR)/libfolks_la-note-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='note-details.c' object='libfolks_la-note-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='note-details.c' object='libfolks_la-note-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-note-details.lo `test -f 'note-details.c' || echo '$(srcdir)/'`note-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-note-details.lo `test -f 'note-details.c' || echo '$(srcdir)/'`note-details.c libfolks_la-phone-details.lo: phone-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-phone-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-phone-details.Tpo -c -o libfolks_la-phone-details.lo `test -f 'phone-details.c' || echo '$(srcdir)/'`phone-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-phone-details.Tpo $(DEPDIR)/libfolks_la-phone-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='phone-details.c' object='libfolks_la-phone-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='phone-details.c' object='libfolks_la-phone-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-phone-details.lo `test -f 'phone-details.c' || echo '$(srcdir)/'`phone-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-phone-details.lo `test -f 'phone-details.c' || echo '$(srcdir)/'`phone-details.c libfolks_la-postal-address-details.lo: postal-address-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-postal-address-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-postal-address-details.Tpo -c -o libfolks_la-postal-address-details.lo `test -f 'postal-address-details.c' || echo '$(srcdir)/'`postal-address-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-postal-address-details.Tpo $(DEPDIR)/libfolks_la-postal-address-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='postal-address-details.c' object='libfolks_la-postal-address-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='postal-address-details.c' object='libfolks_la-postal-address-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-postal-address-details.lo `test -f 'postal-address-details.c' || echo '$(srcdir)/'`postal-address-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-postal-address-details.lo `test -f 'postal-address-details.c' || echo '$(srcdir)/'`postal-address-details.c libfolks_la-presence-details.lo: presence-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-presence-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-presence-details.Tpo -c -o libfolks_la-presence-details.lo `test -f 'presence-details.c' || echo '$(srcdir)/'`presence-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-presence-details.Tpo $(DEPDIR)/libfolks_la-presence-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='presence-details.c' object='libfolks_la-presence-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='presence-details.c' object='libfolks_la-presence-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-presence-details.lo `test -f 'presence-details.c' || echo '$(srcdir)/'`presence-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-presence-details.lo `test -f 'presence-details.c' || echo '$(srcdir)/'`presence-details.c libfolks_la-role-details.lo: role-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-role-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-role-details.Tpo -c -o libfolks_la-role-details.lo `test -f 'role-details.c' || echo '$(srcdir)/'`role-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-role-details.Tpo $(DEPDIR)/libfolks_la-role-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='role-details.c' object='libfolks_la-role-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='role-details.c' object='libfolks_la-role-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-role-details.lo `test -f 'role-details.c' || echo '$(srcdir)/'`role-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-role-details.lo `test -f 'role-details.c' || echo '$(srcdir)/'`role-details.c libfolks_la-url-details.lo: url-details.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-url-details.lo -MD -MP -MF $(DEPDIR)/libfolks_la-url-details.Tpo -c -o libfolks_la-url-details.lo `test -f 'url-details.c' || echo '$(srcdir)/'`url-details.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-url-details.Tpo $(DEPDIR)/libfolks_la-url-details.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='url-details.c' object='libfolks_la-url-details.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='url-details.c' object='libfolks_la-url-details.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-url-details.lo `test -f 'url-details.c' || echo '$(srcdir)/'`url-details.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-url-details.lo `test -f 'url-details.c' || echo '$(srcdir)/'`url-details.c libfolks_la-individual.lo: individual.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-individual.lo -MD -MP -MF $(DEPDIR)/libfolks_la-individual.Tpo -c -o libfolks_la-individual.lo `test -f 'individual.c' || echo '$(srcdir)/'`individual.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-individual.Tpo $(DEPDIR)/libfolks_la-individual.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='individual.c' object='libfolks_la-individual.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='individual.c' object='libfolks_la-individual.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-individual.lo `test -f 'individual.c' || echo '$(srcdir)/'`individual.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-individual.lo `test -f 'individual.c' || echo '$(srcdir)/'`individual.c libfolks_la-individual-aggregator.lo: individual-aggregator.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-individual-aggregator.lo -MD -MP -MF $(DEPDIR)/libfolks_la-individual-aggregator.Tpo -c -o libfolks_la-individual-aggregator.lo `test -f 'individual-aggregator.c' || echo '$(srcdir)/'`individual-aggregator.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-individual-aggregator.Tpo $(DEPDIR)/libfolks_la-individual-aggregator.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='individual-aggregator.c' object='libfolks_la-individual-aggregator.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='individual-aggregator.c' object='libfolks_la-individual-aggregator.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-individual-aggregator.lo `test -f 'individual-aggregator.c' || echo '$(srcdir)/'`individual-aggregator.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-individual-aggregator.lo `test -f 'individual-aggregator.c' || echo '$(srcdir)/'`individual-aggregator.c libfolks_la-persona.lo: persona.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-persona.lo -MD -MP -MF $(DEPDIR)/libfolks_la-persona.Tpo -c -o libfolks_la-persona.lo `test -f 'persona.c' || echo '$(srcdir)/'`persona.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-persona.Tpo $(DEPDIR)/libfolks_la-persona.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='persona.c' object='libfolks_la-persona.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='persona.c' object='libfolks_la-persona.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-persona.lo `test -f 'persona.c' || echo '$(srcdir)/'`persona.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-persona.lo `test -f 'persona.c' || echo '$(srcdir)/'`persona.c libfolks_la-persona-store.lo: persona-store.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-persona-store.lo -MD -MP -MF $(DEPDIR)/libfolks_la-persona-store.Tpo -c -o libfolks_la-persona-store.lo `test -f 'persona-store.c' || echo '$(srcdir)/'`persona-store.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-persona-store.Tpo $(DEPDIR)/libfolks_la-persona-store.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='persona-store.c' object='libfolks_la-persona-store.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='persona-store.c' object='libfolks_la-persona-store.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-persona-store.lo `test -f 'persona-store.c' || echo '$(srcdir)/'`persona-store.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-persona-store.lo `test -f 'persona-store.c' || echo '$(srcdir)/'`persona-store.c libfolks_la-types.lo: types.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-types.lo -MD -MP -MF $(DEPDIR)/libfolks_la-types.Tpo -c -o libfolks_la-types.lo `test -f 'types.c' || echo '$(srcdir)/'`types.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-types.Tpo $(DEPDIR)/libfolks_la-types.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='types.c' object='libfolks_la-types.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='types.c' object='libfolks_la-types.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-types.lo `test -f 'types.c' || echo '$(srcdir)/'`types.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-types.lo `test -f 'types.c' || echo '$(srcdir)/'`types.c libfolks_la-debug.lo: debug.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-debug.lo -MD -MP -MF $(DEPDIR)/libfolks_la-debug.Tpo -c -o libfolks_la-debug.lo `test -f 'debug.c' || echo '$(srcdir)/'`debug.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-debug.Tpo $(DEPDIR)/libfolks_la-debug.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='debug.c' object='libfolks_la-debug.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='debug.c' object='libfolks_la-debug.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-debug.lo `test -f 'debug.c' || echo '$(srcdir)/'`debug.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-debug.lo `test -f 'debug.c' || echo '$(srcdir)/'`debug.c libfolks_la-utils.lo: utils.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-utils.lo -MD -MP -MF $(DEPDIR)/libfolks_la-utils.Tpo -c -o libfolks_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-utils.Tpo $(DEPDIR)/libfolks_la-utils.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='utils.c' object='libfolks_la-utils.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utils.c' object='libfolks_la-utils.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c libfolks_la-potential-match.lo: potential-match.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-potential-match.lo -MD -MP -MF $(DEPDIR)/libfolks_la-potential-match.Tpo -c -o libfolks_la-potential-match.lo `test -f 'potential-match.c' || echo '$(srcdir)/'`potential-match.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-potential-match.Tpo $(DEPDIR)/libfolks_la-potential-match.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='potential-match.c' object='libfolks_la-potential-match.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='potential-match.c' object='libfolks_la-potential-match.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-potential-match.lo `test -f 'potential-match.c' || echo '$(srcdir)/'`potential-match.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-potential-match.lo `test -f 'potential-match.c' || echo '$(srcdir)/'`potential-match.c libfolks_la-avatar-cache.lo: avatar-cache.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-avatar-cache.lo -MD -MP -MF $(DEPDIR)/libfolks_la-avatar-cache.Tpo -c -o libfolks_la-avatar-cache.lo `test -f 'avatar-cache.c' || echo '$(srcdir)/'`avatar-cache.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-avatar-cache.Tpo $(DEPDIR)/libfolks_la-avatar-cache.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='avatar-cache.c' object='libfolks_la-avatar-cache.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='avatar-cache.c' object='libfolks_la-avatar-cache.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-avatar-cache.lo `test -f 'avatar-cache.c' || echo '$(srcdir)/'`avatar-cache.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-avatar-cache.lo `test -f 'avatar-cache.c' || echo '$(srcdir)/'`avatar-cache.c libfolks_la-object-cache.lo: object-cache.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -MT libfolks_la-object-cache.lo -MD -MP -MF $(DEPDIR)/libfolks_la-object-cache.Tpo -c -o libfolks_la-object-cache.lo `test -f 'object-cache.c' || echo '$(srcdir)/'`object-cache.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_la-object-cache.Tpo $(DEPDIR)/libfolks_la-object-cache.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='object-cache.c' object='libfolks_la-object-cache.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='object-cache.c' object='libfolks_la-object-cache.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-object-cache.lo `test -f 'object-cache.c' || echo '$(srcdir)/'`object-cache.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_la_CFLAGS) $(CFLAGS) -c -o libfolks_la-object-cache.lo `test -f 'object-cache.c' || echo '$(srcdir)/'`object-cache.c $(srcdir)/abstract-field-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/alias-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/avatar-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/backend.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/backend-store.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/birthday-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/email-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/favourite-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/gender-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/group-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/web-service-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/im-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/local-id-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/name-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/note-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/phone-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/postal-address-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/presence-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/role-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/url-details.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/individual.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/individual-aggregator.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/persona.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/persona-store.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/types.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/debug.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/utils.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/potential-match.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/avatar-cache.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/object-cache.c: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/folks.vapi: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi $(srcdir)/folks.h: $(srcdir)/libfolks_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_la_vala.stamp; \ fi libfolks_la_vala.stamp: $(libfolks_la_SOURCES) $(AM_V_VALAC)$(VALAC) $(libfolks_la_VALAFLAGS) $(VALAFLAGS) -C $(libfolks_la_SOURCES) $(AM_V_at)touch $@ $(srcdir)/internal.c: $(srcdir)/libfolks_internal_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_internal_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_internal_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_internal_la_vala.stamp; \ fi $(srcdir)/folks-internal.vapi: $(srcdir)/libfolks_internal_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_internal_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_internal_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_internal_la_vala.stamp; \ fi $(srcdir)/folks-internal.h: $(srcdir)/libfolks_internal_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_internal_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_internal_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_internal_la_vala.stamp; \ fi libfolks_internal_la_vala.stamp: $(libfolks_internal_la_SOURCES) @@ -1114,9 +1108,7 @@ @$(NORMAL_UNINSTALL) @list='$(dist_gir_DATA)'; test -n "$(girdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(girdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(girdir)" && rm -f $$files + dir='$(DESTDIR)$(girdir)'; $(am__uninstall_files_from_dir) install-dist_vapiDATA: $(dist_vapi_DATA) @$(NORMAL_INSTALL) test -z "$(vapidir)" || $(MKDIR_P) "$(DESTDIR)$(vapidir)" @@ -1134,9 +1126,7 @@ @$(NORMAL_UNINSTALL) @list='$(dist_vapi_DATA)'; test -n "$(vapidir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(vapidir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(vapidir)" && rm -f $$files + dir='$(DESTDIR)$(vapidir)'; $(am__uninstall_files_from_dir) install-nodist_typelibDATA: $(nodist_typelib_DATA) @$(NORMAL_INSTALL) test -z "$(typelibdir)" || $(MKDIR_P) "$(DESTDIR)$(typelibdir)" @@ -1154,9 +1144,7 @@ @$(NORMAL_UNINSTALL) @list='$(nodist_typelib_DATA)'; test -n "$(typelibdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(typelibdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(typelibdir)" && rm -f $$files + dir='$(DESTDIR)$(typelibdir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @@ -1174,9 +1162,7 @@ @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir) install-folksHEADERS: $(folks_HEADERS) @$(NORMAL_INSTALL) test -z "$(folksdir)" || $(MKDIR_P) "$(DESTDIR)$(folksdir)" @@ -1194,9 +1180,7 @@ @$(NORMAL_UNINSTALL) @list='$(folks_HEADERS)'; test -n "$(folksdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(folksdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(folksdir)" && rm -f $$files + dir='$(DESTDIR)$(folksdir)'; $(am__uninstall_files_from_dir) ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -1299,10 +1283,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/folks/name-details.c folks-0.6.7/folks/name-details.c --- folks-0.6.6/folks/name-details.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/name-details.c 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* name-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* name-details.c generated by valac 0.15.1, the Vala compiler * generated from name-details.vala, do not modify */ /* @@ -870,7 +870,7 @@ FolksNameDetailsChangeFullNameData* _data_; FolksNameDetails* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (FolksNameDetailsChangeFullNameData); _data_->_async_result = g_simple_async_result_new (NULL, _callback_, _user_data_, folks_name_details_real_change_full_name); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, folks_name_details_real_change_full_name_data_free); @@ -964,7 +964,7 @@ FolksNameDetailsChangeNicknameData* _data_; FolksNameDetails* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; _data_ = g_slice_new0 (FolksNameDetailsChangeNicknameData); _data_->_async_result = g_simple_async_result_new (NULL, _callback_, _user_data_, folks_name_details_real_change_nickname); g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, folks_name_details_real_change_nickname_data_free); diff -Nru folks-0.6.6/folks/note-details.c folks-0.6.7/folks/note-details.c --- folks-0.6.6/folks/note-details.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/note-details.c 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* note-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* note-details.c generated by valac 0.15.1, the Vala compiler * generated from note-details.vala, do not modify */ /* @@ -161,7 +161,8 @@ /** * Create a new NoteFieldDetails. * - * @param value the value of the field + * @param value the value of the field, which should be a non-empty free-form + * UTF-8 string as entered by the user * @param parameters initial parameters. See * {@link AbstractFieldDetails.parameters}. A `null` value is equivalent to a * empty map of parameters. @@ -174,12 +175,17 @@ FolksNoteFieldDetails * self = NULL; const gchar* _tmp0_; const gchar* _tmp1_; - GeeMultiMap* _tmp2_; + const gchar* _tmp2_; + GeeMultiMap* _tmp3_; g_return_val_if_fail (value != NULL, NULL); _tmp0_ = value; - _tmp1_ = uid; - _tmp2_ = parameters; - self = (FolksNoteFieldDetails*) g_object_new (object_type, "t_type", G_TYPE_STRING, "t_dup_func", (GBoxedCopyFunc) g_strdup, "t_destroy_func", g_free, "value", _tmp0_, "id", _tmp1_, "parameters", _tmp2_, NULL); + if (g_strcmp0 (_tmp0_, "") == 0) { + g_warning ("note-details.vala:75: Empty note passed to NoteFieldDetails."); + } + _tmp1_ = value; + _tmp2_ = uid; + _tmp3_ = parameters; + self = (FolksNoteFieldDetails*) g_object_new (object_type, "t_type", G_TYPE_STRING, "t_dup_func", (GBoxedCopyFunc) g_strdup, "t_destroy_func", g_free, "value", _tmp1_, "id", _tmp2_, "parameters", _tmp3_, NULL); return self; } @@ -216,40 +222,20 @@ static guint folks_note_field_details_real_hash (FolksAbstractFieldDetails* base) { FolksNoteFieldDetails * self; guint result = 0U; - guint retval; gconstpointer _tmp0_; const gchar* _tmp1_; - const gchar* _tmp6_; - const gchar* _tmp7_; + guint _tmp2_ = 0U; + const gchar* _tmp3_; + const gchar* _tmp4_; + guint _tmp5_ = 0U; self = (FolksNoteFieldDetails*) base; - retval = (guint) 0; _tmp0_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) self); _tmp1_ = _tmp0_; - if (((const gchar*) _tmp1_) != NULL) { - guint _tmp2_; - gconstpointer _tmp3_; - const gchar* _tmp4_; - guint _tmp5_ = 0U; - _tmp2_ = retval; - _tmp3_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) self); - _tmp4_ = _tmp3_; - _tmp5_ = g_str_hash ((const gchar*) _tmp4_); - retval = _tmp2_ + _tmp5_; - } - _tmp6_ = folks_abstract_field_details_get_id ((FolksAbstractFieldDetails*) self); - _tmp7_ = _tmp6_; - if (_tmp7_ != NULL) { - guint _tmp8_; - const gchar* _tmp9_; - const gchar* _tmp10_; - guint _tmp11_ = 0U; - _tmp8_ = retval; - _tmp9_ = folks_abstract_field_details_get_id ((FolksAbstractFieldDetails*) self); - _tmp10_ = _tmp9_; - _tmp11_ = g_str_hash (_tmp10_); - retval = _tmp8_ + _tmp11_; - } - result = retval; + _tmp2_ = g_str_hash ((const gchar*) _tmp1_); + _tmp3_ = folks_abstract_field_details_get_id ((FolksAbstractFieldDetails*) self); + _tmp4_ = _tmp3_; + _tmp5_ = g_str_hash (_tmp4_); + result = _tmp2_ + _tmp5_; return result; } @@ -322,7 +308,7 @@ /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_NOTE_FIELD_DETAILS_ID, "id"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_NOTE_FIELD_DETAILS_ID, g_param_spec_string ("id", "id", "id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); /** * The UID of the note (if any). */ diff -Nru folks-0.6.6/folks/note-details.vala folks-0.6.7/folks/note-details.vala --- folks-0.6.6/folks/note-details.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/folks/note-details.vala 2012-01-12 17:25:24.000000000 +0000 @@ -56,7 +56,8 @@ /** * Create a new NoteFieldDetails. * - * @param value the value of the field + * @param value the value of the field, which should be a non-empty free-form + * UTF-8 string as entered by the user * @param parameters initial parameters. See * {@link AbstractFieldDetails.parameters}. A `null` value is equivalent to a * empty map of parameters. @@ -69,6 +70,11 @@ MultiMap? parameters = null, string? uid = null) { + if (value == "") + { + warning ("Empty note passed to NoteFieldDetails."); + } + Object (value: value, id: uid, parameters: parameters); @@ -81,7 +87,7 @@ */ public override bool equal (AbstractFieldDetails that) { - return base.equal (that); + return base.equal (that); } /** @@ -91,15 +97,7 @@ */ public override uint hash () { - uint retval = 0; - - if (this.value != null) - retval += this.value.hash (); - - if (this.id != null) - retval += this.id.hash (); - - return retval; + return (this.value.hash () + this.id.hash ()); } } diff -Nru folks-0.6.6/folks/object-cache.c folks-0.6.7/folks/object-cache.c --- folks-0.6.6/folks/object-cache.c 2011-12-13 23:39:16.000000000 +0000 +++ folks-0.6.7/folks/object-cache.c 2012-02-23 00:01:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* object-cache.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* object-cache.c generated by valac 0.15.1, the Vala compiler * generated from object-cache.vala, do not modify */ /* @@ -68,6 +68,7 @@ GDestroyNotify t_destroy_func; GFile* _cache_directory; GFile* _cache_file; + gchar* _cache_file_path; gchar* _type_id; gchar* _id; }; @@ -82,128 +83,113 @@ GeeSet* result; const gchar* _tmp0_; const gchar* _tmp1_; - GFile* _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; + const gchar* _tmp2_; guint8* data; gint data_length1; gint _data_size_; - GFile* _tmp5_; - GCancellable* _tmp6_; - guint8* _tmp7_; - gint _tmp8_; + GFile* _tmp3_; + GCancellable* _tmp4_; + guint8* _tmp5_; + gsize _tmp6_; GError* e; - GError* _tmp9_; + GError* _tmp7_; + GError* _tmp8_; + const gchar* _tmp9_; GError* _tmp10_; - GFile* _tmp11_; - gchar* _tmp12_; - gchar* _tmp13_; - GError* _tmp14_; - const gchar* _tmp15_; - GFile* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; - GError* _tmp19_; - const gchar* _tmp20_; - guint8* _tmp21_; - gint _tmp21__length1; - GFile* _tmp22_; - gchar* _tmp23_; - gchar* _tmp24_; - guint8* _tmp25_; - gint _tmp25__length1; - guint8 _tmp26_; + const gchar* _tmp11_; + const gchar* _tmp12_; + GError* _tmp13_; + const gchar* _tmp14_; + guint8* _tmp15_; + gint _tmp15__length1; + const gchar* _tmp16_; + guint8* _tmp17_; + gint _tmp17__length1; + guint8 _tmp18_; guint8 wrapper_version; - guint8* _tmp27_; - gint _tmp27__length1; - guint8 _tmp28_; + guint8* _tmp19_; + gint _tmp19__length1; + guint8 _tmp20_; guint8 object_version; - guint8 _tmp29_; - GFile* _tmp30_; - gchar* _tmp31_; - gchar* _tmp32_; - guint8 _tmp33_; - guint8* _tmp34_; - gint _tmp34__length1; - guint8* _tmp35_; - gint _tmp35__length1; + guint8 _tmp21_; + const gchar* _tmp22_; + guint8 _tmp23_; + guint8* _tmp24_; + gint _tmp24__length1; + guint8* _tmp25_; + gint _tmp25__length1; guint8* variant_data; gint variant_data_length1; gint _variant_data_size_; - guint8 _tmp36_; - guint8 _tmp37_; - GVariantType* _tmp38_; + guint8 _tmp26_; + guint8 _tmp27_; + GVariantType* _tmp28_; + GVariantType* _variant_type; + const GVariantType* _tmp29_; + const gchar* _tmp30_; + guint8 _tmp31_; + const GVariantType* _tmp32_; + GVariantType* _tmp33_; GVariantType* variant_type; - const GVariantType* _tmp39_; - GFile* _tmp40_; - gchar* _tmp41_; - gchar* _tmp42_; - guint8 _tmp43_; - const GVariantType* _tmp44_; - guint8* _tmp45_; - gint _tmp45__length1; - guint8* _tmp46_; - gint _tmp46__length1; - guint8* _tmp47_; - gint _tmp47__length1; - GVariant* _tmp48_; - GVariant* _tmp49_; + const GVariantType* _tmp34_; + guint8* _tmp35_; + gint _tmp35__length1; + guint8* _tmp36_; + gint _tmp36__length1; + guint8* _tmp37_; + gint _tmp37__length1; + GVariant* _tmp38_; + GVariant* _tmp39_; GVariant* variant; - GVariant* _tmp50_; - gboolean _tmp51_; - GFile* _tmp52_; - gchar* _tmp53_; - gchar* _tmp54_; + GVariant* _tmp40_; + gboolean _tmp41_; + const gchar* _tmp42_; + GVariant* _tmp43_; + GVariant* _tmp44_; + GVariant* _tmp45_; + const gchar* _tmp46_; + gchar* _tmp47_; + gchar* _tmp48_; + gchar* type_id; + const gchar* _tmp49_; + const gchar* _tmp50_; + const gchar* _tmp51_; + const gchar* _tmp52_; + const gchar* _tmp53_; + GVariant* _tmp54_; GVariant* _tmp55_; GVariant* _tmp56_; - GVariant* _tmp57_; - const gchar* _tmp58_; + const gchar* _tmp57_; + gchar* _tmp58_; gchar* _tmp59_; - gchar* _tmp60_; - gchar* type_id; + gchar* id; + const gchar* _tmp60_; const gchar* _tmp61_; const gchar* _tmp62_; - GFile* _tmp63_; - gchar* _tmp64_; - gchar* _tmp65_; - const gchar* _tmp66_; - const gchar* _tmp67_; - GVariant* _tmp68_; - GVariant* _tmp69_; - GVariant* _tmp70_; - const gchar* _tmp71_; - gchar* _tmp72_; - gchar* _tmp73_; - gchar* id; - const gchar* _tmp74_; - const gchar* _tmp75_; - GFile* _tmp76_; - gchar* _tmp77_; - gchar* _tmp78_; - const gchar* _tmp79_; - const gchar* _tmp80_; - GVariant* _tmp81_; - GVariant* _tmp82_; + const gchar* _tmp63_; + const gchar* _tmp64_; + GVariant* _tmp65_; + GVariant* _tmp66_; GVariant* objects_variant; - GeeHashSet* _tmp83_; + GeeHashSet* _tmp67_; GeeHashSet* objects; guint i; - gboolean _tmp84_; - gboolean _tmp85_; - guint _tmp86_; - guint _tmp87_; - GVariant* _tmp88_; - gsize _tmp89_; - GVariant* _tmp90_; - guint _tmp91_; - GVariant* _tmp92_; + gboolean _tmp68_; + gboolean _tmp69_; + guint _tmp70_; + guint _tmp71_; + GVariant* _tmp72_; + gsize _tmp73_; + GVariant* _tmp74_; + guint _tmp75_; + GVariant* _tmp76_; GVariant* object_variant; - GVariant* _tmp93_; - guint8 _tmp94_; - gpointer _tmp95_; + GVariant* _tmp77_; + guint8 _tmp78_; + gpointer _tmp79_; gpointer object; - GeeHashSet* _tmp96_; - gconstpointer _tmp97_; + GeeHashSet* _tmp80_; + gconstpointer _tmp81_; GError * _inner_error_; }; @@ -217,85 +203,85 @@ GCancellable* cancellable; const gchar* _tmp0_; const gchar* _tmp1_; - GFile* _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; - guint8 _tmp5_; - GVariantType* _tmp6_; + const gchar* _tmp2_; + guint8 _tmp3_; + GVariantType* _tmp4_; GVariantType* child_type; - const GVariantType* _tmp7_; - GeeSet* _tmp8_; - gint _tmp9_; - gint _tmp10_; - GVariant** _tmp11_; + const GVariantType* _tmp5_; + GeeSet* _tmp6_; + gint _tmp7_; + gint _tmp8_; + GVariant** _tmp9_; GVariant** children; gint children_length1; gint _children_size_; guint i; - GeeSet* _tmp12_; - GeeIterator* _tmp13_; + GeeSet* _tmp10_; + GeeIterator* _tmp11_; GeeIterator* _object_it; + GeeIterator* _tmp12_; + gboolean _tmp13_; GeeIterator* _tmp14_; - gboolean _tmp15_; - GeeIterator* _tmp16_; - gpointer _tmp17_; + gpointer _tmp15_; gpointer object; - GVariant** _tmp18_; - gint _tmp18__length1; - guint _tmp19_; - gconstpointer _tmp20_; - GVariant* _tmp21_; - GVariant* _tmp22_; + GVariant** _tmp16_; + gint _tmp16__length1; + guint _tmp17_; + gconstpointer _tmp18_; + GVariant* _tmp19_; + GVariant* _tmp20_; guint8 wrapper_version; - guint8 _tmp23_; + guint8 _tmp21_; guint8 object_version; - const gchar* _tmp24_; - GVariant* _tmp25_; + const gchar* _tmp22_; + GVariant* _tmp23_; + GVariant* _tmp24_; + const gchar* _tmp25_; GVariant* _tmp26_; - const gchar* _tmp27_; - GVariant* _tmp28_; - GVariant* _tmp29_; - const GVariantType* _tmp30_; - GVariant** _tmp31_; - gint _tmp31__length1; - GVariant* _tmp32_; - GVariant* _tmp33_; - GVariant** _tmp34_; - GVariant** _tmp35_; - gint _tmp35__length1; + GVariant* _tmp27_; + const GVariantType* _tmp28_; + GVariant** _tmp29_; + gint _tmp29__length1; + GVariant* _tmp30_; + GVariant* _tmp31_; + GVariant** _tmp32_; + GVariant** _tmp33_; + gint _tmp33__length1; + GVariant* _tmp34_; + GVariant* _tmp35_; GVariant* _tmp36_; - GVariant* _tmp37_; - GVariant* _tmp38_; GVariant* variant; - GVariant* _tmp39_; - const GVariantType* _tmp40_; - guint8 _tmp41_; - guint8 _tmp42_; - GVariantType* _tmp43_; - GVariantType* _tmp44_; + guint8 _tmp37_; + guint8 _tmp38_; + GVariantType* _tmp39_; + GVariantType* desired_variant_type; + gboolean _tmp40_; + const GVariantType* _tmp41_; + GVariant* _tmp42_; + const GVariantType* _tmp43_; + const GVariantType* _tmp44_; gboolean _tmp45_; - GVariant* _tmp46_; - gsize _tmp47_; - guint8* _tmp48_; + gboolean _tmp46_; + GVariant* _tmp47_; + gsize _tmp48_; + guint8* _tmp49_; guint8* data; gint data_length1; gint _data_size_; - guint8* _tmp49_; - gint _tmp49__length1; - guint8 _tmp50_; + guint8* _tmp50_; + gint _tmp50__length1; guint8 _tmp51_; - guint8* _tmp52_; - gint _tmp52__length1; - guint8 _tmp53_; + guint8 _tmp52_; + guint8* _tmp53_; + gint _tmp53__length1; guint8 _tmp54_; - GVariant* _tmp55_; - guint8* _tmp56_; - gint _tmp56__length1; + guint8 _tmp55_; + GVariant* _tmp56_; guint8* _tmp57_; gint _tmp57__length1; - GFile* _tmp58_; - guint8* _tmp59_; - gint _tmp59__length1; + guint8* _tmp58_; + gint _tmp58__length1; + GFile* _tmp59_; guint8* _tmp60_; gint _tmp60__length1; GCancellable* _tmp61_; @@ -308,11 +294,9 @@ GError* _tmp66_; const gchar* _tmp67_; GError* _tmp68_; - GFile* _tmp69_; - gchar* _tmp70_; - gchar* _tmp71_; - GError* _tmp72_; - const gchar* _tmp73_; + const gchar* _tmp69_; + GError* _tmp70_; + const gchar* _tmp71_; GError * _inner_error_; }; @@ -324,10 +308,8 @@ FolksObjectCache* self; const gchar* _tmp0_; const gchar* _tmp1_; - GFile* _tmp2_; - gchar* _tmp3_; - gchar* _tmp4_; - GFile* _tmp5_; + const gchar* _tmp2_; + GFile* _tmp3_; GError* e; GError * _inner_error_; }; @@ -590,6 +572,11 @@ } +static gpointer _g_variant_type_copy0 (gpointer self) { + return self ? g_variant_type_copy (self) : NULL; +} + + static guint8* _vala_array_dup1 (guint8* self, int length) { return g_memdup (self, length * sizeof (guint8)); } @@ -619,28 +606,24 @@ _state_0: _data_->_tmp0_ = _data_->self->priv->_type_id; _data_->_tmp1_ = _data_->self->priv->_id; - _data_->_tmp2_ = _data_->self->priv->_cache_file; - _data_->_tmp3_ = NULL; - _data_->_tmp3_ = g_file_get_path (_data_->_tmp2_); - _data_->_tmp4_ = _data_->_tmp3_; - g_debug ("object-cache.vala:186: Loading cache (type ID '%s', ID '%s') from file" \ -" '%s'.", _data_->_tmp0_, _data_->_tmp1_, _data_->_tmp4_); - _g_free0 (_data_->_tmp4_); + _data_->_tmp2_ = _data_->self->priv->_cache_file_path; + g_debug ("object-cache.vala:189: Loading cache (type ID '%s', ID '%s') from file" \ +" '%s'.", _data_->_tmp0_, _data_->_tmp1_, _data_->_tmp2_); _data_->data_length1 = 0; _data_->_data_size_ = 0; { - _data_->_tmp5_ = _data_->self->priv->_cache_file; - _data_->_tmp6_ = _data_->cancellable; - _data_->_tmp7_ = NULL; - _data_->_tmp8_ = 0; + _data_->_tmp3_ = _data_->self->priv->_cache_file; + _data_->_tmp4_ = _data_->cancellable; + _data_->_tmp5_ = NULL; + memset (&_data_->_tmp6_, 0, sizeof (gsize)); _data_->_state_ = 1; - g_file_load_contents_async (_data_->_tmp5_, _data_->_tmp6_, folks_object_cache_load_objects_ready, _data_); + g_file_load_contents_async (_data_->_tmp3_, _data_->_tmp4_, folks_object_cache_load_objects_ready, _data_); return FALSE; _state_1: - g_file_load_contents_finish (_data_->_tmp5_, _data_->_res_, &_data_->_tmp7_, &_data_->_tmp8_, NULL, &_data_->_inner_error_); + g_file_load_contents_finish (_data_->_tmp3_, _data_->_res_, &_data_->_tmp5_, &_data_->_tmp6_, NULL, &_data_->_inner_error_); _data_->data = (g_free (_data_->data), NULL); - _data_->data = _data_->_tmp7_; - _data_->data_length1 = _data_->_tmp8_; + _data_->data = _data_->_tmp5_; + _data_->data_length1 = _data_->_tmp6_; _data_->_data_size_ = _data_->data_length1; if (_data_->_inner_error_ != NULL) { goto __catch35_g_error; @@ -651,28 +634,20 @@ { _data_->e = _data_->_inner_error_; _data_->_inner_error_ = NULL; - _data_->_tmp9_ = _data_->e; - if (g_error_matches (_data_->_tmp9_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { + _data_->_tmp7_ = _data_->e; + if (g_error_matches (_data_->_tmp7_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { } else { - _data_->_tmp10_ = _data_->e; - if (g_error_matches (_data_->_tmp10_, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) { - _data_->_tmp11_ = _data_->self->priv->_cache_file; - _data_->_tmp12_ = NULL; - _data_->_tmp12_ = g_file_get_path (_data_->_tmp11_); - _data_->_tmp13_ = _data_->_tmp12_; - _data_->_tmp14_ = _data_->e; - _data_->_tmp15_ = _data_->_tmp14_->message; - g_debug ("object-cache.vala:204: Couldn't load cache file '%s': %s", _data_->_tmp13_, _data_->_tmp15_); - _g_free0 (_data_->_tmp13_); + _data_->_tmp8_ = _data_->e; + if (g_error_matches (_data_->_tmp8_, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) { + _data_->_tmp9_ = _data_->self->priv->_cache_file_path; + _data_->_tmp10_ = _data_->e; + _data_->_tmp11_ = _data_->_tmp10_->message; + g_debug ("object-cache.vala:207: Couldn't load cache file '%s': %s", _data_->_tmp9_, _data_->_tmp11_); } else { - _data_->_tmp16_ = _data_->self->priv->_cache_file; - _data_->_tmp17_ = NULL; - _data_->_tmp17_ = g_file_get_path (_data_->_tmp16_); - _data_->_tmp18_ = _data_->_tmp17_; - _data_->_tmp19_ = _data_->e; - _data_->_tmp20_ = _data_->_tmp19_->message; - g_warning ("object-cache.vala:209: Couldn't load cache file '%s': %s", _data_->_tmp18_, _data_->_tmp20_); - _g_free0 (_data_->_tmp18_); + _data_->_tmp12_ = _data_->self->priv->_cache_file_path; + _data_->_tmp13_ = _data_->e; + _data_->_tmp14_ = _data_->_tmp13_->message; + g_warning ("object-cache.vala:212: Couldn't load cache file '%s': %s", _data_->_tmp12_, _data_->_tmp14_); } } _data_->result = NULL; @@ -693,16 +668,12 @@ g_clear_error (&_data_->_inner_error_); return FALSE; } - _data_->_tmp21_ = _data_->data; - _data_->_tmp21__length1 = _data_->data_length1; - if (((gsize) _data_->_tmp21__length1) < FOLKS_OBJECT_CACHE__HEADER_WIDTH) { - _data_->_tmp22_ = _data_->self->priv->_cache_file; - _data_->_tmp23_ = NULL; - _data_->_tmp23_ = g_file_get_path (_data_->_tmp22_); - _data_->_tmp24_ = _data_->_tmp23_; - g_warning ("object-cache.vala:219: Cache file '%s' was too small. The file was del" \ -"eted.", _data_->_tmp24_); - _g_free0 (_data_->_tmp24_); + _data_->_tmp15_ = _data_->data; + _data_->_tmp15__length1 = _data_->data_length1; + if (((gsize) _data_->_tmp15__length1) < FOLKS_OBJECT_CACHE__HEADER_WIDTH) { + _data_->_tmp16_ = _data_->self->priv->_cache_file_path; + g_warning ("object-cache.vala:222: Cache file '%s' was too small. The file was del" \ +"eted.", _data_->_tmp16_); _data_->_state_ = 2; folks_object_cache_clear_cache (_data_->self, folks_object_cache_load_objects_ready, _data_); return FALSE; @@ -718,23 +689,19 @@ g_object_unref (_data_->_async_result); return FALSE; } - _data_->_tmp25_ = _data_->data; - _data_->_tmp25__length1 = _data_->data_length1; - _data_->_tmp26_ = _data_->_tmp25_[0]; - _data_->wrapper_version = _data_->_tmp26_; - _data_->_tmp27_ = _data_->data; - _data_->_tmp27__length1 = _data_->data_length1; - _data_->_tmp28_ = _data_->_tmp27_[1]; - _data_->object_version = _data_->_tmp28_; - _data_->_tmp29_ = _data_->wrapper_version; - if (_data_->_tmp29_ != FOLKS_OBJECT_CACHE__FILE_FORMAT_VERSION) { - _data_->_tmp30_ = _data_->self->priv->_cache_file; - _data_->_tmp31_ = NULL; - _data_->_tmp31_ = g_file_get_path (_data_->_tmp30_); - _data_->_tmp32_ = _data_->_tmp31_; - _data_->_tmp33_ = _data_->wrapper_version; - g_warning ("Cache file '%s' was version %u of the file format, " "but only version %u is supported. The file was deleted.", _data_->_tmp32_, _data_->_tmp33_, FOLKS_OBJECT_CACHE__FILE_FORMAT_VERSION); - _g_free0 (_data_->_tmp32_); + _data_->_tmp17_ = _data_->data; + _data_->_tmp17__length1 = _data_->data_length1; + _data_->_tmp18_ = _data_->_tmp17_[0]; + _data_->wrapper_version = _data_->_tmp18_; + _data_->_tmp19_ = _data_->data; + _data_->_tmp19__length1 = _data_->data_length1; + _data_->_tmp20_ = _data_->_tmp19_[1]; + _data_->object_version = _data_->_tmp20_; + _data_->_tmp21_ = _data_->wrapper_version; + if (_data_->_tmp21_ != FOLKS_OBJECT_CACHE__FILE_FORMAT_VERSION) { + _data_->_tmp22_ = _data_->self->priv->_cache_file_path; + _data_->_tmp23_ = _data_->wrapper_version; + g_warning ("Cache file '%s' was version %u of the file format, " "but only version %u is supported. The file was deleted.", _data_->_tmp22_, _data_->_tmp23_, FOLKS_OBJECT_CACHE__FILE_FORMAT_VERSION); _data_->_state_ = 3; folks_object_cache_clear_cache (_data_->self, folks_object_cache_load_objects_ready, _data_); return FALSE; @@ -750,34 +717,30 @@ g_object_unref (_data_->_async_result); return FALSE; } - _data_->_tmp34_ = _data_->data; - _data_->_tmp34__length1 = _data_->data_length1; - _data_->_tmp35_ = _data_->data; - _data_->_tmp35__length1 = _data_->data_length1; - _data_->variant_data = _data_->_tmp34_ + FOLKS_OBJECT_CACHE__HEADER_WIDTH; - _data_->variant_data_length1 = _data_->_tmp35__length1 - FOLKS_OBJECT_CACHE__HEADER_WIDTH; + _data_->_tmp24_ = _data_->data; + _data_->_tmp24__length1 = _data_->data_length1; + _data_->_tmp25_ = _data_->data; + _data_->_tmp25__length1 = _data_->data_length1; + _data_->variant_data = _data_->_tmp24_ + FOLKS_OBJECT_CACHE__HEADER_WIDTH; + _data_->variant_data_length1 = _data_->_tmp25__length1 - FOLKS_OBJECT_CACHE__HEADER_WIDTH; _data_->_variant_data_size_ = _data_->variant_data_length1; - _data_->_tmp36_ = _data_->wrapper_version; - _data_->_tmp37_ = _data_->object_version; - _data_->_tmp38_ = NULL; - _data_->_tmp38_ = _folks_object_cache_get_cache_file_variant_type (_data_->self, _data_->_tmp36_, _data_->_tmp37_); - _data_->variant_type = _data_->_tmp38_; - _data_->_tmp39_ = _data_->variant_type; - if (_data_->_tmp39_ == NULL) { - _data_->_tmp40_ = _data_->self->priv->_cache_file; - _data_->_tmp41_ = NULL; - _data_->_tmp41_ = g_file_get_path (_data_->_tmp40_); - _data_->_tmp42_ = _data_->_tmp41_; - _data_->_tmp43_ = _data_->object_version; - g_warning ("Cache file '%s' was version %u of the object file " "format, which is not supported. The file was deleted.", _data_->_tmp42_, _data_->_tmp43_, FOLKS_OBJECT_CACHE__FILE_FORMAT_VERSION); - _g_free0 (_data_->_tmp42_); + _data_->_tmp26_ = _data_->wrapper_version; + _data_->_tmp27_ = _data_->object_version; + _data_->_tmp28_ = NULL; + _data_->_tmp28_ = _folks_object_cache_get_cache_file_variant_type (_data_->self, _data_->_tmp26_, _data_->_tmp27_); + _data_->_variant_type = _data_->_tmp28_; + _data_->_tmp29_ = _data_->_variant_type; + if (_data_->_tmp29_ == NULL) { + _data_->_tmp30_ = _data_->self->priv->_cache_file_path; + _data_->_tmp31_ = _data_->object_version; + g_warning ("Cache file '%s' was version %u of the object file " "format, which is not supported. The file was deleted.", _data_->_tmp30_, _data_->_tmp31_, FOLKS_OBJECT_CACHE__FILE_FORMAT_VERSION); _data_->_state_ = 4; folks_object_cache_clear_cache (_data_->self, folks_object_cache_load_objects_ready, _data_); return FALSE; _state_4: folks_object_cache_clear_cache_finish (_data_->self, _data_->_res_); _data_->result = NULL; - _g_variant_type_free0 (_data_->variant_type); + _g_variant_type_free0 (_data_->_variant_type); _data_->data = (g_free (_data_->data), NULL); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); @@ -787,27 +750,26 @@ g_object_unref (_data_->_async_result); return FALSE; } - _data_->_tmp44_ = _data_->variant_type; - _data_->_tmp45_ = _data_->variant_data; - _data_->_tmp45__length1 = _data_->variant_data_length1; - _data_->_tmp46_ = _data_->data; - _data_->_tmp46__length1 = _data_->data_length1; - _data_->_tmp47_ = (_data_->_tmp46_ != NULL) ? _vala_array_dup1 (_data_->_tmp46_, _data_->_tmp46__length1) : ((gpointer) _data_->_tmp46_); - _data_->_tmp47__length1 = _data_->_tmp46__length1; - _data_->_tmp48_ = NULL; - _data_->_tmp48_ = g_variant_new_from_data (_data_->_tmp44_, _data_->_tmp45_, _data_->_tmp45__length1, FALSE, g_free, _data_->_tmp47_); - _data_->_tmp49_ = g_variant_ref_sink (_data_->_tmp48_); - _data_->variant = _data_->_tmp49_; - _data_->_tmp50_ = _data_->variant; - _data_->_tmp51_ = FALSE; - _data_->_tmp51_ = g_variant_is_normal_form (_data_->_tmp50_); - if (_data_->_tmp51_ == FALSE) { - _data_->_tmp52_ = _data_->self->priv->_cache_file; - _data_->_tmp53_ = NULL; - _data_->_tmp53_ = g_file_get_path (_data_->_tmp52_); - _data_->_tmp54_ = _data_->_tmp53_; - g_warning ("object-cache.vala:265: Cache file '%s' was corrupt and was deleted.", _data_->_tmp54_); - _g_free0 (_data_->_tmp54_); + _data_->_tmp32_ = _data_->_variant_type; + _data_->_tmp33_ = _g_variant_type_copy0 ((const GVariantType*) _data_->_tmp32_); + _data_->variant_type = _data_->_tmp33_; + _data_->_tmp34_ = _data_->variant_type; + _data_->_tmp35_ = _data_->variant_data; + _data_->_tmp35__length1 = _data_->variant_data_length1; + _data_->_tmp36_ = _data_->data; + _data_->_tmp36__length1 = _data_->data_length1; + _data_->_tmp37_ = (_data_->_tmp36_ != NULL) ? _vala_array_dup1 (_data_->_tmp36_, _data_->_tmp36__length1) : ((gpointer) _data_->_tmp36_); + _data_->_tmp37__length1 = _data_->_tmp36__length1; + _data_->_tmp38_ = NULL; + _data_->_tmp38_ = g_variant_new_from_data (_data_->_tmp34_, _data_->_tmp35_, _data_->_tmp35__length1, FALSE, g_free, _data_->_tmp37_); + _data_->_tmp39_ = g_variant_ref_sink (_data_->_tmp38_); + _data_->variant = _data_->_tmp39_; + _data_->_tmp40_ = _data_->variant; + _data_->_tmp41_ = FALSE; + _data_->_tmp41_ = g_variant_is_normal_form (_data_->_tmp40_); + if (_data_->_tmp41_ == FALSE) { + _data_->_tmp42_ = _data_->self->priv->_cache_file_path; + g_warning ("object-cache.vala:269: Cache file '%s' was corrupt and was deleted.", _data_->_tmp42_); _data_->_state_ = 5; folks_object_cache_clear_cache (_data_->self, folks_object_cache_load_objects_ready, _data_); return FALSE; @@ -816,6 +778,7 @@ _data_->result = NULL; _g_variant_unref0 (_data_->variant); _g_variant_type_free0 (_data_->variant_type); + _g_variant_type_free0 (_data_->_variant_type); _data_->data = (g_free (_data_->data), NULL); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); @@ -825,27 +788,23 @@ g_object_unref (_data_->_async_result); return FALSE; } - _data_->_tmp55_ = _data_->variant; - _data_->_tmp56_ = NULL; - _data_->_tmp56_ = g_variant_get_child_value (_data_->_tmp55_, (gsize) 0); - _data_->_tmp57_ = _data_->_tmp56_; - _data_->_tmp58_ = NULL; - _data_->_tmp58_ = g_variant_get_string (_data_->_tmp57_, NULL); - _data_->_tmp59_ = g_strdup (_data_->_tmp58_); - _data_->_tmp60_ = _data_->_tmp59_; - _g_variant_unref0 (_data_->_tmp57_); - _data_->type_id = _data_->_tmp60_; - _data_->_tmp61_ = _data_->type_id; - _data_->_tmp62_ = _data_->self->priv->_type_id; - if (g_strcmp0 (_data_->_tmp61_, _data_->_tmp62_) != 0) { - _data_->_tmp63_ = _data_->self->priv->_cache_file; - _data_->_tmp64_ = NULL; - _data_->_tmp64_ = g_file_get_path (_data_->_tmp63_); - _data_->_tmp65_ = _data_->_tmp64_; - _data_->_tmp66_ = _data_->type_id; - _data_->_tmp67_ = _data_->self->priv->_type_id; - g_warning ("Cache file '%s' had type ID '%s', but '%s' was expected." "The file was deleted.", _data_->_tmp65_, _data_->_tmp66_, _data_->_tmp67_); - _g_free0 (_data_->_tmp65_); + _data_->_tmp43_ = _data_->variant; + _data_->_tmp44_ = NULL; + _data_->_tmp44_ = g_variant_get_child_value (_data_->_tmp43_, (gsize) 0); + _data_->_tmp45_ = _data_->_tmp44_; + _data_->_tmp46_ = NULL; + _data_->_tmp46_ = g_variant_get_string (_data_->_tmp45_, NULL); + _data_->_tmp47_ = g_strdup (_data_->_tmp46_); + _data_->_tmp48_ = _data_->_tmp47_; + _g_variant_unref0 (_data_->_tmp45_); + _data_->type_id = _data_->_tmp48_; + _data_->_tmp49_ = _data_->type_id; + _data_->_tmp50_ = _data_->self->priv->_type_id; + if (g_strcmp0 (_data_->_tmp49_, _data_->_tmp50_) != 0) { + _data_->_tmp51_ = _data_->self->priv->_cache_file_path; + _data_->_tmp52_ = _data_->type_id; + _data_->_tmp53_ = _data_->self->priv->_type_id; + g_warning ("Cache file '%s' had type ID '%s', but '%s' was expected." "The file was deleted.", _data_->_tmp51_, _data_->_tmp52_, _data_->_tmp53_); _data_->_state_ = 6; folks_object_cache_clear_cache (_data_->self, folks_object_cache_load_objects_ready, _data_); return FALSE; @@ -855,6 +814,7 @@ _g_free0 (_data_->type_id); _g_variant_unref0 (_data_->variant); _g_variant_type_free0 (_data_->variant_type); + _g_variant_type_free0 (_data_->_variant_type); _data_->data = (g_free (_data_->data), NULL); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); @@ -864,27 +824,23 @@ g_object_unref (_data_->_async_result); return FALSE; } - _data_->_tmp68_ = _data_->variant; - _data_->_tmp69_ = NULL; - _data_->_tmp69_ = g_variant_get_child_value (_data_->_tmp68_, (gsize) 1); - _data_->_tmp70_ = _data_->_tmp69_; - _data_->_tmp71_ = NULL; - _data_->_tmp71_ = g_variant_get_string (_data_->_tmp70_, NULL); - _data_->_tmp72_ = g_strdup (_data_->_tmp71_); - _data_->_tmp73_ = _data_->_tmp72_; - _g_variant_unref0 (_data_->_tmp70_); - _data_->id = _data_->_tmp73_; - _data_->_tmp74_ = _data_->id; - _data_->_tmp75_ = _data_->self->priv->_id; - if (g_strcmp0 (_data_->_tmp74_, _data_->_tmp75_) != 0) { - _data_->_tmp76_ = _data_->self->priv->_cache_file; - _data_->_tmp77_ = NULL; - _data_->_tmp77_ = g_file_get_path (_data_->_tmp76_); - _data_->_tmp78_ = _data_->_tmp77_; - _data_->_tmp79_ = _data_->id; - _data_->_tmp80_ = _data_->self->priv->_id; - g_warning ("Cache file '%s' had ID '%s', but '%s' was expected." "The file was deleted.", _data_->_tmp78_, _data_->_tmp79_, _data_->_tmp80_); - _g_free0 (_data_->_tmp78_); + _data_->_tmp54_ = _data_->variant; + _data_->_tmp55_ = NULL; + _data_->_tmp55_ = g_variant_get_child_value (_data_->_tmp54_, (gsize) 1); + _data_->_tmp56_ = _data_->_tmp55_; + _data_->_tmp57_ = NULL; + _data_->_tmp57_ = g_variant_get_string (_data_->_tmp56_, NULL); + _data_->_tmp58_ = g_strdup (_data_->_tmp57_); + _data_->_tmp59_ = _data_->_tmp58_; + _g_variant_unref0 (_data_->_tmp56_); + _data_->id = _data_->_tmp59_; + _data_->_tmp60_ = _data_->id; + _data_->_tmp61_ = _data_->self->priv->_id; + if (g_strcmp0 (_data_->_tmp60_, _data_->_tmp61_) != 0) { + _data_->_tmp62_ = _data_->self->priv->_cache_file_path; + _data_->_tmp63_ = _data_->id; + _data_->_tmp64_ = _data_->self->priv->_id; + g_warning ("Cache file '%s' had ID '%s', but '%s' was expected." "The file was deleted.", _data_->_tmp62_, _data_->_tmp63_, _data_->_tmp64_); _data_->_state_ = 7; folks_object_cache_clear_cache (_data_->self, folks_object_cache_load_objects_ready, _data_); return FALSE; @@ -895,6 +851,7 @@ _g_free0 (_data_->type_id); _g_variant_unref0 (_data_->variant); _g_variant_type_free0 (_data_->variant_type); + _g_variant_type_free0 (_data_->_variant_type); _data_->data = (g_free (_data_->data), NULL); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); @@ -904,43 +861,43 @@ g_object_unref (_data_->_async_result); return FALSE; } - _data_->_tmp81_ = _data_->variant; - _data_->_tmp82_ = NULL; - _data_->_tmp82_ = g_variant_get_child_value (_data_->_tmp81_, (gsize) 2); - _data_->objects_variant = _data_->_tmp82_; - _data_->_tmp83_ = gee_hash_set_new (_data_->self->priv->t_type, (GBoxedCopyFunc) _data_->self->priv->t_dup_func, _data_->self->priv->t_destroy_func, NULL, NULL); - _data_->objects = _data_->_tmp83_; + _data_->_tmp65_ = _data_->variant; + _data_->_tmp66_ = NULL; + _data_->_tmp66_ = g_variant_get_child_value (_data_->_tmp65_, (gsize) 2); + _data_->objects_variant = _data_->_tmp66_; + _data_->_tmp67_ = gee_hash_set_new (_data_->self->priv->t_type, (GBoxedCopyFunc) _data_->self->priv->t_dup_func, _data_->self->priv->t_destroy_func, NULL, NULL); + _data_->objects = _data_->_tmp67_; { _data_->i = (guint) 0; { - _data_->_tmp84_ = TRUE; + _data_->_tmp68_ = TRUE; while (TRUE) { - _data_->_tmp85_ = _data_->_tmp84_; - if (!_data_->_tmp85_) { - _data_->_tmp86_ = _data_->i; - _data_->i = _data_->_tmp86_ + 1; + _data_->_tmp69_ = _data_->_tmp68_; + if (!_data_->_tmp69_) { + _data_->_tmp70_ = _data_->i; + _data_->i = _data_->_tmp70_ + 1; } - _data_->_tmp84_ = FALSE; - _data_->_tmp87_ = _data_->i; - _data_->_tmp88_ = _data_->objects_variant; - _data_->_tmp89_ = 0UL; - _data_->_tmp89_ = g_variant_n_children (_data_->_tmp88_); - if (!(((gsize) _data_->_tmp87_) < _data_->_tmp89_)) { + _data_->_tmp68_ = FALSE; + _data_->_tmp71_ = _data_->i; + _data_->_tmp72_ = _data_->objects_variant; + _data_->_tmp73_ = 0UL; + _data_->_tmp73_ = g_variant_n_children (_data_->_tmp72_); + if (!(((gsize) _data_->_tmp71_) < _data_->_tmp73_)) { break; } - _data_->_tmp90_ = _data_->objects_variant; - _data_->_tmp91_ = _data_->i; - _data_->_tmp92_ = NULL; - _data_->_tmp92_ = g_variant_get_child_value (_data_->_tmp90_, (gsize) _data_->_tmp91_); - _data_->object_variant = _data_->_tmp92_; - _data_->_tmp93_ = _data_->object_variant; - _data_->_tmp94_ = _data_->object_version; - _data_->_tmp95_ = NULL; - _data_->_tmp95_ = folks_object_cache_deserialise_object (_data_->self, _data_->_tmp93_, _data_->_tmp94_); - _data_->object = _data_->_tmp95_; - _data_->_tmp96_ = _data_->objects; - _data_->_tmp97_ = _data_->object; - gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp96_, _data_->_tmp97_); + _data_->_tmp74_ = _data_->objects_variant; + _data_->_tmp75_ = _data_->i; + _data_->_tmp76_ = NULL; + _data_->_tmp76_ = g_variant_get_child_value (_data_->_tmp74_, (gsize) _data_->_tmp75_); + _data_->object_variant = _data_->_tmp76_; + _data_->_tmp77_ = _data_->object_variant; + _data_->_tmp78_ = _data_->object_version; + _data_->_tmp79_ = NULL; + _data_->_tmp79_ = folks_object_cache_deserialise_object (_data_->self, _data_->_tmp77_, _data_->_tmp78_); + _data_->object = _data_->_tmp79_; + _data_->_tmp80_ = _data_->objects; + _data_->_tmp81_ = _data_->object; + gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp80_, _data_->_tmp81_); ((_data_->object == NULL) || (_data_->self->priv->t_destroy_func == NULL)) ? NULL : (_data_->object = (_data_->self->priv->t_destroy_func (_data_->object), NULL)); _g_variant_unref0 (_data_->object_variant); } @@ -952,6 +909,7 @@ _g_free0 (_data_->type_id); _g_variant_unref0 (_data_->variant); _g_variant_type_free0 (_data_->variant_type); + _g_variant_type_free0 (_data_->_variant_type); _data_->data = (g_free (_data_->data), NULL); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); @@ -966,6 +924,7 @@ _g_free0 (_data_->type_id); _g_variant_unref0 (_data_->variant); _g_variant_type_free0 (_data_->variant_type); + _g_variant_type_free0 (_data_->_variant_type); _data_->data = (g_free (_data_->data), NULL); if (_data_->_state_ == 0) { g_simple_async_result_complete_in_idle (_data_->_async_result); @@ -1055,134 +1014,135 @@ _state_0: _data_->_tmp0_ = _data_->self->priv->_type_id; _data_->_tmp1_ = _data_->self->priv->_id; - _data_->_tmp2_ = _data_->self->priv->_cache_file; - _data_->_tmp3_ = NULL; - _data_->_tmp3_ = g_file_get_path (_data_->_tmp2_); - _data_->_tmp4_ = _data_->_tmp3_; - g_debug ("object-cache.vala:330: Storing cache (type ID '%s', ID '%s') to file '" \ -"%s'.", _data_->_tmp0_, _data_->_tmp1_, _data_->_tmp4_); - _g_free0 (_data_->_tmp4_); - _data_->_tmp5_ = G_MAXUINT8; - _data_->_tmp6_ = NULL; - _data_->_tmp6_ = folks_object_cache_get_serialised_object_type (_data_->self, _data_->_tmp5_); - _data_->child_type = _data_->_tmp6_; - _data_->_tmp7_ = _data_->child_type; - g_assert (_data_->_tmp7_ != NULL); - _data_->_tmp8_ = _data_->objects; - _data_->_tmp9_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp8_); - _data_->_tmp10_ = _data_->_tmp9_; - _data_->_tmp11_ = NULL; - _data_->_tmp11_ = g_new0 (GVariant*, _data_->_tmp10_ + 1); - _data_->children = _data_->_tmp11_; - _data_->children_length1 = _data_->_tmp10_; + _data_->_tmp2_ = _data_->self->priv->_cache_file_path; + g_debug ("object-cache.vala:334: Storing cache (type ID '%s', ID '%s') to file '" \ +"%s'.", _data_->_tmp0_, _data_->_tmp1_, _data_->_tmp2_); + _data_->_tmp3_ = G_MAXUINT8; + _data_->_tmp4_ = NULL; + _data_->_tmp4_ = folks_object_cache_get_serialised_object_type (_data_->self, _data_->_tmp3_); + _data_->child_type = _data_->_tmp4_; + _data_->_tmp5_ = _data_->child_type; + g_assert (_data_->_tmp5_ != NULL); + _data_->_tmp6_ = _data_->objects; + _data_->_tmp7_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp6_); + _data_->_tmp8_ = _data_->_tmp7_; + _data_->_tmp9_ = NULL; + _data_->_tmp9_ = g_new0 (GVariant*, _data_->_tmp8_ + 1); + _data_->children = _data_->_tmp9_; + _data_->children_length1 = _data_->_tmp8_; _data_->_children_size_ = _data_->children_length1; _data_->i = (guint) 0; { - _data_->_tmp12_ = _data_->objects; - _data_->_tmp13_ = NULL; - _data_->_tmp13_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp12_); - _data_->_object_it = _data_->_tmp13_; + _data_->_tmp10_ = _data_->objects; + _data_->_tmp11_ = NULL; + _data_->_tmp11_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp10_); + _data_->_object_it = _data_->_tmp11_; while (TRUE) { - _data_->_tmp14_ = _data_->_object_it; - _data_->_tmp15_ = FALSE; - _data_->_tmp15_ = gee_iterator_next (_data_->_tmp14_); - if (!_data_->_tmp15_) { + _data_->_tmp12_ = _data_->_object_it; + _data_->_tmp13_ = FALSE; + _data_->_tmp13_ = gee_iterator_next (_data_->_tmp12_); + if (!_data_->_tmp13_) { break; } - _data_->_tmp16_ = _data_->_object_it; - _data_->_tmp17_ = NULL; - _data_->_tmp17_ = gee_iterator_get (_data_->_tmp16_); - _data_->object = _data_->_tmp17_; - _data_->_tmp18_ = _data_->children; - _data_->_tmp18__length1 = _data_->children_length1; - _data_->_tmp19_ = _data_->i; - _data_->i = _data_->_tmp19_ + 1; - _data_->_tmp20_ = _data_->object; - _data_->_tmp21_ = NULL; - _data_->_tmp21_ = folks_object_cache_serialise_object (_data_->self, _data_->_tmp20_); - _g_variant_unref0 (_data_->_tmp18_[_data_->_tmp19_]); - _data_->_tmp18_[_data_->_tmp19_] = _data_->_tmp21_; - _data_->_tmp22_ = _data_->_tmp18_[_data_->_tmp19_]; + _data_->_tmp14_ = _data_->_object_it; + _data_->_tmp15_ = NULL; + _data_->_tmp15_ = gee_iterator_get (_data_->_tmp14_); + _data_->object = _data_->_tmp15_; + _data_->_tmp16_ = _data_->children; + _data_->_tmp16__length1 = _data_->children_length1; + _data_->_tmp17_ = _data_->i; + _data_->i = _data_->_tmp17_ + 1; + _data_->_tmp18_ = _data_->object; + _data_->_tmp19_ = NULL; + _data_->_tmp19_ = folks_object_cache_serialise_object (_data_->self, _data_->_tmp18_); + _g_variant_unref0 (_data_->_tmp16_[_data_->_tmp17_]); + _data_->_tmp16_[_data_->_tmp17_] = _data_->_tmp19_; + _data_->_tmp20_ = _data_->_tmp16_[_data_->_tmp17_]; ((_data_->object == NULL) || (_data_->self->priv->t_destroy_func == NULL)) ? NULL : (_data_->object = (_data_->self->priv->t_destroy_func (_data_->object), NULL)); } _g_object_unref0 (_data_->_object_it); } _data_->wrapper_version = FOLKS_OBJECT_CACHE__FILE_FORMAT_VERSION; - _data_->_tmp23_ = 0U; - _data_->_tmp23_ = folks_object_cache_get_serialised_object_version (_data_->self); - _data_->object_version = _data_->_tmp23_; - _data_->_tmp24_ = _data_->self->priv->_type_id; - _data_->_tmp25_ = g_variant_new_string (_data_->_tmp24_); - _data_->_tmp26_ = g_variant_ref_sink (_data_->_tmp25_); - _data_->_tmp27_ = _data_->self->priv->_id; - _data_->_tmp28_ = g_variant_new_string (_data_->_tmp27_); - _data_->_tmp29_ = g_variant_ref_sink (_data_->_tmp28_); - _data_->_tmp30_ = _data_->child_type; - _data_->_tmp31_ = _data_->children; - _data_->_tmp31__length1 = _data_->children_length1; - _data_->_tmp32_ = g_variant_new_array (_data_->_tmp30_, _data_->_tmp31_, _data_->_tmp31__length1); - _data_->_tmp33_ = g_variant_ref_sink (_data_->_tmp32_); - _data_->_tmp34_ = NULL; - _data_->_tmp34_ = g_new0 (GVariant*, 3 + 1); - _data_->_tmp34_[0] = _data_->_tmp26_; - _data_->_tmp34_[1] = _data_->_tmp29_; - _data_->_tmp34_[2] = _data_->_tmp33_; - _data_->_tmp35_ = _data_->_tmp34_; - _data_->_tmp35__length1 = 3; - _data_->_tmp36_ = g_variant_new_tuple (_data_->_tmp35_, 3); - _data_->_tmp37_ = g_variant_ref_sink (_data_->_tmp36_); - _data_->_tmp38_ = _data_->_tmp37_; - _data_->_tmp35_ = (_vala_array_free (_data_->_tmp35_, _data_->_tmp35__length1, (GDestroyNotify) g_variant_unref), NULL); - _data_->variant = _data_->_tmp38_; - _data_->_tmp39_ = _data_->variant; - _data_->_tmp40_ = NULL; - _data_->_tmp40_ = g_variant_get_type (_data_->_tmp39_); - _data_->_tmp41_ = _data_->wrapper_version; - _data_->_tmp42_ = _data_->object_version; - _data_->_tmp43_ = NULL; - _data_->_tmp43_ = _folks_object_cache_get_cache_file_variant_type (_data_->self, _data_->_tmp41_, _data_->_tmp42_); - _data_->_tmp44_ = _data_->_tmp43_; - _data_->_tmp45_ = FALSE; - _data_->_tmp45_ = g_variant_type_equal (_data_->_tmp40_, _data_->_tmp44_); - g_assert (_data_->_tmp45_); - _g_variant_type_free0 (_data_->_tmp44_); - _data_->_tmp46_ = _data_->variant; - _data_->_tmp47_ = 0UL; - _data_->_tmp47_ = g_variant_get_size (_data_->_tmp46_); - _data_->_tmp48_ = NULL; - _data_->_tmp48_ = g_new0 (guint8, FOLKS_OBJECT_CACHE__HEADER_WIDTH + _data_->_tmp47_); - _data_->data = _data_->_tmp48_; - _data_->data_length1 = FOLKS_OBJECT_CACHE__HEADER_WIDTH + _data_->_tmp47_; + _data_->_tmp21_ = 0U; + _data_->_tmp21_ = folks_object_cache_get_serialised_object_version (_data_->self); + _data_->object_version = _data_->_tmp21_; + _data_->_tmp22_ = _data_->self->priv->_type_id; + _data_->_tmp23_ = g_variant_new_string (_data_->_tmp22_); + _data_->_tmp24_ = g_variant_ref_sink (_data_->_tmp23_); + _data_->_tmp25_ = _data_->self->priv->_id; + _data_->_tmp26_ = g_variant_new_string (_data_->_tmp25_); + _data_->_tmp27_ = g_variant_ref_sink (_data_->_tmp26_); + _data_->_tmp28_ = _data_->child_type; + _data_->_tmp29_ = _data_->children; + _data_->_tmp29__length1 = _data_->children_length1; + _data_->_tmp30_ = g_variant_new_array (_data_->_tmp28_, _data_->_tmp29_, _data_->_tmp29__length1); + _data_->_tmp31_ = g_variant_ref_sink (_data_->_tmp30_); + _data_->_tmp32_ = NULL; + _data_->_tmp32_ = g_new0 (GVariant*, 3 + 1); + _data_->_tmp32_[0] = _data_->_tmp24_; + _data_->_tmp32_[1] = _data_->_tmp27_; + _data_->_tmp32_[2] = _data_->_tmp31_; + _data_->_tmp33_ = _data_->_tmp32_; + _data_->_tmp33__length1 = 3; + _data_->_tmp34_ = g_variant_new_tuple (_data_->_tmp33_, 3); + _data_->_tmp35_ = g_variant_ref_sink (_data_->_tmp34_); + _data_->_tmp36_ = _data_->_tmp35_; + _data_->_tmp33_ = (_vala_array_free (_data_->_tmp33_, _data_->_tmp33__length1, (GDestroyNotify) g_variant_unref), NULL); + _data_->variant = _data_->_tmp36_; + _data_->_tmp37_ = _data_->wrapper_version; + _data_->_tmp38_ = _data_->object_version; + _data_->_tmp39_ = NULL; + _data_->_tmp39_ = _folks_object_cache_get_cache_file_variant_type (_data_->self, _data_->_tmp37_, _data_->_tmp38_); + _data_->desired_variant_type = _data_->_tmp39_; + _data_->_tmp41_ = _data_->desired_variant_type; + if (_data_->_tmp41_ != NULL) { + _data_->_tmp42_ = _data_->variant; + _data_->_tmp43_ = NULL; + _data_->_tmp43_ = g_variant_get_type (_data_->_tmp42_); + _data_->_tmp44_ = _data_->desired_variant_type; + _data_->_tmp45_ = FALSE; + _data_->_tmp45_ = g_variant_type_equal (_data_->_tmp43_, (const GVariantType*) _data_->_tmp44_); + _data_->_tmp40_ = _data_->_tmp45_; + } else { + _data_->_tmp40_ = FALSE; + } + _data_->_tmp46_ = _data_->_tmp40_; + g_assert (_data_->_tmp46_); + _data_->_tmp47_ = _data_->variant; + _data_->_tmp48_ = 0UL; + _data_->_tmp48_ = g_variant_get_size (_data_->_tmp47_); + _data_->_tmp49_ = NULL; + _data_->_tmp49_ = g_new0 (guint8, FOLKS_OBJECT_CACHE__HEADER_WIDTH + _data_->_tmp48_); + _data_->data = _data_->_tmp49_; + _data_->data_length1 = FOLKS_OBJECT_CACHE__HEADER_WIDTH + _data_->_tmp48_; _data_->_data_size_ = _data_->data_length1; - _data_->_tmp49_ = _data_->data; - _data_->_tmp49__length1 = _data_->data_length1; - _data_->_tmp50_ = _data_->wrapper_version; - _data_->_tmp49_[0] = _data_->_tmp50_; - _data_->_tmp51_ = _data_->_tmp49_[0]; - _data_->_tmp52_ = _data_->data; - _data_->_tmp52__length1 = _data_->data_length1; - _data_->_tmp53_ = _data_->object_version; - _data_->_tmp52_[1] = _data_->_tmp53_; - _data_->_tmp54_ = _data_->_tmp52_[1]; - _data_->_tmp55_ = _data_->variant; - _data_->_tmp56_ = _data_->data; - _data_->_tmp56__length1 = _data_->data_length1; + _data_->_tmp50_ = _data_->data; + _data_->_tmp50__length1 = _data_->data_length1; + _data_->_tmp51_ = _data_->wrapper_version; + _data_->_tmp50_[0] = _data_->_tmp51_; + _data_->_tmp52_ = _data_->_tmp50_[0]; + _data_->_tmp53_ = _data_->data; + _data_->_tmp53__length1 = _data_->data_length1; + _data_->_tmp54_ = _data_->object_version; + _data_->_tmp53_[1] = _data_->_tmp54_; + _data_->_tmp55_ = _data_->_tmp53_[1]; + _data_->_tmp56_ = _data_->variant; _data_->_tmp57_ = _data_->data; _data_->_tmp57__length1 = _data_->data_length1; - g_variant_store (_data_->_tmp55_, _data_->_tmp56_ + FOLKS_OBJECT_CACHE__HEADER_WIDTH); + _data_->_tmp58_ = _data_->data; + _data_->_tmp58__length1 = _data_->data_length1; + g_variant_store (_data_->_tmp56_, _data_->_tmp57_ + FOLKS_OBJECT_CACHE__HEADER_WIDTH); while (TRUE) { { - _data_->_tmp58_ = _data_->self->priv->_cache_file; - _data_->_tmp59_ = _data_->data; - _data_->_tmp59__length1 = _data_->data_length1; + _data_->_tmp59_ = _data_->self->priv->_cache_file; _data_->_tmp60_ = _data_->data; _data_->_tmp60__length1 = _data_->data_length1; _data_->_tmp61_ = _data_->cancellable; _data_->_state_ = 1; - g_file_replace_contents_async (_data_->_tmp58_, (const gchar*) _data_->_tmp59_, (gsize) _data_->_tmp60__length1, NULL, FALSE, G_FILE_CREATE_PRIVATE, _data_->_tmp61_, folks_object_cache_store_objects_ready, _data_); + g_file_replace_contents_async (_data_->_tmp59_, _data_->_tmp60_, (gsize) _data_->_tmp60__length1, NULL, FALSE, G_FILE_CREATE_PRIVATE, _data_->_tmp61_, folks_object_cache_store_objects_ready, _data_); return FALSE; _state_1: - g_file_replace_contents_finish (_data_->_tmp58_, _data_->_res_, NULL, &_data_->_inner_error_); + g_file_replace_contents_finish (_data_->_tmp59_, _data_->_res_, NULL, &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { goto __catch36_g_error; } @@ -1218,11 +1178,12 @@ _data_->_tmp65_ = _data_->_tmp64_; _data_->_tmp66_ = _data_->e; _data_->_tmp67_ = _data_->_tmp66_->message; - g_warning ("object-cache.vala:384: Couldn't create cache directory '%s': %s", _data_->_tmp65_, _data_->_tmp67_); + g_warning ("object-cache.vala:390: Couldn't create cache directory '%s': %s", _data_->_tmp65_, _data_->_tmp67_); _g_free0 (_data_->_tmp65_); _g_error_free0 (_data_->e2); _g_error_free0 (_data_->e); _data_->data = (g_free (_data_->data), NULL); + _g_variant_type_free0 (_data_->desired_variant_type); _g_variant_unref0 (_data_->variant); _data_->children = (_vala_array_free (_data_->children, _data_->children_length1, (GDestroyNotify) g_variant_unref), NULL); _g_variant_type_free0 (_data_->child_type); @@ -1238,6 +1199,7 @@ _g_error_free0 (_data_->e); _g_error_free0 (_data_->e); _data_->data = (g_free (_data_->data), NULL); + _g_variant_type_free0 (_data_->desired_variant_type); _g_variant_unref0 (_data_->variant); _data_->children = (_vala_array_free (_data_->children, _data_->children_length1, (GDestroyNotify) g_variant_unref), NULL); _g_variant_type_free0 (_data_->child_type); @@ -1249,6 +1211,7 @@ if (g_error_matches (_data_->_tmp68_, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { _g_error_free0 (_data_->e); _data_->data = (g_free (_data_->data), NULL); + _g_variant_type_free0 (_data_->desired_variant_type); _g_variant_unref0 (_data_->variant); _data_->children = (_vala_array_free (_data_->children, _data_->children_length1, (GDestroyNotify) g_variant_unref), NULL); _g_variant_type_free0 (_data_->child_type); @@ -1261,15 +1224,11 @@ return FALSE; } } - _data_->_tmp69_ = _data_->self->priv->_cache_file; - _data_->_tmp70_ = NULL; - _data_->_tmp70_ = g_file_get_path (_data_->_tmp69_); - _data_->_tmp71_ = _data_->_tmp70_; - _data_->_tmp72_ = _data_->e; - _data_->_tmp73_ = _data_->_tmp72_->message; - g_warning ("object-cache.vala:398: Couldn't write to cache file '%s', so deleting " \ -"it: %s", _data_->_tmp71_, _data_->_tmp73_); - _g_free0 (_data_->_tmp71_); + _data_->_tmp69_ = _data_->self->priv->_cache_file_path; + _data_->_tmp70_ = _data_->e; + _data_->_tmp71_ = _data_->_tmp70_->message; + g_warning ("object-cache.vala:404: Couldn't write to cache file '%s', so deleting " \ +"it: %s", _data_->_tmp69_, _data_->_tmp71_); _data_->_state_ = 3; folks_object_cache_clear_cache (_data_->self, folks_object_cache_store_objects_ready, _data_); return FALSE; @@ -1277,6 +1236,7 @@ folks_object_cache_clear_cache_finish (_data_->self, _data_->_res_); _g_error_free0 (_data_->e); _data_->data = (g_free (_data_->data), NULL); + _g_variant_type_free0 (_data_->desired_variant_type); _g_variant_unref0 (_data_->variant); _data_->children = (_vala_array_free (_data_->children, _data_->children_length1, (GDestroyNotify) g_variant_unref), NULL); _g_variant_type_free0 (_data_->child_type); @@ -1290,6 +1250,7 @@ } __finally36: _data_->data = (g_free (_data_->data), NULL); + _g_variant_type_free0 (_data_->desired_variant_type); _g_variant_unref0 (_data_->variant); _data_->children = (_vala_array_free (_data_->children, _data_->children_length1, (GDestroyNotify) g_variant_unref), NULL); _g_variant_type_free0 (_data_->child_type); @@ -1298,6 +1259,7 @@ return FALSE; } _data_->data = (g_free (_data_->data), NULL); + _g_variant_type_free0 (_data_->desired_variant_type); _g_variant_unref0 (_data_->variant); _data_->children = (_vala_array_free (_data_->children, _data_->children_length1, (GDestroyNotify) g_variant_unref), NULL); _g_variant_type_free0 (_data_->child_type); @@ -1352,16 +1314,12 @@ _state_0: _data_->_tmp0_ = _data_->self->priv->_type_id; _data_->_tmp1_ = _data_->self->priv->_id; - _data_->_tmp2_ = _data_->self->priv->_cache_file; - _data_->_tmp3_ = NULL; - _data_->_tmp3_ = g_file_get_path (_data_->_tmp2_); - _data_->_tmp4_ = _data_->_tmp3_; - g_debug ("object-cache.vala:414: Clearing cache (type ID '%s', ID '%s'); deletin" \ -"g file '%s'.", _data_->_tmp0_, _data_->_tmp1_, _data_->_tmp4_); - _g_free0 (_data_->_tmp4_); + _data_->_tmp2_ = _data_->self->priv->_cache_file_path; + g_debug ("object-cache.vala:420: Clearing cache (type ID '%s', ID '%s'); deletin" \ +"g file '%s'.", _data_->_tmp0_, _data_->_tmp1_, _data_->_tmp2_); { - _data_->_tmp5_ = _data_->self->priv->_cache_file; - g_file_delete (_data_->_tmp5_, NULL, &_data_->_inner_error_); + _data_->_tmp3_ = _data_->self->priv->_cache_file; + g_file_delete (_data_->_tmp3_, NULL, &_data_->_inner_error_); if (_data_->_inner_error_ != NULL) { goto __catch38_g_error; } @@ -1389,55 +1347,57 @@ } -static gpointer _g_variant_type_copy0 (gpointer self) { - return self ? g_variant_type_copy (self) : NULL; -} - - static GVariantType* _folks_object_cache_get_cache_file_variant_type (FolksObjectCache* self, guint8 wrapper_version, guint8 object_version) { GVariantType* result = NULL; guint8 _tmp0_; GVariantType* _tmp1_ = NULL; - GVariantType* object_type; + GVariantType* _object_type; const GVariantType* _tmp2_; const GVariantType* _tmp3_; GVariantType* _tmp4_; + GVariantType* object_type; const GVariantType* _tmp5_; GVariantType* _tmp6_; const GVariantType* _tmp7_; GVariantType* _tmp8_; - GVariantType** _tmp9_ = NULL; - GVariantType** _tmp10_; - gint _tmp10__length1; - GVariantType* _tmp11_; - GVariantType* _tmp12_; + const GVariantType* _tmp9_; + GVariantType* _tmp10_; + GVariantType** _tmp11_ = NULL; + GVariantType** _tmp12_; + gint _tmp12__length1; + GVariantType* _tmp13_; + GVariantType* _tmp14_; g_return_val_if_fail (self != NULL, NULL); _tmp0_ = object_version; _tmp1_ = folks_object_cache_get_serialised_object_type (self, _tmp0_); - object_type = _tmp1_; - _tmp2_ = object_type; + _object_type = _tmp1_; + _tmp2_ = _object_type; if (_tmp2_ == NULL) { result = NULL; - _g_variant_type_free0 (object_type); + _g_variant_type_free0 (_object_type); return result; } - _tmp3_ = G_VARIANT_TYPE_STRING; - _tmp4_ = _g_variant_type_copy0 (_tmp3_); + _tmp3_ = _object_type; + _tmp4_ = _g_variant_type_copy0 ((const GVariantType*) _tmp3_); + object_type = _tmp4_; _tmp5_ = G_VARIANT_TYPE_STRING; _tmp6_ = _g_variant_type_copy0 (_tmp5_); - _tmp7_ = object_type; - _tmp8_ = g_variant_type_new_array (_tmp7_); - _tmp9_ = g_new0 (GVariantType*, 3 + 1); - _tmp9_[0] = _tmp4_; - _tmp9_[1] = _tmp6_; - _tmp9_[2] = _tmp8_; - _tmp10_ = _tmp9_; - _tmp10__length1 = 3; - _tmp11_ = g_variant_type_new_tuple (_tmp10_, 3); + _tmp7_ = G_VARIANT_TYPE_STRING; + _tmp8_ = _g_variant_type_copy0 (_tmp7_); + _tmp9_ = object_type; + _tmp10_ = g_variant_type_new_array (_tmp9_); + _tmp11_ = g_new0 (GVariantType*, 3 + 1); + _tmp11_[0] = _tmp6_; + _tmp11_[1] = _tmp8_; + _tmp11_[2] = _tmp10_; _tmp12_ = _tmp11_; - _tmp10_ = (_vala_array_free (_tmp10_, _tmp10__length1, (GDestroyNotify) g_variant_type_free), NULL); - result = _tmp12_; + _tmp12__length1 = 3; + _tmp13_ = g_variant_type_new_tuple (_tmp12_, 3); + _tmp14_ = _tmp13_; + _tmp12_ = (_vala_array_free (_tmp12_, _tmp12__length1, (GDestroyNotify) g_variant_type_free), NULL); + result = _tmp14_; _g_variant_type_free0 (object_type); + _g_variant_type_free0 (_object_type); return result; } @@ -1595,13 +1555,20 @@ gchar* _tmp13_ = NULL; gchar* _tmp14_; GFile* _tmp15_ = NULL; + GFile* _tmp16_; + gchar* _tmp17_ = NULL; + gchar* path; + const gchar* _tmp18_ = NULL; + const gchar* _tmp19_; + const gchar* _tmp21_; + gchar* _tmp22_; parent_class = G_OBJECT_CLASS (folks_object_cache_parent_class); obj = parent_class->constructor (type, n_construct_properties, construct_properties); self = FOLKS_OBJECT_CACHE (obj); _tmp0_ = self->priv->_type_id; _tmp1_ = folks_object_cache_get_id (self); _tmp2_ = _tmp1_; - g_debug ("object-cache.vala:155: Creating object cache for type ID '%s' with ID " \ + g_debug ("object-cache.vala:156: Creating object cache for type ID '%s' with ID " \ "'%s'.", _tmp0_, _tmp2_); _tmp3_ = g_get_user_cache_dir (); _tmp4_ = g_file_new_for_path (_tmp3_); @@ -1623,6 +1590,22 @@ _g_object_unref0 (self->priv->_cache_file); self->priv->_cache_file = _tmp15_; _g_free0 (_tmp14_); + _tmp16_ = self->priv->_cache_file; + _tmp17_ = g_file_get_path (_tmp16_); + path = _tmp17_; + _tmp19_ = path; + if (_tmp19_ != NULL) { + const gchar* _tmp20_; + _tmp20_ = path; + _tmp18_ = (const gchar*) _tmp20_; + } else { + _tmp18_ = "(null)"; + } + _tmp21_ = _tmp18_; + _tmp22_ = g_strdup (_tmp21_); + _g_free0 (self->priv->_cache_file_path); + self->priv->_cache_file_path = _tmp22_; + _g_free0 (path); return obj; } @@ -1672,6 +1655,7 @@ self = FOLKS_OBJECT_CACHE (obj); _g_object_unref0 (self->priv->_cache_directory); _g_object_unref0 (self->priv->_cache_file); + _g_free0 (self->priv->_cache_file_path); _g_free0 (self->priv->_type_id); _g_free0 (self->priv->_id); G_OBJECT_CLASS (folks_object_cache_parent_class)->finalize (obj); diff -Nru folks-0.6.6/folks/object-cache.vala folks-0.6.7/folks/object-cache.vala --- folks-0.6.6/folks/object-cache.vala 2011-12-13 23:35:55.000000000 +0000 +++ folks-0.6.7/folks/object-cache.vala 2012-02-17 23:39:51.000000000 +0000 @@ -52,6 +52,7 @@ private File _cache_directory; private File _cache_file; + private string _cache_file_path; /* save calls to _cache_file.get_path() */ /** * Get the {@link GLib.VariantType} of the serialised form of an object stored @@ -162,6 +163,8 @@ this._cache_file = this._cache_directory.get_child (Uri.escape_string (this.id, "", false)); + var path = this._cache_file.get_path (); + this._cache_file_path = (path != null) ? (!) path : "(null)"; } /** @@ -184,14 +187,14 @@ public async Set? load_objects (Cancellable? cancellable = null) { debug ("Loading cache (type ID '%s', ID '%s') from file '%s'.", - this.type_id, this._id, this._cache_file.get_path ()); + this.type_id, this._id, this._cache_file_path); // Read in the file uint8[] data; try { - yield this._cache_file.load_contents_async (cancellable, out data); + yield this._cache_file.load_contents_async (cancellable, out data, null); } catch (Error e) { @@ -202,12 +205,12 @@ else if (e is IOError.NOT_FOUND) { debug ("Couldn't load cache file '%s': %s", - this._cache_file.get_path (), e.message); + this._cache_file_path, e.message); } else { warning ("Couldn't load cache file '%s': %s", - this._cache_file.get_path (), e.message); + this._cache_file_path, e.message); } return null; @@ -217,7 +220,7 @@ if (data.length < this._HEADER_WIDTH) { warning ("Cache file '%s' was too small. The file was deleted.", - this._cache_file.get_path ()); + this._cache_file_path); yield this.clear_cache (); return null; @@ -231,7 +234,7 @@ { warning ("Cache file '%s' was version %u of the file format, " + "but only version %u is supported. The file was deleted.", - this._cache_file.get_path (), wrapper_version, + this._cache_file_path, wrapper_version, this._FILE_FORMAT_VERSION); yield this.clear_cache (); @@ -241,19 +244,20 @@ unowned uint8[] variant_data = data[this._HEADER_WIDTH:data.length]; // Deserialise the variant according to the given version numbers - var variant_type = + var _variant_type = this._get_cache_file_variant_type (wrapper_version, object_version); - if (variant_type == null) + if (_variant_type == null) { warning ("Cache file '%s' was version %u of the object file " + "format, which is not supported. The file was deleted.", - this._cache_file.get_path (), object_version, + this._cache_file_path, object_version, this._FILE_FORMAT_VERSION); yield this.clear_cache (); return null; } + var variant_type = (!) _variant_type; var variant = Variant.new_from_data (variant_type, variant_data, false, @@ -263,7 +267,7 @@ if (variant.is_normal_form () == false) { warning ("Cache file '%s' was corrupt and was deleted.", - this._cache_file.get_path ()); + this._cache_file_path); yield this.clear_cache (); return null; @@ -275,7 +279,7 @@ if (type_id != this.type_id) { warning ("Cache file '%s' had type ID '%s', but '%s' was expected." + - "The file was deleted.", this._cache_file.get_path (), type_id, + "The file was deleted.", this._cache_file_path, type_id, this.type_id); yield this.clear_cache (); @@ -287,7 +291,7 @@ if (id != this._id) { warning ("Cache file '%s' had ID '%s', but '%s' was expected." + - "The file was deleted.", this._cache_file.get_path (), id, + "The file was deleted.", this._cache_file_path, id, this._id); yield this.clear_cache (); @@ -328,7 +332,7 @@ Cancellable? cancellable = null) { debug ("Storing cache (type ID '%s', ID '%s') to file '%s'.", - this.type_id, this._id, this._cache_file.get_path ()); + this.type_id, this._id, this._cache_file_path); var child_type = this.get_serialised_object_type (uint8.MAX); assert (child_type != null); // uint8.MAX should always be supported @@ -351,8 +355,10 @@ new Variant.array (child_type, children) // Array of objects }); - assert (variant.get_type ().equal ( - this._get_cache_file_variant_type (wrapper_version, object_version))); + var desired_variant_type = + this._get_cache_file_variant_type (wrapper_version, object_version); + assert (desired_variant_type != null && + variant.get_type ().equal ((!) desired_variant_type)); // Prepend the version numbers to the data uint8[] data = new uint8[this._HEADER_WIDTH + variant.get_size ()]; @@ -366,8 +372,8 @@ try { yield this._cache_file.replace_contents_async ( - (string) data, data.length, null, false, - FileCreateFlags.PRIVATE, cancellable); + data, null, false, + FileCreateFlags.PRIVATE, cancellable, null); break; } catch (Error e) @@ -396,7 +402,7 @@ /* Print a warning and delete the cache file so we don't leave * stale cached objects lying around. */ warning ("Couldn't write to cache file '%s', so deleting it: %s", - this._cache_file.get_path (), e.message); + this._cache_file_path, e.message); yield this.clear_cache (); return; @@ -412,7 +418,7 @@ public async void clear_cache () { debug ("Clearing cache (type ID '%s', ID '%s'); deleting file '%s'.", - this.type_id, this._id, this._cache_file.get_path ()); + this.type_id, this._id, this._cache_file_path); try { @@ -427,13 +433,14 @@ private VariantType? _get_cache_file_variant_type (uint8 wrapper_version, uint8 object_version) { - var object_type = this.get_serialised_object_type (object_version); + var _object_type = this.get_serialised_object_type (object_version); - if (object_type == null) + if (_object_type == null) { // Unsupported version return null; } + var object_type = (!) _object_type; return new VariantType.tuple ({ VariantType.STRING, // Type ID diff -Nru folks-0.6.6/folks/persona.c folks-0.6.7/folks/persona.c --- folks-0.6.6/folks/persona.c 2011-12-13 23:39:16.000000000 +0000 +++ folks-0.6.7/folks/persona.c 2012-02-23 00:01:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* persona.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* persona.c generated by valac 0.15.1, the Vala compiler * generated from persona.vala, do not modify */ /* @@ -740,7 +740,7 @@ GeeSet* _tmp4_; gboolean _tmp5_ = FALSE; _tmp2_ = self->priv->_individual; - _tmp3_ = folks_individual_get_personas (_tmp2_); + _tmp3_ = folks_individual_get_personas (FOLKS_INDIVIDUAL (_tmp2_)); _tmp4_ = _tmp3_; _tmp5_ = gee_collection_contains ((GeeCollection*) _tmp4_, self); _tmp0_ = _tmp5_; @@ -768,7 +768,7 @@ GeeSet* _tmp4_; gboolean _tmp5_ = FALSE; _tmp2_ = value; - _tmp3_ = folks_individual_get_personas (_tmp2_); + _tmp3_ = folks_individual_get_personas (FOLKS_INDIVIDUAL (_tmp2_)); _tmp4_ = _tmp3_; _tmp5_ = gee_collection_contains ((GeeCollection*) _tmp4_, self); _tmp0_ = _tmp5_; diff -Nru folks-0.6.6/folks/persona-store.c folks-0.6.7/folks/persona-store.c --- folks-0.6.6/folks/persona-store.c 2011-12-13 23:39:16.000000000 +0000 +++ folks-0.6.7/folks/persona-store.c 2012-02-23 00:01:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* persona-store.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* persona-store.c generated by valac 0.15.1, the Vala compiler * generated from persona-store.vala, do not modify */ /* @@ -195,6 +195,7 @@ FOLKS_PERSONA_STORE_IS_PRIMARY_STORE, FOLKS_PERSONA_STORE_IS_USER_SET_DEFAULT }; +const gchar* folks_persona_store_get_id (FolksPersonaStore* self); const gchar* folks_persona_store_detail_key (FolksPersonaDetail detail); GType folks_group_details_change_reason_get_type (void) G_GNUC_CONST; void _folks_persona_store_emit_personas_changed (FolksPersonaStore* self, GeeSet* added, GeeSet* removed, const gchar* message, FolksPersona* actor, FolksGroupDetailsChangeReason reason); @@ -213,7 +214,6 @@ const gchar* folks_persona_store_get_type_id (FolksPersonaStore* self); const gchar* folks_persona_store_get_display_name (FolksPersonaStore* self); static void folks_persona_store_set_display_name (FolksPersonaStore* self, const gchar* value); -const gchar* folks_persona_store_get_id (FolksPersonaStore* self); static void folks_persona_store_set_id (FolksPersonaStore* self, const gchar* value); GeeMap* folks_persona_store_get_personas (FolksPersonaStore* self); FolksMaybeBool folks_persona_store_get_can_add_personas (FolksPersonaStore* self); @@ -232,6 +232,7 @@ gboolean folks_persona_store_get_is_user_set_default (FolksPersonaStore* self); void folks_persona_store_set_is_user_set_default (FolksPersonaStore* self, gboolean value); static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_STRING_OBJECT_ENUM (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data); +static GObject * folks_persona_store_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties); static void folks_persona_store_finalize (GObject* obj); static void _vala_folks_persona_store_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); static void _vala_folks_persona_store_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); @@ -358,7 +359,7 @@ gint _tmp8_; gint _tmp9_; _tmp7_ = added; - _tmp8_ = gee_collection_get_size ((GeeCollection*) _tmp7_); + _tmp8_ = gee_collection_get_size ((GeeCollection*) GEE_SET (_tmp7_)); _tmp9_ = _tmp8_; _tmp5_ = _tmp9_ == 0; } @@ -375,7 +376,7 @@ gint _tmp14_; gint _tmp15_; _tmp13_ = removed; - _tmp14_ = gee_collection_get_size ((GeeCollection*) _tmp13_); + _tmp14_ = gee_collection_get_size ((GeeCollection*) GEE_SET (_tmp13_)); _tmp15_ = _tmp14_; _tmp11_ = _tmp15_ == 0; } @@ -409,11 +410,11 @@ } } _tmp22_ = _added; - _tmp23_ = gee_set_get_read_only_view (_tmp22_); + _tmp23_ = gee_set_get_read_only_view (GEE_SET (_tmp22_)); _tmp24_ = _tmp23_; _tmp25_ = _tmp24_; _tmp26_ = _removed; - _tmp27_ = gee_set_get_read_only_view (_tmp26_); + _tmp27_ = gee_set_get_read_only_view (GEE_SET (_tmp26_)); _tmp28_ = _tmp27_; _tmp29_ = _tmp28_; _tmp30_ = message; @@ -724,6 +725,20 @@ } +static GObject * folks_persona_store_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties) { + GObject * obj; + GObjectClass * parent_class; + FolksPersonaStore * self; + const gchar* _tmp0_; + parent_class = G_OBJECT_CLASS (folks_persona_store_parent_class); + obj = parent_class->constructor (type, n_construct_properties, construct_properties); + self = FOLKS_PERSONA_STORE (obj); + _tmp0_ = self->priv->_id; + g_debug ("persona-store.vala:285: Constructing PersonaStore ‘%s’ (%p)", _tmp0_, self); + return obj; +} + + static void folks_persona_store_class_init (FolksPersonaStoreClass * klass) { folks_persona_store_parent_class = g_type_class_peek_parent (klass); g_type_class_add_private (klass, sizeof (FolksPersonaStorePrivate)); @@ -731,6 +746,7 @@ FOLKS_PERSONA_STORE_CLASS (klass)->flush_finish = folks_persona_store_real_flush_finish; G_OBJECT_CLASS (klass)->get_property = _vala_folks_persona_store_get_property; G_OBJECT_CLASS (klass)->set_property = _vala_folks_persona_store_set_property; + G_OBJECT_CLASS (klass)->constructor = folks_persona_store_constructor; G_OBJECT_CLASS (klass)->finalize = folks_persona_store_finalize; /** * The type of PersonaStore this is. @@ -916,7 +932,10 @@ static void folks_persona_store_finalize (GObject* obj) { FolksPersonaStore * self; + const gchar* _tmp0_; self = FOLKS_PERSONA_STORE (obj); + _tmp0_ = self->priv->_id; + g_debug ("persona-store.vala:290: Destroying PersonaStore ‘%s’ (%p)", _tmp0_, self); _g_free0 (self->priv->_display_name); _g_free0 (self->priv->_id); G_OBJECT_CLASS (folks_persona_store_parent_class)->finalize (obj); diff -Nru folks-0.6.6/folks/persona-store.vala folks-0.6.7/folks/persona-store.vala --- folks-0.6.6/folks/persona-store.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/folks/persona-store.vala 2012-01-12 17:25:24.000000000 +0000 @@ -280,6 +280,16 @@ */ public abstract class Folks.PersonaStore : Object { + construct + { + debug ("Constructing PersonaStore ‘%s’ (%p)", this.id, this); + } + + ~PersonaStore () + { + debug ("Destroying PersonaStore ‘%s’ (%p)", this.id, this); + } + /** * The following list of properties are the basic keys * that each PersonaStore with write capabilities should @@ -366,8 +376,8 @@ var _added = added; var _removed = removed; - if ((added == null || added.size == 0) && - (removed == null || removed.size == 0)) + if ((added == null || ((!) added).size == 0) && + (removed == null || ((!) removed).size == 0)) { /* Don't bother signalling if nothing's changed */ return; @@ -381,8 +391,9 @@ _removed = new HashSet (); } - this.personas_changed (_added.read_only_view, _removed.read_only_view, - message, actor, reason); + // We've now guaranteed that both _added and _removed are non-null. + this.personas_changed (((!) _added).read_only_view, + ((!) _removed).read_only_view, message, actor, reason); } /** @@ -618,7 +629,8 @@ * return value is purely for convenience, since it can be complicated to * correlate the provided details with the final Persona. * - * If the store is offline, this function will throw + * If the store is offline (or {@link PersonaStore.prepare()} hasn't yet been + * called successfully), this function will throw * {@link PersonaStoreError.STORE_OFFLINE}. It's the responsibility of the * caller to cache details and re-try this function if it wishes to make * offline adds work. @@ -650,6 +662,12 @@ * will be signalled through emission of * {@link PersonaStore.personas_changed}. * + * If the store is offline (or {@link PersonaStore.prepare()} hasn't yet been + * called successfully), this function will throw + * {@link PersonaStoreError.STORE_OFFLINE}. It's the responsibility of the + * caller to cache details and re-try this function if it wishes to make + * offline removals work. + * * @param persona the {@link Persona} to remove * @since 0.1.11 */ diff -Nru folks-0.6.6/folks/persona.vala folks-0.6.7/folks/persona.vala --- folks-0.6.6/folks/persona.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/folks/persona.vala 2012-01-12 17:25:24.000000000 +0000 @@ -61,7 +61,7 @@ */ public abstract class Folks.Persona : Object { - private weak Individual _individual; + private weak Individual? _individual; /** * The internal ID used to represent the Persona for linking. @@ -151,14 +151,14 @@ get { assert (this._individual == null || - this._individual.personas.contains (this)); + ((!) this._individual).personas.contains (this)); return this._individual; } internal set { - assert (value == null || value.personas.contains (this)); + assert (value == null || ((!) value).personas.contains (this)); this._individual = value; } diff -Nru folks-0.6.6/folks/phone-details.c folks-0.6.7/folks/phone-details.c --- folks-0.6.6/folks/phone-details.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/phone-details.c 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* phone-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* phone-details.c generated by valac 0.15.1, the Vala compiler * generated from phone-details.vala, do not modify */ /* @@ -170,7 +170,8 @@ /** * Create a new PhoneFieldDetails. * - * @param value the value of the field + * @param value the value of the field, which should be a non-empty phone + * number (no particular format is mandated) * @param parameters initial parameters. See * {@link AbstractFieldDetails.parameters}. A `null` value is equivalent to a * empty map of parameters. @@ -182,11 +183,16 @@ FolksPhoneFieldDetails* folks_phone_field_details_construct (GType object_type, const gchar* value, GeeMultiMap* parameters) { FolksPhoneFieldDetails * self = NULL; const gchar* _tmp0_; - GeeMultiMap* _tmp1_; + const gchar* _tmp1_; + GeeMultiMap* _tmp2_; g_return_val_if_fail (value != NULL, NULL); _tmp0_ = value; - _tmp1_ = parameters; - self = (FolksPhoneFieldDetails*) g_object_new (object_type, "t_type", G_TYPE_STRING, "t_dup_func", (GBoxedCopyFunc) g_strdup, "t_destroy_func", g_free, "value", _tmp0_, "parameters", _tmp1_, NULL); + if (g_strcmp0 (_tmp0_, "") == 0) { + g_warning ("phone-details.vala:72: Empty phone number passed to PhoneFieldDetails."); + } + _tmp1_ = value; + _tmp2_ = parameters; + self = (FolksPhoneFieldDetails*) g_object_new (object_type, "t_type", G_TYPE_STRING, "t_dup_func", (GBoxedCopyFunc) g_strdup, "t_destroy_func", g_free, "value", _tmp1_, "parameters", _tmp2_, NULL); return self; } @@ -303,113 +309,121 @@ gboolean result = FALSE; FolksAbstractFieldDetails* _tmp0_; FolksPhoneFieldDetails* _tmp1_; - FolksPhoneFieldDetails* that_fd; + FolksPhoneFieldDetails* _that_fd; FolksPhoneFieldDetails* _tmp2_; - gchar* _tmp3_ = NULL; - gchar* _tmp4_; + FolksPhoneFieldDetails* _tmp3_; + FolksPhoneFieldDetails* _tmp4_; + FolksPhoneFieldDetails* that_fd; gchar* _tmp5_ = NULL; gchar* _tmp6_; + gchar* _tmp7_ = NULL; + gchar* _tmp8_; gchar* n1; - FolksPhoneFieldDetails* _tmp7_; - gchar* _tmp8_ = NULL; - gchar* _tmp9_; + FolksPhoneFieldDetails* _tmp9_; gchar* _tmp10_ = NULL; gchar* _tmp11_; + gchar* _tmp12_ = NULL; + gchar* _tmp13_; gchar* n2; - gboolean _tmp12_ = FALSE; - const gchar* _tmp13_; - gint _tmp14_; - gint _tmp15_; - gboolean _tmp19_; - const gchar* _tmp34_; - const gchar* _tmp35_; + gboolean _tmp14_ = FALSE; + const gchar* _tmp15_; + gint _tmp16_; + gint _tmp17_; + gboolean _tmp21_; + const gchar* _tmp36_; + const gchar* _tmp37_; self = (FolksPhoneFieldDetails*) base; g_return_val_if_fail (that != NULL, FALSE); _tmp0_ = that; _tmp1_ = _g_object_ref0 (FOLKS_IS_PHONE_FIELD_DETAILS (_tmp0_) ? ((FolksPhoneFieldDetails*) _tmp0_) : NULL); - that_fd = _tmp1_; - _tmp2_ = that_fd; + _that_fd = _tmp1_; + _tmp2_ = _that_fd; if (_tmp2_ == NULL) { result = FALSE; - _g_object_unref0 (that_fd); + _g_object_unref0 (_that_fd); return result; } - _tmp3_ = folks_phone_field_details_get_normalised (self); - _tmp4_ = _tmp3_; - _tmp5_ = _folks_phone_field_details_drop_extension (_tmp4_); + _tmp3_ = _that_fd; + _tmp4_ = _g_object_ref0 (FOLKS_PHONE_FIELD_DETAILS (_tmp3_)); + that_fd = _tmp4_; + _tmp5_ = folks_phone_field_details_get_normalised (self); _tmp6_ = _tmp5_; - _g_free0 (_tmp4_); - n1 = _tmp6_; - _tmp7_ = that_fd; - _tmp8_ = folks_phone_field_details_get_normalised (_tmp7_); - _tmp9_ = _tmp8_; - _tmp10_ = _folks_phone_field_details_drop_extension (_tmp9_); + _tmp7_ = _folks_phone_field_details_drop_extension (_tmp6_); + _tmp8_ = _tmp7_; + _g_free0 (_tmp6_); + n1 = _tmp8_; + _tmp9_ = that_fd; + _tmp10_ = folks_phone_field_details_get_normalised (_tmp9_); _tmp11_ = _tmp10_; - _g_free0 (_tmp9_); - n2 = _tmp11_; - _tmp13_ = n1; - _tmp14_ = strlen (_tmp13_); - _tmp15_ = _tmp14_; - if (_tmp15_ >= 7) { - const gchar* _tmp16_; - gint _tmp17_; - gint _tmp18_; - _tmp16_ = n2; - _tmp17_ = strlen (_tmp16_); - _tmp18_ = _tmp17_; - _tmp12_ = _tmp18_ >= 7; + _tmp12_ = _folks_phone_field_details_drop_extension (_tmp11_); + _tmp13_ = _tmp12_; + _g_free0 (_tmp11_); + n2 = _tmp13_; + _tmp15_ = n1; + _tmp16_ = strlen (_tmp15_); + _tmp17_ = _tmp16_; + if (_tmp17_ >= 7) { + const gchar* _tmp18_; + gint _tmp19_; + gint _tmp20_; + _tmp18_ = n2; + _tmp19_ = strlen (_tmp18_); + _tmp20_ = _tmp19_; + _tmp14_ = _tmp20_ >= 7; } else { - _tmp12_ = FALSE; + _tmp14_ = FALSE; } - _tmp19_ = _tmp12_; - if (_tmp19_) { - const gchar* _tmp20_; - const gchar* _tmp21_; - gint _tmp22_; - gint _tmp23_; - gchar* _tmp24_ = NULL; + _tmp21_ = _tmp14_; + if (_tmp21_) { + const gchar* _tmp22_; + const gchar* _tmp23_; + gint _tmp24_; + gint _tmp25_; + gchar* _tmp26_ = NULL; gchar* n1_reduced; - const gchar* _tmp25_; - const gchar* _tmp26_; - gint _tmp27_; - gint _tmp28_; - gchar* _tmp29_ = NULL; + const gchar* _tmp27_; + const gchar* _tmp28_; + gint _tmp29_; + gint _tmp30_; + gchar* _tmp31_ = NULL; gchar* n2_reduced; - const gchar* _tmp30_; - const gchar* _tmp31_; const gchar* _tmp32_; const gchar* _tmp33_; - _tmp20_ = n1; - _tmp21_ = n1; - _tmp22_ = strlen (_tmp21_); - _tmp23_ = _tmp22_; - _tmp24_ = string_slice (_tmp20_, (glong) (-7), (glong) _tmp23_); - n1_reduced = _tmp24_; - _tmp25_ = n2; - _tmp26_ = n2; - _tmp27_ = strlen (_tmp26_); - _tmp28_ = _tmp27_; - _tmp29_ = string_slice (_tmp25_, (glong) (-7), (glong) _tmp28_); - n2_reduced = _tmp29_; - _tmp30_ = n1_reduced; - _tmp31_ = n2_reduced; - g_debug ("phone-details.vala:101: [PhoneDetails.equal] Comparing %s with %s", _tmp30_, _tmp31_); + const gchar* _tmp34_; + const gchar* _tmp35_; + _tmp22_ = n1; + _tmp23_ = n1; + _tmp24_ = strlen (_tmp23_); + _tmp25_ = _tmp24_; + _tmp26_ = string_slice (_tmp22_, (glong) (-7), (glong) _tmp25_); + n1_reduced = _tmp26_; + _tmp27_ = n2; + _tmp28_ = n2; + _tmp29_ = strlen (_tmp28_); + _tmp30_ = _tmp29_; + _tmp31_ = string_slice (_tmp27_, (glong) (-7), (glong) _tmp30_); + n2_reduced = _tmp31_; _tmp32_ = n1_reduced; _tmp33_ = n2_reduced; - result = g_strcmp0 (_tmp32_, _tmp33_) == 0; + g_debug ("phone-details.vala:108: [PhoneDetails.equal] Comparing %s with %s", _tmp32_, _tmp33_); + _tmp34_ = n1_reduced; + _tmp35_ = n2_reduced; + result = g_strcmp0 (_tmp34_, _tmp35_) == 0; _g_free0 (n2_reduced); _g_free0 (n1_reduced); _g_free0 (n2); _g_free0 (n1); _g_object_unref0 (that_fd); + _g_object_unref0 (_that_fd); return result; } - _tmp34_ = n1; - _tmp35_ = n2; - result = g_strcmp0 (_tmp34_, _tmp35_) == 0; + _tmp36_ = n1; + _tmp37_ = n2; + result = g_strcmp0 (_tmp36_, _tmp37_) == 0; _g_free0 (n2); _g_free0 (n1); _g_object_unref0 (that_fd); + _g_object_unref0 (_that_fd); return result; } @@ -549,7 +563,7 @@ } else { const gchar* _tmp26_; _tmp26_ = digit; - g_debug ("phone-details.vala:158: [PhoneDetails.get_normalised] unknown digit: %" \ + g_debug ("phone-details.vala:165: [PhoneDetails.get_normalised] unknown digit: %" \ "s", _tmp26_); } } @@ -716,7 +730,7 @@ /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_PHONE_FIELD_DETAILS_ID, "id"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_PHONE_FIELD_DETAILS_ID, g_param_spec_string ("id", "id", "id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); } diff -Nru folks-0.6.6/folks/phone-details.vala folks-0.6.7/folks/phone-details.vala --- folks-0.6.6/folks/phone-details.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/folks/phone-details.vala 2012-01-12 17:25:24.000000000 +0000 @@ -54,7 +54,8 @@ /** * Create a new PhoneFieldDetails. * - * @param value the value of the field + * @param value the value of the field, which should be a non-empty phone + * number (no particular format is mandated) * @param parameters initial parameters. See * {@link AbstractFieldDetails.parameters}. A `null` value is equivalent to a * empty map of parameters. @@ -66,6 +67,11 @@ public PhoneFieldDetails (string value, MultiMap? parameters = null) { + if (value == "") + { + warning ("Empty phone number passed to PhoneFieldDetails."); + } + Object (value: value, parameters: parameters); } @@ -77,7 +83,7 @@ */ public override bool equal (AbstractFieldDetails that) { - return base.equal (that); + return base.equal (that); } /** @@ -85,9 +91,10 @@ */ public override bool values_equal (AbstractFieldDetails that) { - var that_fd = that as PhoneFieldDetails; - if (that_fd == null) + var _that_fd = that as PhoneFieldDetails; + if (_that_fd == null) return false; + PhoneFieldDetails that_fd = (!) _that_fd; var n1 = this._drop_extension (this.get_normalised ()); var n2 = this._drop_extension (that_fd.get_normalised ()); diff -Nru folks-0.6.6/folks/postal-address-details.c folks-0.6.7/folks/postal-address-details.c --- folks-0.6.6/folks/postal-address-details.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/postal-address-details.c 2012-02-23 00:01:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* postal-address-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* postal-address-details.c generated by valac 0.15.1, the Vala compiler * generated from postal-address-details.vala, do not modify */ /* @@ -176,7 +176,7 @@ }; FolksPostalAddress* folks_postal_address_new (const gchar* po_box, const gchar* extension, const gchar* street, const gchar* locality, const gchar* region, const gchar* postal_code, const gchar* country, const gchar* address_format, const gchar* uid); FolksPostalAddress* folks_postal_address_construct (GType object_type, const gchar* po_box, const gchar* extension, const gchar* street, const gchar* locality, const gchar* region, const gchar* postal_code, const gchar* country, const gchar* address_format, const gchar* uid); -gboolean folks_postal_address_equal (FolksPostalAddress* self, FolksPostalAddress* with); +gboolean folks_postal_address_is_empty (FolksPostalAddress* self); const gchar* folks_postal_address_get_po_box (FolksPostalAddress* self); const gchar* folks_postal_address_get_extension (FolksPostalAddress* self); const gchar* folks_postal_address_get_street (FolksPostalAddress* self); @@ -185,6 +185,7 @@ const gchar* folks_postal_address_get_postal_code (FolksPostalAddress* self); const gchar* folks_postal_address_get_country (FolksPostalAddress* self); const gchar* folks_postal_address_get_address_format (FolksPostalAddress* self); +gboolean folks_postal_address_equal (FolksPostalAddress* self, FolksPostalAddress* with); gchar* folks_postal_address_to_string (FolksPostalAddress* self); void folks_postal_address_set_po_box (FolksPostalAddress* self, const gchar* value); void folks_postal_address_set_extension (FolksPostalAddress* self, const gchar* value); @@ -279,6 +280,110 @@ /** + * Whether none of the components is set. + * + * @return `true` if all the components are the empty string, `false` + * otherwise. + * + * @since 0.6.7 + */ +gboolean folks_postal_address_is_empty (FolksPostalAddress* self) { + gboolean result = FALSE; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; + gboolean _tmp2_ = FALSE; + gboolean _tmp3_ = FALSE; + gboolean _tmp4_ = FALSE; + gboolean _tmp5_ = FALSE; + gboolean _tmp6_ = FALSE; + const gchar* _tmp7_; + const gchar* _tmp8_; + gboolean _tmp11_; + gboolean _tmp14_; + gboolean _tmp17_; + gboolean _tmp20_; + gboolean _tmp23_; + gboolean _tmp26_; + gboolean _tmp29_; + g_return_val_if_fail (self != NULL, FALSE); + _tmp7_ = folks_postal_address_get_po_box (self); + _tmp8_ = _tmp7_; + if (g_strcmp0 (_tmp8_, "") == 0) { + const gchar* _tmp9_; + const gchar* _tmp10_; + _tmp9_ = folks_postal_address_get_extension (self); + _tmp10_ = _tmp9_; + _tmp6_ = g_strcmp0 (_tmp10_, "") == 0; + } else { + _tmp6_ = FALSE; + } + _tmp11_ = _tmp6_; + if (_tmp11_) { + const gchar* _tmp12_; + const gchar* _tmp13_; + _tmp12_ = folks_postal_address_get_street (self); + _tmp13_ = _tmp12_; + _tmp5_ = g_strcmp0 (_tmp13_, "") == 0; + } else { + _tmp5_ = FALSE; + } + _tmp14_ = _tmp5_; + if (_tmp14_) { + const gchar* _tmp15_; + const gchar* _tmp16_; + _tmp15_ = folks_postal_address_get_locality (self); + _tmp16_ = _tmp15_; + _tmp4_ = g_strcmp0 (_tmp16_, "") == 0; + } else { + _tmp4_ = FALSE; + } + _tmp17_ = _tmp4_; + if (_tmp17_) { + const gchar* _tmp18_; + const gchar* _tmp19_; + _tmp18_ = folks_postal_address_get_region (self); + _tmp19_ = _tmp18_; + _tmp3_ = g_strcmp0 (_tmp19_, "") == 0; + } else { + _tmp3_ = FALSE; + } + _tmp20_ = _tmp3_; + if (_tmp20_) { + const gchar* _tmp21_; + const gchar* _tmp22_; + _tmp21_ = folks_postal_address_get_postal_code (self); + _tmp22_ = _tmp21_; + _tmp2_ = g_strcmp0 (_tmp22_, "") == 0; + } else { + _tmp2_ = FALSE; + } + _tmp23_ = _tmp2_; + if (_tmp23_) { + const gchar* _tmp24_; + const gchar* _tmp25_; + _tmp24_ = folks_postal_address_get_country (self); + _tmp25_ = _tmp24_; + _tmp1_ = g_strcmp0 (_tmp25_, "") == 0; + } else { + _tmp1_ = FALSE; + } + _tmp26_ = _tmp1_; + if (_tmp26_) { + const gchar* _tmp27_; + const gchar* _tmp28_; + _tmp27_ = folks_postal_address_get_address_format (self); + _tmp28_ = _tmp27_; + _tmp0_ = g_strcmp0 (_tmp28_, "") == 0; + } else { + _tmp0_ = FALSE; + } + _tmp29_ = _tmp0_; + result = _tmp29_; + return result; +} + + +/** * Compare if two postal addresses are equal. Addresses are equal if all their * components are equal (where `null` compares equal only with `null`) and * they have the same set of types (or both have no types). @@ -986,7 +1091,7 @@ /** * Create a new PostalAddressFieldDetails. * - * @param value the value of the field + * @param value the value of the field, a non-empty {@link PostalAddress} * @param parameters initial parameters. See * {@link AbstractFieldDetails.parameters}. A `null` value is equivalent to an * empty map of parameters. @@ -999,17 +1104,25 @@ FolksPostalAddressFieldDetails* folks_postal_address_field_details_construct (GType object_type, FolksPostalAddress* value, GeeMultiMap* parameters) { FolksPostalAddressFieldDetails * self = NULL; FolksPostalAddress* _tmp0_; - GeeMultiMap* _tmp1_; + gboolean _tmp1_ = FALSE; FolksPostalAddress* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; + GeeMultiMap* _tmp3_; + FolksPostalAddress* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; g_return_val_if_fail (value != NULL, NULL); _tmp0_ = value; - _tmp1_ = parameters; + _tmp1_ = folks_postal_address_is_empty (_tmp0_); + if (_tmp1_) { + g_warning ("postal-address-details.vala:284: Empty postal address passed to Postal" \ +"AddressFieldDetails."); + } _tmp2_ = value; - _tmp3_ = folks_postal_address_get_uid (_tmp2_); - _tmp4_ = _tmp3_; - self = (FolksPostalAddressFieldDetails*) g_object_new (object_type, "t_type", FOLKS_TYPE_POSTAL_ADDRESS, "t_dup_func", (GBoxedCopyFunc) g_object_ref, "t_destroy_func", g_object_unref, "value", _tmp0_, "parameters", _tmp1_, "id", _tmp4_, NULL); + _tmp3_ = parameters; + _tmp4_ = value; + _tmp5_ = folks_postal_address_get_uid (_tmp4_); + _tmp6_ = _tmp5_; + self = (FolksPostalAddressFieldDetails*) g_object_new (object_type, "t_type", FOLKS_TYPE_POSTAL_ADDRESS, "t_dup_func", (GBoxedCopyFunc) g_object_ref, "t_destroy_func", g_object_unref, "value", _tmp2_, "parameters", _tmp3_, "id", _tmp6_, NULL); return self; } @@ -1210,7 +1323,7 @@ /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_POSTAL_ADDRESS_FIELD_DETAILS_ID, "id"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_POSTAL_ADDRESS_FIELD_DETAILS_ID, g_param_spec_string ("id", "id", "id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); } diff -Nru folks-0.6.6/folks/postal-address-details.vala folks-0.6.7/folks/postal-address-details.vala --- folks-0.6.6/folks/postal-address-details.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/folks/postal-address-details.vala 2012-02-23 00:01:16.000000000 +0000 @@ -174,6 +174,26 @@ } /** + * Whether none of the components is set. + * + * @return `true` if all the components are the empty string, `false` + * otherwise. + * + * @since 0.6.7 + */ + public bool is_empty () + { + return this.po_box == "" && + this.extension == "" && + this.street == "" && + this.locality == "" && + this.region == "" && + this.postal_code == "" && + this.country == "" && + this.address_format == ""; + } + + /** * Compare if two postal addresses are equal. Addresses are equal if all their * components are equal (where `null` compares equal only with `null`) and * they have the same set of types (or both have no types). @@ -246,7 +266,7 @@ /** * Create a new PostalAddressFieldDetails. * - * @param value the value of the field + * @param value the value of the field, a non-empty {@link PostalAddress} * @param parameters initial parameters. See * {@link AbstractFieldDetails.parameters}. A `null` value is equivalent to an * empty map of parameters. @@ -259,6 +279,11 @@ public PostalAddressFieldDetails (PostalAddress value, MultiMap? parameters = null) { + if (value.is_empty ()) + { + warning ("Empty postal address passed to PostalAddressFieldDetails."); + } + /* We keep id and value.uid synchronised in both directions. */ Object (value: value, parameters: parameters, @@ -282,7 +307,7 @@ */ public override bool equal (AbstractFieldDetails that) { - if (!base.parameters_equal (that)) + if (!base.parameters_equal (that)) return false; /* This is fairly-dumb but smart matching is an i10n nightmare. */ diff -Nru folks-0.6.6/folks/potential-match.c folks-0.6.7/folks/potential-match.c --- folks-0.6.6/folks/potential-match.c 2011-12-13 23:39:16.000000000 +0000 +++ folks-0.6.7/folks/potential-match.c 2012-02-23 00:01:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* potential-match.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* potential-match.c generated by valac 0.15.1, the Vala compiler * generated from potential-match.vala, do not modify */ /* @@ -111,6 +111,14 @@ typedef struct _FolksStructuredName FolksStructuredName; typedef struct _FolksStructuredNameClass FolksStructuredNameClass; +#define FOLKS_TYPE_ALIAS_DETAILS (folks_alias_details_get_type ()) +#define FOLKS_ALIAS_DETAILS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOLKS_TYPE_ALIAS_DETAILS, FolksAliasDetails)) +#define FOLKS_IS_ALIAS_DETAILS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOLKS_TYPE_ALIAS_DETAILS)) +#define FOLKS_ALIAS_DETAILS_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), FOLKS_TYPE_ALIAS_DETAILS, FolksAliasDetailsIface)) + +typedef struct _FolksAliasDetails FolksAliasDetails; +typedef struct _FolksAliasDetailsIface FolksAliasDetailsIface; + #define FOLKS_TYPE_IM_DETAILS (folks_im_details_get_type ()) #define FOLKS_IM_DETAILS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOLKS_TYPE_IM_DETAILS, FolksImDetails)) #define FOLKS_IS_IM_DETAILS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), FOLKS_TYPE_IM_DETAILS)) @@ -217,6 +225,14 @@ void (*set_nickname) (FolksNameDetails* self, const gchar* value); }; +struct _FolksAliasDetailsIface { + GTypeInterface parent_iface; + void (*change_alias) (FolksAliasDetails* self, const gchar* alias, GAsyncReadyCallback _callback_, gpointer _user_data_); + void (*change_alias_finish) (FolksAliasDetails* self, GAsyncResult* _res_, GError** error); + const gchar* (*get_alias) (FolksAliasDetails* self); + void (*set_alias) (FolksAliasDetails* self, const gchar* value); +}; + struct _FolksImDetailsIface { GTypeInterface parent_iface; void (*change_im_addresses) (FolksImDetails* self, GeeMultiMap* im_addresses, GAsyncReadyCallback _callback_, gpointer _user_data_); @@ -262,12 +278,15 @@ GType folks_phone_details_get_type (void) G_GNUC_CONST; GeeSet* folks_phone_details_get_phone_numbers (FolksPhoneDetails* self); gboolean folks_abstract_field_details_values_equal (FolksAbstractFieldDetails* self, FolksAbstractFieldDetails* that); +static gboolean _folks_potential_match_look_alike (FolksPotentialMatch* self, const gchar* a, const gchar* b); GType folks_structured_name_get_type (void) G_GNUC_CONST; GType folks_name_details_get_type (void) G_GNUC_CONST; -FolksStructuredName* folks_name_details_get_structured_name (FolksNameDetails* self); -static gboolean _folks_potential_match_look_alike (FolksPotentialMatch* self, const gchar* a, const gchar* b); const gchar* folks_name_details_get_nickname (FolksNameDetails* self); +static gboolean _folks_potential_match_look_alike_or_identical (FolksPotentialMatch* self, const gchar* a, const gchar* b, gboolean* exact); const gchar* folks_name_details_get_full_name (FolksNameDetails* self); +GType folks_alias_details_get_type (void) G_GNUC_CONST; +const gchar* folks_alias_details_get_alias (FolksAliasDetails* self); +FolksStructuredName* folks_name_details_get_structured_name (FolksNameDetails* self); gboolean folks_structured_name_is_empty (FolksStructuredName* self); gboolean folks_structured_name_equal (FolksStructuredName* self, FolksStructuredName* other); gboolean _folks_utils_str_equal_safe (const gchar* a, const gchar* b); @@ -532,238 +551,341 @@ static void _folks_potential_match_name_similarity (FolksPotentialMatch* self) { - FolksIndividual* _tmp0_; - FolksStructuredName* _tmp1_; - FolksStructuredName* _tmp2_; - FolksStructuredName* _tmp3_; - FolksStructuredName* a; - FolksIndividual* _tmp4_; - FolksStructuredName* _tmp5_; - FolksStructuredName* _tmp6_; - FolksStructuredName* _tmp7_; - FolksStructuredName* b; gdouble similarity; - FolksIndividual* _tmp8_; - const gchar* _tmp9_; - const gchar* _tmp10_; + gboolean exact_match; + FolksIndividual* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + FolksIndividual* _tmp3_; + const gchar* _tmp4_; + const gchar* _tmp5_; + gboolean _tmp6_ = FALSE; + gboolean _tmp8_ = FALSE; + gboolean _tmp9_ = FALSE; + gboolean _tmp10_ = FALSE; FolksIndividual* _tmp11_; const gchar* _tmp12_; const gchar* _tmp13_; - gboolean _tmp14_ = FALSE; - FolksIndividual* _tmp16_; - const gchar* _tmp17_; - const gchar* _tmp18_; - FolksIndividual* _tmp19_; - const gchar* _tmp20_; - const gchar* _tmp21_; - gboolean _tmp22_ = FALSE; - gboolean _tmp24_ = FALSE; - FolksStructuredName* _tmp25_; + FolksIndividual* _tmp14_; + const gchar* _tmp15_; + const gchar* _tmp16_; + gboolean _tmp17_ = FALSE; + gboolean _tmp18_ = FALSE; gboolean _tmp27_; - gdouble _tmp84_; - gdouble _tmp85_; - gdouble _tmp86_; + gboolean _tmp36_; + gboolean _tmp45_; + FolksIndividual* _tmp47_; + FolksStructuredName* _tmp48_; + FolksStructuredName* _tmp49_; + FolksStructuredName* _tmp50_; + FolksStructuredName* _a; + FolksIndividual* _tmp51_; + FolksStructuredName* _tmp52_; + FolksStructuredName* _tmp53_; + FolksStructuredName* _tmp54_; + FolksStructuredName* _b; + gboolean _tmp55_ = FALSE; + FolksStructuredName* _tmp56_; + gboolean _tmp58_; + gdouble _tmp119_; + gdouble _tmp120_; + gdouble _tmp121_; g_return_if_fail (self != NULL); + similarity = 0.0; + exact_match = FALSE; _tmp0_ = self->priv->_individual_a; - _tmp1_ = folks_name_details_get_structured_name ((FolksNameDetails*) _tmp0_); + _tmp1_ = folks_name_details_get_nickname ((FolksNameDetails*) _tmp0_); _tmp2_ = _tmp1_; - _tmp3_ = _g_object_ref0 (_tmp2_); - a = _tmp3_; - _tmp4_ = self->priv->_individual_b; - _tmp5_ = folks_name_details_get_structured_name ((FolksNameDetails*) _tmp4_); - _tmp6_ = _tmp5_; - _tmp7_ = _g_object_ref0 (_tmp6_); - b = _tmp7_; - similarity = 0.0; - _tmp8_ = self->priv->_individual_a; - _tmp9_ = folks_name_details_get_nickname ((FolksNameDetails*) _tmp8_); - _tmp10_ = _tmp9_; - _tmp11_ = self->priv->_individual_b; - _tmp12_ = folks_name_details_get_nickname ((FolksNameDetails*) _tmp11_); + _tmp3_ = self->priv->_individual_b; + _tmp4_ = folks_name_details_get_nickname ((FolksNameDetails*) _tmp3_); + _tmp5_ = _tmp4_; + _tmp6_ = _folks_potential_match_look_alike (self, _tmp2_, _tmp5_); + if (_tmp6_) { + gdouble _tmp7_; + _tmp7_ = similarity; + similarity = _tmp7_ + 0.20; + } + _tmp11_ = self->priv->_individual_a; + _tmp12_ = folks_name_details_get_full_name ((FolksNameDetails*) _tmp11_); _tmp13_ = _tmp12_; - _tmp14_ = _folks_potential_match_look_alike (self, _tmp10_, _tmp13_); - if (_tmp14_) { - gdouble _tmp15_; - _tmp15_ = similarity; - similarity = _tmp15_ + 0.20; - } - _tmp16_ = self->priv->_individual_a; - _tmp17_ = folks_name_details_get_full_name ((FolksNameDetails*) _tmp16_); - _tmp18_ = _tmp17_; - _tmp19_ = self->priv->_individual_b; - _tmp20_ = folks_name_details_get_full_name ((FolksNameDetails*) _tmp19_); - _tmp21_ = _tmp20_; - _tmp22_ = _folks_potential_match_look_alike (self, _tmp18_, _tmp21_); - if (_tmp22_) { - gdouble _tmp23_; - _tmp23_ = similarity; - similarity = _tmp23_ + 0.70; - } - _tmp25_ = a; - if (_tmp25_ != NULL) { - FolksStructuredName* _tmp26_; - _tmp26_ = b; - _tmp24_ = _tmp26_ != NULL; + _tmp14_ = self->priv->_individual_b; + _tmp15_ = folks_name_details_get_full_name ((FolksNameDetails*) _tmp14_); + _tmp16_ = _tmp15_; + _tmp18_ = _folks_potential_match_look_alike_or_identical (self, _tmp13_, _tmp16_, &_tmp17_); + exact_match = _tmp17_; + if (_tmp18_) { + _tmp10_ = TRUE; } else { - _tmp24_ = FALSE; + FolksIndividual* _tmp19_; + const gchar* _tmp20_; + const gchar* _tmp21_; + FolksIndividual* _tmp22_; + const gchar* _tmp23_; + const gchar* _tmp24_; + gboolean _tmp25_ = FALSE; + gboolean _tmp26_ = FALSE; + _tmp19_ = self->priv->_individual_a; + _tmp20_ = folks_alias_details_get_alias ((FolksAliasDetails*) _tmp19_); + _tmp21_ = _tmp20_; + _tmp22_ = self->priv->_individual_b; + _tmp23_ = folks_name_details_get_full_name ((FolksNameDetails*) _tmp22_); + _tmp24_ = _tmp23_; + _tmp26_ = _folks_potential_match_look_alike_or_identical (self, _tmp21_, _tmp24_, &_tmp25_); + exact_match = _tmp25_; + _tmp10_ = _tmp26_; } - _tmp27_ = _tmp24_; + _tmp27_ = _tmp10_; if (_tmp27_) { - gboolean _tmp28_ = FALSE; - FolksStructuredName* _tmp29_; - gboolean _tmp30_ = FALSE; - gboolean _tmp34_; - FolksStructuredName* _tmp35_; - const gchar* _tmp36_; - const gchar* _tmp37_; - FolksStructuredName* _tmp38_; + _tmp9_ = TRUE; + } else { + FolksIndividual* _tmp28_; + const gchar* _tmp29_; + const gchar* _tmp30_; + FolksIndividual* _tmp31_; + const gchar* _tmp32_; + const gchar* _tmp33_; + gboolean _tmp34_ = FALSE; + gboolean _tmp35_ = FALSE; + _tmp28_ = self->priv->_individual_a; + _tmp29_ = folks_name_details_get_full_name ((FolksNameDetails*) _tmp28_); + _tmp30_ = _tmp29_; + _tmp31_ = self->priv->_individual_b; + _tmp32_ = folks_alias_details_get_alias ((FolksAliasDetails*) _tmp31_); + _tmp33_ = _tmp32_; + _tmp35_ = _folks_potential_match_look_alike_or_identical (self, _tmp30_, _tmp33_, &_tmp34_); + exact_match = _tmp34_; + _tmp9_ = _tmp35_; + } + _tmp36_ = _tmp9_; + if (_tmp36_) { + _tmp8_ = TRUE; + } else { + FolksIndividual* _tmp37_; + const gchar* _tmp38_; const gchar* _tmp39_; - const gchar* _tmp40_; - gboolean _tmp41_ = FALSE; + FolksIndividual* _tmp40_; + const gchar* _tmp41_; + const gchar* _tmp42_; gboolean _tmp43_ = FALSE; - FolksStructuredName* _tmp44_; - const gchar* _tmp45_; - const gchar* _tmp46_; - FolksStructuredName* _tmp47_; - const gchar* _tmp48_; - const gchar* _tmp49_; - gboolean _tmp50_ = FALSE; - gboolean _tmp58_; + gboolean _tmp44_ = FALSE; + _tmp37_ = self->priv->_individual_a; + _tmp38_ = folks_alias_details_get_alias ((FolksAliasDetails*) _tmp37_); + _tmp39_ = _tmp38_; + _tmp40_ = self->priv->_individual_b; + _tmp41_ = folks_alias_details_get_alias ((FolksAliasDetails*) _tmp40_); + _tmp42_ = _tmp41_; + _tmp44_ = _folks_potential_match_look_alike_or_identical (self, _tmp39_, _tmp42_, &_tmp43_); + exact_match = _tmp43_; + _tmp8_ = _tmp44_; + } + _tmp45_ = _tmp8_; + if (_tmp45_) { + gdouble _tmp46_; + _tmp46_ = similarity; + similarity = _tmp46_ + 0.70; + } + _tmp47_ = self->priv->_individual_a; + _tmp48_ = folks_name_details_get_structured_name ((FolksNameDetails*) _tmp47_); + _tmp49_ = _tmp48_; + _tmp50_ = _g_object_ref0 (_tmp49_); + _a = _tmp50_; + _tmp51_ = self->priv->_individual_b; + _tmp52_ = folks_name_details_get_structured_name ((FolksNameDetails*) _tmp51_); + _tmp53_ = _tmp52_; + _tmp54_ = _g_object_ref0 (_tmp53_); + _b = _tmp54_; + _tmp56_ = _a; + if (_tmp56_ != NULL) { + FolksStructuredName* _tmp57_; + _tmp57_ = _b; + _tmp55_ = _tmp57_ != NULL; + } else { + _tmp55_ = FALSE; + } + _tmp58_ = _tmp55_; + if (_tmp58_) { + FolksStructuredName* _tmp59_; FolksStructuredName* _tmp60_; - const gchar* _tmp61_; - const gchar* _tmp62_; - FolksStructuredName* _tmp63_; - const gchar* _tmp64_; - const gchar* _tmp65_; - gboolean _tmp66_ = FALSE; - FolksStructuredName* _tmp68_; - const gchar* _tmp69_; - const gchar* _tmp70_; - FolksStructuredName* _tmp71_; + FolksStructuredName* a; + FolksStructuredName* _tmp61_; + FolksStructuredName* _tmp62_; + FolksStructuredName* b; + gboolean _tmp63_ = FALSE; + FolksStructuredName* _tmp64_; + gboolean _tmp65_ = FALSE; + gboolean _tmp69_; + FolksStructuredName* _tmp70_; + const gchar* _tmp71_; const gchar* _tmp72_; - const gchar* _tmp73_; - gboolean _tmp74_ = FALSE; - FolksStructuredName* _tmp76_; - const gchar* _tmp77_; - const gchar* _tmp78_; + FolksStructuredName* _tmp73_; + const gchar* _tmp74_; + const gchar* _tmp75_; + gboolean _tmp76_ = FALSE; + gboolean _tmp78_ = FALSE; FolksStructuredName* _tmp79_; const gchar* _tmp80_; const gchar* _tmp81_; - gboolean _tmp82_ = FALSE; - _tmp29_ = a; - _tmp30_ = folks_structured_name_is_empty (_tmp29_); - if (_tmp30_ == FALSE) { - FolksStructuredName* _tmp31_; - FolksStructuredName* _tmp32_; - gboolean _tmp33_ = FALSE; - _tmp31_ = a; - _tmp32_ = b; - _tmp33_ = folks_structured_name_equal (_tmp31_, _tmp32_); - _tmp28_ = _tmp33_; + FolksStructuredName* _tmp82_; + const gchar* _tmp83_; + const gchar* _tmp84_; + gboolean _tmp85_ = FALSE; + gboolean _tmp93_; + FolksStructuredName* _tmp95_; + const gchar* _tmp96_; + const gchar* _tmp97_; + FolksStructuredName* _tmp98_; + const gchar* _tmp99_; + const gchar* _tmp100_; + gboolean _tmp101_ = FALSE; + FolksStructuredName* _tmp103_; + const gchar* _tmp104_; + const gchar* _tmp105_; + FolksStructuredName* _tmp106_; + const gchar* _tmp107_; + const gchar* _tmp108_; + gboolean _tmp109_ = FALSE; + FolksStructuredName* _tmp111_; + const gchar* _tmp112_; + const gchar* _tmp113_; + FolksStructuredName* _tmp114_; + const gchar* _tmp115_; + const gchar* _tmp116_; + gboolean _tmp117_ = FALSE; + _tmp59_ = _a; + _tmp60_ = _g_object_ref0 (FOLKS_STRUCTURED_NAME (_tmp59_)); + a = _tmp60_; + _tmp61_ = _b; + _tmp62_ = _g_object_ref0 (FOLKS_STRUCTURED_NAME (_tmp61_)); + b = _tmp62_; + _tmp64_ = a; + _tmp65_ = folks_structured_name_is_empty (_tmp64_); + if (_tmp65_ == FALSE) { + FolksStructuredName* _tmp66_; + FolksStructuredName* _tmp67_; + gboolean _tmp68_ = FALSE; + _tmp66_ = a; + _tmp67_ = b; + _tmp68_ = folks_structured_name_equal (_tmp66_, _tmp67_); + _tmp63_ = _tmp68_; } else { - _tmp28_ = FALSE; + _tmp63_ = FALSE; } - _tmp34_ = _tmp28_; - if (_tmp34_) { + _tmp69_ = _tmp63_; + if (_tmp69_) { self->priv->_result = FOLKS_MATCH_RESULT_HIGH; _g_object_unref0 (b); _g_object_unref0 (a); + _g_object_unref0 (_b); + _g_object_unref0 (_a); return; } - _tmp35_ = a; - _tmp36_ = folks_structured_name_get_given_name (_tmp35_); - _tmp37_ = _tmp36_; - _tmp38_ = b; - _tmp39_ = folks_structured_name_get_given_name (_tmp38_); - _tmp40_ = _tmp39_; - _tmp41_ = _folks_utils_str_equal_safe (_tmp37_, _tmp40_); - if (_tmp41_) { - gdouble _tmp42_; - _tmp42_ = similarity; - similarity = _tmp42_ + 0.20; - } - _tmp44_ = a; - _tmp45_ = folks_structured_name_get_family_name (_tmp44_); - _tmp46_ = _tmp45_; - _tmp47_ = b; - _tmp48_ = folks_structured_name_get_family_name (_tmp47_); - _tmp49_ = _tmp48_; - _tmp50_ = _folks_potential_match_look_alike (self, _tmp46_, _tmp49_); - if (_tmp50_) { - FolksStructuredName* _tmp51_; - const gchar* _tmp52_; - const gchar* _tmp53_; - FolksStructuredName* _tmp54_; - const gchar* _tmp55_; - const gchar* _tmp56_; - gboolean _tmp57_ = FALSE; - _tmp51_ = a; - _tmp52_ = folks_structured_name_get_given_name (_tmp51_); - _tmp53_ = _tmp52_; - _tmp54_ = b; - _tmp55_ = folks_structured_name_get_given_name (_tmp54_); - _tmp56_ = _tmp55_; - _tmp57_ = _folks_potential_match_look_alike (self, _tmp53_, _tmp56_); - _tmp43_ = _tmp57_; - } else { - _tmp43_ = FALSE; + _tmp70_ = a; + _tmp71_ = folks_structured_name_get_given_name (_tmp70_); + _tmp72_ = _tmp71_; + _tmp73_ = b; + _tmp74_ = folks_structured_name_get_given_name (_tmp73_); + _tmp75_ = _tmp74_; + _tmp76_ = _folks_utils_str_equal_safe (_tmp72_, _tmp75_); + if (_tmp76_) { + gdouble _tmp77_; + _tmp77_ = similarity; + similarity = _tmp77_ + 0.20; } - _tmp58_ = _tmp43_; - if (_tmp58_) { - gdouble _tmp59_; - _tmp59_ = similarity; - similarity = _tmp59_ + 0.40; - } - _tmp60_ = a; - _tmp61_ = folks_structured_name_get_additional_names (_tmp60_); - _tmp62_ = _tmp61_; - _tmp63_ = b; - _tmp64_ = folks_structured_name_get_additional_names (_tmp63_); - _tmp65_ = _tmp64_; - _tmp66_ = _folks_utils_str_equal_safe (_tmp62_, _tmp65_); - if (_tmp66_) { - gdouble _tmp67_; - _tmp67_ = similarity; - similarity = _tmp67_ + 0.5; - } - _tmp68_ = a; - _tmp69_ = folks_structured_name_get_prefixes (_tmp68_); - _tmp70_ = _tmp69_; - _tmp71_ = b; - _tmp72_ = folks_structured_name_get_prefixes (_tmp71_); - _tmp73_ = _tmp72_; - _tmp74_ = _folks_utils_str_equal_safe (_tmp70_, _tmp73_); - if (_tmp74_) { - gdouble _tmp75_; - _tmp75_ = similarity; - similarity = _tmp75_ + 0.5; - } - _tmp76_ = a; - _tmp77_ = folks_structured_name_get_suffixes (_tmp76_); - _tmp78_ = _tmp77_; - _tmp79_ = b; - _tmp80_ = folks_structured_name_get_suffixes (_tmp79_); + _tmp79_ = a; + _tmp80_ = folks_structured_name_get_family_name (_tmp79_); _tmp81_ = _tmp80_; - _tmp82_ = _folks_utils_str_equal_safe (_tmp78_, _tmp81_); - if (_tmp82_) { - gdouble _tmp83_; - _tmp83_ = similarity; - similarity = _tmp83_ + 0.5; - } - } - _tmp84_ = similarity; - g_debug ("potential-match.vala:213: [name_similarity] Got %f\n", _tmp84_); - _tmp85_ = similarity; - _tmp86_ = folks_potential_match__DIST_THRESHOLD; - if (_tmp85_ >= _tmp86_) { - FolksMatchResult _tmp87_; - FolksMatchResult _tmp88_ = 0; - _tmp87_ = self->priv->_result; - _tmp88_ = _folks_potential_match_inc_match_level (self, _tmp87_, 2); - self->priv->_result = _tmp88_; + _tmp82_ = b; + _tmp83_ = folks_structured_name_get_family_name (_tmp82_); + _tmp84_ = _tmp83_; + _tmp85_ = _folks_potential_match_look_alike (self, _tmp81_, _tmp84_); + if (_tmp85_) { + FolksStructuredName* _tmp86_; + const gchar* _tmp87_; + const gchar* _tmp88_; + FolksStructuredName* _tmp89_; + const gchar* _tmp90_; + const gchar* _tmp91_; + gboolean _tmp92_ = FALSE; + _tmp86_ = a; + _tmp87_ = folks_structured_name_get_given_name (_tmp86_); + _tmp88_ = _tmp87_; + _tmp89_ = b; + _tmp90_ = folks_structured_name_get_given_name (_tmp89_); + _tmp91_ = _tmp90_; + _tmp92_ = _folks_potential_match_look_alike (self, _tmp88_, _tmp91_); + _tmp78_ = _tmp92_; + } else { + _tmp78_ = FALSE; + } + _tmp93_ = _tmp78_; + if (_tmp93_) { + gdouble _tmp94_; + _tmp94_ = similarity; + similarity = _tmp94_ + 0.40; + } + _tmp95_ = a; + _tmp96_ = folks_structured_name_get_additional_names (_tmp95_); + _tmp97_ = _tmp96_; + _tmp98_ = b; + _tmp99_ = folks_structured_name_get_additional_names (_tmp98_); + _tmp100_ = _tmp99_; + _tmp101_ = _folks_utils_str_equal_safe (_tmp97_, _tmp100_); + if (_tmp101_) { + gdouble _tmp102_; + _tmp102_ = similarity; + similarity = _tmp102_ + 0.5; + } + _tmp103_ = a; + _tmp104_ = folks_structured_name_get_prefixes (_tmp103_); + _tmp105_ = _tmp104_; + _tmp106_ = b; + _tmp107_ = folks_structured_name_get_prefixes (_tmp106_); + _tmp108_ = _tmp107_; + _tmp109_ = _folks_utils_str_equal_safe (_tmp105_, _tmp108_); + if (_tmp109_) { + gdouble _tmp110_; + _tmp110_ = similarity; + similarity = _tmp110_ + 0.5; + } + _tmp111_ = a; + _tmp112_ = folks_structured_name_get_suffixes (_tmp111_); + _tmp113_ = _tmp112_; + _tmp114_ = b; + _tmp115_ = folks_structured_name_get_suffixes (_tmp114_); + _tmp116_ = _tmp115_; + _tmp117_ = _folks_utils_str_equal_safe (_tmp113_, _tmp116_); + if (_tmp117_) { + gdouble _tmp118_; + _tmp118_ = similarity; + similarity = _tmp118_ + 0.5; + } + _g_object_unref0 (b); + _g_object_unref0 (a); + } + _tmp119_ = similarity; + g_debug ("potential-match.vala:228: [name_similarity] Got %f\n", _tmp119_); + _tmp120_ = similarity; + _tmp121_ = folks_potential_match__DIST_THRESHOLD; + if (_tmp120_ >= _tmp121_) { + gint inc; + gboolean _tmp122_; + FolksMatchResult _tmp124_; + gint _tmp125_; + FolksMatchResult _tmp126_ = 0; + inc = 2; + _tmp122_ = exact_match; + if (_tmp122_) { + gint _tmp123_; + _tmp123_ = inc; + inc = _tmp123_ + 1; + } + _tmp124_ = self->priv->_result; + _tmp125_ = inc; + _tmp126_ = _folks_potential_match_inc_match_level (self, _tmp124_, _tmp125_); + self->priv->_result = _tmp126_; } - _g_object_unref0 (b); - _g_object_unref0 (a); + _g_object_unref0 (_b); + _g_object_unref0 (_a); } @@ -922,6 +1044,24 @@ GeeIterator* _tmp12_; gpointer _tmp13_ = NULL; FolksEmailFieldDetails* fd_a; + FolksEmailFieldDetails* _tmp14_; + gconstpointer _tmp15_; + const gchar* _tmp16_; + gchar** _tmp17_; + gchar** _tmp18_ = NULL; + gchar** email_split_a; + gint email_split_a_length1; + gint _email_split_a_size_; + gchar** _tmp19_; + gint _tmp19__length1; + gchar** _tmp23_; + gint _tmp23__length1; + const gchar* _tmp24_; + gchar** _tmp25_; + gchar** _tmp26_ = NULL; + gchar** tokens_a; + gint tokens_a_length1; + gint _tokens_a_size_; _tmp10_ = _fd_a_it; _tmp11_ = gee_iterator_next (_tmp10_); if (!_tmp11_) { @@ -930,92 +1070,122 @@ _tmp12_ = _fd_a_it; _tmp13_ = gee_iterator_get (_tmp12_); fd_a = (FolksEmailFieldDetails*) _tmp13_; + _tmp14_ = fd_a; + _tmp15_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp14_); + _tmp16_ = _tmp15_; + _tmp18_ = _tmp17_ = g_strsplit ((const gchar*) _tmp16_, "@", 0); + email_split_a = _tmp18_; + email_split_a_length1 = _vala_array_length (_tmp17_); + _email_split_a_size_ = email_split_a_length1; + _tmp19_ = email_split_a; + _tmp19__length1 = email_split_a_length1; + if (_tmp19__length1 < 2) { + FolksEmailFieldDetails* _tmp20_; + gconstpointer _tmp21_; + const gchar* _tmp22_; + _tmp20_ = fd_a; + _tmp21_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp20_); + _tmp22_ = _tmp21_; + g_warning ("Invalid e-mail address when looking for potential " "match: %s", (const gchar*) _tmp22_); + email_split_a = (_vala_array_free (email_split_a, email_split_a_length1, (GDestroyNotify) g_free), NULL); + _g_object_unref0 (fd_a); + continue; + } + _tmp23_ = email_split_a; + _tmp23__length1 = email_split_a_length1; + _tmp24_ = _tmp23_[0]; + _tmp26_ = _tmp25_ = g_strsplit_set (_tmp24_, FOLKS_POTENTIAL_MATCH__SEPARATORS, 0); + tokens_a = _tmp26_; + tokens_a_length1 = _vala_array_length (_tmp25_); + _tokens_a_size_ = tokens_a_length1; { - GeeSet* _tmp14_; - GeeIterator* _tmp15_ = NULL; + GeeSet* _tmp27_; + GeeIterator* _tmp28_ = NULL; GeeIterator* _fd_b_it; - _tmp14_ = set_b; - _tmp15_ = gee_iterable_iterator ((GeeIterable*) _tmp14_); - _fd_b_it = _tmp15_; + _tmp27_ = set_b; + _tmp28_ = gee_iterable_iterator ((GeeIterable*) _tmp27_); + _fd_b_it = _tmp28_; while (TRUE) { - GeeIterator* _tmp16_; - gboolean _tmp17_ = FALSE; - GeeIterator* _tmp18_; - gpointer _tmp19_ = NULL; + GeeIterator* _tmp29_; + gboolean _tmp30_ = FALSE; + GeeIterator* _tmp31_; + gpointer _tmp32_ = NULL; FolksEmailFieldDetails* fd_b; - FolksEmailFieldDetails* _tmp20_; - gconstpointer _tmp21_; - const gchar* _tmp22_; - gchar** _tmp23_; - gchar** _tmp24_ = NULL; - gchar** email_split_a; - gint email_split_a_length1; - gint _email_split_a_size_; - FolksEmailFieldDetails* _tmp25_; - gconstpointer _tmp26_; - const gchar* _tmp27_; - gchar** _tmp28_; - gchar** _tmp29_ = NULL; - gchar** email_split_b; - gint email_split_b_length1; - gint _email_split_b_size_; - FolksEmailFieldDetails* _tmp30_; - gconstpointer _tmp31_; - const gchar* _tmp32_; FolksEmailFieldDetails* _tmp33_; gconstpointer _tmp34_; const gchar* _tmp35_; - _tmp16_ = _fd_b_it; - _tmp17_ = gee_iterator_next (_tmp16_); - if (!_tmp17_) { + gchar** _tmp36_; + gchar** _tmp37_ = NULL; + gchar** email_split_b; + gint email_split_b_length1; + gint _email_split_b_size_; + gchar** _tmp38_; + gint _tmp38__length1; + FolksEmailFieldDetails* _tmp42_; + gconstpointer _tmp43_; + const gchar* _tmp44_; + FolksEmailFieldDetails* _tmp45_; + gconstpointer _tmp46_; + const gchar* _tmp47_; + _tmp29_ = _fd_b_it; + _tmp30_ = gee_iterator_next (_tmp29_); + if (!_tmp30_) { break; } - _tmp18_ = _fd_b_it; - _tmp19_ = gee_iterator_get (_tmp18_); - fd_b = (FolksEmailFieldDetails*) _tmp19_; - _tmp20_ = fd_a; - _tmp21_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp20_); - _tmp22_ = _tmp21_; - _tmp24_ = _tmp23_ = g_strsplit ((const gchar*) _tmp22_, "@", 0); - email_split_a = _tmp24_; - email_split_a_length1 = _vala_array_length (_tmp23_); - _email_split_a_size_ = email_split_a_length1; - _tmp25_ = fd_b; - _tmp26_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp25_); - _tmp27_ = _tmp26_; - _tmp29_ = _tmp28_ = g_strsplit ((const gchar*) _tmp27_, "@", 0); - email_split_b = _tmp29_; - email_split_b_length1 = _vala_array_length (_tmp28_); - _email_split_b_size_ = email_split_b_length1; - _tmp30_ = fd_a; - _tmp31_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp30_); - _tmp32_ = _tmp31_; + _tmp31_ = _fd_b_it; + _tmp32_ = gee_iterator_get (_tmp31_); + fd_b = (FolksEmailFieldDetails*) _tmp32_; _tmp33_ = fd_b; _tmp34_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp33_); _tmp35_ = _tmp34_; - if (g_strcmp0 ((const gchar*) _tmp32_, (const gchar*) _tmp35_) == 0) { - GeeSet* _tmp36_; - gchar** _tmp37_; - gint _tmp37__length1; - const gchar* _tmp38_; - gboolean _tmp39_ = FALSE; - _tmp36_ = folks_potential_match_known_email_aliases; - _tmp37_ = email_split_a; - _tmp37__length1 = email_split_a_length1; - _tmp38_ = _tmp37_[0]; - _tmp39_ = gee_collection_contains ((GeeCollection*) _tmp36_, _tmp38_); - if (_tmp39_ == TRUE) { - FolksMatchResult _tmp40_; - _tmp40_ = self->priv->_result; - if (_tmp40_ < FOLKS_MATCH_RESULT_HIGH) { + _tmp37_ = _tmp36_ = g_strsplit ((const gchar*) _tmp35_, "@", 0); + email_split_b = _tmp37_; + email_split_b_length1 = _vala_array_length (_tmp36_); + _email_split_b_size_ = email_split_b_length1; + _tmp38_ = email_split_b; + _tmp38__length1 = email_split_b_length1; + if (_tmp38__length1 < 2) { + FolksEmailFieldDetails* _tmp39_; + gconstpointer _tmp40_; + const gchar* _tmp41_; + _tmp39_ = fd_b; + _tmp40_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp39_); + _tmp41_ = _tmp40_; + g_warning ("Invalid e-mail address when looking for " "potential match: %s", (const gchar*) _tmp41_); + email_split_b = (_vala_array_free (email_split_b, email_split_b_length1, (GDestroyNotify) g_free), NULL); + _g_object_unref0 (fd_b); + continue; + } + _tmp42_ = fd_a; + _tmp43_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp42_); + _tmp44_ = _tmp43_; + _tmp45_ = fd_b; + _tmp46_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp45_); + _tmp47_ = _tmp46_; + if (g_strcmp0 ((const gchar*) _tmp44_, (const gchar*) _tmp47_) == 0) { + GeeSet* _tmp48_; + gchar** _tmp49_; + gint _tmp49__length1; + const gchar* _tmp50_; + gboolean _tmp51_ = FALSE; + _tmp48_ = folks_potential_match_known_email_aliases; + _tmp49_ = email_split_a; + _tmp49__length1 = email_split_a_length1; + _tmp50_ = _tmp49_[0]; + _tmp51_ = gee_collection_contains ((GeeCollection*) _tmp48_, _tmp50_); + if (_tmp51_ == TRUE) { + FolksMatchResult _tmp52_; + _tmp52_ = self->priv->_result; + if (_tmp52_ < FOLKS_MATCH_RESULT_HIGH) { self->priv->_result = FOLKS_MATCH_RESULT_LOW; } } else { self->priv->_result = FOLKS_MATCH_RESULT_HIGH; email_split_b = (_vala_array_free (email_split_b, email_split_b_length1, (GDestroyNotify) g_free), NULL); - email_split_a = (_vala_array_free (email_split_a, email_split_a_length1, (GDestroyNotify) g_free), NULL); _g_object_unref0 (fd_b); _g_object_unref0 (_fd_b_it); + tokens_a = (_vala_array_free (tokens_a, tokens_a_length1, (GDestroyNotify) g_free), NULL); + email_split_a = (_vala_array_free (email_split_a, email_split_a_length1, (GDestroyNotify) g_free), NULL); _g_object_unref0 (fd_a); _g_object_unref0 (_fd_a_it); _g_object_unref0 (set_b); @@ -1023,72 +1193,57 @@ return; } } else { - gchar** _tmp41_; - gint _tmp41__length1; - const gchar* _tmp42_; - gchar** _tmp43_; - gchar** _tmp44_ = NULL; - gchar** tokens_a; - gint tokens_a_length1; - gint _tokens_a_size_; - gchar** _tmp45_; - gint _tmp45__length1; - const gchar* _tmp46_; - gchar** _tmp47_; - gchar** _tmp48_ = NULL; + gchar** _tmp53_; + gint _tmp53__length1; + const gchar* _tmp54_; + gchar** _tmp55_; + gchar** _tmp56_ = NULL; gchar** tokens_b; gint tokens_b_length1; gint _tokens_b_size_; - gchar** _tmp49_; - gint _tmp49__length1; - gchar** _tmp50_; - gint _tmp50__length1; - gboolean _tmp51_ = FALSE; - _tmp41_ = email_split_a; - _tmp41__length1 = email_split_a_length1; - _tmp42_ = _tmp41_[0]; - _tmp44_ = _tmp43_ = g_strsplit_set (_tmp42_, FOLKS_POTENTIAL_MATCH__SEPARATORS, 0); - tokens_a = _tmp44_; - tokens_a_length1 = _vala_array_length (_tmp43_); - _tokens_a_size_ = tokens_a_length1; - _tmp45_ = email_split_b; - _tmp45__length1 = email_split_b_length1; - _tmp46_ = _tmp45_[0]; - _tmp48_ = _tmp47_ = g_strsplit_set (_tmp46_, FOLKS_POTENTIAL_MATCH__SEPARATORS, 0); - tokens_b = _tmp48_; - tokens_b_length1 = _vala_array_length (_tmp47_); + gchar** _tmp57_; + gint _tmp57__length1; + gchar** _tmp58_; + gint _tmp58__length1; + gboolean _tmp59_ = FALSE; + _tmp53_ = email_split_b; + _tmp53__length1 = email_split_b_length1; + _tmp54_ = _tmp53_[0]; + _tmp56_ = _tmp55_ = g_strsplit_set (_tmp54_, FOLKS_POTENTIAL_MATCH__SEPARATORS, 0); + tokens_b = _tmp56_; + tokens_b_length1 = _vala_array_length (_tmp55_); _tokens_b_size_ = tokens_b_length1; - _tmp49_ = tokens_a; - _tmp49__length1 = tokens_a_length1; - _tmp50_ = tokens_b; - _tmp50__length1 = tokens_b_length1; - _tmp51_ = _folks_potential_match_check_initials_expansion (self, _tmp49_, _tmp49__length1, _tmp50_, _tmp50__length1); - if (_tmp51_) { + _tmp57_ = tokens_a; + _tmp57__length1 = tokens_a_length1; + _tmp58_ = tokens_b; + _tmp58__length1 = tokens_b_length1; + _tmp59_ = _folks_potential_match_check_initials_expansion (self, _tmp57_, _tmp57__length1, _tmp58_, _tmp58__length1); + if (_tmp59_) { self->priv->_result = FOLKS_MATCH_RESULT_MEDIUM; } else { - gchar** _tmp52_; - gint _tmp52__length1; - gchar** _tmp53_; - gint _tmp53__length1; - gboolean _tmp54_ = FALSE; - _tmp52_ = tokens_a; - _tmp52__length1 = tokens_a_length1; - _tmp53_ = tokens_b; - _tmp53__length1 = tokens_b_length1; - _tmp54_ = _folks_potential_match_match_tokens (self, _tmp52_, _tmp52__length1, _tmp53_, _tmp53__length1); - if (_tmp54_) { + gchar** _tmp60_; + gint _tmp60__length1; + gchar** _tmp61_; + gint _tmp61__length1; + gboolean _tmp62_ = FALSE; + _tmp60_ = tokens_a; + _tmp60__length1 = tokens_a_length1; + _tmp61_ = tokens_b; + _tmp61__length1 = tokens_b_length1; + _tmp62_ = _folks_potential_match_match_tokens (self, _tmp60_, _tmp60__length1, _tmp61_, _tmp61__length1); + if (_tmp62_) { self->priv->_result = FOLKS_MATCH_RESULT_MEDIUM; } } tokens_b = (_vala_array_free (tokens_b, tokens_b_length1, (GDestroyNotify) g_free), NULL); - tokens_a = (_vala_array_free (tokens_a, tokens_a_length1, (GDestroyNotify) g_free), NULL); } email_split_b = (_vala_array_free (email_split_b, email_split_b_length1, (GDestroyNotify) g_free), NULL); - email_split_a = (_vala_array_free (email_split_a, email_split_a_length1, (GDestroyNotify) g_free), NULL); _g_object_unref0 (fd_b); } _g_object_unref0 (_fd_b_it); } + tokens_a = (_vala_array_free (tokens_a, tokens_a_length1, (GDestroyNotify) g_free), NULL); + email_split_a = (_vala_array_free (email_split_a, email_split_a_length1, (GDestroyNotify) g_free), NULL); _g_object_unref0 (fd_a); } _g_object_unref0 (_fd_a_it); @@ -1403,44 +1558,126 @@ } -static gboolean _folks_potential_match_look_alike (FolksPotentialMatch* self, const gchar* a, const gchar* b) { +static gboolean _folks_potential_match_look_alike_or_identical (FolksPotentialMatch* self, const gchar* a, const gchar* b, gboolean* exact) { + gboolean _vala_exact = FALSE; gboolean result = FALSE; gboolean _tmp0_ = FALSE; - const gchar* _tmp1_; - gboolean _tmp3_; - gboolean _tmp4_ = FALSE; - const gchar* _tmp5_; - const gchar* _tmp6_; - gdouble _tmp7_ = 0.0; - gdouble _tmp8_; + gboolean _tmp1_ = FALSE; + gboolean _tmp2_ = FALSE; + const gchar* _tmp3_; + gboolean _tmp5_; + gboolean _tmp7_; gboolean _tmp9_; - gboolean alike; + const gchar* _tmp10_; + const gchar* _tmp11_; + const gchar* _tmp12_; + const gchar* _tmp13_; + gdouble _tmp14_ = 0.0; + gdouble _tmp15_; g_return_val_if_fail (self != NULL, FALSE); - _tmp1_ = a; - if (_tmp1_ == NULL) { + _vala_exact = FALSE; + _tmp3_ = a; + if (_tmp3_ == NULL) { + _tmp2_ = TRUE; + } else { + const gchar* _tmp4_; + _tmp4_ = a; + _tmp2_ = g_strcmp0 (_tmp4_, "") == 0; + } + _tmp5_ = _tmp2_; + if (_tmp5_) { + _tmp1_ = TRUE; + } else { + const gchar* _tmp6_; + _tmp6_ = b; + _tmp1_ = _tmp6_ == NULL; + } + _tmp7_ = _tmp1_; + if (_tmp7_) { _tmp0_ = TRUE; } else { - const gchar* _tmp2_; - _tmp2_ = b; - _tmp0_ = _tmp2_ == NULL; + const gchar* _tmp8_; + _tmp8_ = b; + _tmp0_ = g_strcmp0 (_tmp8_, "") == 0; } - _tmp3_ = _tmp0_; - if (_tmp3_) { + _tmp9_ = _tmp0_; + if (_tmp9_) { result = FALSE; + if (exact) { + *exact = _vala_exact; + } + return result; + } + _tmp10_ = a; + _tmp11_ = b; + if (g_strcmp0 (_tmp10_, _tmp11_) == 0) { + _vala_exact = TRUE; + result = TRUE; + if (exact) { + *exact = _vala_exact; + } return result; } - _tmp5_ = a; - _tmp6_ = b; - _tmp7_ = folks_potential_match_jaro_dist (self, _tmp5_, _tmp6_); - _tmp8_ = folks_potential_match__DIST_THRESHOLD; - if (_tmp7_ >= _tmp8_) { - _tmp4_ = TRUE; + _tmp12_ = a; + _tmp13_ = b; + _tmp14_ = folks_potential_match_jaro_dist (self, (const gchar*) _tmp12_, (const gchar*) _tmp13_); + _tmp15_ = folks_potential_match__DIST_THRESHOLD; + result = _tmp14_ >= _tmp15_; + if (exact) { + *exact = _vala_exact; + } + return result; +} + + +static gboolean _folks_potential_match_look_alike (FolksPotentialMatch* self, const gchar* a, const gchar* b) { + gboolean result = FALSE; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; + gboolean _tmp2_ = FALSE; + const gchar* _tmp3_; + gboolean _tmp5_; + gboolean _tmp7_; + gboolean _tmp9_; + const gchar* _tmp10_; + const gchar* _tmp11_; + gdouble _tmp12_ = 0.0; + gdouble _tmp13_; + g_return_val_if_fail (self != NULL, FALSE); + _tmp3_ = a; + if (_tmp3_ == NULL) { + _tmp2_ = TRUE; + } else { + const gchar* _tmp4_; + _tmp4_ = a; + _tmp2_ = g_strcmp0 (_tmp4_, "") == 0; + } + _tmp5_ = _tmp2_; + if (_tmp5_) { + _tmp1_ = TRUE; + } else { + const gchar* _tmp6_; + _tmp6_ = b; + _tmp1_ = _tmp6_ == NULL; + } + _tmp7_ = _tmp1_; + if (_tmp7_) { + _tmp0_ = TRUE; } else { - _tmp4_ = FALSE; + const gchar* _tmp8_; + _tmp8_ = b; + _tmp0_ = g_strcmp0 (_tmp8_, "") == 0; + } + _tmp9_ = _tmp0_; + if (_tmp9_) { + result = FALSE; + return result; } - _tmp9_ = _tmp4_; - alike = _tmp9_; - result = alike; + _tmp10_ = a; + _tmp11_ = b; + _tmp12_ = folks_potential_match_jaro_dist (self, (const gchar*) _tmp10_, (const gchar*) _tmp11_); + _tmp13_ = folks_potential_match__DIST_THRESHOLD; + result = _tmp12_ >= _tmp13_; return result; } @@ -1554,7 +1791,7 @@ distance = (1.0 / 3.0) * ((_tmp34_ + _tmp35_) + _tmp36_); _tmp37_ = s1; _tmp38_ = s2; - g_debug ("potential-match.vala:412: [jaro_dist] Distance for %s and %s: %f\n", _tmp37_, _tmp38_, distance); + g_debug ("potential-match.vala:472: [jaro_dist] Distance for %s and %s: %f\n", _tmp37_, _tmp38_, distance); result = distance; return result; } @@ -1719,7 +1956,7 @@ _tmp21_ = s2; _tmp22_ = matches; _tmp23_ = _vala_t; - g_debug ("potential-match.vala:436: %s and %s have %d matches and %f / 2 transpo" \ + g_debug ("potential-match.vala:496: %s and %s have %d matches and %f / 2 transpo" \ "sitions\n", _tmp20_, _tmp21_, _tmp22_, _tmp23_); _tmp24_ = _vala_t; _vala_t = _tmp24_ / 2.0; diff -Nru folks-0.6.6/folks/potential-match.vala folks-0.6.7/folks/potential-match.vala --- folks-0.6.6/folks/potential-match.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/folks/potential-match.vala 2012-01-26 23:52:54.000000000 +0000 @@ -166,9 +166,8 @@ */ private void _name_similarity () { - Folks.StructuredName a = this._individual_a.structured_name; - Folks.StructuredName b = this._individual_b.structured_name; double similarity = 0.0; + bool exact_match = false; if (this._look_alike (this._individual_a.nickname, this._individual_b.nickname)) @@ -176,14 +175,30 @@ similarity += 0.20; } - if (this._look_alike (this._individual_a.full_name, - this._individual_b.full_name)) + if (this._look_alike_or_identical (this._individual_a.full_name, + this._individual_b.full_name, + out exact_match) || + this._look_alike_or_identical (this._individual_a.alias, + this._individual_b.full_name, + out exact_match) || + this._look_alike_or_identical (this._individual_a.full_name, + this._individual_b.alias, + out exact_match) || + this._look_alike_or_identical (this._individual_a.alias, + this._individual_b.alias, + out exact_match)) { similarity += 0.70; } - if (a != null && b != null) + var _a = this._individual_a.structured_name; + var _b = this._individual_b.structured_name; + + if (_a != null && _b != null) { + var a = (!) _a; + var b = (!) _b; + if (a.is_empty () == false && a.equal (b)) { this._result = MatchResult.HIGH; @@ -213,7 +228,16 @@ debug ("[name_similarity] Got %f\n", similarity); if (similarity >= this._DIST_THRESHOLD) - this._result = this._inc_match_level (this._result, 2); + { + int inc = 2; + /* We need exact matches to go to at least HIGH, or otherwise its + not possible to get a HIGH match for e.g. a facebook telepathy + persona, where alias is the only piece of information + available */ + if (exact_match) + inc += 1; + this._result = this._inc_match_level (this._result, inc); + } } /** @@ -254,11 +278,31 @@ foreach (var fd_a in set_a) { + string[] email_split_a = fd_a.value.split ("@"); + + /* Sanity check for valid e-mail addresses. */ + if (email_split_a.length < 2) + { + warning ("Invalid e-mail address when looking for potential " + + "match: %s", fd_a.value); + continue; + } + + string[] tokens_a = + email_split_a[0].split_set (this._SEPARATORS); + foreach (var fd_b in set_b) { - string[] email_split_a = fd_a.value.split ("@"); string[] email_split_b = fd_b.value.split ("@"); + /* Sanity check for valid e-mail addresses. */ + if (email_split_b.length < 2) + { + warning ("Invalid e-mail address when looking for " + + "potential match: %s", fd_b.value); + continue; + } + if (fd_a.value == fd_b.value) { if (PotentialMatch.known_email_aliases.contains @@ -277,8 +321,6 @@ } else { - string[] tokens_a = - email_split_a[0].split_set (this._SEPARATORS); string[] tokens_b = email_split_b[0].split_set (this._SEPARATORS); @@ -370,15 +412,33 @@ return ret; } + private bool _look_alike_or_identical (string? a, string? b, out bool exact) + { + exact = false; + if (a == null || a == "" || b == null || b == "") + { + return false; + } + + if (a == b) + { + exact = true; + return true; + } + + // a and b look alike if their Jaro distance is over the threshold. + return (this.jaro_dist ((!) a, (!) b) >= this._DIST_THRESHOLD); + } + private bool _look_alike (string? a, string? b) { - if (a == null || b == null) + if (a == null || a == "" || b == null || b == "") { return false; } - bool alike = this.jaro_dist (a, b) >= this._DIST_THRESHOLD ? true : false; - return alike; + // a and b look alike if their Jaro distance is over the threshold. + return (this.jaro_dist ((!) a, (!) b) >= this._DIST_THRESHOLD); } /* Based on: diff -Nru folks-0.6.6/folks/presence-details.c folks-0.6.7/folks/presence-details.c --- folks-0.6.6/folks/presence-details.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/presence-details.c 2012-02-23 00:01:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* presence-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* presence-details.c generated by valac 0.15.1, the Vala compiler * generated from presence-details.vala, do not modify */ /* diff -Nru folks-0.6.6/folks/role-details.c folks-0.6.7/folks/role-details.c --- folks-0.6.6/folks/role-details.c 2011-12-13 23:39:15.000000000 +0000 +++ folks-0.6.7/folks/role-details.c 2012-02-23 00:01:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* role-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* role-details.c generated by valac 0.15.1, the Vala compiler * generated from role-details.vala, do not modify */ /* @@ -166,10 +166,11 @@ }; FolksRole* folks_role_new (const gchar* title, const gchar* organisation_name, const gchar* uid); FolksRole* folks_role_construct (GType object_type, const gchar* title, const gchar* organisation_name, const gchar* uid); -gboolean folks_role_equal (FolksRole* a, FolksRole* b); +gboolean folks_role_is_empty (FolksRole* self); +const gchar* folks_role_get_organisation_name (FolksRole* self); const gchar* folks_role_get_title (FolksRole* self); const gchar* folks_role_get_role (FolksRole* self); -const gchar* folks_role_get_organisation_name (FolksRole* self); +gboolean folks_role_equal (FolksRole* a, FolksRole* b); guint folks_role_hash (FolksRole* r); gchar* folks_role_to_string (FolksRole* self); void folks_role_set_organisation_name (FolksRole* self, const gchar* value); @@ -241,6 +242,50 @@ /** + * Whether none of the components is set. + * + * @return `true` if all the components are the empty string, `false` + * otherwise. + * + * @since 0.6.7 + */ +gboolean folks_role_is_empty (FolksRole* self) { + gboolean result = FALSE; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; + const gchar* _tmp2_; + const gchar* _tmp3_; + gboolean _tmp6_; + gboolean _tmp9_; + g_return_val_if_fail (self != NULL, FALSE); + _tmp2_ = folks_role_get_organisation_name (self); + _tmp3_ = _tmp2_; + if (g_strcmp0 (_tmp3_, "") == 0) { + const gchar* _tmp4_; + const gchar* _tmp5_; + _tmp4_ = folks_role_get_title (self); + _tmp5_ = _tmp4_; + _tmp1_ = g_strcmp0 (_tmp5_, "") == 0; + } else { + _tmp1_ = FALSE; + } + _tmp6_ = _tmp1_; + if (_tmp6_) { + const gchar* _tmp7_; + const gchar* _tmp8_; + _tmp7_ = folks_role_get_role (self); + _tmp8_ = _tmp7_; + _tmp0_ = g_strcmp0 (_tmp8_, "") == 0; + } else { + _tmp0_ = FALSE; + } + _tmp9_ = _tmp0_; + result = _tmp9_; + return result; +} + + +/** * Compare if two roles are equal. Roles are equal if their titles and * organisation names are equal. * @@ -623,7 +668,7 @@ /** * Create a new RoleFieldDetails. * - * @param value the {@link Role} of the field + * @param value the non-empty {@link Role} of the field * @param parameters initial parameters. See * {@link AbstractFieldDetails.parameters}. A `null` value is equivalent to an * empty map of parameters. @@ -635,17 +680,24 @@ FolksRoleFieldDetails* folks_role_field_details_construct (GType object_type, FolksRole* value, GeeMultiMap* parameters) { FolksRoleFieldDetails * self = NULL; FolksRole* _tmp0_; - GeeMultiMap* _tmp1_; + gboolean _tmp1_ = FALSE; FolksRole* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; + GeeMultiMap* _tmp3_; + FolksRole* _tmp4_; + const gchar* _tmp5_; + const gchar* _tmp6_; g_return_val_if_fail (value != NULL, NULL); _tmp0_ = value; - _tmp1_ = parameters; + _tmp1_ = folks_role_is_empty (_tmp0_); + if (_tmp1_) { + g_warning ("role-details.vala:197: Empty role passed to RoleFieldDetails."); + } _tmp2_ = value; - _tmp3_ = folks_role_get_uid (_tmp2_); - _tmp4_ = _tmp3_; - self = (FolksRoleFieldDetails*) g_object_new (object_type, "t_type", FOLKS_TYPE_ROLE, "t_dup_func", (GBoxedCopyFunc) g_object_ref, "t_destroy_func", g_object_unref, "value", _tmp0_, "parameters", _tmp1_, "id", _tmp4_, NULL); + _tmp3_ = parameters; + _tmp4_ = value; + _tmp5_ = folks_role_get_uid (_tmp4_); + _tmp6_ = _tmp5_; + self = (FolksRoleFieldDetails*) g_object_new (object_type, "t_type", FOLKS_TYPE_ROLE, "t_dup_func", (GBoxedCopyFunc) g_object_ref, "t_destroy_func", g_object_unref, "value", _tmp2_, "parameters", _tmp3_, "id", _tmp6_, NULL); return self; } @@ -670,42 +722,50 @@ gboolean result = FALSE; FolksAbstractFieldDetails* _tmp0_; FolksRoleFieldDetails* _tmp1_; - FolksRoleFieldDetails* that_fd; + FolksRoleFieldDetails* _that_fd; FolksRoleFieldDetails* _tmp2_; - FolksAbstractFieldDetails* _tmp3_; - gboolean _tmp4_ = FALSE; - gconstpointer _tmp5_; - FolksRole* _tmp6_; - FolksRoleFieldDetails* _tmp7_; - gconstpointer _tmp8_; - FolksRole* _tmp9_; - gboolean _tmp10_ = FALSE; + FolksRoleFieldDetails* _tmp3_; + FolksRoleFieldDetails* _tmp4_; + FolksRoleFieldDetails* that_fd; + FolksAbstractFieldDetails* _tmp5_; + gboolean _tmp6_ = FALSE; + gconstpointer _tmp7_; + FolksRole* _tmp8_; + FolksRoleFieldDetails* _tmp9_; + gconstpointer _tmp10_; + FolksRole* _tmp11_; + gboolean _tmp12_ = FALSE; self = (FolksRoleFieldDetails*) base; g_return_val_if_fail (that != NULL, FALSE); _tmp0_ = that; _tmp1_ = _g_object_ref0 (FOLKS_IS_ROLE_FIELD_DETAILS (_tmp0_) ? ((FolksRoleFieldDetails*) _tmp0_) : NULL); - that_fd = _tmp1_; - _tmp2_ = that_fd; + _that_fd = _tmp1_; + _tmp2_ = _that_fd; if (_tmp2_ == NULL) { result = FALSE; - _g_object_unref0 (that_fd); + _g_object_unref0 (_that_fd); return result; } - _tmp3_ = that; - _tmp4_ = FOLKS_ABSTRACT_FIELD_DETAILS_CLASS (folks_role_field_details_parent_class)->parameters_equal (FOLKS_ABSTRACT_FIELD_DETAILS (self), _tmp3_); - if (!_tmp4_) { + _tmp3_ = _that_fd; + _tmp4_ = _g_object_ref0 (FOLKS_ROLE_FIELD_DETAILS (_tmp3_)); + that_fd = _tmp4_; + _tmp5_ = that; + _tmp6_ = FOLKS_ABSTRACT_FIELD_DETAILS_CLASS (folks_role_field_details_parent_class)->parameters_equal (FOLKS_ABSTRACT_FIELD_DETAILS (self), _tmp5_); + if (!_tmp6_) { result = FALSE; _g_object_unref0 (that_fd); + _g_object_unref0 (_that_fd); return result; } - _tmp5_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) self); - _tmp6_ = _tmp5_; - _tmp7_ = that_fd; - _tmp8_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp7_); - _tmp9_ = _tmp8_; - _tmp10_ = folks_role_equal ((FolksRole*) _tmp6_, (FolksRole*) _tmp9_); - result = _tmp10_; + _tmp7_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) self); + _tmp8_ = _tmp7_; + _tmp9_ = that_fd; + _tmp10_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp9_); + _tmp11_ = _tmp10_; + _tmp12_ = folks_role_equal ((FolksRole*) _tmp8_, (FolksRole*) _tmp11_); + result = _tmp12_; _g_object_unref0 (that_fd); + _g_object_unref0 (_that_fd); return result; } @@ -856,7 +916,7 @@ /** * {@inheritDoc} */ - g_object_class_override_property (G_OBJECT_CLASS (klass), FOLKS_ROLE_FIELD_DETAILS_ID, "id"); + g_object_class_install_property (G_OBJECT_CLASS (klass), FOLKS_ROLE_FIELD_DETAILS_ID, g_param_spec_string ("id", "id", "id", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); } diff -Nru folks-0.6.6/folks/role-details.vala folks-0.6.7/folks/role-details.vala --- folks-0.6.6/folks/role-details.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/folks/role-details.vala 2012-02-23 00:01:16.000000000 +0000 @@ -98,6 +98,21 @@ } /** + * Whether none of the components is set. + * + * @return `true` if all the components are the empty string, `false` + * otherwise. + * + * @since 0.6.7 + */ + public bool is_empty () + { + return this.organisation_name == "" && + this.title == "" && + this.role == ""; + } + + /** * Compare if two roles are equal. Roles are equal if their titles and * organisation names are equal. * @@ -165,7 +180,7 @@ /** * Create a new RoleFieldDetails. * - * @param value the {@link Role} of the field + * @param value the non-empty {@link Role} of the field * @param parameters initial parameters. See * {@link AbstractFieldDetails.parameters}. A `null` value is equivalent to an * empty map of parameters. @@ -177,6 +192,11 @@ public RoleFieldDetails (Role value, MultiMap? parameters = null) { + if (value.is_empty ()) + { + warning ("Empty role passed to RoleFieldDetails."); + } + /* We keep id and value.uid synchronised in both directions. */ Object (value: value, parameters: parameters, @@ -200,11 +220,12 @@ */ public override bool equal (AbstractFieldDetails that) { - var that_fd = that as RoleFieldDetails; - if (that_fd == null) + var _that_fd = that as RoleFieldDetails; + if (_that_fd == null) return false; + RoleFieldDetails that_fd = (!) _that_fd; - if (!base.parameters_equal (that)) + if (!base.parameters_equal (that)) return false; return Role.equal (this.value, that_fd.value); diff -Nru folks-0.6.6/folks/types.c folks-0.6.7/folks/types.c --- folks-0.6.6/folks/types.c 2011-12-13 23:39:16.000000000 +0000 +++ folks-0.6.7/folks/types.c 2012-02-23 00:01:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* types.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* types.c generated by valac 0.15.1, the Vala compiler * generated from types.vala, do not modify */ /* diff -Nru folks-0.6.6/folks/url-details.c folks-0.6.7/folks/url-details.c --- folks-0.6.6/folks/url-details.c 2011-12-13 23:39:15.000000000 +0000 +++ folks-0.6.7/folks/url-details.c 2012-02-23 00:01:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* url-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* url-details.c generated by valac 0.15.1, the Vala compiler * generated from url-details.vala, do not modify */ /* @@ -151,7 +151,7 @@ /** * Create a new UrlFieldDetails. * - * @param value the value of the field + * @param value the value of the field, a non-empty URI * @param parameters initial parameters. See * {@link AbstractFieldDetails.parameters}. A `null` value is equivalent to a * empty map of parameters. @@ -163,11 +163,16 @@ FolksUrlFieldDetails* folks_url_field_details_construct (GType object_type, const gchar* value, GeeMultiMap* parameters) { FolksUrlFieldDetails * self = NULL; const gchar* _tmp0_; - GeeMultiMap* _tmp1_; + const gchar* _tmp1_; + GeeMultiMap* _tmp2_; g_return_val_if_fail (value != NULL, NULL); _tmp0_ = value; - _tmp1_ = parameters; - self = (FolksUrlFieldDetails*) g_object_new (object_type, "t_type", G_TYPE_STRING, "t_dup_func", (GBoxedCopyFunc) g_strdup, "t_destroy_func", g_free, "value", _tmp0_, "parameters", _tmp1_, NULL); + if (g_strcmp0 (_tmp0_, "") == 0) { + g_warning ("url-details.vala:91: Empty URI passed to UrlFieldDetails."); + } + _tmp1_ = value; + _tmp2_ = parameters; + self = (FolksUrlFieldDetails*) g_object_new (object_type, "t_type", G_TYPE_STRING, "t_dup_func", (GBoxedCopyFunc) g_strdup, "t_destroy_func", g_free, "value", _tmp1_, "parameters", _tmp2_, NULL); return self; } diff -Nru folks-0.6.6/folks/url-details.vala folks-0.6.7/folks/url-details.vala --- folks-0.6.6/folks/url-details.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/folks/url-details.vala 2012-01-12 17:25:24.000000000 +0000 @@ -74,7 +74,7 @@ /** * Create a new UrlFieldDetails. * - * @param value the value of the field + * @param value the value of the field, a non-empty URI * @param parameters initial parameters. See * {@link AbstractFieldDetails.parameters}. A `null` value is equivalent to a * empty map of parameters. @@ -86,6 +86,11 @@ public UrlFieldDetails (string value, MultiMap? parameters = null) { + if (value == "") + { + warning ("Empty URI passed to UrlFieldDetails."); + } + Object (value: value, parameters: parameters); } @@ -97,7 +102,7 @@ */ public override bool equal (AbstractFieldDetails that) { - return base.equal (that); + return base.equal (that); } /** diff -Nru folks-0.6.6/folks/utils.c folks-0.6.7/folks/utils.c --- folks-0.6.6/folks/utils.c 2011-12-13 23:39:16.000000000 +0000 +++ folks-0.6.7/folks/utils.c 2012-02-23 00:01:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* utils.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* utils.c generated by valac 0.15.1, the Vala compiler * generated from utils.vala, do not modify */ /* diff -Nru folks-0.6.6/folks/web-service-details.c folks-0.6.7/folks/web-service-details.c --- folks-0.6.6/folks/web-service-details.c 2011-12-13 23:39:14.000000000 +0000 +++ folks-0.6.7/folks/web-service-details.c 2012-02-23 00:01:47.000000000 +0000 @@ -1,4 +1,4 @@ -/* web-service-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* web-service-details.c generated by valac 0.15.1, the Vala compiler * generated from web-service-details.vala, do not modify */ /* @@ -146,7 +146,7 @@ /** * Create a new WebServiceFieldDetails. * - * @param value the value of the field + * @param value the value of the field, a non-empty web service address * @param parameters initial parameters. See * {@link AbstractFieldDetails.parameters}. A `null` value is equivalent to an * empty map of parameters. @@ -158,11 +158,16 @@ FolksWebServiceFieldDetails* folks_web_service_field_details_construct (GType object_type, const gchar* value, GeeMultiMap* parameters) { FolksWebServiceFieldDetails * self = NULL; const gchar* _tmp0_; - GeeMultiMap* _tmp1_; + const gchar* _tmp1_; + GeeMultiMap* _tmp2_; g_return_val_if_fail (value != NULL, NULL); _tmp0_ = value; - _tmp1_ = parameters; - self = (FolksWebServiceFieldDetails*) g_object_new (object_type, "t_type", G_TYPE_STRING, "t_dup_func", (GBoxedCopyFunc) g_strdup, "t_destroy_func", g_free, "value", _tmp0_, "parameters", _tmp1_, NULL); + if (g_strcmp0 (_tmp0_, "") == 0) { + g_warning ("web-service-details.vala:52: %s", "Empty web service address passed to " "WebServiceFieldDetails."); + } + _tmp1_ = value; + _tmp2_ = parameters; + self = (FolksWebServiceFieldDetails*) g_object_new (object_type, "t_type", G_TYPE_STRING, "t_dup_func", (GBoxedCopyFunc) g_strdup, "t_destroy_func", g_free, "value", _tmp1_, "parameters", _tmp2_, NULL); return self; } diff -Nru folks-0.6.6/folks/web-service-details.vala folks-0.6.7/folks/web-service-details.vala --- folks-0.6.6/folks/web-service-details.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/folks/web-service-details.vala 2012-01-12 17:25:24.000000000 +0000 @@ -35,7 +35,7 @@ /** * Create a new WebServiceFieldDetails. * - * @param value the value of the field + * @param value the value of the field, a non-empty web service address * @param parameters initial parameters. See * {@link AbstractFieldDetails.parameters}. A `null` value is equivalent to an * empty map of parameters. @@ -47,6 +47,12 @@ public WebServiceFieldDetails (string value, MultiMap? parameters = null) { + if (value == "") + { + warning ("Empty web service address passed to " + + "WebServiceFieldDetails."); + } + Object (value: value, parameters: parameters); } @@ -58,7 +64,7 @@ */ public override bool equal (AbstractFieldDetails that) { - return base.equal (that); + return base.equal (that); } /** diff -Nru folks-0.6.6/INSTALL folks-0.6.7/INSTALL --- folks-0.6.6/INSTALL 2011-12-13 23:38:46.000000000 +0000 +++ folks-0.6.7/INSTALL 2012-02-23 00:03:54.000000000 +0000 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -226,6 +226,11 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended diff -Nru folks-0.6.6/install-sh folks-0.6.7/install-sh --- folks-0.6.6/install-sh 2011-12-13 23:38:35.000000000 +0000 +++ folks-0.6.7/install-sh 2012-02-23 00:03:51.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2009-04-28.21; # UTC +scriptversion=2011-01-19.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -156,6 +156,10 @@ -s) stripcmd=$stripprog;; -t) dst_arg=$2 + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac shift;; -T) no_target_directory=true;; @@ -186,6 +190,10 @@ fi shift # arg dst_arg=$arg + # Protect names problematic for `test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac done fi @@ -200,7 +208,11 @@ fi if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 + do_exit='(exit $ret); exit $ret' + trap "ret=129; $do_exit" 1 + trap "ret=130; $do_exit" 2 + trap "ret=141; $do_exit" 13 + trap "ret=143; $do_exit" 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@ -228,9 +240,9 @@ for src do - # Protect names starting with `-'. + # Protect names problematic for `test' and other utilities. case $src in - -*) src=./$src;; + -* | [=\(\)!]) src=./$src;; esac if test -n "$dir_arg"; then @@ -252,12 +264,7 @@ echo "$0: no destination specified." >&2 exit 1 fi - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@ -385,7 +392,7 @@ case $dstdir in /*) prefix='/';; - -*) prefix='./';; + [-=\(\)!]*) prefix='./';; *) prefix='';; esac @@ -403,7 +410,7 @@ for d do - test -z "$d" && continue + test X"$d" = X && continue prefix=$prefix$d if test -d "$prefix"; then diff -Nru folks-0.6.6/lcov.mk folks-0.6.7/lcov.mk --- folks-0.6.6/lcov.mk 1970-01-01 00:00:00.000000000 +0000 +++ folks-0.6.7/lcov.mk 2012-01-12 17:25:24.000000000 +0000 @@ -0,0 +1,23 @@ +# From http://cgit.freedesktop.org/telepathy/telepathy-glib/tree/tools/lcov.am + +lcov-reset: + lcov --directory @top_srcdir@ --zerocounters + +lcov-report: + lcov --directory @top_srcdir@ --capture \ + --output-file @top_builddir@/lcov.info + $(mkdir_p) @top_builddir@/lcov.html + git_commit=`GIT_DIR=@top_srcdir@/.git git log -1 --pretty=format:%h 2>/dev/null`;\ + genhtml --title "@PACKAGE_STRING@ $$git_commit" \ + --output-directory @top_builddir@/lcov.html lcov.info + @echo + @echo 'lcov report can be found in:' + @echo 'file://@abs_top_builddir@/lcov.html/index.html' + @echo + +lcov-check: + $(MAKE) lcov-reset + $(MAKE) check $(LCOV_CHECK_ARGS) + $(MAKE) lcov-report + +## vim:set ft=automake: diff -Nru folks-0.6.6/ltmain.sh folks-0.6.7/ltmain.sh --- folks-0.6.6/ltmain.sh 2011-12-13 23:38:20.000000000 +0000 +++ folks-0.6.7/ltmain.sh 2012-02-23 00:03:47.000000000 +0000 @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 Debian-2.4-4 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4 Debian-2.4-4" +VERSION="2.4.2 Debian-2.4.2-1" TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="/bin/grep -E"} -: ${FGREP="/bin/grep -F"} -: ${GREP="/bin/grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -387,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ opt_silent=false func_append preserve_args " $opt" ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2059,7 +2060,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3982,14 +3985,17 @@ # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6150,7 +6163,8 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6834,7 +6848,7 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7319,6 +7333,7 @@ # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7438,7 +7453,7 @@ versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8026,6 +8041,11 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8056,7 +8076,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8064,11 +8084,7 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9158,6 +9174,8 @@ esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9267,7 +9285,8 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff -Nru folks-0.6.6/m4/intltool.m4 folks-0.6.7/m4/intltool.m4 --- folks-0.6.6/m4/intltool.m4 1970-01-01 00:00:00.000000000 +0000 +++ folks-0.6.7/m4/intltool.m4 2012-02-23 00:03:54.000000000 +0000 @@ -0,0 +1,216 @@ +## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*- +## Copyright (C) 2001 Eazel, Inc. +## Author: Maciej Stachowiak +## Kenneth Christiansen +## +## 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. + +dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +# serial 40 IT_PROG_INTLTOOL +AC_DEFUN([IT_PROG_INTLTOOL], [ +AC_PREREQ([2.50])dnl +AC_REQUIRE([AM_NLS])dnl + +case "$am__api_version" in + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) + ;; + *) + ;; +esac + +if test -n "$1"; then + AC_MSG_CHECKING([for intltool >= $1]) + + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` + [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + ] + AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) +fi + +AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) +AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) +AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) +fi + + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + +_IT_SUBST(INTLTOOL_DESKTOP_RULE) +_IT_SUBST(INTLTOOL_DIRECTORY_RULE) +_IT_SUBST(INTLTOOL_KEYS_RULE) +_IT_SUBST(INTLTOOL_PROP_RULE) +_IT_SUBST(INTLTOOL_OAF_RULE) +_IT_SUBST(INTLTOOL_PONG_RULE) +_IT_SUBST(INTLTOOL_SERVER_RULE) +_IT_SUBST(INTLTOOL_SHEET_RULE) +_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) +_IT_SUBST(INTLTOOL_UI_RULE) +_IT_SUBST(INTLTOOL_XAM_RULE) +_IT_SUBST(INTLTOOL_KBD_RULE) +_IT_SUBST(INTLTOOL_XML_RULE) +_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) +_IT_SUBST(INTLTOOL_CAVES_RULE) +_IT_SUBST(INTLTOOL_SCHEMAS_RULE) +_IT_SUBST(INTLTOOL_THEME_RULE) +_IT_SUBST(INTLTOOL_SERVICE_RULE) +_IT_SUBST(INTLTOOL_POLICY_RULE) + +# Check the gettext tools to make sure they are GNU +AC_PATH_PROG(XGETTEXT, xgettext) +AC_PATH_PROG(MSGMERGE, msgmerge) +AC_PATH_PROG(MSGFMT, msgfmt) +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi + +AC_PATH_PROG(INTLTOOL_PERL, perl) +if test -z "$INTLTOOL_PERL"; then + AC_MSG_ERROR([perl not found]) +fi +AC_MSG_CHECKING([for perl >= 5.8.1]) +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +else + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + AC_MSG_RESULT([$IT_PERL_VERSION]) +fi +if test "x$2" != "xno-xml"; then + AC_MSG_CHECKING([for XML::Parser]) + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + AC_MSG_RESULT([ok]) + else + AC_MSG_ERROR([XML::Parser perl module is required for intltool]) + fi +fi + +# Substitute ALL_LINGUAS so we can use it in po/Makefile +AC_SUBST(ALL_LINGUAS) + +# Set DATADIRNAME correctly if it is not set yet +# (copied from glib-gettext.m4) +if test -z "$DATADIRNAME"; then + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[]], + [[extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr]])], + [DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share + dnl in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [DATADIRNAME=share], [DATADIRNAME=lib]) + ;; + *) + [DATADIRNAME=lib] + ;; + esac]) +fi +AC_SUBST(DATADIRNAME) + +IT_PO_SUBDIR([po]) + +]) + + +# IT_PO_SUBDIR(DIRNAME) +# --------------------- +# All po subdirs have to be declared with this macro; the subdir "po" is +# declared by IT_PROG_INTLTOOL. +# +AC_DEFUN([IT_PO_SUBDIR], +[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. +dnl +dnl The following CONFIG_COMMANDS should be executed at the very end +dnl of config.status. +AC_CONFIG_COMMANDS_PRE([ + AC_CONFIG_COMMANDS([$1/stamp-it], [ + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then + AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) + fi + rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" + >"$1/stamp-it.tmp" + [sed '/^#/d + s/^[[].*] *// + /^[ ]*$/d + '"s|^| $ac_top_srcdir/|" \ + "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" + ] + [sed '/^POTFILES =/,/[^\\]$/ { + /^POTFILES =/!d + r $1/POTFILES + } + ' "$1/Makefile.in" >"$1/Makefile"] + rm -f "$1/Makefile.tmp" + mv "$1/stamp-it.tmp" "$1/stamp-it" + ]) +])dnl +]) + +# _IT_SUBST(VARIABLE) +# ------------------- +# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +# +AC_DEFUN([_IT_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) + +# deprecated macros +AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) +# A hint is needed for aclocal from Automake <= 1.9.4: +# AC_DEFUN([AC_PROG_INTLTOOL], ...) + diff -Nru folks-0.6.6/m4/libtool.m4 folks-0.6.7/m4/libtool.m4 --- folks-0.6.6/m4/libtool.m4 2011-12-13 23:38:20.000000000 +0000 +++ folks-0.6.7/m4/libtool.m4 2012-02-23 00:03:47.000000000 +0000 @@ -1,8 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -11,8 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -146,6 +146,8 @@ AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -637,7 +639,7 @@ m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -801,6 +803,7 @@ m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -822,6 +825,31 @@ ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -852,6 +880,10 @@ m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -954,7 +986,13 @@ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -962,6 +1000,7 @@ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -973,6 +1012,7 @@ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -990,7 +1030,9 @@ echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1035,8 +1077,8 @@ ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1047,6 +1089,8 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1330,14 +1374,27 @@ CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1414,13 +1471,13 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -1600,6 +1657,11 @@ lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1639,7 +1701,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2185,7 +2247,7 @@ case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2194,7 +2256,7 @@ ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2259,7 +2321,7 @@ ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -2398,7 +2460,7 @@ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2406,10 +2468,6 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2417,7 +2475,7 @@ objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2435,7 +2493,7 @@ esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2455,7 +2513,7 @@ ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' @@ -2466,7 +2524,7 @@ ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -2527,7 +2585,7 @@ ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2543,7 +2601,7 @@ nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -2580,9 +2638,9 @@ dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2657,7 +2715,7 @@ ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2726,7 +2784,7 @@ ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2751,7 +2809,7 @@ ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2775,7 +2833,7 @@ sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -2806,7 +2864,7 @@ tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2816,7 +2874,7 @@ ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3238,7 +3296,7 @@ lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3658,6 +3716,7 @@ # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4242,7 +4301,9 @@ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4334,18 +4395,33 @@ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -4505,7 +4581,9 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] @@ -4533,7 +4611,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4787,8 +4864,7 @@ xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -5084,6 +5160,7 @@ # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -5130,10 +5207,6 @@ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5146,7 +5219,7 @@ ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5185,7 +5258,6 @@ fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5627,9 +5699,6 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5787,7 +5856,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6157,7 +6225,7 @@ esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6918,12 +6986,18 @@ } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -7120,7 +7194,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7253,7 +7326,6 @@ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7440,6 +7512,77 @@ ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7509,6 +7652,13 @@ dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], diff -Nru folks-0.6.6/m4/ltoptions.m4 folks-0.6.7/m4/ltoptions.m4 --- folks-0.6.6/m4/ltoptions.m4 2011-12-13 23:38:20.000000000 +0000 +++ folks-0.6.7/m4/ltoptions.m4 2012-02-23 00:03:47.000000000 +0000 @@ -326,9 +326,24 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff -Nru folks-0.6.6/m4/ltversion.m4 folks-0.6.7/m4/ltversion.m4 --- folks-0.6.6/m4/ltversion.m4 2011-12-13 23:38:20.000000000 +0000 +++ folks-0.6.7/m4/ltversion.m4 2012-02-23 00:03:47.000000000 +0000 @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru folks-0.6.6/Makefile.am folks-0.6.7/Makefile.am --- folks-0.6.6/Makefile.am 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/Makefile.am 2012-01-12 17:25:24.000000000 +0000 @@ -20,11 +20,13 @@ EXTRA_DIST = \ autogen.sh \ check.mk \ + lcov.mk \ valgrind.mk \ $(NULL) MAINTAINERCLEANFILES = \ ABOUT-NLS \ + $(top_builddir)/lcov.info \ $(srcdir)/INSTALL \ $(srcdir)/aclocal.m4 \ $(srcdir)/compile \ @@ -51,6 +53,16 @@ po/remove-potcdate.sin \ $(NULL) +maintainer-clean-local: maintainer-clean-local-lcov +maintainer-clean-local-lcov: + rm -rf $(top_builddir)/lcov.html + +.PHONY: maintainer-clean-local-lcov + +GITIGNOREFILES = \ + $(top_builddir)/lcov.html/* \ + $(NULL) + distclean-local: if test "x$(srcdir)" = "x."; then :; else \ rm -f ChangeLog; \ @@ -79,4 +91,7 @@ .PHONY: ChangeLog +# Code coverage support +include lcov.mk + -include $(top_srcdir)/git.mk diff -Nru folks-0.6.6/Makefile.in folks-0.6.7/Makefile.in --- folks-0.6.6/Makefile.in 2011-12-13 23:38:46.000000000 +0000 +++ folks-0.6.7/Makefile.in 2012-02-23 00:04:14.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,6 +14,8 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + +# From http://cgit.freedesktop.org/telepathy/telepathy-glib/tree/tools/lcov.am VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ @@ -34,18 +36,19 @@ build_triplet = @build@ host_triplet = @host@ @HAVE_VALADOC_TRUE@am__append_1 = docs -subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/Makefile.in $(srcdir)/config.h.in $(srcdir)/lcov.mk \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ compile config.guess config.sub depcomp install-sh ltmain.sh \ missing +subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ @@ -112,6 +115,8 @@ GZIP_ENV = --best DIST_ARCHIVES = $(distdir).tar.bz2 distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ @@ -132,6 +137,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -309,11 +316,13 @@ EXTRA_DIST = \ autogen.sh \ check.mk \ + lcov.mk \ valgrind.mk \ $(NULL) MAINTAINERCLEANFILES = \ ABOUT-NLS \ + $(top_builddir)/lcov.info \ $(srcdir)/INSTALL \ $(srcdir)/aclocal.m4 \ $(srcdir)/compile \ @@ -340,6 +349,10 @@ po/remove-potcdate.sin \ $(NULL) +GITIGNOREFILES = \ + $(top_builddir)/lcov.html/* \ + $(NULL) + distcleancheck_listfiles = \ find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \ sh '{}' ';' @@ -348,9 +361,9 @@ $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/lcov.mk $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -384,10 +397,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @if test ! -f $@; then rm -f stamp-h1; else :; fi + @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -615,7 +626,7 @@ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__remove_distdir) dist-lzma: distdir @@ -623,7 +634,7 @@ $(am__remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) dist-tarZ: distdir @@ -640,7 +651,7 @@ $(am__remove_distdir) dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -673,6 +684,7 @@ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -701,8 +713,16 @@ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -733,10 +753,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -803,7 +828,8 @@ -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic +maintainer-clean-am: distclean-am maintainer-clean-generic \ + maintainer-clean-local mostlyclean: mostlyclean-recursive @@ -835,10 +861,16 @@ install-info-am install-man install-pdf install-pdf-am \ install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am + maintainer-clean-generic maintainer-clean-local mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am + + +maintainer-clean-local: maintainer-clean-local-lcov +maintainer-clean-local-lcov: + rm -rf $(top_builddir)/lcov.html +.PHONY: maintainer-clean-local-lcov distclean-local: if test "x$(srcdir)" = "x."; then :; else \ @@ -864,6 +896,28 @@ .PHONY: ChangeLog +lcov-reset: + lcov --directory @top_srcdir@ --zerocounters + +lcov-report: + lcov --directory @top_srcdir@ --capture \ + --output-file @top_builddir@/lcov.info + $(mkdir_p) @top_builddir@/lcov.html + git_commit=`GIT_DIR=@top_srcdir@/.git git log -1 --pretty=format:%h 2>/dev/null`;\ + genhtml --title "@PACKAGE_STRING@ $$git_commit" \ + --output-directory @top_builddir@/lcov.html lcov.info + @echo + @echo 'lcov report can be found in:' + @echo 'file://@abs_top_builddir@/lcov.html/index.html' + @echo + +lcov-check: + $(MAKE) lcov-reset + $(MAKE) check $(LCOV_CHECK_ARGS) + $(MAKE) lcov-report + +# Code coverage support + -include $(top_srcdir)/git.mk # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -Nru folks-0.6.6/NEWS folks-0.6.7/NEWS --- folks-0.6.6/NEWS 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/NEWS 2012-02-18 00:46:31.000000000 +0000 @@ -1,3 +1,21 @@ +Overview of changes from libfolks 0.6.6 to libfolks 0.6.7 +============================================================= +Bugs fixed: +* Bug 666310 — Crash in Tracker backend by unsetting an entry in a read-only map +* Bug 666528 — Can't convert from type 'GFile' to 'gchararray' +* Bug 666540 — Segfault on empty e-mail addresses with potential match +* Bug 659610 — Support code coverage report generation +* Bug 657063 — Allow to pass a command to folks-inspect +* Bug 667410 — A second instance of the aggregator only fetch a small subset of + my contacts +* Bug 667535 — persona created by tpf_persona_dup_for_contact() outlives its + TpContact +* Bug 670196 — Disable GLib deprecation warnings +* Bug 668415 — Port to Vala 0.15.x + +API changes: +* Add PostalAddress.is_empty() and Role.is_empty() + Overview of changes from libfolks 0.6.5 to libfolks 0.6.6 ============================================================= Bugs fixed: diff -Nru folks-0.6.6/po/cs.po folks-0.6.7/po/cs.po --- folks-0.6.6/po/cs.po 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/po/cs.po 2012-02-18 00:46:31.000000000 +0000 @@ -2,15 +2,15 @@ # Copyright (C) 2011 folks's COPYRIGHT HOLDER # This file is distributed under the same license as the folks package. # -# Marek Černocký , 2011. +# Marek Černocký , 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: folks master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=folks&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-10-25 21:22+0000\n" -"PO-Revision-Date: 2011-10-31 00:26+0100\n" +"POT-Creation-Date: 2012-01-30 19:09+0000\n" +"PO-Revision-Date: 2012-02-17 11:26+0100\n" "Last-Translator: Marek Černocký \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -21,170 +21,164 @@ #. Translators: the first parameter is an address book #. * URI and the second is a persona UID. -#: ../backends/eds/lib/edsf-persona-store.vala:480 +#: ../backends/eds/lib/edsf-persona-store.vala:533 #, c-format msgid "Address book ‘%s’ is offline, so contact ‘%s’ cannot be removed." msgstr "Adresář „%s“ je off-line, takže kontakt „%s“ nelze odebrat." #. Translators: the first parameter is an address book #. * URI and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:486 +#: ../backends/eds/lib/edsf-persona-store.vala:539 #, c-format msgid "Permission denied to remove contact ‘%s’: %s" msgstr "Zamítnuto svolení odebrat kontakt „%s“: %s" #. Translators: the parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:491 +#: ../backends/eds/lib/edsf-persona-store.vala:544 #, c-format msgid "Removing contacts isn't supported by this persona store: %s" msgstr "Odebírání kontaktů není u tohoto úložiště osob podporováno: %s" -#: ../backends/eds/lib/edsf-persona-store.vala:520 +#: ../backends/eds/lib/edsf-persona-store.vala:573 #, c-format msgid "Can't remove contact ‘%s’: %s" msgstr "Nelze odebrat kontakt „%s“: %s" #. Translators: the parameter is an address book #. * URI. -#: ../backends/eds/lib/edsf-persona-store.vala:588 -#: ../backends/eds/lib/edsf-persona-store.vala:777 +#: ../backends/eds/lib/edsf-persona-store.vala:651 +#: ../backends/eds/lib/edsf-persona-store.vala:846 #, c-format msgid "Address book ‘%s’ is offline." msgstr "Adresář „%s“ je off-line." #. Translators: the first parameter is an address #. * book URI and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:593 -#: ../backends/eds/lib/edsf-persona-store.vala:782 +#: ../backends/eds/lib/edsf-persona-store.vala:656 +#: ../backends/eds/lib/edsf-persona-store.vala:851 #, c-format msgid "Permission denied to open address book ‘%s’: %s" msgstr "Odepřen přístup k otevření adresáře „%s“: %s" #. Translators: the first parameter is an address book URI #. * and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:626 +#: ../backends/eds/lib/edsf-persona-store.vala:689 #, c-format msgid "Couldn't open address book ‘%s’: %s" msgstr "Nelze otevřít adresář „%s“: %s" -#. Translators: the parameter is an address book URI. -#: ../backends/eds/lib/edsf-persona-store.vala:636 -#, c-format -msgid "Couldn't open address book ‘%s’." -msgstr "Nelze otevřít adresář „%s“." - #. Translators: the parameteter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:698 -#: ../backends/eds/lib/edsf-persona-store.vala:725 +#: ../backends/eds/lib/edsf-persona-store.vala:754 +#: ../backends/eds/lib/edsf-persona-store.vala:785 #, c-format msgid "Couldn't get address book capabilities: %s" msgstr "Nelze zjistit schopnosti adresáře: %s" #. Translators: the parameter is an address book URI. -#: ../backends/eds/lib/edsf-persona-store.vala:738 +#: ../backends/eds/lib/edsf-persona-store.vala:802 #, c-format msgid "Couldn't get view for address book ‘%s’." msgstr "Nelze získat zobrazení pro adresář „%s“." #. Translators: the first parameter is an address book URI #. * and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:815 +#: ../backends/eds/lib/edsf-persona-store.vala:884 #, c-format msgid "Couldn't get view for address book ‘%s’: %s" msgstr "Nelze získat zobrazení pro adresář „%s“: %s" -#: ../backends/eds/lib/edsf-persona-store.vala:1045 +#: ../backends/eds/lib/edsf-persona-store.vala:1247 #, c-format msgid "Changing the ‘%s’ property failed due to reaching the timeout." msgstr "Změna vlastnosti „%s“ selhala kvůli vypršení časového limitu." -#: ../backends/eds/lib/edsf-persona-store.vala:1067 +#: ../backends/eds/lib/edsf-persona-store.vala:1278 #: ../folks/avatar-details.vala:59 msgid "Avatar is not writeable on this contact." msgstr "U tohoto kontaktu není umožněn zápis do položky Avatar." -#: ../backends/eds/lib/edsf-persona-store.vala:1088 -#: ../folks/web-service-details.vala:118 +#: ../backends/eds/lib/edsf-persona-store.vala:1299 +#: ../folks/web-service-details.vala:123 msgid "Web service addresses are not writeable on this contact." msgstr "U tohoto kontaktu není umožněn zápis do položky Adresa webové služby." -#: ../backends/eds/lib/edsf-persona-store.vala:1129 -#: ../folks/url-details.vala:148 +#: ../backends/eds/lib/edsf-persona-store.vala:1335 +#: ../folks/url-details.vala:152 msgid "URLs are not writeable on this contact." msgstr "U tohoto kontaktu není umožněn zápis do položek Adresa URL." -#: ../backends/eds/lib/edsf-persona-store.vala:1207 +#: ../backends/eds/lib/edsf-persona-store.vala:1413 #: ../folks/local-id-details.vala:64 msgid "Local IDs are not writeable on this contact." msgstr "U tohoto kontaktu není umožněn zápis do položek Místní ID." -#: ../backends/eds/lib/edsf-persona-store.vala:1239 +#: ../backends/eds/lib/edsf-persona-store.vala:1440 msgid "The contact cannot be marked as favourite." msgstr "Kontakt nelze označit jako oblíbený." #. Translators: the parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:1305 +#: ../backends/eds/lib/edsf-persona-store.vala:1507 #, c-format msgid "Can't update avatar: %s" msgstr "Nelze aktualizovat avatara: %s" -#: ../backends/eds/lib/edsf-persona-store.vala:1316 -#: ../folks/email-details.vala:115 +#: ../backends/eds/lib/edsf-persona-store.vala:1518 +#: ../folks/email-details.vala:120 msgid "E-mail addresses are not writeable on this contact." msgstr "U tohoto kontaktu není umožněn zápis do položek E-mailová adresa." -#: ../backends/eds/lib/edsf-persona-store.vala:1330 -#: ../folks/phone-details.vala:223 +#: ../backends/eds/lib/edsf-persona-store.vala:1532 +#: ../folks/phone-details.vala:229 msgid "Phone numbers are not writeable on this contact." msgstr "U tohoto kontaktu není umožněn zápis do položek Telefonní číslo." -#: ../backends/eds/lib/edsf-persona-store.vala:1344 -#: ../folks/postal-address-details.vala:335 +#: ../backends/eds/lib/edsf-persona-store.vala:1546 +#: ../folks/postal-address-details.vala:361 msgid "Postal addresses are not writeable on this contact." msgstr "U tohoto kontaktu není umožněn zápis do položky Poštovní adresa." -#: ../backends/eds/lib/edsf-persona-store.vala:1411 +#: ../backends/eds/lib/edsf-persona-store.vala:1613 #: ../folks/name-details.vala:281 msgid "Full name is not writeable on this contact." msgstr "U tohoto kontaktu není umožněn zápis do položky Celé jméno." -#: ../backends/eds/lib/edsf-persona-store.vala:1432 +#: ../backends/eds/lib/edsf-persona-store.vala:1635 #: ../folks/name-details.vala:319 msgid "Nickname is not writeable on this contact." msgstr "U tohoto kontaktu není umožněn zápis do položky Přezdívka." -#: ../backends/eds/lib/edsf-persona-store.vala:1453 -#: ../folks/note-details.vala:141 +#: ../backends/eds/lib/edsf-persona-store.vala:1657 +#: ../folks/note-details.vala:136 msgid "Notes are not writeable on this contact." msgstr "U tohoto kontaktu není umožněn zápis do položky Poznámky." -#: ../backends/eds/lib/edsf-persona-store.vala:1482 +#: ../backends/eds/lib/edsf-persona-store.vala:1686 #: ../folks/birthday-details.vala:60 msgid "Birthday is not writeable on this contact." msgstr "U tohoto kontaktu není umožněn zápis do položky Narozeniny." -#: ../backends/eds/lib/edsf-persona-store.vala:1521 -#: ../folks/role-details.vala:255 +#: ../backends/eds/lib/edsf-persona-store.vala:1730 +#: ../folks/role-details.vala:277 msgid "Roles are not writeable on this contact." msgstr "U tohoto kontaktu není umožněn zápis do položky Funkce." -#: ../backends/eds/lib/edsf-persona-store.vala:1622 +#: ../backends/eds/lib/edsf-persona-store.vala:1831 #: ../folks/name-details.vala:244 msgid "Structured name is not writeable on this contact." msgstr "U tohoto kontaktu není umožněn zápis do položky Strukturované jméno." -#: ../backends/eds/lib/edsf-persona-store.vala:1656 -#: ../folks/im-details.vala:130 +#: ../backends/eds/lib/edsf-persona-store.vala:1871 +#: ../folks/im-details.vala:136 msgid "IM addresses are not writeable on this contact." msgstr "" "U tohoto kontaktu není umožněn zápis do položek Adresa rychlé komunikace." -#: ../backends/eds/lib/edsf-persona-store.vala:1706 +#: ../backends/eds/lib/edsf-persona-store.vala:1921 #: ../folks/group-details.vala:168 msgid "Groups are not writeable on this contact." msgstr "U tohoto kontaktu není umožněn zápis do položek Skupina." -#: ../backends/eds/lib/edsf-persona-store.vala:1736 +#: ../backends/eds/lib/edsf-persona-store.vala:1951 #: ../folks/gender-details.vala:77 msgid "Gender is not writeable on this contact." msgstr "U tohoto kontaktu není umožněn zápis do položky Pohlaví." @@ -192,7 +186,7 @@ #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error #. * message. -#: ../backends/eds/lib/edsf-persona-store.vala:1870 +#: ../backends/eds/lib/edsf-persona-store.vala:2100 #, c-format msgid "Property ‘%s’ is not writeable: %s" msgstr "U vlastnosti „%s“ není umožněn zápis: %s" @@ -200,42 +194,42 @@ #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error #. * message. -#: ../backends/eds/lib/edsf-persona-store.vala:1879 +#: ../backends/eds/lib/edsf-persona-store.vala:2109 #, c-format msgid "Invalid value for property ‘%s’: %s" msgstr "Neplatná hodnota pro vlastnost „%s“: %s" #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:1905 +#: ../backends/eds/lib/edsf-persona-store.vala:2135 #, c-format msgid "Unknown error setting property ‘%s’: %s" msgstr "Neznámá chyba při nastavování vlastnosti „%s“: %s" #. Translators: the first parameter is a filename, #. * and the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:205 +#: ../backends/key-file/kf-persona-store.vala:224 #, c-format msgid "The relationship key file '%s' could not be loaded: %s" msgstr "Nelze načíst soubor „%s“ s klíči vztahů: %s" #. Translators: the first parameter is a path, and #. * the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:227 +#: ../backends/key-file/kf-persona-store.vala:246 #, c-format msgid "The relationship key file directory '%s' could not be created: %s" msgstr "Nelze vytvořit složku „%s“ pro soubor s klíči vztahů: %s" #. Translators: the first parameter is a filename, #. * and the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:251 +#: ../backends/key-file/kf-persona-store.vala:270 #, c-format msgid "The relationship key file '%s' could not be created: %s" msgstr "Nelze vytvořit soubor „%s“ s klíči vztahů: %s" #. Translators: the first parameter is a filename, the second is #. * an error message. -#: ../backends/key-file/kf-persona-store.vala:436 +#: ../backends/key-file/kf-persona-store.vala:463 #, c-format msgid "Could not write updated key file '%s': %s" msgstr "Nelze zapsat aktualizovaný soubor s klíči „%s“: %s" @@ -245,97 +239,97 @@ #. * an IM address (e.g. “foo@jabber.org”), the second is #. * the name of a protocol (e.g. “jabber”) and the third is #. * an error message. -#: ../backends/key-file/kf-persona.vala:169 +#: ../backends/key-file/kf-persona.vala:171 #, c-format msgid "Invalid IM address ‘%s’ for protocol ‘%s’: %s" msgstr "Neplatná adresa rychlé komunikace „%s“ pro protokol „%s“: %s" #. Translators: the parameter is an error message. -#: ../backends/key-file/kf-persona.vala:357 +#: ../backends/key-file/kf-persona.vala:364 #, c-format msgid "Couldn't load data from key file: %s" msgstr "Nelze načíst data ze souboru s klíči: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:504 +#: ../backends/telepathy/lib/tp-lowlevel.c:508 #, c-format msgid "Error requesting a group channel: %s" msgstr "Chyba požadavku na skupinový kanál: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:522 +#: ../backends/telepathy/lib/tp-lowlevel.c:526 #, c-format msgid "Error requesting group handles: %s" msgstr "Chyba požadavku na skupinový ovladač: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:560 +#: ../backends/telepathy/lib/tp-lowlevel.c:564 #, c-format msgid "Failed to change contact's alias: %s" msgstr "Selhala změna aliasu kontaktu: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:619 +#: ../backends/telepathy/lib/tp-lowlevel.c:623 #, c-format msgid "Failed to create group channel: %s" msgstr "Selhalo vytvoření skupinového kanálu: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:651 +#: ../backends/telepathy/lib/tp-lowlevel.c:655 #, c-format msgid "Get Channels property failed: %s" msgstr "Selhalo získání vlastnosti Channels: %s" #. Translators: the first parameter is a group channel identifier and the #. * second is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:693 +#: ../backends/telepathy/lib/tp-lowlevel.c:697 #, c-format msgid "Failed to add contact to group '%s': %s" msgstr "Selhalo přidání kontaktu do skupiny „%s“: %s" #. Translators: the first parameter is a group channel identifier and the #. * second is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:709 +#: ../backends/telepathy/lib/tp-lowlevel.c:713 #, c-format msgid "Failed to remove contact from group '%s': %s" msgstr "Selhalo odebrání kontaktu ze skupiny „%s“: %s" #. Translators: the first parameter is a pointer address and the #. * second is a contact handle (numeric identifier). -#: ../backends/telepathy/lib/tp-lowlevel.c:732 +#: ../backends/telepathy/lib/tp-lowlevel.c:736 #, c-format msgid "Invalid group channel %p to add handle %d to." msgstr "Neplatný skupinový kanál %p, do kterého se má přidat ovladač %d." -#: ../backends/telepathy/lib/tpf-persona-store.vala:596 +#: ../backends/telepathy/lib/tpf-persona-store.vala:637 msgid "Couldn't connect to the telepathy-logger service." msgstr "Nelze se připojit ke službě telepathy-logger." -#: ../backends/telepathy/lib/tpf-persona-store.vala:631 +#: ../backends/telepathy/lib/tpf-persona-store.vala:676 msgid "Lost connection to the telepathy-logger service." msgstr "Ztraceno připojení ke službě telepathy-logger." #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:663 -#: ../backends/telepathy/lib/tpf-persona-store.vala:675 +#: ../backends/telepathy/lib/tpf-persona-store.vala:708 +#: ../backends/telepathy/lib/tpf-persona-store.vala:720 #, c-format msgid "Couldn't get list of favorite contacts: %s" msgstr "Nelze získat seznam oblíbených kontaktů: %s" #. Translators: the parameter is an identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:712 +#: ../backends/telepathy/lib/tpf-persona-store.vala:757 #, c-format msgid "Unknown Telepathy contact ‘%s’ in favorites list." msgstr "Neznámý kontakt Telepathy „%s“ v seznamu oblíbených." #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:743 +#: ../backends/telepathy/lib/tpf-persona-store.vala:788 #, c-format msgid "Couldn't add favorite contacts: %s" msgstr "Nelze přidat oblíbené kontakty: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:764 +#: ../backends/telepathy/lib/tpf-persona-store.vala:809 #, c-format msgid "Couldn't remove favorite contacts: %s" msgstr "Nelze odebrat oblíbené kontakty: %s" @@ -343,7 +337,7 @@ #. Translators: the first parameter is the display name for #. * the Telepathy account, and the second is an error #. * message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:884 +#: ../backends/telepathy/lib/tpf-persona-store.vala:935 #, c-format msgid "" "Failed to determine whether we can set aliases on Telepathy account '%s': %s" @@ -353,7 +347,7 @@ #. Translators: the first parameter is the display name for #. * the Telepathy account, and the second is an error #. * message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:937 +#: ../backends/telepathy/lib/tpf-persona-store.vala:988 #, c-format msgid "" "Failed to determine whether we can set groups on Telepathy account '%s': %s" @@ -362,32 +356,32 @@ #. Translators: the first parameter is a Telepathy handle, #. * and the second is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1114 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1166 #, c-format msgid "Failed to create contact for self handle '%u': %s" msgstr "Selhalo vytvoření kontaktu pro vlastní ovladač „%u“: %s" #. Translators: do not translate "NewChannels", as it's a D-Bus #. * signal name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1145 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1197 msgid "Error creating channel for NewChannels signal." msgstr "Chyba při vytváření kanálu pro signál NewChannels." #. Translators: the parameter is a persona identifier and #. * the second parameter is a group name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1184 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1236 #, c-format msgid "Failed to add Telepathy contact ‘%s’ to group ‘%s’." msgstr "Selhalo přidání kontaktu Telepathy „%s“ do skupiny „%s“." #. Translators: the parameter is a persona identifier #. * and the second parameter is a group name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1192 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1247 #, c-format msgid "Failed to remove Telepathy contact ‘%s’ from group ‘%s’." msgstr "Selhalo odebrání kontaktu Telepathy „%s“ ze skupiny „%s“." -#: ../backends/telepathy/lib/tpf-persona-store.vala:1546 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1613 msgid "Telepathy contacts representing the local user may not be removed." msgstr "Kontakt Telepathy představující místní uživatele není možné odebrat." @@ -397,10 +391,10 @@ #. Translators: The first parameter is a contact identifier, #. * the second is a contact list identifier and the third is an #. * error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1560 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1575 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1590 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1764 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1634 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1649 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1664 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1845 #, c-format msgid "Failed to remove Telepathy contact ‘%s’ from ‘%s’ list: %s" msgstr "Selhalo odebrání kontaktu Telepathy „%s“ ze skupiny „%s“: %s" @@ -408,21 +402,21 @@ #. Translators: The first parameter is a contact identifier, #. * the second is a contact list identifier and the third is an #. * error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1754 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1835 #, c-format msgid "Failed to add Telepathy contact ‘%s’ to ‘%s’ list: %s" msgstr "Selhalo přidání kontaktu Telepathy „%s“ do seznamu kontaktů „%s“: %s" #. Translators: the first parameter is a channel identifier and #. * the second is an error message.. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1866 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1948 #, c-format msgid "Failed to create incoming Telepathy contacts from channel ‘%s’: %s" msgstr "Selhalo vytvoření příchozích kontaktů Telepathy z kanálu „%s“: %s" #. Translators: the first two parameters are store identifiers and #. * the third is a contact identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2047 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2186 #, c-format msgid "" "Persona store (%s, %s) requires the following details:\n" @@ -431,13 +425,13 @@ "Úložiště osob (%s, %s) vyžaduje následující podrobnosti:\n" " kontakt (poskytuje: „%s“)\n" -#: ../backends/telepathy/lib/tpf-persona-store.vala:2062 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2201 msgid "Cannot create a new Telepathy contact while offline." msgstr "Nelze vytvořit nový kontakt Telepathy, když jste off-line." #. Translators: the parameter is the number of personas #. * which were returned. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2114 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2253 #, c-format msgid "Requested a single persona, but got %u persona back." msgid_plural "Requested a single persona, but got %u personas back." @@ -445,31 +439,39 @@ msgstr[1] "Požadována jedna osoba, ale zpět obdrženy %u osoby." msgstr[2] "Požadována jedna osoba, ale zpět obdrženo %u osob." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2125 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2264 #, c-format msgid "Failed to add a persona from details: %s" msgstr "Selhalo přidání osoby z podrobností: %s" #. Translators: "telepathy-logger" is the name of an application, #. * and should not be translated. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2145 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2284 msgid "" "Failed to change favorite without a connection to the telepathy-logger " "service." msgstr "Selhala změna oblíbených bez připojení ke službě telepathy-logger." +#: ../backends/telepathy/lib/tpf-persona-store.vala:2290 +msgid "" +"Failed to change favorite status of Telepathy Persona because it has no " +"attached TpContact." +msgstr "" +"Selhala změna stavu oblíbenosti pro kontakt Telepathy, protože není připojen " +"TpContact." + #. Translators: the parameter is a contact identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2163 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2308 #, c-format msgid "Failed to change favorite status for Telepathy contact ‘%s’." msgstr "Selhala změna stavu oblíbenosti pro kontakt Telepathy „%s“." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2258 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2410 msgid "Extended information may only be set on the user's Telepathy contact." msgstr "" "Rozšiřující informace je možné nastavit pouze u kontaktu uživatele Telepathy." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2287 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2439 msgid "" "Extended information cannot be written because the store is disconnected." msgstr "Rozšiřující informace nelze zapsat, protože úložiště je odpojeno." @@ -477,7 +479,7 @@ #. Translators: the first parameter is the unknown key that #. * was received with the details params, and the second #. * identifies the persona store. -#: ../backends/tracker/lib/trf-persona-store.vala:733 +#: ../backends/tracker/lib/trf-persona-store.vala:739 #, c-format msgid "Unrecognized parameter '%s' passed to persona store '%s'." msgstr "Parametr „%s“ nebyl úložištěm osob „%s“ rozpoznán." @@ -488,20 +490,20 @@ #. Translators: the first parameter is a backend name, and the #. * second is an error message. -#: ../folks/backend-store.vala:354 +#: ../folks/backend-store.vala:366 #, c-format msgid "Error preparing Backend '%s': %s" msgstr "Chyba přípravy podpůrné vrstvy „%s“: %s" #. Translators: the first parameter is a folder path and the second #. * is an error message. -#: ../folks/backend-store.vala:547 +#: ../folks/backend-store.vala:559 #, c-format msgid "Error listing contents of folder '%s': %s" msgstr "Chyba při výpisu obsahu složky „%s“: %s" #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:580 +#: ../folks/backend-store.vala:601 #, c-format msgid "" "The content type of '%s' could not be determined. Have you installed shared-" @@ -510,26 +512,26 @@ #. Translators: the first parameter is a filename and the second is an #. * error message. -#: ../folks/backend-store.vala:603 +#: ../folks/backend-store.vala:629 #, c-format msgid "Failed to load module from path '%s': %s" msgstr "Selhalo načtení modulu z cesty „%s“: %s" #. Translators: the first parameter is a function name, the second is #. * a filename and the third is an error message. -#: ../folks/backend-store.vala:618 +#: ../folks/backend-store.vala:645 #, c-format msgid "Failed to find entry point function '%s' in '%s': %s" msgstr "Selhalo nalezení funkce vstupního bodu „%s“ v „%s“: %s" #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:659 +#: ../folks/backend-store.vala:686 #, c-format msgid "File or directory '%s' does not exist." msgstr "Soubor nebo složka „%s“ neexistuje." #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:665 +#: ../folks/backend-store.vala:692 #, c-format msgid "Failed to get content type for '%s'." msgstr "Selhalo získání typu obsahu pro „%s“." @@ -544,52 +546,72 @@ msgstr "U tohoto kontaktu není umožněn zápis do položky se stavem Oblíbený." #. Translators: the parameter is an IM address. -#: ../folks/im-details.vala:172 ../folks/im-details.vala:186 -#: ../folks/im-details.vala:208 ../folks/im-details.vala:235 +#: ../folks/im-details.vala:178 ../folks/im-details.vala:192 +#: ../folks/im-details.vala:214 ../folks/im-details.vala:241 #, c-format msgid "The IM address '%s' could not be understood." msgstr "Adresa rychlé komunikace „%s“ není srozumitelná." #. Translators: the first parameter is a persona store identifier #. * and the second is an error message. -#: ../folks/individual-aggregator.vala:696 +#: ../folks/individual-aggregator.vala:782 #, c-format msgid "Error preparing persona store '%s': %s" msgstr "Chyba přípravy úložiště osob „%s“: %s" #. Translators: the parameter is a property name. -#: ../folks/individual-aggregator.vala:890 -#: ../folks/individual-aggregator.vala:1072 +#: ../folks/individual-aggregator.vala:977 +#: ../folks/individual-aggregator.vala:1160 #, c-format msgid "Unknown property '%s' in linkable property list." msgstr "Neznámá vlastnost „%s“ v seznamu vlastností, na které lze odkazovat." #. Translators: the first parameter is a store identifier #. * and the second parameter is an error message. -#: ../folks/individual-aggregator.vala:1478 +#: ../folks/individual-aggregator.vala:1580 #, c-format msgid "Failed to add contact for persona store ID '%s': %s" msgstr "Selhalo přidání kontaktu pro ID úložiště osob „%s“: %s" -#: ../folks/individual-aggregator.vala:1559 -msgid "Can't link personas with no primary store." +#: ../folks/individual-aggregator.vala:1661 +msgid "Can’t link personas with no primary store." msgstr "Bez hlavního úložiště nelze vytvářet odkazy na osoby." -#: ../folks/individual-aggregator.vala:1816 -msgid "Can't add personas with no primary store." +#: ../folks/individual-aggregator.vala:1662 +#: ../folks/individual-aggregator.vala:1927 +#, c-format +msgid "" +"Persona store ‘%s:%s’ is configured as primary, but could not be found or " +"failed to load." +msgstr "" +"Úložiště osob „%s:%s“ je nastaveno jako hlavní, ale nezdařilo se jej najít " +"nebo selhalo jeho načtení." + +#: ../folks/individual-aggregator.vala:1663 +#: ../folks/individual-aggregator.vala:1928 +#, c-format +msgid "" +"Check the service providing the persona store is running, or change the " +"default store in that service or using the “%s” GConf key." +msgstr "" +"Zkontrolujte, zda běží služba poskytující úložiště osob, nebo změňte výchozí " +"úložiště u této služby nebo pomocí klíče GConf „%s“." + +#: ../folks/individual-aggregator.vala:1926 +msgid "Can’t add personas with no primary store." msgstr "Bez hlavního úložiště nelze přidávat osoby." -#: ../folks/individual-aggregator.vala:1821 +#: ../folks/individual-aggregator.vala:1935 #, c-format msgid "Can't write to requested property (“%s”) of the writeable store." msgstr "Nelze zapsat požadovanou vlastnost („%s“) v zapisovatelném úložišti." -#: ../folks/postal-address-details.vala:211 +#: ../folks/postal-address-details.vala:231 #, c-format msgid "%s, %s, %s, %s, %s, %s, %s" msgstr "%s, %s, %s, %s, %s, %s, %s" -#: ../folks/role-details.vala:133 +#: ../folks/role-details.vala:148 #, c-format msgid "Title: %s, Organisation: %s, Role: %s" msgstr "Titul: %s, organizace: %s, funkce: %s" diff -Nru folks-0.6.6/po/de.po folks-0.6.7/po/de.po --- folks-0.6.6/po/de.po 2011-12-13 23:32:35.000000000 +0000 +++ folks-0.6.7/po/de.po 2012-02-18 00:46:31.000000000 +0000 @@ -1,15 +1,15 @@ # German translation of folks. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the folks package. -# Mario Blättermann , 2010, 2011. +# Mario Blättermann , 2010, 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: folks master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=folks&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-10-25 21:22+0000\n" -"PO-Revision-Date: 2011-11-18 17:31+0100\n" +"POT-Creation-Date: 2012-01-30 19:09+0000\n" +"PO-Revision-Date: 2012-02-05 13:45+0100\n" "Last-Translator: Mario Blättermann \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ #. Translators: the first parameter is an address book #. * URI and the second is a persona UID. -#: ../backends/eds/lib/edsf-persona-store.vala:480 +#: ../backends/eds/lib/edsf-persona-store.vala:533 #, c-format msgid "Address book ‘%s’ is offline, so contact ‘%s’ cannot be removed." msgstr "" @@ -31,165 +31,159 @@ #. Translators: the first parameter is an address book #. * URI and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:486 +#: ../backends/eds/lib/edsf-persona-store.vala:539 #, c-format msgid "Permission denied to remove contact ‘%s’: %s" msgstr "Kontakt »%s« kann nicht entfernt werden: %s" #. Translators: the parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:491 +#: ../backends/eds/lib/edsf-persona-store.vala:544 #, c-format msgid "Removing contacts isn't supported by this persona store: %s" msgstr "" "Das Entfernen von Kontakten wird für diesen Personenspeicher nicht " "unterstützt: %s" -#: ../backends/eds/lib/edsf-persona-store.vala:520 +#: ../backends/eds/lib/edsf-persona-store.vala:573 #, c-format msgid "Can't remove contact ‘%s’: %s" msgstr "Kontakt »%s« konnte nicht entfernt werden: %s" #. Translators: the parameter is an address book #. * URI. -#: ../backends/eds/lib/edsf-persona-store.vala:588 -#: ../backends/eds/lib/edsf-persona-store.vala:777 +#: ../backends/eds/lib/edsf-persona-store.vala:651 +#: ../backends/eds/lib/edsf-persona-store.vala:846 #, c-format msgid "Address book ‘%s’ is offline." msgstr "Das Adressbuch »%s« ist nicht verfügbar." #. Translators: the first parameter is an address #. * book URI and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:593 -#: ../backends/eds/lib/edsf-persona-store.vala:782 +#: ../backends/eds/lib/edsf-persona-store.vala:656 +#: ../backends/eds/lib/edsf-persona-store.vala:851 #, c-format msgid "Permission denied to open address book ‘%s’: %s" msgstr "Der Zugriff zum Öffnen des Adressbuchs »%s« wurde verweigert: %s" #. Translators: the first parameter is an address book URI #. * and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:626 +#: ../backends/eds/lib/edsf-persona-store.vala:689 #, c-format msgid "Couldn't open address book ‘%s’: %s" msgstr "Adressbuch »%s« konnte nicht geöffnet werden: %s" -#. Translators: the parameter is an address book URI. -#: ../backends/eds/lib/edsf-persona-store.vala:636 -#, c-format -msgid "Couldn't open address book ‘%s’." -msgstr "Adressbuch »%s« konnte nicht geöffnet werden." - #. Translators: the parameteter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:698 -#: ../backends/eds/lib/edsf-persona-store.vala:725 +#: ../backends/eds/lib/edsf-persona-store.vala:754 +#: ../backends/eds/lib/edsf-persona-store.vala:785 #, c-format msgid "Couldn't get address book capabilities: %s" msgstr "Fähigkeiten des Adressbuchs konnten nicht ermittelt werden: %s" #. Translators: the parameter is an address book URI. -#: ../backends/eds/lib/edsf-persona-store.vala:738 +#: ../backends/eds/lib/edsf-persona-store.vala:802 #, c-format msgid "Couldn't get view for address book ‘%s’." msgstr "Ansicht für Adressbuch »%s« konnte nicht abgerufen werden." #. Translators: the first parameter is an address book URI #. * and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:815 +#: ../backends/eds/lib/edsf-persona-store.vala:884 #, c-format msgid "Couldn't get view for address book ‘%s’: %s" msgstr "Ansicht für Adressbuch »%s« konnte nicht abgerufen werden: %s" -#: ../backends/eds/lib/edsf-persona-store.vala:1045 +#: ../backends/eds/lib/edsf-persona-store.vala:1247 #, c-format msgid "Changing the ‘%s’ property failed due to reaching the timeout." msgstr "" "Das Ändern der Eigenschaft »%s« ist wegen Zeitüberschreitung fehlgeschlagen." -#: ../backends/eds/lib/edsf-persona-store.vala:1067 +#: ../backends/eds/lib/edsf-persona-store.vala:1278 #: ../folks/avatar-details.vala:59 msgid "Avatar is not writeable on this contact." msgstr "Benutzerbild ist für diesen Kontakt schreibgeschützt." -#: ../backends/eds/lib/edsf-persona-store.vala:1088 -#: ../folks/web-service-details.vala:118 +#: ../backends/eds/lib/edsf-persona-store.vala:1299 +#: ../folks/web-service-details.vala:123 msgid "Web service addresses are not writeable on this contact." msgstr "Webdienst-Adressen sind für diesen Kontakt schreibgeschützt." -#: ../backends/eds/lib/edsf-persona-store.vala:1129 -#: ../folks/url-details.vala:148 +#: ../backends/eds/lib/edsf-persona-store.vala:1335 +#: ../folks/url-details.vala:152 msgid "URLs are not writeable on this contact." msgstr "URLs sind für diesen Kontakt schreibgeschützt." -#: ../backends/eds/lib/edsf-persona-store.vala:1207 +#: ../backends/eds/lib/edsf-persona-store.vala:1413 #: ../folks/local-id-details.vala:64 msgid "Local IDs are not writeable on this contact." msgstr "Lokale Kennungen sind für diesen Kontakt schreibgeschützt." -#: ../backends/eds/lib/edsf-persona-store.vala:1239 +#: ../backends/eds/lib/edsf-persona-store.vala:1440 msgid "The contact cannot be marked as favourite." msgstr "Der Kontakt kann nicht als Favorit markiert werden." #. Translators: the parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:1305 +#: ../backends/eds/lib/edsf-persona-store.vala:1507 #, c-format msgid "Can't update avatar: %s" msgstr "Benutzerbild kann nicht aktualisiert werden: %s" -#: ../backends/eds/lib/edsf-persona-store.vala:1316 -#: ../folks/email-details.vala:115 +#: ../backends/eds/lib/edsf-persona-store.vala:1518 +#: ../folks/email-details.vala:120 msgid "E-mail addresses are not writeable on this contact." msgstr "E-Mail-Adressen sind für diesen Kontakt schreibgeschützt." -#: ../backends/eds/lib/edsf-persona-store.vala:1330 -#: ../folks/phone-details.vala:223 +#: ../backends/eds/lib/edsf-persona-store.vala:1532 +#: ../folks/phone-details.vala:229 msgid "Phone numbers are not writeable on this contact." msgstr "Telefonnummern sind für diesen Kontakt schreibgeschützt." -#: ../backends/eds/lib/edsf-persona-store.vala:1344 -#: ../folks/postal-address-details.vala:335 +#: ../backends/eds/lib/edsf-persona-store.vala:1546 +#: ../folks/postal-address-details.vala:361 msgid "Postal addresses are not writeable on this contact." msgstr "Postanschriften sind für diesen Kontakt schreibgeschützt." -#: ../backends/eds/lib/edsf-persona-store.vala:1411 +#: ../backends/eds/lib/edsf-persona-store.vala:1613 #: ../folks/name-details.vala:281 msgid "Full name is not writeable on this contact." msgstr "Der vollständige Name ist für diesen Kontakt schreibgeschützt." -#: ../backends/eds/lib/edsf-persona-store.vala:1432 +#: ../backends/eds/lib/edsf-persona-store.vala:1635 #: ../folks/name-details.vala:319 msgid "Nickname is not writeable on this contact." msgstr "Der Spitzname ist für diesen Kontakt schreibgeschützt." -#: ../backends/eds/lib/edsf-persona-store.vala:1453 -#: ../folks/note-details.vala:141 +#: ../backends/eds/lib/edsf-persona-store.vala:1657 +#: ../folks/note-details.vala:136 msgid "Notes are not writeable on this contact." msgstr "Notizen sind für diesen Kontakt schreibgeschützt." -#: ../backends/eds/lib/edsf-persona-store.vala:1482 +#: ../backends/eds/lib/edsf-persona-store.vala:1686 #: ../folks/birthday-details.vala:60 msgid "Birthday is not writeable on this contact." msgstr "Der Geburtstag ist für diesen Kontakt schreibgeschützt." -#: ../backends/eds/lib/edsf-persona-store.vala:1521 -#: ../folks/role-details.vala:255 +#: ../backends/eds/lib/edsf-persona-store.vala:1730 +#: ../folks/role-details.vala:277 msgid "Roles are not writeable on this contact." msgstr "Funktionen sind für diesen Kontakt schreibgeschützt." -#: ../backends/eds/lib/edsf-persona-store.vala:1622 +#: ../backends/eds/lib/edsf-persona-store.vala:1831 #: ../folks/name-details.vala:244 msgid "Structured name is not writeable on this contact." msgstr "Der strukturierte Name ist für diesen Kontakt schreibgeschützt." -#: ../backends/eds/lib/edsf-persona-store.vala:1656 -#: ../folks/im-details.vala:130 +#: ../backends/eds/lib/edsf-persona-store.vala:1871 +#: ../folks/im-details.vala:136 msgid "IM addresses are not writeable on this contact." msgstr "Sofortnachrichtenadressen sind für diesen Kontakt schreibgeschützt." -#: ../backends/eds/lib/edsf-persona-store.vala:1706 +#: ../backends/eds/lib/edsf-persona-store.vala:1921 #: ../folks/group-details.vala:168 msgid "Groups are not writeable on this contact." msgstr "Gruppen sind für diesen Kontakt schreibgeschützt." -#: ../backends/eds/lib/edsf-persona-store.vala:1736 +#: ../backends/eds/lib/edsf-persona-store.vala:1951 #: ../folks/gender-details.vala:77 msgid "Gender is not writeable on this contact." msgstr "Das Geschlecht ist für diesen Kontakt schreibgeschützt." @@ -197,7 +191,7 @@ #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error #. * message. -#: ../backends/eds/lib/edsf-persona-store.vala:1870 +#: ../backends/eds/lib/edsf-persona-store.vala:2100 #, c-format msgid "Property ‘%s’ is not writeable: %s" msgstr "Die Eigenschaft »%s« ist schreibgeschützt: %s" @@ -205,42 +199,42 @@ #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error #. * message. -#: ../backends/eds/lib/edsf-persona-store.vala:1879 +#: ../backends/eds/lib/edsf-persona-store.vala:2109 #, c-format msgid "Invalid value for property ‘%s’: %s" msgstr "Ungültiger Wert für Eigenschaft »%s«: %s" #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:1905 +#: ../backends/eds/lib/edsf-persona-store.vala:2135 #, c-format msgid "Unknown error setting property ‘%s’: %s" msgstr "Unbekannter Fehler beim Setzen der Eigenschaft »%s«: %s" #. Translators: the first parameter is a filename, #. * and the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:205 +#: ../backends/key-file/kf-persona-store.vala:224 #, c-format msgid "The relationship key file '%s' could not be loaded: %s" msgstr "Die Beziehungs-Schlüsseldatei »%s« konnte nicht geladen werden: %s" #. Translators: the first parameter is a path, and #. * the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:227 +#: ../backends/key-file/kf-persona-store.vala:246 #, c-format msgid "The relationship key file directory '%s' could not be created: %s" msgstr "Die Beziehungs-Schlüsseldatei »%s« konnte nicht erzeugt werden: %s" #. Translators: the first parameter is a filename, #. * and the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:251 +#: ../backends/key-file/kf-persona-store.vala:270 #, c-format msgid "The relationship key file '%s' could not be created: %s" msgstr "Die Beziehungs-Schlüsseldatei »%s« konnte nicht erzeugt werden: %s" #. Translators: the first parameter is a filename, the second is #. * an error message. -#: ../backends/key-file/kf-persona-store.vala:436 +#: ../backends/key-file/kf-persona-store.vala:463 #, c-format msgid "Could not write updated key file '%s': %s" msgstr "Aktualisierte Schlüsseldatei »%s« konnte nicht geschrieben werden: %s" @@ -250,98 +244,98 @@ #. * an IM address (e.g. “foo@jabber.org”), the second is #. * the name of a protocol (e.g. “jabber”) and the third is #. * an error message. -#: ../backends/key-file/kf-persona.vala:169 +#: ../backends/key-file/kf-persona.vala:171 #, c-format msgid "Invalid IM address ‘%s’ for protocol ‘%s’: %s" msgstr "Ungültige Sofortnachrichtenadresse »%s« für Protokoll »%s«: %s" #. Translators: the parameter is an error message. -#: ../backends/key-file/kf-persona.vala:357 +#: ../backends/key-file/kf-persona.vala:364 #, c-format msgid "Couldn't load data from key file: %s" msgstr "Daten konnten nicht aus Schlüsseldatei geladen werden: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:504 +#: ../backends/telepathy/lib/tp-lowlevel.c:508 #, c-format msgid "Error requesting a group channel: %s" msgstr "Fehler beim Anfordern eines Gruppenkanals: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:522 +#: ../backends/telepathy/lib/tp-lowlevel.c:526 #, c-format msgid "Error requesting group handles: %s" msgstr "Fehler beim Anfordern eines Gruppen-Handle: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:560 +#: ../backends/telepathy/lib/tp-lowlevel.c:564 #, c-format msgid "Failed to change contact's alias: %s" msgstr "Alias des Kontakts konnte nicht geändert werden: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:619 +#: ../backends/telepathy/lib/tp-lowlevel.c:623 #, c-format msgid "Failed to create group channel: %s" msgstr "Fehler bei der Erzeugung des Gruppenkanals: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:651 +#: ../backends/telepathy/lib/tp-lowlevel.c:655 #, c-format msgid "Get Channels property failed: %s" msgstr "Kanal-Eigenschaft konnte nicht abgerufen werden: %s" #. Translators: the first parameter is a group channel identifier and the #. * second is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:693 +#: ../backends/telepathy/lib/tp-lowlevel.c:697 #, c-format msgid "Failed to add contact to group '%s': %s" msgstr "Kontakt konnte nicht zu Gruppe »%s« hinzugefügt werden: %s" #. Translators: the first parameter is a group channel identifier and the #. * second is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:709 +#: ../backends/telepathy/lib/tp-lowlevel.c:713 #, c-format msgid "Failed to remove contact from group '%s': %s" msgstr "Kontakt konnte nicht aus Gruppe »%s« entfernt werden: %s" #. Translators: the first parameter is a pointer address and the #. * second is a contact handle (numeric identifier). -#: ../backends/telepathy/lib/tp-lowlevel.c:732 +#: ../backends/telepathy/lib/tp-lowlevel.c:736 #, c-format msgid "Invalid group channel %p to add handle %d to." msgstr "" "Ungültiger Gruppenkanal %p, zu dem das Handle %d hinzugefügt werden soll." -#: ../backends/telepathy/lib/tpf-persona-store.vala:596 +#: ../backends/telepathy/lib/tpf-persona-store.vala:637 msgid "Couldn't connect to the telepathy-logger service." msgstr "Verbindung zum Dienst telepathy-logger konnte nicht aufgebaut werden." -#: ../backends/telepathy/lib/tpf-persona-store.vala:631 +#: ../backends/telepathy/lib/tpf-persona-store.vala:676 msgid "Lost connection to the telepathy-logger service." msgstr "Verbindung zum Dienst telepathy-logger wurde verloren." #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:663 -#: ../backends/telepathy/lib/tpf-persona-store.vala:675 +#: ../backends/telepathy/lib/tpf-persona-store.vala:708 +#: ../backends/telepathy/lib/tpf-persona-store.vala:720 #, c-format msgid "Couldn't get list of favorite contacts: %s" msgstr "Liste der favorisierten Kontakte konnte nicht abgerufen werden: %s" #. Translators: the parameter is an identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:712 +#: ../backends/telepathy/lib/tpf-persona-store.vala:757 #, c-format msgid "Unknown Telepathy contact ‘%s’ in favorites list." msgstr "Unbekannter Telepathy-Kontakt »%s« in Favoritenliste." #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:743 +#: ../backends/telepathy/lib/tpf-persona-store.vala:788 #, c-format msgid "Couldn't add favorite contacts: %s" msgstr "Favorisierte Kontakte konnten nicht hinzugefügt werden: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:764 +#: ../backends/telepathy/lib/tpf-persona-store.vala:809 #, c-format msgid "Couldn't remove favorite contacts: %s" msgstr "Favorisierte Kontakte konnten nicht entfernt werden: %s" @@ -349,7 +343,7 @@ #. Translators: the first parameter is the display name for #. * the Telepathy account, and the second is an error #. * message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:884 +#: ../backends/telepathy/lib/tpf-persona-store.vala:935 #, c-format msgid "" "Failed to determine whether we can set aliases on Telepathy account '%s': %s" @@ -360,7 +354,7 @@ #. Translators: the first parameter is the display name for #. * the Telepathy account, and the second is an error #. * message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:937 +#: ../backends/telepathy/lib/tpf-persona-store.vala:988 #, c-format msgid "" "Failed to determine whether we can set groups on Telepathy account '%s': %s" @@ -370,32 +364,32 @@ #. Translators: the first parameter is a Telepathy handle, #. * and the second is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1114 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1166 #, c-format msgid "Failed to create contact for self handle '%u': %s" msgstr "Erstellen eines Kontakts für eigenes Handle »%u« schlug fehl: %s" #. Translators: do not translate "NewChannels", as it's a D-Bus #. * signal name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1145 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1197 msgid "Error creating channel for NewChannels signal." msgstr "Fehler beim Erstellen des Kanals für das NewChannels-Signal." #. Translators: the parameter is a persona identifier and #. * the second parameter is a group name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1184 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1236 #, c-format msgid "Failed to add Telepathy contact ‘%s’ to group ‘%s’." msgstr "Telepathy-Kontakt »%s« konnte nicht zu Gruppe »%s« hinzugefügt werden." #. Translators: the parameter is a persona identifier #. * and the second parameter is a group name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1192 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1247 #, c-format msgid "Failed to remove Telepathy contact ‘%s’ from group ‘%s’." msgstr "Telepathy-Kontakt »%s« konnte nicht aus Gruppe »%s« entfernt werden." -#: ../backends/telepathy/lib/tpf-persona-store.vala:1546 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1613 msgid "Telepathy contacts representing the local user may not be removed." msgstr "" "Telepathy-Kontakte, die den lokalen Benutzer verkörpern, können nicht " @@ -407,10 +401,10 @@ #. Translators: The first parameter is a contact identifier, #. * the second is a contact list identifier and the third is an #. * error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1560 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1575 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1590 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1764 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1634 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1649 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1664 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1845 #, c-format msgid "Failed to remove Telepathy contact ‘%s’ from ‘%s’ list: %s" msgstr "Telepathy-Kontakt »%s« konnte nicht aus Gruppe »%s« entfernt werden: %s" @@ -418,14 +412,14 @@ #. Translators: The first parameter is a contact identifier, #. * the second is a contact list identifier and the third is an #. * error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1754 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1835 #, c-format msgid "Failed to add Telepathy contact ‘%s’ to ‘%s’ list: %s" msgstr "Hinzufügen des Telepathy-Kontakts »%s« zur Liste »%s« schlug fehl: %s" #. Translators: the first parameter is a channel identifier and #. * the second is an error message.. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1866 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1948 #, c-format msgid "Failed to create incoming Telepathy contacts from channel ‘%s’: %s" msgstr "" @@ -434,7 +428,7 @@ #. Translators: the first two parameters are store identifiers and #. * the third is a contact identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2047 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2186 #, c-format msgid "" "Persona store (%s, %s) requires the following details:\n" @@ -443,14 +437,14 @@ "Personenspeicher (%s, %s) erfordert die folgenden Details:\n" " Kontakt (angegeben: »%s«)\n" -#: ../backends/telepathy/lib/tpf-persona-store.vala:2062 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2201 msgid "Cannot create a new Telepathy contact while offline." msgstr "" "Ein neuer Telepathy-Kontakt kann im Offline-Modus nicht erstellt werden." #. Translators: the parameter is the number of personas #. * which were returned. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2114 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2253 #, c-format msgid "Requested a single persona, but got %u persona back." msgid_plural "Requested a single persona, but got %u personas back." @@ -460,14 +454,14 @@ "Eine einzige Person wurde angefordert, aber es wurden %u Personen " "zurückgegeben." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2125 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2264 #, c-format msgid "Failed to add a persona from details: %s" msgstr "Hinzufügen der Person aus den Details schlug fehl: %s" #. Translators: "telepathy-logger" is the name of an application, #. * and should not be translated. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2145 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2284 msgid "" "Failed to change favorite without a connection to the telepathy-logger " "service." @@ -475,20 +469,28 @@ "Ändern eines Favoriten ohne Verbindung zum telepathy-logger-Dienst schlug " "fehl." +#: ../backends/telepathy/lib/tpf-persona-store.vala:2290 +msgid "" +"Failed to change favorite status of Telepathy Persona because it has no " +"attached TpContact." +msgstr "" +"Favoritenstatus für Telepathy-Person konnte nicht geändert werden, weil kein " +"TpContact zugeordnet ist." + #. Translators: the parameter is a contact identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2163 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2308 #, c-format msgid "Failed to change favorite status for Telepathy contact ‘%s’." msgstr "" "Favoritenstatus für Telepathy-Kontakt »%s« konnte nicht geändert werden." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2258 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2410 msgid "Extended information may only be set on the user's Telepathy contact." msgstr "" "Erweiterte Informationen können nur für den Telepathy-Kontakt des Benutzers " "angegeben werden." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2287 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2439 msgid "" "Extended information cannot be written because the store is disconnected." msgstr "" @@ -498,7 +500,7 @@ #. Translators: the first parameter is the unknown key that #. * was received with the details params, and the second #. * identifies the persona store. -#: ../backends/tracker/lib/trf-persona-store.vala:733 +#: ../backends/tracker/lib/trf-persona-store.vala:739 #, c-format msgid "Unrecognized parameter '%s' passed to persona store '%s'." msgstr "" @@ -510,20 +512,20 @@ #. Translators: the first parameter is a backend name, and the #. * second is an error message. -#: ../folks/backend-store.vala:354 +#: ../folks/backend-store.vala:366 #, c-format msgid "Error preparing Backend '%s': %s" msgstr "Fehler bei der Vorbereitung des Backends »%s«: %s" #. Translators: the first parameter is a folder path and the second #. * is an error message. -#: ../folks/backend-store.vala:547 +#: ../folks/backend-store.vala:559 #, c-format msgid "Error listing contents of folder '%s': %s" msgstr "Fehler beim Auflisten des Inhalts des Ordners »%s«: %s" #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:580 +#: ../folks/backend-store.vala:601 #, c-format msgid "" "The content type of '%s' could not be determined. Have you installed shared-" @@ -534,26 +536,26 @@ #. Translators: the first parameter is a filename and the second is an #. * error message. -#: ../folks/backend-store.vala:603 +#: ../folks/backend-store.vala:629 #, c-format msgid "Failed to load module from path '%s': %s" msgstr "Laden des Moduls aus Pfad »%s« schlug fehl: %s" #. Translators: the first parameter is a function name, the second is #. * a filename and the third is an error message. -#: ../folks/backend-store.vala:618 +#: ../folks/backend-store.vala:645 #, c-format msgid "Failed to find entry point function '%s' in '%s': %s" msgstr "Eintrittspunktfunktion »%s« konnte nicht in »%s« gefunden werden: %s" #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:659 +#: ../folks/backend-store.vala:686 #, c-format msgid "File or directory '%s' does not exist." msgstr "Datei oder Ordner »%s« existiert nicht." #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:665 +#: ../folks/backend-store.vala:692 #, c-format msgid "Failed to get content type for '%s'." msgstr "Typ des Inhalts konnte für »%s« nicht abgefragt werden." @@ -568,56 +570,77 @@ msgstr "Der Favoritenstatus ist für diesen Kontakt schreibgeschützt." #. Translators: the parameter is an IM address. -#: ../folks/im-details.vala:172 ../folks/im-details.vala:186 -#: ../folks/im-details.vala:208 ../folks/im-details.vala:235 +#: ../folks/im-details.vala:178 ../folks/im-details.vala:192 +#: ../folks/im-details.vala:214 ../folks/im-details.vala:241 #, c-format msgid "The IM address '%s' could not be understood." msgstr "Die Sofortnachrichtenadresse »%s« ist unverständlich." #. Translators: the first parameter is a persona store identifier #. * and the second is an error message. -#: ../folks/individual-aggregator.vala:696 +#: ../folks/individual-aggregator.vala:782 #, c-format msgid "Error preparing persona store '%s': %s" msgstr "Fehler beim Vorbereiten des Personenspeichers »%s«: %s" #. Translators: the parameter is a property name. -#: ../folks/individual-aggregator.vala:890 -#: ../folks/individual-aggregator.vala:1072 +#: ../folks/individual-aggregator.vala:977 +#: ../folks/individual-aggregator.vala:1160 #, c-format msgid "Unknown property '%s' in linkable property list." msgstr "Unbekannte Eigenschaft »%s« in verknüpfbarer Eigenschaftsliste." #. Translators: the first parameter is a store identifier #. * and the second parameter is an error message. -#: ../folks/individual-aggregator.vala:1478 +#: ../folks/individual-aggregator.vala:1580 #, c-format msgid "Failed to add contact for persona store ID '%s': %s" msgstr "" "Hinzufügen eines Kontakts zum Personenspeicher mit der Kennung »%s« schlug " "fehl: %s" -#: ../folks/individual-aggregator.vala:1559 -msgid "Can't link personas with no primary store." -msgstr "Ohne primären Speicher können Personen nicht verknüpft werden." - -#: ../folks/individual-aggregator.vala:1816 -msgid "Can't add personas with no primary store." -msgstr "Ohne primären Speicher können keine Personen hinzugefügt werden." +#: ../folks/individual-aggregator.vala:1661 +msgid "Can’t link personas with no primary store." +msgstr "Personen können ohne primären Speicher nicht verknüpft werden." + +#: ../folks/individual-aggregator.vala:1662 +#: ../folks/individual-aggregator.vala:1927 +#, c-format +msgid "" +"Persona store ‘%s:%s’ is configured as primary, but could not be found or " +"failed to load." +msgstr "" +"Personenspeicher »%s:%s« ist als primärer konfiguriert, konnte aber nicht " +"gefunden werden oder das Laden schlug fehl." + +#: ../folks/individual-aggregator.vala:1663 +#: ../folks/individual-aggregator.vala:1928 +#, c-format +msgid "" +"Check the service providing the persona store is running, or change the " +"default store in that service or using the “%s” GConf key." +msgstr "" +"Prüfen Sie den Dienstanbieter, den der Personenspeicher ausführt, oder ändern " +"Sie den voreingestellten Speicher für diesen Dienst mit dem GConf-Schlüssel " +"»%s«." + +#: ../folks/individual-aggregator.vala:1926 +msgid "Can’t add personas with no primary store." +msgstr "Personen können ohne primären Speicher nicht hinzugefügt werden." -#: ../folks/individual-aggregator.vala:1821 +#: ../folks/individual-aggregator.vala:1935 #, c-format msgid "Can't write to requested property (“%s”) of the writeable store." msgstr "" "In angeforderte Eigenschaft (»%s«) des schreibbaren Speichers konnte nicht " "geschrieben werden." -#: ../folks/postal-address-details.vala:211 +#: ../folks/postal-address-details.vala:231 #, c-format msgid "%s, %s, %s, %s, %s, %s, %s" msgstr "%s, %s, %s, %s, %s, %s, %s" -#: ../folks/role-details.vala:133 +#: ../folks/role-details.vala:148 #, c-format msgid "Title: %s, Organisation: %s, Role: %s" msgstr "Titel: %s, Organisation: %s, Funktion: %s" @@ -774,6 +797,9 @@ "Unbekannter Name »%s« des Quellen-Backends. »%s« ist derzeit das einzige " "unterstützte Quellen-Backend." +#~ msgid "Couldn't open address book ‘%s’." +#~ msgstr "Adressbuch »%s« konnte nicht geöffnet werden." + #~ msgid "Failed to remove persona '%s' (%s) from 'stored' list: %s" #~ msgstr "Person »%s« (%s) konnte nicht aus »stored«-Liste entfernt werden: %s" diff -Nru folks-0.6.6/po/es.po folks-0.6.7/po/es.po --- folks-0.6.6/po/es.po 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/po/es.po 2012-02-18 00:46:31.000000000 +0000 @@ -2,15 +2,16 @@ # Copyright (C) 2011 folks's COPYRIGHT HOLDER # This file is distributed under the same license as the folks package. # Jorge González , 2011. -# Daniel Mustieles , 2011. +# Nicolás Satragno , 2011. +# Daniel Mustieles , 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: folks master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=folks&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-10-25 21:22+0000\n" -"PO-Revision-Date: 2011-10-31 00:00+0100\n" +"POT-Creation-Date: 2012-01-30 19:09+0000\n" +"PO-Revision-Date: 2012-01-31 13:13+0100\n" "Last-Translator: Daniel Mustieles \n" "Language-Team: Español \n" "MIME-Version: 1.0\n" @@ -20,173 +21,167 @@ #. Translators: the first parameter is an address book #. * URI and the second is a persona UID. -#: ../backends/eds/lib/edsf-persona-store.vala:480 +#: ../backends/eds/lib/edsf-persona-store.vala:533 #, c-format msgid "Address book ‘%s’ is offline, so contact ‘%s’ cannot be removed." msgstr "" -"La libreta de direcciones «%s» está fuera de línea, por lo que el contacto " -"«%s» no se puede quitar." +"La libreta de direcciones «%s» está fuera de línea, por lo que el contacto «%" +"s» no se puede quitar." #. Translators: the first parameter is an address book #. * URI and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:486 +#: ../backends/eds/lib/edsf-persona-store.vala:539 #, c-format msgid "Permission denied to remove contact ‘%s’: %s" msgstr "Permiso denegado para quitar el contacto «%s»: %s" #. Translators: the parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:491 +#: ../backends/eds/lib/edsf-persona-store.vala:544 #, c-format msgid "Removing contacts isn't supported by this persona store: %s" msgstr "Este almacén de contactos no soporta quitar contactos: %s" -#: ../backends/eds/lib/edsf-persona-store.vala:520 +#: ../backends/eds/lib/edsf-persona-store.vala:573 #, c-format msgid "Can't remove contact ‘%s’: %s" msgstr "No se puede quitar el contacto «%s»: %s" #. Translators: the parameter is an address book #. * URI. -#: ../backends/eds/lib/edsf-persona-store.vala:588 -#: ../backends/eds/lib/edsf-persona-store.vala:777 +#: ../backends/eds/lib/edsf-persona-store.vala:651 +#: ../backends/eds/lib/edsf-persona-store.vala:846 #, c-format msgid "Address book ‘%s’ is offline." msgstr "La libreta de direcciones «%s» está fuera de línea." #. Translators: the first parameter is an address #. * book URI and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:593 -#: ../backends/eds/lib/edsf-persona-store.vala:782 +#: ../backends/eds/lib/edsf-persona-store.vala:656 +#: ../backends/eds/lib/edsf-persona-store.vala:851 #, c-format msgid "Permission denied to open address book ‘%s’: %s" msgstr "Permiso denegado para abrir la libreta de direcciones «%s»: %s" #. Translators: the first parameter is an address book URI #. * and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:626 +#: ../backends/eds/lib/edsf-persona-store.vala:689 #, c-format msgid "Couldn't open address book ‘%s’: %s" msgstr "No se pudo abrir la librea de direcciones «%s»: %s" -#. Translators: the parameter is an address book URI. -#: ../backends/eds/lib/edsf-persona-store.vala:636 -#, c-format -msgid "Couldn't open address book ‘%s’." -msgstr "No se pudo abrir la librea de direcciones: %s." - #. Translators: the parameteter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:698 -#: ../backends/eds/lib/edsf-persona-store.vala:725 +#: ../backends/eds/lib/edsf-persona-store.vala:754 +#: ../backends/eds/lib/edsf-persona-store.vala:785 #, c-format msgid "Couldn't get address book capabilities: %s" msgstr "" "No se pudieron obtener las capacidades de la libreta de direcciones: %s" #. Translators: the parameter is an address book URI. -#: ../backends/eds/lib/edsf-persona-store.vala:738 +#: ../backends/eds/lib/edsf-persona-store.vala:802 #, c-format msgid "Couldn't get view for address book ‘%s’." msgstr "No se pudo obtener la vista para la libreta de direcciones «%s»." #. Translators: the first parameter is an address book URI #. * and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:815 +#: ../backends/eds/lib/edsf-persona-store.vala:884 #, c-format msgid "Couldn't get view for address book ‘%s’: %s" msgstr "No se pudo obtener la vista para la libreta de direcciones «%s»: %s" -#: ../backends/eds/lib/edsf-persona-store.vala:1045 +#: ../backends/eds/lib/edsf-persona-store.vala:1247 #, c-format msgid "Changing the ‘%s’ property failed due to reaching the timeout." msgstr "Falló al cambiar la propiedad «%s» porque expiró el tiempo." -#: ../backends/eds/lib/edsf-persona-store.vala:1067 +#: ../backends/eds/lib/edsf-persona-store.vala:1278 #: ../folks/avatar-details.vala:59 msgid "Avatar is not writeable on this contact." msgstr "El avatar no se puede escribir en este contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1088 -#: ../folks/web-service-details.vala:118 +#: ../backends/eds/lib/edsf-persona-store.vala:1299 +#: ../folks/web-service-details.vala:123 msgid "Web service addresses are not writeable on this contact." msgstr "" "No se pueden escribir las direcciones del servicio web para este contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1129 -#: ../folks/url-details.vala:148 +#: ../backends/eds/lib/edsf-persona-store.vala:1335 +#: ../folks/url-details.vala:152 msgid "URLs are not writeable on this contact." msgstr "Las URL no se pueden escribir en este contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1207 +#: ../backends/eds/lib/edsf-persona-store.vala:1413 #: ../folks/local-id-details.vala:64 msgid "Local IDs are not writeable on this contact." msgstr "No se pueden escribir los ID locales en este contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1239 +#: ../backends/eds/lib/edsf-persona-store.vala:1440 msgid "The contact cannot be marked as favourite." msgstr "No se puede marcar el contacto como favorito." #. Translators: the parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:1305 +#: ../backends/eds/lib/edsf-persona-store.vala:1507 #, c-format msgid "Can't update avatar: %s" msgstr "No se puede actualizar el avatar: %s" -#: ../backends/eds/lib/edsf-persona-store.vala:1316 -#: ../folks/email-details.vala:115 +#: ../backends/eds/lib/edsf-persona-store.vala:1518 +#: ../folks/email-details.vala:120 msgid "E-mail addresses are not writeable on this contact." msgstr "Las direcciones de correo-e no se pueden escribir en este contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1330 -#: ../folks/phone-details.vala:223 +#: ../backends/eds/lib/edsf-persona-store.vala:1532 +#: ../folks/phone-details.vala:229 msgid "Phone numbers are not writeable on this contact." msgstr "Los números de teléfono no se pueden escribir en este contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1344 -#: ../folks/postal-address-details.vala:335 +#: ../backends/eds/lib/edsf-persona-store.vala:1546 +#: ../folks/postal-address-details.vala:361 msgid "Postal addresses are not writeable on this contact." msgstr "La dirección postal no se pueden escribir en este contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1411 +#: ../backends/eds/lib/edsf-persona-store.vala:1613 #: ../folks/name-details.vala:281 msgid "Full name is not writeable on this contact." msgstr "El nombre completo no se puede escribir en este contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1432 +#: ../backends/eds/lib/edsf-persona-store.vala:1635 #: ../folks/name-details.vala:319 msgid "Nickname is not writeable on this contact." msgstr "No se puede escribir el apodo en este contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1453 -#: ../folks/note-details.vala:141 +#: ../backends/eds/lib/edsf-persona-store.vala:1657 +#: ../folks/note-details.vala:136 msgid "Notes are not writeable on this contact." msgstr "Las notas no se pueden escribir en este contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1482 +#: ../backends/eds/lib/edsf-persona-store.vala:1686 #: ../folks/birthday-details.vala:60 msgid "Birthday is not writeable on this contact." msgstr "El cumpleaños no se puede escribir en este contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1521 -#: ../folks/role-details.vala:255 +#: ../backends/eds/lib/edsf-persona-store.vala:1730 +#: ../folks/role-details.vala:277 msgid "Roles are not writeable on this contact." msgstr "Los roles no se pueden escribir en este contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1622 +#: ../backends/eds/lib/edsf-persona-store.vala:1831 #: ../folks/name-details.vala:244 msgid "Structured name is not writeable on this contact." msgstr "El nombre estructurado no se puede escribir en este contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1656 -#: ../folks/im-details.vala:130 +#: ../backends/eds/lib/edsf-persona-store.vala:1871 +#: ../folks/im-details.vala:136 msgid "IM addresses are not writeable on this contact." msgstr "Las direcciones IM no se pueden escribir en este contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1706 +#: ../backends/eds/lib/edsf-persona-store.vala:1921 #: ../folks/group-details.vala:168 msgid "Groups are not writeable on this contact." msgstr "Los grupos no se pueden escribir en este contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1736 +#: ../backends/eds/lib/edsf-persona-store.vala:1951 #: ../folks/gender-details.vala:77 msgid "Gender is not writeable on this contact." msgstr "El género no se puede escribir en este contacto." @@ -194,7 +189,7 @@ #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error #. * message. -#: ../backends/eds/lib/edsf-persona-store.vala:1870 +#: ../backends/eds/lib/edsf-persona-store.vala:2100 #, c-format msgid "Property ‘%s’ is not writeable: %s" msgstr "La propiedad «%s» no se puede escribir: %s" @@ -202,150 +197,152 @@ #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error #. * message. -#: ../backends/eds/lib/edsf-persona-store.vala:1879 +#: ../backends/eds/lib/edsf-persona-store.vala:2109 #, c-format msgid "Invalid value for property ‘%s’: %s" msgstr "Valor no válido para la propiedad «%s»: %s" #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:1905 +#: ../backends/eds/lib/edsf-persona-store.vala:2135 #, c-format msgid "Unknown error setting property ‘%s’: %s" msgstr "Error desconocido al establecer la propiedad «%s»: %s" #. Translators: the first parameter is a filename, #. * and the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:205 +#: ../backends/key-file/kf-persona-store.vala:224 #, c-format msgid "The relationship key file '%s' could not be loaded: %s" msgstr "No se pudo cargar el archivo de clave de relación «%s»: %s" #. Translators: the first parameter is a path, and #. * the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:227 +#: ../backends/key-file/kf-persona-store.vala:246 #, c-format msgid "The relationship key file directory '%s' could not be created: %s" -msgstr "" +msgstr "No se pudo crea la carpeta del archivo de clave de relación «%s»: %s" #. Translators: the first parameter is a filename, #. * and the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:251 +#: ../backends/key-file/kf-persona-store.vala:270 #, c-format msgid "The relationship key file '%s' could not be created: %s" -msgstr "" +msgstr "No se pudo crear el archivo de clave de relación «%s»: %s" #. Translators: the first parameter is a filename, the second is #. * an error message. -#: ../backends/key-file/kf-persona-store.vala:436 +#: ../backends/key-file/kf-persona-store.vala:463 #, c-format msgid "Could not write updated key file '%s': %s" -msgstr "" +msgstr "No se pudo escribir la clave de relación actualizada «%s»: %s" #. Translators: this is an error message for if the user #. * provides an invalid IM address. The first parameter is #. * an IM address (e.g. “foo@jabber.org”), the second is #. * the name of a protocol (e.g. “jabber”) and the third is #. * an error message. -#: ../backends/key-file/kf-persona.vala:169 +#: ../backends/key-file/kf-persona.vala:171 #, c-format msgid "Invalid IM address ‘%s’ for protocol ‘%s’: %s" msgstr "Dirección IM «%s» no válida para el protocolo «%s»: %s" #. Translators: the parameter is an error message. -#: ../backends/key-file/kf-persona.vala:357 +#: ../backends/key-file/kf-persona.vala:364 #, c-format msgid "Couldn't load data from key file: %s" -msgstr "" +msgstr "No se pudieron cargar los datos de la clave de relación: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:504 +#: ../backends/telepathy/lib/tp-lowlevel.c:508 #, c-format msgid "Error requesting a group channel: %s" -msgstr "" +msgstr "Error al solicitar un canal de grupo: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:522 +#: ../backends/telepathy/lib/tp-lowlevel.c:526 #, c-format msgid "Error requesting group handles: %s" -msgstr "" +msgstr "Error al solicitar los punteros inteligentes del grupo: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:560 +#: ../backends/telepathy/lib/tp-lowlevel.c:564 #, c-format msgid "Failed to change contact's alias: %s" msgstr "Falló al cambiar el alias del contacto: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:619 +#: ../backends/telepathy/lib/tp-lowlevel.c:623 #, c-format msgid "Failed to create group channel: %s" -msgstr "" +msgstr "Falló al crear el canal del grupo: %s" +# Lo dejo en inglés porque «Get Channels» parece una propiedad inherente al código de un objeto. Aparte, «Channels» está en mayúsculas. +# Nicolás. #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:651 +#: ../backends/telepathy/lib/tp-lowlevel.c:655 #, c-format msgid "Get Channels property failed: %s" -msgstr "" +msgstr "Falló la propiedad «Get Channels»: %s" #. Translators: the first parameter is a group channel identifier and the #. * second is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:693 +#: ../backends/telepathy/lib/tp-lowlevel.c:697 #, c-format msgid "Failed to add contact to group '%s': %s" msgstr "Fallo al añadir el contacto al grupo «%s»: %s" #. Translators: the first parameter is a group channel identifier and the #. * second is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:709 +#: ../backends/telepathy/lib/tp-lowlevel.c:713 #, c-format msgid "Failed to remove contact from group '%s': %s" msgstr "Fallo al quitar el contacto del grupo «%s»: %s" #. Translators: the first parameter is a pointer address and the #. * second is a contact handle (numeric identifier). -#: ../backends/telepathy/lib/tp-lowlevel.c:732 +#: ../backends/telepathy/lib/tp-lowlevel.c:736 #, c-format msgid "Invalid group channel %p to add handle %d to." -msgstr "" +msgstr "Canal de grupo no válido %p para añadirle el puntero inteligente %d." -#: ../backends/telepathy/lib/tpf-persona-store.vala:596 +#: ../backends/telepathy/lib/tpf-persona-store.vala:637 msgid "Couldn't connect to the telepathy-logger service." msgstr "No se pudo conectar al servicio «telepathy-logger»." -#: ../backends/telepathy/lib/tpf-persona-store.vala:631 +#: ../backends/telepathy/lib/tpf-persona-store.vala:676 msgid "Lost connection to the telepathy-logger service." msgstr "Conexión con el servicio «telepathy-logger» perdida." #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:663 -#: ../backends/telepathy/lib/tpf-persona-store.vala:675 +#: ../backends/telepathy/lib/tpf-persona-store.vala:708 +#: ../backends/telepathy/lib/tpf-persona-store.vala:720 #, c-format msgid "Couldn't get list of favorite contacts: %s" msgstr "No se pudo obtener la lista de contactos favoritos: %s" #. Translators: the parameter is an identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:712 +#: ../backends/telepathy/lib/tpf-persona-store.vala:757 #, c-format msgid "Unknown Telepathy contact ‘%s’ in favorites list." msgstr "Contacto «%s» de Telepathy desconocido en la lista de favoritos." #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:743 +#: ../backends/telepathy/lib/tpf-persona-store.vala:788 #, c-format msgid "Couldn't add favorite contacts: %s" -msgstr "" +msgstr "No se pudieron añadir los contactos favoritos: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:764 +#: ../backends/telepathy/lib/tpf-persona-store.vala:809 #, c-format msgid "Couldn't remove favorite contacts: %s" -msgstr "" +msgstr "No se pudieron quitar los contactos favoritos: %s" #. Translators: the first parameter is the display name for #. * the Telepathy account, and the second is an error #. * message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:884 +#: ../backends/telepathy/lib/tpf-persona-store.vala:935 #, c-format msgid "" "Failed to determine whether we can set aliases on Telepathy account '%s': %s" @@ -356,7 +353,7 @@ #. Translators: the first parameter is the display name for #. * the Telepathy account, and the second is an error #. * message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:937 +#: ../backends/telepathy/lib/tpf-persona-store.vala:988 #, c-format msgid "" "Failed to determine whether we can set groups on Telepathy account '%s': %s" @@ -366,33 +363,32 @@ #. Translators: the first parameter is a Telepathy handle, #. * and the second is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1114 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1166 #, c-format msgid "Failed to create contact for self handle '%u': %s" -msgstr "" +msgstr "Falló al crear contacto para el puntero inteligente propio «%u»: %s" #. Translators: do not translate "NewChannels", as it's a D-Bus #. * signal name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1145 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1197 msgid "Error creating channel for NewChannels signal." -msgstr "" +msgstr "Error al crear el canal para la señal «NewChannels»" #. Translators: the parameter is a persona identifier and #. * the second parameter is a group name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1184 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1236 #, c-format msgid "Failed to add Telepathy contact ‘%s’ to group ‘%s’." msgstr "Falló al añadir el contacto «%s» de Telepathy al grupo «%s»." #. Translators: the parameter is a persona identifier #. * and the second parameter is a group name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1192 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1247 #, c-format msgid "Failed to remove Telepathy contact ‘%s’ from group ‘%s’." msgstr "Fallo al quitar el contacto «%s» de Telepathy del grupo «%s»." -#: ../backends/telepathy/lib/tpf-persona-store.vala:1546 -#| msgid "Personas representing the local user may not be removed." +#: ../backends/telepathy/lib/tpf-persona-store.vala:1613 msgid "Telepathy contacts representing the local user may not be removed." msgstr "" "Los contactos de Telepathy que representan al usuario local no se deben " @@ -404,10 +400,10 @@ #. Translators: The first parameter is a contact identifier, #. * the second is a contact list identifier and the third is an #. * error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1560 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1575 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1590 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1764 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1634 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1649 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1664 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1845 #, c-format msgid "Failed to remove Telepathy contact ‘%s’ from ‘%s’ list: %s" msgstr "Fallo al quitar el contacto «%s» de Telepathy de la lista «%s»: %s" @@ -415,78 +411,92 @@ #. Translators: The first parameter is a contact identifier, #. * the second is a contact list identifier and the third is an #. * error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1754 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1835 #, c-format msgid "Failed to add Telepathy contact ‘%s’ to ‘%s’ list: %s" msgstr "Falló al añadir el contacto «%s» de Telepathy a lista «%s»: %s" #. Translators: the first parameter is a channel identifier and #. * the second is an error message.. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1866 -#, fuzzy, c-format -#| msgid "Failed to remove contact from group '%s': %s" +#: ../backends/telepathy/lib/tpf-persona-store.vala:1948 +#, c-format msgid "Failed to create incoming Telepathy contacts from channel ‘%s’: %s" -msgstr "Fallo al quitar el contacto del grupo «%s»: %s" +msgstr "Falló al crear contactos entrantes de Telepathy del canal «%s»: %s" #. Translators: the first two parameters are store identifiers and #. * the third is a contact identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2047 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2186 #, c-format msgid "" "Persona store (%s, %s) requires the following details:\n" " contact (provided: '%s')\n" msgstr "" +"El almacén de contactos (%s, %s) requiere los siguientes detalles:\n" +" contacto (proporcionado: «%s»)\n" -#: ../backends/telepathy/lib/tpf-persona-store.vala:2062 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2201 msgid "Cannot create a new Telepathy contact while offline." msgstr "" "No se puede crear un contacto de Telepathy nuevo estando fuera de línea." #. Translators: the parameter is the number of personas #. * which were returned. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2114 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2253 #, c-format msgid "Requested a single persona, but got %u persona back." msgid_plural "Requested a single persona, but got %u personas back." msgstr[0] "Se solicitó un único contacto, pero se obtuvo %u contacto." msgstr[1] "Se solicitó un único contacto, pero se obtuvieron %u contactos." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2125 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2264 #, c-format msgid "Failed to add a persona from details: %s" -msgstr "" +msgstr "Falló al añadir un contacto desde los detalles: %s" #. Translators: "telepathy-logger" is the name of an application, #. * and should not be translated. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2145 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2284 msgid "" "Failed to change favorite without a connection to the telepathy-logger " "service." msgstr "" +"Falló al cambiar el favorito sin una conexión al servicio «telepathy-logger»." + +#: ../backends/telepathy/lib/tpf-persona-store.vala:2290 +#| msgid "Failed to change favorite status for Telepathy contact ‘%s’." +msgid "" +"Failed to change favorite status of Telepathy Persona because it has no " +"attached TpContact." +msgstr "" +"Falló al cambiar el estado de favorito del contacto de Telepathy porque no " +"tiene un TpContact adjunto." #. Translators: the parameter is a contact identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2163 -#, fuzzy, c-format -#| msgid "Failed to change a persona's favorite status." +#: ../backends/telepathy/lib/tpf-persona-store.vala:2308 +#, c-format msgid "Failed to change favorite status for Telepathy contact ‘%s’." -msgstr "Falló al cambiar el estado de favorito de un contacto." +msgstr "Falló al cambiar el estado de favorito del contacto «%s» de Telepathy." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2258 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2410 msgid "Extended information may only be set on the user's Telepathy contact." msgstr "" +"La información extendida se introducidrá únicamente en el contacto de " +"Telepathy del usuario." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2287 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2439 msgid "" "Extended information cannot be written because the store is disconnected." msgstr "" +"La información extendida no se puede escribir porque el almacén está " +"desconectado." #. Translators: the first parameter is the unknown key that #. * was received with the details params, and the second #. * identifies the persona store. -#: ../backends/tracker/lib/trf-persona-store.vala:733 +#: ../backends/tracker/lib/trf-persona-store.vala:739 #, c-format msgid "Unrecognized parameter '%s' passed to persona store '%s'." -msgstr "" +msgstr "Parámetro «%s» desconocido pasado al almacén de contactos «%s»." #: ../folks/alias-details.vala:57 msgid "Alias is not writeable on this contact." @@ -494,20 +504,20 @@ #. Translators: the first parameter is a backend name, and the #. * second is an error message. -#: ../folks/backend-store.vala:354 +#: ../folks/backend-store.vala:366 #, c-format msgid "Error preparing Backend '%s': %s" msgstr "Error al preparar «backend» «%s»: %s" #. Translators: the first parameter is a folder path and the second #. * is an error message. -#: ../folks/backend-store.vala:547 +#: ../folks/backend-store.vala:559 #, c-format msgid "Error listing contents of folder '%s': %s" msgstr "Error al listar el contenido de la carpeta «%s»: %s" #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:580 +#: ../folks/backend-store.vala:601 #, c-format msgid "" "The content type of '%s' could not be determined. Have you installed shared-" @@ -518,89 +528,107 @@ #. Translators: the first parameter is a filename and the second is an #. * error message. -#: ../folks/backend-store.vala:603 +#: ../folks/backend-store.vala:629 #, c-format msgid "Failed to load module from path '%s': %s" msgstr "Falló al cargar el módulo desde la ruta «%s»: %s" #. Translators: the first parameter is a function name, the second is #. * a filename and the third is an error message. -#: ../folks/backend-store.vala:618 +#: ../folks/backend-store.vala:645 #, c-format msgid "Failed to find entry point function '%s' in '%s': %s" msgstr "Falló al encontrar la función del punto de entrada «%s» en «%s»: %s" #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:659 +#: ../folks/backend-store.vala:686 #, c-format msgid "File or directory '%s' does not exist." msgstr "El archivo o la carpeta «%s» no existe." #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:665 +#: ../folks/backend-store.vala:692 #, c-format msgid "Failed to get content type for '%s'." msgstr "Falló al obtener el tipo de contenido para «%s»." #: ../folks/birthday-details.vala:89 msgid "Birthday event ID is not writeable on this contact." -msgstr "" +msgstr "No se puede escribir el ID de evento de cumpleaños en este contacto." #: ../folks/favourite-details.vala:52 msgid "Favorite status is not writeable on this contact." msgstr "El estado de favorito no se puede escribir en este contacto." #. Translators: the parameter is an IM address. -#: ../folks/im-details.vala:172 ../folks/im-details.vala:186 -#: ../folks/im-details.vala:208 ../folks/im-details.vala:235 +#: ../folks/im-details.vala:178 ../folks/im-details.vala:192 +#: ../folks/im-details.vala:214 ../folks/im-details.vala:241 #, c-format msgid "The IM address '%s' could not be understood." msgstr "No se pudo entender la dirección IM «%s»." #. Translators: the first parameter is a persona store identifier #. * and the second is an error message. -#: ../folks/individual-aggregator.vala:696 +#: ../folks/individual-aggregator.vala:782 #, c-format msgid "Error preparing persona store '%s': %s" msgstr "Error al preparar el almacén de contactos «%s»: %s" #. Translators: the parameter is a property name. -#: ../folks/individual-aggregator.vala:890 -#: ../folks/individual-aggregator.vala:1072 +#: ../folks/individual-aggregator.vala:977 +#: ../folks/individual-aggregator.vala:1160 #, c-format msgid "Unknown property '%s' in linkable property list." msgstr "Propiedad «%s» desconocida en la lista enlazable de propiedades." #. Translators: the first parameter is a store identifier #. * and the second parameter is an error message. -#: ../folks/individual-aggregator.vala:1478 +#: ../folks/individual-aggregator.vala:1580 #, c-format msgid "Failed to add contact for persona store ID '%s': %s" +msgstr "Falló al añadir el contacto para el ID de almacén de contactos «%s»: %s" + +#: ../folks/individual-aggregator.vala:1661 +msgid "Can’t link personas with no primary store." +msgstr "No se pueden enlazar contactos sin almacén primario." + +#: ../folks/individual-aggregator.vala:1662 +#: ../folks/individual-aggregator.vala:1927 +#, c-format +msgid "" +"Persona store ‘%s:%s’ is configured as primary, but could not be found or " +"failed to load." +msgstr "" +"El almacén de contactos «%s:%s» está configurado como primario, pero no se " +"encontró o falló al cargar." + +#: ../folks/individual-aggregator.vala:1663 +#: ../folks/individual-aggregator.vala:1928 +#, c-format +msgid "" +"Check the service providing the persona store is running, or change the " +"default store in that service or using the “%s” GConf key." msgstr "" +"Verifique que el servicio que proporciona el almacén de contactos se esté " +"ejecutando, o modifique el almacén predeterminado en ese servicio usando la " +"clave de GConf «%s»." -#: ../folks/individual-aggregator.vala:1559 -#, fuzzy -#| msgid "Can't link personas with no writeable store." -msgid "Can't link personas with no primary store." -msgstr "No se pueden enlazar contactos con almacenes no escribibles." - -#: ../folks/individual-aggregator.vala:1816 -#, fuzzy -#| msgid "Can't add personas with no writeable store." -msgid "Can't add personas with no primary store." -msgstr "No se pueden añadir contactos con almacenes no escribibles." +#: ../folks/individual-aggregator.vala:1926 +msgid "Can’t add personas with no primary store." +msgstr "No se pueden añadir contactos sin almacén primario." -#: ../folks/individual-aggregator.vala:1821 +#: ../folks/individual-aggregator.vala:1935 #, c-format msgid "Can't write to requested property (“%s”) of the writeable store." msgstr "" +"No se puede escribir a la propiedad solicitada («%s») del almacén escribible." -#: ../folks/postal-address-details.vala:211 +#: ../folks/postal-address-details.vala:231 #, c-format msgid "%s, %s, %s, %s, %s, %s, %s" msgstr "%s, %s, %s, %s, %s, %s, %s" -#: ../folks/role-details.vala:133 +#: ../folks/role-details.vala:148 #, c-format msgid "Title: %s, Organisation: %s, Role: %s" msgstr "Título: %s, organización: %s, rol: %s" @@ -628,7 +656,7 @@ #: ../tools/import-pidgin.vala:81 #, c-format msgid "The Pidgin buddy list file '%s' could not be loaded." -msgstr "" +msgstr "No se pudo cargar la lista de amigos de Pidgin «%s»." #. Translators: the parameter is a filename. #: ../tools/import-pidgin.vala:96 @@ -637,6 +665,8 @@ "The Pidgin buddy list file ‘%s’ could not be loaded: the root element could " "not be found or was not recognized." msgstr "" +"No se pudo cargar la lista de amigos de Pidgin «%s»: no se encontró el " +"elemento raíz o no se reconoció." #. Translators: the first parameter is the number of buddies which #. * were successfully imported, and the second is a filename. @@ -644,8 +674,8 @@ #, c-format msgid "Imported %u buddy from '%s'." msgid_plural "Imported %u buddies from '%s'." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Importado %u amigo de «%s»." +msgstr[1] "Importados %u amigos de «%s»." #. Translators: the first parameter is a persona identifier, #. * and the second is an error message. @@ -661,6 +691,8 @@ "Ignoring buddy with no alias and only one IM address:\n" "%s" msgstr "" +"Ignorando amigo sin alias y sólo una dirección IM:\n" +"%s" #: ../tools/import-pidgin.vala:243 #, c-format @@ -669,6 +701,9 @@ "%s\n" "Error: %s\n" msgstr "" +"Falló al crear contacto nuevo para el amigo con alias «%s» y direcciones IM:\n" +"%s\n" +"Error: %s\n" #. Translators: the first parameter is a persona identifier, the #. * second is an alias for the persona, and the third is a set of IM @@ -689,10 +724,12 @@ #: ../tools/import.vala:47 msgid "Source filename (default: specific to source backend)" msgstr "" +"Nombre de archivo fuente (predeterminado: específico a la fuente del " +"«backend»)" #: ../tools/import.vala:57 msgid "— import meta-contact information to libfolks" -msgstr "" +msgstr "— importar información de meta-contacto a libfolks" #. Translators: the parameter is an error message. #: ../tools/import.vala:67 @@ -721,21 +758,18 @@ #. Translators: the parameter is a backend identifier. #: ../tools/import.vala:145 -#, fuzzy, c-format -#| msgid "Couldn't load the backends: %s\n" +#, c-format msgid "Couldn't load the ‘%s’ backend's persona store." -msgstr "No se pudieron cargar los «backend»: %s\n" +msgstr "No se pudo cargar el almacén de contactos del «backend %s»." #: ../tools/import.vala:166 -#, fuzzy, c-format -#| msgid "Couldn't load the backends: %s\n" +#, c-format msgid "Couldn't prepare the ‘%s’ backend's persona store: %s" -msgstr "No se pudieron cargar los «backend»: %s\n" +msgstr "No se pudieron preparar los almacenes de contactos del «backend %s»: %s" #. Translators: the parameter is an error message. #: ../tools/import.vala:184 #, c-format -#| msgid "Error importing personas: %s\n" msgid "Error importing contacts: %s" msgstr "Error al importar contactos: %s" @@ -746,6 +780,11 @@ "Unrecognized source backend name ‘%s’. ‘%s’ is currently the only supported " "source backend." msgstr "" +"Nombre «%s» de la fuente del «backend» desconocido. «%s» es actualmente el " +"único soportado." + +#~ msgid "Couldn't open address book ‘%s’." +#~ msgstr "No se pudo abrir la librea de direcciones: %s." #~ msgid "Failed to remove persona '%s' (%s) from 'stored' list: %s" #~ msgstr "Falló al quitar el contacto «%s» (%s) de la lista «stored»: %s" diff -Nru folks-0.6.6/po/gl.po folks-0.6.7/po/gl.po --- folks-0.6.6/po/gl.po 2011-12-13 23:32:35.000000000 +0000 +++ folks-0.6.7/po/gl.po 2012-01-19 03:05:45.000000000 +0000 @@ -2,14 +2,14 @@ # Copyright (C) 2011 folks's COPYRIGHT HOLDER # This file is distributed under the same license as the folks package. # Fran Diéguez , 2011. -# Fran Dieguez , 2011. +# Fran Dieguez , 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: folks master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-14 10:46+0100\n" -"PO-Revision-Date: 2011-11-14 10:58+0100\n" +"POT-Creation-Date: 2012-01-17 01:50+0100\n" +"PO-Revision-Date: 2012-01-17 01:52+0100\n" "Last-Translator: Fran Dieguez \n" "Language-Team: Galician \n" "Language: gl\n" @@ -20,7 +20,7 @@ #. Translators: the first parameter is an address book #. * URI and the second is a persona UID. -#: ../backends/eds/lib/edsf-persona-store.vala:480 +#: ../backends/eds/lib/edsf-persona-store.vala:533 #, c-format msgid "Address book ‘%s’ is offline, so contact ‘%s’ cannot be removed." msgstr "" @@ -29,164 +29,158 @@ #. Translators: the first parameter is an address book #. * URI and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:486 +#: ../backends/eds/lib/edsf-persona-store.vala:539 #, c-format msgid "Permission denied to remove contact ‘%s’: %s" msgstr "Permiso denegado para quitar o contacto «%s»: %s" #. Translators: the parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:491 +#: ../backends/eds/lib/edsf-persona-store.vala:544 #, c-format msgid "Removing contacts isn't supported by this persona store: %s" msgstr "Este almacén de contactos non permite quitar contactos: %s" -#: ../backends/eds/lib/edsf-persona-store.vala:520 +#: ../backends/eds/lib/edsf-persona-store.vala:573 #, c-format msgid "Can't remove contact ‘%s’: %s" msgstr "Non é posíbel quitar o contacto «%s»: %s" #. Translators: the parameter is an address book #. * URI. -#: ../backends/eds/lib/edsf-persona-store.vala:588 -#: ../backends/eds/lib/edsf-persona-store.vala:777 +#: ../backends/eds/lib/edsf-persona-store.vala:651 +#: ../backends/eds/lib/edsf-persona-store.vala:846 #, c-format msgid "Address book ‘%s’ is offline." msgstr "A axenda de enderezos «%s» está fóra de liña." #. Translators: the first parameter is an address #. * book URI and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:593 -#: ../backends/eds/lib/edsf-persona-store.vala:782 +#: ../backends/eds/lib/edsf-persona-store.vala:656 +#: ../backends/eds/lib/edsf-persona-store.vala:851 #, c-format msgid "Permission denied to open address book ‘%s’: %s" msgstr "Permiso denegado para abrir a axenda de enderezos «%s»: %s" #. Translators: the first parameter is an address book URI #. * and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:626 +#: ../backends/eds/lib/edsf-persona-store.vala:689 #, c-format msgid "Couldn't open address book ‘%s’: %s" msgstr "Non foi posíbel abrir a axenda de enderezos «%s»: %s" -#. Translators: the parameter is an address book URI. -#: ../backends/eds/lib/edsf-persona-store.vala:636 -#, c-format -msgid "Couldn't open address book ‘%s’." -msgstr "Non foi posíbel abrir a axenda de enderezos: «%s»." - #. Translators: the parameteter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:698 -#: ../backends/eds/lib/edsf-persona-store.vala:725 +#: ../backends/eds/lib/edsf-persona-store.vala:754 +#: ../backends/eds/lib/edsf-persona-store.vala:785 #, c-format msgid "Couldn't get address book capabilities: %s" msgstr "Non foi posíbel obter as capacidades da axenda de enderezos: %s." #. Translators: the parameter is an address book URI. -#: ../backends/eds/lib/edsf-persona-store.vala:738 +#: ../backends/eds/lib/edsf-persona-store.vala:802 #, c-format msgid "Couldn't get view for address book ‘%s’." msgstr "Non foi posíbel obter a vista para a axenda de enderezos «%s»." #. Translators: the first parameter is an address book URI #. * and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:815 +#: ../backends/eds/lib/edsf-persona-store.vala:884 #, c-format msgid "Couldn't get view for address book ‘%s’: %s" msgstr "Non foi posíbel obter a vista para a axenda de enderezos «%s»: %s" -#: ../backends/eds/lib/edsf-persona-store.vala:1045 +#: ../backends/eds/lib/edsf-persona-store.vala:1247 #, c-format msgid "Changing the ‘%s’ property failed due to reaching the timeout." msgstr "" "Produciuse un fallo ao cambiar a propiedade «%s» porque expirou o tempo." -#: ../backends/eds/lib/edsf-persona-store.vala:1067 +#: ../backends/eds/lib/edsf-persona-store.vala:1278 #: ../folks/avatar-details.vala:59 msgid "Avatar is not writeable on this contact." msgstr "Non é posíbel escribir o avatar neste contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1088 -#: ../folks/web-service-details.vala:118 +#: ../backends/eds/lib/edsf-persona-store.vala:1299 +#: ../folks/web-service-details.vala:123 msgid "Web service addresses are not writeable on this contact." msgstr "Non é posíbel escribir os enderezos de servizos web neste contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1129 -#: ../folks/url-details.vala:148 +#: ../backends/eds/lib/edsf-persona-store.vala:1335 +#: ../folks/url-details.vala:152 msgid "URLs are not writeable on this contact." msgstr "Non é posíbel escribir os URL neste contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1207 +#: ../backends/eds/lib/edsf-persona-store.vala:1413 #: ../folks/local-id-details.vala:64 msgid "Local IDs are not writeable on this contact." msgstr "Os ID locais non son escribíbeis neste contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1239 +#: ../backends/eds/lib/edsf-persona-store.vala:1440 msgid "The contact cannot be marked as favourite." msgstr "Non é posíbel marcar o contacto como favorito." #. Translators: the parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:1314 +#: ../backends/eds/lib/edsf-persona-store.vala:1507 #, c-format msgid "Can't update avatar: %s" msgstr "Non foi posíbel actualizar o avatar: %s" -#: ../backends/eds/lib/edsf-persona-store.vala:1325 -#: ../folks/email-details.vala:115 +#: ../backends/eds/lib/edsf-persona-store.vala:1518 +#: ../folks/email-details.vala:120 msgid "E-mail addresses are not writeable on this contact." msgstr "" "Non é posíbel escribir os enderezos de correo electrónico neste contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1339 -#: ../folks/phone-details.vala:223 +#: ../backends/eds/lib/edsf-persona-store.vala:1532 +#: ../folks/phone-details.vala:229 msgid "Phone numbers are not writeable on this contact." msgstr "Non é posíbel escribir os números de teléfono neste contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1353 -#: ../folks/postal-address-details.vala:335 +#: ../backends/eds/lib/edsf-persona-store.vala:1546 +#: ../folks/postal-address-details.vala:361 msgid "Postal addresses are not writeable on this contact." msgstr "Non é posíbel escribir o enderezo postal neste contacto" -#: ../backends/eds/lib/edsf-persona-store.vala:1420 +#: ../backends/eds/lib/edsf-persona-store.vala:1613 #: ../folks/name-details.vala:281 msgid "Full name is not writeable on this contact." msgstr "Non é posíbel escribir o nome completo neste contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1441 +#: ../backends/eds/lib/edsf-persona-store.vala:1635 #: ../folks/name-details.vala:319 msgid "Nickname is not writeable on this contact." msgstr "Non é escribíbel o alcume neste contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1462 -#: ../folks/note-details.vala:141 +#: ../backends/eds/lib/edsf-persona-store.vala:1657 +#: ../folks/note-details.vala:136 msgid "Notes are not writeable on this contact." msgstr "Non é posíbel escribir as notas neste contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1491 +#: ../backends/eds/lib/edsf-persona-store.vala:1686 #: ../folks/birthday-details.vala:60 msgid "Birthday is not writeable on this contact." msgstr "Non é posíble escribir o cumpreanos neste contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1530 -#: ../folks/role-details.vala:255 +#: ../backends/eds/lib/edsf-persona-store.vala:1730 +#: ../folks/role-details.vala:277 msgid "Roles are not writeable on this contact." msgstr "Non é posíbel escribir os roles neste contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1631 +#: ../backends/eds/lib/edsf-persona-store.vala:1831 #: ../folks/name-details.vala:244 msgid "Structured name is not writeable on this contact." msgstr "Non é posíbel escribir o nome estruturado neste contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1665 -#: ../folks/im-details.vala:130 +#: ../backends/eds/lib/edsf-persona-store.vala:1871 +#: ../folks/im-details.vala:136 msgid "IM addresses are not writeable on this contact." msgstr "Non é posíbel escribir os enderezos IM neste contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1715 +#: ../backends/eds/lib/edsf-persona-store.vala:1921 #: ../folks/group-details.vala:168 msgid "Groups are not writeable on this contact." msgstr "Os grupos non son escribíbeis neste contacto." -#: ../backends/eds/lib/edsf-persona-store.vala:1745 +#: ../backends/eds/lib/edsf-persona-store.vala:1951 #: ../folks/gender-details.vala:77 msgid "Gender is not writeable on this contact." msgstr "Non é posíbel escribir o xénero neste contacto." @@ -194,7 +188,7 @@ #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error #. * message. -#: ../backends/eds/lib/edsf-persona-store.vala:1879 +#: ../backends/eds/lib/edsf-persona-store.vala:2100 #, c-format msgid "Property ‘%s’ is not writeable: %s" msgstr "Non é posíbel escribir na propiedade «%s»: %s" @@ -202,28 +196,28 @@ #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error #. * message. -#: ../backends/eds/lib/edsf-persona-store.vala:1888 +#: ../backends/eds/lib/edsf-persona-store.vala:2109 #, c-format msgid "Invalid value for property ‘%s’: %s" msgstr "Valor non válido para a propiedade «%s»: %s" #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:1914 +#: ../backends/eds/lib/edsf-persona-store.vala:2135 #, c-format msgid "Unknown error setting property ‘%s’: %s" msgstr "Produciuse un erro descoñecido ao estabelecer a propiedade «%s»: %s" #. Translators: the first parameter is a filename, #. * and the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:205 +#: ../backends/key-file/kf-persona-store.vala:224 #, c-format msgid "The relationship key file '%s' could not be loaded: %s" msgstr "Non é posíbel cargar o ficheiro de relación de chaves «%s»: %s" #. Translators: the first parameter is a path, and #. * the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:227 +#: ../backends/key-file/kf-persona-store.vala:246 #, c-format msgid "The relationship key file directory '%s' could not be created: %s" msgstr "" @@ -231,14 +225,14 @@ #. Translators: the first parameter is a filename, #. * and the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:251 +#: ../backends/key-file/kf-persona-store.vala:270 #, c-format msgid "The relationship key file '%s' could not be created: %s" msgstr "Non é posíbel crear o ficheiro de relación de chaves «%s»: %s" #. Translators: the first parameter is a filename, the second is #. * an error message. -#: ../backends/key-file/kf-persona-store.vala:436 +#: ../backends/key-file/kf-persona-store.vala:463 #, c-format msgid "Could not write updated key file '%s': %s" msgstr "Non foi posíbel escribir no ficheiro de chaves actualizadas «%s»: %s" @@ -248,97 +242,97 @@ #. * an IM address (e.g. “foo@jabber.org”), the second is #. * the name of a protocol (e.g. “jabber”) and the third is #. * an error message. -#: ../backends/key-file/kf-persona.vala:169 +#: ../backends/key-file/kf-persona.vala:171 #, c-format msgid "Invalid IM address ‘%s’ for protocol ‘%s’: %s" msgstr "Enderezo IM «%s» non válido para o protocolo «%s»: %s" #. Translators: the parameter is an error message. -#: ../backends/key-file/kf-persona.vala:357 +#: ../backends/key-file/kf-persona.vala:364 #, c-format msgid "Couldn't load data from key file: %s" msgstr "Non foi posíbel cargar os datos desde o ficheiro de chaves: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:504 +#: ../backends/telepathy/lib/tp-lowlevel.c:508 #, c-format msgid "Error requesting a group channel: %s" msgstr "Produciuse un erro ao solicitar a canle de grupos: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:522 +#: ../backends/telepathy/lib/tp-lowlevel.c:526 #, c-format msgid "Error requesting group handles: %s" msgstr "Produciuse un erro ao solicitar o xestor de grupo: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:560 +#: ../backends/telepathy/lib/tp-lowlevel.c:564 #, c-format msgid "Failed to change contact's alias: %s" msgstr "Produciuse un erro ao cambiar o alias do contacto: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:619 +#: ../backends/telepathy/lib/tp-lowlevel.c:623 #, c-format msgid "Failed to create group channel: %s" msgstr "Produciuse un fallo ao crear a canle de grupo: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:651 +#: ../backends/telepathy/lib/tp-lowlevel.c:655 #, c-format msgid "Get Channels property failed: %s" msgstr "Produciuse un fallo ao obter a propiedade Canles: %s" #. Translators: the first parameter is a group channel identifier and the #. * second is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:693 +#: ../backends/telepathy/lib/tp-lowlevel.c:697 #, c-format msgid "Failed to add contact to group '%s': %s" msgstr "Produciuse un fallo ao engadiro o contacto ao grupo «%s»: %s" #. Translators: the first parameter is a group channel identifier and the #. * second is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:709 +#: ../backends/telepathy/lib/tp-lowlevel.c:713 #, c-format msgid "Failed to remove contact from group '%s': %s" msgstr "Produciuse un fallo ao quitar o contacto do grupo «%s»: %s" #. Translators: the first parameter is a pointer address and the #. * second is a contact handle (numeric identifier). -#: ../backends/telepathy/lib/tp-lowlevel.c:732 +#: ../backends/telepathy/lib/tp-lowlevel.c:736 #, c-format msgid "Invalid group channel %p to add handle %d to." msgstr "Canle de grupo %p non válida onde engadir un xestor %d " -#: ../backends/telepathy/lib/tpf-persona-store.vala:596 +#: ../backends/telepathy/lib/tpf-persona-store.vala:637 msgid "Couldn't connect to the telepathy-logger service." msgstr "Non foi posíbel conectarse ao servizo «telepathy-logger»." -#: ../backends/telepathy/lib/tpf-persona-store.vala:631 +#: ../backends/telepathy/lib/tpf-persona-store.vala:676 msgid "Lost connection to the telepathy-logger service." msgstr "Conexión co servizo «telepathy-logger» perdida." #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:663 -#: ../backends/telepathy/lib/tpf-persona-store.vala:675 +#: ../backends/telepathy/lib/tpf-persona-store.vala:708 +#: ../backends/telepathy/lib/tpf-persona-store.vala:720 #, c-format msgid "Couldn't get list of favorite contacts: %s" msgstr "Non foi posíbel obter a lista de contactos favoritos: %s" #. Translators: the parameter is an identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:712 +#: ../backends/telepathy/lib/tpf-persona-store.vala:757 #, c-format msgid "Unknown Telepathy contact ‘%s’ in favorites list." msgstr "Contacto «%s» de Telepathy descoñecido na lista de favoritos." #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:743 +#: ../backends/telepathy/lib/tpf-persona-store.vala:788 #, c-format msgid "Couldn't add favorite contacts: %s" msgstr "Non foi posíbel engadir aos contactos favoritos: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:764 +#: ../backends/telepathy/lib/tpf-persona-store.vala:809 #, c-format msgid "Couldn't remove favorite contacts: %s" msgstr "Non foi posíbel elimianr os contactos favoritos: %s" @@ -346,7 +340,7 @@ #. Translators: the first parameter is the display name for #. * the Telepathy account, and the second is an error #. * message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:884 +#: ../backends/telepathy/lib/tpf-persona-store.vala:935 #, c-format msgid "" "Failed to determine whether we can set aliases on Telepathy account '%s': %s" @@ -357,7 +351,7 @@ #. Translators: the first parameter is the display name for #. * the Telepathy account, and the second is an error #. * message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:937 +#: ../backends/telepathy/lib/tpf-persona-store.vala:988 #, c-format msgid "" "Failed to determine whether we can set groups on Telepathy account '%s': %s" @@ -367,20 +361,20 @@ #. Translators: the first parameter is a Telepathy handle, #. * and the second is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1114 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1166 #, c-format msgid "Failed to create contact for self handle '%u': %s" msgstr "Produciuse un fallo ao crear o contacto para o xestor propio «%u»: %s" #. Translators: do not translate "NewChannels", as it's a D-Bus #. * signal name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1145 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1197 msgid "Error creating channel for NewChannels signal." msgstr "Produciuse un erro ao crear a canle do sinal NewChannels" #. Translators: the parameter is a persona identifier and #. * the second parameter is a group name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1184 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1236 #, c-format msgid "Failed to add Telepathy contact ‘%s’ to group ‘%s’." msgstr "" @@ -388,13 +382,13 @@ #. Translators: the parameter is a persona identifier #. * and the second parameter is a group name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1192 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1244 #, c-format msgid "Failed to remove Telepathy contact ‘%s’ from group ‘%s’." msgstr "" "Produciuse un fallo ao quitar o contacto «%s» de Telepathy do grupo «%s»." -#: ../backends/telepathy/lib/tpf-persona-store.vala:1546 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1606 msgid "Telepathy contacts representing the local user may not be removed." msgstr "" "Os contactos de Telepathy que representan ao usuario local non se deben " @@ -406,10 +400,10 @@ #. Translators: The first parameter is a contact identifier, #. * the second is a contact list identifier and the third is an #. * error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1560 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1575 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1590 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1764 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1620 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1635 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1650 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1824 #, c-format msgid "Failed to remove Telepathy contact ‘%s’ from ‘%s’ list: %s" msgstr "" @@ -418,7 +412,7 @@ #. Translators: The first parameter is a contact identifier, #. * the second is a contact list identifier and the third is an #. * error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1754 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1814 #, c-format msgid "Failed to add Telepathy contact ‘%s’ to ‘%s’ list: %s" msgstr "" @@ -427,7 +421,7 @@ #. Translators: the first parameter is a channel identifier and #. * the second is an error message.. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1866 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1927 #, c-format msgid "Failed to create incoming Telepathy contacts from channel ‘%s’: %s" msgstr "" @@ -435,7 +429,7 @@ #. Translators: the first two parameters are store identifiers and #. * the third is a contact identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2047 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2165 #, c-format msgid "" "Persona store (%s, %s) requires the following details:\n" @@ -444,27 +438,27 @@ "O almacén de contactos (%s, %s) require os seguintes detalles:\n" " contacto (fornecido: «%s»)\n" -#: ../backends/telepathy/lib/tpf-persona-store.vala:2062 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2180 msgid "Cannot create a new Telepathy contact while offline." msgstr "Non é posíbel crear un contacto de Telepathy novo estando desconectado" #. Translators: the parameter is the number of personas #. * which were returned. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2114 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2232 #, c-format msgid "Requested a single persona, but got %u persona back." msgid_plural "Requested a single persona, but got %u personas back." msgstr[0] "Solicitouse un único contacto, pero obtívose %u contacto." msgstr[1] "Soliciouse un único contacto, pero obtivéronse %u contactos." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2125 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2243 #, c-format msgid "Failed to add a persona from details: %s" msgstr "Produciuse un fallo ao engadir un contacto desde os detalles: %s" #. Translators: "telepathy-logger" is the name of an application, #. * and should not be translated. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2145 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2263 msgid "" "Failed to change favorite without a connection to the telepathy-logger " "service." @@ -473,20 +467,20 @@ "servizo de telepathy-logger" #. Translators: the parameter is a contact identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2163 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2281 #, c-format msgid "Failed to change favorite status for Telepathy contact ‘%s’." msgstr "" "Produciuse un fallo ao cambiar o estado de favorito para o contacto de " "Telepathy «%s»." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2258 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2376 msgid "Extended information may only be set on the user's Telepathy contact." msgstr "" "A información extendida só pode estabelecerse no contacto de Telepathy do " "usuario." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2287 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2405 msgid "" "Extended information cannot be written because the store is disconnected." msgstr "" @@ -496,7 +490,7 @@ #. Translators: the first parameter is the unknown key that #. * was received with the details params, and the second #. * identifies the persona store. -#: ../backends/tracker/lib/trf-persona-store.vala:733 +#: ../backends/tracker/lib/trf-persona-store.vala:739 #, c-format msgid "Unrecognized parameter '%s' passed to persona store '%s'." msgstr "Parametro «%s» non recoñecido pasado polo almacén de persoas «%s»." @@ -507,20 +501,20 @@ #. Translators: the first parameter is a backend name, and the #. * second is an error message. -#: ../folks/backend-store.vala:354 +#: ../folks/backend-store.vala:366 #, c-format msgid "Error preparing Backend '%s': %s" msgstr "Produciuse un erro ao preparar o Backend «%s»: %s" #. Translators: the first parameter is a folder path and the second #. * is an error message. -#: ../folks/backend-store.vala:547 +#: ../folks/backend-store.vala:559 #, c-format msgid "Error listing contents of folder '%s': %s" msgstr "Produciuse un erro ao mostrar os contdios do cartafol «%s»: %s" #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:580 +#: ../folks/backend-store.vala:601 #, c-format msgid "" "The content type of '%s' could not be determined. Have you installed shared-" @@ -531,14 +525,14 @@ #. Translators: the first parameter is a filename and the second is an #. * error message. -#: ../folks/backend-store.vala:603 +#: ../folks/backend-store.vala:629 #, c-format msgid "Failed to load module from path '%s': %s" msgstr "Produciuse un fallo ao cargar o módulo desde a ruta «%s»: %s" #. Translators: the first parameter is a function name, the second is #. * a filename and the third is an error message. -#: ../folks/backend-store.vala:618 +#: ../folks/backend-store.vala:645 #, c-format msgid "Failed to find entry point function '%s' in '%s': %s" msgstr "" @@ -546,13 +540,13 @@ "%s" #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:659 +#: ../folks/backend-store.vala:686 #, c-format msgid "File or directory '%s' does not exist." msgstr "Non existe o ficheiro ou cartafol «%s»." #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:665 +#: ../folks/backend-store.vala:692 #, c-format msgid "Failed to get content type for '%s'." msgstr "Produciuse un fallo ao obter o tipo de contido para «%s»." @@ -566,56 +560,77 @@ msgstr "Non é posíbel escribir o estado de favorito neste contacto." #. Translators: the parameter is an IM address. -#: ../folks/im-details.vala:172 ../folks/im-details.vala:186 -#: ../folks/im-details.vala:208 ../folks/im-details.vala:235 +#: ../folks/im-details.vala:178 ../folks/im-details.vala:192 +#: ../folks/im-details.vala:214 ../folks/im-details.vala:241 #, c-format msgid "The IM address '%s' could not be understood." msgstr "Non é posíbel entender o enderezo de IM «%s»." #. Translators: the first parameter is a persona store identifier #. * and the second is an error message. -#: ../folks/individual-aggregator.vala:699 +#: ../folks/individual-aggregator.vala:782 #, c-format msgid "Error preparing persona store '%s': %s" msgstr "Produciuse un erro ao preparar o almacén de contactos «%s»: %s" #. Translators: the parameter is a property name. -#: ../folks/individual-aggregator.vala:893 -#: ../folks/individual-aggregator.vala:1075 +#: ../folks/individual-aggregator.vala:977 +#: ../folks/individual-aggregator.vala:1160 #, c-format msgid "Unknown property '%s' in linkable property list." msgstr "Propiedade «%s» descoñecida na lista ligábel de propiedades." #. Translators: the first parameter is a store identifier #. * and the second parameter is an error message. -#: ../folks/individual-aggregator.vala:1495 +#: ../folks/individual-aggregator.vala:1580 #, c-format msgid "Failed to add contact for persona store ID '%s': %s" msgstr "" "Produciuse un fallo ao engadir o contacto para o ID de almacenamento de " "contacto «%s»: %s" -#: ../folks/individual-aggregator.vala:1576 -msgid "Can't link personas with no primary store." -msgstr "Non é posíbel ligar contactos sen almacén primario." +#: ../folks/individual-aggregator.vala:1661 +msgid "Can’t link personas with no primary store." +msgstr "Non é posíbel ligar os contactos sen un almacén primario" + +#: ../folks/individual-aggregator.vala:1662 +#: ../folks/individual-aggregator.vala:1927 +#, c-format +msgid "" +"Persona store ‘%s:%s’ is configured as primary, but could not be found or " +"failed to load." +msgstr "" +"O almacén de contactos «%s:%s» está configurado como primario, pero non se " +"atopou ou fallou ao cargar." + +#: ../folks/individual-aggregator.vala:1663 +#: ../folks/individual-aggregator.vala:1928 +#, c-format +msgid "" +"Check the service providing the persona store is running, or change the " +"default store in that service or using the “%s” GConf key." +msgstr "" +"Comprobe que o servizo que fornece o almacén de contactos estea " +"executándose, ou modifique o almacén predeterminado nese servizo usando a " +"chave de GConf «%s»." -#: ../folks/individual-aggregator.vala:1833 -msgid "Can't add personas with no primary store." +#: ../folks/individual-aggregator.vala:1926 +msgid "Can’t add personas with no primary store." msgstr "Non é posíbel engadir contactos sen almacén primario." -#: ../folks/individual-aggregator.vala:1838 +#: ../folks/individual-aggregator.vala:1935 #, c-format msgid "Can't write to requested property (“%s”) of the writeable store." msgstr "" "Non é posíbel escribir a propiedade solicitada (\"%s\") do almacen " "escribíbel." -#: ../folks/postal-address-details.vala:211 +#: ../folks/postal-address-details.vala:231 #, c-format msgid "%s, %s, %s, %s, %s, %s, %s" msgstr "%s, %s, %s, %s, %s, %s, %s" -#: ../folks/role-details.vala:133 +#: ../folks/role-details.vala:148 #, c-format msgid "Title: %s, Organisation: %s, Role: %s" msgstr "Título: %s, organización: %s, rol: %s" @@ -770,6 +785,9 @@ "Non se recoñeceu o nome «%s» do motor de orixe. Actualmente %s é o único de " "motor orixe admitido." +#~ msgid "Couldn't open address book ‘%s’." +#~ msgstr "Non foi posíbel abrir a axenda de enderezos: «%s»." + #~ msgid "Failed to remove persona '%s' (%s) from 'stored' list: %s" #~ msgstr "" #~ "Produciuse un fallo ao quitar o contacto «%s» (%s) da lista «stored»: %s" diff -Nru folks-0.6.6/po/LINGUAS folks-0.6.7/po/LINGUAS --- folks-0.6.6/po/LINGUAS 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/po/LINGUAS 2012-02-18 00:46:31.000000000 +0000 @@ -5,6 +5,9 @@ eo es gl +nb pl +pt_BR sl sv +zh_CN diff -Nru folks-0.6.6/po/nb.po folks-0.6.7/po/nb.po --- folks-0.6.6/po/nb.po 1970-01-01 00:00:00.000000000 +0000 +++ folks-0.6.7/po/nb.po 2011-12-22 18:18:11.000000000 +0000 @@ -0,0 +1,724 @@ +# Norwegian bokmål translation of folks. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Kjartan Maraas , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: folks 0.6.x\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-12-19 09:14+0100\n" +"PO-Revision-Date: 2011-12-19 09:27+0100\n" +"Last-Translator: Kjartan Maraas \n" +"Language-Team: Norwegian bokmål \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" + +#. Translators: the first parameter is an address book +#. * URI and the second is a persona UID. +#: ../backends/eds/lib/edsf-persona-store.vala:495 +#, c-format +msgid "Address book ‘%s’ is offline, so contact ‘%s’ cannot be removed." +msgstr "Adressebok «%s» er frakoblet så kontakt «%s» kan ikke fjernes." + +#. Translators: the first parameter is an address book +#. * URI and the second is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:501 +#, c-format +msgid "Permission denied to remove contact ‘%s’: %s" +msgstr "" + +#. Translators: the parameter is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:506 +#, c-format +msgid "Removing contacts isn't supported by this persona store: %s" +msgstr "" + +#: ../backends/eds/lib/edsf-persona-store.vala:535 +#, c-format +msgid "Can't remove contact ‘%s’: %s" +msgstr "Kan ikke fjerne kontakt «%s»: %s" + +#. Translators: the parameter is an address book +#. * URI. +#: ../backends/eds/lib/edsf-persona-store.vala:605 +#: ../backends/eds/lib/edsf-persona-store.vala:807 +#, c-format +msgid "Address book ‘%s’ is offline." +msgstr "Adressebok «%s» er frakoblet." + +#. Translators: the first parameter is an address +#. * book URI and the second is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:610 +#: ../backends/eds/lib/edsf-persona-store.vala:812 +#, c-format +msgid "Permission denied to open address book ‘%s’: %s" +msgstr "" + +#. Translators: the first parameter is an address book URI +#. * and the second is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:643 +#, c-format +msgid "Couldn't open address book ‘%s’: %s" +msgstr "Kunne ikke åpne adressebok «%s»: %s" + +#. Translators: the parameter is an address book URI. +#: ../backends/eds/lib/edsf-persona-store.vala:658 +#, c-format +msgid "Couldn't open address book ‘%s’." +msgstr "Kunne ikke åpne adressebok «%s»." + +#. Translators: the parameteter is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:720 +#: ../backends/eds/lib/edsf-persona-store.vala:751 +#, c-format +msgid "Couldn't get address book capabilities: %s" +msgstr "" + +#. Translators: the parameter is an address book URI. +#: ../backends/eds/lib/edsf-persona-store.vala:768 +#, c-format +msgid "Couldn't get view for address book ‘%s’." +msgstr "" + +#. Translators: the first parameter is an address book URI +#. * and the second is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:845 +#, c-format +msgid "Couldn't get view for address book ‘%s’: %s" +msgstr "" + +#: ../backends/eds/lib/edsf-persona-store.vala:1080 +#, c-format +msgid "Changing the ‘%s’ property failed due to reaching the timeout." +msgstr "" + +#: ../backends/eds/lib/edsf-persona-store.vala:1102 +#: ../folks/avatar-details.vala:59 +msgid "Avatar is not writeable on this contact." +msgstr "Avatar er ikke skrivbar på denne kontakten." + +#: ../backends/eds/lib/edsf-persona-store.vala:1123 +#: ../folks/web-service-details.vala:117 +msgid "Web service addresses are not writeable on this contact." +msgstr "" + +#: ../backends/eds/lib/edsf-persona-store.vala:1164 +#: ../folks/url-details.vala:147 +msgid "URLs are not writeable on this contact." +msgstr "URLer er ikke skrivbare på denne kontakten." + +#: ../backends/eds/lib/edsf-persona-store.vala:1242 +#: ../folks/local-id-details.vala:64 +msgid "Local IDs are not writeable on this contact." +msgstr "Lokale IDer er ikke skrivbare på denne kontakten." + +#: ../backends/eds/lib/edsf-persona-store.vala:1274 +msgid "The contact cannot be marked as favourite." +msgstr "Kontakten kan ikke merkes som favoritt." + +#. Translators: the parameter is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:1349 +#, c-format +msgid "Can't update avatar: %s" +msgstr "Kan ikke oppdatere avatar: %s" + +#: ../backends/eds/lib/edsf-persona-store.vala:1360 +#: ../folks/email-details.vala:115 +msgid "E-mail addresses are not writeable on this contact." +msgstr "E-postadresser er ikke skrivbare på denne kontakten." + +#: ../backends/eds/lib/edsf-persona-store.vala:1374 +#: ../folks/phone-details.vala:222 +msgid "Phone numbers are not writeable on this contact." +msgstr "Telefonnummer er ikke skrivbare på denne kontakten." + +#: ../backends/eds/lib/edsf-persona-store.vala:1388 +#: ../folks/postal-address-details.vala:336 +msgid "Postal addresses are not writeable on this contact." +msgstr "Postadresser er ikke skrivbare på denne kontakten." + +#: ../backends/eds/lib/edsf-persona-store.vala:1455 +#: ../folks/name-details.vala:281 +msgid "Full name is not writeable on this contact." +msgstr "Fullt navn er ikke skrivbart på denne kontakten." + +#: ../backends/eds/lib/edsf-persona-store.vala:1476 +#: ../folks/name-details.vala:319 +msgid "Nickname is not writeable on this contact." +msgstr "Kallenavn er ikke skrivbart på denne kontakten." + +#: ../backends/eds/lib/edsf-persona-store.vala:1497 +#: ../folks/note-details.vala:138 +msgid "Notes are not writeable on this contact." +msgstr "Notater er ikke skrivbare på denne kontakten." + +#: ../backends/eds/lib/edsf-persona-store.vala:1526 +#: ../folks/birthday-details.vala:60 +msgid "Birthday is not writeable on this contact." +msgstr "Fødselsdag er ikke skrivbar på denne kontakten." + +#: ../backends/eds/lib/edsf-persona-store.vala:1565 +#: ../folks/role-details.vala:256 +msgid "Roles are not writeable on this contact." +msgstr "Roller er ikke skrivbare på denne kontakten." + +#: ../backends/eds/lib/edsf-persona-store.vala:1666 +#: ../folks/name-details.vala:244 +msgid "Structured name is not writeable on this contact." +msgstr "Strukturert navn er ikke skrivbart på denne kontakten." + +#: ../backends/eds/lib/edsf-persona-store.vala:1700 +#: ../folks/im-details.vala:130 +msgid "IM addresses are not writeable on this contact." +msgstr "" + +#: ../backends/eds/lib/edsf-persona-store.vala:1750 +#: ../folks/group-details.vala:168 +msgid "Groups are not writeable on this contact." +msgstr "Grupper er ikke skrivbare på denne kontakten." + +#: ../backends/eds/lib/edsf-persona-store.vala:1780 +#: ../folks/gender-details.vala:77 +msgid "Gender is not writeable on this contact." +msgstr "Kjønn er ikke skrivbart på denne kontakten." + +#. Translators: the first parameter is a non-human-readable +#. * property name and the second parameter is an error +#. * message. +#: ../backends/eds/lib/edsf-persona-store.vala:1914 +#, c-format +msgid "Property ‘%s’ is not writeable: %s" +msgstr "Egenskap «%s» er ikke skrivbar: %s" + +#. Translators: the first parameter is a non-human-readable +#. * property name and the second parameter is an error +#. * message. +#: ../backends/eds/lib/edsf-persona-store.vala:1923 +#, c-format +msgid "Invalid value for property ‘%s’: %s" +msgstr "Ugyldig verdi for egenskap «%s»: %s" + +#. Translators: the first parameter is a non-human-readable +#. * property name and the second parameter is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:1949 +#, c-format +msgid "Unknown error setting property ‘%s’: %s" +msgstr "Ukjent feil ved setting av egenskap «%s»: %s" + +#. Translators: the first parameter is a filename, +#. * and the second is an error message. +#: ../backends/key-file/kf-persona-store.vala:224 +#, c-format +msgid "The relationship key file '%s' could not be loaded: %s" +msgstr "" + +#. Translators: the first parameter is a path, and +#. * the second is an error message. +#: ../backends/key-file/kf-persona-store.vala:246 +#, c-format +msgid "The relationship key file directory '%s' could not be created: %s" +msgstr "" + +#. Translators: the first parameter is a filename, +#. * and the second is an error message. +#: ../backends/key-file/kf-persona-store.vala:270 +#, c-format +msgid "The relationship key file '%s' could not be created: %s" +msgstr "" + +#. Translators: the first parameter is a filename, the second is +#. * an error message. +#: ../backends/key-file/kf-persona-store.vala:463 +#, c-format +msgid "Could not write updated key file '%s': %s" +msgstr "" + +#. Translators: this is an error message for if the user +#. * provides an invalid IM address. The first parameter is +#. * an IM address (e.g. “foo@jabber.org”), the second is +#. * the name of a protocol (e.g. “jabber”) and the third is +#. * an error message. +#: ../backends/key-file/kf-persona.vala:171 +#, c-format +msgid "Invalid IM address ‘%s’ for protocol ‘%s’: %s" +msgstr "" + +#. Translators: the parameter is an error message. +#: ../backends/key-file/kf-persona.vala:364 +#, c-format +msgid "Couldn't load data from key file: %s" +msgstr "Kunne ikke laste data fra nøkkelfil: %s" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:508 +#, c-format +msgid "Error requesting a group channel: %s" +msgstr "" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:526 +#, c-format +msgid "Error requesting group handles: %s" +msgstr "" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:564 +#, c-format +msgid "Failed to change contact's alias: %s" +msgstr "" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:623 +#, c-format +msgid "Failed to create group channel: %s" +msgstr "" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:655 +#, c-format +msgid "Get Channels property failed: %s" +msgstr "" + +#. Translators: the first parameter is a group channel identifier and the +#. * second is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:697 +#, c-format +msgid "Failed to add contact to group '%s': %s" +msgstr "" + +#. Translators: the first parameter is a group channel identifier and the +#. * second is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:713 +#, c-format +msgid "Failed to remove contact from group '%s': %s" +msgstr "" + +#. Translators: the first parameter is a pointer address and the +#. * second is a contact handle (numeric identifier). +#: ../backends/telepathy/lib/tp-lowlevel.c:736 +#, c-format +msgid "Invalid group channel %p to add handle %d to." +msgstr "" + +#: ../backends/telepathy/lib/tpf-persona-store.vala:634 +msgid "Couldn't connect to the telepathy-logger service." +msgstr "" + +#: ../backends/telepathy/lib/tpf-persona-store.vala:673 +msgid "Lost connection to the telepathy-logger service." +msgstr "" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:705 +#: ../backends/telepathy/lib/tpf-persona-store.vala:717 +#, c-format +msgid "Couldn't get list of favorite contacts: %s" +msgstr "" + +#. Translators: the parameter is an identifier. +#: ../backends/telepathy/lib/tpf-persona-store.vala:754 +#, c-format +msgid "Unknown Telepathy contact ‘%s’ in favorites list." +msgstr "" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:785 +#, c-format +msgid "Couldn't add favorite contacts: %s" +msgstr "" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:806 +#, c-format +msgid "Couldn't remove favorite contacts: %s" +msgstr "" + +#. Translators: the first parameter is the display name for +#. * the Telepathy account, and the second is an error +#. * message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:932 +#, c-format +msgid "" +"Failed to determine whether we can set aliases on Telepathy account '%s': %s" +msgstr "" + +#. Translators: the first parameter is the display name for +#. * the Telepathy account, and the second is an error +#. * message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:985 +#, c-format +msgid "" +"Failed to determine whether we can set groups on Telepathy account '%s': %s" +msgstr "" + +#. Translators: the first parameter is a Telepathy handle, +#. * and the second is an error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1162 +#, c-format +msgid "Failed to create contact for self handle '%u': %s" +msgstr "" + +#. Translators: do not translate "NewChannels", as it's a D-Bus +#. * signal name. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1193 +msgid "Error creating channel for NewChannels signal." +msgstr "" + +#. Translators: the parameter is a persona identifier and +#. * the second parameter is a group name. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1232 +#, c-format +msgid "Failed to add Telepathy contact ‘%s’ to group ‘%s’." +msgstr "" + +#. Translators: the parameter is a persona identifier +#. * and the second parameter is a group name. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1240 +#, c-format +msgid "Failed to remove Telepathy contact ‘%s’ from group ‘%s’." +msgstr "" + +#: ../backends/telepathy/lib/tpf-persona-store.vala:1602 +msgid "Telepathy contacts representing the local user may not be removed." +msgstr "" + +#. Translators: The first parameter is a contact identifier, the +#. * second is a contact list identifier and the third is an error +#. * message. +#. Translators: The first parameter is a contact identifier, +#. * the second is a contact list identifier and the third is an +#. * error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1616 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1631 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1646 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1820 +#, c-format +msgid "Failed to remove Telepathy contact ‘%s’ from ‘%s’ list: %s" +msgstr "" + +#. Translators: The first parameter is a contact identifier, +#. * the second is a contact list identifier and the third is an +#. * error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1810 +#, c-format +msgid "Failed to add Telepathy contact ‘%s’ to ‘%s’ list: %s" +msgstr "" + +#. Translators: the first parameter is a channel identifier and +#. * the second is an error message.. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1923 +#, c-format +msgid "Failed to create incoming Telepathy contacts from channel ‘%s’: %s" +msgstr "" + +#. Translators: the first two parameters are store identifiers and +#. * the third is a contact identifier. +#: ../backends/telepathy/lib/tpf-persona-store.vala:2154 +#, c-format +msgid "" +"Persona store (%s, %s) requires the following details:\n" +" contact (provided: '%s')\n" +msgstr "" +"Personalager (%s, %s) krever følgende detaljer:\n" +" kontakt (oppgitt: «%s»)\n" + +#: ../backends/telepathy/lib/tpf-persona-store.vala:2169 +msgid "Cannot create a new Telepathy contact while offline." +msgstr "" + +#. Translators: the parameter is the number of personas +#. * which were returned. +#: ../backends/telepathy/lib/tpf-persona-store.vala:2221 +#, c-format +msgid "Requested a single persona, but got %u persona back." +msgid_plural "Requested a single persona, but got %u personas back." +msgstr[0] "Forespurte en enkelt persona, men fikk %u persona tilbake." +msgstr[1] "Forespurte en enkelt persona, men fikk %u personas tilbake." + +#: ../backends/telepathy/lib/tpf-persona-store.vala:2232 +#, c-format +msgid "Failed to add a persona from details: %s" +msgstr "Klarte ikke å legge til persona fra detaljer: %s" + +#. Translators: "telepathy-logger" is the name of an application, +#. * and should not be translated. +#: ../backends/telepathy/lib/tpf-persona-store.vala:2252 +msgid "" +"Failed to change favorite without a connection to the telepathy-logger " +"service." +msgstr "" + +#. Translators: the parameter is a contact identifier. +#: ../backends/telepathy/lib/tpf-persona-store.vala:2270 +#, c-format +msgid "Failed to change favorite status for Telepathy contact ‘%s’." +msgstr "" + +#: ../backends/telepathy/lib/tpf-persona-store.vala:2365 +msgid "Extended information may only be set on the user's Telepathy contact." +msgstr "" + +#: ../backends/telepathy/lib/tpf-persona-store.vala:2394 +msgid "" +"Extended information cannot be written because the store is disconnected." +msgstr "" + +#. Translators: the first parameter is the unknown key that +#. * was received with the details params, and the second +#. * identifies the persona store. +#: ../backends/tracker/lib/trf-persona-store.vala:739 +#, c-format +msgid "Unrecognized parameter '%s' passed to persona store '%s'." +msgstr "" + +#: ../folks/alias-details.vala:57 +msgid "Alias is not writeable on this contact." +msgstr "Alias er ikke skrivbart på denne kontakten." + +#. Translators: the first parameter is a backend name, and the +#. * second is an error message. +#: ../folks/backend-store.vala:359 +#, c-format +msgid "Error preparing Backend '%s': %s" +msgstr "Feil ved forberedelse av motor «%s»: %s" + +#. Translators: the first parameter is a folder path and the second +#. * is an error message. +#: ../folks/backend-store.vala:552 +#, c-format +msgid "Error listing contents of folder '%s': %s" +msgstr "" + +#. Translators: the parameter is a filename. +#: ../folks/backend-store.vala:585 +#, c-format +msgid "" +"The content type of '%s' could not be determined. Have you installed shared-" +"mime-info?" +msgstr "" + +#. Translators: the first parameter is a filename and the second is an +#. * error message. +#: ../folks/backend-store.vala:608 +#, c-format +msgid "Failed to load module from path '%s': %s" +msgstr "Klarte ikke å laste modul fra sti «%s»: %s" + +#. Translators: the first parameter is a function name, the second is +#. * a filename and the third is an error message. +#: ../folks/backend-store.vala:623 +#, c-format +msgid "Failed to find entry point function '%s' in '%s': %s" +msgstr "" + +#. Translators: the parameter is a filename. +#: ../folks/backend-store.vala:664 +#, c-format +msgid "File or directory '%s' does not exist." +msgstr "Fil eller katalog «%s» eksisterer ikke." + +#. Translators: the parameter is a filename. +#: ../folks/backend-store.vala:670 +#, c-format +msgid "Failed to get content type for '%s'." +msgstr "Klarte ikke å finne innholdstype for «%s»." + +#: ../folks/birthday-details.vala:89 +msgid "Birthday event ID is not writeable on this contact." +msgstr "" + +#: ../folks/favourite-details.vala:52 +msgid "Favorite status is not writeable on this contact." +msgstr "" + +#. Translators: the parameter is an IM address. +#: ../folks/im-details.vala:172 ../folks/im-details.vala:186 +#: ../folks/im-details.vala:208 ../folks/im-details.vala:235 +#, c-format +msgid "The IM address '%s' could not be understood." +msgstr "" + +#. Translators: the first parameter is a persona store identifier +#. * and the second is an error message. +#: ../folks/individual-aggregator.vala:720 +#, c-format +msgid "Error preparing persona store '%s': %s" +msgstr "" + +#. Translators: the parameter is a property name. +#: ../folks/individual-aggregator.vala:914 +#: ../folks/individual-aggregator.vala:1096 +#, c-format +msgid "Unknown property '%s' in linkable property list." +msgstr "" + +#. Translators: the first parameter is a store identifier +#. * and the second parameter is an error message. +#: ../folks/individual-aggregator.vala:1516 +#, c-format +msgid "Failed to add contact for persona store ID '%s': %s" +msgstr "" + +#: ../folks/individual-aggregator.vala:1597 +msgid "Can't link personas with no primary store." +msgstr "Kan ikke lenke personas uten primærlager." + +#: ../folks/individual-aggregator.vala:1854 +msgid "Can't add personas with no primary store." +msgstr "Kan ikke legge til personas uten primærlager." + +#: ../folks/individual-aggregator.vala:1859 +#, c-format +msgid "Can't write to requested property (“%s”) of the writeable store." +msgstr "" + +#: ../folks/postal-address-details.vala:211 +#, c-format +msgid "%s, %s, %s, %s, %s, %s, %s" +msgstr "%s, %s, %s, %s, %s, %s, %s" + +#: ../folks/role-details.vala:133 +#, c-format +msgid "Title: %s, Organisation: %s, Role: %s" +msgstr "Tittel: %s, organisasjon: %s, rolle: %s" + +#. Translators: the parameter is a filename. +#: ../tools/import-pidgin.vala:48 +#, c-format +msgid "File %s does not exist." +msgstr "Fil %s eksisterer ikke." + +#. Translators: the first parameter is a filename, and the second +#. * is an error message. +#: ../tools/import-pidgin.vala:64 +#, c-format +msgid "Failed to get information about file %s: %s" +msgstr "" + +#. Translators: the parameter is a filename. +#: ../tools/import-pidgin.vala:71 +#, c-format +msgid "File %s is not readable." +msgstr "Fil %s er ikke lesbar." + +#. Translators: the parameter is a filename. +#: ../tools/import-pidgin.vala:81 +#, c-format +msgid "The Pidgin buddy list file '%s' could not be loaded." +msgstr "" + +#. Translators: the parameter is a filename. +#: ../tools/import-pidgin.vala:96 +#, c-format +msgid "" +"The Pidgin buddy list file ‘%s’ could not be loaded: the root element could " +"not be found or was not recognized." +msgstr "" + +#. Translators: the first parameter is the number of buddies which +#. * were successfully imported, and the second is a filename. +#: ../tools/import-pidgin.vala:116 +#, c-format +msgid "Imported %u buddy from '%s'." +msgid_plural "Imported %u buddies from '%s'." +msgstr[0] "Importerte %u venn fra «%s»." +msgstr[1] "Importerte %u venner fra «%s»." + +#. Translators: the first parameter is a persona identifier, +#. * and the second is an error message. +#: ../tools/import-pidgin.vala:163 +#, c-format +msgid "Error changing group of contact ‘%s’: %s" +msgstr "Feil ved endring av gruppe for kontakt «%s»: %s" + +#. Translators: the parameter is the buddy's IM address. +#: ../tools/import-pidgin.vala:219 +#, c-format +msgid "" +"Ignoring buddy with no alias and only one IM address:\n" +"%s" +msgstr "" + +#: ../tools/import-pidgin.vala:243 +#, c-format +msgid "" +"Failed to create new contact for buddy with alias ‘%s’ and IM addresses:\n" +"%s\n" +"Error: %s\n" +msgstr "" + +#. Translators: the first parameter is a persona identifier, the +#. * second is an alias for the persona, and the third is a set of IM +#. * addresses each on a new line. +#: ../tools/import-pidgin.vala:257 +#, c-format +msgid "" +"Created contact ‘%s’ for buddy with alias ‘%s’ and IM addresses:\n" +"%s" +msgstr "" + +#: ../tools/import.vala:44 +msgid "Source backend name (default: 'pidgin')" +msgstr "" + +#: ../tools/import.vala:47 +msgid "Source filename (default: specific to source backend)" +msgstr "" + +#: ../tools/import.vala:57 +msgid "— import meta-contact information to libfolks" +msgstr "" + +#. Translators: the parameter is an error message. +#: ../tools/import.vala:67 +#, c-format +msgid "Couldn't parse command line options: %s" +msgstr "" + +#. Translators: the parameter is an error message. +#: ../tools/import.vala:108 +#, c-format +msgid "Couldn't load the backends: %s" +msgstr "" + +#. Translators: the parameter is a backend identifier. +#: ../tools/import.vala:119 +#, c-format +msgid "Couldn't load the ‘%s’ backend." +msgstr "" + +#. Translators: the first parameter is a backend identifier and the +#. * second parameter is an error message. +#: ../tools/import.vala:132 +#, c-format +msgid "Couldn't prepare the ‘%s’ backend: %s" +msgstr "" + +#. Translators: the parameter is a backend identifier. +#: ../tools/import.vala:145 +#, c-format +msgid "Couldn't load the ‘%s’ backend's persona store." +msgstr "" + +#: ../tools/import.vala:166 +#, c-format +msgid "Couldn't prepare the ‘%s’ backend's persona store: %s" +msgstr "" + +#. Translators: the parameter is an error message. +#: ../tools/import.vala:184 +#, c-format +msgid "Error importing contacts: %s" +msgstr "" + +#. Translators: both parameters are identifiers for backends. +#: ../tools/import.vala:198 +#, c-format +msgid "" +"Unrecognized source backend name ‘%s’. ‘%s’ is currently the only supported " +"source backend." +msgstr "" diff -Nru folks-0.6.6/po/pl.po folks-0.6.7/po/pl.po --- folks-0.6.6/po/pl.po 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/po/pl.po 2012-02-18 00:46:31.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: folks\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-10-26 20:18+0200\n" -"PO-Revision-Date: 2011-10-26 20:19+0200\n" +"POT-Creation-Date: 2012-02-02 19:18+0100\n" +"PO-Revision-Date: 2012-02-02 19:15+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -23,7 +23,7 @@ #. Translators: the first parameter is an address book #. * URI and the second is a persona UID. -#: ../backends/eds/lib/edsf-persona-store.vala:480 +#: ../backends/eds/lib/edsf-persona-store.vala:533 #, c-format msgid "Address book ‘%s’ is offline, so contact ‘%s’ cannot be removed." msgstr "" @@ -32,165 +32,159 @@ #. Translators: the first parameter is an address book #. * URI and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:486 +#: ../backends/eds/lib/edsf-persona-store.vala:539 #, c-format msgid "Permission denied to remove contact ‘%s’: %s" msgstr "Brak uprawnień, aby usunąć kontakt \"%s\": %s" #. Translators: the parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:491 +#: ../backends/eds/lib/edsf-persona-store.vala:544 #, c-format msgid "Removing contacts isn't supported by this persona store: %s" msgstr "" "Usuwanie kontaktów nie jest obsługiwane przez tę przechowalnię osób: %s" -#: ../backends/eds/lib/edsf-persona-store.vala:520 +#: ../backends/eds/lib/edsf-persona-store.vala:573 #, c-format msgid "Can't remove contact ‘%s’: %s" msgstr "Nie można usunąć kontaktu \"%s\": %s" #. Translators: the parameter is an address book #. * URI. -#: ../backends/eds/lib/edsf-persona-store.vala:588 -#: ../backends/eds/lib/edsf-persona-store.vala:777 +#: ../backends/eds/lib/edsf-persona-store.vala:651 +#: ../backends/eds/lib/edsf-persona-store.vala:846 #, c-format msgid "Address book ‘%s’ is offline." msgstr "Książka adresowa \"%s\" jest w trybie offline." #. Translators: the first parameter is an address #. * book URI and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:593 -#: ../backends/eds/lib/edsf-persona-store.vala:782 +#: ../backends/eds/lib/edsf-persona-store.vala:656 +#: ../backends/eds/lib/edsf-persona-store.vala:851 #, c-format msgid "Permission denied to open address book ‘%s’: %s" msgstr "Brak uprawnień, aby otworzyć książkę adresową \"%s\": %s" #. Translators: the first parameter is an address book URI #. * and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:626 +#: ../backends/eds/lib/edsf-persona-store.vala:689 #, c-format msgid "Couldn't open address book ‘%s’: %s" msgstr "Nie można otworzyć książki adresowej \"%s\": %s" -#. Translators: the parameter is an address book URI. -#: ../backends/eds/lib/edsf-persona-store.vala:636 -#, c-format -msgid "Couldn't open address book ‘%s’." -msgstr "Nie można otworzyć książki adresowej \"%s\"." - #. Translators: the parameteter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:698 -#: ../backends/eds/lib/edsf-persona-store.vala:725 +#: ../backends/eds/lib/edsf-persona-store.vala:754 +#: ../backends/eds/lib/edsf-persona-store.vala:785 #, c-format msgid "Couldn't get address book capabilities: %s" msgstr "Nie można uzyskać możliwości książki adresowej: %s" #. Translators: the parameter is an address book URI. -#: ../backends/eds/lib/edsf-persona-store.vala:738 +#: ../backends/eds/lib/edsf-persona-store.vala:802 #, c-format msgid "Couldn't get view for address book ‘%s’." msgstr "Nie można uzyskać widoku dla książki adresowej \"%s\"." #. Translators: the first parameter is an address book URI #. * and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:815 +#: ../backends/eds/lib/edsf-persona-store.vala:884 #, c-format msgid "Couldn't get view for address book ‘%s’: %s" msgstr "Nie można uzyskać widoku dla książki adresowej \"%s\": %s" -#: ../backends/eds/lib/edsf-persona-store.vala:1045 +#: ../backends/eds/lib/edsf-persona-store.vala:1247 #, c-format msgid "Changing the ‘%s’ property failed due to reaching the timeout." msgstr "" "Zmienianie właściwości \"%s\" się nie powiodło z powodu przekroczenia czasu " "oczekiwania." -#: ../backends/eds/lib/edsf-persona-store.vala:1067 +#: ../backends/eds/lib/edsf-persona-store.vala:1278 #: ../folks/avatar-details.vala:59 msgid "Avatar is not writeable on this contact." msgstr "Awatar nie jest zapisywanlny w tym kontakcie." -#: ../backends/eds/lib/edsf-persona-store.vala:1088 -#: ../folks/web-service-details.vala:118 +#: ../backends/eds/lib/edsf-persona-store.vala:1299 +#: ../folks/web-service-details.vala:123 msgid "Web service addresses are not writeable on this contact." msgstr "Adresy usług WWW nie są zapisywalne w tym kontakcie." -#: ../backends/eds/lib/edsf-persona-store.vala:1129 -#: ../folks/url-details.vala:148 +#: ../backends/eds/lib/edsf-persona-store.vala:1335 +#: ../folks/url-details.vala:152 msgid "URLs are not writeable on this contact." msgstr "Adresy URL nie są zapisywalne w tym kontakcie." -#: ../backends/eds/lib/edsf-persona-store.vala:1207 +#: ../backends/eds/lib/edsf-persona-store.vala:1413 #: ../folks/local-id-details.vala:64 msgid "Local IDs are not writeable on this contact." msgstr "Lokalne identyfikatory nie są zapisywalne w tym kontakcie." -#: ../backends/eds/lib/edsf-persona-store.vala:1239 +#: ../backends/eds/lib/edsf-persona-store.vala:1440 msgid "The contact cannot be marked as favourite." msgstr "Kontakt nie może zostać oznaczony jako ulubiony." #. Translators: the parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:1305 +#: ../backends/eds/lib/edsf-persona-store.vala:1507 #, c-format msgid "Can't update avatar: %s" msgstr "Nie można zaktualizować awatara: %s" -#: ../backends/eds/lib/edsf-persona-store.vala:1316 -#: ../folks/email-details.vala:115 +#: ../backends/eds/lib/edsf-persona-store.vala:1518 +#: ../folks/email-details.vala:120 msgid "E-mail addresses are not writeable on this contact." msgstr "Adresy e-mail nie są zapisywalne w tym kontakcie." -#: ../backends/eds/lib/edsf-persona-store.vala:1330 -#: ../folks/phone-details.vala:223 +#: ../backends/eds/lib/edsf-persona-store.vala:1532 +#: ../folks/phone-details.vala:229 msgid "Phone numbers are not writeable on this contact." msgstr "Numery telefonu nie są zapisywalne w tym kontakcie." -#: ../backends/eds/lib/edsf-persona-store.vala:1344 -#: ../folks/postal-address-details.vala:335 +#: ../backends/eds/lib/edsf-persona-store.vala:1546 +#: ../folks/postal-address-details.vala:361 msgid "Postal addresses are not writeable on this contact." msgstr "Adresy pocztowe nie są zapisywalne w tym kontakcie." -#: ../backends/eds/lib/edsf-persona-store.vala:1411 +#: ../backends/eds/lib/edsf-persona-store.vala:1613 #: ../folks/name-details.vala:281 msgid "Full name is not writeable on this contact." msgstr "Imię i nazwisko nie są zapisywalne w tym kontakcie." -#: ../backends/eds/lib/edsf-persona-store.vala:1432 +#: ../backends/eds/lib/edsf-persona-store.vala:1635 #: ../folks/name-details.vala:319 msgid "Nickname is not writeable on this contact." msgstr "Pseudonim nie jest zapisywalny w tym kontakcie." -#: ../backends/eds/lib/edsf-persona-store.vala:1453 -#: ../folks/note-details.vala:141 +#: ../backends/eds/lib/edsf-persona-store.vala:1657 +#: ../folks/note-details.vala:136 msgid "Notes are not writeable on this contact." msgstr "Notatki nie są zapisywalne w tym kontakcie." -#: ../backends/eds/lib/edsf-persona-store.vala:1482 +#: ../backends/eds/lib/edsf-persona-store.vala:1686 #: ../folks/birthday-details.vala:60 msgid "Birthday is not writeable on this contact." msgstr "Urodziny nie są zapisywalne w tym kontakcie." -#: ../backends/eds/lib/edsf-persona-store.vala:1521 -#: ../folks/role-details.vala:255 +#: ../backends/eds/lib/edsf-persona-store.vala:1730 +#: ../folks/role-details.vala:277 msgid "Roles are not writeable on this contact." msgstr "Role nie są zapisywalne w tym kontakcie." -#: ../backends/eds/lib/edsf-persona-store.vala:1622 +#: ../backends/eds/lib/edsf-persona-store.vala:1831 #: ../folks/name-details.vala:244 msgid "Structured name is not writeable on this contact." msgstr "Nazwa strukturalna nie jest zapisywalna w tym kontakcie." -#: ../backends/eds/lib/edsf-persona-store.vala:1656 -#: ../folks/im-details.vala:130 +#: ../backends/eds/lib/edsf-persona-store.vala:1871 +#: ../folks/im-details.vala:136 msgid "IM addresses are not writeable on this contact." msgstr "Adresy komunikatora nie są zapisywalne w tym kontakcie." -#: ../backends/eds/lib/edsf-persona-store.vala:1706 +#: ../backends/eds/lib/edsf-persona-store.vala:1921 #: ../folks/group-details.vala:168 msgid "Groups are not writeable on this contact." msgstr "Grupy nie są zapisywalne w tym kontakcie." -#: ../backends/eds/lib/edsf-persona-store.vala:1736 +#: ../backends/eds/lib/edsf-persona-store.vala:1951 #: ../folks/gender-details.vala:77 msgid "Gender is not writeable on this contact." msgstr "Płeć nie jest nie jest zapisywalna w tym kontakcie." @@ -198,7 +192,7 @@ #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error #. * message. -#: ../backends/eds/lib/edsf-persona-store.vala:1870 +#: ../backends/eds/lib/edsf-persona-store.vala:2100 #, c-format msgid "Property ‘%s’ is not writeable: %s" msgstr "Właściwość \"%s\" nie jest zapisywalna: %s" @@ -206,42 +200,42 @@ #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error #. * message. -#: ../backends/eds/lib/edsf-persona-store.vala:1879 +#: ../backends/eds/lib/edsf-persona-store.vala:2109 #, c-format msgid "Invalid value for property ‘%s’: %s" msgstr "Nieprawidłowa wartość dla właściwości \"%s\": %s" #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:1905 +#: ../backends/eds/lib/edsf-persona-store.vala:2135 #, c-format msgid "Unknown error setting property ‘%s’: %s" msgstr "Nieznany błąd podczas ustawiania właściwości \"%s\": %s" #. Translators: the first parameter is a filename, #. * and the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:205 +#: ../backends/key-file/kf-persona-store.vala:224 #, c-format msgid "The relationship key file '%s' could not be loaded: %s" msgstr "Nie można wczytać pliku klucza powiązania \"%s\": %s" #. Translators: the first parameter is a path, and #. * the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:227 +#: ../backends/key-file/kf-persona-store.vala:246 #, c-format msgid "The relationship key file directory '%s' could not be created: %s" msgstr "Nie można utworzyć katalogu pliku klucza powiązania \"%s\": %s" #. Translators: the first parameter is a filename, #. * and the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:251 +#: ../backends/key-file/kf-persona-store.vala:270 #, c-format msgid "The relationship key file '%s' could not be created: %s" msgstr "Nie można utworzyć pliku klucza powiązania \"%s\": %s" #. Translators: the first parameter is a filename, the second is #. * an error message. -#: ../backends/key-file/kf-persona-store.vala:436 +#: ../backends/key-file/kf-persona-store.vala:463 #, c-format msgid "Could not write updated key file '%s': %s" msgstr "Nie można zapisać zaktualizowanego pliku klucza \"%s\": %s" @@ -251,99 +245,99 @@ #. * an IM address (e.g. “foo@jabber.org”), the second is #. * the name of a protocol (e.g. “jabber”) and the third is #. * an error message. -#: ../backends/key-file/kf-persona.vala:169 +#: ../backends/key-file/kf-persona.vala:171 #, c-format msgid "Invalid IM address ‘%s’ for protocol ‘%s’: %s" msgstr "Nieprawidłowy adres komunikatora \"%s\" dla protokołu \"%s\": %s" #. Translators: the parameter is an error message. -#: ../backends/key-file/kf-persona.vala:357 +#: ../backends/key-file/kf-persona.vala:364 #, c-format msgid "Couldn't load data from key file: %s" msgstr "Nie można wczytać danych z pliku klucza: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:504 +#: ../backends/telepathy/lib/tp-lowlevel.c:508 #, c-format msgid "Error requesting a group channel: %s" msgstr "Błąd podczas żądania kanału grupy: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:522 +#: ../backends/telepathy/lib/tp-lowlevel.c:526 #, c-format msgid "Error requesting group handles: %s" msgstr "Błąd podczas żądania elementów obsługujących grupy: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:560 +#: ../backends/telepathy/lib/tp-lowlevel.c:564 #, c-format msgid "Failed to change contact's alias: %s" msgstr "Zmiana pseudonimu kontaktu się nie powiodła: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:619 +#: ../backends/telepathy/lib/tp-lowlevel.c:623 #, c-format msgid "Failed to create group channel: %s" msgstr "Utworzenie kanału grupy się nie powiodło: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:651 +#: ../backends/telepathy/lib/tp-lowlevel.c:655 #, c-format msgid "Get Channels property failed: %s" msgstr "Właściwość uzyskania kanałów się nie powiodła: %s" #. Translators: the first parameter is a group channel identifier and the #. * second is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:693 +#: ../backends/telepathy/lib/tp-lowlevel.c:697 #, c-format msgid "Failed to add contact to group '%s': %s" msgstr "Dodanie kontaktu do grupy \"%s\" się nie powiodło: %s" #. Translators: the first parameter is a group channel identifier and the #. * second is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:709 +#: ../backends/telepathy/lib/tp-lowlevel.c:713 #, c-format msgid "Failed to remove contact from group '%s': %s" msgstr "Usunięcie kontaktu z grupy \"%s\" się nie powiodło: %s" #. Translators: the first parameter is a pointer address and the #. * second is a contact handle (numeric identifier). -#: ../backends/telepathy/lib/tp-lowlevel.c:732 +#: ../backends/telepathy/lib/tp-lowlevel.c:736 #, c-format msgid "Invalid group channel %p to add handle %d to." msgstr "" "Nieprawidłowy kanał grupy %p, do którego ma zostać dodany element " "obsługujący %d." -#: ../backends/telepathy/lib/tpf-persona-store.vala:596 +#: ../backends/telepathy/lib/tpf-persona-store.vala:637 msgid "Couldn't connect to the telepathy-logger service." msgstr "Nie można połączyć się z usługą telepathy-logger." -#: ../backends/telepathy/lib/tpf-persona-store.vala:631 +#: ../backends/telepathy/lib/tpf-persona-store.vala:676 msgid "Lost connection to the telepathy-logger service." msgstr "Utracono połączenie z usługą telepathy-logger." #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:663 -#: ../backends/telepathy/lib/tpf-persona-store.vala:675 +#: ../backends/telepathy/lib/tpf-persona-store.vala:708 +#: ../backends/telepathy/lib/tpf-persona-store.vala:720 #, c-format msgid "Couldn't get list of favorite contacts: %s" msgstr "Nie można uzyskać listy ulubionych kontaktów: %s" #. Translators: the parameter is an identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:712 +#: ../backends/telepathy/lib/tpf-persona-store.vala:757 #, c-format msgid "Unknown Telepathy contact ‘%s’ in favorites list." msgstr "Nieznany kontakt Telepathy \"%s\" na liście ulubionych." #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:743 +#: ../backends/telepathy/lib/tpf-persona-store.vala:788 #, c-format msgid "Couldn't add favorite contacts: %s" msgstr "Nie można dodać ulubionych kontaktów: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:764 +#: ../backends/telepathy/lib/tpf-persona-store.vala:809 #, c-format msgid "Couldn't remove favorite contacts: %s" msgstr "Nie można usunąć ulubionych kontaktów: %s" @@ -351,7 +345,7 @@ #. Translators: the first parameter is the display name for #. * the Telepathy account, and the second is an error #. * message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:884 +#: ../backends/telepathy/lib/tpf-persona-store.vala:935 #, c-format msgid "" "Failed to determine whether we can set aliases on Telepathy account '%s': %s" @@ -362,7 +356,7 @@ #. Translators: the first parameter is the display name for #. * the Telepathy account, and the second is an error #. * message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:937 +#: ../backends/telepathy/lib/tpf-persona-store.vala:988 #, c-format msgid "" "Failed to determine whether we can set groups on Telepathy account '%s': %s" @@ -372,7 +366,7 @@ #. Translators: the first parameter is a Telepathy handle, #. * and the second is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1114 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1166 #, c-format msgid "Failed to create contact for self handle '%u': %s" msgstr "" @@ -381,25 +375,25 @@ #. Translators: do not translate "NewChannels", as it's a D-Bus #. * signal name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1145 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1197 msgid "Error creating channel for NewChannels signal." msgstr "Błąd podczas tworzenia kanału dla sygnału NewChannels." #. Translators: the parameter is a persona identifier and #. * the second parameter is a group name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1184 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1236 #, c-format msgid "Failed to add Telepathy contact ‘%s’ to group ‘%s’." msgstr "Dodanie kontaktu Telepathy \"%s\" do grupy \"%s\" się nie powiodło." #. Translators: the parameter is a persona identifier #. * and the second parameter is a group name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1192 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1247 #, c-format msgid "Failed to remove Telepathy contact ‘%s’ from group ‘%s’." msgstr "Usunięcie kontaktu Telepathy \"%s\" z grupy \"%s\" się nie powiodło." -#: ../backends/telepathy/lib/tpf-persona-store.vala:1546 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1613 msgid "Telepathy contacts representing the local user may not be removed." msgstr "" "Kontakty Telepathy reprezentujące lokalnego użytkownika nie mogą być usuwane." @@ -410,10 +404,10 @@ #. Translators: The first parameter is a contact identifier, #. * the second is a contact list identifier and the third is an #. * error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1560 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1575 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1590 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1764 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1634 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1649 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1664 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1845 #, c-format msgid "Failed to remove Telepathy contact ‘%s’ from ‘%s’ list: %s" msgstr "" @@ -422,14 +416,14 @@ #. Translators: The first parameter is a contact identifier, #. * the second is a contact list identifier and the third is an #. * error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1754 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1835 #, c-format msgid "Failed to add Telepathy contact ‘%s’ to ‘%s’ list: %s" msgstr "Dodanie kontaktu Telepathy \"%s\" do listy \"%s\" się nie powiodło: %s" #. Translators: the first parameter is a channel identifier and #. * the second is an error message.. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1866 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1948 #, c-format msgid "Failed to create incoming Telepathy contacts from channel ‘%s’: %s" msgstr "" @@ -438,7 +432,7 @@ #. Translators: the first two parameters are store identifiers and #. * the third is a contact identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2047 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2186 #, c-format msgid "" "Persona store (%s, %s) requires the following details:\n" @@ -447,7 +441,7 @@ "Przechowalnia osoby (%s, %s) wymaga następujących informacji:\n" " contact (dostarczono: \"%s\")\n" -#: ../backends/telepathy/lib/tpf-persona-store.vala:2062 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2201 msgid "Cannot create a new Telepathy contact while offline." msgstr "" "Nie można utworzyć nowego kontaktu Telepathy podczas działania w trybie " @@ -455,7 +449,7 @@ #. Translators: the parameter is the number of personas #. * which were returned. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2114 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2253 #, c-format msgid "Requested a single persona, but got %u persona back." msgid_plural "Requested a single persona, but got %u personas back." @@ -463,34 +457,42 @@ msgstr[1] "Żądano jednej osoby, a otrzymano %u." msgstr[2] "Żądano jednej osoby, a otrzymano %u." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2125 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2264 #, c-format msgid "Failed to add a persona from details: %s" msgstr "Dodanie osoby z informacji się nie powiodło: %s" #. Translators: "telepathy-logger" is the name of an application, #. * and should not be translated. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2145 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2284 msgid "" "Failed to change favorite without a connection to the telepathy-logger " "service." msgstr "" "Zmiana ulubionych bez połączenia z usługą telepathy-logger się nie powiodła." +#: ../backends/telepathy/lib/tpf-persona-store.vala:2290 +msgid "" +"Failed to change favorite status of Telepathy Persona because it has no " +"attached TpContact." +msgstr "" +"Zmiana ulubionego stanu dla osoby Telepathy się nie powiodła, ponieważ nie " +"posiada ona dołączonego TpContact." + #. Translators: the parameter is a contact identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2163 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2308 #, c-format msgid "Failed to change favorite status for Telepathy contact ‘%s’." msgstr "" "Zmiana ulubionego stanu dla kontaktu Telepathy \"%s\" się nie powiodła." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2258 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2410 msgid "Extended information may only be set on the user's Telepathy contact." msgstr "" "Rozszerzone informacje mogą być ustawiane tylko w kontakcie Telepathy " "użytkownika." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2287 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2439 msgid "" "Extended information cannot be written because the store is disconnected." msgstr "" @@ -500,7 +502,7 @@ #. Translators: the first parameter is the unknown key that #. * was received with the details params, and the second #. * identifies the persona store. -#: ../backends/tracker/lib/trf-persona-store.vala:733 +#: ../backends/tracker/lib/trf-persona-store.vala:739 #, c-format msgid "Unrecognized parameter '%s' passed to persona store '%s'." msgstr "Nierozpoznany parametr \"%s\" przekazany do przechowalni osoby \"%s\"." @@ -511,20 +513,20 @@ #. Translators: the first parameter is a backend name, and the #. * second is an error message. -#: ../folks/backend-store.vala:354 +#: ../folks/backend-store.vala:366 #, c-format msgid "Error preparing Backend '%s': %s" msgstr "Błąd podczas przygotowywania mechanizmu \"%s\": %s" #. Translators: the first parameter is a folder path and the second #. * is an error message. -#: ../folks/backend-store.vala:547 +#: ../folks/backend-store.vala:559 #, c-format msgid "Error listing contents of folder '%s': %s" msgstr "Błąd podczas wyświetlania listy zawartości katalogu \"%s\": %s" #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:580 +#: ../folks/backend-store.vala:601 #, c-format msgid "" "The content type of '%s' could not be determined. Have you installed shared-" @@ -535,27 +537,27 @@ #. Translators: the first parameter is a filename and the second is an #. * error message. -#: ../folks/backend-store.vala:603 +#: ../folks/backend-store.vala:629 #, c-format msgid "Failed to load module from path '%s': %s" msgstr "Wczytanie modułu ze ścieżki \"%s\" się nie powiodło: %s" #. Translators: the first parameter is a function name, the second is #. * a filename and the third is an error message. -#: ../folks/backend-store.vala:618 +#: ../folks/backend-store.vala:645 #, c-format msgid "Failed to find entry point function '%s' in '%s': %s" msgstr "" "Odnalezienie funkcji punktu wprowadzania \"%s\" w \"%s\" się nie powiodło: %s" #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:659 +#: ../folks/backend-store.vala:686 #, c-format msgid "File or directory '%s' does not exist." msgstr "Plik lub katalog \"%s\" nie istnieje." #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:665 +#: ../folks/backend-store.vala:692 #, c-format msgid "Failed to get content type for '%s'." msgstr "Uzyskanie typu treści dla \"%s\" się nie powiodło." @@ -569,55 +571,76 @@ msgstr "Ulubiony stan nie jest zapisywalny w tym kontakcie." #. Translators: the parameter is an IM address. -#: ../folks/im-details.vala:172 ../folks/im-details.vala:186 -#: ../folks/im-details.vala:208 ../folks/im-details.vala:235 +#: ../folks/im-details.vala:178 ../folks/im-details.vala:192 +#: ../folks/im-details.vala:214 ../folks/im-details.vala:241 #, c-format msgid "The IM address '%s' could not be understood." msgstr "Nie można przetworzyć adresu komunikatora \"%s\"." #. Translators: the first parameter is a persona store identifier #. * and the second is an error message. -#: ../folks/individual-aggregator.vala:696 +#: ../folks/individual-aggregator.vala:782 #, c-format msgid "Error preparing persona store '%s': %s" msgstr "Błąd podczas przygotowywania przechowalni osoby \"%s\": %s" #. Translators: the parameter is a property name. -#: ../folks/individual-aggregator.vala:890 -#: ../folks/individual-aggregator.vala:1072 +#: ../folks/individual-aggregator.vala:977 +#: ../folks/individual-aggregator.vala:1160 #, c-format msgid "Unknown property '%s' in linkable property list." msgstr "Nieznana właściwość \"%s\" na liście dowiązywalnych właściwości." #. Translators: the first parameter is a store identifier #. * and the second parameter is an error message. -#: ../folks/individual-aggregator.vala:1478 +#: ../folks/individual-aggregator.vala:1580 #, c-format msgid "Failed to add contact for persona store ID '%s': %s" msgstr "" "Dodanie kontaktu dla identyfikatora przechowalni osoby \"%s\" się nie " "powiodło: %s" -#: ../folks/individual-aggregator.vala:1559 -msgid "Can't link personas with no primary store." +#: ../folks/individual-aggregator.vala:1661 +msgid "Can’t link personas with no primary store." msgstr "Nie można powiązać osób bez głównej przechowalni." -#: ../folks/individual-aggregator.vala:1816 -msgid "Can't add personas with no primary store." +#: ../folks/individual-aggregator.vala:1662 +#: ../folks/individual-aggregator.vala:1927 +#, c-format +msgid "" +"Persona store ‘%s:%s’ is configured as primary, but could not be found or " +"failed to load." +msgstr "" +"Przechowalnia osób \"%s:%s\" jest skonfigurowana jako główna, ale nie można " +"jej odnaleźć lub wczytanie się nie powiodło." + +#: ../folks/individual-aggregator.vala:1663 +#: ../folks/individual-aggregator.vala:1928 +#, c-format +msgid "" +"Check the service providing the persona store is running, or change the " +"default store in that service or using the “%s” GConf key." +msgstr "" +"Proszę sprawdzić, czy usługa dostarczająca przechowalnię osób jest " +"uruchomiona, albo zmienić domyślną przechowalnię w tej usłudze lub używając " +"klucza GConf \"%s\"." + +#: ../folks/individual-aggregator.vala:1926 +msgid "Can’t add personas with no primary store." msgstr "Nie można dodać osób bez głównej przechowalni." -#: ../folks/individual-aggregator.vala:1821 +#: ../folks/individual-aggregator.vala:1935 #, c-format msgid "Can't write to requested property (“%s”) of the writeable store." msgstr "" "Nie można zapisać do żądanej właściwości (\"%s\") zapisywalnej przechowalni." -#: ../folks/postal-address-details.vala:211 +#: ../folks/postal-address-details.vala:231 #, c-format msgid "%s, %s, %s, %s, %s, %s, %s" msgstr "%s, %s, %s, %s, %s, %s, %s" -#: ../folks/role-details.vala:133 +#: ../folks/role-details.vala:148 #, c-format msgid "Title: %s, Organisation: %s, Role: %s" msgstr "Tytuł: %s, organizacja: %s, rola: %s" diff -Nru folks-0.6.6/po/pt_BR.po folks-0.6.7/po/pt_BR.po --- folks-0.6.6/po/pt_BR.po 1970-01-01 00:00:00.000000000 +0000 +++ folks-0.6.7/po/pt_BR.po 2011-12-22 18:18:11.000000000 +0000 @@ -0,0 +1,758 @@ +# Brazilian Portuguese translation for folks. +# Copyright (C) 2011 folks's COPYRIGHT HOLDER +# This file is distributed under the same license as the folks package. +# Henrique P. Machado , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: folks master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=folks&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-12-19 08:28+0000\n" +"PO-Revision-Date: 2011-12-16 02:05+0200\n" +"Last-Translator: Henrique P. Machado \n" +"Language-Team: Brazilian Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#. Translators: the first parameter is an address book +#. * URI and the second is a persona UID. +#: ../backends/eds/lib/edsf-persona-store.vala:495 +#, c-format +msgid "Address book ‘%s’ is offline, so contact ‘%s’ cannot be removed." +msgstr "" +"O Catálogo de endereços \"%s\" está desconectado, por conta disso o contato " +"\"%s\" não pode ser removido." + +#. Translators: the first parameter is an address book +#. * URI and the second is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:501 +#, c-format +msgid "Permission denied to remove contact ‘%s’: %s" +msgstr "Permissão negada para remover o contato \"%s\": %s" + +#. Translators: the parameter is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:506 +#, c-format +msgid "Removing contacts isn't supported by this persona store: %s" +msgstr "Não há suporte à remoção de contatos neste armazém de contatos: %s" + +#: ../backends/eds/lib/edsf-persona-store.vala:535 +#, c-format +msgid "Can't remove contact ‘%s’: %s" +msgstr "Não é possível remover o contato \"%s\": %s" + +#. Translators: the parameter is an address book +#. * URI. +#: ../backends/eds/lib/edsf-persona-store.vala:605 +#: ../backends/eds/lib/edsf-persona-store.vala:807 +#, c-format +msgid "Address book ‘%s’ is offline." +msgstr "O Catálogo de endereços \"%s\" está desconectado." + +#. Translators: the first parameter is an address +#. * book URI and the second is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:610 +#: ../backends/eds/lib/edsf-persona-store.vala:812 +#, c-format +msgid "Permission denied to open address book ‘%s’: %s" +msgstr "Permissão negada para abrir o catálogo de endereços \"%s\": %s" + +#. Translators: the first parameter is an address book URI +#. * and the second is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:643 +#, c-format +msgid "Couldn't open address book ‘%s’: %s" +msgstr "Não foi possível abrir o catálogo de endereços \"%s\": %s" + +#. Translators: the parameter is an address book URI. +#: ../backends/eds/lib/edsf-persona-store.vala:658 +#, c-format +msgid "Couldn't open address book ‘%s’." +msgstr "Não foi possível abrir o catálogo de endereços \"%s\"." + +#. Translators: the parameteter is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:720 +#: ../backends/eds/lib/edsf-persona-store.vala:751 +#, c-format +msgid "Couldn't get address book capabilities: %s" +msgstr "Não foi possível obter as capacidades do catálogo de endereços: %s" + +#. Translators: the parameter is an address book URI. +#: ../backends/eds/lib/edsf-persona-store.vala:768 +#, c-format +msgid "Couldn't get view for address book ‘%s’." +msgstr "Não foi possível obter visão do catálogo de endereços \"%s\"." + +#. Translators: the first parameter is an address book URI +#. * and the second is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:845 +#, c-format +msgid "Couldn't get view for address book ‘%s’: %s" +msgstr "Não foi possível obter visão do catálogo de endereços \"%s\": %s" + +#: ../backends/eds/lib/edsf-persona-store.vala:1080 +#, c-format +msgid "Changing the ‘%s’ property failed due to reaching the timeout." +msgstr "" +"A mudança da propriedade \"%s\" falhou ao se atingir o tempo de espera." + +#: ../backends/eds/lib/edsf-persona-store.vala:1102 +#: ../folks/avatar-details.vala:59 +msgid "Avatar is not writeable on this contact." +msgstr "O avatar não é gravável neste contato." + +#: ../backends/eds/lib/edsf-persona-store.vala:1123 +#: ../folks/web-service-details.vala:117 +msgid "Web service addresses are not writeable on this contact." +msgstr "Endereços de serviços web não são graváveis neste contato." + +#: ../backends/eds/lib/edsf-persona-store.vala:1164 +#: ../folks/url-details.vala:147 +msgid "URLs are not writeable on this contact." +msgstr "URLs não são graváveis neste contato." + +#: ../backends/eds/lib/edsf-persona-store.vala:1242 +#: ../folks/local-id-details.vala:64 +msgid "Local IDs are not writeable on this contact." +msgstr "IDs locais não são graváveis neste contato." + +#: ../backends/eds/lib/edsf-persona-store.vala:1274 +msgid "The contact cannot be marked as favourite." +msgstr "O contato não pode ser marcado como favorito." + +#. Translators: the parameter is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:1349 +#, c-format +msgid "Can't update avatar: %s" +msgstr "Não é possível atualizar o avatar: %s" + +#: ../backends/eds/lib/edsf-persona-store.vala:1360 +#: ../folks/email-details.vala:115 +msgid "E-mail addresses are not writeable on this contact." +msgstr "Endereços de e-mail não são graváveis neste contato." + +#: ../backends/eds/lib/edsf-persona-store.vala:1374 +#: ../folks/phone-details.vala:222 +msgid "Phone numbers are not writeable on this contact." +msgstr "Números de telefone não são graváveis neste contato." + +#: ../backends/eds/lib/edsf-persona-store.vala:1388 +#: ../folks/postal-address-details.vala:336 +msgid "Postal addresses are not writeable on this contact." +msgstr "Códigos postais não são graváveis neste contato." + +#: ../backends/eds/lib/edsf-persona-store.vala:1455 +#: ../folks/name-details.vala:281 +msgid "Full name is not writeable on this contact." +msgstr "Nome completo não é gravável neste contato." + +#: ../backends/eds/lib/edsf-persona-store.vala:1476 +#: ../folks/name-details.vala:319 +msgid "Nickname is not writeable on this contact." +msgstr "O apelido não é gravável neste contato." + +#: ../backends/eds/lib/edsf-persona-store.vala:1497 +#: ../folks/note-details.vala:138 +msgid "Notes are not writeable on this contact." +msgstr "Anotações não são graváveis neste contato." + +#: ../backends/eds/lib/edsf-persona-store.vala:1526 +#: ../folks/birthday-details.vala:60 +msgid "Birthday is not writeable on this contact." +msgstr "Aniversário não é gravável neste contato." + +#: ../backends/eds/lib/edsf-persona-store.vala:1565 +#: ../folks/role-details.vala:256 +msgid "Roles are not writeable on this contact." +msgstr "Cargos não são gravados neste contato." + +#: ../backends/eds/lib/edsf-persona-store.vala:1666 +#: ../folks/name-details.vala:244 +msgid "Structured name is not writeable on this contact." +msgstr "Nome estruturado não é gravável neste contato." + +#: ../backends/eds/lib/edsf-persona-store.vala:1700 +#: ../folks/im-details.vala:130 +msgid "IM addresses are not writeable on this contact." +msgstr "Endereços de IM não são graváveis neste contato." + +#: ../backends/eds/lib/edsf-persona-store.vala:1750 +#: ../folks/group-details.vala:168 +msgid "Groups are not writeable on this contact." +msgstr "Grupos não são graváveis neste contato." + +#: ../backends/eds/lib/edsf-persona-store.vala:1780 +#: ../folks/gender-details.vala:77 +msgid "Gender is not writeable on this contact." +msgstr "Sexo não é gravável neste contato." + +#. Translators: the first parameter is a non-human-readable +#. * property name and the second parameter is an error +#. * message. +#: ../backends/eds/lib/edsf-persona-store.vala:1914 +#, c-format +msgid "Property ‘%s’ is not writeable: %s" +msgstr "A propriedade \"%s\" não é gravável: %s" + +#. Translators: the first parameter is a non-human-readable +#. * property name and the second parameter is an error +#. * message. +#: ../backends/eds/lib/edsf-persona-store.vala:1923 +#, c-format +msgid "Invalid value for property ‘%s’: %s" +msgstr "Valor inválido para a propriedade \"%s\": %s" + +#. Translators: the first parameter is a non-human-readable +#. * property name and the second parameter is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:1949 +#, c-format +msgid "Unknown error setting property ‘%s’: %s" +msgstr "Erro desconhecido ao definir a propriedade \"%s\": %s" + +#. Translators: the first parameter is a filename, +#. * and the second is an error message. +#: ../backends/key-file/kf-persona-store.vala:224 +#, c-format +msgid "The relationship key file '%s' could not be loaded: %s" +msgstr "A arquivo da chave de relacionamento \"%s\" não pôde ser carregado: %s" + +#. Translators: the first parameter is a path, and +#. * the second is an error message. +#: ../backends/key-file/kf-persona-store.vala:246 +#, c-format +msgid "The relationship key file directory '%s' could not be created: %s" +msgstr "" +"O diretório do arquivo da chave de relacionamento \"%s\" não pôde ser " +"criado: %s" + +#. Translators: the first parameter is a filename, +#. * and the second is an error message. +#: ../backends/key-file/kf-persona-store.vala:270 +#, c-format +msgid "The relationship key file '%s' could not be created: %s" +msgstr "O arquivo de chave de relacionamento \"%s\" não pôde ser criado: %s" + +#. Translators: the first parameter is a filename, the second is +#. * an error message. +#: ../backends/key-file/kf-persona-store.vala:463 +#, c-format +msgid "Could not write updated key file '%s': %s" +msgstr "Não foi possível gravar o arquivo de chave \"%s\" atualizado: %s" + +#. Translators: this is an error message for if the user +#. * provides an invalid IM address. The first parameter is +#. * an IM address (e.g. “foo@jabber.org”), the second is +#. * the name of a protocol (e.g. “jabber”) and the third is +#. * an error message. +#: ../backends/key-file/kf-persona.vala:171 +#, c-format +msgid "Invalid IM address ‘%s’ for protocol ‘%s’: %s" +msgstr "Endereço de IM \"%s\" inválido para o protocolo \"%s\": %s" + +#. Translators: the parameter is an error message. +#: ../backends/key-file/kf-persona.vala:364 +#, c-format +msgid "Couldn't load data from key file: %s" +msgstr "Não foi possível carregar dados do arquivo chave: %s" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:508 +#, c-format +msgid "Error requesting a group channel: %s" +msgstr "Erro ao requisitar um canal de grupo: %s" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:526 +#, c-format +msgid "Error requesting group handles: %s" +msgstr "Erro ao requisitar manipuladores do grupo: %s" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:564 +#, c-format +msgid "Failed to change contact's alias: %s" +msgstr "Falhou ao alterar o alias do contato: %s" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:623 +#, c-format +msgid "Failed to create group channel: %s" +msgstr "Falhou ao criar o grupo do canal: %s" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:655 +#, c-format +msgid "Get Channels property failed: %s" +msgstr "Falha ao obter propriedade de Canais: %s" + +#. Translators: the first parameter is a group channel identifier and the +#. * second is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:697 +#, c-format +msgid "Failed to add contact to group '%s': %s" +msgstr "Falha ao adicionar contato ao grupo \"%s\": %s" + +#. Translators: the first parameter is a group channel identifier and the +#. * second is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:713 +#, c-format +msgid "Failed to remove contact from group '%s': %s" +msgstr "Falha ao remover contato do grupo \"%s\": %s" + +#. Translators: the first parameter is a pointer address and the +#. * second is a contact handle (numeric identifier). +#: ../backends/telepathy/lib/tp-lowlevel.c:736 +#, c-format +msgid "Invalid group channel %p to add handle %d to." +msgstr "Canal de grupo inválido (%p) para adicionar um manipulador (%d)." + +#: ../backends/telepathy/lib/tpf-persona-store.vala:634 +msgid "Couldn't connect to the telepathy-logger service." +msgstr "Não foi possível conectar ao serviço telepathy-logger." + +#: ../backends/telepathy/lib/tpf-persona-store.vala:673 +msgid "Lost connection to the telepathy-logger service." +msgstr "Conexão perdida com o serviço telepathy-logger." + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:705 +#: ../backends/telepathy/lib/tpf-persona-store.vala:717 +#, c-format +msgid "Couldn't get list of favorite contacts: %s" +msgstr "Não foi possível obter a lista de contatos favoritos: %s" + +#. Translators: the parameter is an identifier. +#: ../backends/telepathy/lib/tpf-persona-store.vala:754 +#, c-format +msgid "Unknown Telepathy contact ‘%s’ in favorites list." +msgstr "Contato \"%s\" do Telepathy desconhecido na lista de favoritos." + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:785 +#, c-format +msgid "Couldn't add favorite contacts: %s" +msgstr "Não foi possível adicionar contatos favoritos: %s" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:806 +#, c-format +msgid "Couldn't remove favorite contacts: %s" +msgstr "Não foi possível remover contatos favoritos: %s" + +#. Translators: the first parameter is the display name for +#. * the Telepathy account, and the second is an error +#. * message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:932 +#, c-format +msgid "" +"Failed to determine whether we can set aliases on Telepathy account '%s': %s" +msgstr "" +"Falha ao determinar se podemos definir aliases à conta \"%s\", do Telepathy: " +"%s" + +#. Translators: the first parameter is the display name for +#. * the Telepathy account, and the second is an error +#. * message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:985 +#, c-format +msgid "" +"Failed to determine whether we can set groups on Telepathy account '%s': %s" +msgstr "" +"Falha ao determinar se podemos definir grupos à conta \"%s\", do Telepathy: %" +"s" + +#. Translators: the first parameter is a Telepathy handle, +#. * and the second is an error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1162 +#, c-format +msgid "Failed to create contact for self handle '%u': %s" +msgstr "Falha ao criar contato para o automanipulador \"%u\": %s" + +#. Translators: do not translate "NewChannels", as it's a D-Bus +#. * signal name. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1193 +msgid "Error creating channel for NewChannels signal." +msgstr "Erro ao criar canal para o sinal NewChannels." + +#. Translators: the parameter is a persona identifier and +#. * the second parameter is a group name. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1232 +#, c-format +msgid "Failed to add Telepathy contact ‘%s’ to group ‘%s’." +msgstr "Falha ao adicionar o contato \"%s\" do Telepathy ao grupo \"%s\"." + +#. Translators: the parameter is a persona identifier +#. * and the second parameter is a group name. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1240 +#, c-format +msgid "Failed to remove Telepathy contact ‘%s’ from group ‘%s’." +msgstr "Falha ao remover o contato \"%s\" do grupo \"%s\" do Telepathy." + +#: ../backends/telepathy/lib/tpf-persona-store.vala:1602 +msgid "Telepathy contacts representing the local user may not be removed." +msgstr "" +"Contatos do Telepathy representando o usuário local não podem ser removidos." + +#. Translators: The first parameter is a contact identifier, the +#. * second is a contact list identifier and the third is an error +#. * message. +#. Translators: The first parameter is a contact identifier, +#. * the second is a contact list identifier and the third is an +#. * error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1616 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1631 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1646 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1820 +#, c-format +msgid "Failed to remove Telepathy contact ‘%s’ from ‘%s’ list: %s" +msgstr "Falha ao remover o contato \"%s\" da lista \"%s\" do Telepathy: %s" + +#. Translators: The first parameter is a contact identifier, +#. * the second is a contact list identifier and the third is an +#. * error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1810 +#, c-format +msgid "Failed to add Telepathy contact ‘%s’ to ‘%s’ list: %s" +msgstr "Falha ao adicionar o contato \"%s\" à lista \"%s\" do Telepathy: %s" + +#. Translators: the first parameter is a channel identifier and +#. * the second is an error message.. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1923 +#, c-format +msgid "Failed to create incoming Telepathy contacts from channel ‘%s’: %s" +msgstr "" +"Falha ao criar contatos de entrada do Telepathy a partir do canal \"%s\": %s" + +#. Translators: the first two parameters are store identifiers and +#. * the third is a contact identifier. +#: ../backends/telepathy/lib/tpf-persona-store.vala:2154 +#, c-format +msgid "" +"Persona store (%s, %s) requires the following details:\n" +" contact (provided: '%s')\n" +msgstr "" +"O Armazém de contatos (%s, %s) necessita dos seguintes detalhes:\n" +" contato (informado: \"%s\")\n" + +#: ../backends/telepathy/lib/tpf-persona-store.vala:2169 +msgid "Cannot create a new Telepathy contact while offline." +msgstr "" +"Não é possível criar um novo contato do Telepathy enquanto estiver " +"desconectado." + +#. Translators: the parameter is the number of personas +#. * which were returned. +#: ../backends/telepathy/lib/tpf-persona-store.vala:2221 +#, c-format +msgid "Requested a single persona, but got %u persona back." +msgid_plural "Requested a single persona, but got %u personas back." +msgstr[0] "Requisitado um simples contato, mas obtido %u contato." +msgstr[1] "Requisitado um simples contato, mas obtido %u contatos." + +#: ../backends/telepathy/lib/tpf-persona-store.vala:2232 +#, c-format +msgid "Failed to add a persona from details: %s" +msgstr "Falhou ao adicionar um contato a partir dos detalhes: %s" + +#. Translators: "telepathy-logger" is the name of an application, +#. * and should not be translated. +#: ../backends/telepathy/lib/tpf-persona-store.vala:2252 +msgid "" +"Failed to change favorite without a connection to the telepathy-logger " +"service." +msgstr "" +"Falhou ao modificar favorito sem uma conexão ao serviço telepathy-logger." + +#. Translators: the parameter is a contact identifier. +#: ../backends/telepathy/lib/tpf-persona-store.vala:2270 +#, c-format +msgid "Failed to change favorite status for Telepathy contact ‘%s’." +msgstr "" +"Falhou ao modificar o status de favorito para o contato \"%s\", do Telepathy." + +#: ../backends/telepathy/lib/tpf-persona-store.vala:2365 +msgid "Extended information may only be set on the user's Telepathy contact." +msgstr "" +"Informação extendida só pode ser definida no contato do usuário Telepathy." + +#: ../backends/telepathy/lib/tpf-persona-store.vala:2394 +msgid "" +"Extended information cannot be written because the store is disconnected." +msgstr "" +"A informação extendida não pode ser gravada porque o armazém está " +"desconectado." + +#. Translators: the first parameter is the unknown key that +#. * was received with the details params, and the second +#. * identifies the persona store. +#: ../backends/tracker/lib/trf-persona-store.vala:739 +#, c-format +msgid "Unrecognized parameter '%s' passed to persona store '%s'." +msgstr "" +"Parâmetro \"%s\" passado para o armazém de contatos \"%s\" não foi " +"reconhecido." + +#: ../folks/alias-details.vala:57 +msgid "Alias is not writeable on this contact." +msgstr "Alias não é gravável neste contato." + +#. Translators: the first parameter is a backend name, and the +#. * second is an error message. +#: ../folks/backend-store.vala:359 +#, c-format +msgid "Error preparing Backend '%s': %s" +msgstr "Erro ao preparar o Backend \"%s\": %s" + +#. Translators: the first parameter is a folder path and the second +#. * is an error message. +#: ../folks/backend-store.vala:552 +#, c-format +msgid "Error listing contents of folder '%s': %s" +msgstr "Erro ao listar o conteudo da pasta \"%s\": %s" + +#. Translators: the parameter is a filename. +#: ../folks/backend-store.vala:585 +#, c-format +msgid "" +"The content type of '%s' could not be determined. Have you installed shared-" +"mime-info?" +msgstr "" +"O tipo do conteudo de \"%s\" não pôde ser determinado. Você instalou as " +"shared-mime-info?" + +#. Translators: the first parameter is a filename and the second is an +#. * error message. +#: ../folks/backend-store.vala:608 +#, c-format +msgid "Failed to load module from path '%s': %s" +msgstr "Falhou ao carregar módulo a partir do caminho \"%s\": %s" + +#. Translators: the first parameter is a function name, the second is +#. * a filename and the third is an error message. +#: ../folks/backend-store.vala:623 +#, c-format +msgid "Failed to find entry point function '%s' in '%s': %s" +msgstr "Falhou ao procurar o ponto de entrada da função \"%s\" em \"%s\": %s" + +#. Translators: the parameter is a filename. +#: ../folks/backend-store.vala:664 +#, c-format +msgid "File or directory '%s' does not exist." +msgstr "O arquivo ou diretório \"%s\" não existe." + +#. Translators: the parameter is a filename. +#: ../folks/backend-store.vala:670 +#, c-format +msgid "Failed to get content type for '%s'." +msgstr "Falhou ao obter o tipo de conteudo para \"%s\"." + +#: ../folks/birthday-details.vala:89 +msgid "Birthday event ID is not writeable on this contact." +msgstr "A ID do evento de aniversário não é gravável neste contato." + +#: ../folks/favourite-details.vala:52 +msgid "Favorite status is not writeable on this contact." +msgstr "O status de favorito não é gravável neste contato." + +#. Translators: the parameter is an IM address. +#: ../folks/im-details.vala:172 ../folks/im-details.vala:186 +#: ../folks/im-details.vala:208 ../folks/im-details.vala:235 +#, c-format +msgid "The IM address '%s' could not be understood." +msgstr "O endereço de IM \"%s\" não pôde ser compreendido." + +#. Translators: the first parameter is a persona store identifier +#. * and the second is an error message. +#: ../folks/individual-aggregator.vala:720 +#, c-format +msgid "Error preparing persona store '%s': %s" +msgstr "Erro ao preparar o armazém de contatos \"%s\": %s" + +#. Translators: the parameter is a property name. +#: ../folks/individual-aggregator.vala:914 +#: ../folks/individual-aggregator.vala:1096 +#, c-format +msgid "Unknown property '%s' in linkable property list." +msgstr "Propriedade \"%s\" desconhecida na lista de propriedades vinculáveis." + +#. Translators: the first parameter is a store identifier +#. * and the second parameter is an error message. +#: ../folks/individual-aggregator.vala:1516 +#, c-format +msgid "Failed to add contact for persona store ID '%s': %s" +msgstr "Falhou ao adicionar contato à ID \"%s\" do armazém de contatos: %s" + +#: ../folks/individual-aggregator.vala:1597 +msgid "Can't link personas with no primary store." +msgstr "Não é possível vincular contatos sem um armazém primário." + +#: ../folks/individual-aggregator.vala:1854 +msgid "Can't add personas with no primary store." +msgstr "Não é possível adicionar contatos sem um armazém primário." + +#: ../folks/individual-aggregator.vala:1859 +#, c-format +msgid "Can't write to requested property (“%s”) of the writeable store." +msgstr "Não é possível gravar para a propriedade (\"%s\") do armazém gravável." + +#: ../folks/postal-address-details.vala:211 +#, c-format +msgid "%s, %s, %s, %s, %s, %s, %s" +msgstr "%s, %s, %s, %s, %s, %s, %s" + +#: ../folks/role-details.vala:133 +#, c-format +msgid "Title: %s, Organisation: %s, Role: %s" +msgstr "Título: %s, Organização: %s, Cargo: %s" + +#. Translators: the parameter is a filename. +#: ../tools/import-pidgin.vala:48 +#, c-format +msgid "File %s does not exist." +msgstr "O arquivo %s não existe." + +#. Translators: the first parameter is a filename, and the second +#. * is an error message. +#: ../tools/import-pidgin.vala:64 +#, c-format +msgid "Failed to get information about file %s: %s" +msgstr "Falha ao obter informação sobre o arquivo %s: %s" + +#. Translators: the parameter is a filename. +#: ../tools/import-pidgin.vala:71 +#, c-format +msgid "File %s is not readable." +msgstr "O arquivo %s não pode ser lido." + +#. Translators: the parameter is a filename. +#: ../tools/import-pidgin.vala:81 +#, c-format +msgid "The Pidgin buddy list file '%s' could not be loaded." +msgstr "O arquivo \"%s\", lista de contatos do Pidgin não pôde ser carregado." + +#. Translators: the parameter is a filename. +#: ../tools/import-pidgin.vala:96 +#, c-format +msgid "" +"The Pidgin buddy list file ‘%s’ could not be loaded: the root element could " +"not be found or was not recognized." +msgstr "" +"O arquivo \"%s\", da lista de contatos do Pidgin não pôde ser carregado: o " +"elemento raiz não pôde ser encontrato ou não foi reconhecido." + +#. Translators: the first parameter is the number of buddies which +#. * were successfully imported, and the second is a filename. +#: ../tools/import-pidgin.vala:116 +#, c-format +msgid "Imported %u buddy from '%s'." +msgid_plural "Imported %u buddies from '%s'." +msgstr[0] "Importado %u contato de \"%s\"." +msgstr[1] "Importados %u contatos de \"%s\"." + +#. Translators: the first parameter is a persona identifier, +#. * and the second is an error message. +#: ../tools/import-pidgin.vala:163 +#, c-format +msgid "Error changing group of contact ‘%s’: %s" +msgstr "Erro ao modificar o grupo do contato \"%s\": %s" + +#. Translators: the parameter is the buddy's IM address. +#: ../tools/import-pidgin.vala:219 +#, c-format +msgid "" +"Ignoring buddy with no alias and only one IM address:\n" +"%s" +msgstr "" +"Ignorando contato sem alias e com somente um endereço de IM:\n" +"%s" + +#: ../tools/import-pidgin.vala:243 +#, c-format +msgid "" +"Failed to create new contact for buddy with alias ‘%s’ and IM addresses:\n" +"%s\n" +"Error: %s\n" +msgstr "" +"Falha ao criar novo contato para o amigo com alias \"%s\" e endereços de " +"IM:\n" +"%s\n" +"Erro: %s\n" + +#. Translators: the first parameter is a persona identifier, the +#. * second is an alias for the persona, and the third is a set of IM +#. * addresses each on a new line. +#: ../tools/import-pidgin.vala:257 +#, c-format +msgid "" +"Created contact ‘%s’ for buddy with alias ‘%s’ and IM addresses:\n" +"%s" +msgstr "" +"Criado contato \"%s\" para o amigo com alias \"%s\" e endereços de IM:\n" +"%s" + +#: ../tools/import.vala:44 +msgid "Source backend name (default: 'pidgin')" +msgstr "Nome do backend de origem (padrão: \"pidgin\")" + +#: ../tools/import.vala:47 +msgid "Source filename (default: specific to source backend)" +msgstr "Arquivo fonte (padrão: específico do backend de origem)" + +#: ../tools/import.vala:57 +msgid "— import meta-contact information to libfolks" +msgstr "- importar informação de meta-contatos para libfolks" + +#. Translators: the parameter is an error message. +#: ../tools/import.vala:67 +#, c-format +msgid "Couldn't parse command line options: %s" +msgstr "Não foi possível analisar as opções da linha de comandos: %s" + +#. Translators: the parameter is an error message. +#: ../tools/import.vala:108 +#, c-format +msgid "Couldn't load the backends: %s" +msgstr "Não foi possível carregar os backends: %s" + +#. Translators: the parameter is a backend identifier. +#: ../tools/import.vala:119 +#, c-format +msgid "Couldn't load the ‘%s’ backend." +msgstr "Não foi possível carregar o backend \"%s\"." + +#. Translators: the first parameter is a backend identifier and the +#. * second parameter is an error message. +#: ../tools/import.vala:132 +#, c-format +msgid "Couldn't prepare the ‘%s’ backend: %s" +msgstr "Não foi possível preparar o backend \"%s\": %s" + +#. Translators: the parameter is a backend identifier. +#: ../tools/import.vala:145 +#, c-format +msgid "Couldn't load the ‘%s’ backend's persona store." +msgstr "Não foi possível carregar o backend do armazém de contatos \"%s\"." + +#: ../tools/import.vala:166 +#, c-format +msgid "Couldn't prepare the ‘%s’ backend's persona store: %s" +msgstr "Não foi possível preparar o backend do armazém de contatos \"%s\": %s" + +#. Translators: the parameter is an error message. +#: ../tools/import.vala:184 +#, c-format +msgid "Error importing contacts: %s" +msgstr "Erro ao importar contatos: %s" + +#. Translators: both parameters are identifiers for backends. +#: ../tools/import.vala:198 +#, c-format +msgid "" +"Unrecognized source backend name ‘%s’. ‘%s’ is currently the only supported " +"source backend." +msgstr "" +"Nome do backend de origem não reconhecido: \"%s\". O backend \"%s\" é a " +"única origem suportada." diff -Nru folks-0.6.6/po/sl.po folks-0.6.7/po/sl.po --- folks-0.6.6/po/sl.po 2011-12-13 23:32:35.000000000 +0000 +++ folks-0.6.7/po/sl.po 2012-02-18 00:46:31.000000000 +0000 @@ -2,14 +2,14 @@ # Copyright (C) 2011 folks's COPYRIGHT HOLDER # This file is distributed under the same license as the folks package. # -# Matej Urbančič , 2011. +# Matej Urbančič , 2011 - 2012. # msgid "" msgstr "" "Project-Id-Version: folks master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=folks&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-11-10 18:05+0000\n" -"PO-Revision-Date: 2011-11-10 21:11+0100\n" +"POT-Creation-Date: 2012-01-31 12:15+0000\n" +"PO-Revision-Date: 2012-01-31 20:00+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" "Language: Slovenian\n" @@ -23,14 +23,14 @@ #. Translators: the first parameter is an address book #. * URI and the second is a persona UID. -#: ../backends/eds/lib/edsf-persona-store.vala:480 +#: ../backends/eds/lib/edsf-persona-store.vala:533 #, c-format msgid "Address book ‘%s’ is offline, so contact ‘%s’ cannot be removed." msgstr "Imenik ‘%s’ ni povezan, zato stika ‘%s’ ni mogoče odstraniti." #. Translators: the first parameter is an address book #. * URI and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:486 +#: ../backends/eds/lib/edsf-persona-store.vala:539 #, c-format msgid "Permission denied to remove contact ‘%s’: %s" msgstr "Ni ustreznega dovoljenja za odstranjevanje stika ‘%s’: %s" @@ -38,156 +38,150 @@ # oseba ima več "person", več računov, IM, lalaa # oseba ima torej več "stikov" #. Translators: the parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:491 +#: ../backends/eds/lib/edsf-persona-store.vala:544 #, c-format msgid "Removing contacts isn't supported by this persona store: %s" msgstr "Odstranjevanje stikov ni podprto s strani zaloge stikov: %s" -#: ../backends/eds/lib/edsf-persona-store.vala:520 +#: ../backends/eds/lib/edsf-persona-store.vala:573 #, c-format msgid "Can't remove contact ‘%s’: %s" msgstr "Ni mogoče odstraniti stika ‘%s’: %s" #. Translators: the parameter is an address book #. * URI. -#: ../backends/eds/lib/edsf-persona-store.vala:588 -#: ../backends/eds/lib/edsf-persona-store.vala:777 +#: ../backends/eds/lib/edsf-persona-store.vala:651 +#: ../backends/eds/lib/edsf-persona-store.vala:846 #, c-format msgid "Address book ‘%s’ is offline." msgstr "Imenik '%s' ni povezan." #. Translators: the first parameter is an address #. * book URI and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:593 -#: ../backends/eds/lib/edsf-persona-store.vala:782 +#: ../backends/eds/lib/edsf-persona-store.vala:656 +#: ../backends/eds/lib/edsf-persona-store.vala:851 #, c-format msgid "Permission denied to open address book ‘%s’: %s" msgstr "Ni ustreznih dovoljenj za odpiranje imenika ‘%s’: %s" #. Translators: the first parameter is an address book URI #. * and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:626 +#: ../backends/eds/lib/edsf-persona-store.vala:689 #, c-format msgid "Couldn't open address book ‘%s’: %s" msgstr "Ni mogoče odpreti imenika ‘%s’: %s" -#. Translators: the parameter is an address book URI. -#: ../backends/eds/lib/edsf-persona-store.vala:636 -#, c-format -msgid "Couldn't open address book ‘%s’." -msgstr "Ni mogoče odpreti imenika ‘%s’." - #. Translators: the parameteter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:698 -#: ../backends/eds/lib/edsf-persona-store.vala:725 +#: ../backends/eds/lib/edsf-persona-store.vala:754 +#: ../backends/eds/lib/edsf-persona-store.vala:785 #, c-format msgid "Couldn't get address book capabilities: %s" msgstr "Ni mogoče pridobiti podatkov o zmožnosti imenika: %s" #. Translators: the parameter is an address book URI. -#: ../backends/eds/lib/edsf-persona-store.vala:738 +#: ../backends/eds/lib/edsf-persona-store.vala:802 #, c-format msgid "Couldn't get view for address book ‘%s’." msgstr "Ni mogoče pridobiti pogleda za imenik ‘%s’." #. Translators: the first parameter is an address book URI #. * and the second is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:815 +#: ../backends/eds/lib/edsf-persona-store.vala:884 #, c-format msgid "Couldn't get view for address book ‘%s’: %s" msgstr "Ni mogoče pridobiti pogleda za imenik ‘%s’: %s" -#: ../backends/eds/lib/edsf-persona-store.vala:1045 +#: ../backends/eds/lib/edsf-persona-store.vala:1247 #, c-format msgid "Changing the ‘%s’ property failed due to reaching the timeout." msgstr "Spreminjanje lastnosti ‘%s’ je spodletelo zaradi časovne omejitve." -#: ../backends/eds/lib/edsf-persona-store.vala:1067 +#: ../backends/eds/lib/edsf-persona-store.vala:1278 #: ../folks/avatar-details.vala:59 msgid "Avatar is not writeable on this contact." msgstr "Podoba tega stika ni zapisljiva." -#: ../backends/eds/lib/edsf-persona-store.vala:1088 -#: ../folks/web-service-details.vala:118 +#: ../backends/eds/lib/edsf-persona-store.vala:1299 +#: ../folks/web-service-details.vala:123 msgid "Web service addresses are not writeable on this contact." msgstr "Naslovi spletnih storitev za ta stik niso zapisljivi." -#: ../backends/eds/lib/edsf-persona-store.vala:1129 -#: ../folks/url-details.vala:148 +#: ../backends/eds/lib/edsf-persona-store.vala:1335 +#: ../folks/url-details.vala:152 msgid "URLs are not writeable on this contact." msgstr "Naslovi URL za ta stik niso zapisljivi." -#: ../backends/eds/lib/edsf-persona-store.vala:1207 +#: ../backends/eds/lib/edsf-persona-store.vala:1413 #: ../folks/local-id-details.vala:64 msgid "Local IDs are not writeable on this contact." msgstr "Krajevni ID za ta stik ni zapisljiv." -#: ../backends/eds/lib/edsf-persona-store.vala:1239 +#: ../backends/eds/lib/edsf-persona-store.vala:1440 msgid "The contact cannot be marked as favourite." msgstr "Stika ni mogoče označiti kot priljubljenega." #. Translators: the parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:1314 +#: ../backends/eds/lib/edsf-persona-store.vala:1507 #, c-format msgid "Can't update avatar: %s" msgstr "Podobe ni mogoče posodobiti: %s" -#: ../backends/eds/lib/edsf-persona-store.vala:1325 -#: ../folks/email-details.vala:115 +#: ../backends/eds/lib/edsf-persona-store.vala:1518 +#: ../folks/email-details.vala:120 msgid "E-mail addresses are not writeable on this contact." msgstr "Elektronski poštni naslov za ta stik ni zapisljiv." -#: ../backends/eds/lib/edsf-persona-store.vala:1339 -#: ../folks/phone-details.vala:223 +#: ../backends/eds/lib/edsf-persona-store.vala:1532 +#: ../folks/phone-details.vala:229 msgid "Phone numbers are not writeable on this contact." msgstr "Telefonske številke za ta stik niso zapisljive." -#: ../backends/eds/lib/edsf-persona-store.vala:1353 -#: ../folks/postal-address-details.vala:335 +#: ../backends/eds/lib/edsf-persona-store.vala:1546 +#: ../folks/postal-address-details.vala:361 msgid "Postal addresses are not writeable on this contact." msgstr "Poštni naslov za ta stik ni zapisljiv." -#: ../backends/eds/lib/edsf-persona-store.vala:1420 +#: ../backends/eds/lib/edsf-persona-store.vala:1613 #: ../folks/name-details.vala:281 msgid "Full name is not writeable on this contact." msgstr "Polno ime za ta stik ni zapisljivo." -#: ../backends/eds/lib/edsf-persona-store.vala:1441 +#: ../backends/eds/lib/edsf-persona-store.vala:1635 #: ../folks/name-details.vala:319 msgid "Nickname is not writeable on this contact." msgstr "Vzdevek za ta stik ni zapisljiv." -#: ../backends/eds/lib/edsf-persona-store.vala:1462 -#: ../folks/note-details.vala:141 +#: ../backends/eds/lib/edsf-persona-store.vala:1657 +#: ../folks/note-details.vala:136 msgid "Notes are not writeable on this contact." msgstr "Opombe za ta stik niso zapisljive." -#: ../backends/eds/lib/edsf-persona-store.vala:1491 +#: ../backends/eds/lib/edsf-persona-store.vala:1686 #: ../folks/birthday-details.vala:60 msgid "Birthday is not writeable on this contact." msgstr "Rojstni datum tega stika ni zapisljiv." -#: ../backends/eds/lib/edsf-persona-store.vala:1530 -#: ../folks/role-details.vala:255 +#: ../backends/eds/lib/edsf-persona-store.vala:1730 +#: ../folks/role-details.vala:277 msgid "Roles are not writeable on this contact." msgstr "Vloge za ta stik niso zapisljive." -#: ../backends/eds/lib/edsf-persona-store.vala:1631 +#: ../backends/eds/lib/edsf-persona-store.vala:1831 #: ../folks/name-details.vala:244 msgid "Structured name is not writeable on this contact." msgstr "Oblikovno ime za ta stik ni zapisljivo." -#: ../backends/eds/lib/edsf-persona-store.vala:1665 -#: ../folks/im-details.vala:130 +#: ../backends/eds/lib/edsf-persona-store.vala:1871 +#: ../folks/im-details.vala:136 msgid "IM addresses are not writeable on this contact." msgstr "Naslov hipnega sporočanja za ta stik ni zapisljiv." -#: ../backends/eds/lib/edsf-persona-store.vala:1715 +#: ../backends/eds/lib/edsf-persona-store.vala:1921 #: ../folks/group-details.vala:168 msgid "Groups are not writeable on this contact." msgstr "Skupine za ta stik niso zapisljive." -#: ../backends/eds/lib/edsf-persona-store.vala:1745 +#: ../backends/eds/lib/edsf-persona-store.vala:1951 #: ../folks/gender-details.vala:77 msgid "Gender is not writeable on this contact." msgstr "Spol za ta stik ni zapisljiv." @@ -195,7 +189,7 @@ #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error #. * message. -#: ../backends/eds/lib/edsf-persona-store.vala:1879 +#: ../backends/eds/lib/edsf-persona-store.vala:2100 #, c-format msgid "Property ‘%s’ is not writeable: %s" msgstr "Lastnost '%s' ni zapisljiva: %s" @@ -203,28 +197,28 @@ #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error #. * message. -#: ../backends/eds/lib/edsf-persona-store.vala:1888 +#: ../backends/eds/lib/edsf-persona-store.vala:2109 #, c-format msgid "Invalid value for property ‘%s’: %s" msgstr "Neveljavna vrednost za lastnost ‘%s’: %s" #. Translators: the first parameter is a non-human-readable #. * property name and the second parameter is an error message. -#: ../backends/eds/lib/edsf-persona-store.vala:1914 +#: ../backends/eds/lib/edsf-persona-store.vala:2135 #, c-format msgid "Unknown error setting property ‘%s’: %s" msgstr "Neznana napaka med nastavljanjem lastnosti ‘%s’: %s" #. Translators: the first parameter is a filename, #. * and the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:205 +#: ../backends/key-file/kf-persona-store.vala:224 #, c-format msgid "The relationship key file '%s' could not be loaded: %s" msgstr "Datoteke ključa sorodnosti stikov '%s' ni mogoče naložiti: %s " #. Translators: the first parameter is a path, and #. * the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:227 +#: ../backends/key-file/kf-persona-store.vala:246 #, c-format msgid "The relationship key file directory '%s' could not be created: %s" msgstr "Mape datoteke ključa sorodnosti stikov '%s' ni mogoče ustvariti: %s" @@ -232,14 +226,14 @@ # relationship keyfile = allows linking of Personas from other backends by creating a Kf.Persona containing linkable properties which can be matched against the Personas being linked together #. Translators: the first parameter is a filename, #. * and the second is an error message. -#: ../backends/key-file/kf-persona-store.vala:251 +#: ../backends/key-file/kf-persona-store.vala:270 #, c-format msgid "The relationship key file '%s' could not be created: %s" msgstr "Datoteke ključa sorodnosti stikov '%s' ni mogoče ustvariti: %s " #. Translators: the first parameter is a filename, the second is #. * an error message. -#: ../backends/key-file/kf-persona-store.vala:436 +#: ../backends/key-file/kf-persona-store.vala:463 #, c-format msgid "Could not write updated key file '%s': %s" msgstr "Ni mogoče zapisati posodobljene datoteke ključa '%s': %s" @@ -249,97 +243,97 @@ #. * an IM address (e.g. “foo@jabber.org”), the second is #. * the name of a protocol (e.g. “jabber”) and the third is #. * an error message. -#: ../backends/key-file/kf-persona.vala:169 +#: ../backends/key-file/kf-persona.vala:171 #, c-format msgid "Invalid IM address ‘%s’ for protocol ‘%s’: %s" msgstr "Neveljaven naslov hipne povezave ‘%s’ za protokol ‘%s’: %s" #. Translators: the parameter is an error message. -#: ../backends/key-file/kf-persona.vala:357 +#: ../backends/key-file/kf-persona.vala:364 #, c-format msgid "Couldn't load data from key file: %s" msgstr "Ni mogoče naložiti podatkov iz datoteke ključa: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:504 +#: ../backends/telepathy/lib/tp-lowlevel.c:508 #, c-format msgid "Error requesting a group channel: %s" msgstr "Napaka med podajanjem zahteve za skupinski kanala: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:522 +#: ../backends/telepathy/lib/tp-lowlevel.c:526 #, c-format msgid "Error requesting group handles: %s" msgstr "Napaka med podajanjem zahteve za skupinske ročnike: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:560 +#: ../backends/telepathy/lib/tp-lowlevel.c:564 #, c-format msgid "Failed to change contact's alias: %s" msgstr "Spreminjanje vzdevka stika je spodletelo: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:619 +#: ../backends/telepathy/lib/tp-lowlevel.c:623 #, c-format msgid "Failed to create group channel: %s" msgstr "Ustvarjanje skupine kanalov je spodletelo: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:651 +#: ../backends/telepathy/lib/tp-lowlevel.c:655 #, c-format msgid "Get Channels property failed: %s" msgstr "Pridobivanje lastnosti kanalov je spodletelo: %s" #. Translators: the first parameter is a group channel identifier and the #. * second is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:693 +#: ../backends/telepathy/lib/tp-lowlevel.c:697 #, c-format msgid "Failed to add contact to group '%s': %s" msgstr "Dodajanje stika v skupino '%s' je spodletelo: %s" #. Translators: the first parameter is a group channel identifier and the #. * second is an error message. -#: ../backends/telepathy/lib/tp-lowlevel.c:709 +#: ../backends/telepathy/lib/tp-lowlevel.c:713 #, c-format msgid "Failed to remove contact from group '%s': %s" msgstr "Odstranjevanje stika iz skupine '%s' je spodletelo: %s" #. Translators: the first parameter is a pointer address and the #. * second is a contact handle (numeric identifier). -#: ../backends/telepathy/lib/tp-lowlevel.c:732 +#: ../backends/telepathy/lib/tp-lowlevel.c:736 #, c-format msgid "Invalid group channel %p to add handle %d to." msgstr "Neveljaven skupinski kanal %p za dodelitev ročnika %d." -#: ../backends/telepathy/lib/tpf-persona-store.vala:596 +#: ../backends/telepathy/lib/tpf-persona-store.vala:637 msgid "Couldn't connect to the telepathy-logger service." msgstr "Ni se mogoče povezati s storitvijo telepathy-logger." -#: ../backends/telepathy/lib/tpf-persona-store.vala:631 +#: ../backends/telepathy/lib/tpf-persona-store.vala:676 msgid "Lost connection to the telepathy-logger service." msgstr "Povezava s storitvijo telepathy-logger je izgubljena." #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:663 -#: ../backends/telepathy/lib/tpf-persona-store.vala:675 +#: ../backends/telepathy/lib/tpf-persona-store.vala:708 +#: ../backends/telepathy/lib/tpf-persona-store.vala:720 #, c-format msgid "Couldn't get list of favorite contacts: %s" msgstr "Ni mogoče pridobiti seznama priljubljenih stikov: %s" #. Translators: the parameter is an identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:712 +#: ../backends/telepathy/lib/tpf-persona-store.vala:757 #, c-format msgid "Unknown Telepathy contact ‘%s’ in favorites list." msgstr "Neznan stik Telepathy '%s' na seznamu priljubljenih." #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:743 +#: ../backends/telepathy/lib/tpf-persona-store.vala:788 #, c-format msgid "Couldn't add favorite contacts: %s" msgstr "Ni mogoče dodati priljubljenega stika: %s" #. Translators: the parameter is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:764 +#: ../backends/telepathy/lib/tpf-persona-store.vala:809 #, c-format msgid "Couldn't remove favorite contacts: %s" msgstr "Ni mogoče odstraniti priljubljenega stika: %s" @@ -347,7 +341,7 @@ #. Translators: the first parameter is the display name for #. * the Telepathy account, and the second is an error #. * message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:884 +#: ../backends/telepathy/lib/tpf-persona-store.vala:935 #, c-format msgid "Failed to determine whether we can set aliases on Telepathy account '%s': %s" msgstr "Določevanje ali je mogoče določiti vzdevke računa Telepathy '%s' je spodletelo: %s" @@ -355,39 +349,39 @@ #. Translators: the first parameter is the display name for #. * the Telepathy account, and the second is an error #. * message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:937 +#: ../backends/telepathy/lib/tpf-persona-store.vala:988 #, c-format msgid "Failed to determine whether we can set groups on Telepathy account '%s': %s" msgstr "Določevanje ali je mogoče določiti skupine računa Telepathy '%s' je spodletelo: %s" #. Translators: the first parameter is a Telepathy handle, #. * and the second is an error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1114 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1166 #, c-format msgid "Failed to create contact for self handle '%u': %s" msgstr "Ustvarjanje stika za ročnik '%u': %s" #. Translators: do not translate "NewChannels", as it's a D-Bus #. * signal name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1145 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1197 msgid "Error creating channel for NewChannels signal." msgstr "Napaka ustvarjanja kanala za signal NewChannels." #. Translators: the parameter is a persona identifier and #. * the second parameter is a group name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1184 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1236 #, c-format msgid "Failed to add Telepathy contact ‘%s’ to group ‘%s’." msgstr "Dodajanje stika Telepathy ‘%s’ v skupino ‘%s’ je spodletelo." #. Translators: the parameter is a persona identifier #. * and the second parameter is a group name. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1192 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1247 #, c-format msgid "Failed to remove Telepathy contact ‘%s’ from group ‘%s’." msgstr "Odstranjevanje stika Telepathy ‘%s’ iz skupine ‘%s’ je spodletelo." -#: ../backends/telepathy/lib/tpf-persona-store.vala:1546 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1613 msgid "Telepathy contacts representing the local user may not be removed." msgstr "Stikov Telepathy, ki predstavljajo krajevnega uporabnika ni mogoče odstraniti." @@ -397,10 +391,10 @@ #. Translators: The first parameter is a contact identifier, #. * the second is a contact list identifier and the third is an #. * error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1560 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1575 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1590 -#: ../backends/telepathy/lib/tpf-persona-store.vala:1764 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1634 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1649 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1664 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1845 #, c-format msgid "Failed to remove Telepathy contact ‘%s’ from ‘%s’ list: %s" msgstr "Odstranjevanje stika Telepathy ‘%s’ iz seznama ‘%s’ je spodletelo: %s" @@ -408,21 +402,21 @@ #. Translators: The first parameter is a contact identifier, #. * the second is a contact list identifier and the third is an #. * error message. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1754 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1835 #, c-format msgid "Failed to add Telepathy contact ‘%s’ to ‘%s’ list: %s" msgstr "Dodajanje stika Telepathy ‘%s’ na seznam stikov ‘%s’ je spodletelo: %s" #. Translators: the first parameter is a channel identifier and #. * the second is an error message.. -#: ../backends/telepathy/lib/tpf-persona-store.vala:1866 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1948 #, c-format msgid "Failed to create incoming Telepathy contacts from channel ‘%s’: %s" msgstr "Ustvarjanje prihajajočih stikov Telepathy preko kanala ‘%s’ je spodletelo: %s" #. Translators: the first two parameters are store identifiers and #. * the third is a contact identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2047 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2186 #, c-format msgid "" "Persona store (%s, %s) requires the following details:\n" @@ -431,13 +425,13 @@ "Zaloga stika (%s, %s) zahteva naslednje podatke:\n" " stik (ponujen: '%s')\n" -#: ../backends/telepathy/lib/tpf-persona-store.vala:2062 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2201 msgid "Cannot create a new Telepathy contact while offline." msgstr "Novega stika Telepathy brez povezave ni mogoče ustvariti." #. Translators: the parameter is the number of personas #. * which were returned. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2114 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2253 #, c-format msgid "Requested a single persona, but got %u persona back." msgid_plural "Requested a single persona, but got %u personas back." @@ -446,35 +440,39 @@ msgstr[2] "Podana je zahteva za podatke enega stika, vrnjena pa sta %u stika." msgstr[3] "Podana je zahteva za podatke enega stika, vrnjeni pa so %u stiki." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2125 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2264 #, c-format msgid "Failed to add a persona from details: %s" msgstr "Dodajanje stika iz podatkov je spodletelo: %s" #. Translators: "telepathy-logger" is the name of an application, #. * and should not be translated. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2145 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2284 msgid "Failed to change favorite without a connection to the telepathy-logger service." msgstr "Spreminjanje priljubljenih ni mogoče brez povezave s storitvijo telepathy-logger." +#: ../backends/telepathy/lib/tpf-persona-store.vala:2290 +msgid "Failed to change favorite status of Telepathy Persona because it has no attached TpContact." +msgstr "Spreminjanje stanja priljubljenih za stik Telepathy je spodletelo, ker ni ustreznega predmeta TpContact." + #. Translators: the parameter is a contact identifier. -#: ../backends/telepathy/lib/tpf-persona-store.vala:2163 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2308 #, c-format msgid "Failed to change favorite status for Telepathy contact ‘%s’." msgstr "Spreminjanje stanja priljubljenih za stik Telepathy ‘%s’ je spodledelo." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2258 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2410 msgid "Extended information may only be set on the user's Telepathy contact." msgstr "Razširjene podrobnost je mogoče določiti le na stiku uporabnika programa Telepathy." -#: ../backends/telepathy/lib/tpf-persona-store.vala:2287 +#: ../backends/telepathy/lib/tpf-persona-store.vala:2439 msgid "Extended information cannot be written because the store is disconnected." msgstr "Razširjenih podrobnosti ni mogoče zapisati, saj povezava s trgovino ni vzpostavljena." #. Translators: the first parameter is the unknown key that #. * was received with the details params, and the second #. * identifies the persona store. -#: ../backends/tracker/lib/trf-persona-store.vala:733 +#: ../backends/tracker/lib/trf-persona-store.vala:739 #, c-format msgid "Unrecognized parameter '%s' passed to persona store '%s'." msgstr "Poslan je neprepoznan parameter '%s' v zalogo stikov '%s'." @@ -485,46 +483,46 @@ #. Translators: the first parameter is a backend name, and the #. * second is an error message. -#: ../folks/backend-store.vala:354 +#: ../folks/backend-store.vala:366 #, c-format msgid "Error preparing Backend '%s': %s" msgstr "Napaka pripravljanja ozadnjega programa '%s': %s" #. Translators: the first parameter is a folder path and the second #. * is an error message. -#: ../folks/backend-store.vala:547 +#: ../folks/backend-store.vala:559 #, c-format msgid "Error listing contents of folder '%s': %s" msgstr "Napaka med izpisovanjem vsebine mape '%s': %s" #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:580 +#: ../folks/backend-store.vala:601 #, c-format msgid "The content type of '%s' could not be determined. Have you installed shared-mime-info?" msgstr "Vrste vsebine '%s' ni mogoče določiti. Ali je nameščen paket shared-mime-info?" #. Translators: the first parameter is a filename and the second is an #. * error message. -#: ../folks/backend-store.vala:603 +#: ../folks/backend-store.vala:629 #, c-format msgid "Failed to load module from path '%s': %s" msgstr "Nalaganje modula na poti '%s' je spodletelo: %s" #. Translators: the first parameter is a function name, the second is #. * a filename and the third is an error message. -#: ../folks/backend-store.vala:618 +#: ../folks/backend-store.vala:645 #, c-format msgid "Failed to find entry point function '%s' in '%s': %s" msgstr "Iskanje funkcije vstopne točke '%s' v '%s' je spodletelo: %s" #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:659 +#: ../folks/backend-store.vala:686 #, c-format msgid "File or directory '%s' does not exist." msgstr "Datoteka ali imenik '%s' ne obstaja." #. Translators: the parameter is a filename. -#: ../folks/backend-store.vala:665 +#: ../folks/backend-store.vala:692 #, c-format msgid "Failed to get content type for '%s'." msgstr "Pridobivanje vrste vsebine za '%s' je spodletelo." @@ -538,54 +536,66 @@ msgstr "Polje stanja priljubljenih za ta stik ni zapisljivo." #. Translators: the parameter is an IM address. -#: ../folks/im-details.vala:172 -#: ../folks/im-details.vala:186 -#: ../folks/im-details.vala:208 -#: ../folks/im-details.vala:235 +#: ../folks/im-details.vala:178 +#: ../folks/im-details.vala:192 +#: ../folks/im-details.vala:214 +#: ../folks/im-details.vala:241 #, c-format msgid "The IM address '%s' could not be understood." msgstr "Naslova hipnega stika '%s' ni mogoče razumeti." #. Translators: the first parameter is a persona store identifier #. * and the second is an error message. -#: ../folks/individual-aggregator.vala:699 +#: ../folks/individual-aggregator.vala:782 #, c-format msgid "Error preparing persona store '%s': %s" msgstr "Napaka med pripravljanjem zaloge stikov '%s': %s." #. Translators: the parameter is a property name. -#: ../folks/individual-aggregator.vala:893 -#: ../folks/individual-aggregator.vala:1075 +#: ../folks/individual-aggregator.vala:977 +#: ../folks/individual-aggregator.vala:1160 #, c-format msgid "Unknown property '%s' in linkable property list." msgstr "Neznana lastnost '%s' v seznamu povezljivih lastnosti." #. Translators: the first parameter is a store identifier #. * and the second parameter is an error message. -#: ../folks/individual-aggregator.vala:1495 +#: ../folks/individual-aggregator.vala:1580 #, c-format msgid "Failed to add contact for persona store ID '%s': %s" msgstr "Dodajanje stika za ID zalogo stikov '%s' je spodletelo: %s" -#: ../folks/individual-aggregator.vala:1576 -msgid "Can't link personas with no primary store." +#: ../folks/individual-aggregator.vala:1661 +msgid "Can’t link personas with no primary store." msgstr "Ni mogoče povezati stikov brez osnovne zaloge osebe." -#: ../folks/individual-aggregator.vala:1833 -msgid "Can't add personas with no primary store." +#: ../folks/individual-aggregator.vala:1662 +#: ../folks/individual-aggregator.vala:1927 +#, c-format +msgid "Persona store ‘%s:%s’ is configured as primary, but could not be found or failed to load." +msgstr "Zaloga osebe ‘%s:%s’ je nastavljena kot osnovna, vendar pa je ni mogoče najti oziroma naložiti." + +#: ../folks/individual-aggregator.vala:1663 +#: ../folks/individual-aggregator.vala:1928 +#, c-format +msgid "Check the service providing the persona store is running, or change the default store in that service or using the “%s” GConf key." +msgstr "Preverite ali je storitev, ki omogoča zaloge oseb, zagnana ali pa spremenite privzeto zalogo v storitvi oziroma s ključem GConf “%s”." + +#: ../folks/individual-aggregator.vala:1926 +msgid "Can’t add personas with no primary store." msgstr "Ni mogoče dodati stikov brez osnovne zaloge osebe." -#: ../folks/individual-aggregator.vala:1838 +#: ../folks/individual-aggregator.vala:1935 #, c-format msgid "Can't write to requested property (“%s”) of the writeable store." msgstr "Ni mogoče pisati v zahtevano lastnost (“%s”) zapisljive zaloge." -#: ../folks/postal-address-details.vala:211 +#: ../folks/postal-address-details.vala:231 #, c-format msgid "%s, %s, %s, %s, %s, %s, %s" msgstr "%s, %s, %s, %s, %s, %s, %s" -#: ../folks/role-details.vala:133 +#: ../folks/role-details.vala:148 #, c-format msgid "Title: %s, Organisation: %s, Role: %s" msgstr "Naslov: %s, ustanova: %s, vloga: %s" @@ -732,3 +742,5 @@ msgid "Unrecognized source backend name ‘%s’. ‘%s’ is currently the only supported source backend." msgstr "Neprepoznano ime ozadnjega programa vira '%s'. Trenutno je podprt le ozadnji program vira ‘%s’." +#~ msgid "Couldn't open address book ‘%s’." +#~ msgstr "Ni mogoče odpreti imenika ‘%s’." diff -Nru folks-0.6.6/po/zh_CN.po folks-0.6.7/po/zh_CN.po --- folks-0.6.6/po/zh_CN.po 1970-01-01 00:00:00.000000000 +0000 +++ folks-0.6.7/po/zh_CN.po 2012-02-18 00:46:31.000000000 +0000 @@ -0,0 +1,753 @@ +# Chinese (China) translation for folks. +# Copyright (C) 2011 folks's COPYRIGHT HOLDER +# This file is distributed under the same license as the folks package. +# Wylmer Wang , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: folks master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=folks&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-01-30 19:09+0000\n" +"PO-Revision-Date: 2012-02-16 19:55+0800\n" +"Last-Translator: Wylmer Wang \n" +"Language-Team: Chinese (China) \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#. Translators: the first parameter is an address book +#. * URI and the second is a persona UID. +#: ../backends/eds/lib/edsf-persona-store.vala:533 +#, c-format +msgid "Address book ‘%s’ is offline, so contact ‘%s’ cannot be removed." +msgstr "地址簿“%s”为离线，因此不能移除联系人“%s”。" + +#. Translators: the first parameter is an address book +#. * URI and the second is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:539 +#, c-format +msgid "Permission denied to remove contact ‘%s’: %s" +msgstr "移除联系人“%s”的权限不足：%s" + +#. Translators: the parameter is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:544 +#, c-format +msgid "Removing contacts isn't supported by this persona store: %s" +msgstr "此 persona 商店不支持移除联系人：%s" + +#: ../backends/eds/lib/edsf-persona-store.vala:573 +#, c-format +msgid "Can't remove contact ‘%s’: %s" +msgstr "无法移除联系人“%s”：%s" + +#. Translators: the parameter is an address book +#. * URI. +#: ../backends/eds/lib/edsf-persona-store.vala:651 +#: ../backends/eds/lib/edsf-persona-store.vala:846 +#, c-format +msgid "Address book ‘%s’ is offline." +msgstr "地址簿“%s”离线。" + +#. Translators: the first parameter is an address +#. * book URI and the second is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:656 +#: ../backends/eds/lib/edsf-persona-store.vala:851 +#, c-format +msgid "Permission denied to open address book ‘%s’: %s" +msgstr "打开地址簿“%s”的权限不足：%s" + +#. Translators: the first parameter is an address book URI +#. * and the second is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:689 +#, c-format +msgid "Couldn't open address book ‘%s’: %s" +msgstr "无法打开地址簿“%s”：%s" + +#. Translators: the parameteter is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:754 +#: ../backends/eds/lib/edsf-persona-store.vala:785 +#, c-format +msgid "Couldn't get address book capabilities: %s" +msgstr "无法获取地址簿容量：%s" + +#. Translators: the parameter is an address book URI. +#: ../backends/eds/lib/edsf-persona-store.vala:802 +#, c-format +msgid "Couldn't get view for address book ‘%s’." +msgstr "无法获取地址簿“%s”的视图。" + +#. Translators: the first parameter is an address book URI +#. * and the second is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:884 +#, c-format +msgid "Couldn't get view for address book ‘%s’: %s" +msgstr "无法获取地址簿“%s”的视图：%s" + +#: ../backends/eds/lib/edsf-persona-store.vala:1247 +#, c-format +msgid "Changing the ‘%s’ property failed due to reaching the timeout." +msgstr "由于超时，更改“%s”属性失败。" + +#: ../backends/eds/lib/edsf-persona-store.vala:1278 +#: ../folks/avatar-details.vala:59 +msgid "Avatar is not writeable on this contact." +msgstr "此联系人的头像不可写。" + +#: ../backends/eds/lib/edsf-persona-store.vala:1299 +#: ../folks/web-service-details.vala:123 +msgid "Web service addresses are not writeable on this contact." +msgstr "此联系人的网络服务地址不可写。" + +#: ../backends/eds/lib/edsf-persona-store.vala:1335 +#: ../folks/url-details.vala:152 +msgid "URLs are not writeable on this contact." +msgstr "此联系人的 URL 不可写。" + +#: ../backends/eds/lib/edsf-persona-store.vala:1413 +#: ../folks/local-id-details.vala:64 +msgid "Local IDs are not writeable on this contact." +msgstr "此联系人的本地 ID 不可写。" + +#: ../backends/eds/lib/edsf-persona-store.vala:1440 +msgid "The contact cannot be marked as favourite." +msgstr "" + +#. Translators: the parameter is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:1507 +#, c-format +msgid "Can't update avatar: %s" +msgstr "无法更新头像：%s" + +#: ../backends/eds/lib/edsf-persona-store.vala:1518 +#: ../folks/email-details.vala:120 +msgid "E-mail addresses are not writeable on this contact." +msgstr "此联系人的电子邮箱地址不可写。" + +#: ../backends/eds/lib/edsf-persona-store.vala:1532 +#: ../folks/phone-details.vala:229 +msgid "Phone numbers are not writeable on this contact." +msgstr "此联系人的电话号码不可写。" + +#: ../backends/eds/lib/edsf-persona-store.vala:1546 +#: ../folks/postal-address-details.vala:361 +msgid "Postal addresses are not writeable on this contact." +msgstr "此联系人的邮政地址不可写。" + +#: ../backends/eds/lib/edsf-persona-store.vala:1613 +#: ../folks/name-details.vala:281 +msgid "Full name is not writeable on this contact." +msgstr "此联系人的全名不可写。" + +#: ../backends/eds/lib/edsf-persona-store.vala:1635 +#: ../folks/name-details.vala:319 +msgid "Nickname is not writeable on this contact." +msgstr "此联系人的昵称不可写。" + +#: ../backends/eds/lib/edsf-persona-store.vala:1657 +#: ../folks/note-details.vala:136 +msgid "Notes are not writeable on this contact." +msgstr "此联系人的备注不可写。" + +#: ../backends/eds/lib/edsf-persona-store.vala:1686 +#: ../folks/birthday-details.vala:60 +msgid "Birthday is not writeable on this contact." +msgstr "此联系人的生日不可写。" + +#: ../backends/eds/lib/edsf-persona-store.vala:1730 +#: ../folks/role-details.vala:277 +msgid "Roles are not writeable on this contact." +msgstr "此联系人的身份不可写。" + +#: ../backends/eds/lib/edsf-persona-store.vala:1831 +#: ../folks/name-details.vala:244 +#, fuzzy +msgid "Structured name is not writeable on this contact." +msgstr "此联系人的正式姓名不可写。" + +#: ../backends/eds/lib/edsf-persona-store.vala:1871 +#: ../folks/im-details.vala:136 +msgid "IM addresses are not writeable on this contact." +msgstr "此联系人的聊天账户地址不可写。" + +#: ../backends/eds/lib/edsf-persona-store.vala:1921 +#: ../folks/group-details.vala:168 +msgid "Groups are not writeable on this contact." +msgstr "此联系人的组不可写。" + +#: ../backends/eds/lib/edsf-persona-store.vala:1951 +#: ../folks/gender-details.vala:77 +msgid "Gender is not writeable on this contact." +msgstr "此联系人的性别不可写。" + +#. Translators: the first parameter is a non-human-readable +#. * property name and the second parameter is an error +#. * message. +#: ../backends/eds/lib/edsf-persona-store.vala:2100 +#, c-format +msgid "Property ‘%s’ is not writeable: %s" +msgstr "属性“%s”不可写：%s" + +#. Translators: the first parameter is a non-human-readable +#. * property name and the second parameter is an error +#. * message. +#: ../backends/eds/lib/edsf-persona-store.vala:2109 +#, c-format +msgid "Invalid value for property ‘%s’: %s" +msgstr "属性“%s”的值无效：%s" + +#. Translators: the first parameter is a non-human-readable +#. * property name and the second parameter is an error message. +#: ../backends/eds/lib/edsf-persona-store.vala:2135 +#, c-format +msgid "Unknown error setting property ‘%s’: %s" +msgstr "设置属性“%s”时出现未知错误：%s" + +#. Translators: the first parameter is a filename, +#. * and the second is an error message. +#: ../backends/key-file/kf-persona-store.vala:224 +#, c-format +msgid "The relationship key file '%s' could not be loaded: %s" +msgstr "" + +#. Translators: the first parameter is a path, and +#. * the second is an error message. +#: ../backends/key-file/kf-persona-store.vala:246 +#, c-format +msgid "The relationship key file directory '%s' could not be created: %s" +msgstr "" + +#. Translators: the first parameter is a filename, +#. * and the second is an error message. +#: ../backends/key-file/kf-persona-store.vala:270 +#, c-format +msgid "The relationship key file '%s' could not be created: %s" +msgstr "" + +#. Translators: the first parameter is a filename, the second is +#. * an error message. +#: ../backends/key-file/kf-persona-store.vala:463 +#, c-format +msgid "Could not write updated key file '%s': %s" +msgstr "" + +#. Translators: this is an error message for if the user +#. * provides an invalid IM address. The first parameter is +#. * an IM address (e.g. “foo@jabber.org”), the second is +#. * the name of a protocol (e.g. “jabber”) and the third is +#. * an error message. +#: ../backends/key-file/kf-persona.vala:171 +#, c-format +msgid "Invalid IM address ‘%s’ for protocol ‘%s’: %s" +msgstr "对应协议“%2$s”的聊天地址“%1$s”无效：%3$s" + +#. Translators: the parameter is an error message. +#: ../backends/key-file/kf-persona.vala:364 +#, c-format +msgid "Couldn't load data from key file: %s" +msgstr "" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:508 +#, c-format +msgid "Error requesting a group channel: %s" +msgstr "请求组频道出错：%s" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:526 +#, c-format +msgid "Error requesting group handles: %s" +msgstr "请求组句柄出错：%s" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:564 +#, c-format +msgid "Failed to change contact's alias: %s" +msgstr "更改联系人的别名失败：%s" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:623 +#, c-format +msgid "Failed to create group channel: %s" +msgstr "创建组频道失败：%s" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:655 +#, c-format +msgid "Get Channels property failed: %s" +msgstr "获取频道属性失败：%s" + +#. Translators: the first parameter is a group channel identifier and the +#. * second is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:697 +#, c-format +msgid "Failed to add contact to group '%s': %s" +msgstr "将联系人添加到组“%s”失败：%s" + +#. Translators: the first parameter is a group channel identifier and the +#. * second is an error message. +#: ../backends/telepathy/lib/tp-lowlevel.c:713 +#, c-format +msgid "Failed to remove contact from group '%s': %s" +msgstr "将联系人移出组“%s”失败：%s" + +#. Translators: the first parameter is a pointer address and the +#. * second is a contact handle (numeric identifier). +#: ../backends/telepathy/lib/tp-lowlevel.c:736 +#, c-format +msgid "Invalid group channel %p to add handle %d to." +msgstr "添加句柄 %2$d 的组频道 %1$p 无效。" + +#: ../backends/telepathy/lib/tpf-persona-store.vala:637 +msgid "Couldn't connect to the telepathy-logger service." +msgstr "无法连接到 telepathy-logger 服务。" + +#: ../backends/telepathy/lib/tpf-persona-store.vala:676 +msgid "Lost connection to the telepathy-logger service." +msgstr "丢失与 telepathy-logger 服务的连接。" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:708 +#: ../backends/telepathy/lib/tpf-persona-store.vala:720 +#, c-format +msgid "Couldn't get list of favorite contacts: %s" +msgstr "无法获取关注联系人的列表：%s" + +#. Translators: the parameter is an identifier. +#: ../backends/telepathy/lib/tpf-persona-store.vala:757 +#, c-format +msgid "Unknown Telepathy contact ‘%s’ in favorites list." +msgstr "常用联系人列表中的 Telepathy 联系人“%s”为未知。" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:788 +#, c-format +msgid "Couldn't add favorite contacts: %s" +msgstr "无法添加关注联系人：%s" + +#. Translators: the parameter is an error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:809 +#, c-format +msgid "Couldn't remove favorite contacts: %s" +msgstr "无法移除关注联系人：%s" + +#. Translators: the first parameter is the display name for +#. * the Telepathy account, and the second is an error +#. * message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:935 +#, c-format +msgid "" +"Failed to determine whether we can set aliases on Telepathy account '%s': %s" +msgstr "确定是否有设置 Telepathy 账户“%s”别名的权限失败：%s" + +#. Translators: the first parameter is the display name for +#. * the Telepathy account, and the second is an error +#. * message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:988 +#, c-format +msgid "" +"Failed to determine whether we can set groups on Telepathy account '%s': %s" +msgstr "确定是否有设置 Telepathy 账户“%s”的组的权限失败：%s" + +#. Translators: the first parameter is a Telepathy handle, +#. * and the second is an error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1166 +#, fuzzy, c-format +msgid "Failed to create contact for self handle '%u': %s" +msgstr "为自身句柄“%u”创建联系人失败：%s" + +#. Translators: do not translate "NewChannels", as it's a D-Bus +#. * signal name. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1197 +msgid "Error creating channel for NewChannels signal." +msgstr "为 NewChannels 信号创建频道出错。" + +#. Translators: the parameter is a persona identifier and +#. * the second parameter is a group name. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1236 +#, c-format +msgid "Failed to add Telepathy contact ‘%s’ to group ‘%s’." +msgstr "将 Telepathy 联系人“%s”加入组“%s”失败。" + +#. Translators: the parameter is a persona identifier +#. * and the second parameter is a group name. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1247 +#, c-format +msgid "Failed to remove Telepathy contact ‘%s’ from group ‘%s’." +msgstr "将 Telepathy 联系人“%s”移出组“%s”失败。" + +#: ../backends/telepathy/lib/tpf-persona-store.vala:1613 +msgid "Telepathy contacts representing the local user may not be removed." +msgstr "不能移除代表本地用户的 Telepathy 联系人。" + +#. Translators: The first parameter is a contact identifier, the +#. * second is a contact list identifier and the third is an error +#. * message. +#. Translators: The first parameter is a contact identifier, +#. * the second is a contact list identifier and the third is an +#. * error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1634 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1649 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1664 +#: ../backends/telepathy/lib/tpf-persona-store.vala:1845 +#, c-format +msgid "Failed to remove Telepathy contact ‘%s’ from ‘%s’ list: %s" +msgstr "将 Telepathy 联系人“%s”移出列表“%s”失败：%s" + +#. Translators: The first parameter is a contact identifier, +#. * the second is a contact list identifier and the third is an +#. * error message. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1835 +#, c-format +msgid "Failed to add Telepathy contact ‘%s’ to ‘%s’ list: %s" +msgstr "将 Telepathy 联系人“%s”添加到列表“%s”失败：%s" + +#. Translators: the first parameter is a channel identifier and +#. * the second is an error message.. +#: ../backends/telepathy/lib/tpf-persona-store.vala:1948 +#, fuzzy, c-format +msgid "Failed to create incoming Telepathy contacts from channel ‘%s’: %s" +msgstr "从频道“%s”创建引入 Telepathy 联系人失败：%s" + +#. Translators: the first two parameters are store identifiers and +#. * the third is a contact identifier. +#: ../backends/telepathy/lib/tpf-persona-store.vala:2186 +#, c-format +msgid "" +"Persona store (%s, %s) requires the following details:\n" +" contact (provided: '%s')\n" +msgstr "" +"Persona 商店(%s，%s)要求提供以下细节：\n" +" 联系人(提供了：“%s”)\n" + +#: ../backends/telepathy/lib/tpf-persona-store.vala:2201 +msgid "Cannot create a new Telepathy contact while offline." +msgstr "离线时无法创建新的 Telepathy 联系人。" + +#. Translators: the parameter is the number of personas +#. * which were returned. +#: ../backends/telepathy/lib/tpf-persona-store.vala:2253 +#, fuzzy, c-format +msgid "Requested a single persona, but got %u persona back." +msgid_plural "Requested a single persona, but got %u personas back." +msgstr[0] "请求了一条 persona，但收到了 %u 条。" + +#: ../backends/telepathy/lib/tpf-persona-store.vala:2264 +#, fuzzy, c-format +msgid "Failed to add a persona from details: %s" +msgstr "由详情添加一条 persona 失败：%s" + +#. Translators: "telepathy-logger" is the name of an application, +#. * and should not be translated. +#: ../backends/telepathy/lib/tpf-persona-store.vala:2284 +msgid "" +"Failed to change favorite without a connection to the telepathy-logger " +"service." +msgstr "没有与 telepathy-logger 服务连接，更改关注失败。" + +#: ../backends/telepathy/lib/tpf-persona-store.vala:2290 +#, fuzzy +#| msgid "Failed to change favorite status for Telepathy contact ‘%s’." +msgid "" +"Failed to change favorite status of Telepathy Persona because it has no " +"attached TpContact." +msgstr "更改 Telepathy 联系人“%s”的关注状态失败。" + +#. Translators: the parameter is a contact identifier. +#: ../backends/telepathy/lib/tpf-persona-store.vala:2308 +#, c-format +msgid "Failed to change favorite status for Telepathy contact ‘%s’." +msgstr "更改 Telepathy 联系人“%s”的关注状态失败。" + +#: ../backends/telepathy/lib/tpf-persona-store.vala:2410 +msgid "Extended information may only be set on the user's Telepathy contact." +msgstr "" + +#: ../backends/telepathy/lib/tpf-persona-store.vala:2439 +msgid "" +"Extended information cannot be written because the store is disconnected." +msgstr "" + +#. Translators: the first parameter is the unknown key that +#. * was received with the details params, and the second +#. * identifies the persona store. +#: ../backends/tracker/lib/trf-persona-store.vala:739 +#, c-format +msgid "Unrecognized parameter '%s' passed to persona store '%s'." +msgstr "将不识别的参数“%s”传给了 persona 商店“%s”。" + +#: ../folks/alias-details.vala:57 +msgid "Alias is not writeable on this contact." +msgstr "此联系人的昵称不可写。" + +#. Translators: the first parameter is a backend name, and the +#. * second is an error message. +#: ../folks/backend-store.vala:366 +#, c-format +msgid "Error preparing Backend '%s': %s" +msgstr "准备后端“%s”出错：%s" + +#. Translators: the first parameter is a folder path and the second +#. * is an error message. +#: ../folks/backend-store.vala:559 +#, c-format +msgid "Error listing contents of folder '%s': %s" +msgstr "列出文件夹“%s”的内容出错：%s" + +#. Translators: the parameter is a filename. +#: ../folks/backend-store.vala:601 +#, c-format +msgid "" +"The content type of '%s' could not be determined. Have you installed shared-" +"mime-info?" +msgstr "无法确定“%s”的内容类型。您安装 shared-mime-info 了吗？" + +#. Translators: the first parameter is a filename and the second is an +#. * error message. +#: ../folks/backend-store.vala:629 +#, c-format +msgid "Failed to load module from path '%s': %s" +msgstr "从路径“%s”加载模块失败：%s" + +#. Translators: the first parameter is a function name, the second is +#. * a filename and the third is an error message. +#: ../folks/backend-store.vala:645 +#, c-format +msgid "Failed to find entry point function '%s' in '%s': %s" +msgstr "在“%2$s”中查找入口点函数“%1$s”失败：%3$s" + +#. Translators: the parameter is a filename. +#: ../folks/backend-store.vala:686 +#, c-format +msgid "File or directory '%s' does not exist." +msgstr "文件或目录“%s”不存在。" + +#. Translators: the parameter is a filename. +#: ../folks/backend-store.vala:692 +#, c-format +msgid "Failed to get content type for '%s'." +msgstr "获取“%s”的内容类型失败。" + +#: ../folks/birthday-details.vala:89 +msgid "Birthday event ID is not writeable on this contact." +msgstr "此联系人的生日事件 ID 不可写。" + +#: ../folks/favourite-details.vala:52 +msgid "Favorite status is not writeable on this contact." +msgstr "此联系人的常用状态不可写。" + +#. Translators: the parameter is an IM address. +#: ../folks/im-details.vala:178 ../folks/im-details.vala:192 +#: ../folks/im-details.vala:214 ../folks/im-details.vala:241 +#, c-format +msgid "The IM address '%s' could not be understood." +msgstr "无法理解聊天地址“%s”。" + +#. Translators: the first parameter is a persona store identifier +#. * and the second is an error message. +#: ../folks/individual-aggregator.vala:782 +#, c-format +msgid "Error preparing persona store '%s': %s" +msgstr "解析 persona 商店“%s”出错：%s" + +#. Translators: the parameter is a property name. +#: ../folks/individual-aggregator.vala:977 +#: ../folks/individual-aggregator.vala:1160 +#, c-format +msgid "Unknown property '%s' in linkable property list." +msgstr "可链接属性列表中的属性“%s”为未知。" + +#. Translators: the first parameter is a store identifier +#. * and the second parameter is an error message. +#: ../folks/individual-aggregator.vala:1580 +#, c-format +msgid "Failed to add contact for persona store ID '%s': %s" +msgstr "为 persona 商店 ID “%s”添加联系人失败：%s" + +#: ../folks/individual-aggregator.vala:1661 +#, fuzzy +msgid "Can’t link personas with no primary store." +msgstr "没有主商店，不能链接 personas。" + +#: ../folks/individual-aggregator.vala:1662 +#: ../folks/individual-aggregator.vala:1927 +#, c-format +msgid "" +"Persona store ‘%s:%s’ is configured as primary, but could not be found or " +"failed to load." +msgstr "" + +#: ../folks/individual-aggregator.vala:1663 +#: ../folks/individual-aggregator.vala:1928 +#, c-format +msgid "" +"Check the service providing the persona store is running, or change the " +"default store in that service or using the “%s” GConf key." +msgstr "" + +#: ../folks/individual-aggregator.vala:1926 +#, fuzzy +msgid "Can’t add personas with no primary store." +msgstr "没有主商店，不能添加 personas。" + +#: ../folks/individual-aggregator.vala:1935 +#, c-format +msgid "Can't write to requested property (“%s”) of the writeable store." +msgstr "不能写入可写商店中请求的属性(“%s”)。" + +#: ../folks/postal-address-details.vala:231 +#, c-format +msgid "%s, %s, %s, %s, %s, %s, %s" +msgstr "%s、%s、%s、%s、%s、%s、%s" + +#: ../folks/role-details.vala:148 +#, c-format +msgid "Title: %s, Organisation: %s, Role: %s" +msgstr "标题：%s，组织：%s，身份：%s" + +#. Translators: the parameter is a filename. +#: ../tools/import-pidgin.vala:48 +#, c-format +msgid "File %s does not exist." +msgstr "文件 %s 不存在。" + +#. Translators: the first parameter is a filename, and the second +#. * is an error message. +#: ../tools/import-pidgin.vala:64 +#, c-format +msgid "Failed to get information about file %s: %s" +msgstr "获取有关文件 %s 的信息失败：%s" + +#. Translators: the parameter is a filename. +#: ../tools/import-pidgin.vala:71 +#, c-format +msgid "File %s is not readable." +msgstr "文件 %s 不可读。" + +#. Translators: the parameter is a filename. +#: ../tools/import-pidgin.vala:81 +#, c-format +msgid "The Pidgin buddy list file '%s' could not be loaded." +msgstr "无法加载 Pidgin 好友列表文件“%s”。" + +#. Translators: the parameter is a filename. +#: ../tools/import-pidgin.vala:96 +#, c-format +msgid "" +"The Pidgin buddy list file ‘%s’ could not be loaded: the root element could " +"not be found or was not recognized." +msgstr "无法加载 Pidgin 好友列表文件“%s”：找不到或无法识别根元素。" + +#. Translators: the first parameter is the number of buddies which +#. * were successfully imported, and the second is a filename. +#: ../tools/import-pidgin.vala:116 +#, c-format +msgid "Imported %u buddy from '%s'." +msgid_plural "Imported %u buddies from '%s'." +msgstr[0] "从“%2$s”中导入了 %1$u 位好友。" + +#. Translators: the first parameter is a persona identifier, +#. * and the second is an error message. +#: ../tools/import-pidgin.vala:163 +#, c-format +msgid "Error changing group of contact ‘%s’: %s" +msgstr "更改联系人“%s”的组失败：%s" + +#. Translators: the parameter is the buddy's IM address. +#: ../tools/import-pidgin.vala:219 +#, c-format +msgid "" +"Ignoring buddy with no alias and only one IM address:\n" +"%s" +msgstr "" +"忽略没有昵称，只有一条聊天地址的好友：\n" +"%s" + +#: ../tools/import-pidgin.vala:243 +#, c-format +msgid "" +"Failed to create new contact for buddy with alias ‘%s’ and IM addresses:\n" +"%s\n" +"Error: %s\n" +msgstr "" +"为具有昵称“%s”和聊天地址的好友创建新联系人失败：\n" +"%s\n" +"错误：%s\n" + +#. Translators: the first parameter is a persona identifier, the +#. * second is an alias for the persona, and the third is a set of IM +#. * addresses each on a new line. +#: ../tools/import-pidgin.vala:257 +#, c-format +msgid "" +"Created contact ‘%s’ for buddy with alias ‘%s’ and IM addresses:\n" +"%s" +msgstr "" +"已为具有昵称“%2$s”和聊天地址的好友创建新联系人“%1$s”：\n" +"%3$s" + +#: ../tools/import.vala:44 +msgid "Source backend name (default: 'pidgin')" +msgstr "源后端名称(默认：“pidgin”)" + +#: ../tools/import.vala:47 +msgid "Source filename (default: specific to source backend)" +msgstr "源文件名(默认：依源后端而定)" + +#: ../tools/import.vala:57 +msgid "— import meta-contact information to libfolks" +msgstr "— 将元联系人信息导入到 libfolks" + +#. Translators: the parameter is an error message. +#: ../tools/import.vala:67 +#, c-format +msgid "Couldn't parse command line options: %s" +msgstr "无法解析命令行选项：%s" + +#. Translators: the parameter is an error message. +#: ../tools/import.vala:108 +#, c-format +msgid "Couldn't load the backends: %s" +msgstr "无法加载后端：%s" + +#. Translators: the parameter is a backend identifier. +#: ../tools/import.vala:119 +#, c-format +msgid "Couldn't load the ‘%s’ backend." +msgstr "无法加载“%s”后端。" + +#. Translators: the first parameter is a backend identifier and the +#. * second parameter is an error message. +#: ../tools/import.vala:132 +#, c-format +msgid "Couldn't prepare the ‘%s’ backend: %s" +msgstr "无法准备“%s”后端：%s" + +#. Translators: the parameter is a backend identifier. +#: ../tools/import.vala:145 +#, c-format +msgid "Couldn't load the ‘%s’ backend's persona store." +msgstr "无法加载“%s”后端的 persona 商店。" + +#: ../tools/import.vala:166 +#, c-format +msgid "Couldn't prepare the ‘%s’ backend's persona store: %s" +msgstr "无法准备“%s”后端的 persona 商店：%s" + +#. Translators: the parameter is an error message. +#: ../tools/import.vala:184 +#, c-format +msgid "Error importing contacts: %s" +msgstr "导入联系人出错：%s" + +#. Translators: both parameters are identifiers for backends. +#: ../tools/import.vala:198 +#, c-format +msgid "" +"Unrecognized source backend name ‘%s’. ‘%s’ is currently the only supported " +"source backend." +msgstr "无法识别源后端名称“%s”。“%s”是目前惟一支持的源后端。" + +#~ msgid "Couldn't open address book ‘%s’." +#~ msgstr "无法打开地址簿“%s”。" diff -Nru folks-0.6.6/tests/data/Makefile.in folks-0.6.7/tests/data/Makefile.in --- folks-0.6.6/tests/data/Makefile.in 2011-12-13 23:38:40.000000000 +0000 +++ folks-0.6.7/tests/data/Makefile.in 2012-02-23 00:04:12.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -38,10 +38,11 @@ $(srcdir)/gconf.path.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -77,6 +78,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -350,10 +353,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/tests/eds/add-contacts-stress-test.c folks-0.6.7/tests/eds/add-contacts-stress-test.c --- folks-0.6.6/tests/eds/add-contacts-stress-test.c 2011-12-13 23:42:15.000000000 +0000 +++ folks-0.6.7/tests/eds/add-contacts-stress-test.c 2012-02-23 00:02:33.000000000 +0000 @@ -1,4 +1,4 @@ -/* add-contacts-stress-test.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* add-contacts-stress-test.c generated by valac 0.15.1, the Vala compiler * generated from add-contacts-stress-test.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/add-persona.c folks-0.6.7/tests/eds/add-persona.c --- folks-0.6.6/tests/eds/add-persona.c 2011-12-13 23:42:39.000000000 +0000 +++ folks-0.6.7/tests/eds/add-persona.c 2012-02-23 00:02:31.000000000 +0000 @@ -1,4 +1,4 @@ -/* add-persona.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* add-persona.c generated by valac 0.15.1, the Vala compiler * generated from add-persona.vala, do not modify */ /* @@ -1463,7 +1463,7 @@ #line 182 "/home/treitter/collabora/folks/tests/eds/add-persona.vala" memset (&_data_->_tmp23_, 0, sizeof (GValue)); #line 182 "/home/treitter/collabora/folks/tests/eds/add-persona.vala" - g_value_init (&_data_->_tmp23_, G_TYPE_LOADABLE_ICON); + g_value_init (&_data_->_tmp23_, g_loadable_icon_get_type ()); #line 182 "/home/treitter/collabora/folks/tests/eds/add-persona.vala" _data_->_tmp24_ = _data_->_tmp23_; #line 182 "/home/treitter/collabora/folks/tests/eds/add-persona.vala" diff -Nru folks-0.6.6/tests/eds/add-persona.vala folks-0.6.7/tests/eds/add-persona.vala --- folks-0.6.6/tests/eds/add-persona.vala 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/tests/eds/add-persona.vala 2012-02-17 23:39:51.000000000 +0000 @@ -167,7 +167,7 @@ details.insert (Folks.PersonaStore.detail_key (PersonaDetail.FULL_NAME), (owned) v1); - Value? v2 = Value (typeof (Set)); + Value? v2 = Value (typeof (Set)); var emails = new HashSet ( (GLib.HashFunc) EmailFieldDetails.hash, (GLib.EqualFunc) EmailFieldDetails.equal); @@ -185,7 +185,7 @@ details.insert (Folks.PersonaStore.detail_key (PersonaDetail.AVATAR), (owned) v3); - Value? v4 = Value (typeof (MultiMap)); + Value? v4 = Value (typeof (MultiMap)); var im_fds = new HashMultiMap (); im_fds.set ("jabber", new ImFieldDetails (this._im_addr_1)); im_fds.set ("yahoo", new ImFieldDetails (this._im_addr_2)); @@ -193,7 +193,7 @@ details.insert ( Folks.PersonaStore.detail_key (PersonaDetail.IM_ADDRESSES), v4); - Value? v5 = Value (typeof (Set)); + Value? v5 = Value (typeof (Set)); var phones = new HashSet ( (GLib.HashFunc) PhoneFieldDetails.hash, (GLib.EqualFunc) PhoneFieldDetails.equal); @@ -211,7 +211,7 @@ Folks.PersonaStore.detail_key (PersonaDetail.PHONE_NUMBERS), (owned) v5); - Value? v6 = Value (typeof (Set)); + Value? v6 = Value (typeof (Set)); var pa_fds = new HashSet ( (GLib.HashFunc) PostalAddressFieldDetails.hash, (GLib.EqualFunc) PostalAddressFieldDetails.equal); @@ -235,7 +235,7 @@ Folks.PersonaStore.detail_key (PersonaDetail.STRUCTURED_NAME), (owned) v7); - Value? v8 = Value (typeof (Set)); + Value? v8 = Value (typeof (Set)); var notes = new HashSet ( (GLib.HashFunc) NoteFieldDetails.hash, (GLib.EqualFunc) NoteFieldDetails.equal); @@ -252,7 +252,7 @@ details.insert (Folks.PersonaStore.detail_key (PersonaDetail.BIRTHDAY), (owned) v9); - Value? v10 = Value (typeof (Set)); + Value? v10 = Value (typeof (Set)); var role_fds = new HashSet ( (GLib.HashFunc) RoleFieldDetails.hash, (GLib.EqualFunc) RoleFieldDetails.equal); diff -Nru folks-0.6.6/tests/eds/avatar-details.c folks-0.6.7/tests/eds/avatar-details.c --- folks-0.6.6/tests/eds/avatar-details.c 2011-12-13 23:42:46.000000000 +0000 +++ folks-0.6.7/tests/eds/avatar-details.c 2012-02-23 00:02:31.000000000 +0000 @@ -1,4 +1,4 @@ -/* avatar-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* avatar-details.c generated by valac 0.15.1, the Vala compiler * generated from avatar-details.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/change-primary-store.c folks-0.6.7/tests/eds/change-primary-store.c --- folks-0.6.6/tests/eds/change-primary-store.c 2011-12-13 23:42:04.000000000 +0000 +++ folks-0.6.7/tests/eds/change-primary-store.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,776 +0,0 @@ -/* change-primary-store.c generated by valac 0.14.0.50-58097f, the Vala compiler - * generated from change-primary-store.vala, do not modify */ - -/* - * Copyright (C) 2011 Collabora Ltd. - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 2.1 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - * - * Authors: Raul Gutierrez Segales - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -#define TYPE_CHANGE_PRIMARY_STORE_TESTS (change_primary_store_tests_get_type ()) -#define CHANGE_PRIMARY_STORE_TESTS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CHANGE_PRIMARY_STORE_TESTS, ChangePrimaryStoreTests)) -#define CHANGE_PRIMARY_STORE_TESTS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_CHANGE_PRIMARY_STORE_TESTS, ChangePrimaryStoreTestsClass)) -#define IS_CHANGE_PRIMARY_STORE_TESTS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CHANGE_PRIMARY_STORE_TESTS)) -#define IS_CHANGE_PRIMARY_STORE_TESTS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CHANGE_PRIMARY_STORE_TESTS)) -#define CHANGE_PRIMARY_STORE_TESTS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CHANGE_PRIMARY_STORE_TESTS, ChangePrimaryStoreTestsClass)) - -typedef struct _ChangePrimaryStoreTests ChangePrimaryStoreTests; -typedef struct _ChangePrimaryStoreTestsClass ChangePrimaryStoreTestsClass; -typedef struct _ChangePrimaryStoreTestsPrivate ChangePrimaryStoreTestsPrivate; -#define _g_main_loop_unref0(var) ((var == NULL) ? NULL : (var = (g_main_loop_unref (var), NULL))) -#define _eds_test_backend_unref0(var) ((var == NULL) ? NULL : (var = (eds_test_backend_unref (var), NULL))) -#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) -#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) -typedef struct _ChangePrimaryStoreTestsTestChangePrimaryStoreData ChangePrimaryStoreTestsTestChangePrimaryStoreData; - -struct _ChangePrimaryStoreTests { - FolksTestCase parent_instance; - ChangePrimaryStoreTestsPrivate * priv; -}; - -struct _ChangePrimaryStoreTestsClass { - FolksTestCaseClass parent_class; -}; - -struct _ChangePrimaryStoreTestsPrivate { - GMainLoop* _main_loop; - EdsTestBackend* _eds_backend; - EdsTestBackend* _eds_backend_other; - FolksIndividualAggregator* _aggregator; - FolksPersonaStore* _pstore1; - FolksPersonaStore* _pstore2; - gboolean _new_primary_store_found; -}; - -struct _ChangePrimaryStoreTestsTestChangePrimaryStoreData { - int _state_; - GObject* _source_object_; - GAsyncResult* _res_; - GSimpleAsyncResult* _async_result; - ChangePrimaryStoreTests* self; - FolksBackendStore* _tmp0_; - FolksBackendStore* store; - FolksIndividualAggregator* _tmp1_; - FolksIndividualAggregator* _tmp2_; - EdsTestBackend* _tmp3_; - const gchar* _tmp4_; - const gchar* _tmp5_; - FolksPersonaStore* _tmp6_; - EdsTestBackend* _tmp7_; - const gchar* _tmp8_; - const gchar* _tmp9_; - FolksPersonaStore* _tmp10_; - FolksPersonaStore* _tmp11_; - FolksPersonaStore* _tmp12_; - FolksIndividualAggregator* _tmp13_; - FolksPersonaStore* _tmp14_; - FolksPersonaStore* _tmp15_; - FolksPersonaStore* _tmp16_; - FolksIndividualAggregator* _tmp17_; - EdsTestBackend* _tmp18_; - GError* e; - GError* _tmp19_; - const gchar* _tmp20_; - GError * _inner_error_; -}; - - -static gpointer change_primary_store_tests_parent_class = NULL; - -GType change_primary_store_tests_get_type (void) G_GNUC_CONST; -#define CHANGE_PRIMARY_STORE_TESTS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CHANGE_PRIMARY_STORE_TESTS, ChangePrimaryStoreTestsPrivate)) -enum { - CHANGE_PRIMARY_STORE_TESTS_DUMMY_PROPERTY -}; -ChangePrimaryStoreTests* change_primary_store_tests_new (void); -ChangePrimaryStoreTests* change_primary_store_tests_construct (GType object_type); -void change_primary_store_tests_test_change_primary_store (ChangePrimaryStoreTests* self); -static void _change_primary_store_tests_test_change_primary_store_folks_test_case_test_method (gpointer self); -static void change_primary_store_tests_real_set_up (FolksTestCase* base); -static void change_primary_store_tests_real_tear_down (FolksTestCase* base); -static void _change_primary_store_tests_test_change_primary_store (ChangePrimaryStoreTests* self, GAsyncReadyCallback _callback_, gpointer _user_data_); -static void _change_primary_store_tests_test_change_primary_store_finish (ChangePrimaryStoreTests* self, GAsyncResult* _res_); -static gboolean __lambda2_ (ChangePrimaryStoreTests* self); -static gboolean ___lambda2__gsource_func (gpointer self); -static void _change_primary_store_tests_test_change_primary_store_data_free (gpointer _data); -static gboolean _change_primary_store_tests_test_change_primary_store_co (ChangePrimaryStoreTestsTestChangePrimaryStoreData* _data_); -static void _change_primary_store_tests_test_change_primary_store_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); -static FolksPersonaStore* _change_primary_store_tests_get_persona_store (ChangePrimaryStoreTests* self, FolksBackendStore* store, const gchar* store_id); -static void _change_primary_store_tests_primary_store_cb (ChangePrimaryStoreTests* self, GObject* ia_obj, GParamSpec* ps); -static void __change_primary_store_tests_primary_store_cb_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); -static void change_primary_store_tests_finalize (GObject* obj); -gint _vala_main (gchar** args, int args_length1); - - -static void _change_primary_store_tests_test_change_primary_store_folks_test_case_test_method (gpointer self) { -#line 43 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - change_primary_store_tests_test_change_primary_store (self); -#line 134 "change-primary-store.c" -} - - -ChangePrimaryStoreTests* change_primary_store_tests_construct (GType object_type) { - ChangePrimaryStoreTests * self = NULL; - EdsTestBackend* _tmp0_; - EdsTestBackend* _tmp1_; - EdsTestBackend* _tmp2_; - EdsTestBackend* _tmp3_; -#line 36 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - self = (ChangePrimaryStoreTests*) folks_test_case_construct (object_type, "ChangePrimaryStoreTests"); -#line 38 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp0_ = eds_test_backend_new (); -#line 38 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _eds_test_backend_unref0 (self->priv->_eds_backend); -#line 38 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - self->priv->_eds_backend = _tmp0_; -#line 39 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp1_ = self->priv->_eds_backend; -#line 39 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - eds_test_backend_set_address_book_uri (_tmp1_, "system"); -#line 40 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp2_ = eds_test_backend_new (); -#line 40 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _eds_test_backend_unref0 (self->priv->_eds_backend_other); -#line 40 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - self->priv->_eds_backend_other = _tmp2_; -#line 41 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp3_ = self->priv->_eds_backend_other; -#line 41 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - eds_test_backend_set_address_book_uri (_tmp3_, "other"); -#line 43 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - folks_test_case_add_test ((FolksTestCase*) self, "test primary store changes in the IndividualAggregator", _change_primary_store_tests_test_change_primary_store_folks_test_case_test_method, self); -#line 34 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - return self; -#line 170 "change-primary-store.c" -} - - -ChangePrimaryStoreTests* change_primary_store_tests_new (void) { -#line 34 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - return change_primary_store_tests_construct (TYPE_CHANGE_PRIMARY_STORE_TESTS); -#line 177 "change-primary-store.c" -} - - -static void change_primary_store_tests_real_set_up (FolksTestCase* base) { - ChangePrimaryStoreTests * self; - EdsTestBackend* _tmp0_; - EdsTestBackend* _tmp1_; -#line 47 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - self = (ChangePrimaryStoreTests*) base; -#line 49 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_unsetenv ("FOLKS_PRIMARY_STORE"); -#line 50 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp0_ = self->priv->_eds_backend; -#line 50 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - eds_test_backend_set_up (_tmp0_, TRUE); -#line 51 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp1_ = self->priv->_eds_backend_other; -#line 51 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - eds_test_backend_set_up (_tmp1_, FALSE); -#line 197 "change-primary-store.c" -} - - -static void change_primary_store_tests_real_tear_down (FolksTestCase* base) { - ChangePrimaryStoreTests * self; - EdsTestBackend* _tmp0_; - EdsTestBackend* _tmp1_; -#line 54 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - self = (ChangePrimaryStoreTests*) base; -#line 56 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp0_ = self->priv->_eds_backend; -#line 56 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - eds_test_backend_tear_down (_tmp0_); -#line 57 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp1_ = self->priv->_eds_backend_other; -#line 57 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - eds_test_backend_tear_down (_tmp1_); -#line 215 "change-primary-store.c" -} - - -static gboolean __lambda2_ (ChangePrimaryStoreTests* self) { - gboolean result = FALSE; - GMainLoop* _tmp0_; -#line 69 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp0_ = self->priv->_main_loop; -#line 69 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_main_loop_quit (_tmp0_); -#line 70 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_assert_not_reached (); -#line 67 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - return result; -#line 230 "change-primary-store.c" -} - - -static gboolean ___lambda2__gsource_func (gpointer self) { - gboolean result; - result = __lambda2_ (self); -#line 67 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - return result; -#line 239 "change-primary-store.c" -} - - -void change_primary_store_tests_test_change_primary_store (ChangePrimaryStoreTests* self) { - GMainLoop* _tmp0_; - guint _tmp1_ = 0U; - guint timer_id; - GMainLoop* _tmp2_; - gboolean _tmp3_; -#line 60 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_return_if_fail (self != NULL); -#line 62 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp0_ = g_main_loop_new (NULL, FALSE); -#line 62 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_main_loop_unref0 (self->priv->_main_loop); -#line 62 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - self->priv->_main_loop = _tmp0_; -#line 63 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - self->priv->_new_primary_store_found = FALSE; -#line 65 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _change_primary_store_tests_test_change_primary_store (self, NULL, NULL); -#line 67 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp1_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 8, ___lambda2__gsource_func, g_object_ref (self), g_object_unref); -#line 67 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - timer_id = _tmp1_; -#line 73 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp2_ = self->priv->_main_loop; -#line 73 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_main_loop_run (_tmp2_); -#line 75 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp3_ = self->priv->_new_primary_store_found; -#line 75 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_assert (_tmp3_); -#line 77 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_source_remove (timer_id); -#line 78 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_object_unref0 (self->priv->_aggregator); -#line 78 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - self->priv->_aggregator = NULL; -#line 79 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_main_loop_unref0 (self->priv->_main_loop); -#line 79 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - self->priv->_main_loop = NULL; -#line 283 "change-primary-store.c" -} - - -static void _change_primary_store_tests_test_change_primary_store_data_free (gpointer _data) { - ChangePrimaryStoreTestsTestChangePrimaryStoreData* _data_; - _data_ = _data; -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_object_unref0 (_data_->self); -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_slice_free (ChangePrimaryStoreTestsTestChangePrimaryStoreData, _data_); -#line 294 "change-primary-store.c" -} - - -static gpointer _g_object_ref0 (gpointer self) { -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - return self ? g_object_ref (self) : NULL; -#line 301 "change-primary-store.c" -} - - -static void _change_primary_store_tests_test_change_primary_store (ChangePrimaryStoreTests* self, GAsyncReadyCallback _callback_, gpointer _user_data_) { - ChangePrimaryStoreTestsTestChangePrimaryStoreData* _data_; - ChangePrimaryStoreTests* _tmp0_; -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_ = g_slice_new0 (ChangePrimaryStoreTestsTestChangePrimaryStoreData); -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _change_primary_store_tests_test_change_primary_store); -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _change_primary_store_tests_test_change_primary_store_data_free); -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp0_ = _g_object_ref0 (self); -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->self = _tmp0_; -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _change_primary_store_tests_test_change_primary_store_co (_data_); -#line 320 "change-primary-store.c" -} - - -static void _change_primary_store_tests_test_change_primary_store_finish (ChangePrimaryStoreTests* self, GAsyncResult* _res_) { - ChangePrimaryStoreTestsTestChangePrimaryStoreData* _data_; -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 328 "change-primary-store.c" -} - - -static void _change_primary_store_tests_test_change_primary_store_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { - ChangePrimaryStoreTestsTestChangePrimaryStoreData* _data_; -#line 85 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_ = _user_data_; -#line 85 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_source_object_ = source_object; -#line 85 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_res_ = _res_; -#line 85 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _change_primary_store_tests_test_change_primary_store_co (_data_); -#line 342 "change-primary-store.c" -} - - -static void __change_primary_store_tests_primary_store_cb_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { -#line 101 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _change_primary_store_tests_primary_store_cb (self, _sender, pspec); -#line 349 "change-primary-store.c" -} - - -static gboolean _change_primary_store_tests_test_change_primary_store_co (ChangePrimaryStoreTestsTestChangePrimaryStoreData* _data_) { -#line 82 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - switch (_data_->_state_) { -#line 82 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - case 0: -#line 358 "change-primary-store.c" - goto _state_0; -#line 82 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - case 1: -#line 362 "change-primary-store.c" - goto _state_1; -#line 82 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - case 2: -#line 366 "change-primary-store.c" - goto _state_2; - default: -#line 82 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_assert_not_reached (); -#line 371 "change-primary-store.c" - } - _state_0: -#line 84 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp0_ = NULL; -#line 84 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp0_ = folks_backend_store_dup (); -#line 84 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->store = _data_->_tmp0_; -#line 85 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_state_ = 1; -#line 85 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - folks_backend_store_prepare (_data_->store, _change_primary_store_tests_test_change_primary_store_ready, _data_); -#line 85 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - return FALSE; -#line 386 "change-primary-store.c" - _state_1: -#line 85 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - folks_backend_store_prepare_finish (_data_->store, _data_->_res_); -#line 86 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp1_ = folks_individual_aggregator_new (); -#line 86 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_object_unref0 (_data_->self->priv->_aggregator); -#line 86 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->self->priv->_aggregator = _data_->_tmp1_; -#line 396 "change-primary-store.c" - { -#line 89 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp2_ = _data_->self->priv->_aggregator; -#line 89 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_state_ = 2; -#line 89 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - folks_individual_aggregator_prepare (_data_->_tmp2_, _change_primary_store_tests_test_change_primary_store_ready, _data_); -#line 89 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - return FALSE; -#line 406 "change-primary-store.c" - _state_2: -#line 89 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - folks_individual_aggregator_prepare_finish (_data_->_tmp2_, _data_->_res_, &_data_->_inner_error_); -#line 89 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - if (_data_->_inner_error_ != NULL) { -#line 412 "change-primary-store.c" - goto __catch0_g_error; - } -#line 91 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp3_ = _data_->self->priv->_eds_backend; -#line 91 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp4_ = eds_test_backend_get_address_book_uid (_data_->_tmp3_); -#line 91 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp5_ = _data_->_tmp4_; -#line 91 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp6_ = NULL; -#line 91 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp6_ = _change_primary_store_tests_get_persona_store (_data_->self, _data_->store, _data_->_tmp5_); -#line 91 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_object_unref0 (_data_->self->priv->_pstore1); -#line 91 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->self->priv->_pstore1 = _data_->_tmp6_; -#line 93 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp7_ = _data_->self->priv->_eds_backend_other; -#line 93 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp8_ = eds_test_backend_get_address_book_uid (_data_->_tmp7_); -#line 93 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp9_ = _data_->_tmp8_; -#line 93 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp10_ = NULL; -#line 93 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp10_ = _change_primary_store_tests_get_persona_store (_data_->self, _data_->store, _data_->_tmp9_); -#line 93 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_object_unref0 (_data_->self->priv->_pstore2); -#line 93 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->self->priv->_pstore2 = _data_->_tmp10_; -#line 96 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp11_ = _data_->self->priv->_pstore1; -#line 96 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_assert (_data_->_tmp11_ != NULL); -#line 97 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp12_ = _data_->self->priv->_pstore2; -#line 97 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_assert (_data_->_tmp12_ != NULL); -#line 99 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp13_ = _data_->self->priv->_aggregator; -#line 99 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp14_ = folks_individual_aggregator_get_primary_store (_data_->_tmp13_); -#line 99 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp15_ = _data_->_tmp14_; -#line 99 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp16_ = _data_->self->priv->_pstore1; -#line 99 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_assert (_data_->_tmp15_ == _data_->_tmp16_); -#line 101 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp17_ = _data_->self->priv->_aggregator; -#line 101 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_signal_connect_object ((GObject*) _data_->_tmp17_, "notify::primary-store", (GCallback) __change_primary_store_tests_primary_store_cb_g_object_notify, _data_->self, 0); -#line 104 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp18_ = _data_->self->priv->_eds_backend_other; -#line 104 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - eds_test_backend_set_as_default (_data_->_tmp18_); -#line 469 "change-primary-store.c" - } - goto __finally0; - __catch0_g_error: - { -#line 87 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->e = _data_->_inner_error_; -#line 87 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_inner_error_ = NULL; -#line 108 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp19_ = _data_->e; -#line 108 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _data_->_tmp20_ = _data_->_tmp19_->message; -#line 108 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_warning ("change-primary-store.vala:108: Error when calling prepare: %s\n", _data_->_tmp20_); -#line 87 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_error_free0 (_data_->e); -#line 486 "change-primary-store.c" - } - __finally0: -#line 87 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - if (_data_->_inner_error_ != NULL) { -#line 87 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_object_unref0 (_data_->store); -#line 87 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); -#line 87 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_clear_error (&_data_->_inner_error_); -#line 87 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - return FALSE; -#line 499 "change-primary-store.c" - } -#line 82 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_object_unref0 (_data_->store); -#line 82 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - if (_data_->_state_ == 0) { -#line 82 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 507 "change-primary-store.c" - } else { -#line 82 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 511 "change-primary-store.c" - } -#line 82 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_object_unref (_data_->_async_result); -#line 82 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - return FALSE; -#line 517 "change-primary-store.c" -} - - -static FolksPersonaStore* _change_primary_store_tests_get_persona_store (ChangePrimaryStoreTests* self, FolksBackendStore* store, const gchar* store_id) { - FolksPersonaStore* result = NULL; - FolksPersonaStore* pstore; -#line 112 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_return_val_if_fail (self != NULL, NULL); -#line 112 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_return_val_if_fail (store != NULL, NULL); -#line 112 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_return_val_if_fail (store_id != NULL, NULL); -#line 114 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - pstore = NULL; -#line 532 "change-primary-store.c" - { - FolksBackendStore* _tmp0_; - GeeMap* _tmp1_; - GeeMap* _tmp2_; - GeeCollection* _tmp3_; - GeeCollection* _tmp4_; - GeeCollection* _tmp5_; - GeeIterator* _tmp6_ = NULL; - GeeIterator* _tmp7_; - GeeIterator* _backend_it; -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp0_ = store; -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp1_ = folks_backend_store_get_enabled_backends (_tmp0_); -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp2_ = _tmp1_; -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp3_ = gee_map_get_values (_tmp2_); -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp4_ = _tmp3_; -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp5_ = _tmp4_; -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp6_ = gee_iterable_iterator ((GeeIterable*) _tmp5_); -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp7_ = _tmp6_; -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_object_unref0 (_tmp5_); -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _backend_it = _tmp7_; -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - while (TRUE) { -#line 565 "change-primary-store.c" - GeeIterator* _tmp8_; - gboolean _tmp9_ = FALSE; - GeeIterator* _tmp10_; - gpointer _tmp11_ = NULL; - FolksBackend* backend; - FolksBackend* _tmp12_; - GeeMap* _tmp13_; - GeeMap* _tmp14_; - const gchar* _tmp15_; - gpointer _tmp16_ = NULL; - FolksPersonaStore* _tmp17_; -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp8_ = _backend_it; -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp9_ = gee_iterator_next (_tmp8_); -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - if (!_tmp9_) { -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - break; -#line 585 "change-primary-store.c" - } -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp10_ = _backend_it; -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp11_ = gee_iterator_get (_tmp10_); -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - backend = (FolksBackend*) _tmp11_; -#line 117 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp12_ = backend; -#line 117 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp13_ = folks_backend_get_persona_stores (_tmp12_); -#line 117 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp14_ = _tmp13_; -#line 117 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp15_ = store_id; -#line 117 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp16_ = gee_map_get (_tmp14_, _tmp15_); -#line 117 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_object_unref0 (pstore); -#line 117 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - pstore = (FolksPersonaStore*) _tmp16_; -#line 118 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp17_ = pstore; -#line 118 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - if (_tmp17_ != NULL) { -#line 119 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_object_unref0 (backend); -#line 119 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - break; -#line 615 "change-primary-store.c" - } -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_object_unref0 (backend); -#line 619 "change-primary-store.c" - } -#line 115 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_object_unref0 (_backend_it); -#line 623 "change-primary-store.c" - } -#line 121 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - result = pstore; -#line 121 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - return result; -#line 629 "change-primary-store.c" -} - - -static void _change_primary_store_tests_primary_store_cb (ChangePrimaryStoreTests* self, GObject* ia_obj, GParamSpec* ps) { - GObject* _tmp0_; - FolksIndividualAggregator* _tmp1_; - FolksIndividualAggregator* ia; - FolksIndividualAggregator* _tmp2_; - FolksPersonaStore* _tmp3_; - FolksPersonaStore* _tmp4_; - FolksPersonaStore* _tmp5_; -#line 124 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_return_if_fail (self != NULL); -#line 124 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_return_if_fail (ia_obj != NULL); -#line 124 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_return_if_fail (ps != NULL); -#line 126 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp0_ = ia_obj; -#line 126 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp1_ = _g_object_ref0 (FOLKS_INDIVIDUAL_AGGREGATOR (_tmp0_)); -#line 126 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - ia = _tmp1_; -#line 128 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp2_ = ia; -#line 128 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp3_ = folks_individual_aggregator_get_primary_store (_tmp2_); -#line 128 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp4_ = _tmp3_; -#line 128 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp5_ = self->priv->_pstore2; -#line 128 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - if (_tmp4_ == _tmp5_) { -#line 663 "change-primary-store.c" - GMainLoop* _tmp6_; -#line 130 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - self->priv->_new_primary_store_found = TRUE; -#line 131 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp6_ = self->priv->_main_loop; -#line 131 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_main_loop_quit (_tmp6_); -#line 671 "change-primary-store.c" - } -#line 124 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_object_unref0 (ia); -#line 675 "change-primary-store.c" -} - - -static void change_primary_store_tests_class_init (ChangePrimaryStoreTestsClass * klass) { -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - change_primary_store_tests_parent_class = g_type_class_peek_parent (klass); -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_type_class_add_private (klass, sizeof (ChangePrimaryStoreTestsPrivate)); -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - FOLKS_TEST_CASE_CLASS (klass)->set_up = change_primary_store_tests_real_set_up; -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - FOLKS_TEST_CASE_CLASS (klass)->tear_down = change_primary_store_tests_real_tear_down; -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - G_OBJECT_CLASS (klass)->finalize = change_primary_store_tests_finalize; -#line 690 "change-primary-store.c" -} - - -static void change_primary_store_tests_instance_init (ChangePrimaryStoreTests * self) { -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - self->priv = CHANGE_PRIMARY_STORE_TESTS_GET_PRIVATE (self); -#line 697 "change-primary-store.c" -} - - -static void change_primary_store_tests_finalize (GObject* obj) { - ChangePrimaryStoreTests * self; -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - self = CHANGE_PRIMARY_STORE_TESTS (obj); -#line 26 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_main_loop_unref0 (self->priv->_main_loop); -#line 27 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _eds_test_backend_unref0 (self->priv->_eds_backend); -#line 28 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _eds_test_backend_unref0 (self->priv->_eds_backend_other); -#line 29 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_object_unref0 (self->priv->_aggregator); -#line 30 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_object_unref0 (self->priv->_pstore1); -#line 31 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_object_unref0 (self->priv->_pstore2); -#line 24 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - G_OBJECT_CLASS (change_primary_store_tests_parent_class)->finalize (obj); -#line 719 "change-primary-store.c" -} - - -GType change_primary_store_tests_get_type (void) { - static volatile gsize change_primary_store_tests_type_id__volatile = 0; - if (g_once_init_enter (&change_primary_store_tests_type_id__volatile)) { - static const GTypeInfo g_define_type_info = { sizeof (ChangePrimaryStoreTestsClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) change_primary_store_tests_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ChangePrimaryStoreTests), 0, (GInstanceInitFunc) change_primary_store_tests_instance_init, NULL }; - GType change_primary_store_tests_type_id; - change_primary_store_tests_type_id = g_type_register_static (FOLKS_TYPE_TEST_CASE, "ChangePrimaryStoreTests", &g_define_type_info, 0); - g_once_init_leave (&change_primary_store_tests_type_id__volatile, change_primary_store_tests_type_id); - } - return change_primary_store_tests_type_id__volatile; -} - - -gint _vala_main (gchar** args, int args_length1) { - gint result = 0; - GTestSuite* _tmp0_ = NULL; - GTestSuite* root; - ChangePrimaryStoreTests* _tmp1_; - ChangePrimaryStoreTests* _tmp2_; - GTestSuite* _tmp3_ = NULL; -#line 138 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_test_init (&args_length1, &args, NULL); -#line 140 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp0_ = g_test_get_root (); -#line 140 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - root = _tmp0_; -#line 141 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp1_ = change_primary_store_tests_new (); -#line 141 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp2_ = _tmp1_; -#line 141 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _tmp3_ = folks_test_case_get_suite ((FolksTestCase*) _tmp2_); -#line 141 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_test_suite_add_suite (root, _tmp3_); -#line 141 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - _g_object_unref0 (_tmp2_); -#line 143 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_test_run (); -#line 145 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - result = 0; -#line 145 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - return result; -#line 764 "change-primary-store.c" -} - - -int main (int argc, char ** argv) { -#line 136 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - g_type_init (); -#line 136 "/home/treitter/collabora/folks/tests/eds/change-primary-store.vala" - return _vala_main (argv, argc); -#line 773 "change-primary-store.c" -} - - - diff -Nru folks-0.6.6/tests/eds/change-primary-store.vala folks-0.6.7/tests/eds/change-primary-store.vala --- folks-0.6.6/tests/eds/change-primary-store.vala 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/tests/eds/change-primary-store.vala 1970-01-01 00:00:00.000000000 +0000 @@ -1,146 +0,0 @@ -/* - * Copyright (C) 2011 Collabora Ltd. - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 2.1 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - * - * Authors: Raul Gutierrez Segales - * - */ - -using Folks; -using Gee; - -public class ChangePrimaryStoreTests : Folks.TestCase -{ - private GLib.MainLoop _main_loop; - private EdsTest.Backend _eds_backend; - private EdsTest.Backend _eds_backend_other; - private IndividualAggregator _aggregator; - private Folks.PersonaStore _pstore1; - private Folks.PersonaStore _pstore2; - private bool _new_primary_store_found; - - public ChangePrimaryStoreTests () - { - base ("ChangePrimaryStoreTests"); - - this._eds_backend = new EdsTest.Backend (); - this._eds_backend.address_book_uri = "system"; - this._eds_backend_other = new EdsTest.Backend (); - this._eds_backend_other.address_book_uri = "other"; - - this.add_test ("test primary store changes in the IndividualAggregator", - this.test_change_primary_store); - } - - public override void set_up () - { - Environment.unset_variable ("FOLKS_PRIMARY_STORE"); - this._eds_backend.set_up (true); - this._eds_backend_other.set_up (); - } - - public override void tear_down () - { - this._eds_backend.tear_down (); - this._eds_backend_other.tear_down (); - } - - public void test_change_primary_store () - { - this._main_loop = new GLib.MainLoop (null, false); - this._new_primary_store_found = false; - - this._test_change_primary_store (); - - var timer_id = Timeout.add_seconds (8, () => - { - this._main_loop.quit (); - assert_not_reached (); - }); - - this._main_loop.run (); - - assert (this._new_primary_store_found); - - GLib.Source.remove (timer_id); - this._aggregator = null; - this._main_loop = null; - } - - private async void _test_change_primary_store () - { - var store = BackendStore.dup (); - yield store.prepare (); - this._aggregator = new IndividualAggregator (); - try - { - yield this._aggregator.prepare (); - - this._pstore1 = this._get_persona_store (store, - this._eds_backend.address_book_uid); - this._pstore2 = this._get_persona_store (store, - this._eds_backend_other.address_book_uid); - - assert (this._pstore1 != null); - assert (this._pstore2 != null); - - assert (this._aggregator.primary_store == this._pstore1); - - this._aggregator.notify["primary-store"].connect ( - this._primary_store_cb); - - this._eds_backend_other.set_as_default (); - } - catch (GLib.Error e) - { - GLib.warning ("Error when calling prepare: %s\n", e.message); - } - } - - private PersonaStore? _get_persona_store (BackendStore store, string store_id) - { - PersonaStore? pstore = null; - foreach (var backend in store.enabled_backends.values) - { - pstore = backend.persona_stores.get (store_id); - if (pstore != null) - break; - } - return pstore; - } - - private void _primary_store_cb (Object ia_obj, ParamSpec ps) - { - IndividualAggregator ia = (IndividualAggregator) ia_obj; - - if (ia.primary_store == this._pstore2) - { - this._new_primary_store_found = true; - this._main_loop.quit (); - } - } -} - -public int main (string[] args) -{ - Test.init (ref args); - - TestSuite root = TestSuite.get_root (); - root.add_suite (new ChangePrimaryStoreTests ().get_suite ()); - - Test.run (); - - return 0; -} diff -Nru folks-0.6.6/tests/eds/email-details.c folks-0.6.7/tests/eds/email-details.c --- folks-0.6.6/tests/eds/email-details.c 2011-12-13 23:42:54.000000000 +0000 +++ folks-0.6.7/tests/eds/email-details.c 2012-02-23 00:02:30.000000000 +0000 @@ -1,4 +1,4 @@ -/* email-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* email-details.c generated by valac 0.15.1, the Vala compiler * generated from email-details.vala, do not modify */ /* @@ -697,7 +697,7 @@ #line 115 "/home/treitter/collabora/folks/tests/eds/email-details.vala" _tmp88_ = self->priv->_email_types; #line 115 "/home/treitter/collabora/folks/tests/eds/email-details.vala" - _tmp89_ = gee_collection_get_size ((GeeCollection*) _tmp88_); + _tmp89_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp88_); #line 115 "/home/treitter/collabora/folks/tests/eds/email-details.vala" _tmp90_ = _tmp89_; #line 115 "/home/treitter/collabora/folks/tests/eds/email-details.vala" @@ -705,7 +705,7 @@ #line 116 "/home/treitter/collabora/folks/tests/eds/email-details.vala" _tmp91_ = self->priv->_c1; #line 116 "/home/treitter/collabora/folks/tests/eds/email-details.vala" - _tmp92_ = gee_map_get_size ((GeeMap*) _tmp91_); + _tmp92_ = gee_abstract_map_get_size ((GeeMap*) _tmp91_); #line 116 "/home/treitter/collabora/folks/tests/eds/email-details.vala" _tmp93_ = _tmp92_; #line 116 "/home/treitter/collabora/folks/tests/eds/email-details.vala" @@ -713,7 +713,7 @@ #line 117 "/home/treitter/collabora/folks/tests/eds/email-details.vala" _tmp94_ = self->priv->_c2; #line 117 "/home/treitter/collabora/folks/tests/eds/email-details.vala" - _tmp95_ = gee_map_get_size ((GeeMap*) _tmp94_); + _tmp95_ = gee_abstract_map_get_size ((GeeMap*) _tmp94_); #line 117 "/home/treitter/collabora/folks/tests/eds/email-details.vala" _tmp96_ = _tmp95_; #line 117 "/home/treitter/collabora/folks/tests/eds/email-details.vala" @@ -721,7 +721,7 @@ #line 118 "/home/treitter/collabora/folks/tests/eds/email-details.vala" _tmp97_ = self->priv->_c3; #line 118 "/home/treitter/collabora/folks/tests/eds/email-details.vala" - _tmp98_ = gee_map_get_size ((GeeMap*) _tmp97_); + _tmp98_ = gee_abstract_map_get_size ((GeeMap*) _tmp97_); #line 118 "/home/treitter/collabora/folks/tests/eds/email-details.vala" _tmp99_ = _tmp98_; #line 118 "/home/treitter/collabora/folks/tests/eds/email-details.vala" diff -Nru folks-0.6.6/tests/eds/im-details.c folks-0.6.7/tests/eds/im-details.c --- folks-0.6.6/tests/eds/im-details.c 2011-12-13 23:42:34.000000000 +0000 +++ folks-0.6.7/tests/eds/im-details.c 2012-02-23 00:02:35.000000000 +0000 @@ -1,4 +1,4 @@ -/* im-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* im-details.c generated by valac 0.15.1, the Vala compiler * generated from im-details.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/individual-retrieval.c folks-0.6.7/tests/eds/individual-retrieval.c --- folks-0.6.6/tests/eds/individual-retrieval.c 2011-12-13 23:43:02.000000000 +0000 +++ folks-0.6.7/tests/eds/individual-retrieval.c 2012-02-23 00:02:30.000000000 +0000 @@ -1,4 +1,4 @@ -/* individual-retrieval.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* individual-retrieval.c generated by valac 0.15.1, the Vala compiler * generated from individual-retrieval.vala, do not modify */ /* @@ -452,7 +452,7 @@ #line 91 "/home/treitter/collabora/folks/tests/eds/individual-retrieval.vala" _tmp38_ = self->priv->_found_individuals; #line 91 "/home/treitter/collabora/folks/tests/eds/individual-retrieval.vala" - _tmp39_ = gee_collection_get_size ((GeeCollection*) _tmp38_); + _tmp39_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp38_); #line 91 "/home/treitter/collabora/folks/tests/eds/individual-retrieval.vala" _tmp40_ = _tmp39_; #line 91 "/home/treitter/collabora/folks/tests/eds/individual-retrieval.vala" @@ -770,7 +770,7 @@ #line 128 "/home/treitter/collabora/folks/tests/eds/individual-retrieval.vala" _tmp20_ = self->priv->_found_individuals; #line 128 "/home/treitter/collabora/folks/tests/eds/individual-retrieval.vala" - _tmp21_ = gee_collection_get_size ((GeeCollection*) _tmp20_); + _tmp21_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp20_); #line 128 "/home/treitter/collabora/folks/tests/eds/individual-retrieval.vala" _tmp22_ = _tmp21_; #line 128 "/home/treitter/collabora/folks/tests/eds/individual-retrieval.vala" diff -Nru folks-0.6.6/tests/eds/link-personas.c folks-0.6.7/tests/eds/link-personas.c --- folks-0.6.6/tests/eds/link-personas.c 2011-12-13 23:42:18.000000000 +0000 +++ folks-0.6.7/tests/eds/link-personas.c 2012-02-23 00:02:34.000000000 +0000 @@ -1,4 +1,4 @@ -/* link-personas.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* link-personas.c generated by valac 0.15.1, the Vala compiler * generated from link-personas.vala, do not modify */ /* @@ -2220,7 +2220,7 @@ #line 339 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" _data_->_tmp1_ = _data_->self->priv->_linking_props; #line 339 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" - _data_->_tmp2_ = gee_map_get_size ((GeeMap*) _data_->_tmp1_); + _data_->_tmp2_ = gee_abstract_map_get_size ((GeeMap*) _data_->_tmp1_); #line 339 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" _data_->_tmp3_ = _data_->_tmp2_; #line 339 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" @@ -2932,7 +2932,7 @@ #line 433 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" _data_->_tmp166_ = _data_->self->priv->_linking_props; #line 433 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" - _data_->_tmp167_ = gee_map_get_size ((GeeMap*) _data_->_tmp166_); + _data_->_tmp167_ = gee_abstract_map_get_size ((GeeMap*) _data_->_tmp166_); #line 433 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" _data_->_tmp168_ = _data_->_tmp167_; #line 433 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" @@ -2949,7 +2949,7 @@ #line 441 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" _data_->_tmp171_ = _data_->self->priv->_personas; #line 441 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" - _data_->_tmp172_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp171_); + _data_->_tmp172_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp171_); #line 441 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" _data_->_tmp173_ = _data_->_tmp172_; #line 441 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" @@ -3107,7 +3107,7 @@ #line 464 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" _data_->_tmp0_ = _data_->self->priv->_linking_props; #line 464 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" - _data_->_tmp1_ = gee_map_get_size ((GeeMap*) _data_->_tmp0_); + _data_->_tmp1_ = gee_abstract_map_get_size ((GeeMap*) _data_->_tmp0_); #line 464 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" _data_->_tmp2_ = _data_->_tmp1_; #line 464 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" @@ -3329,7 +3329,7 @@ #line 493 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" _data_->_tmp48_ = _data_->self->priv->_linking_props; #line 493 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" - _data_->_tmp49_ = gee_map_get_size ((GeeMap*) _data_->_tmp48_); + _data_->_tmp49_ = gee_abstract_map_get_size ((GeeMap*) _data_->_tmp48_); #line 493 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" _data_->_tmp50_ = _data_->_tmp49_; #line 493 "/home/treitter/collabora/folks/tests/eds/link-personas.vala" diff -Nru folks-0.6.6/tests/eds/link-personas-diff-stores.c folks-0.6.7/tests/eds/link-personas-diff-stores.c --- folks-0.6.6/tests/eds/link-personas-diff-stores.c 2011-12-13 23:42:02.000000000 +0000 +++ folks-0.6.7/tests/eds/link-personas-diff-stores.c 2012-02-23 00:02:32.000000000 +0000 @@ -1,4 +1,4 @@ -/* link-personas-diff-stores.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* link-personas-diff-stores.c generated by valac 0.15.1, the Vala compiler * generated from link-personas-diff-stores.vala, do not modify */ /* @@ -46,6 +46,7 @@ #define _eds_test_backend_unref0(var) ((var == NULL) ? NULL : (var = (eds_test_backend_unref (var), NULL))) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) +typedef struct _Block1Data Block1Data; #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) typedef struct _LinkPersonasDiffStoresTestsTestLinkingPersonasAsyncData LinkPersonasDiffStoresTestsTestLinkingPersonasAsyncData; #define __vala_GValue_free0(var) ((var == NULL) ? NULL : (var = (_vala_GValue_free (var), NULL))) @@ -77,34 +78,31 @@ GeeHashSet* _personas; }; +struct _Block1Data { + int _ref_count_; + LinkPersonasDiffStoresTests * self; + FolksBackendStore* store; + gpointer _async_data_; +}; + struct _LinkPersonasDiffStoresTestsTestLinkingPersonasAsyncData { int _state_; GObject* _source_object_; GAsyncResult* _res_; GSimpleAsyncResult* _async_result; LinkPersonasDiffStoresTests* self; + Block1Data* _data1_; FolksBackendStore* _tmp0_; - FolksBackendStore* store; FolksIndividualAggregator* _tmp1_; FolksIndividualAggregator* _tmp2_; FolksIndividualAggregator* _tmp3_; - EdsTestBackend* _tmp4_; - const gchar* _tmp5_; - const gchar* _tmp6_; - FolksPersonaStore* _tmp7_; - FolksPersonaStore* pstore; - FolksPersonaStore* _tmp8_; - EdsTestBackend* _tmp9_; - const gchar* _tmp10_; - const gchar* _tmp11_; - FolksPersonaStore* _tmp12_; - FolksPersonaStore* pstore2; - FolksPersonaStore* _tmp13_; - FolksPersonaStore* _tmp14_; - FolksPersonaStore* _tmp15_; + FolksIndividualAggregator* _tmp4_; + gboolean _tmp5_; + gboolean _tmp6_; + FolksIndividualAggregator* _tmp7_; GError* e; - GError* _tmp16_; - const gchar* _tmp17_; + GError* _tmp8_; + const gchar* _tmp9_; GError * _inner_error_; }; @@ -289,16 +287,20 @@ static void link_personas_diff_stores_tests_real_tear_down (FolksTestCase* base); static void _link_personas_diff_stores_tests_test_linking_personas_async (LinkPersonasDiffStoresTests* self, GAsyncReadyCallback _callback_, gpointer _user_data_); static void _link_personas_diff_stores_tests_test_linking_personas_finish (LinkPersonasDiffStoresTests* self, GAsyncResult* _res_); -static gboolean __lambda3_ (LinkPersonasDiffStoresTests* self); -static gboolean ___lambda3__gsource_func (gpointer self); +static gboolean __lambda4_ (LinkPersonasDiffStoresTests* self); +static gboolean ___lambda4__gsource_func (gpointer self); static void _link_personas_diff_stores_tests_test_linking_personas_async_data_free (gpointer _data); static gboolean _link_personas_diff_stores_tests_test_linking_personas_async_co (LinkPersonasDiffStoresTestsTestLinkingPersonasAsyncData* _data_); +static Block1Data* block1_data_ref (Block1Data* _data1_); +static void block1_data_unref (Block1Data* _data1_); static void _link_personas_diff_stores_tests_test_linking_personas_async_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); static void _link_personas_diff_stores_tests_individuals_changed_cb (LinkPersonasDiffStoresTests* self, GeeMultiMap* changes); static void __link_personas_diff_stores_tests_individuals_changed_cb_folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self); +static void ___lambda3_ (Block1Data* _data1_, GObject* obj, GParamSpec* pspec); static FolksPersonaStore* _link_personas_diff_stores_tests_get_store (LinkPersonasDiffStoresTests* self, FolksBackendStore* store, const gchar* store_id); static void _link_personas_diff_stores_tests_add_personas (LinkPersonasDiffStoresTests* self, FolksPersonaStore* pstore1, FolksPersonaStore* pstore2, GAsyncReadyCallback _callback_, gpointer _user_data_); static void _link_personas_diff_stores_tests_add_personas_finish (LinkPersonasDiffStoresTests* self, GAsyncResult* _res_); +static void ____lambda3__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); static void _link_personas_diff_stores_tests_add_personas_data_free (gpointer _data); static gboolean _link_personas_diff_stores_tests_add_personas_co (LinkPersonasDiffStoresTestsAddPersonasData* _data_); static void _g_free0_ (gpointer var); @@ -325,7 +327,7 @@ static void _link_personas_diff_stores_tests_test_linking_via_local_ids_diff_stores_folks_test_case_test_method (gpointer self) { #line 42 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" link_personas_diff_stores_tests_test_linking_via_local_ids_diff_stores (self); -#line 329 "link-personas-diff-stores.c" +#line 331 "link-personas-diff-stores.c" } @@ -337,14 +339,14 @@ folks_test_case_add_test ((FolksTestCase*) self, "test linking via local IDs using different PersonaStores", _link_personas_diff_stores_tests_test_linking_via_local_ids_diff_stores_folks_test_case_test_method, self); #line 38 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return self; -#line 341 "link-personas-diff-stores.c" +#line 343 "link-personas-diff-stores.c" } LinkPersonasDiffStoresTests* link_personas_diff_stores_tests_new (void) { #line 38 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return link_personas_diff_stores_tests_construct (TYPE_LINK_PERSONAS_DIFF_STORES_TESTS); -#line 348 "link-personas-diff-stores.c" +#line 350 "link-personas-diff-stores.c" } @@ -400,7 +402,7 @@ g_setenv ("FOLKS_PRIMARY_STORE", config_val, TRUE); #line 46 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_free0 (config_val); -#line 404 "link-personas-diff-stores.c" +#line 406 "link-personas-diff-stores.c" } @@ -428,11 +430,11 @@ _eds_test_backend_unref0 (self->priv->_eds_backend_other); #line 68 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" self->priv->_eds_backend_other = NULL; -#line 432 "link-personas-diff-stores.c" +#line 434 "link-personas-diff-stores.c" } -static gboolean __lambda3_ (LinkPersonasDiffStoresTests* self) { +static gboolean __lambda4_ (LinkPersonasDiffStoresTests* self) { gboolean result = FALSE; GMainLoop* _tmp0_; #line 86 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" @@ -443,16 +445,16 @@ g_assert_not_reached (); #line 84 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return result; -#line 447 "link-personas-diff-stores.c" +#line 449 "link-personas-diff-stores.c" } -static gboolean ___lambda3__gsource_func (gpointer self) { +static gboolean ___lambda4__gsource_func (gpointer self) { gboolean result; - result = __lambda3_ (self); + result = __lambda4_ (self); #line 84 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return result; -#line 456 "link-personas-diff-stores.c" +#line 458 "link-personas-diff-stores.c" } @@ -512,7 +514,7 @@ #line 82 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _link_personas_diff_stores_tests_test_linking_personas_async (self, NULL, NULL); #line 84 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _tmp6_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 8, ___lambda3__gsource_func, g_object_ref (self), g_object_unref); + _tmp6_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 8, ___lambda4__gsource_func, g_object_ref (self), g_object_unref); #line 84 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" timer_id = _tmp6_; #line 90 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" @@ -533,7 +535,7 @@ _g_main_loop_unref0 (self->priv->_main_loop); #line 96 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" self->priv->_main_loop = NULL; -#line 537 "link-personas-diff-stores.c" +#line 539 "link-personas-diff-stores.c" } @@ -544,14 +546,14 @@ _g_object_unref0 (_data_->self); #line 24 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_slice_free (LinkPersonasDiffStoresTestsTestLinkingPersonasAsyncData, _data_); -#line 548 "link-personas-diff-stores.c" +#line 550 "link-personas-diff-stores.c" } static gpointer _g_object_ref0 (gpointer self) { #line 24 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return self ? g_object_ref (self) : NULL; -#line 555 "link-personas-diff-stores.c" +#line 557 "link-personas-diff-stores.c" } @@ -570,7 +572,7 @@ _data_->self = _tmp0_; #line 24 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _link_personas_diff_stores_tests_test_linking_personas_async_co (_data_); -#line 574 "link-personas-diff-stores.c" +#line 576 "link-personas-diff-stores.c" } @@ -578,7 +580,34 @@ LinkPersonasDiffStoresTestsTestLinkingPersonasAsyncData* _data_; #line 24 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 582 "link-personas-diff-stores.c" +#line 584 "link-personas-diff-stores.c" +} + + +static Block1Data* block1_data_ref (Block1Data* _data1_) { +#line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + g_atomic_int_inc (&_data1_->_ref_count_); +#line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + return _data1_; +#line 593 "link-personas-diff-stores.c" +} + + +static void block1_data_unref (Block1Data* _data1_) { +#line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { +#line 600 "link-personas-diff-stores.c" + LinkPersonasDiffStoresTests * self; +#line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + self = _data1_->self; +#line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _g_object_unref0 (_data1_->store); +#line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _g_object_unref0 (self); +#line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + g_slice_free (Block1Data, _data1_); +#line 610 "link-personas-diff-stores.c" + } } @@ -592,14 +621,89 @@ _data_->_res_ = _res_; #line 102 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _link_personas_diff_stores_tests_test_linking_personas_async_co (_data_); -#line 596 "link-personas-diff-stores.c" +#line 625 "link-personas-diff-stores.c" } static void __link_personas_diff_stores_tests_individuals_changed_cb_folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 104 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _link_personas_diff_stores_tests_individuals_changed_cb (self, changes); -#line 603 "link-personas-diff-stores.c" +#line 632 "link-personas-diff-stores.c" +} + + +static void ___lambda3_ (Block1Data* _data1_, GObject* obj, GParamSpec* pspec) { + LinkPersonasDiffStoresTests * self; + EdsTestBackend* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + FolksPersonaStore* _tmp3_ = NULL; + FolksPersonaStore* pstore; + gboolean _tmp4_; + gboolean _tmp5_; + EdsTestBackend* _tmp6_; + const gchar* _tmp7_; + const gchar* _tmp8_; + FolksPersonaStore* _tmp9_ = NULL; + FolksPersonaStore* pstore2; + gboolean _tmp10_; + gboolean _tmp11_; +#line 113 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + self = _data1_->self; +#line 113 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + g_return_if_fail (obj != NULL); +#line 113 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + g_return_if_fail (pspec != NULL); +#line 115 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _tmp0_ = self->priv->_eds_backend; +#line 115 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _tmp1_ = eds_test_backend_get_address_book_uid (_tmp0_); +#line 115 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _tmp2_ = _tmp1_; +#line 115 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _tmp3_ = _link_personas_diff_stores_tests_get_store (self, _data1_->store, _tmp2_); +#line 115 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + pstore = _tmp3_; +#line 117 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + g_assert (pstore != NULL); +#line 118 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _tmp4_ = folks_persona_store_get_is_prepared (pstore); +#line 118 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _tmp5_ = _tmp4_; +#line 118 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + g_assert (_tmp5_ == TRUE); +#line 120 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _tmp6_ = self->priv->_eds_backend_other; +#line 120 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _tmp7_ = eds_test_backend_get_address_book_uid (_tmp6_); +#line 120 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _tmp8_ = _tmp7_; +#line 120 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _tmp9_ = _link_personas_diff_stores_tests_get_store (self, _data1_->store, _tmp8_); +#line 120 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + pstore2 = _tmp9_; +#line 122 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + g_assert (pstore2 != NULL); +#line 123 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _tmp10_ = folks_persona_store_get_is_prepared (pstore2); +#line 123 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _tmp11_ = _tmp10_; +#line 123 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + g_assert (_tmp11_ == TRUE); +#line 125 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _link_personas_diff_stores_tests_add_personas (self, pstore, pstore2, NULL, NULL); +#line 113 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _g_object_unref0 (pstore2); +#line 113 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _g_object_unref0 (pstore); +#line 700 "link-personas-diff-stores.c" +} + + +static void ____lambda3__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { +#line 113 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + ___lambda3_ (self, _sender, pspec); +#line 707 "link-personas-diff-stores.c" } @@ -608,42 +712,46 @@ switch (_data_->_state_) { #line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" case 0: -#line 612 "link-personas-diff-stores.c" +#line 716 "link-personas-diff-stores.c" goto _state_0; #line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" case 1: -#line 616 "link-personas-diff-stores.c" +#line 720 "link-personas-diff-stores.c" goto _state_1; #line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" case 2: -#line 620 "link-personas-diff-stores.c" +#line 724 "link-personas-diff-stores.c" goto _state_2; -#line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - case 3: -#line 624 "link-personas-diff-stores.c" - goto _state_3; default: #line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_assert_not_reached (); -#line 629 "link-personas-diff-stores.c" +#line 729 "link-personas-diff-stores.c" } _state_0: +#line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _data_->_data1_ = g_slice_new0 (Block1Data); +#line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _data_->_data1_->_ref_count_ = 1; +#line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _data_->_data1_->self = g_object_ref (_data_->self); +#line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _data_->_data1_->_async_data_ = _data_; #line 101 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp0_ = NULL; #line 101 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp0_ = folks_backend_store_dup (); #line 101 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->store = _data_->_tmp0_; + _data_->_data1_->store = _data_->_tmp0_; #line 102 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_state_ = 1; #line 102 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - folks_backend_store_prepare (_data_->store, _link_personas_diff_stores_tests_test_linking_personas_async_ready, _data_); + folks_backend_store_prepare (_data_->_data1_->store, _link_personas_diff_stores_tests_test_linking_personas_async_ready, _data_); #line 102 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return FALSE; -#line 644 "link-personas-diff-stores.c" +#line 752 "link-personas-diff-stores.c" _state_1: #line 102 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - folks_backend_store_prepare_finish (_data_->store, _data_->_res_); + folks_backend_store_prepare_finish (_data_->_data1_->store, _data_->_res_); #line 103 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp1_ = folks_individual_aggregator_new (); #line 103 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" @@ -654,7 +762,7 @@ _data_->_tmp2_ = _data_->self->priv->_aggregator; #line 104 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_signal_connect_object (_data_->_tmp2_, "individuals-changed-detailed", (GCallback) __link_personas_diff_stores_tests_individuals_changed_cb_folks_individual_aggregator_individuals_changed_detailed, _data_->self, 0); -#line 658 "link-personas-diff-stores.c" +#line 766 "link-personas-diff-stores.c" { #line 108 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp3_ = _data_->self->priv->_aggregator; @@ -664,66 +772,28 @@ folks_individual_aggregator_prepare (_data_->_tmp3_, _link_personas_diff_stores_tests_test_linking_personas_async_ready, _data_); #line 108 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return FALSE; -#line 668 "link-personas-diff-stores.c" +#line 776 "link-personas-diff-stores.c" _state_2: #line 108 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" folks_individual_aggregator_prepare_finish (_data_->_tmp3_, _data_->_res_, &_data_->_inner_error_); #line 108 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_inner_error_ != NULL) { -#line 674 "link-personas-diff-stores.c" +#line 782 "link-personas-diff-stores.c" goto __catch0_g_error; } -#line 110 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->_tmp4_ = _data_->self->priv->_eds_backend; -#line 110 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->_tmp5_ = eds_test_backend_get_address_book_uid (_data_->_tmp4_); -#line 110 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 109 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _data_->_tmp4_ = _data_->self->priv->_aggregator; +#line 109 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _data_->_tmp5_ = folks_individual_aggregator_get_is_prepared (_data_->_tmp4_); +#line 109 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp6_ = _data_->_tmp5_; -#line 110 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->_tmp7_ = NULL; -#line 110 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->_tmp7_ = _link_personas_diff_stores_tests_get_store (_data_->self, _data_->store, _data_->_tmp6_); -#line 110 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->pstore = _data_->_tmp7_; -#line 112 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->_tmp8_ = _data_->pstore; -#line 112 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - g_assert (_data_->_tmp8_ != NULL); -#line 114 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->_tmp9_ = _data_->self->priv->_eds_backend_other; -#line 114 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->_tmp10_ = eds_test_backend_get_address_book_uid (_data_->_tmp9_); -#line 114 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->_tmp11_ = _data_->_tmp10_; -#line 114 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->_tmp12_ = NULL; -#line 114 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->_tmp12_ = _link_personas_diff_stores_tests_get_store (_data_->self, _data_->store, _data_->_tmp11_); -#line 114 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->pstore2 = _data_->_tmp12_; -#line 116 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->_tmp13_ = _data_->pstore2; -#line 116 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - g_assert (_data_->_tmp13_ != NULL); -#line 118 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->_tmp14_ = _data_->pstore; -#line 118 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->_tmp15_ = _data_->pstore2; -#line 118 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->_state_ = 3; -#line 118 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _link_personas_diff_stores_tests_add_personas (_data_->self, _data_->_tmp14_, _data_->_tmp15_, _link_personas_diff_stores_tests_test_linking_personas_async_ready, _data_); -#line 118 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - return FALSE; -#line 719 "link-personas-diff-stores.c" - _state_3: -#line 118 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _link_personas_diff_stores_tests_add_personas_finish (_data_->self, _data_->_res_); -#line 106 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _g_object_unref0 (_data_->pstore2); -#line 106 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _g_object_unref0 (_data_->pstore); -#line 727 "link-personas-diff-stores.c" +#line 109 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + g_assert (_data_->_tmp6_); +#line 113 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _data_->_tmp7_ = _data_->self->priv->_aggregator; +#line 113 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + g_signal_connect_data ((GObject*) _data_->_tmp7_, "notify::is-quiescent", (GCallback) ____lambda3__g_object_notify, block1_data_ref (_data_->_data1_), (GClosureNotify) block1_data_unref, 0); +#line 797 "link-personas-diff-stores.c" } goto __finally0; __catch0_g_error: @@ -732,61 +802,65 @@ _data_->e = _data_->_inner_error_; #line 106 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_inner_error_ = NULL; -#line 122 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->_tmp16_ = _data_->e; -#line 122 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->_tmp17_ = _data_->_tmp16_->message; -#line 122 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - g_warning ("link-personas-diff-stores.vala:122: Error when calling prepare: %s\n", _data_->_tmp17_); +#line 130 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _data_->_tmp8_ = _data_->e; +#line 130 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _data_->_tmp9_ = _data_->_tmp8_->message; +#line 130 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + g_warning ("link-personas-diff-stores.vala:130: Error when calling prepare: %s\n", _data_->_tmp9_); #line 106 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_error_free0 (_data_->e); -#line 744 "link-personas-diff-stores.c" +#line 814 "link-personas-diff-stores.c" } __finally0: #line 106 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_inner_error_ != NULL) { #line 106 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _g_object_unref0 (_data_->store); + block1_data_unref (_data_->_data1_); +#line 106 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _data_->_data1_ = NULL; #line 106 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); #line 106 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_clear_error (&_data_->_inner_error_); #line 106 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return FALSE; -#line 757 "link-personas-diff-stores.c" +#line 829 "link-personas-diff-stores.c" } #line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _g_object_unref0 (_data_->store); + block1_data_unref (_data_->_data1_); +#line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _data_->_data1_ = NULL; #line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_state_ == 0) { #line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 765 "link-personas-diff-stores.c" +#line 839 "link-personas-diff-stores.c" } else { #line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_simple_async_result_complete (_data_->_async_result); -#line 769 "link-personas-diff-stores.c" +#line 843 "link-personas-diff-stores.c" } #line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_object_unref (_data_->_async_result); #line 99 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return FALSE; -#line 775 "link-personas-diff-stores.c" +#line 849 "link-personas-diff-stores.c" } static FolksPersonaStore* _link_personas_diff_stores_tests_get_store (LinkPersonasDiffStoresTests* self, FolksBackendStore* store, const gchar* store_id) { FolksPersonaStore* result = NULL; FolksPersonaStore* pstore; -#line 126 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 134 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_return_val_if_fail (self != NULL, NULL); -#line 126 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 134 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_return_val_if_fail (store != NULL, NULL); -#line 126 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 134 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_return_val_if_fail (store_id != NULL, NULL); -#line 128 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 136 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" pstore = NULL; -#line 790 "link-personas-diff-stores.c" +#line 864 "link-personas-diff-stores.c" { FolksBackendStore* _tmp0_; GeeMap* _tmp1_; @@ -797,29 +871,29 @@ GeeIterator* _tmp6_ = NULL; GeeIterator* _tmp7_; GeeIterator* _backend_it; -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp0_ = store; -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp1_ = folks_backend_store_get_enabled_backends (_tmp0_); -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp2_ = _tmp1_; -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp3_ = gee_map_get_values (_tmp2_); -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp4_ = _tmp3_; -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp5_ = _tmp4_; -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp6_ = gee_iterable_iterator ((GeeIterable*) _tmp5_); -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp7_ = _tmp6_; -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (_tmp5_); -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _backend_it = _tmp7_; -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" while (TRUE) { -#line 823 "link-personas-diff-stores.c" +#line 897 "link-personas-diff-stores.c" GeeIterator* _tmp8_; gboolean _tmp9_ = FALSE; GeeIterator* _tmp10_; @@ -831,59 +905,59 @@ const gchar* _tmp15_; gpointer _tmp16_ = NULL; FolksPersonaStore* _tmp17_; -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp8_ = _backend_it; -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp9_ = gee_iterator_next (_tmp8_); -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (!_tmp9_) { -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" break; -#line 843 "link-personas-diff-stores.c" +#line 917 "link-personas-diff-stores.c" } -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp10_ = _backend_it; -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp11_ = gee_iterator_get (_tmp10_); -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" backend = (FolksBackend*) _tmp11_; -#line 131 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 139 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp12_ = backend; -#line 131 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 139 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp13_ = folks_backend_get_persona_stores (_tmp12_); -#line 131 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 139 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp14_ = _tmp13_; -#line 131 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 139 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp15_ = store_id; -#line 131 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 139 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp16_ = gee_map_get (_tmp14_, _tmp15_); -#line 131 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 139 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (pstore); -#line 131 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 139 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" pstore = (FolksPersonaStore*) _tmp16_; -#line 132 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 140 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp17_ = pstore; -#line 132 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 140 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_tmp17_ != NULL) { -#line 133 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 141 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (backend); -#line 133 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 141 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" break; -#line 873 "link-personas-diff-stores.c" +#line 947 "link-personas-diff-stores.c" } -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (backend); -#line 877 "link-personas-diff-stores.c" +#line 951 "link-personas-diff-stores.c" } -#line 129 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 137 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (_backend_it); -#line 881 "link-personas-diff-stores.c" +#line 955 "link-personas-diff-stores.c" } -#line 135 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 143 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" result = pstore; -#line 135 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 143 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return result; -#line 887 "link-personas-diff-stores.c" +#line 961 "link-personas-diff-stores.c" } @@ -898,7 +972,7 @@ _g_object_unref0 (_data_->self); #line 24 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_slice_free (LinkPersonasDiffStoresTestsAddPersonasData, _data_); -#line 902 "link-personas-diff-stores.c" +#line 976 "link-personas-diff-stores.c" } @@ -933,7 +1007,7 @@ _data_->pstore2 = _tmp4_; #line 24 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _link_personas_diff_stores_tests_add_personas_co (_data_); -#line 937 "link-personas-diff-stores.c" +#line 1011 "link-personas-diff-stores.c" } @@ -941,346 +1015,346 @@ LinkPersonasDiffStoresTestsAddPersonasData* _data_; #line 24 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 945 "link-personas-diff-stores.c" +#line 1019 "link-personas-diff-stores.c" } static void _g_free0_ (gpointer var) { -#line 151 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 159 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" var = (g_free (var), NULL); -#line 952 "link-personas-diff-stores.c" +#line 1026 "link-personas-diff-stores.c" } static void _vala_GValue_free (GValue* self) { -#line 151 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 159 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_value_unset (self); -#line 151 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 159 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_free (self); -#line 961 "link-personas-diff-stores.c" +#line 1035 "link-personas-diff-stores.c" } static void __vala_GValue_free0_ (gpointer var) { -#line 151 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 159 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" (var == NULL) ? NULL : (var = (_vala_GValue_free (var), NULL)); -#line 968 "link-personas-diff-stores.c" +#line 1042 "link-personas-diff-stores.c" } static GValue* _g_value_dup (GValue* self) { -#line 153 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 161 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return g_boxed_copy (G_TYPE_VALUE, self); -#line 975 "link-personas-diff-stores.c" +#line 1049 "link-personas-diff-stores.c" } static gpointer __g_value_dup0 (gpointer self) { -#line 153 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 161 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return self ? _g_value_dup (self) : NULL; -#line 982 "link-personas-diff-stores.c" +#line 1056 "link-personas-diff-stores.c" } static void _link_personas_diff_stores_tests_add_personas_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { LinkPersonasDiffStoresTestsAddPersonasData* _data_; -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_ = _user_data_; -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_source_object_ = source_object; -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_res_ = _res_; -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _link_personas_diff_stores_tests_add_personas_co (_data_); -#line 996 "link-personas-diff-stores.c" +#line 1070 "link-personas-diff-stores.c" } static gboolean _link_personas_diff_stores_tests_add_personas_co (LinkPersonasDiffStoresTestsAddPersonasData* _data_) { -#line 149 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" switch (_data_->_state_) { -#line 149 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" case 0: -#line 1005 "link-personas-diff-stores.c" +#line 1079 "link-personas-diff-stores.c" goto _state_0; -#line 149 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" case 1: -#line 1009 "link-personas-diff-stores.c" +#line 1083 "link-personas-diff-stores.c" goto _state_1; -#line 149 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" case 2: -#line 1013 "link-personas-diff-stores.c" +#line 1087 "link-personas-diff-stores.c" goto _state_2; default: -#line 149 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_assert_not_reached (); -#line 1018 "link-personas-diff-stores.c" +#line 1092 "link-personas-diff-stores.c" } _state_0: -#line 151 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 159 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp0_ = g_str_hash; -#line 151 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 159 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp1_ = g_str_equal; -#line 151 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 159 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp2_ = g_hash_table_new_full (_data_->_tmp0_, _data_->_tmp1_, _g_free0_, __vala_GValue_free0_); -#line 151 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 159 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->details1 = _data_->_tmp2_; -#line 153 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 161 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" memset (&_data_->_tmp3_, 0, sizeof (GValue)); -#line 153 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 161 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_value_init (&_data_->_tmp3_, G_TYPE_STRING); -#line 153 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 161 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp4_ = _data_->_tmp3_; -#line 153 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 161 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp5_ = __g_value_dup0 (&_data_->_tmp4_); -#line 153 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 161 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp6_ = _data_->_tmp5_; -#line 153 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 161 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" G_IS_VALUE (&_data_->_tmp4_) ? (g_value_unset (&_data_->_tmp4_), NULL) : NULL; -#line 153 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 161 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->v1 = _data_->_tmp6_; -#line 154 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 162 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp7_ = _data_->v1; -#line 154 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 162 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp8_ = _data_->self->priv->_persona_fullname_1; -#line 154 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 162 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_value_set_string (_data_->_tmp7_, _data_->_tmp8_); -#line 155 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 163 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp9_ = _data_->details1; -#line 155 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 163 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp10_ = g_strdup ("full-name"); -#line 155 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 163 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp11_ = _data_->v1; -#line 155 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 163 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->v1 = NULL; -#line 155 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 163 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_hash_table_insert (_data_->_tmp9_, _data_->_tmp10_, _data_->_tmp11_); -#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp12_ = g_str_hash; -#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp13_ = g_str_equal; -#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp14_ = g_hash_table_new_full (_data_->_tmp12_, _data_->_tmp13_, _g_free0_, __vala_GValue_free0_); -#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->details2 = _data_->_tmp14_; -#line 159 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 167 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" memset (&_data_->_tmp15_, 0, sizeof (GValue)); -#line 159 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 167 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_value_init (&_data_->_tmp15_, G_TYPE_STRING); -#line 159 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 167 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp16_ = _data_->_tmp15_; -#line 159 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 167 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp17_ = __g_value_dup0 (&_data_->_tmp16_); -#line 159 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 167 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp18_ = _data_->_tmp17_; -#line 159 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 167 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" G_IS_VALUE (&_data_->_tmp16_) ? (g_value_unset (&_data_->_tmp16_), NULL) : NULL; -#line 159 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 167 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->v2 = _data_->_tmp18_; -#line 160 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp19_ = _data_->v2; -#line 160 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp20_ = _data_->self->priv->_persona_fullname_2; -#line 160 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_value_set_string (_data_->_tmp19_, _data_->_tmp20_); -#line 161 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 169 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp21_ = _data_->details2; -#line 161 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 169 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp22_ = g_strdup ("full-name"); -#line 161 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 169 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp23_ = _data_->v2; -#line 161 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 169 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->v2 = NULL; -#line 161 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 169 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_hash_table_insert (_data_->_tmp21_, _data_->_tmp22_, _data_->_tmp23_); -#line 1097 "link-personas-diff-stores.c" +#line 1171 "link-personas-diff-stores.c" { -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp24_ = _data_->self->priv->_aggregator; -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp25_ = _data_->pstore1; -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp26_ = _data_->details1; -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_state_ = 1; -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" folks_individual_aggregator_add_persona_from_details (_data_->_tmp24_, NULL, _data_->_tmp25_, _data_->_tmp26_, _link_personas_diff_stores_tests_add_personas_ready, _data_); -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return FALSE; -#line 1111 "link-personas-diff-stores.c" +#line 1185 "link-personas-diff-stores.c" _state_1: -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp27_ = NULL; -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp27_ = folks_individual_aggregator_add_persona_from_details_finish (_data_->_tmp24_, _data_->_res_, &_data_->_inner_error_); -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp28_ = _data_->_tmp27_; -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (_data_->_tmp28_); -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_inner_error_ != NULL) { -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_inner_error_->domain == FOLKS_INDIVIDUAL_AGGREGATOR_ERROR) { -#line 1125 "link-personas-diff-stores.c" +#line 1199 "link-personas-diff-stores.c" goto __catch1_folks_individual_aggregator_error; } -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" __vala_GValue_free0 (_data_->v2); -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_hash_table_unref0 (_data_->details2); -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" __vala_GValue_free0 (_data_->v1); -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_hash_table_unref0 (_data_->details1); -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_clear_error (&_data_->_inner_error_); -#line 165 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return FALSE; -#line 1142 "link-personas-diff-stores.c" +#line 1216 "link-personas-diff-stores.c" } -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp29_ = _data_->self->priv->_aggregator; -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp30_ = _data_->pstore2; -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp31_ = _data_->details2; -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_state_ = 2; -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" folks_individual_aggregator_add_persona_from_details (_data_->_tmp29_, NULL, _data_->_tmp30_, _data_->_tmp31_, _link_personas_diff_stores_tests_add_personas_ready, _data_); -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return FALSE; -#line 1156 "link-personas-diff-stores.c" +#line 1230 "link-personas-diff-stores.c" _state_2: -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp32_ = NULL; -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp32_ = folks_individual_aggregator_add_persona_from_details_finish (_data_->_tmp29_, _data_->_res_, &_data_->_inner_error_); -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp33_ = _data_->_tmp32_; -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (_data_->_tmp33_); -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_inner_error_ != NULL) { -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_inner_error_->domain == FOLKS_INDIVIDUAL_AGGREGATOR_ERROR) { -#line 1170 "link-personas-diff-stores.c" +#line 1244 "link-personas-diff-stores.c" goto __catch1_folks_individual_aggregator_error; } -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" __vala_GValue_free0 (_data_->v2); -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_hash_table_unref0 (_data_->details2); -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" __vala_GValue_free0 (_data_->v1); -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_hash_table_unref0 (_data_->details1); -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_clear_error (&_data_->_inner_error_); -#line 168 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 176 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return FALSE; -#line 1187 "link-personas-diff-stores.c" +#line 1261 "link-personas-diff-stores.c" } } goto __finally1; __catch1_folks_individual_aggregator_error: { -#line 163 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 171 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->e = _data_->_inner_error_; -#line 163 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 171 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_inner_error_ = NULL; -#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 181 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp34_ = _data_->e; -#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 181 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp35_ = _data_->_tmp34_->message; -#line 173 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - g_warning ("link-personas-diff-stores.vala:173: [AddPersonaError] add_persona_from" \ +#line 181 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + g_warning ("link-personas-diff-stores.vala:181: [AddPersonaError] add_persona_from" \ "_details: %s\n", _data_->_tmp35_); -#line 163 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 171 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_error_free0 (_data_->e); -#line 1205 "link-personas-diff-stores.c" +#line 1279 "link-personas-diff-stores.c" } __finally1: -#line 163 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 171 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_inner_error_ != NULL) { -#line 163 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 171 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" __vala_GValue_free0 (_data_->v2); -#line 163 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 171 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_hash_table_unref0 (_data_->details2); -#line 163 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 171 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" __vala_GValue_free0 (_data_->v1); -#line 163 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 171 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_hash_table_unref0 (_data_->details1); -#line 163 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 171 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); -#line 163 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 171 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_clear_error (&_data_->_inner_error_); -#line 163 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 171 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return FALSE; -#line 1224 "link-personas-diff-stores.c" +#line 1298 "link-personas-diff-stores.c" } -#line 149 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" __vala_GValue_free0 (_data_->v2); -#line 149 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_hash_table_unref0 (_data_->details2); -#line 149 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" __vala_GValue_free0 (_data_->v1); -#line 149 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_hash_table_unref0 (_data_->details1); -#line 149 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_state_ == 0) { -#line 149 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1238 "link-personas-diff-stores.c" +#line 1312 "link-personas-diff-stores.c" } else { -#line 149 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1242 "link-personas-diff-stores.c" +#line 1316 "link-personas-diff-stores.c" } -#line 149 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_object_unref (_data_->_async_result); -#line 149 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 157 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return FALSE; -#line 1248 "link-personas-diff-stores.c" +#line 1322 "link-personas-diff-stores.c" } static void __lambda2_ (LinkPersonasDiffStoresTests* self, GObject* object, GAsyncResult* _result_) { GAsyncResult* _tmp0_; -#line 181 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 189 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_return_if_fail (_result_ != NULL); -#line 183 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 191 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp0_ = _result_; -#line 183 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 191 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _link_personas_diff_stores_tests_individuals_changed_finish (self, _tmp0_); -#line 1260 "link-personas-diff-stores.c" +#line 1334 "link-personas-diff-stores.c" } static void ___lambda2__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 181 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 189 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" __lambda2_ (self, source_object, res); -#line 181 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 189 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_object_unref (self); -#line 1269 "link-personas-diff-stores.c" +#line 1343 "link-personas-diff-stores.c" } static void _link_personas_diff_stores_tests_individuals_changed_cb (LinkPersonasDiffStoresTests* self, GeeMultiMap* changes) { GeeMultiMap* _tmp0_; -#line 178 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 186 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_return_if_fail (self != NULL); -#line 178 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 186 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_return_if_fail (changes != NULL); -#line 181 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 189 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp0_ = changes; -#line 181 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 189 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _link_personas_diff_stores_tests_individuals_changed_async (self, _tmp0_, ___lambda2__gasync_ready_callback, g_object_ref (self)); -#line 1283 "link-personas-diff-stores.c" +#line 1357 "link-personas-diff-stores.c" } @@ -1293,7 +1367,7 @@ _g_object_unref0 (_data_->self); #line 24 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_slice_free (LinkPersonasDiffStoresTestsIndividualsChangedAsyncData, _data_); -#line 1296 "link-personas-diff-stores.c" +#line 1370 "link-personas-diff-stores.c" } @@ -1320,7 +1394,7 @@ _data_->changes = _tmp2_; #line 24 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _link_personas_diff_stores_tests_individuals_changed_async_co (_data_); -#line 1323 "link-personas-diff-stores.c" +#line 1397 "link-personas-diff-stores.c" } @@ -1328,128 +1402,128 @@ LinkPersonasDiffStoresTestsIndividualsChangedAsyncData* _data_; #line 24 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 1331 "link-personas-diff-stores.c" +#line 1405 "link-personas-diff-stores.c" } static void _link_personas_diff_stores_tests_individuals_changed_async_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { LinkPersonasDiffStoresTestsIndividualsChangedAsyncData* _data_; -#line 199 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 207 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_ = _user_data_; -#line 199 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 207 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_source_object_ = source_object; -#line 199 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 207 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_res_ = _res_; -#line 199 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 207 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _link_personas_diff_stores_tests_individuals_changed_async_co (_data_); -#line 1345 "link-personas-diff-stores.c" +#line 1419 "link-personas-diff-stores.c" } static gboolean _link_personas_diff_stores_tests_individuals_changed_async_co (LinkPersonasDiffStoresTestsIndividualsChangedAsyncData* _data_) { -#line 187 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 195 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" switch (_data_->_state_) { -#line 187 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 195 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" case 0: -#line 1354 "link-personas-diff-stores.c" +#line 1428 "link-personas-diff-stores.c" goto _state_0; -#line 187 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 195 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" case 1: -#line 1358 "link-personas-diff-stores.c" +#line 1432 "link-personas-diff-stores.c" goto _state_1; default: -#line 187 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 195 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_assert_not_reached (); -#line 1363 "link-personas-diff-stores.c" +#line 1437 "link-personas-diff-stores.c" } _state_0: -#line 190 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 198 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp0_ = _data_->changes; -#line 190 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 198 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp1_ = NULL; -#line 190 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 198 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp1_ = gee_multi_map_get_values (_data_->_tmp0_); -#line 190 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 198 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->added = _data_->_tmp1_; -#line 1374 "link-personas-diff-stores.c" +#line 1448 "link-personas-diff-stores.c" { -#line 192 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 200 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp2_ = _data_->added; -#line 192 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 200 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp3_ = NULL; -#line 192 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 200 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp3_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp2_); -#line 192 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 200 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_i_it = _data_->_tmp3_; -#line 192 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 200 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" while (TRUE) { -#line 192 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 200 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp4_ = _data_->_i_it; -#line 192 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 200 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp5_ = FALSE; -#line 192 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 200 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp5_ = gee_iterator_next (_data_->_tmp4_); -#line 192 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 200 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (!_data_->_tmp5_) { -#line 192 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 200 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" break; -#line 1396 "link-personas-diff-stores.c" +#line 1470 "link-personas-diff-stores.c" } -#line 192 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 200 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp6_ = _data_->_i_it; -#line 192 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 200 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp7_ = NULL; -#line 192 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 200 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp7_ = gee_iterator_get (_data_->_tmp6_); -#line 192 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 200 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->i = (FolksIndividual*) _data_->_tmp7_; -#line 194 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 202 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp8_ = _data_->i; -#line 194 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 202 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_tmp8_ == NULL) { -#line 196 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 204 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (_data_->i); -#line 196 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 204 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" continue; -#line 1414 "link-personas-diff-stores.c" +#line 1488 "link-personas-diff-stores.c" } -#line 199 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 207 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp9_ = _data_->i; -#line 199 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 207 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_state_ = 1; -#line 199 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 207 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _link_personas_diff_stores_tests_check_personas (_data_->self, _data_->_tmp9_, _link_personas_diff_stores_tests_individuals_changed_async_ready, _data_); -#line 199 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 207 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return FALSE; -#line 1424 "link-personas-diff-stores.c" +#line 1498 "link-personas-diff-stores.c" _state_1: -#line 199 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 207 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _link_personas_diff_stores_tests_check_personas_finish (_data_->self, _data_->_res_); -#line 192 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 200 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (_data_->i); -#line 1430 "link-personas-diff-stores.c" +#line 1504 "link-personas-diff-stores.c" } -#line 192 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 200 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (_data_->_i_it); -#line 1434 "link-personas-diff-stores.c" +#line 1508 "link-personas-diff-stores.c" } -#line 187 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 195 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (_data_->added); -#line 187 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 195 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_state_ == 0) { -#line 187 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 195 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1442 "link-personas-diff-stores.c" +#line 1516 "link-personas-diff-stores.c" } else { -#line 187 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 195 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1446 "link-personas-diff-stores.c" +#line 1520 "link-personas-diff-stores.c" } -#line 187 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 195 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_object_unref (_data_->_async_result); -#line 187 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 195 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return FALSE; -#line 1452 "link-personas-diff-stores.c" +#line 1526 "link-personas-diff-stores.c" } @@ -1462,7 +1536,7 @@ _g_object_unref0 (_data_->self); #line 24 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_slice_free (LinkPersonasDiffStoresTestsCheckPersonasData, _data_); -#line 1465 "link-personas-diff-stores.c" +#line 1539 "link-personas-diff-stores.c" } @@ -1489,7 +1563,7 @@ _data_->i = _tmp2_; #line 24 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _link_personas_diff_stores_tests_check_personas_co (_data_); -#line 1492 "link-personas-diff-stores.c" +#line 1566 "link-personas-diff-stores.c" } @@ -1497,417 +1571,417 @@ LinkPersonasDiffStoresTestsCheckPersonasData* _data_; #line 24 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 1500 "link-personas-diff-stores.c" +#line 1574 "link-personas-diff-stores.c" } static void _link_personas_diff_stores_tests_check_personas_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { LinkPersonasDiffStoresTestsCheckPersonasData* _data_; -#line 266 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 274 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_ = _user_data_; -#line 266 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 274 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_source_object_ = source_object; -#line 266 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 274 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_res_ = _res_; -#line 266 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 274 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _link_personas_diff_stores_tests_check_personas_co (_data_); -#line 1514 "link-personas-diff-stores.c" +#line 1588 "link-personas-diff-stores.c" } static gboolean _link_personas_diff_stores_tests_check_personas_co (LinkPersonasDiffStoresTestsCheckPersonasData* _data_) { -#line 213 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 221 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" switch (_data_->_state_) { -#line 213 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 221 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" case 0: -#line 1523 "link-personas-diff-stores.c" +#line 1597 "link-personas-diff-stores.c" goto _state_0; -#line 213 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 221 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" case 1: -#line 1527 "link-personas-diff-stores.c" +#line 1601 "link-personas-diff-stores.c" goto _state_1; default: -#line 213 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 221 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_assert_not_reached (); -#line 1532 "link-personas-diff-stores.c" +#line 1606 "link-personas-diff-stores.c" } _state_0: -#line 216 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 224 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp0_ = _data_->self->priv->_linked_individual_found; -#line 216 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 224 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_tmp0_ == TRUE) { -#line 217 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 225 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_state_ == 0) { -#line 217 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 225 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1543 "link-personas-diff-stores.c" +#line 1617 "link-personas-diff-stores.c" } else { -#line 217 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 225 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1547 "link-personas-diff-stores.c" +#line 1621 "link-personas-diff-stores.c" } -#line 217 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 225 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_object_unref (_data_->_async_result); -#line 217 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 225 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return FALSE; -#line 1553 "link-personas-diff-stores.c" +#line 1627 "link-personas-diff-stores.c" } -#line 219 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 227 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->first_persona = NULL; -#line 1557 "link-personas-diff-stores.c" +#line 1631 "link-personas-diff-stores.c" { -#line 220 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 228 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp1_ = _data_->i; -#line 220 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 228 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp2_ = folks_individual_get_personas (_data_->_tmp1_); -#line 220 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 228 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp3_ = _data_->_tmp2_; -#line 220 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 228 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp4_ = NULL; -#line 220 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 228 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp4_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp3_); -#line 220 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 228 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_p_it = _data_->_tmp4_; -#line 220 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 228 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" while (TRUE) { -#line 220 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 228 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp5_ = _data_->_p_it; -#line 220 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 228 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp6_ = FALSE; -#line 220 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 228 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp6_ = gee_iterator_next (_data_->_tmp5_); -#line 220 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 228 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (!_data_->_tmp6_) { -#line 220 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 228 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" break; -#line 1583 "link-personas-diff-stores.c" +#line 1657 "link-personas-diff-stores.c" } -#line 220 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 228 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp7_ = _data_->_p_it; -#line 220 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 228 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp8_ = NULL; -#line 220 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 228 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp8_ = gee_iterator_get (_data_->_tmp7_); -#line 220 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 228 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->p = (FolksPersona*) _data_->_tmp8_; -#line 222 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 230 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp9_ = _data_->p; -#line 222 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 230 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp10_ = _g_object_ref0 (_data_->_tmp9_); -#line 222 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 230 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (_data_->first_persona); -#line 222 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 230 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->first_persona = _data_->_tmp10_; -#line 223 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 231 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (_data_->p); -#line 223 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 231 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" break; -#line 1605 "link-personas-diff-stores.c" +#line 1679 "link-personas-diff-stores.c" } -#line 220 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 228 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (_data_->_p_it); -#line 1609 "link-personas-diff-stores.c" +#line 1683 "link-personas-diff-stores.c" } -#line 226 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 234 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp12_ = _data_->i; -#line 226 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 234 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp13_ = folks_name_details_get_full_name ((FolksNameDetails*) _data_->_tmp12_); -#line 226 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 234 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp14_ = _data_->_tmp13_; -#line 226 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 234 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp15_ = _data_->self->priv->_persona_fullname_1; -#line 226 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 234 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (g_strcmp0 (_data_->_tmp14_, _data_->_tmp15_) == 0) { -#line 227 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 235 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp16_ = _data_->self->priv->_persona_iid_1; -#line 227 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 235 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp11_ = g_strcmp0 (_data_->_tmp16_, "") == 0; -#line 1625 "link-personas-diff-stores.c" +#line 1699 "link-personas-diff-stores.c" } else { -#line 226 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 234 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp11_ = FALSE; -#line 1629 "link-personas-diff-stores.c" +#line 1703 "link-personas-diff-stores.c" } -#line 226 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 234 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp17_ = _data_->_tmp11_; -#line 226 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 234 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_tmp17_) { -#line 229 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 237 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp18_ = _data_->first_persona; -#line 229 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 237 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp19_ = folks_persona_get_iid (_data_->_tmp18_); -#line 229 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 237 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp20_ = _data_->_tmp19_; -#line 229 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 237 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp21_ = g_strdup (_data_->_tmp20_); -#line 229 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 237 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_free0 (_data_->self->priv->_persona_iid_1); -#line 229 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 237 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->self->priv->_persona_iid_1 = _data_->_tmp21_; -#line 230 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 238 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp22_ = _data_->self->priv->_personas; -#line 230 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 238 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp23_ = _data_->first_persona; -#line 230 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 238 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp22_, _data_->_tmp23_); -#line 1653 "link-personas-diff-stores.c" +#line 1727 "link-personas-diff-stores.c" } else { -#line 232 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 240 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp25_ = _data_->i; -#line 232 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 240 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp26_ = folks_name_details_get_full_name ((FolksNameDetails*) _data_->_tmp25_); -#line 232 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 240 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp27_ = _data_->_tmp26_; -#line 232 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 240 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp28_ = _data_->self->priv->_persona_fullname_2; -#line 232 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 240 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (g_strcmp0 (_data_->_tmp27_, _data_->_tmp28_) == 0) { -#line 233 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 241 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp29_ = _data_->self->priv->_persona_iid_2; -#line 233 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 241 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp24_ = g_strcmp0 (_data_->_tmp29_, "") == 0; -#line 1669 "link-personas-diff-stores.c" +#line 1743 "link-personas-diff-stores.c" } else { -#line 232 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 240 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp24_ = FALSE; -#line 1673 "link-personas-diff-stores.c" +#line 1747 "link-personas-diff-stores.c" } -#line 232 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 240 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp30_ = _data_->_tmp24_; -#line 232 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 240 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_tmp30_) { -#line 235 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp31_ = _data_->first_persona; -#line 235 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp32_ = folks_persona_get_iid (_data_->_tmp31_); -#line 235 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp33_ = _data_->_tmp32_; -#line 235 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp34_ = g_strdup (_data_->_tmp33_); -#line 235 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_free0 (_data_->self->priv->_persona_iid_2); -#line 235 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->self->priv->_persona_iid_2 = _data_->_tmp34_; -#line 236 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 244 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp35_ = _data_->self->priv->_personas; -#line 236 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 244 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp36_ = _data_->first_persona; -#line 236 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 244 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp35_, _data_->_tmp36_); -#line 1697 "link-personas-diff-stores.c" +#line 1771 "link-personas-diff-stores.c" } else { -#line 238 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 246 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp37_ = _data_->i; -#line 238 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 246 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp38_ = folks_individual_get_personas (_data_->_tmp37_); -#line 238 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 246 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp39_ = _data_->_tmp38_; -#line 238 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 246 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp40_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp39_); -#line 238 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 246 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp41_ = _data_->_tmp40_; -#line 238 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 246 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_tmp41_ > 1) { -#line 240 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 248 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->first_persona_id = FALSE; -#line 241 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 249 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->second_persona_id = FALSE; -#line 1715 "link-personas-diff-stores.c" +#line 1789 "link-personas-diff-stores.c" { -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp42_ = _data_->i; -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp43_ = folks_individual_get_personas (_data_->_tmp42_); -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp44_ = _data_->_tmp43_; -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp45_ = NULL; -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp45_ = gee_iterable_iterator ((GeeIterable*) _data_->_tmp44_); -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_p1_it = _data_->_tmp45_; -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" while (TRUE) { -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp46_ = _data_->_p1_it; -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp47_ = FALSE; -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp47_ = gee_iterator_next (_data_->_tmp46_); -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (!_data_->_tmp47_) { -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" break; -#line 1741 "link-personas-diff-stores.c" +#line 1815 "link-personas-diff-stores.c" } -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp48_ = _data_->_p1_it; -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp49_ = NULL; -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp49_ = gee_iterator_get (_data_->_tmp48_); -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->p1 = (FolksPersona*) _data_->_tmp49_; -#line 245 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 253 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp50_ = _data_->p1; -#line 245 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 253 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp51_ = folks_persona_get_iid (_data_->_tmp50_); -#line 245 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 253 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp52_ = _data_->_tmp51_; -#line 245 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 253 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp53_ = _data_->self->priv->_persona_iid_1; -#line 245 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 253 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (g_strcmp0 (_data_->_tmp52_, _data_->_tmp53_) == 0) { -#line 246 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 254 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->first_persona_id = TRUE; -#line 1763 "link-personas-diff-stores.c" +#line 1837 "link-personas-diff-stores.c" } else { -#line 247 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 255 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp54_ = _data_->p1; -#line 247 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 255 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp55_ = folks_persona_get_iid (_data_->_tmp54_); -#line 247 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 255 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp56_ = _data_->_tmp55_; -#line 247 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 255 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp57_ = _data_->self->priv->_persona_iid_2; -#line 247 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 255 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (g_strcmp0 (_data_->_tmp56_, _data_->_tmp57_) == 0) { -#line 248 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 256 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->second_persona_id = TRUE; -#line 1777 "link-personas-diff-stores.c" +#line 1851 "link-personas-diff-stores.c" } } -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (_data_->p1); -#line 1782 "link-personas-diff-stores.c" +#line 1856 "link-personas-diff-stores.c" } -#line 243 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (_data_->_p1_it); -#line 1786 "link-personas-diff-stores.c" +#line 1860 "link-personas-diff-stores.c" } -#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 259 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp59_ = _data_->first_persona_id; -#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 259 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_tmp59_) { -#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 259 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp60_ = _data_->second_persona_id; -#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 259 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp58_ = _data_->_tmp60_; -#line 1796 "link-personas-diff-stores.c" +#line 1870 "link-personas-diff-stores.c" } else { -#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 259 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp58_ = FALSE; -#line 1800 "link-personas-diff-stores.c" +#line 1874 "link-personas-diff-stores.c" } -#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 259 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp61_ = _data_->_tmp58_; -#line 251 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 259 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_tmp61_) { -#line 253 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 261 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->self->priv->_linked_individual_found = TRUE; -#line 254 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 262 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp62_ = _data_->self->priv->_main_loop; -#line 254 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 262 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_main_loop_quit (_data_->_tmp62_); -#line 1812 "link-personas-diff-stores.c" +#line 1886 "link-personas-diff-stores.c" } } } } -#line 260 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 268 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp64_ = _data_->self->priv->_personas; -#line 260 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - _data_->_tmp65_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp64_); -#line 260 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 268 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + _data_->_tmp65_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp64_); +#line 268 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp66_ = _data_->_tmp65_; -#line 260 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 268 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_tmp66_ == 2) { -#line 261 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 269 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp67_ = _data_->self->priv->_linking_fired; -#line 261 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 269 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp63_ = _data_->_tmp67_ == FALSE; -#line 1829 "link-personas-diff-stores.c" +#line 1903 "link-personas-diff-stores.c" } else { -#line 260 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 268 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp63_ = FALSE; -#line 1833 "link-personas-diff-stores.c" +#line 1907 "link-personas-diff-stores.c" } -#line 260 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 268 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp68_ = _data_->_tmp63_; -#line 260 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 268 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_tmp68_) { -#line 263 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 271 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->self->priv->_linking_fired = TRUE; -#line 1841 "link-personas-diff-stores.c" +#line 1915 "link-personas-diff-stores.c" { -#line 266 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 274 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp69_ = _data_->self->priv->_aggregator; -#line 266 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 274 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp70_ = _data_->self->priv->_personas; -#line 266 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 274 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_state_ = 1; -#line 266 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 274 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" folks_individual_aggregator_link_personas (_data_->_tmp69_, (GeeSet*) _data_->_tmp70_, _link_personas_diff_stores_tests_check_personas_ready, _data_); -#line 266 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 274 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return FALSE; -#line 1853 "link-personas-diff-stores.c" +#line 1927 "link-personas-diff-stores.c" _state_1: -#line 266 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 274 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" folks_individual_aggregator_link_personas_finish (_data_->_tmp69_, _data_->_res_, &_data_->_inner_error_); -#line 266 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 274 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_inner_error_ != NULL) { -#line 1859 "link-personas-diff-stores.c" +#line 1933 "link-personas-diff-stores.c" goto __catch2_g_error; } } goto __finally2; __catch2_g_error: { -#line 264 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 272 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->e = _data_->_inner_error_; -#line 264 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 272 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_inner_error_ = NULL; -#line 270 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 278 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp71_ = _data_->e; -#line 270 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 278 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _data_->_tmp72_ = _data_->_tmp71_->message; -#line 270 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" - g_warning ("link-personas-diff-stores.vala:270: link_personas: %s\n", _data_->_tmp72_); -#line 264 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 278 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" + g_warning ("link-personas-diff-stores.vala:278: link_personas: %s\n", _data_->_tmp72_); +#line 272 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_error_free0 (_data_->e); -#line 1878 "link-personas-diff-stores.c" +#line 1952 "link-personas-diff-stores.c" } __finally2: -#line 264 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 272 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_inner_error_ != NULL) { -#line 264 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 272 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (_data_->first_persona); -#line 264 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 272 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); -#line 264 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 272 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_clear_error (&_data_->_inner_error_); -#line 264 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 272 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return FALSE; -#line 1891 "link-personas-diff-stores.c" +#line 1965 "link-personas-diff-stores.c" } } -#line 213 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 221 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (_data_->first_persona); -#line 213 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 221 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" if (_data_->_state_ == 0) { -#line 213 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 221 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1900 "link-personas-diff-stores.c" +#line 1974 "link-personas-diff-stores.c" } else { -#line 213 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 221 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1904 "link-personas-diff-stores.c" +#line 1978 "link-personas-diff-stores.c" } -#line 213 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 221 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_object_unref (_data_->_async_result); -#line 213 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 221 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return FALSE; -#line 1910 "link-personas-diff-stores.c" +#line 1984 "link-personas-diff-stores.c" } @@ -1922,14 +1996,14 @@ FOLKS_TEST_CASE_CLASS (klass)->tear_down = link_personas_diff_stores_tests_real_tear_down; #line 24 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" G_OBJECT_CLASS (klass)->finalize = link_personas_diff_stores_tests_finalize; -#line 1925 "link-personas-diff-stores.c" +#line 1999 "link-personas-diff-stores.c" } static void link_personas_diff_stores_tests_instance_init (LinkPersonasDiffStoresTests * self) { #line 24 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" self->priv = LINK_PERSONAS_DIFF_STORES_TESTS_GET_PRIVATE (self); -#line 1932 "link-personas-diff-stores.c" +#line 2006 "link-personas-diff-stores.c" } @@ -1957,7 +2031,7 @@ _g_object_unref0 (self->priv->_personas); #line 24 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" G_OBJECT_CLASS (link_personas_diff_stores_tests_parent_class)->finalize (obj); -#line 1960 "link-personas-diff-stores.c" +#line 2034 "link-personas-diff-stores.c" } @@ -1980,38 +2054,38 @@ LinkPersonasDiffStoresTests* _tmp1_; LinkPersonasDiffStoresTests* _tmp2_; GTestSuite* _tmp3_ = NULL; -#line 278 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 286 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_test_init (&args_length1, &args, NULL); -#line 280 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 288 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp0_ = g_test_get_root (); -#line 280 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 288 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" root = _tmp0_; -#line 281 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 289 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp1_ = link_personas_diff_stores_tests_new (); -#line 281 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 289 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp2_ = _tmp1_; -#line 281 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 289 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _tmp3_ = folks_test_case_get_suite ((FolksTestCase*) _tmp2_); -#line 281 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 289 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_test_suite_add_suite (root, _tmp3_); -#line 281 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 289 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" _g_object_unref0 (_tmp2_); -#line 283 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 291 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_test_run (); -#line 285 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 293 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" result = 0; -#line 285 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 293 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return result; -#line 2005 "link-personas-diff-stores.c" +#line 2079 "link-personas-diff-stores.c" } int main (int argc, char ** argv) { -#line 276 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 284 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" g_type_init (); -#line 276 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" +#line 284 "/home/treitter/collabora/folks/tests/eds/link-personas-diff-stores.vala" return _vala_main (argv, argc); -#line 2014 "link-personas-diff-stores.c" +#line 2088 "link-personas-diff-stores.c" } diff -Nru folks-0.6.6/tests/eds/link-personas-diff-stores.vala folks-0.6.7/tests/eds/link-personas-diff-stores.vala --- folks-0.6.6/tests/eds/link-personas-diff-stores.vala 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/tests/eds/link-personas-diff-stores.vala 2012-01-12 17:25:24.000000000 +0000 @@ -106,16 +106,24 @@ try { yield this._aggregator.prepare (); + assert (this._aggregator.is_prepared); - var pstore = this._get_store (store, - this._eds_backend.address_book_uid); - assert (pstore != null); - - var pstore2 = this._get_store (store, - this._eds_backend_other.address_book_uid); - assert (pstore2 != null); + /* We require both stores to guarantee to be prepared for this test, + * since we call add_persona_from_details() on them. */ + this._aggregator.notify["is-quiescent"].connect ((obj, pspec) => + { + var pstore = this._get_store (store, + this._eds_backend.address_book_uid); + assert (pstore != null); + assert (pstore.is_prepared == true); + + var pstore2 = this._get_store (store, + this._eds_backend_other.address_book_uid); + assert (pstore2 != null); + assert (pstore2.is_prepared == true); - yield this._add_personas (pstore, pstore2); + this._add_personas (pstore, pstore2); + }); } catch (GLib.Error e) { diff -Nru folks-0.6.6/tests/eds/link-personas.vala folks-0.6.7/tests/eds/link-personas.vala --- folks-0.6.6/tests/eds/link-personas.vala 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/tests/eds/link-personas.vala 2012-02-17 23:39:51.000000000 +0000 @@ -211,7 +211,7 @@ if (this._linking_method == LinkingMethod.IM_ADDRESSES || this._linking_method == LinkingMethod.EMAIL_AS_IM_ADDRESS) { - v1 = Value (typeof (MultiMap)); + v1 = Value (typeof (MultiMap)); var im_addrs1 = new HashMultiMap ( null, null, (GLib.HashFunc) ImFieldDetails.hash, @@ -226,7 +226,7 @@ } else if (this._linking_method == LinkingMethod.WEB_SERVICE_ADDRESSES) { - v1 = Value (typeof (MultiMap)); + v1 = Value (typeof (MultiMap)); var wsa1 = new HashMultiMap ( null, null, (GLib.HashFunc) WebServiceFieldDetails.hash, @@ -246,7 +246,7 @@ Value? v3; if (this._linking_method == LinkingMethod.IM_ADDRESSES) { - v3 = Value (typeof (MultiMap)); + v3 = Value (typeof (MultiMap)); var im_addrs2 = new HashMultiMap ( null, null, (GLib.HashFunc) ImFieldDetails.hash, @@ -257,7 +257,7 @@ } else if (this._linking_method == LinkingMethod.WEB_SERVICE_ADDRESSES) { - v3 = Value (typeof (MultiMap)); + v3 = Value (typeof (MultiMap)); var wsa2 = new HashMultiMap ( null, null, (GLib.HashFunc) WebServiceFieldDetails.hash, @@ -268,7 +268,7 @@ } else if (this._linking_method == LinkingMethod.EMAIL_AS_IM_ADDRESS) { - v3 = Value (typeof (Set)); + v3 = Value (typeof (Set)); var emails = new HashSet ( (GLib.HashFunc) EmailFieldDetails.hash, (GLib.EqualFunc) EmailFieldDetails.equal); diff -Nru folks-0.6.6/tests/eds/Makefile.am folks-0.6.7/tests/eds/Makefile.am --- folks-0.6.6/tests/eds/Makefile.am 2011-12-13 23:32:35.000000000 +0000 +++ folks-0.6.7/tests/eds/Makefile.am 2012-02-23 00:01:16.000000000 +0000 @@ -41,9 +41,13 @@ -g \ $(NULL) +# FIXME: these tests have been removed temporarily due to bgo#668415 +# store-removed \ +# change-primary-store \ +# $(NULL) + # in order from least to most complex noinst_PROGRAMS = \ - store-removed \ persona-store-tests \ individual-retrieval \ phone-details \ @@ -71,7 +75,6 @@ set-properties-race \ set-birthday \ set-roles \ - change-primary-store \ link-personas-diff-stores \ set-is-favourite \ $(NULL) @@ -92,9 +95,10 @@ TESTS = $(noinst_PROGRAMS) -store_removed_SOURCES = \ - store-removed.vala \ - $(NULL) +# FIXME: temporarily removed due to bgo#668415 +#store_removed_SOURCES = \ +# store-removed.vala \ +# $(NULL) persona_store_tests_SOURCES = \ persona-store-tests.vala \ @@ -204,9 +208,10 @@ set-roles.vala \ $(NULL) -change_primary_store_SOURCES = \ - change-primary-store.vala \ - $(NULL) +# FIXME: temporarily removed due to bgo#668415 +#change_primary_store_SOURCES = \ +# change-primary-store.vala \ +# $(NULL) link_personas_diff_stores_SOURCES = \ link-personas-diff-stores.vala \ @@ -222,9 +227,13 @@ $(TESTS) \ $(NULL) +# FIXME: temporarily removed due to bgo#668415 +# store_removed_vala.stamp \ +# change_primary_store_vala.stamp \ +# $(NULL) + MAINTAINERCLEANFILES = \ $(addsuffix .c,$(noinst_PROGRAMS)) \ - store_removed_vala.stamp \ persona_store_tests_vala.stamp \ individual_retrieval_vala.stamp \ removing_contacts_vala.stamp \ @@ -252,7 +261,6 @@ set_urls_vala.stamp \ set_birthday_vala.stamp \ set_roles_vala.stamp \ - change_primary_store_vala.stamp \ link_personas_diff_stores_vala.stamp \ set_is_favourite_vala.stamp \ $(NULL) diff -Nru folks-0.6.6/tests/eds/Makefile.in folks-0.6.7/tests/eds/Makefile.in --- folks-0.6.6/tests/eds/Makefile.in 2011-12-13 23:38:41.000000000 +0000 +++ folks-0.6.7/tests/eds/Makefile.in 2012-02-23 00:04:12.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -34,7 +34,7 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -noinst_PROGRAMS = store-removed$(EXEEXT) persona-store-tests$(EXEEXT) \ +noinst_PROGRAMS = persona-store-tests$(EXEEXT) \ individual-retrieval$(EXEEXT) phone-details$(EXEEXT) \ email-details$(EXEEXT) name-details$(EXEEXT) \ removing-contacts$(EXEEXT) updating-contacts$(EXEEXT) \ @@ -48,20 +48,17 @@ add-contacts-stress-test$(EXEEXT) set-gender$(EXEEXT) \ set-urls$(EXEEXT) set-properties-race$(EXEEXT) \ set-birthday$(EXEEXT) set-roles$(EXEEXT) \ - change-primary-store$(EXEEXT) \ link-personas-diff-stores$(EXEEXT) set-is-favourite$(EXEEXT) subdir = tests/eds DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ add-contacts-stress-test.c add-persona.c \ add_contacts_stress_test_vala.stamp add_persona_vala.stamp \ - avatar-details.c avatar_details_vala.stamp \ - change-primary-store.c change_primary_store_vala.stamp \ - email-details.c email_details_vala.stamp im-details.c \ - im_details_vala.stamp individual-retrieval.c \ - individual_retrieval_vala.stamp link-personas-diff-stores.c \ - link-personas.c link_personas_diff_stores_vala.stamp \ - link_personas_vala.stamp name-details.c \ - name_details_vala.stamp persona-store-tests.c \ + avatar-details.c avatar_details_vala.stamp email-details.c \ + email_details_vala.stamp im-details.c im_details_vala.stamp \ + individual-retrieval.c individual_retrieval_vala.stamp \ + link-personas-diff-stores.c link-personas.c \ + link_personas_diff_stores_vala.stamp link_personas_vala.stamp \ + name-details.c name_details_vala.stamp persona-store-tests.c \ persona_store_tests_vala.stamp phone-details.c \ phone_details_vala.stamp postal-address-details.c \ postal_address_details_vala.stamp remove-persona.c \ @@ -77,14 +74,15 @@ set_notes_vala.stamp set_phones_vala.stamp \ set_postal_addresses_vala.stamp set_properties_race_vala.stamp \ set_roles_vala.stamp set_structured_name_vala.stamp \ - set_urls_vala.stamp store-removed.c store_removed_vala.stamp \ - updating-contacts.c updating_contacts_vala.stamp + set_urls_vala.stamp updating-contacts.c \ + updating_contacts_vala.stamp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -118,13 +116,6 @@ $(top_builddir)/tests/lib/eds/libeds-test.la \ $(top_builddir)/tests/lib/libfolks-test.la \ $(top_builddir)/backends/eds/lib/libfolks-eds.la -am_change_primary_store_OBJECTS = change-primary-store.$(OBJEXT) -change_primary_store_OBJECTS = $(am_change_primary_store_OBJECTS) -change_primary_store_LDADD = $(LDADD) -change_primary_store_DEPENDENCIES = \ - $(top_builddir)/tests/lib/eds/libeds-test.la \ - $(top_builddir)/tests/lib/libfolks-test.la \ - $(top_builddir)/backends/eds/lib/libfolks-eds.la am_email_details_OBJECTS = email-details.$(OBJEXT) email_details_OBJECTS = $(am_email_details_OBJECTS) email_details_LDADD = $(LDADD) @@ -298,13 +289,6 @@ set_urls_DEPENDENCIES = $(top_builddir)/tests/lib/eds/libeds-test.la \ $(top_builddir)/tests/lib/libfolks-test.la \ $(top_builddir)/backends/eds/lib/libfolks-eds.la -am_store_removed_OBJECTS = store-removed.$(OBJEXT) -store_removed_OBJECTS = $(am_store_removed_OBJECTS) -store_removed_LDADD = $(LDADD) -store_removed_DEPENDENCIES = \ - $(top_builddir)/tests/lib/eds/libeds-test.la \ - $(top_builddir)/tests/lib/libfolks-test.la \ - $(top_builddir)/backends/eds/lib/libfolks-eds.la am_updating_contacts_OBJECTS = updating-contacts.$(OBJEXT) updating_contacts_OBJECTS = $(am_updating_contacts_OBJECTS) updating_contacts_LDADD = $(LDADD) @@ -346,24 +330,7 @@ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(add_contacts_stress_test_SOURCES) $(add_persona_SOURCES) \ - $(avatar_details_SOURCES) $(change_primary_store_SOURCES) \ - $(email_details_SOURCES) $(im_details_SOURCES) \ - $(individual_retrieval_SOURCES) $(link_personas_SOURCES) \ - $(link_personas_diff_stores_SOURCES) $(name_details_SOURCES) \ - $(persona_store_tests_SOURCES) $(phone_details_SOURCES) \ - $(postal_address_details_SOURCES) $(remove_persona_SOURCES) \ - $(removing_contacts_SOURCES) $(set_avatar_SOURCES) \ - $(set_birthday_SOURCES) $(set_emails_SOURCES) \ - $(set_gender_SOURCES) $(set_im_addresses_SOURCES) \ - $(set_is_favourite_SOURCES) $(set_names_SOURCES) \ - $(set_notes_SOURCES) $(set_phones_SOURCES) \ - $(set_postal_addresses_SOURCES) $(set_properties_race_SOURCES) \ - $(set_roles_SOURCES) $(set_structured_name_SOURCES) \ - $(set_urls_SOURCES) $(store_removed_SOURCES) \ - $(updating_contacts_SOURCES) -DIST_SOURCES = $(add_contacts_stress_test_SOURCES) \ - $(add_persona_SOURCES) $(avatar_details_SOURCES) \ - $(change_primary_store_SOURCES) $(email_details_SOURCES) \ + $(avatar_details_SOURCES) $(email_details_SOURCES) \ $(im_details_SOURCES) $(individual_retrieval_SOURCES) \ $(link_personas_SOURCES) $(link_personas_diff_stores_SOURCES) \ $(name_details_SOURCES) $(persona_store_tests_SOURCES) \ @@ -376,7 +343,22 @@ $(set_phones_SOURCES) $(set_postal_addresses_SOURCES) \ $(set_properties_race_SOURCES) $(set_roles_SOURCES) \ $(set_structured_name_SOURCES) $(set_urls_SOURCES) \ - $(store_removed_SOURCES) $(updating_contacts_SOURCES) + $(updating_contacts_SOURCES) +DIST_SOURCES = $(add_contacts_stress_test_SOURCES) \ + $(add_persona_SOURCES) $(avatar_details_SOURCES) \ + $(email_details_SOURCES) $(im_details_SOURCES) \ + $(individual_retrieval_SOURCES) $(link_personas_SOURCES) \ + $(link_personas_diff_stores_SOURCES) $(name_details_SOURCES) \ + $(persona_store_tests_SOURCES) $(phone_details_SOURCES) \ + $(postal_address_details_SOURCES) $(remove_persona_SOURCES) \ + $(removing_contacts_SOURCES) $(set_avatar_SOURCES) \ + $(set_birthday_SOURCES) $(set_emails_SOURCES) \ + $(set_gender_SOURCES) $(set_im_addresses_SOURCES) \ + $(set_is_favourite_SOURCES) $(set_names_SOURCES) \ + $(set_notes_SOURCES) $(set_phones_SOURCES) \ + $(set_postal_addresses_SOURCES) $(set_properties_race_SOURCES) \ + $(set_roles_SOURCES) $(set_structured_name_SOURCES) \ + $(set_urls_SOURCES) $(updating_contacts_SOURCES) ETAGS = etags CTAGS = ctags am__tty_colors = \ @@ -402,6 +384,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -621,10 +605,11 @@ -- TESTS = $(noinst_PROGRAMS) -store_removed_SOURCES = \ - store-removed.vala \ - $(NULL) +# FIXME: temporarily removed due to bgo#668415 +#store_removed_SOURCES = \ +# store-removed.vala \ +# $(NULL) persona_store_tests_SOURCES = \ persona-store-tests.vala \ $(NULL) @@ -733,10 +718,11 @@ set-roles.vala \ $(NULL) -change_primary_store_SOURCES = \ - change-primary-store.vala \ - $(NULL) +# FIXME: temporarily removed due to bgo#668415 +#change_primary_store_SOURCES = \ +# change-primary-store.vala \ +# $(NULL) link_personas_diff_stores_SOURCES = \ link-personas-diff-stores.vala \ $(NULL) @@ -751,9 +737,13 @@ $(TESTS) \ $(NULL) + +# FIXME: temporarily removed due to bgo#668415 +# store_removed_vala.stamp \ +# change_primary_store_vala.stamp \ +# $(NULL) MAINTAINERCLEANFILES = \ $(addsuffix .c,$(noinst_PROGRAMS)) \ - store_removed_vala.stamp \ persona_store_tests_vala.stamp \ individual_retrieval_vala.stamp \ removing_contacts_vala.stamp \ @@ -781,7 +771,6 @@ set_urls_vala.stamp \ set_birthday_vala.stamp \ set_roles_vala.stamp \ - change_primary_store_vala.stamp \ link_personas_diff_stores_vala.stamp \ set_is_favourite_vala.stamp \ $(NULL) @@ -843,9 +832,6 @@ avatar-details$(EXEEXT): $(avatar_details_OBJECTS) $(avatar_details_DEPENDENCIES) @rm -f avatar-details$(EXEEXT) $(AM_V_CCLD)$(LINK) $(avatar_details_OBJECTS) $(avatar_details_LDADD) $(LIBS) -change-primary-store$(EXEEXT): $(change_primary_store_OBJECTS) $(change_primary_store_DEPENDENCIES) - @rm -f change-primary-store$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(change_primary_store_OBJECTS) $(change_primary_store_LDADD) $(LIBS) email-details$(EXEEXT): $(email_details_OBJECTS) $(email_details_DEPENDENCIES) @rm -f email-details$(EXEEXT) $(AM_V_CCLD)$(LINK) $(email_details_OBJECTS) $(email_details_LDADD) $(LIBS) @@ -921,9 +907,6 @@ set-urls$(EXEEXT): $(set_urls_OBJECTS) $(set_urls_DEPENDENCIES) @rm -f set-urls$(EXEEXT) $(AM_V_CCLD)$(LINK) $(set_urls_OBJECTS) $(set_urls_LDADD) $(LIBS) -store-removed$(EXEEXT): $(store_removed_OBJECTS) $(store_removed_DEPENDENCIES) - @rm -f store-removed$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(store_removed_OBJECTS) $(store_removed_LDADD) $(LIBS) updating-contacts$(EXEEXT): $(updating_contacts_OBJECTS) $(updating_contacts_DEPENDENCIES) @rm -f updating-contacts$(EXEEXT) $(AM_V_CCLD)$(LINK) $(updating_contacts_OBJECTS) $(updating_contacts_LDADD) $(LIBS) @@ -937,7 +920,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/add-contacts-stress-test.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/add-persona.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avatar-details.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/change-primary-store.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/email-details.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/im-details.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/individual-retrieval.Po@am__quote@ @@ -963,275 +945,255 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/set-roles.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/set-structured-name.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/set-urls.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/store-removed.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/updating-contacts.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< $(srcdir)/add-contacts-stress-test.c: $(srcdir)/add_contacts_stress_test_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/add_contacts_stress_test_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/add_contacts_stress_test_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) add_contacts_stress_test_vala.stamp; \ fi add_contacts_stress_test_vala.stamp: $(add_contacts_stress_test_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(add_contacts_stress_test_SOURCES) $(AM_V_at)touch $@ $(srcdir)/link-personas-diff-stores.c: $(srcdir)/link_personas_diff_stores_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/link_personas_diff_stores_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/link_personas_diff_stores_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) link_personas_diff_stores_vala.stamp; \ fi link_personas_diff_stores_vala.stamp: $(link_personas_diff_stores_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(link_personas_diff_stores_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-im-addresses.c: $(srcdir)/set_im_addresses_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_im_addresses_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_im_addresses_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_im_addresses_vala.stamp; \ fi set_im_addresses_vala.stamp: $(set_im_addresses_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_im_addresses_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-phones.c: $(srcdir)/set_phones_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_phones_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_phones_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_phones_vala.stamp; \ fi set_phones_vala.stamp: $(set_phones_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_phones_SOURCES) $(AM_V_at)touch $@ $(srcdir)/persona-store-tests.c: $(srcdir)/persona_store_tests_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/persona_store_tests_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/persona_store_tests_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) persona_store_tests_vala.stamp; \ fi persona_store_tests_vala.stamp: $(persona_store_tests_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(persona_store_tests_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-properties-race.c: $(srcdir)/set_properties_race_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_properties_race_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_properties_race_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_properties_race_vala.stamp; \ fi set_properties_race_vala.stamp: $(set_properties_race_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_properties_race_SOURCES) $(AM_V_at)touch $@ $(srcdir)/individual-retrieval.c: $(srcdir)/individual_retrieval_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/individual_retrieval_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/individual_retrieval_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) individual_retrieval_vala.stamp; \ fi individual_retrieval_vala.stamp: $(individual_retrieval_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(individual_retrieval_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-names.c: $(srcdir)/set_names_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_names_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_names_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_names_vala.stamp; \ fi set_names_vala.stamp: $(set_names_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_names_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-urls.c: $(srcdir)/set_urls_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_urls_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_urls_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_urls_vala.stamp; \ fi set_urls_vala.stamp: $(set_urls_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_urls_SOURCES) $(AM_V_at)touch $@ $(srcdir)/email-details.c: $(srcdir)/email_details_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/email_details_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/email_details_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) email_details_vala.stamp; \ fi email_details_vala.stamp: $(email_details_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(email_details_SOURCES) $(AM_V_at)touch $@ $(srcdir)/add-persona.c: $(srcdir)/add_persona_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/add_persona_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/add_persona_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) add_persona_vala.stamp; \ fi add_persona_vala.stamp: $(add_persona_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(add_persona_SOURCES) $(AM_V_at)touch $@ $(srcdir)/avatar-details.c: $(srcdir)/avatar_details_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/avatar_details_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/avatar_details_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) avatar_details_vala.stamp; \ fi avatar_details_vala.stamp: $(avatar_details_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(avatar_details_SOURCES) $(AM_V_at)touch $@ -$(srcdir)/store-removed.c: $(srcdir)/store_removed_vala.stamp - @if test -f $@; then :; else \ - rm -f $(srcdir)/store_removed_vala.stamp; \ - $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) store_removed_vala.stamp; \ - fi -store_removed_vala.stamp: $(store_removed_SOURCES) - $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(store_removed_SOURCES) - $(AM_V_at)touch $@ $(srcdir)/removing-contacts.c: $(srcdir)/removing_contacts_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/removing_contacts_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/removing_contacts_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) removing_contacts_vala.stamp; \ fi removing_contacts_vala.stamp: $(removing_contacts_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(removing_contacts_SOURCES) $(AM_V_at)touch $@ $(srcdir)/im-details.c: $(srcdir)/im_details_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/im_details_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/im_details_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) im_details_vala.stamp; \ fi im_details_vala.stamp: $(im_details_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(im_details_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-roles.c: $(srcdir)/set_roles_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_roles_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_roles_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_roles_vala.stamp; \ fi set_roles_vala.stamp: $(set_roles_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_roles_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-is-favourite.c: $(srcdir)/set_is_favourite_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_is_favourite_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_is_favourite_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_is_favourite_vala.stamp; \ fi set_is_favourite_vala.stamp: $(set_is_favourite_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_is_favourite_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-gender.c: $(srcdir)/set_gender_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_gender_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_gender_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_gender_vala.stamp; \ fi set_gender_vala.stamp: $(set_gender_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_gender_SOURCES) $(AM_V_at)touch $@ $(srcdir)/link-personas.c: $(srcdir)/link_personas_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/link_personas_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/link_personas_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) link_personas_vala.stamp; \ fi link_personas_vala.stamp: $(link_personas_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(link_personas_SOURCES) $(AM_V_at)touch $@ $(srcdir)/name-details.c: $(srcdir)/name_details_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/name_details_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/name_details_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) name_details_vala.stamp; \ fi name_details_vala.stamp: $(name_details_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(name_details_SOURCES) $(AM_V_at)touch $@ $(srcdir)/remove-persona.c: $(srcdir)/remove_persona_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/remove_persona_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/remove_persona_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) remove_persona_vala.stamp; \ fi remove_persona_vala.stamp: $(remove_persona_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(remove_persona_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-structured-name.c: $(srcdir)/set_structured_name_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_structured_name_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_structured_name_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_structured_name_vala.stamp; \ fi set_structured_name_vala.stamp: $(set_structured_name_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_structured_name_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-postal-addresses.c: $(srcdir)/set_postal_addresses_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_postal_addresses_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_postal_addresses_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_postal_addresses_vala.stamp; \ fi set_postal_addresses_vala.stamp: $(set_postal_addresses_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_postal_addresses_SOURCES) $(AM_V_at)touch $@ $(srcdir)/phone-details.c: $(srcdir)/phone_details_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/phone_details_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/phone_details_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) phone_details_vala.stamp; \ fi phone_details_vala.stamp: $(phone_details_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(phone_details_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-notes.c: $(srcdir)/set_notes_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_notes_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_notes_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_notes_vala.stamp; \ fi set_notes_vala.stamp: $(set_notes_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_notes_SOURCES) $(AM_V_at)touch $@ -$(srcdir)/change-primary-store.c: $(srcdir)/change_primary_store_vala.stamp - @if test -f $@; then :; else \ - rm -f $(srcdir)/change_primary_store_vala.stamp; \ - $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) change_primary_store_vala.stamp; \ - fi -change_primary_store_vala.stamp: $(change_primary_store_SOURCES) - $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(change_primary_store_SOURCES) - $(AM_V_at)touch $@ $(srcdir)/updating-contacts.c: $(srcdir)/updating_contacts_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/updating_contacts_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/updating_contacts_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) updating_contacts_vala.stamp; \ fi updating_contacts_vala.stamp: $(updating_contacts_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(updating_contacts_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-emails.c: $(srcdir)/set_emails_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_emails_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_emails_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_emails_vala.stamp; \ fi set_emails_vala.stamp: $(set_emails_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_emails_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-birthday.c: $(srcdir)/set_birthday_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_birthday_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_birthday_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_birthday_vala.stamp; \ fi set_birthday_vala.stamp: $(set_birthday_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_birthday_SOURCES) $(AM_V_at)touch $@ $(srcdir)/postal-address-details.c: $(srcdir)/postal_address_details_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/postal_address_details_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/postal_address_details_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) postal_address_details_vala.stamp; \ fi postal_address_details_vala.stamp: $(postal_address_details_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(postal_address_details_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-avatar.c: $(srcdir)/set_avatar_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_avatar_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_avatar_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_avatar_vala.stamp; \ fi set_avatar_vala.stamp: $(set_avatar_SOURCES) @@ -1377,14 +1339,15 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ test "$$failed" -eq 0; \ else :; fi @@ -1433,10 +1396,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -1455,8 +1423,6 @@ -rm -f add_persona_vala.stamp -rm -f avatar-details.c -rm -f avatar_details_vala.stamp - -rm -f change-primary-store.c - -rm -f change_primary_store_vala.stamp -rm -f email-details.c -rm -f email_details_vala.stamp -rm -f im-details.c @@ -1507,8 +1473,6 @@ -rm -f set_roles_vala.stamp -rm -f set_structured_name_vala.stamp -rm -f set_urls_vala.stamp - -rm -f store-removed.c - -rm -f store_removed_vala.stamp -rm -f updating-contacts.c -rm -f updating_contacts_vala.stamp -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) diff -Nru folks-0.6.6/tests/eds/name-details.c folks-0.6.7/tests/eds/name-details.c --- folks-0.6.6/tests/eds/name-details.c 2011-12-13 23:42:53.000000000 +0000 +++ folks-0.6.7/tests/eds/name-details.c 2012-02-23 00:02:31.000000000 +0000 @@ -1,4 +1,4 @@ -/* name-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* name-details.c generated by valac 0.15.1, the Vala compiler * generated from name-details.vala, do not modify */ /* @@ -674,7 +674,7 @@ #line 112 "/home/treitter/collabora/folks/tests/eds/name-details.vala" _tmp82_ = self->priv->_c1; #line 112 "/home/treitter/collabora/folks/tests/eds/name-details.vala" - _tmp83_ = gee_map_get_size ((GeeMap*) _tmp82_); + _tmp83_ = gee_abstract_map_get_size ((GeeMap*) _tmp82_); #line 112 "/home/treitter/collabora/folks/tests/eds/name-details.vala" _tmp84_ = _tmp83_; #line 112 "/home/treitter/collabora/folks/tests/eds/name-details.vala" @@ -682,7 +682,7 @@ #line 113 "/home/treitter/collabora/folks/tests/eds/name-details.vala" _tmp85_ = self->priv->_c2; #line 113 "/home/treitter/collabora/folks/tests/eds/name-details.vala" - _tmp86_ = gee_map_get_size ((GeeMap*) _tmp85_); + _tmp86_ = gee_abstract_map_get_size ((GeeMap*) _tmp85_); #line 113 "/home/treitter/collabora/folks/tests/eds/name-details.vala" _tmp87_ = _tmp86_; #line 113 "/home/treitter/collabora/folks/tests/eds/name-details.vala" @@ -1558,7 +1558,7 @@ #line 211 "/home/treitter/collabora/folks/tests/eds/name-details.vala" _tmp158_ = self->priv->_c1; #line 211 "/home/treitter/collabora/folks/tests/eds/name-details.vala" - _tmp159_ = gee_map_get_size ((GeeMap*) _tmp158_); + _tmp159_ = gee_abstract_map_get_size ((GeeMap*) _tmp158_); #line 211 "/home/treitter/collabora/folks/tests/eds/name-details.vala" _tmp160_ = _tmp159_; #line 211 "/home/treitter/collabora/folks/tests/eds/name-details.vala" @@ -1570,7 +1570,7 @@ #line 212 "/home/treitter/collabora/folks/tests/eds/name-details.vala" _tmp161_ = self->priv->_c2; #line 212 "/home/treitter/collabora/folks/tests/eds/name-details.vala" - _tmp162_ = gee_map_get_size ((GeeMap*) _tmp161_); + _tmp162_ = gee_abstract_map_get_size ((GeeMap*) _tmp161_); #line 212 "/home/treitter/collabora/folks/tests/eds/name-details.vala" _tmp163_ = _tmp162_; #line 212 "/home/treitter/collabora/folks/tests/eds/name-details.vala" diff -Nru folks-0.6.6/tests/eds/persona-store-tests.c folks-0.6.7/tests/eds/persona-store-tests.c --- folks-0.6.6/tests/eds/persona-store-tests.c 2011-12-13 23:43:05.000000000 +0000 +++ folks-0.6.7/tests/eds/persona-store-tests.c 2012-02-23 00:02:30.000000000 +0000 @@ -1,4 +1,4 @@ -/* persona-store-tests.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* persona-store-tests.c generated by valac 0.15.1, the Vala compiler * generated from persona-store-tests.vala, do not modify */ /* @@ -193,15 +193,19 @@ static void block1_data_unref (Block1Data* _data1_) { #line 48 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { +#line 197 "persona-store-tests.c" + PersonaStoreTests * self; #line 48 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" - _g_object_unref0 (_data1_->self); + self = _data1_->self; #line 48 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _g_object_unref0 (_data1_->backend_store); #line 48 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _g_main_loop_unref0 (_data1_->main_loop); #line 48 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" + _g_object_unref0 (self); +#line 48 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" g_slice_free (Block1Data, _data1_); -#line 205 "persona-store-tests.c" +#line 209 "persona-store-tests.c" } } @@ -209,7 +213,7 @@ static GValue* _g_value_dup (GValue* self) { #line 50 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" return g_boxed_copy (G_TYPE_VALUE, self); -#line 213 "persona-store-tests.c" +#line 217 "persona-store-tests.c" } @@ -218,21 +222,21 @@ g_value_unset (self); #line 50 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" g_free (self); -#line 222 "persona-store-tests.c" +#line 226 "persona-store-tests.c" } static gpointer __g_value_dup0 (gpointer self) { #line 57 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" return self ? _g_value_dup (self) : NULL; -#line 229 "persona-store-tests.c" +#line 233 "persona-store-tests.c" } static gpointer _g_object_ref0 (gpointer self) { #line 63 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" return self ? g_object_ref (self) : NULL; -#line 236 "persona-store-tests.c" +#line 240 "persona-store-tests.c" } @@ -247,7 +251,7 @@ _tmp0_ = r; #line 76 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" folks_backend_store_prepare_finish (_data1_->backend_store, _tmp0_); -#line 251 "persona-store-tests.c" +#line 255 "persona-store-tests.c" } @@ -256,7 +260,7 @@ __lambda2_ (self, source_object, res); #line 74 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" block1_data_unref (self); -#line 260 "persona-store-tests.c" +#line 264 "persona-store-tests.c" } @@ -268,14 +272,14 @@ _tmp0_ = ps; #line 84 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _persona_store_tests_set_up_persona_store (self, _tmp0_); -#line 272 "persona-store-tests.c" +#line 276 "persona-store-tests.c" } static void ____lambda4__folks_backend_persona_store_added (FolksBackend* _sender, FolksPersonaStore* store, gpointer self) { #line 82 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" ___lambda4_ (self, store); -#line 279 "persona-store-tests.c" +#line 283 "persona-store-tests.c" } @@ -293,13 +297,13 @@ _tmp2_ = _tmp1_; #line 80 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" if (g_strcmp0 (_tmp2_, "eds") == 0) { -#line 297 "persona-store-tests.c" +#line 301 "persona-store-tests.c" FolksBackend* _tmp3_; #line 82 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _tmp3_ = b; #line 82 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" g_signal_connect_object (_tmp3_, "persona-store-added", (GCallback) ____lambda4__folks_backend_persona_store_added, self, 0); -#line 303 "persona-store-tests.c" +#line 307 "persona-store-tests.c" { FolksBackend* _tmp4_; GeeMap* _tmp5_; @@ -332,7 +336,7 @@ _store_it = _tmp11_; #line 87 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" while (TRUE) { -#line 336 "persona-store-tests.c" +#line 340 "persona-store-tests.c" GeeIterator* _tmp12_; gboolean _tmp13_ = FALSE; GeeIterator* _tmp14_; @@ -347,7 +351,7 @@ if (!_tmp13_) { #line 87 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" break; -#line 351 "persona-store-tests.c" +#line 355 "persona-store-tests.c" } #line 87 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _tmp14_ = _store_it; @@ -361,11 +365,11 @@ _persona_store_tests_set_up_persona_store (self, _tmp16_); #line 87 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _g_object_unref0 (store); -#line 365 "persona-store-tests.c" +#line 369 "persona-store-tests.c" } #line 87 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _g_object_unref0 (_store_it); -#line 369 "persona-store-tests.c" +#line 373 "persona-store-tests.c" } } } @@ -374,7 +378,7 @@ static void ___lambda3__folks_backend_store_backend_available (FolksBackendStore* _sender, FolksBackend* backend, gpointer self) { #line 78 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" __lambda3_ (self, backend); -#line 378 "persona-store-tests.c" +#line 382 "persona-store-tests.c" } @@ -389,7 +393,7 @@ result = FALSE; #line 100 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" return result; -#line 393 "persona-store-tests.c" +#line 397 "persona-store-tests.c" } @@ -398,7 +402,7 @@ result = __lambda6_ (self); #line 97 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" return result; -#line 402 "persona-store-tests.c" +#line 406 "persona-store-tests.c" } @@ -647,7 +651,7 @@ block1_data_unref (_data1_); #line 48 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _data1_ = NULL; -#line 651 "persona-store-tests.c" +#line 655 "persona-store-tests.c" } @@ -656,20 +660,24 @@ g_atomic_int_inc (&_data2_->_ref_count_); #line 113 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" return _data2_; -#line 660 "persona-store-tests.c" +#line 664 "persona-store-tests.c" } static void block2_data_unref (Block2Data* _data2_) { #line 113 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { +#line 671 "persona-store-tests.c" + PersonaStoreTests * self; #line 113 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" - _g_object_unref0 (_data2_->self); + self = _data2_->self; #line 113 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _g_object_unref0 (_data2_->store); #line 113 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" + _g_object_unref0 (self); +#line 113 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" g_slice_free (Block2Data, _data2_); -#line 673 "persona-store-tests.c" +#line 681 "persona-store-tests.c" } } @@ -677,14 +685,14 @@ static void __persona_store_tests_can_add_personas_cb_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 124 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _persona_store_tests_can_add_personas_cb (self, _sender, pspec); -#line 681 "persona-store-tests.c" +#line 689 "persona-store-tests.c" } static void __persona_store_tests_can_remove_personas_cb_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 130 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _persona_store_tests_can_remove_personas_cb (self, _sender, pspec); -#line 688 "persona-store-tests.c" +#line 696 "persona-store-tests.c" } @@ -696,12 +704,12 @@ if (g_strcmp0 (stack[i], needle) == 0) { #line 133 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" return TRUE; -#line 700 "persona-store-tests.c" +#line 708 "persona-store-tests.c" } } #line 133 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" return FALSE; -#line 705 "persona-store-tests.c" +#line 713 "persona-store-tests.c" } @@ -712,7 +720,7 @@ self = _data2_->self; #line 115 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" g_return_if_fail (_result_ != NULL); -#line 716 "persona-store-tests.c" +#line 724 "persona-store-tests.c" { FolksPersonaStore* _tmp0_; GAsyncResult* _tmp1_; @@ -740,7 +748,7 @@ folks_persona_store_prepare_finish (_tmp0_, _tmp1_, &_inner_error_); #line 119 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" if (_inner_error_ != NULL) { -#line 744 "persona-store-tests.c" +#line 752 "persona-store-tests.c" goto __catch0_g_error; } #line 121 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" @@ -751,20 +759,20 @@ _tmp4_ = _tmp3_; #line 121 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" if (_tmp4_ != FOLKS_MAYBE_BOOL_UNSET) { -#line 755 "persona-store-tests.c" +#line 763 "persona-store-tests.c" FolksPersonaStore* _tmp5_; #line 122 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _tmp5_ = _data2_->store; #line 122 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _persona_store_tests_can_add_personas_cb (self, (GObject*) _tmp5_, NULL); -#line 761 "persona-store-tests.c" +#line 769 "persona-store-tests.c" } else { FolksPersonaStore* _tmp6_; #line 124 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _tmp6_ = _data2_->store; #line 124 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" g_signal_connect_object ((GObject*) _tmp6_, "notify::can-add-personas", (GCallback) __persona_store_tests_can_add_personas_cb_g_object_notify, self, 0); -#line 768 "persona-store-tests.c" +#line 776 "persona-store-tests.c" } #line 127 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _tmp7_ = _data2_->store; @@ -774,20 +782,20 @@ _tmp9_ = _tmp8_; #line 127 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" if (_tmp9_ != FOLKS_MAYBE_BOOL_UNSET) { -#line 778 "persona-store-tests.c" +#line 786 "persona-store-tests.c" FolksPersonaStore* _tmp10_; #line 128 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _tmp10_ = _data2_->store; #line 128 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _persona_store_tests_can_remove_personas_cb (self, (GObject*) _tmp10_, NULL); -#line 784 "persona-store-tests.c" +#line 792 "persona-store-tests.c" } else { FolksPersonaStore* _tmp11_; #line 130 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _tmp11_ = _data2_->store; #line 130 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" g_signal_connect_object ((GObject*) _tmp11_, "notify::can-remove-personas", (GCallback) __persona_store_tests_can_remove_personas_cb_g_object_notify, self, 0); -#line 791 "persona-store-tests.c" +#line 799 "persona-store-tests.c" } #line 133 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _tmp12_ = _data2_->store; @@ -799,13 +807,13 @@ _tmp14__length1 = _tmp13__length1; #line 133 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" if (_vala_string_array_contains (_tmp14_, _tmp14__length1, "alias")) { -#line 803 "persona-store-tests.c" +#line 811 "persona-store-tests.c" FolksPersonaStore* _tmp15_; #line 134 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _tmp15_ = _data2_->store; #line 134 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _persona_store_tests_check_can_alias_personas (self, (GObject*) _tmp15_, NULL); -#line 809 "persona-store-tests.c" +#line 817 "persona-store-tests.c" } #line 136 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _tmp16_ = _data2_->store; @@ -817,13 +825,13 @@ _tmp18__length1 = _tmp17__length1; #line 136 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" if (_vala_string_array_contains (_tmp18_, _tmp18__length1, "groups")) { -#line 821 "persona-store-tests.c" +#line 829 "persona-store-tests.c" FolksPersonaStore* _tmp19_; #line 137 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _tmp19_ = _data2_->store; #line 137 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _persona_store_tests_check_can_group_personas (self, (GObject*) _tmp19_, NULL); -#line 827 "persona-store-tests.c" +#line 835 "persona-store-tests.c" } } goto __finally0; @@ -862,7 +870,7 @@ g_warning ("Error preparing PersonaStore type: %s, id: %s: " "'%s'", _tmp22_, _tmp25_, _tmp27_); #line 117 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _g_error_free0 (e); -#line 866 "persona-store-tests.c" +#line 874 "persona-store-tests.c" } __finally0: #line 117 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" @@ -873,7 +881,7 @@ g_clear_error (&_inner_error_); #line 117 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" return; -#line 877 "persona-store-tests.c" +#line 885 "persona-store-tests.c" } } @@ -883,7 +891,7 @@ __lambda5_ (self, source_object, res); #line 115 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" block2_data_unref (self); -#line 887 "persona-store-tests.c" +#line 895 "persona-store-tests.c" } @@ -916,7 +924,7 @@ block2_data_unref (_data2_); #line 113 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _data2_ = NULL; -#line 920 "persona-store-tests.c" +#line 928 "persona-store-tests.c" } @@ -950,7 +958,7 @@ _tmp5_ = _tmp4_; #line 152 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" if (_tmp5_ != FOLKS_MAYBE_BOOL_UNSET) { -#line 954 "persona-store-tests.c" +#line 962 "persona-store-tests.c" EdsfPersonaStore* _tmp6_; FolksMaybeBool _tmp7_; FolksMaybeBool _tmp8_; @@ -976,11 +984,11 @@ g_signal_parse_name ("notify::can-add-personas", G_TYPE_OBJECT, &_tmp11_, &_tmp12_, TRUE); #line 158 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" g_signal_handlers_disconnect_matched ((GObject*) _tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DETAIL | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, _tmp12_, NULL, (GCallback) __persona_store_tests_can_add_personas_cb_g_object_notify, self); -#line 980 "persona-store-tests.c" +#line 988 "persona-store-tests.c" } #line 147 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _g_object_unref0 (store); -#line 984 "persona-store-tests.c" +#line 992 "persona-store-tests.c" } @@ -1014,7 +1022,7 @@ _tmp5_ = _tmp4_; #line 168 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" if (_tmp5_ != FOLKS_MAYBE_BOOL_UNSET) { -#line 1018 "persona-store-tests.c" +#line 1026 "persona-store-tests.c" EdsfPersonaStore* _tmp6_; FolksMaybeBool _tmp7_; FolksMaybeBool _tmp8_; @@ -1040,11 +1048,11 @@ g_signal_parse_name ("notify::can-remove-personas", G_TYPE_OBJECT, &_tmp11_, &_tmp12_, TRUE); #line 174 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" g_signal_handlers_disconnect_matched ((GObject*) _tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DETAIL | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, _tmp12_, NULL, (GCallback) __persona_store_tests_can_remove_personas_cb_g_object_notify, self); -#line 1044 "persona-store-tests.c" +#line 1052 "persona-store-tests.c" } #line 163 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _g_object_unref0 (store); -#line 1048 "persona-store-tests.c" +#line 1056 "persona-store-tests.c" } @@ -1082,17 +1090,17 @@ _tmp5__length1 = _tmp4__length1; #line 184 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" if (_vala_string_array_contains (_tmp5_, _tmp5__length1, "alias")) { -#line 1086 "persona-store-tests.c" +#line 1094 "persona-store-tests.c" GeeHashSet* _tmp6_; #line 186 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _tmp6_ = self->priv->_capabilities_received; #line 186 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _tmp6_, "can-alias-personas"); -#line 1092 "persona-store-tests.c" +#line 1100 "persona-store-tests.c" } #line 179 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _g_object_unref0 (store); -#line 1096 "persona-store-tests.c" +#line 1104 "persona-store-tests.c" } @@ -1130,17 +1138,17 @@ _tmp5__length1 = _tmp4__length1; #line 195 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" if (_vala_string_array_contains (_tmp5_, _tmp5__length1, "groups")) { -#line 1134 "persona-store-tests.c" +#line 1142 "persona-store-tests.c" GeeHashSet* _tmp6_; #line 197 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _tmp6_ = self->priv->_capabilities_received; #line 197 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _tmp6_, "can-group-personas"); -#line 1140 "persona-store-tests.c" +#line 1148 "persona-store-tests.c" } #line 190 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" _g_object_unref0 (store); -#line 1144 "persona-store-tests.c" +#line 1152 "persona-store-tests.c" } @@ -1155,14 +1163,14 @@ FOLKS_TEST_CASE_CLASS (klass)->tear_down = persona_store_tests_real_tear_down; #line 25 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" G_OBJECT_CLASS (klass)->finalize = persona_store_tests_finalize; -#line 1159 "persona-store-tests.c" +#line 1167 "persona-store-tests.c" } static void persona_store_tests_instance_init (PersonaStoreTests * self) { #line 25 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" self->priv = PERSONA_STORE_TESTS_GET_PRIVATE (self); -#line 1166 "persona-store-tests.c" +#line 1174 "persona-store-tests.c" } @@ -1176,7 +1184,7 @@ _g_object_unref0 (self->priv->_capabilities_received); #line 25 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" G_OBJECT_CLASS (persona_store_tests_parent_class)->finalize (obj); -#line 1180 "persona-store-tests.c" +#line 1188 "persona-store-tests.c" } @@ -1221,7 +1229,7 @@ result = 0; #line 211 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" return result; -#line 1225 "persona-store-tests.c" +#line 1233 "persona-store-tests.c" } @@ -1230,7 +1238,7 @@ g_type_init (); #line 202 "/home/treitter/collabora/folks/tests/eds/persona-store-tests.vala" return _vala_main (argv, argc); -#line 1234 "persona-store-tests.c" +#line 1242 "persona-store-tests.c" } diff -Nru folks-0.6.6/tests/eds/phone-details.c folks-0.6.7/tests/eds/phone-details.c --- folks-0.6.6/tests/eds/phone-details.c 2011-12-13 23:42:56.000000000 +0000 +++ folks-0.6.7/tests/eds/phone-details.c 2012-02-23 00:02:31.000000000 +0000 @@ -1,4 +1,4 @@ -/* phone-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* phone-details.c generated by valac 0.15.1, the Vala compiler * generated from phone-details.vala, do not modify */ /* @@ -640,7 +640,7 @@ #line 108 "/home/treitter/collabora/folks/tests/eds/phone-details.vala" _tmp71_ = self->priv->_phone_types; #line 108 "/home/treitter/collabora/folks/tests/eds/phone-details.vala" - _tmp72_ = gee_collection_get_size ((GeeCollection*) _tmp71_); + _tmp72_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp71_); #line 108 "/home/treitter/collabora/folks/tests/eds/phone-details.vala" _tmp73_ = _tmp72_; #line 108 "/home/treitter/collabora/folks/tests/eds/phone-details.vala" @@ -648,7 +648,7 @@ #line 109 "/home/treitter/collabora/folks/tests/eds/phone-details.vala" _tmp74_ = self->priv->_c1; #line 109 "/home/treitter/collabora/folks/tests/eds/phone-details.vala" - _tmp75_ = gee_map_get_size ((GeeMap*) _tmp74_); + _tmp75_ = gee_abstract_map_get_size ((GeeMap*) _tmp74_); #line 109 "/home/treitter/collabora/folks/tests/eds/phone-details.vala" _tmp76_ = _tmp75_; #line 109 "/home/treitter/collabora/folks/tests/eds/phone-details.vala" @@ -656,7 +656,7 @@ #line 110 "/home/treitter/collabora/folks/tests/eds/phone-details.vala" _tmp77_ = self->priv->_c2; #line 110 "/home/treitter/collabora/folks/tests/eds/phone-details.vala" - _tmp78_ = gee_map_get_size ((GeeMap*) _tmp77_); + _tmp78_ = gee_abstract_map_get_size ((GeeMap*) _tmp77_); #line 110 "/home/treitter/collabora/folks/tests/eds/phone-details.vala" _tmp79_ = _tmp78_; #line 110 "/home/treitter/collabora/folks/tests/eds/phone-details.vala" diff -Nru folks-0.6.6/tests/eds/postal-address-details.c folks-0.6.7/tests/eds/postal-address-details.c --- folks-0.6.6/tests/eds/postal-address-details.c 2011-12-13 23:42:33.000000000 +0000 +++ folks-0.6.7/tests/eds/postal-address-details.c 2012-02-23 00:02:34.000000000 +0000 @@ -1,4 +1,4 @@ -/* postal-address-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* postal-address-details.c generated by valac 0.15.1, the Vala compiler * generated from postal-address-details.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/remove-persona.c folks-0.6.7/tests/eds/remove-persona.c --- folks-0.6.6/tests/eds/remove-persona.c 2011-12-13 23:42:32.000000000 +0000 +++ folks-0.6.7/tests/eds/remove-persona.c 2012-02-23 00:02:35.000000000 +0000 @@ -1,4 +1,4 @@ -/* remove-persona.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* remove-persona.c generated by valac 0.15.1, the Vala compiler * generated from remove-persona.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/removing-contacts.c folks-0.6.7/tests/eds/removing-contacts.c --- folks-0.6.6/tests/eds/removing-contacts.c 2011-12-13 23:42:51.000000000 +0000 +++ folks-0.6.7/tests/eds/removing-contacts.c 2012-02-23 00:02:31.000000000 +0000 @@ -1,4 +1,4 @@ -/* removing-contacts.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* removing-contacts.c generated by valac 0.15.1, the Vala compiler * generated from removing-contacts.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/set-avatar.c folks-0.6.7/tests/eds/set-avatar.c --- folks-0.6.6/tests/eds/set-avatar.c 2011-12-13 23:42:30.000000000 +0000 +++ folks-0.6.7/tests/eds/set-avatar.c 2012-02-23 00:02:34.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-avatar.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-avatar.c generated by valac 0.15.1, the Vala compiler * generated from set-avatar.vala, do not modify */ /* @@ -1238,13 +1238,17 @@ static void block1_data_unref (Block1Data* _data1_) { #line 216 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { +#line 1242 "set-avatar.c" + SetAvatarTests * self; #line 216 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" - _g_object_unref0 (_data1_->self); + self = _data1_->self; #line 216 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _g_object_unref0 (_data1_->i); #line 216 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" + _g_object_unref0 (self); +#line 216 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_slice_free (Block1Data, _data1_); -#line 1248 "set-avatar.c" +#line 1252 "set-avatar.c" } } @@ -1252,7 +1256,7 @@ static void __set_avatar_tests_notify_individual_avatar_cb_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 224 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _set_avatar_tests_notify_individual_avatar_cb (self, _sender, pspec); -#line 1256 "set-avatar.c" +#line 1260 "set-avatar.c" } @@ -1272,13 +1276,13 @@ _tmp2_ = self->priv->_main_loop; #line 248 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" if (_tmp2_ != NULL) { -#line 1276 "set-avatar.c" +#line 1280 "set-avatar.c" GMainLoop* _tmp3_; #line 249 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _tmp3_ = self->priv->_main_loop; #line 249 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_main_loop_quit (_tmp3_); -#line 1282 "set-avatar.c" +#line 1286 "set-avatar.c" } } @@ -1288,7 +1292,7 @@ ___lambda6_ (self, source_object, res); #line 238 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_object_unref (self); -#line 1292 "set-avatar.c" +#line 1296 "set-avatar.c" } @@ -1299,7 +1303,7 @@ self = _data1_->self; #line 229 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_return_if_fail (res != NULL); -#line 1303 "set-avatar.c" +#line 1307 "set-avatar.c" { FolksIndividual* _tmp0_; GAsyncResult* _tmp1_; @@ -1316,7 +1320,7 @@ if (_inner_error_ != NULL) { #line 233 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" if (_inner_error_->domain == FOLKS_PROPERTY_ERROR) { -#line 1320 "set-avatar.c" +#line 1324 "set-avatar.c" goto __catch1_folks_property_error; } #line 233 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" @@ -1325,7 +1329,7 @@ g_clear_error (&_inner_error_); #line 233 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" return; -#line 1329 "set-avatar.c" +#line 1333 "set-avatar.c" } #line 235 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _tmp2_ = self->priv->_found_before_update; @@ -1339,7 +1343,7 @@ _tmp4_ = _data1_->i; #line 238 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _set_avatar_tests_check_individual_has_avatar (self, _tmp4_, ____lambda6__gasync_ready_callback, g_object_ref (self)); -#line 1343 "set-avatar.c" +#line 1347 "set-avatar.c" } goto __finally1; __catch1_folks_property_error: @@ -1359,7 +1363,7 @@ g_critical ("set-avatar.vala:254: Unexpected error changing avatar: %s", _tmp6_); #line 231 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _g_error_free0 (e); -#line 1363 "set-avatar.c" +#line 1367 "set-avatar.c" } __finally1: #line 231 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" @@ -1370,7 +1374,7 @@ g_clear_error (&_inner_error_); #line 231 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" return; -#line 1374 "set-avatar.c" +#line 1378 "set-avatar.c" } } @@ -1380,7 +1384,7 @@ _____lambda5_ (self, source_object, res); #line 229 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" block1_data_unref (self); -#line 1384 "set-avatar.c" +#line 1388 "set-avatar.c" } @@ -1408,7 +1412,7 @@ _tmp3_ = gee_multi_map_get_keys (_tmp2_); #line 214 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" removed = _tmp3_; -#line 1412 "set-avatar.c" +#line 1416 "set-avatar.c" { GeeCollection* _tmp4_; GeeIterator* _tmp5_ = NULL; @@ -1421,7 +1425,7 @@ _i_it = _tmp5_; #line 216 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" while (TRUE) { -#line 1425 "set-avatar.c" +#line 1429 "set-avatar.c" Block1Data* _data1_; GeeIterator* _tmp6_; gboolean _tmp7_ = FALSE; @@ -1452,7 +1456,7 @@ _data1_ = NULL; #line 216 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" break; -#line 1456 "set-avatar.c" +#line 1460 "set-avatar.c" } #line 216 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _tmp8_ = _i_it; @@ -1478,7 +1482,7 @@ _tmp15_ = _tmp14_; #line 222 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" if (g_strcmp0 (_tmp15_, "John McClane") == 0) { -#line 1482 "set-avatar.c" +#line 1486 "set-avatar.c" FolksIndividual* _tmp16_; FolksIndividual* _tmp17_; GLoadableIcon* _tmp18_; @@ -1494,7 +1498,7 @@ _tmp18_ = self->priv->_avatar; #line 229 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" folks_avatar_details_change_avatar ((FolksAvatarDetails*) _tmp17_, _tmp18_, ______lambda5__gasync_ready_callback, block1_data_ref (_data1_)); -#line 1498 "set-avatar.c" +#line 1502 "set-avatar.c" } #line 216 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _g_object_unref0 (name); @@ -1502,11 +1506,11 @@ block1_data_unref (_data1_); #line 216 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _data1_ = NULL; -#line 1506 "set-avatar.c" +#line 1510 "set-avatar.c" } #line 216 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _g_object_unref0 (_i_it); -#line 1510 "set-avatar.c" +#line 1514 "set-avatar.c" } #line 261 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _tmp19_ = removed; @@ -1516,7 +1520,7 @@ _tmp21_ = _tmp20_; #line 261 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_assert (_tmp21_ == 1); -#line 1520 "set-avatar.c" +#line 1524 "set-avatar.c" { GeeSet* _tmp22_; GeeIterator* _tmp23_ = NULL; @@ -1529,7 +1533,7 @@ _i_it = _tmp23_; #line 263 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" while (TRUE) { -#line 1533 "set-avatar.c" +#line 1537 "set-avatar.c" GeeIterator* _tmp24_; gboolean _tmp25_ = FALSE; GeeIterator* _tmp26_; @@ -1544,7 +1548,7 @@ if (!_tmp25_) { #line 263 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" break; -#line 1548 "set-avatar.c" +#line 1552 "set-avatar.c" } #line 263 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _tmp26_ = _i_it; @@ -1558,24 +1562,24 @@ g_assert (_tmp28_ == NULL); #line 263 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _g_object_unref0 (i); -#line 1562 "set-avatar.c" +#line 1566 "set-avatar.c" } #line 263 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _g_object_unref0 (_i_it); -#line 1566 "set-avatar.c" +#line 1570 "set-avatar.c" } #line 211 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _g_object_unref0 (removed); #line 211 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _g_object_unref0 (added); -#line 1572 "set-avatar.c" +#line 1576 "set-avatar.c" } static void ___lambda4__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 211 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" __lambda4_ (self, changes); -#line 1579 "set-avatar.c" +#line 1583 "set-avatar.c" } @@ -1584,24 +1588,24 @@ switch (_data_->_state_) { #line 203 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" case 0: -#line 1588 "set-avatar.c" +#line 1592 "set-avatar.c" goto _state_0; #line 203 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" case 1: -#line 1592 "set-avatar.c" +#line 1596 "set-avatar.c" goto _state_1; #line 203 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" case 2: -#line 1596 "set-avatar.c" +#line 1600 "set-avatar.c" goto _state_2; #line 203 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" case 3: -#line 1600 "set-avatar.c" +#line 1604 "set-avatar.c" goto _state_3; default: #line 203 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_assert_not_reached (); -#line 1605 "set-avatar.c" +#line 1609 "set-avatar.c" } _state_0: #line 205 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" @@ -1612,7 +1616,7 @@ eds_test_backend_commit_contacts_to_addressbook (_data_->_tmp0_, _set_avatar_tests_test_set_individual_avatar_async_ready, _data_); #line 205 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" return FALSE; -#line 1616 "set-avatar.c" +#line 1620 "set-avatar.c" _state_1: #line 205 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" eds_test_backend_commit_contacts_to_addressbook_finish (_data_->_tmp0_, _data_->_res_); @@ -1628,7 +1632,7 @@ folks_backend_store_prepare (_data_->store, _set_avatar_tests_test_set_individual_avatar_async_ready, _data_); #line 208 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" return FALSE; -#line 1632 "set-avatar.c" +#line 1636 "set-avatar.c" _state_2: #line 208 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" folks_backend_store_prepare_finish (_data_->store, _data_->_res_); @@ -1642,7 +1646,7 @@ _data_->_tmp3_ = _data_->self->priv->_aggregator; #line 211 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_signal_connect_object (_data_->_tmp3_, "individuals-changed-detailed", (GCallback) ___lambda4__folks_individual_aggregator_individuals_changed_detailed, _data_->self, 0); -#line 1646 "set-avatar.c" +#line 1650 "set-avatar.c" { #line 271 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _data_->_tmp4_ = _data_->self->priv->_aggregator; @@ -1652,13 +1656,13 @@ folks_individual_aggregator_prepare (_data_->_tmp4_, _set_avatar_tests_test_set_individual_avatar_async_ready, _data_); #line 271 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" return FALSE; -#line 1656 "set-avatar.c" +#line 1660 "set-avatar.c" _state_3: #line 271 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" folks_individual_aggregator_prepare_finish (_data_->_tmp4_, _data_->_res_, &_data_->_inner_error_); #line 271 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" if (_data_->_inner_error_ != NULL) { -#line 1662 "set-avatar.c" +#line 1666 "set-avatar.c" goto __catch2_g_error; } } @@ -1677,7 +1681,7 @@ g_warning ("set-avatar.vala:275: Error when calling prepare: %s\n", _data_->_tmp6_); #line 269 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _g_error_free0 (_data_->e); -#line 1681 "set-avatar.c" +#line 1685 "set-avatar.c" } __finally2: #line 269 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" @@ -1690,7 +1694,7 @@ g_clear_error (&_data_->_inner_error_); #line 269 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" return FALSE; -#line 1694 "set-avatar.c" +#line 1698 "set-avatar.c" } #line 203 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _g_object_unref0 (_data_->store); @@ -1698,17 +1702,17 @@ if (_data_->_state_ == 0) { #line 203 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1702 "set-avatar.c" +#line 1706 "set-avatar.c" } else { #line 203 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1706 "set-avatar.c" +#line 1710 "set-avatar.c" } #line 203 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_object_unref (_data_->_async_result); #line 203 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" return FALSE; -#line 1712 "set-avatar.c" +#line 1716 "set-avatar.c" } @@ -1721,7 +1725,7 @@ g_return_if_fail (ps != NULL); #line 286 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" self->priv->_found_after_update = TRUE; -#line 1725 "set-avatar.c" +#line 1729 "set-avatar.c" } @@ -1734,7 +1738,7 @@ _g_object_unref0 (_data_->self); #line 25 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_slice_free (SetAvatarTestsCheckIndividualHasAvatarData, _data_); -#line 1738 "set-avatar.c" +#line 1742 "set-avatar.c" } @@ -1761,7 +1765,7 @@ _data_->i = _tmp2_; #line 25 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _set_avatar_tests_check_individual_has_avatar_co (_data_); -#line 1765 "set-avatar.c" +#line 1769 "set-avatar.c" } @@ -1774,7 +1778,7 @@ result = _data_->result; #line 25 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" return result; -#line 1778 "set-avatar.c" +#line 1782 "set-avatar.c" } @@ -1788,7 +1792,7 @@ _data_->_res_ = _res_; #line 295 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _set_avatar_tests_check_individual_has_avatar_co (_data_); -#line 1792 "set-avatar.c" +#line 1796 "set-avatar.c" } @@ -1797,20 +1801,20 @@ switch (_data_->_state_) { #line 289 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" case 0: -#line 1801 "set-avatar.c" +#line 1805 "set-avatar.c" goto _state_0; #line 289 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" case 1: -#line 1805 "set-avatar.c" +#line 1809 "set-avatar.c" goto _state_1; #line 289 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" case 2: -#line 1809 "set-avatar.c" +#line 1813 "set-avatar.c" goto _state_2; default: #line 289 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_assert_not_reached (); -#line 1814 "set-avatar.c" +#line 1818 "set-avatar.c" } _state_0: #line 291 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" @@ -1841,7 +1845,7 @@ folks_test_utils_loadable_icons_content_equal (_data_->_tmp7_, _data_->_tmp8_, -1, _set_avatar_tests_check_individual_has_avatar_ready, _data_); #line 295 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" return FALSE; -#line 1845 "set-avatar.c" +#line 1849 "set-avatar.c" _state_1: #line 295 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _data_->_tmp9_ = FALSE; @@ -1853,7 +1857,7 @@ _data_->_tmp10_ = _data_->individual_equal; #line 298 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" if (_data_->_tmp10_ == TRUE) { -#line 1857 "set-avatar.c" +#line 1861 "set-avatar.c" { #line 300 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _data_->_tmp11_ = _data_->i; @@ -1879,7 +1883,7 @@ if (!_data_->_tmp16_) { #line 300 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" break; -#line 1883 "set-avatar.c" +#line 1887 "set-avatar.c" } #line 300 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _data_->_tmp17_ = _data_->_p_it; @@ -1903,7 +1907,7 @@ folks_test_utils_loadable_icons_content_equal (_data_->_tmp21_, _data_->_tmp22_, -1, _set_avatar_tests_check_individual_has_avatar_ready, _data_); #line 302 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" return FALSE; -#line 1907 "set-avatar.c" +#line 1911 "set-avatar.c" _state_2: #line 302 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _data_->_tmp23_ = FALSE; @@ -1927,11 +1931,11 @@ _data_->_tmp30_ = _data_->persona_equal; #line 306 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _data_->_tmp24_ = _data_->_tmp30_ == TRUE; -#line 1931 "set-avatar.c" +#line 1935 "set-avatar.c" } else { #line 306 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _data_->_tmp24_ = FALSE; -#line 1935 "set-avatar.c" +#line 1939 "set-avatar.c" } #line 306 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _data_->_tmp31_ = _data_->_tmp24_; @@ -1949,25 +1953,25 @@ if (_data_->_state_ == 0) { #line 308 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1953 "set-avatar.c" +#line 1957 "set-avatar.c" } else { #line 308 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1957 "set-avatar.c" +#line 1961 "set-avatar.c" } #line 308 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_object_unref (_data_->_async_result); #line 308 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" return FALSE; -#line 1963 "set-avatar.c" +#line 1967 "set-avatar.c" } #line 300 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _g_object_unref0 (_data_->p); -#line 1967 "set-avatar.c" +#line 1971 "set-avatar.c" } #line 300 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" _g_object_unref0 (_data_->_p_it); -#line 1971 "set-avatar.c" +#line 1975 "set-avatar.c" } } } @@ -1979,11 +1983,11 @@ if (_data_->_state_ == 0) { #line 314 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1983 "set-avatar.c" +#line 1987 "set-avatar.c" } else { #line 314 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1987 "set-avatar.c" +#line 1991 "set-avatar.c" } #line 314 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_object_unref (_data_->_async_result); @@ -1995,17 +1999,17 @@ if (_data_->_state_ == 0) { #line 289 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1999 "set-avatar.c" +#line 2003 "set-avatar.c" } else { #line 289 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2003 "set-avatar.c" +#line 2007 "set-avatar.c" } #line 289 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" g_object_unref (_data_->_async_result); #line 289 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" return FALSE; -#line 2009 "set-avatar.c" +#line 2013 "set-avatar.c" } @@ -2020,14 +2024,14 @@ FOLKS_TEST_CASE_CLASS (klass)->tear_down = set_avatar_tests_real_tear_down; #line 25 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" G_OBJECT_CLASS (klass)->finalize = set_avatar_tests_finalize; -#line 2024 "set-avatar.c" +#line 2028 "set-avatar.c" } static void set_avatar_tests_instance_init (SetAvatarTests * self) { #line 25 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" self->priv = SET_AVATAR_TESTS_GET_PRIVATE (self); -#line 2031 "set-avatar.c" +#line 2035 "set-avatar.c" } @@ -2045,7 +2049,7 @@ _g_object_unref0 (self->priv->_avatar); #line 25 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" G_OBJECT_CLASS (set_avatar_tests_parent_class)->finalize (obj); -#line 2049 "set-avatar.c" +#line 2053 "set-avatar.c" } @@ -2090,7 +2094,7 @@ result = 0; #line 327 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" return result; -#line 2094 "set-avatar.c" +#line 2098 "set-avatar.c" } @@ -2099,7 +2103,7 @@ g_type_init (); #line 318 "/home/treitter/collabora/folks/tests/eds/set-avatar.vala" return _vala_main (argv, argc); -#line 2103 "set-avatar.c" +#line 2107 "set-avatar.c" } diff -Nru folks-0.6.6/tests/eds/set-birthday.c folks-0.6.7/tests/eds/set-birthday.c --- folks-0.6.6/tests/eds/set-birthday.c 2011-12-13 23:42:06.000000000 +0000 +++ folks-0.6.7/tests/eds/set-birthday.c 2012-02-23 00:02:33.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-birthday.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-birthday.c generated by valac 0.15.1, the Vala compiler * generated from set-birthday.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/set-emails.c folks-0.6.7/tests/eds/set-emails.c --- folks-0.6.6/tests/eds/set-emails.c 2011-12-13 23:42:28.000000000 +0000 +++ folks-0.6.7/tests/eds/set-emails.c 2012-02-23 00:02:33.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-emails.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-emails.c generated by valac 0.15.1, the Vala compiler * generated from set-emails.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/set-gender.c folks-0.6.7/tests/eds/set-gender.c --- folks-0.6.6/tests/eds/set-gender.c 2011-12-13 23:42:14.000000000 +0000 +++ folks-0.6.7/tests/eds/set-gender.c 2012-02-23 00:02:33.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-gender.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-gender.c generated by valac 0.15.1, the Vala compiler * generated from set-gender.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/set-im-addresses.c folks-0.6.7/tests/eds/set-im-addresses.c --- folks-0.6.6/tests/eds/set-im-addresses.c 2011-12-13 23:42:27.000000000 +0000 +++ folks-0.6.7/tests/eds/set-im-addresses.c 2012-02-23 00:02:34.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-im-addresses.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-im-addresses.c generated by valac 0.15.1, the Vala compiler * generated from set-im-addresses.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/set-is-favourite.c folks-0.6.7/tests/eds/set-is-favourite.c --- folks-0.6.6/tests/eds/set-is-favourite.c 2011-12-13 23:42:01.000000000 +0000 +++ folks-0.6.7/tests/eds/set-is-favourite.c 2012-02-23 00:02:33.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-is-favourite.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-is-favourite.c generated by valac 0.15.1, the Vala compiler * generated from set-is-favourite.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/set-names.c folks-0.6.7/tests/eds/set-names.c --- folks-0.6.6/tests/eds/set-names.c 2011-12-13 23:42:25.000000000 +0000 +++ folks-0.6.7/tests/eds/set-names.c 2012-02-23 00:02:34.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-names.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-names.c generated by valac 0.15.1, the Vala compiler * generated from set-names.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/set-notes.c folks-0.6.7/tests/eds/set-notes.c --- folks-0.6.6/tests/eds/set-notes.c 2011-12-13 23:42:17.000000000 +0000 +++ folks-0.6.7/tests/eds/set-notes.c 2012-02-23 00:02:33.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-notes.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-notes.c generated by valac 0.15.1, the Vala compiler * generated from set-notes.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/set-phones.c folks-0.6.7/tests/eds/set-phones.c --- folks-0.6.6/tests/eds/set-phones.c 2011-12-13 23:42:22.000000000 +0000 +++ folks-0.6.7/tests/eds/set-phones.c 2012-02-23 00:02:34.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-phones.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-phones.c generated by valac 0.15.1, the Vala compiler * generated from set-phones.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/set-postal-addresses.c folks-0.6.7/tests/eds/set-postal-addresses.c --- folks-0.6.6/tests/eds/set-postal-addresses.c 2011-12-13 23:42:20.000000000 +0000 +++ folks-0.6.7/tests/eds/set-postal-addresses.c 2012-02-23 00:02:34.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-postal-addresses.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-postal-addresses.c generated by valac 0.15.1, the Vala compiler * generated from set-postal-addresses.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/set-properties-race.c folks-0.6.7/tests/eds/set-properties-race.c --- folks-0.6.6/tests/eds/set-properties-race.c 2011-12-13 23:42:10.000000000 +0000 +++ folks-0.6.7/tests/eds/set-properties-race.c 2012-02-23 00:02:33.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-properties-race.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-properties-race.c generated by valac 0.15.1, the Vala compiler * generated from set-properties-race.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/set-roles.c folks-0.6.7/tests/eds/set-roles.c --- folks-0.6.6/tests/eds/set-roles.c 2011-12-13 23:42:06.000000000 +0000 +++ folks-0.6.7/tests/eds/set-roles.c 2012-02-23 00:02:33.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-roles.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-roles.c generated by valac 0.15.1, the Vala compiler * generated from set-roles.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/set-structured-name.c folks-0.6.7/tests/eds/set-structured-name.c --- folks-0.6.6/tests/eds/set-structured-name.c 2011-12-13 23:42:25.000000000 +0000 +++ folks-0.6.7/tests/eds/set-structured-name.c 2012-02-23 00:02:34.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-structured-name.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-structured-name.c generated by valac 0.15.1, the Vala compiler * generated from set-structured-name.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/set-urls.c folks-0.6.7/tests/eds/set-urls.c --- folks-0.6.6/tests/eds/set-urls.c 2011-12-13 23:42:11.000000000 +0000 +++ folks-0.6.7/tests/eds/set-urls.c 2012-02-23 00:02:32.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-urls.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-urls.c generated by valac 0.15.1, the Vala compiler * generated from set-urls.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/eds/store-removed.c folks-0.6.7/tests/eds/store-removed.c --- folks-0.6.6/tests/eds/store-removed.c 2011-12-13 23:42:00.000000000 +0000 +++ folks-0.6.7/tests/eds/store-removed.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1333 +0,0 @@ -/* store-removed.c generated by valac 0.14.0.50-58097f, the Vala compiler - * generated from store-removed.vala, do not modify */ - -/* - * Copyright (C) 2011 Philip Withnall - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 2.1 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - * - * Authors: Philip Withnall - * - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - -#define TYPE_STORE_REMOVED_TESTS (store_removed_tests_get_type ()) -#define STORE_REMOVED_TESTS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_STORE_REMOVED_TESTS, StoreRemovedTests)) -#define STORE_REMOVED_TESTS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_STORE_REMOVED_TESTS, StoreRemovedTestsClass)) -#define IS_STORE_REMOVED_TESTS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_STORE_REMOVED_TESTS)) -#define IS_STORE_REMOVED_TESTS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_STORE_REMOVED_TESTS)) -#define STORE_REMOVED_TESTS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_STORE_REMOVED_TESTS, StoreRemovedTestsClass)) - -typedef struct _StoreRemovedTests StoreRemovedTests; -typedef struct _StoreRemovedTestsClass StoreRemovedTestsClass; -typedef struct _StoreRemovedTestsPrivate StoreRemovedTestsPrivate; -#define _eds_test_backend_unref0(var) ((var == NULL) ? NULL : (var = (eds_test_backend_unref (var), NULL))) -#define _g_main_loop_unref0(var) ((var == NULL) ? NULL : (var = (g_main_loop_unref (var), NULL))) -#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) -#define _g_free0(var) (var = (g_free (var), NULL)) -#define __vala_GValue_free0(var) ((var == NULL) ? NULL : (var = (_vala_GValue_free (var), NULL))) -typedef struct _Block1Data Block1Data; -#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) -typedef struct _StoreRemovedTestsTestSingleStorePart1AsyncData StoreRemovedTestsTestSingleStorePart1AsyncData; -typedef struct _Block2Data Block2Data; -typedef struct _StoreRemovedTestsTestSingleStorePart2AsyncData StoreRemovedTestsTestSingleStorePart2AsyncData; - -struct _StoreRemovedTests { - FolksTestCase parent_instance; - StoreRemovedTestsPrivate * priv; -}; - -struct _StoreRemovedTestsClass { - FolksTestCaseClass parent_class; -}; - -struct _StoreRemovedTestsPrivate { - EdsTestBackend* _eds_backend; - GMainLoop* _main_loop; - FolksIndividualAggregator* _aggregator; -}; - -struct _Block1Data { - int _ref_count_; - StoreRemovedTests * self; - gulong signal_id; - gpointer _async_data_; -}; - -struct _StoreRemovedTestsTestSingleStorePart1AsyncData { - int _state_; - GObject* _source_object_; - GAsyncResult* _res_; - GSimpleAsyncResult* _async_result; - StoreRemovedTests* self; - Block1Data* _data1_; - EdsTestBackend* _tmp0_; - FolksBackendStore* _tmp1_; - FolksBackendStore* store; - FolksIndividualAggregator* _tmp2_; - FolksIndividualAggregator* _tmp3_; - gulong _tmp4_; - FolksIndividualAggregator* _tmp5_; - GError* e; - GError* _tmp6_; - const gchar* _tmp7_; - GError * _inner_error_; -}; - -struct _Block2Data { - int _ref_count_; - StoreRemovedTests * self; - gulong signal_id; - gpointer _async_data_; -}; - -struct _StoreRemovedTestsTestSingleStorePart2AsyncData { - int _state_; - GObject* _source_object_; - GAsyncResult* _res_; - GSimpleAsyncResult* _async_result; - StoreRemovedTests* self; - Block2Data* _data2_; - FolksIndividualAggregator* _tmp0_; - gulong _tmp1_; - ESourceList* source_list; - ESourceList* _tmp2_; - ESourceList* _tmp3_; - EdsTestBackend* _tmp4_; - const gchar* _tmp5_; - const gchar* _tmp6_; - GError* e1; - GError* _tmp7_; - const gchar* _tmp8_; - GError * _inner_error_; -}; - - -static gpointer store_removed_tests_parent_class = NULL; - -GType store_removed_tests_get_type (void) G_GNUC_CONST; -#define STORE_REMOVED_TESTS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_STORE_REMOVED_TESTS, StoreRemovedTestsPrivate)) -enum { - STORE_REMOVED_TESTS_DUMMY_PROPERTY -}; -StoreRemovedTests* store_removed_tests_new (void); -StoreRemovedTests* store_removed_tests_construct (GType object_type); -void store_removed_tests_test_single_store (StoreRemovedTests* self); -static void _store_removed_tests_test_single_store_folks_test_case_test_method (gpointer self); -static void store_removed_tests_real_set_up (FolksTestCase* base); -static void store_removed_tests_real_tear_down (FolksTestCase* base); -static GValue* _g_value_dup (GValue* self); -static void _vala_GValue_free (GValue* self); -static void _store_removed_tests_test_single_store_part1_async (StoreRemovedTests* self, GAsyncReadyCallback _callback_, gpointer _user_data_); -static void _store_removed_tests_test_single_store_part1_finish (StoreRemovedTests* self, GAsyncResult* _res_); -static gboolean __lambda3_ (StoreRemovedTests* self); -static gboolean ___lambda3__gsource_func (gpointer self); -static void _store_removed_tests_test_single_store_part2_async (StoreRemovedTests* self, GAsyncReadyCallback _callback_, gpointer _user_data_); -static void _store_removed_tests_test_single_store_part2_finish (StoreRemovedTests* self, GAsyncResult* _res_); -static gboolean __lambda5_ (StoreRemovedTests* self); -static gboolean ___lambda5__gsource_func (gpointer self); -static void _store_removed_tests_test_single_store_part1_async_data_free (gpointer _data); -static gboolean _store_removed_tests_test_single_store_part1_async_co (StoreRemovedTestsTestSingleStorePart1AsyncData* _data_); -static Block1Data* block1_data_ref (Block1Data* _data1_); -static void block1_data_unref (Block1Data* _data1_); -static void _store_removed_tests_test_single_store_part1_async_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); -static void __lambda2_ (Block1Data* _data1_, GeeMultiMap* changes); -static void ___lambda2__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self); -static void _store_removed_tests_test_single_store_part2_async_data_free (gpointer _data); -static gboolean _store_removed_tests_test_single_store_part2_async_co (StoreRemovedTestsTestSingleStorePart2AsyncData* _data_); -static Block2Data* block2_data_ref (Block2Data* _data2_); -static void block2_data_unref (Block2Data* _data2_); -static void __lambda4_ (Block2Data* _data2_, GeeMultiMap* changes); -static void ___lambda4__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self); -static void store_removed_tests_finalize (GObject* obj); -gint _vala_main (gchar** args, int args_length1); - - -static void _store_removed_tests_test_single_store_folks_test_case_test_method (gpointer self) { -#line 35 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - store_removed_tests_test_single_store (self); -#line 175 "store-removed.c" -} - - -StoreRemovedTests* store_removed_tests_construct (GType object_type) { - StoreRemovedTests * self = NULL; -#line 33 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - self = (StoreRemovedTests*) folks_test_case_construct (object_type, "StoreRemoved"); -#line 35 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - folks_test_case_add_test ((FolksTestCase*) self, "single store", _store_removed_tests_test_single_store_folks_test_case_test_method, self); -#line 31 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return self; -#line 187 "store-removed.c" -} - - -StoreRemovedTests* store_removed_tests_new (void) { -#line 31 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return store_removed_tests_construct (TYPE_STORE_REMOVED_TESTS); -#line 194 "store-removed.c" -} - - -static void store_removed_tests_real_set_up (FolksTestCase* base) { - StoreRemovedTests * self; - EdsTestBackend* _tmp0_; - EdsTestBackend* _tmp1_; - EdsTestBackend* _tmp2_; - const gchar* _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_ = NULL; - gchar* config_val; -#line 38 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - self = (StoreRemovedTests*) base; -#line 40 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp0_ = eds_test_backend_new (); -#line 40 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _eds_test_backend_unref0 (self->priv->_eds_backend); -#line 40 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - self->priv->_eds_backend = _tmp0_; -#line 41 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp1_ = self->priv->_eds_backend; -#line 41 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - eds_test_backend_set_up (_tmp1_, FALSE); -#line 44 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp2_ = self->priv->_eds_backend; -#line 44 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp3_ = eds_test_backend_get_address_book_uid (_tmp2_); -#line 44 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp4_ = _tmp3_; -#line 44 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp5_ = g_strdup_printf ("eds:%s", _tmp4_); -#line 44 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - config_val = _tmp5_; -#line 45 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_setenv ("FOLKS_PRIMARY_STORE", config_val, TRUE); -#line 38 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_free0 (config_val); -#line 233 "store-removed.c" -} - - -static void store_removed_tests_real_tear_down (FolksTestCase* base) { - StoreRemovedTests * self; - EdsTestBackend* _tmp0_; -#line 48 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - self = (StoreRemovedTests*) base; -#line 50 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp0_ = self->priv->_eds_backend; -#line 50 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - eds_test_backend_tear_down (_tmp0_); -#line 246 "store-removed.c" -} - - -static GValue* _g_value_dup (GValue* self) { -#line 60 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return g_boxed_copy (G_TYPE_VALUE, self); -#line 253 "store-removed.c" -} - - -static void _vala_GValue_free (GValue* self) { -#line 60 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_value_unset (self); -#line 60 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_free (self); -#line 262 "store-removed.c" -} - - -static gpointer __g_value_dup0 (gpointer self) { -#line 62 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return self ? _g_value_dup (self) : NULL; -#line 269 "store-removed.c" -} - - -static gpointer _g_object_ref0 (gpointer self) { -#line 70 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return self ? g_object_ref (self) : NULL; -#line 276 "store-removed.c" -} - - -static gboolean __lambda3_ (StoreRemovedTests* self) { - gboolean result = FALSE; -#line 77 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_critical ("store-removed.vala:77: Timeout reached."); -#line 78 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - result = FALSE; -#line 78 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return result; -#line 288 "store-removed.c" -} - - -static gboolean ___lambda3__gsource_func (gpointer self) { - gboolean result; - result = __lambda3_ (self); -#line 75 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return result; -#line 297 "store-removed.c" -} - - -static gboolean __lambda5_ (StoreRemovedTests* self) { - gboolean result = FALSE; -#line 93 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_critical ("store-removed.vala:93: Timeout reached."); -#line 94 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - result = FALSE; -#line 94 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return result; -#line 309 "store-removed.c" -} - - -static gboolean ___lambda5__gsource_func (gpointer self) { - gboolean result; - result = __lambda5_ (self); -#line 91 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return result; -#line 318 "store-removed.c" -} - - -void store_removed_tests_test_single_store (StoreRemovedTests* self) { - GMainLoop* _tmp0_; - EdsTestBackend* _tmp1_; - GeeHashMap* _tmp2_; - GeeHashMap* c1; - GValue _tmp3_ = {0}; - GValue _tmp4_; - GValue* _tmp5_; - GValue* _tmp6_; - GValue* v; - GValue* _tmp7_; - GValue* _tmp8_; - GValue* _tmp9_; - GValue _tmp10_ = {0}; - GValue _tmp11_; - GValue* _tmp12_; - GValue* _tmp13_; - const gchar* _tmp14_; - GValue* _tmp15_; - GValue* _tmp16_; - EdsTestBackend* _tmp17_; - GeeHashMap* _tmp18_; - guint _tmp19_ = 0U; - guint timeout_id; - GMainLoop* _tmp20_; - FolksIndividualAggregator* _tmp21_; - GeeMap* _tmp22_; - GeeMap* _tmp23_; - gint _tmp24_; - gint _tmp25_; - guint _tmp26_; - guint _tmp27_ = 0U; - GMainLoop* _tmp28_; - FolksIndividualAggregator* _tmp29_; - GeeMap* _tmp30_; - GeeMap* _tmp31_; - gint _tmp32_; - gint _tmp33_; - guint _tmp34_; -#line 53 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_return_if_fail (self != NULL); -#line 55 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp0_ = g_main_loop_new (NULL, FALSE); -#line 55 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_main_loop_unref0 (self->priv->_main_loop); -#line 55 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - self->priv->_main_loop = _tmp0_; -#line 57 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp1_ = self->priv->_eds_backend; -#line 57 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - eds_test_backend_reset (_tmp1_); -#line 60 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_VALUE, (GBoxedCopyFunc) _g_value_dup, _vala_GValue_free, NULL, NULL, NULL); -#line 60 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - c1 = _tmp2_; -#line 62 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_value_init (&_tmp3_, G_TYPE_STRING); -#line 62 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp4_ = _tmp3_; -#line 62 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp5_ = __g_value_dup0 (&_tmp4_); -#line 62 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp6_ = _tmp5_; -#line 62 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - G_IS_VALUE (&_tmp4_) ? (g_value_unset (&_tmp4_), NULL) : NULL; -#line 62 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - v = _tmp6_; -#line 63 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp7_ = v; -#line 63 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_value_set_string (_tmp7_, "Chancellor Brian Blessed"); -#line 64 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp8_ = v; -#line 64 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - v = NULL; -#line 64 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp9_ = _tmp8_; -#line 64 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - gee_abstract_map_set ((GeeAbstractMap*) c1, "full_name", _tmp9_); -#line 64 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - __vala_GValue_free0 (_tmp9_); -#line 66 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_value_init (&_tmp10_, G_TYPE_STRING); -#line 66 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp11_ = _tmp10_; -#line 66 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp12_ = __g_value_dup0 (&_tmp11_); -#line 66 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - __vala_GValue_free0 (v); -#line 66 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - v = _tmp12_; -#line 66 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - G_IS_VALUE (&_tmp11_) ? (g_value_unset (&_tmp11_), NULL) : NULL; -#line 67 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp13_ = v; -#line 67 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_value_set_string (_tmp13_, "brian@example.com"); -#line 68 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp14_ = EDSF_PERSONA_email_fields[0]; -#line 68 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp15_ = v; -#line 68 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - v = NULL; -#line 68 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp16_ = _tmp15_; -#line 68 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - gee_abstract_map_set ((GeeAbstractMap*) c1, _tmp14_, _tmp16_); -#line 68 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - __vala_GValue_free0 (_tmp16_); -#line 70 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp17_ = self->priv->_eds_backend; -#line 70 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp18_ = _g_object_ref0 (c1); -#line 70 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - eds_test_backend_add_contact (_tmp17_, _tmp18_); -#line 73 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _store_removed_tests_test_single_store_part1_async (self, NULL, NULL); -#line 75 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp19_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 5, ___lambda3__gsource_func, g_object_ref (self), g_object_unref); -#line 75 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - timeout_id = _tmp19_; -#line 81 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp20_ = self->priv->_main_loop; -#line 81 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_main_loop_run (_tmp20_); -#line 84 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp21_ = self->priv->_aggregator; -#line 84 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp22_ = folks_individual_aggregator_get_individuals (_tmp21_); -#line 84 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp23_ = _tmp22_; -#line 84 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp24_ = gee_map_get_size (_tmp23_); -#line 84 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp25_ = _tmp24_; -#line 84 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_assert (_tmp25_ == 1); -#line 86 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp26_ = timeout_id; -#line 86 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_source_remove (_tmp26_); -#line 89 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _store_removed_tests_test_single_store_part2_async (self, NULL, NULL); -#line 91 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp27_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 5, ___lambda5__gsource_func, g_object_ref (self), g_object_unref); -#line 91 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - timeout_id = _tmp27_; -#line 97 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp28_ = self->priv->_main_loop; -#line 97 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_main_loop_run (_tmp28_); -#line 100 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp29_ = self->priv->_aggregator; -#line 100 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp30_ = folks_individual_aggregator_get_individuals (_tmp29_); -#line 100 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp31_ = _tmp30_; -#line 100 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp32_ = gee_map_get_size (_tmp31_); -#line 100 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp33_ = _tmp32_; -#line 100 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_assert (_tmp33_ == 0); -#line 102 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp34_ = timeout_id; -#line 102 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_source_remove (_tmp34_); -#line 53 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - __vala_GValue_free0 (v); -#line 53 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (c1); -#line 493 "store-removed.c" -} - - -static void _store_removed_tests_test_single_store_part1_async_data_free (gpointer _data) { - StoreRemovedTestsTestSingleStorePart1AsyncData* _data_; - _data_ = _data; -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (_data_->self); -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_slice_free (StoreRemovedTestsTestSingleStorePart1AsyncData, _data_); -#line 504 "store-removed.c" -} - - -static void _store_removed_tests_test_single_store_part1_async (StoreRemovedTests* self, GAsyncReadyCallback _callback_, gpointer _user_data_) { - StoreRemovedTestsTestSingleStorePart1AsyncData* _data_; - StoreRemovedTests* _tmp0_; -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_ = g_slice_new0 (StoreRemovedTestsTestSingleStorePart1AsyncData); -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _store_removed_tests_test_single_store_part1_async); -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _store_removed_tests_test_single_store_part1_async_data_free); -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp0_ = _g_object_ref0 (self); -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->self = _tmp0_; -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _store_removed_tests_test_single_store_part1_async_co (_data_); -#line 523 "store-removed.c" -} - - -static void _store_removed_tests_test_single_store_part1_finish (StoreRemovedTests* self, GAsyncResult* _res_) { - StoreRemovedTestsTestSingleStorePart1AsyncData* _data_; -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 531 "store-removed.c" -} - - -static Block1Data* block1_data_ref (Block1Data* _data1_) { -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_atomic_int_inc (&_data1_->_ref_count_); -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return _data1_; -#line 540 "store-removed.c" -} - - -static void block1_data_unref (Block1Data* _data1_) { -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (_data1_->self); -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_slice_free (Block1Data, _data1_); -#line 551 "store-removed.c" - } -} - - -static void _store_removed_tests_test_single_store_part1_async_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { - StoreRemovedTestsTestSingleStorePart1AsyncData* _data_; -#line 107 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_ = _user_data_; -#line 107 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_source_object_ = source_object; -#line 107 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_res_ = _res_; -#line 107 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _store_removed_tests_test_single_store_part1_async_co (_data_); -#line 566 "store-removed.c" -} - - -static void __lambda2_ (Block1Data* _data1_, GeeMultiMap* changes) { - StoreRemovedTests * self; - GeeMultiMap* _tmp0_; - GeeCollection* _tmp1_ = NULL; - GeeCollection* added; - GeeMultiMap* _tmp2_; - GeeSet* _tmp3_ = NULL; - GeeSet* removed; - GeeCollection* _tmp4_; - gint _tmp5_; - gint _tmp6_; - GeeSet* _tmp14_; - gint _tmp15_; - gint _tmp16_; - GMainLoop* _tmp24_; - FolksIndividualAggregator* _tmp25_; - gulong _tmp26_; -#line 116 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - self = _data1_->self; -#line 116 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_return_if_fail (changes != NULL); -#line 118 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp0_ = changes; -#line 118 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp1_ = gee_multi_map_get_values (_tmp0_); -#line 118 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - added = _tmp1_; -#line 119 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp2_ = changes; -#line 119 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp3_ = gee_multi_map_get_keys (_tmp2_); -#line 119 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - removed = _tmp3_; -#line 121 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp4_ = added; -#line 121 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp5_ = gee_collection_get_size (_tmp4_); -#line 121 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp6_ = _tmp5_; -#line 121 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_assert (_tmp6_ == 1); -#line 611 "store-removed.c" - { - GeeCollection* _tmp7_; - GeeIterator* _tmp8_ = NULL; - GeeIterator* _i_it; -#line 125 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp7_ = added; -#line 125 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp8_ = gee_iterable_iterator ((GeeIterable*) _tmp7_); -#line 125 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _i_it = _tmp8_; -#line 125 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - while (TRUE) { -#line 624 "store-removed.c" - GeeIterator* _tmp9_; - gboolean _tmp10_ = FALSE; - GeeIterator* _tmp11_; - gpointer _tmp12_ = NULL; - FolksIndividual* i; - FolksIndividual* _tmp13_; -#line 125 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp9_ = _i_it; -#line 125 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp10_ = gee_iterator_next (_tmp9_); -#line 125 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - if (!_tmp10_) { -#line 125 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - break; -#line 639 "store-removed.c" - } -#line 125 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp11_ = _i_it; -#line 125 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp12_ = gee_iterator_get (_tmp11_); -#line 125 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - i = (FolksIndividual*) _tmp12_; -#line 127 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp13_ = i; -#line 127 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_assert (_tmp13_ != NULL); -#line 125 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (i); -#line 653 "store-removed.c" - } -#line 125 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (_i_it); -#line 657 "store-removed.c" - } -#line 130 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp14_ = removed; -#line 130 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp15_ = gee_collection_get_size ((GeeCollection*) _tmp14_); -#line 130 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp16_ = _tmp15_; -#line 130 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_assert (_tmp16_ == 1); -#line 667 "store-removed.c" - { - GeeSet* _tmp17_; - GeeIterator* _tmp18_ = NULL; - GeeIterator* _i_it; -#line 132 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp17_ = removed; -#line 132 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp18_ = gee_iterable_iterator ((GeeIterable*) _tmp17_); -#line 132 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _i_it = _tmp18_; -#line 132 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - while (TRUE) { -#line 680 "store-removed.c" - GeeIterator* _tmp19_; - gboolean _tmp20_ = FALSE; - GeeIterator* _tmp21_; - gpointer _tmp22_ = NULL; - FolksIndividual* i; - FolksIndividual* _tmp23_; -#line 132 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp19_ = _i_it; -#line 132 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp20_ = gee_iterator_next (_tmp19_); -#line 132 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - if (!_tmp20_) { -#line 132 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - break; -#line 695 "store-removed.c" - } -#line 132 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp21_ = _i_it; -#line 132 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp22_ = gee_iterator_get (_tmp21_); -#line 132 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - i = (FolksIndividual*) _tmp22_; -#line 134 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp23_ = i; -#line 134 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_assert (_tmp23_ == NULL); -#line 132 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (i); -#line 709 "store-removed.c" - } -#line 132 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (_i_it); -#line 713 "store-removed.c" - } -#line 138 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp24_ = self->priv->_main_loop; -#line 138 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_main_loop_quit (_tmp24_); -#line 139 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp25_ = self->priv->_aggregator; -#line 139 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp26_ = _data1_->signal_id; -#line 139 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_signal_handler_disconnect ((GObject*) _tmp25_, _tmp26_); -#line 116 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (removed); -#line 116 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (added); -#line 729 "store-removed.c" -} - - -static void ___lambda2__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { -#line 115 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - __lambda2_ (self, changes); -#line 736 "store-removed.c" -} - - -static gboolean _store_removed_tests_test_single_store_part1_async_co (StoreRemovedTestsTestSingleStorePart1AsyncData* _data_) { -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - switch (_data_->_state_) { -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - case 0: -#line 745 "store-removed.c" - goto _state_0; -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - case 1: -#line 749 "store-removed.c" - goto _state_1; -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - case 2: -#line 753 "store-removed.c" - goto _state_2; -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - case 3: -#line 757 "store-removed.c" - goto _state_3; - default: -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_assert_not_reached (); -#line 762 "store-removed.c" - } - _state_0: -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_data1_ = g_slice_new0 (Block1Data); -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_data1_->_ref_count_ = 1; -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_data1_->self = g_object_ref (_data_->self); -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_data1_->_async_data_ = _data_; -#line 107 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp0_ = _data_->self->priv->_eds_backend; -#line 107 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_state_ = 1; -#line 107 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - eds_test_backend_commit_contacts_to_addressbook (_data_->_tmp0_, _store_removed_tests_test_single_store_part1_async_ready, _data_); -#line 107 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return FALSE; -#line 781 "store-removed.c" - _state_1: -#line 107 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - eds_test_backend_commit_contacts_to_addressbook_finish (_data_->_tmp0_, _data_->_res_); -#line 109 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp1_ = NULL; -#line 109 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp1_ = folks_backend_store_dup (); -#line 109 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->store = _data_->_tmp1_; -#line 110 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_state_ = 2; -#line 110 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - folks_backend_store_prepare (_data_->store, _store_removed_tests_test_single_store_part1_async_ready, _data_); -#line 110 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return FALSE; -#line 797 "store-removed.c" - _state_2: -#line 110 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - folks_backend_store_prepare_finish (_data_->store, _data_->_res_); -#line 112 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp2_ = folks_individual_aggregator_new (); -#line 112 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (_data_->self->priv->_aggregator); -#line 112 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->self->priv->_aggregator = _data_->_tmp2_; -#line 114 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_data1_->signal_id = (gulong) 0; -#line 115 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp3_ = _data_->self->priv->_aggregator; -#line 115 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp4_ = 0UL; -#line 115 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp4_ = g_signal_connect_data (_data_->_tmp3_, "individuals-changed-detailed", (GCallback) ___lambda2__folks_individual_aggregator_individuals_changed_detailed, block1_data_ref (_data_->_data1_), (GClosureNotify) block1_data_unref, 0); -#line 115 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_data1_->signal_id = _data_->_tmp4_; -#line 817 "store-removed.c" - { -#line 144 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp5_ = _data_->self->priv->_aggregator; -#line 144 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_state_ = 3; -#line 144 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - folks_individual_aggregator_prepare (_data_->_tmp5_, _store_removed_tests_test_single_store_part1_async_ready, _data_); -#line 144 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return FALSE; -#line 827 "store-removed.c" - _state_3: -#line 144 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - folks_individual_aggregator_prepare_finish (_data_->_tmp5_, _data_->_res_, &_data_->_inner_error_); -#line 144 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - if (_data_->_inner_error_ != NULL) { -#line 833 "store-removed.c" - goto __catch0_g_error; - } - } - goto __finally0; - __catch0_g_error: - { -#line 142 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->e = _data_->_inner_error_; -#line 142 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_inner_error_ = NULL; -#line 148 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp6_ = _data_->e; -#line 148 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp7_ = _data_->_tmp6_->message; -#line 148 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_critical ("store-removed.vala:148: Error when calling prepare: %s", _data_->_tmp7_); -#line 142 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_error_free0 (_data_->e); -#line 852 "store-removed.c" - } - __finally0: -#line 142 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - if (_data_->_inner_error_ != NULL) { -#line 142 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (_data_->store); -#line 142 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - block1_data_unref (_data_->_data1_); -#line 142 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_data1_ = NULL; -#line 142 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); -#line 142 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_clear_error (&_data_->_inner_error_); -#line 142 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return FALSE; -#line 869 "store-removed.c" - } -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (_data_->store); -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - block1_data_unref (_data_->_data1_); -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_data1_ = NULL; -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - if (_data_->_state_ == 0) { -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 881 "store-removed.c" - } else { -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 885 "store-removed.c" - } -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_object_unref (_data_->_async_result); -#line 105 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return FALSE; -#line 891 "store-removed.c" -} - - -static void _store_removed_tests_test_single_store_part2_async_data_free (gpointer _data) { - StoreRemovedTestsTestSingleStorePart2AsyncData* _data_; - _data_ = _data; -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (_data_->self); -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_slice_free (StoreRemovedTestsTestSingleStorePart2AsyncData, _data_); -#line 902 "store-removed.c" -} - - -static void _store_removed_tests_test_single_store_part2_async (StoreRemovedTests* self, GAsyncReadyCallback _callback_, gpointer _user_data_) { - StoreRemovedTestsTestSingleStorePart2AsyncData* _data_; - StoreRemovedTests* _tmp0_; -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_ = g_slice_new0 (StoreRemovedTestsTestSingleStorePart2AsyncData); -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _store_removed_tests_test_single_store_part2_async); -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _store_removed_tests_test_single_store_part2_async_data_free); -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp0_ = _g_object_ref0 (self); -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->self = _tmp0_; -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _store_removed_tests_test_single_store_part2_async_co (_data_); -#line 921 "store-removed.c" -} - - -static void _store_removed_tests_test_single_store_part2_finish (StoreRemovedTests* self, GAsyncResult* _res_) { - StoreRemovedTestsTestSingleStorePart2AsyncData* _data_; -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 929 "store-removed.c" -} - - -static Block2Data* block2_data_ref (Block2Data* _data2_) { -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_atomic_int_inc (&_data2_->_ref_count_); -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return _data2_; -#line 938 "store-removed.c" -} - - -static void block2_data_unref (Block2Data* _data2_) { -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (_data2_->self); -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_slice_free (Block2Data, _data2_); -#line 949 "store-removed.c" - } -} - - -static void __lambda4_ (Block2Data* _data2_, GeeMultiMap* changes) { - StoreRemovedTests * self; - GeeMultiMap* _tmp0_; - GeeCollection* _tmp1_ = NULL; - GeeCollection* added; - GeeMultiMap* _tmp2_; - GeeSet* _tmp3_ = NULL; - GeeSet* removed; - GeeCollection* _tmp4_; - gint _tmp5_; - gint _tmp6_; - GeeSet* _tmp14_; - gint _tmp15_; - gint _tmp16_; - GMainLoop* _tmp24_; - FolksIndividualAggregator* _tmp25_; - gulong _tmp26_; -#line 156 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - self = _data2_->self; -#line 156 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_return_if_fail (changes != NULL); -#line 158 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp0_ = changes; -#line 158 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp1_ = gee_multi_map_get_values (_tmp0_); -#line 158 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - added = _tmp1_; -#line 159 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp2_ = changes; -#line 159 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp3_ = gee_multi_map_get_keys (_tmp2_); -#line 159 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - removed = _tmp3_; -#line 161 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp4_ = added; -#line 161 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp5_ = gee_collection_get_size (_tmp4_); -#line 161 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp6_ = _tmp5_; -#line 161 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_assert (_tmp6_ == 1); -#line 995 "store-removed.c" - { - GeeCollection* _tmp7_; - GeeIterator* _tmp8_ = NULL; - GeeIterator* _i_it; -#line 163 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp7_ = added; -#line 163 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp8_ = gee_iterable_iterator ((GeeIterable*) _tmp7_); -#line 163 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _i_it = _tmp8_; -#line 163 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - while (TRUE) { -#line 1008 "store-removed.c" - GeeIterator* _tmp9_; - gboolean _tmp10_ = FALSE; - GeeIterator* _tmp11_; - gpointer _tmp12_ = NULL; - FolksIndividual* i; - FolksIndividual* _tmp13_; -#line 163 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp9_ = _i_it; -#line 163 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp10_ = gee_iterator_next (_tmp9_); -#line 163 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - if (!_tmp10_) { -#line 163 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - break; -#line 1023 "store-removed.c" - } -#line 163 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp11_ = _i_it; -#line 163 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp12_ = gee_iterator_get (_tmp11_); -#line 163 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - i = (FolksIndividual*) _tmp12_; -#line 165 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp13_ = i; -#line 165 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_assert (_tmp13_ == NULL); -#line 163 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (i); -#line 1037 "store-removed.c" - } -#line 163 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (_i_it); -#line 1041 "store-removed.c" - } -#line 168 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp14_ = removed; -#line 168 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp15_ = gee_collection_get_size ((GeeCollection*) _tmp14_); -#line 168 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp16_ = _tmp15_; -#line 168 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_assert (_tmp16_ == 1); -#line 1051 "store-removed.c" - { - GeeSet* _tmp17_; - GeeIterator* _tmp18_ = NULL; - GeeIterator* _i_it; -#line 172 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp17_ = removed; -#line 172 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp18_ = gee_iterable_iterator ((GeeIterable*) _tmp17_); -#line 172 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _i_it = _tmp18_; -#line 172 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - while (TRUE) { -#line 1064 "store-removed.c" - GeeIterator* _tmp19_; - gboolean _tmp20_ = FALSE; - GeeIterator* _tmp21_; - gpointer _tmp22_ = NULL; - FolksIndividual* i; - FolksIndividual* _tmp23_; -#line 172 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp19_ = _i_it; -#line 172 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp20_ = gee_iterator_next (_tmp19_); -#line 172 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - if (!_tmp20_) { -#line 172 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - break; -#line 1079 "store-removed.c" - } -#line 172 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp21_ = _i_it; -#line 172 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp22_ = gee_iterator_get (_tmp21_); -#line 172 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - i = (FolksIndividual*) _tmp22_; -#line 174 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp23_ = i; -#line 174 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_assert (_tmp23_ != NULL); -#line 172 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (i); -#line 1093 "store-removed.c" - } -#line 172 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (_i_it); -#line 1097 "store-removed.c" - } -#line 178 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp24_ = self->priv->_main_loop; -#line 178 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_main_loop_quit (_tmp24_); -#line 179 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp25_ = self->priv->_aggregator; -#line 179 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp26_ = _data2_->signal_id; -#line 179 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_signal_handler_disconnect ((GObject*) _tmp25_, _tmp26_); -#line 156 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (removed); -#line 156 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (added); -#line 1113 "store-removed.c" -} - - -static void ___lambda4__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { -#line 155 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - __lambda4_ (self, changes); -#line 1120 "store-removed.c" -} - - -static gboolean _store_removed_tests_test_single_store_part2_async_co (StoreRemovedTestsTestSingleStorePart2AsyncData* _data_) { -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - switch (_data_->_state_) { -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - case 0: -#line 1129 "store-removed.c" - goto _state_0; - default: -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_assert_not_reached (); -#line 1134 "store-removed.c" - } - _state_0: -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_data2_ = g_slice_new0 (Block2Data); -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_data2_->_ref_count_ = 1; -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_data2_->self = g_object_ref (_data_->self); -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_data2_->_async_data_ = _data_; -#line 154 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_data2_->signal_id = (gulong) 0; -#line 155 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp0_ = _data_->self->priv->_aggregator; -#line 155 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp1_ = 0UL; -#line 155 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp1_ = g_signal_connect_data (_data_->_tmp0_, "individuals-changed-detailed", (GCallback) ___lambda4__folks_individual_aggregator_individuals_changed_detailed, block2_data_ref (_data_->_data2_), (GClosureNotify) block2_data_unref, 0); -#line 155 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_data2_->signal_id = _data_->_tmp1_; -#line 184 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->source_list = NULL; -#line 1157 "store-removed.c" - { -#line 187 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp2_ = NULL; -#line 187 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - e_book_client_get_sources (&_data_->_tmp2_, &_data_->_inner_error_); -#line 187 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (_data_->source_list); -#line 187 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->source_list = _data_->_tmp2_; -#line 187 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - if (_data_->_inner_error_ != NULL) { -#line 1169 "store-removed.c" - goto __catch1_g_error; - } -#line 188 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp3_ = _data_->source_list; -#line 188 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp4_ = _data_->self->priv->_eds_backend; -#line 188 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp5_ = eds_test_backend_get_address_book_uid (_data_->_tmp4_); -#line 188 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp6_ = _data_->_tmp5_; -#line 188 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - e_source_list_remove_source_by_uid (_data_->_tmp3_, _data_->_tmp6_); -#line 1182 "store-removed.c" - } - goto __finally1; - __catch1_g_error: - { -#line 185 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->e1 = _data_->_inner_error_; -#line 185 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_inner_error_ = NULL; -#line 192 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp7_ = _data_->e1; -#line 192 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_tmp8_ = _data_->_tmp7_->message; -#line 192 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_critical ("store-removed.vala:192: Error getting source list: %s", _data_->_tmp8_); -#line 185 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_error_free0 (_data_->e1); -#line 1199 "store-removed.c" - } - __finally1: -#line 185 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - if (_data_->_inner_error_ != NULL) { -#line 185 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (_data_->source_list); -#line 185 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - block2_data_unref (_data_->_data2_); -#line 185 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_data2_ = NULL; -#line 185 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); -#line 185 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_clear_error (&_data_->_inner_error_); -#line 185 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return FALSE; -#line 1216 "store-removed.c" - } -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (_data_->source_list); -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - block2_data_unref (_data_->_data2_); -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _data_->_data2_ = NULL; -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - if (_data_->_state_ == 0) { -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1228 "store-removed.c" - } else { -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_simple_async_result_complete (_data_->_async_result); -#line 1232 "store-removed.c" - } -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_object_unref (_data_->_async_result); -#line 152 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return FALSE; -#line 1238 "store-removed.c" -} - - -static void store_removed_tests_class_init (StoreRemovedTestsClass * klass) { -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - store_removed_tests_parent_class = g_type_class_peek_parent (klass); -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_type_class_add_private (klass, sizeof (StoreRemovedTestsPrivate)); -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - FOLKS_TEST_CASE_CLASS (klass)->set_up = store_removed_tests_real_set_up; -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - FOLKS_TEST_CASE_CLASS (klass)->tear_down = store_removed_tests_real_tear_down; -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - G_OBJECT_CLASS (klass)->finalize = store_removed_tests_finalize; -#line 1253 "store-removed.c" -} - - -static void store_removed_tests_instance_init (StoreRemovedTests * self) { -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - self->priv = STORE_REMOVED_TESTS_GET_PRIVATE (self); -#line 1260 "store-removed.c" -} - - -static void store_removed_tests_finalize (GObject* obj) { - StoreRemovedTests * self; -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - self = STORE_REMOVED_TESTS (obj); -#line 27 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _eds_test_backend_unref0 (self->priv->_eds_backend); -#line 28 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_main_loop_unref0 (self->priv->_main_loop); -#line 29 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (self->priv->_aggregator); -#line 25 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - G_OBJECT_CLASS (store_removed_tests_parent_class)->finalize (obj); -#line 1276 "store-removed.c" -} - - -GType store_removed_tests_get_type (void) { - static volatile gsize store_removed_tests_type_id__volatile = 0; - if (g_once_init_enter (&store_removed_tests_type_id__volatile)) { - static const GTypeInfo g_define_type_info = { sizeof (StoreRemovedTestsClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) store_removed_tests_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (StoreRemovedTests), 0, (GInstanceInitFunc) store_removed_tests_instance_init, NULL }; - GType store_removed_tests_type_id; - store_removed_tests_type_id = g_type_register_static (FOLKS_TYPE_TEST_CASE, "StoreRemovedTests", &g_define_type_info, 0); - g_once_init_leave (&store_removed_tests_type_id__volatile, store_removed_tests_type_id); - } - return store_removed_tests_type_id__volatile; -} - - -gint _vala_main (gchar** args, int args_length1) { - gint result = 0; - GTestSuite* _tmp0_ = NULL; - GTestSuite* root; - StoreRemovedTests* _tmp1_; - StoreRemovedTests* _tmp2_; - GTestSuite* _tmp3_ = NULL; -#line 199 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_test_init (&args_length1, &args, NULL); -#line 201 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp0_ = g_test_get_root (); -#line 201 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - root = _tmp0_; -#line 202 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp1_ = store_removed_tests_new (); -#line 202 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp2_ = _tmp1_; -#line 202 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _tmp3_ = folks_test_case_get_suite ((FolksTestCase*) _tmp2_); -#line 202 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_test_suite_add_suite (root, _tmp3_); -#line 202 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - _g_object_unref0 (_tmp2_); -#line 204 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_test_run (); -#line 206 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - result = 0; -#line 206 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return result; -#line 1321 "store-removed.c" -} - - -int main (int argc, char ** argv) { -#line 197 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - g_type_init (); -#line 197 "/home/treitter/collabora/folks/tests/eds/store-removed.vala" - return _vala_main (argv, argc); -#line 1330 "store-removed.c" -} - - - diff -Nru folks-0.6.6/tests/eds/store-removed.vala folks-0.6.7/tests/eds/store-removed.vala --- folks-0.6.6/tests/eds/store-removed.vala 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/tests/eds/store-removed.vala 1970-01-01 00:00:00.000000000 +0000 @@ -1,207 +0,0 @@ -/* - * Copyright (C) 2011 Philip Withnall - * - * This library is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 2.1 of the License, or - * (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this library. If not, see . - * - * Authors: Philip Withnall - * - */ - -using EdsTest; -using Folks; -using Gee; - -public class StoreRemovedTests : Folks.TestCase -{ - private EdsTest.Backend _eds_backend; - private GLib.MainLoop _main_loop; - private IndividualAggregator _aggregator; - - public StoreRemovedTests () - { - base ("StoreRemoved"); - - this.add_test ("single store", this.test_single_store); - } - - public override void set_up () - { - this._eds_backend = new EdsTest.Backend (); - this._eds_backend.set_up (); - - /* We configure eds as the primary store */ - var config_val = "eds:%s".printf (this._eds_backend.address_book_uid); - Environment.set_variable ("FOLKS_PRIMARY_STORE", config_val, true); - } - - public override void tear_down () - { - this._eds_backend.tear_down (); - } - - public void test_single_store () - { - this._main_loop = new GLib.MainLoop (null, false); - - this._eds_backend.reset (); - - /* Create a contact in the address book. */ - var c1 = new Gee.HashMap (); - - Value? v = Value (typeof (string)); - v.set_string ("Chancellor Brian Blessed"); - c1.set ("full_name", (owned) v); - - v = Value (typeof (string)); - v.set_string ("brian@example.com"); - c1.set (Edsf.Persona.email_fields[0], (owned) v); - - this._eds_backend.add_contact (c1); - - /* Schedule the test to start with the main loop. */ - this._test_single_store_part1_async (); - - var timeout_id = Timeout.add_seconds (5, () => - { - critical ("Timeout reached."); - return false; - }); - - this._main_loop.run (); - - /* We should have a single individual by now. */ - assert (this._aggregator.individuals.size == 1); - - Source.remove (timeout_id); - - /* Part 2, where we remove the address book. */ - this._test_single_store_part2_async (); - - timeout_id = Timeout.add_seconds (5, () => - { - critical ("Timeout reached."); - return false; - }); - - this._main_loop.run (); - - /* The individual should be gone. */ - assert (this._aggregator.individuals.size == 0); - - Source.remove (timeout_id); - } - - private async void _test_single_store_part1_async () - { - yield this._eds_backend.commit_contacts_to_addressbook (); - - var store = BackendStore.dup (); - yield store.prepare (); - - this._aggregator = new IndividualAggregator (); - - ulong signal_id = 0; - signal_id = this._aggregator.individuals_changed_detailed.connect ( - (changes) => - { - var added = changes.get_values (); - var removed = changes.get_keys (); - - assert (added.size == 1); - - /* We don't really care what the individual is, as long as it's not - * null. */ - foreach (var i in added) - { - assert (i != null); - } - - assert (removed.size == 1); - - foreach (var i in removed) - { - assert (i == null); - } - - /* Success! */ - this._main_loop.quit (); - this._aggregator.disconnect (signal_id); - }); - - try - { - yield this._aggregator.prepare (); - } - catch (GLib.Error e) - { - critical ("Error when calling prepare: %s", e.message); - } - } - - private async void _test_single_store_part2_async () - { - ulong signal_id = 0; - signal_id = this._aggregator.individuals_changed_detailed.connect ( - (changes) => - { - var added = changes.get_values (); - var removed = changes.get_keys (); - - assert (added.size == 1); - - foreach (var i in added) - { - assert (i == null); - } - - assert (removed.size == 1); - - /* We don't really care what the individual is, as long as it's not - * null. */ - foreach (var i in removed) - { - assert (i != null); - } - - /* Success! */ - this._main_loop.quit (); - this._aggregator.disconnect (signal_id); - }); - - /* Tear down the backend. This should remove all individuals. We check - * for this above. */ - E.SourceList? source_list = null; - try - { - E.BookClient.get_sources (out source_list); - source_list.remove_source_by_uid (this._eds_backend.address_book_uid); - } - catch (GLib.Error e1) - { - critical ("Error getting source list: %s", e1.message); - } - } -} - -public int main (string[] args) -{ - Test.init (ref args); - - TestSuite root = TestSuite.get_root (); - root.add_suite (new StoreRemovedTests ().get_suite ()); - - Test.run (); - - return 0; -} diff -Nru folks-0.6.6/tests/eds/updating-contacts.c folks-0.6.7/tests/eds/updating-contacts.c --- folks-0.6.6/tests/eds/updating-contacts.c 2011-12-13 23:42:47.000000000 +0000 +++ folks-0.6.7/tests/eds/updating-contacts.c 2012-02-23 00:02:31.000000000 +0000 @@ -1,4 +1,4 @@ -/* updating-contacts.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* updating-contacts.c generated by valac 0.15.1, the Vala compiler * generated from updating-contacts.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/folks/abstract-field-details.c folks-0.6.7/tests/folks/abstract-field-details.c --- folks-0.6.6/tests/folks/abstract-field-details.c 2011-12-13 23:41:30.000000000 +0000 +++ folks-0.6.7/tests/folks/abstract-field-details.c 2012-02-23 00:02:22.000000000 +0000 @@ -1,4 +1,4 @@ -/* abstract-field-details.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* abstract-field-details.c generated by valac 0.15.1, the Vala compiler * generated from abstract-field-details.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/folks/aggregation.c folks-0.6.7/tests/folks/aggregation.c --- folks-0.6.6/tests/folks/aggregation.c 2011-12-13 23:41:39.000000000 +0000 +++ folks-0.6.7/tests/folks/aggregation.c 2012-02-23 00:02:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* aggregation.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* aggregation.c generated by valac 0.15.1, the Vala compiler * generated from aggregation.vala, do not modify */ /* @@ -553,8 +553,10 @@ static void block1_data_unref (Block1Data* _data1_) { #line 87 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { +#line 557 "aggregation.c" + AggregationTests * self; #line 87 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - _g_object_unref0 (_data1_->self); + self = _data1_->self; #line 87 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_data1_->aggregator); #line 87 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -566,8 +568,10 @@ #line 87 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_main_loop_unref0 (_data1_->main_loop); #line 87 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" + _g_object_unref0 (self); +#line 87 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_slice_free (Block1Data, _data1_); -#line 571 "aggregation.c" +#line 575 "aggregation.c" } } @@ -608,14 +612,14 @@ _g_object_unref0 (added); #line 140 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (removed); -#line 612 "aggregation.c" +#line 616 "aggregation.c" } static void ___lambda2__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 140 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" __lambda2_ (self, changes); -#line 619 "aggregation.c" +#line 623 "aggregation.c" } @@ -641,14 +645,14 @@ _tmp3_ = _data1_->expected_individuals; #line 150 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _aggregation_tests_test_iid_individuals_changed (self, FALSE, (GeeCollection*) _tmp0_, _tmp1_, (GeeSet*) _tmp2_, (GeeSet*) _tmp3_); -#line 645 "aggregation.c" +#line 649 "aggregation.c" } static void ___lambda3__folks_individual_aggregator_individuals_changed (FolksIndividualAggregator* _sender, GeeSet* added, GeeSet* removed, const gchar* message, FolksPersona* actor, FolksGroupDetailsChangeReason reason, gpointer self) { #line 148 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" __lambda3_ (self, added, removed, message, actor, reason); -#line 652 "aggregation.c" +#line 656 "aggregation.c" } @@ -666,7 +670,7 @@ result = FALSE; #line 160 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 670 "aggregation.c" +#line 674 "aggregation.c" } @@ -675,7 +679,7 @@ result = __lambda4_ (self); #line 157 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 679 "aggregation.c" +#line 683 "aggregation.c" } @@ -686,7 +690,7 @@ self = _data1_->self; #line 165 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_return_if_fail (r != NULL); -#line 690 "aggregation.c" +#line 694 "aggregation.c" { FolksIndividualAggregator* _tmp0_; GAsyncResult* _tmp1_; @@ -698,7 +702,7 @@ folks_individual_aggregator_prepare_finish (_tmp0_, _tmp1_, &_inner_error_); #line 169 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_inner_error_ != NULL) { -#line 702 "aggregation.c" +#line 706 "aggregation.c" goto __catch0_g_error; } } @@ -719,7 +723,7 @@ g_assert_not_reached (); #line 167 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_error_free0 (e1); -#line 723 "aggregation.c" +#line 727 "aggregation.c" } __finally0: #line 167 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -730,7 +734,7 @@ g_clear_error (&_inner_error_); #line 167 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return; -#line 734 "aggregation.c" +#line 738 "aggregation.c" } } @@ -740,7 +744,7 @@ __lambda6_ (self, source_object, res); #line 165 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" block1_data_unref (self); -#line 744 "aggregation.c" +#line 748 "aggregation.c" } @@ -758,7 +762,7 @@ result = FALSE; #line 179 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 762 "aggregation.c" +#line 766 "aggregation.c" } @@ -767,7 +771,7 @@ result = __lambda5_ (self); #line 163 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 771 "aggregation.c" +#line 775 "aggregation.c" } @@ -880,7 +884,7 @@ _tmp16_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL); #line 131 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _data1_->expected_individuals_detailed = _tmp16_; -#line 884 "aggregation.c" +#line 888 "aggregation.c" { GeeHashSet* _tmp17_; GeeIterator* _tmp18_ = NULL; @@ -893,7 +897,7 @@ _id_it = _tmp18_; #line 132 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 897 "aggregation.c" +#line 901 "aggregation.c" GeeIterator* _tmp19_; gboolean _tmp20_ = FALSE; GeeIterator* _tmp21_; @@ -911,7 +915,7 @@ if (!_tmp20_) { #line 132 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 915 "aggregation.c" +#line 919 "aggregation.c" } #line 132 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp21_ = _id_it; @@ -933,11 +937,11 @@ gee_abstract_collection_add ((GeeAbstractCollection*) _tmp25_, _tmp26_); #line 132 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_free0 (id); -#line 937 "aggregation.c" +#line 941 "aggregation.c" } #line 132 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_id_it); -#line 941 "aggregation.c" +#line 945 "aggregation.c" } #line 139 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp27_ = folks_individual_aggregator_new (); @@ -964,7 +968,7 @@ #line 185 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp32_ = _data1_->expected_individuals; #line 185 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - _tmp33_ = gee_collection_get_size ((GeeCollection*) _tmp32_); + _tmp33_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp32_); #line 185 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp34_ = _tmp33_; #line 185 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -972,7 +976,7 @@ #line 186 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp35_ = _data1_->expected_individuals_detailed; #line 186 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - _tmp36_ = gee_collection_get_size ((GeeCollection*) _tmp35_); + _tmp36_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp35_); #line 186 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp37_ = _tmp36_; #line 186 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -1001,14 +1005,14 @@ block1_data_unref (_data1_); #line 87 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _data1_ = NULL; -#line 1005 "aggregation.c" +#line 1009 "aggregation.c" } static gpointer _g_object_ref0 (gpointer self) { #line 227 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return self ? g_object_ref (self) : NULL; -#line 1012 "aggregation.c" +#line 1016 "aggregation.c" } @@ -1023,7 +1027,7 @@ g_return_if_fail (default_individuals != NULL); #line 195 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_return_if_fail (expected_individuals != NULL); -#line 1027 "aggregation.c" +#line 1031 "aggregation.c" { GeeSet* _tmp0_; GeeIterator* _tmp1_ = NULL; @@ -1036,7 +1040,7 @@ _i_it = _tmp1_; #line 201 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 1040 "aggregation.c" +#line 1044 "aggregation.c" GeeIterator* _tmp2_; gboolean _tmp3_ = FALSE; GeeIterator* _tmp4_; @@ -1061,7 +1065,7 @@ if (!_tmp3_) { #line 201 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 1065 "aggregation.c" +#line 1069 "aggregation.c" } #line 201 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp4_ = _i_it; @@ -1075,14 +1079,14 @@ if (_tmp7_ != NULL) { #line 203 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp6_ = TRUE; -#line 1079 "aggregation.c" +#line 1083 "aggregation.c" } else { gboolean _tmp8_; #line 203 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp8_ = detailed; #line 203 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp6_ = _tmp8_ == TRUE; -#line 1086 "aggregation.c" +#line 1090 "aggregation.c" } #line 203 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp9_ = _tmp6_; @@ -1096,7 +1100,7 @@ _g_object_unref0 (i); #line 206 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" continue; -#line 1100 "aggregation.c" +#line 1104 "aggregation.c" } #line 209 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp13_ = i; @@ -1106,7 +1110,7 @@ _tmp15_ = _tmp14_; #line 209 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (!_tmp15_) { -#line 1110 "aggregation.c" +#line 1114 "aggregation.c" FolksIndividual* _tmp16_; GeeSet* _tmp17_; GeeSet* _tmp18_; @@ -1124,17 +1128,17 @@ _tmp20_ = _tmp19_; #line 210 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp12_ = _tmp20_ == 2; -#line 1128 "aggregation.c" +#line 1132 "aggregation.c" } else { #line 209 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp12_ = FALSE; -#line 1132 "aggregation.c" +#line 1136 "aggregation.c" } #line 209 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp21_ = _tmp12_; #line 209 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp21_) { -#line 1138 "aggregation.c" +#line 1142 "aggregation.c" GeeSet* _tmp22_; FolksIndividual* _tmp23_; const gchar* _tmp24_; @@ -1152,17 +1156,17 @@ _tmp26_ = gee_collection_contains ((GeeCollection*) _tmp22_, _tmp25_); #line 211 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp11_ = _tmp26_; -#line 1156 "aggregation.c" +#line 1160 "aggregation.c" } else { #line 209 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp11_ = FALSE; -#line 1160 "aggregation.c" +#line 1164 "aggregation.c" } #line 209 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp27_ = _tmp11_; #line 209 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp27_) { -#line 1166 "aggregation.c" +#line 1170 "aggregation.c" GeeSet* _tmp28_; FolksIndividual* _tmp29_; const gchar* _tmp30_; @@ -1177,15 +1181,15 @@ _tmp31_ = _tmp30_; #line 213 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" gee_collection_add ((GeeCollection*) _tmp28_, _tmp31_); -#line 1181 "aggregation.c" +#line 1185 "aggregation.c" } #line 201 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (i); -#line 1185 "aggregation.c" +#line 1189 "aggregation.c" } #line 201 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_i_it); -#line 1189 "aggregation.c" +#line 1193 "aggregation.c" } { GeeCollection* _tmp32_; @@ -1199,7 +1203,7 @@ _i_it = _tmp33_; #line 219 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 1203 "aggregation.c" +#line 1207 "aggregation.c" GeeIterator* _tmp34_; gboolean _tmp35_ = FALSE; GeeIterator* _tmp36_; @@ -1227,7 +1231,7 @@ if (!_tmp35_) { #line 219 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 1231 "aggregation.c" +#line 1235 "aggregation.c" } #line 219 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp36_ = _i_it; @@ -1241,14 +1245,14 @@ if (_tmp39_ != NULL) { #line 221 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp38_ = TRUE; -#line 1245 "aggregation.c" +#line 1249 "aggregation.c" } else { gboolean _tmp40_; #line 221 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp40_ = detailed; #line 221 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp38_ = _tmp40_ == TRUE; -#line 1252 "aggregation.c" +#line 1256 "aggregation.c" } #line 221 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp41_ = _tmp38_; @@ -1262,7 +1266,7 @@ _g_object_unref0 (i); #line 224 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" continue; -#line 1266 "aggregation.c" +#line 1270 "aggregation.c" } #line 227 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp43_ = i; @@ -1282,7 +1286,7 @@ _tmp50_ = _tmp49_; #line 230 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (!_tmp50_) { -#line 1286 "aggregation.c" +#line 1290 "aggregation.c" GeeSet* _tmp51_; gint _tmp52_; gint _tmp53_; @@ -1294,17 +1298,17 @@ _tmp53_ = _tmp52_; #line 230 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp47_ = _tmp53_ == 2; -#line 1298 "aggregation.c" +#line 1302 "aggregation.c" } else { #line 230 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp47_ = FALSE; -#line 1302 "aggregation.c" +#line 1306 "aggregation.c" } #line 230 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp54_ = _tmp47_; #line 230 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp54_) { -#line 1308 "aggregation.c" +#line 1312 "aggregation.c" GeeSet* _tmp55_; FolksIndividual* _tmp56_; const gchar* _tmp57_; @@ -1325,7 +1329,7 @@ g_assert (_tmp59_); #line 234 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" iid = NULL; -#line 1329 "aggregation.c" +#line 1333 "aggregation.c" { GeeSet* _tmp60_; GeeIterator* _tmp61_ = NULL; @@ -1338,7 +1342,7 @@ _persona_it = _tmp61_; #line 235 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 1342 "aggregation.c" +#line 1346 "aggregation.c" GeeIterator* _tmp62_; gboolean _tmp63_ = FALSE; GeeIterator* _tmp64_; @@ -1353,7 +1357,7 @@ if (!_tmp63_) { #line 235 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 1357 "aggregation.c" +#line 1361 "aggregation.c" } #line 235 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp64_ = _persona_it; @@ -1365,7 +1369,7 @@ _tmp66_ = iid; #line 237 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp66_ != NULL) { -#line 1369 "aggregation.c" +#line 1373 "aggregation.c" FolksPersona* _tmp67_; const gchar* _tmp68_; const gchar* _tmp69_; @@ -1380,7 +1384,7 @@ _tmp70_ = iid; #line 239 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_assert (g_strcmp0 (_tmp69_, _tmp70_) == 0); -#line 1384 "aggregation.c" +#line 1388 "aggregation.c" } else { FolksPersona* _tmp71_; const gchar* _tmp72_; @@ -1398,29 +1402,29 @@ _g_free0 (iid); #line 243 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" iid = _tmp74_; -#line 1402 "aggregation.c" +#line 1406 "aggregation.c" } #line 235 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (persona); -#line 1406 "aggregation.c" +#line 1410 "aggregation.c" } #line 235 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_persona_it); -#line 1410 "aggregation.c" +#line 1414 "aggregation.c" } #line 230 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_free0 (iid); -#line 1414 "aggregation.c" +#line 1418 "aggregation.c" } #line 219 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (personas); #line 219 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (i); -#line 1420 "aggregation.c" +#line 1424 "aggregation.c" } #line 219 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_i_it); -#line 1424 "aggregation.c" +#line 1428 "aggregation.c" } } @@ -1430,22 +1434,26 @@ g_atomic_int_inc (&_data2_->_ref_count_); #line 256 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return _data2_; -#line 1434 "aggregation.c" +#line 1438 "aggregation.c" } static void block2_data_unref (Block2Data* _data2_) { #line 256 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { +#line 1445 "aggregation.c" + AggregationTests * self; #line 256 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - _g_object_unref0 (_data2_->self); + self = _data2_->self; #line 256 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_data2_->aggregator); #line 256 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_main_loop_unref0 (_data2_->main_loop); #line 256 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" + _g_object_unref0 (self); +#line 256 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_slice_free (Block2Data, _data2_); -#line 1449 "aggregation.c" +#line 1457 "aggregation.c" } } @@ -1480,14 +1488,14 @@ _g_object_unref0 (added); #line 279 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (removed); -#line 1484 "aggregation.c" +#line 1492 "aggregation.c" } static void ___lambda7__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 279 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" __lambda7_ (self, changes); -#line 1491 "aggregation.c" +#line 1499 "aggregation.c" } @@ -1507,14 +1515,14 @@ _tmp1_ = removed; #line 289 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _aggregation_tests_test_linkable_properties_individuals_changed (self, FALSE, (guint) 5, (GeeCollection*) _tmp0_, _tmp1_, &_data2_->individual1, &_data2_->individual2); -#line 1511 "aggregation.c" +#line 1519 "aggregation.c" } static void ___lambda8__folks_individual_aggregator_individuals_changed (FolksIndividualAggregator* _sender, GeeSet* added, GeeSet* removed, const gchar* message, FolksPersona* actor, FolksGroupDetailsChangeReason reason, gpointer self) { #line 287 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" __lambda8_ (self, added, removed, message, actor, reason); -#line 1518 "aggregation.c" +#line 1526 "aggregation.c" } @@ -1532,7 +1540,7 @@ result = FALSE; #line 299 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 1536 "aggregation.c" +#line 1544 "aggregation.c" } @@ -1541,7 +1549,7 @@ result = __lambda9_ (self); #line 296 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 1545 "aggregation.c" +#line 1553 "aggregation.c" } @@ -1552,7 +1560,7 @@ self = _data2_->self; #line 304 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_return_if_fail (r != NULL); -#line 1556 "aggregation.c" +#line 1564 "aggregation.c" { FolksIndividualAggregator* _tmp0_; GAsyncResult* _tmp1_; @@ -1564,7 +1572,7 @@ folks_individual_aggregator_prepare_finish (_tmp0_, _tmp1_, &_inner_error_); #line 308 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_inner_error_ != NULL) { -#line 1568 "aggregation.c" +#line 1576 "aggregation.c" goto __catch1_g_error; } } @@ -1585,7 +1593,7 @@ g_assert_not_reached (); #line 306 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_error_free0 (e1); -#line 1589 "aggregation.c" +#line 1597 "aggregation.c" } __finally1: #line 306 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -1596,7 +1604,7 @@ g_clear_error (&_inner_error_); #line 306 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return; -#line 1600 "aggregation.c" +#line 1608 "aggregation.c" } } @@ -1606,7 +1614,7 @@ __lambda11_ (self, source_object, res); #line 304 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" block2_data_unref (self); -#line 1610 "aggregation.c" +#line 1618 "aggregation.c" } @@ -1624,7 +1632,7 @@ result = FALSE; #line 318 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 1628 "aggregation.c" +#line 1636 "aggregation.c" } @@ -1633,7 +1641,7 @@ result = __lambda10_ (self); #line 302 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 1637 "aggregation.c" +#line 1645 "aggregation.c" } @@ -1797,7 +1805,7 @@ gee_abstract_collection_add ((GeeAbstractCollection*) _tmp24_, "geraldine@example.com"); #line 343 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" set_in_use = NULL; -#line 1801 "aggregation.c" +#line 1809 "aggregation.c" { FolksIndividual* _tmp25_; GeeSet* _tmp26_; @@ -1816,7 +1824,7 @@ _p_it = _tmp28_; #line 344 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 1820 "aggregation.c" +#line 1828 "aggregation.c" GeeIterator* _tmp29_; gboolean _tmp30_ = FALSE; GeeIterator* _tmp31_; @@ -1840,7 +1848,7 @@ if (!_tmp30_) { #line 344 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 1844 "aggregation.c" +#line 1852 "aggregation.c" } #line 344 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp31_ = _p_it; @@ -1852,7 +1860,7 @@ _tmp34_ = set_in_use; #line 347 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp34_ == NULL) { -#line 1856 "aggregation.c" +#line 1864 "aggregation.c" GeeHashSet* _tmp35_; FolksPersona* _tmp36_; const gchar* _tmp37_; @@ -1870,17 +1878,17 @@ _tmp39_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp35_, _tmp38_); #line 348 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp33_ = _tmp39_; -#line 1874 "aggregation.c" +#line 1882 "aggregation.c" } else { #line 347 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp33_ = FALSE; -#line 1878 "aggregation.c" +#line 1886 "aggregation.c" } #line 347 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp40_ = _tmp33_; #line 347 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp40_) { -#line 1884 "aggregation.c" +#line 1892 "aggregation.c" GeeHashSet* _tmp41_; GeeHashSet* _tmp42_; #line 350 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -1891,14 +1899,14 @@ _g_object_unref0 (set_in_use); #line 350 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" set_in_use = _tmp42_; -#line 1895 "aggregation.c" +#line 1903 "aggregation.c" } else { GeeHashSet* _tmp43_; #line 352 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp43_ = set_in_use; #line 352 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp43_ == NULL) { -#line 1902 "aggregation.c" +#line 1910 "aggregation.c" GeeHashSet* _tmp44_; GeeHashSet* _tmp45_; #line 354 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -1909,7 +1917,7 @@ _g_object_unref0 (set_in_use); #line 354 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" set_in_use = _tmp45_; -#line 1913 "aggregation.c" +#line 1921 "aggregation.c" } } #line 357 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -1926,7 +1934,7 @@ g_assert (_tmp50_); #line 359 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" found_detailed = FALSE; -#line 1930 "aggregation.c" +#line 1938 "aggregation.c" { FolksIndividual* _tmp51_; GeeSet* _tmp52_; @@ -1945,7 +1953,7 @@ _pd_it = _tmp54_; #line 360 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 1949 "aggregation.c" +#line 1957 "aggregation.c" GeeIterator* _tmp55_; gboolean _tmp56_ = FALSE; GeeIterator* _tmp57_; @@ -1965,7 +1973,7 @@ if (!_tmp56_) { #line 360 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 1969 "aggregation.c" +#line 1977 "aggregation.c" } #line 360 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp57_ = _pd_it; @@ -1989,15 +1997,15 @@ if (g_strcmp0 (_tmp61_, _tmp64_) == 0) { #line 364 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" found_detailed = TRUE; -#line 1993 "aggregation.c" +#line 2001 "aggregation.c" } #line 360 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (pd); -#line 1997 "aggregation.c" +#line 2005 "aggregation.c" } #line 360 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_pd_it); -#line 2001 "aggregation.c" +#line 2009 "aggregation.c" } #line 367 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp65_ = found_detailed; @@ -2005,16 +2013,16 @@ g_assert (_tmp65_ == TRUE); #line 344 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (p); -#line 2009 "aggregation.c" +#line 2017 "aggregation.c" } #line 344 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_p_it); -#line 2013 "aggregation.c" +#line 2021 "aggregation.c" } #line 370 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp66_ = set_in_use; #line 370 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - _tmp67_ = gee_collection_get_size ((GeeCollection*) _tmp66_); + _tmp67_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp66_); #line 370 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp68_ = _tmp67_; #line 370 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -2025,7 +2033,7 @@ _tmp70_ = individual1_expected; #line 372 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp69_ == _tmp70_) { -#line 2029 "aggregation.c" +#line 2037 "aggregation.c" GeeHashSet* _tmp71_; GeeHashSet* _tmp72_; #line 374 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -2036,7 +2044,7 @@ _g_object_unref0 (set_in_use); #line 374 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" set_in_use = _tmp72_; -#line 2040 "aggregation.c" +#line 2048 "aggregation.c" } else { GeeHashSet* _tmp73_; GeeHashSet* _tmp74_; @@ -2048,7 +2056,7 @@ _g_object_unref0 (set_in_use); #line 378 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" set_in_use = _tmp74_; -#line 2052 "aggregation.c" +#line 2060 "aggregation.c" } { FolksIndividual* _tmp75_; @@ -2068,7 +2076,7 @@ _p_it = _tmp78_; #line 381 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 2072 "aggregation.c" +#line 2080 "aggregation.c" GeeIterator* _tmp79_; gboolean _tmp80_ = FALSE; GeeIterator* _tmp81_; @@ -2089,7 +2097,7 @@ if (!_tmp80_) { #line 381 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 2093 "aggregation.c" +#line 2101 "aggregation.c" } #line 381 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp81_ = _p_it; @@ -2111,7 +2119,7 @@ g_assert (_tmp87_); #line 385 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" found_detailed = FALSE; -#line 2115 "aggregation.c" +#line 2123 "aggregation.c" { FolksIndividual* _tmp88_; GeeSet* _tmp89_; @@ -2130,7 +2138,7 @@ _pd_it = _tmp91_; #line 386 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 2134 "aggregation.c" +#line 2142 "aggregation.c" GeeIterator* _tmp92_; gboolean _tmp93_ = FALSE; GeeIterator* _tmp94_; @@ -2150,7 +2158,7 @@ if (!_tmp93_) { #line 386 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 2154 "aggregation.c" +#line 2162 "aggregation.c" } #line 386 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp94_ = _pd_it; @@ -2174,15 +2182,15 @@ if (g_strcmp0 (_tmp98_, _tmp101_) == 0) { #line 390 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" found_detailed = TRUE; -#line 2178 "aggregation.c" +#line 2186 "aggregation.c" } #line 386 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (pd); -#line 2182 "aggregation.c" +#line 2190 "aggregation.c" } #line 386 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_pd_it); -#line 2186 "aggregation.c" +#line 2194 "aggregation.c" } #line 393 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp102_ = found_detailed; @@ -2190,16 +2198,16 @@ g_assert (_tmp102_ == TRUE); #line 381 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (p); -#line 2194 "aggregation.c" +#line 2202 "aggregation.c" } #line 381 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_p_it); -#line 2198 "aggregation.c" +#line 2206 "aggregation.c" } #line 396 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp103_ = set_in_use; #line 396 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - _tmp104_ = gee_collection_get_size ((GeeCollection*) _tmp103_); + _tmp104_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp103_); #line 396 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp105_ = _tmp104_; #line 396 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -2228,7 +2236,7 @@ block2_data_unref (_data2_); #line 256 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _data2_ = NULL; -#line 2232 "aggregation.c" +#line 2240 "aggregation.c" } @@ -2237,22 +2245,26 @@ g_atomic_int_inc (&_data3_->_ref_count_); #line 411 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return _data3_; -#line 2241 "aggregation.c" +#line 2249 "aggregation.c" } static void block3_data_unref (Block3Data* _data3_) { #line 411 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { +#line 2256 "aggregation.c" + AggregationTests * self; #line 411 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - _g_object_unref0 (_data3_->self); + self = _data3_->self; #line 411 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_data3_->aggregator); #line 411 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_main_loop_unref0 (_data3_->main_loop); #line 411 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" + _g_object_unref0 (self); +#line 411 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_slice_free (Block3Data, _data3_); -#line 2256 "aggregation.c" +#line 2268 "aggregation.c" } } @@ -2287,14 +2299,14 @@ _g_object_unref0 (added); #line 440 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (removed); -#line 2291 "aggregation.c" +#line 2303 "aggregation.c" } static void ___lambda12__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 440 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" __lambda12_ (self, changes); -#line 2298 "aggregation.c" +#line 2310 "aggregation.c" } @@ -2314,14 +2326,14 @@ _tmp1_ = removed; #line 450 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _aggregation_tests_test_linkable_properties_individuals_changed (self, FALSE, (guint) 9, (GeeCollection*) _tmp0_, _tmp1_, &_data3_->individual1, &_data3_->individual2); -#line 2318 "aggregation.c" +#line 2330 "aggregation.c" } static void ___lambda13__folks_individual_aggregator_individuals_changed (FolksIndividualAggregator* _sender, GeeSet* added, GeeSet* removed, const gchar* message, FolksPersona* actor, FolksGroupDetailsChangeReason reason, gpointer self) { #line 448 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" __lambda13_ (self, added, removed, message, actor, reason); -#line 2325 "aggregation.c" +#line 2337 "aggregation.c" } @@ -2339,7 +2351,7 @@ result = FALSE; #line 460 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 2343 "aggregation.c" +#line 2355 "aggregation.c" } @@ -2348,7 +2360,7 @@ result = __lambda14_ (self); #line 457 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 2352 "aggregation.c" +#line 2364 "aggregation.c" } @@ -2359,7 +2371,7 @@ self = _data3_->self; #line 465 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_return_if_fail (r != NULL); -#line 2363 "aggregation.c" +#line 2375 "aggregation.c" { FolksIndividualAggregator* _tmp0_; GAsyncResult* _tmp1_; @@ -2371,7 +2383,7 @@ folks_individual_aggregator_prepare_finish (_tmp0_, _tmp1_, &_inner_error_); #line 469 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_inner_error_ != NULL) { -#line 2375 "aggregation.c" +#line 2387 "aggregation.c" goto __catch2_g_error; } } @@ -2392,7 +2404,7 @@ g_assert_not_reached (); #line 467 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_error_free0 (e1); -#line 2396 "aggregation.c" +#line 2408 "aggregation.c" } __finally2: #line 467 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -2403,7 +2415,7 @@ g_clear_error (&_inner_error_); #line 467 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return; -#line 2407 "aggregation.c" +#line 2419 "aggregation.c" } } @@ -2413,7 +2425,7 @@ __lambda16_ (self, source_object, res); #line 465 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" block3_data_unref (self); -#line 2417 "aggregation.c" +#line 2429 "aggregation.c" } @@ -2431,7 +2443,7 @@ result = FALSE; #line 479 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 2435 "aggregation.c" +#line 2447 "aggregation.c" } @@ -2440,7 +2452,7 @@ result = __lambda15_ (self); #line 463 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 2444 "aggregation.c" +#line 2456 "aggregation.c" } @@ -2578,7 +2590,7 @@ _tmp18_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL); #line 497 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" expected_personas2_detailed = _tmp18_; -#line 2582 "aggregation.c" +#line 2594 "aggregation.c" { GeeHashSet* _tmp19_; GeeIterator* _tmp20_ = NULL; @@ -2591,7 +2603,7 @@ _id_it = _tmp20_; #line 498 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 2595 "aggregation.c" +#line 2607 "aggregation.c" GeeIterator* _tmp21_; gboolean _tmp22_ = FALSE; GeeIterator* _tmp23_; @@ -2613,7 +2625,7 @@ if (!_tmp22_) { #line 498 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 2617 "aggregation.c" +#line 2629 "aggregation.c" } #line 498 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp23_ = _id_it; @@ -2647,11 +2659,11 @@ gee_abstract_collection_add ((GeeAbstractCollection*) _tmp31_, _tmp32_); #line 498 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_free0 (id); -#line 2651 "aggregation.c" +#line 2663 "aggregation.c" } #line 498 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_id_it); -#line 2655 "aggregation.c" +#line 2667 "aggregation.c" } { FolksIndividual* _tmp33_; @@ -2671,7 +2683,7 @@ _p_it = _tmp36_; #line 506 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 2675 "aggregation.c" +#line 2687 "aggregation.c" GeeIterator* _tmp37_; gboolean _tmp38_ = FALSE; GeeIterator* _tmp39_; @@ -2694,7 +2706,7 @@ if (!_tmp38_) { #line 506 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 2698 "aggregation.c" +#line 2710 "aggregation.c" } #line 506 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp39_ = _p_it; @@ -2716,7 +2728,7 @@ if (_tmp47_) { #line 508 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp42_ = TRUE; -#line 2720 "aggregation.c" +#line 2732 "aggregation.c" } else { FolksPersona* _tmp48_; const gchar* _tmp49_; @@ -2729,7 +2741,7 @@ _tmp50_ = _tmp49_; #line 509 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp42_ = g_strcmp0 (_tmp50_, "0") == 0; -#line 2733 "aggregation.c" +#line 2745 "aggregation.c" } #line 508 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp51_ = _tmp42_; @@ -2737,7 +2749,7 @@ if (_tmp51_) { #line 508 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp41_ = TRUE; -#line 2741 "aggregation.c" +#line 2753 "aggregation.c" } else { FolksPersona* _tmp52_; const gchar* _tmp53_; @@ -2750,7 +2762,7 @@ _tmp54_ = _tmp53_; #line 509 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp41_ = g_strcmp0 (_tmp54_, "1") == 0; -#line 2754 "aggregation.c" +#line 2766 "aggregation.c" } #line 508 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp55_ = _tmp41_; @@ -2758,21 +2770,21 @@ g_assert (_tmp55_); #line 506 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (p); -#line 2762 "aggregation.c" +#line 2774 "aggregation.c" } #line 506 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_p_it); -#line 2766 "aggregation.c" +#line 2778 "aggregation.c" } #line 512 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp56_ = expected_personas1; #line 512 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - _tmp57_ = gee_collection_get_size ((GeeCollection*) _tmp56_); + _tmp57_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp56_); #line 512 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp58_ = _tmp57_; #line 512 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_assert (_tmp58_ == 0); -#line 2776 "aggregation.c" +#line 2788 "aggregation.c" { FolksIndividual* _tmp59_; GeeSet* _tmp60_; @@ -2791,7 +2803,7 @@ _p_it = _tmp62_; #line 514 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 2795 "aggregation.c" +#line 2807 "aggregation.c" GeeIterator* _tmp63_; gboolean _tmp64_ = FALSE; GeeIterator* _tmp65_; @@ -2814,7 +2826,7 @@ if (!_tmp64_) { #line 514 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 2818 "aggregation.c" +#line 2830 "aggregation.c" } #line 514 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp65_ = _p_it; @@ -2836,7 +2848,7 @@ if (_tmp73_) { #line 516 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp68_ = TRUE; -#line 2840 "aggregation.c" +#line 2852 "aggregation.c" } else { FolksPersona* _tmp74_; const gchar* _tmp75_; @@ -2849,7 +2861,7 @@ _tmp76_ = _tmp75_; #line 517 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp68_ = g_strcmp0 (_tmp76_, "0") == 0; -#line 2853 "aggregation.c" +#line 2865 "aggregation.c" } #line 516 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp77_ = _tmp68_; @@ -2857,7 +2869,7 @@ if (_tmp77_) { #line 516 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp67_ = TRUE; -#line 2861 "aggregation.c" +#line 2873 "aggregation.c" } else { FolksPersona* _tmp78_; const gchar* _tmp79_; @@ -2870,7 +2882,7 @@ _tmp80_ = _tmp79_; #line 517 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp67_ = g_strcmp0 (_tmp80_, "1") == 0; -#line 2874 "aggregation.c" +#line 2886 "aggregation.c" } #line 516 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp81_ = _tmp67_; @@ -2878,21 +2890,21 @@ g_assert (_tmp81_); #line 514 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (p); -#line 2882 "aggregation.c" +#line 2894 "aggregation.c" } #line 514 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_p_it); -#line 2886 "aggregation.c" +#line 2898 "aggregation.c" } #line 520 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp82_ = expected_personas1_detailed; #line 520 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - _tmp83_ = gee_collection_get_size ((GeeCollection*) _tmp82_); + _tmp83_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp82_); #line 520 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp84_ = _tmp83_; #line 520 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_assert (_tmp84_ == 0); -#line 2896 "aggregation.c" +#line 2908 "aggregation.c" { FolksIndividual* _tmp85_; GeeSet* _tmp86_; @@ -2911,7 +2923,7 @@ _p_it = _tmp88_; #line 522 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 2915 "aggregation.c" +#line 2927 "aggregation.c" GeeIterator* _tmp89_; gboolean _tmp90_ = FALSE; GeeIterator* _tmp91_; @@ -2934,7 +2946,7 @@ if (!_tmp90_) { #line 522 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 2938 "aggregation.c" +#line 2950 "aggregation.c" } #line 522 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp91_ = _p_it; @@ -2956,7 +2968,7 @@ if (_tmp99_) { #line 524 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp94_ = TRUE; -#line 2960 "aggregation.c" +#line 2972 "aggregation.c" } else { FolksPersona* _tmp100_; const gchar* _tmp101_; @@ -2969,7 +2981,7 @@ _tmp102_ = _tmp101_; #line 525 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp94_ = g_strcmp0 (_tmp102_, "0") == 0; -#line 2973 "aggregation.c" +#line 2985 "aggregation.c" } #line 524 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp103_ = _tmp94_; @@ -2977,7 +2989,7 @@ if (_tmp103_) { #line 524 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp93_ = TRUE; -#line 2981 "aggregation.c" +#line 2993 "aggregation.c" } else { FolksPersona* _tmp104_; const gchar* _tmp105_; @@ -2990,7 +3002,7 @@ _tmp106_ = _tmp105_; #line 525 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp93_ = g_strcmp0 (_tmp106_, "1") == 0; -#line 2994 "aggregation.c" +#line 3006 "aggregation.c" } #line 524 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp107_ = _tmp93_; @@ -2998,21 +3010,21 @@ g_assert (_tmp107_); #line 522 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (p); -#line 3002 "aggregation.c" +#line 3014 "aggregation.c" } #line 522 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_p_it); -#line 3006 "aggregation.c" +#line 3018 "aggregation.c" } #line 528 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp108_ = expected_personas2; #line 528 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - _tmp109_ = gee_collection_get_size ((GeeCollection*) _tmp108_); + _tmp109_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp108_); #line 528 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp110_ = _tmp109_; #line 528 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_assert (_tmp110_ == 0); -#line 3016 "aggregation.c" +#line 3028 "aggregation.c" { FolksIndividual* _tmp111_; GeeSet* _tmp112_; @@ -3031,7 +3043,7 @@ _p_it = _tmp114_; #line 530 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 3035 "aggregation.c" +#line 3047 "aggregation.c" GeeIterator* _tmp115_; gboolean _tmp116_ = FALSE; GeeIterator* _tmp117_; @@ -3054,7 +3066,7 @@ if (!_tmp116_) { #line 530 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 3058 "aggregation.c" +#line 3070 "aggregation.c" } #line 530 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp117_ = _p_it; @@ -3076,7 +3088,7 @@ if (_tmp125_) { #line 532 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp120_ = TRUE; -#line 3080 "aggregation.c" +#line 3092 "aggregation.c" } else { FolksPersona* _tmp126_; const gchar* _tmp127_; @@ -3089,7 +3101,7 @@ _tmp128_ = _tmp127_; #line 533 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp120_ = g_strcmp0 (_tmp128_, "0") == 0; -#line 3093 "aggregation.c" +#line 3105 "aggregation.c" } #line 532 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp129_ = _tmp120_; @@ -3097,7 +3109,7 @@ if (_tmp129_) { #line 532 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp119_ = TRUE; -#line 3101 "aggregation.c" +#line 3113 "aggregation.c" } else { FolksPersona* _tmp130_; const gchar* _tmp131_; @@ -3110,7 +3122,7 @@ _tmp132_ = _tmp131_; #line 533 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp119_ = g_strcmp0 (_tmp132_, "1") == 0; -#line 3114 "aggregation.c" +#line 3126 "aggregation.c" } #line 532 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp133_ = _tmp119_; @@ -3118,16 +3130,16 @@ g_assert (_tmp133_); #line 530 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (p); -#line 3122 "aggregation.c" +#line 3134 "aggregation.c" } #line 530 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_p_it); -#line 3126 "aggregation.c" +#line 3138 "aggregation.c" } #line 536 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp134_ = expected_personas2_detailed; #line 536 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - _tmp135_ = gee_collection_get_size ((GeeCollection*) _tmp134_); + _tmp135_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp134_); #line 536 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp136_ = _tmp135_; #line 536 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -3164,7 +3176,7 @@ block3_data_unref (_data3_); #line 411 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _data3_ = NULL; -#line 3168 "aggregation.c" +#line 3180 "aggregation.c" } @@ -3175,11 +3187,7 @@ g_return_if_fail (added != NULL); #line 545 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_return_if_fail (removed != NULL); -#line 545 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - g_return_if_fail (individual1 != NULL); -#line 545 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - g_return_if_fail (individual2 != NULL); -#line 3183 "aggregation.c" +#line 3191 "aggregation.c" { GeeSet* _tmp0_; GeeIterator* _tmp1_ = NULL; @@ -3192,7 +3200,7 @@ _i_it = _tmp1_; #line 550 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 3196 "aggregation.c" +#line 3204 "aggregation.c" GeeIterator* _tmp2_; gboolean _tmp3_ = FALSE; GeeIterator* _tmp4_; @@ -3215,7 +3223,7 @@ if (!_tmp3_) { #line 550 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 3219 "aggregation.c" +#line 3227 "aggregation.c" } #line 550 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp4_ = _i_it; @@ -3229,14 +3237,14 @@ if (_tmp7_ != NULL) { #line 552 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp6_ = TRUE; -#line 3233 "aggregation.c" +#line 3241 "aggregation.c" } else { gboolean _tmp8_; #line 552 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp8_ = detailed; #line 552 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp6_ = _tmp8_ == TRUE; -#line 3240 "aggregation.c" +#line 3248 "aggregation.c" } #line 552 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp9_ = _tmp6_; @@ -3250,7 +3258,7 @@ _g_object_unref0 (i); #line 555 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" continue; -#line 3254 "aggregation.c" +#line 3262 "aggregation.c" } #line 558 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp12_ = i; @@ -3260,7 +3268,7 @@ _tmp14_ = _tmp13_; #line 558 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (!_tmp14_) { -#line 3264 "aggregation.c" +#line 3272 "aggregation.c" FolksIndividual* _tmp15_; GeeSet* _tmp16_; GeeSet* _tmp17_; @@ -3281,17 +3289,17 @@ _tmp20_ = num_personas; #line 558 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp11_ = ((guint) _tmp19_) == _tmp20_; -#line 3285 "aggregation.c" +#line 3293 "aggregation.c" } else { #line 558 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp11_ = FALSE; -#line 3289 "aggregation.c" +#line 3297 "aggregation.c" } #line 558 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp21_ = _tmp11_; #line 558 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp21_) { -#line 3295 "aggregation.c" +#line 3303 "aggregation.c" FolksIndividual* _tmp22_; FolksIndividual* _tmp23_; #line 560 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -3302,7 +3310,7 @@ if (_tmp22_ == _tmp23_) { #line 562 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" *individual1 = NULL; -#line 3306 "aggregation.c" +#line 3314 "aggregation.c" } else { FolksIndividual* _tmp24_; FolksIndividual* _tmp25_; @@ -3314,7 +3322,7 @@ if (_tmp24_ == _tmp25_) { #line 566 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" *individual2 = NULL; -#line 3318 "aggregation.c" +#line 3326 "aggregation.c" } else { guint _tmp26_; FolksIndividual* _tmp27_; @@ -3332,17 +3340,17 @@ g_critical ("aggregation.vala:570: Unknown %u-persona individual: %s", _tmp26_, _tmp29_); #line 572 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_assert_not_reached (); -#line 3336 "aggregation.c" +#line 3344 "aggregation.c" } } } #line 550 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (i); -#line 3342 "aggregation.c" +#line 3350 "aggregation.c" } #line 550 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_i_it); -#line 3346 "aggregation.c" +#line 3354 "aggregation.c" } { GeeCollection* _tmp30_; @@ -3356,7 +3364,7 @@ _i_it = _tmp31_; #line 577 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 3360 "aggregation.c" +#line 3368 "aggregation.c" GeeIterator* _tmp32_; gboolean _tmp33_ = FALSE; GeeIterator* _tmp34_; @@ -3379,7 +3387,7 @@ if (!_tmp33_) { #line 577 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 3383 "aggregation.c" +#line 3391 "aggregation.c" } #line 577 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp34_ = _i_it; @@ -3393,14 +3401,14 @@ if (_tmp37_ != NULL) { #line 579 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp36_ = TRUE; -#line 3397 "aggregation.c" +#line 3405 "aggregation.c" } else { gboolean _tmp38_; #line 579 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp38_ = detailed; #line 579 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp36_ = _tmp38_ == TRUE; -#line 3404 "aggregation.c" +#line 3412 "aggregation.c" } #line 579 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp39_ = _tmp36_; @@ -3414,7 +3422,7 @@ _g_object_unref0 (i); #line 582 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" continue; -#line 3418 "aggregation.c" +#line 3426 "aggregation.c" } #line 585 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp42_ = i; @@ -3424,7 +3432,7 @@ _tmp44_ = _tmp43_; #line 585 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (!_tmp44_) { -#line 3428 "aggregation.c" +#line 3436 "aggregation.c" FolksIndividual* _tmp45_; GeeSet* _tmp46_; GeeSet* _tmp47_; @@ -3445,17 +3453,17 @@ _tmp50_ = num_personas; #line 585 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp41_ = ((guint) _tmp49_) == _tmp50_; -#line 3449 "aggregation.c" +#line 3457 "aggregation.c" } else { #line 585 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp41_ = FALSE; -#line 3453 "aggregation.c" +#line 3461 "aggregation.c" } #line 585 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp51_ = _tmp41_; #line 585 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp51_) { -#line 3459 "aggregation.c" +#line 3467 "aggregation.c" gboolean _tmp52_ = FALSE; FolksIndividual* _tmp53_; gboolean _tmp56_; @@ -3463,7 +3471,7 @@ _tmp53_ = *individual1; #line 587 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp53_ == NULL) { -#line 3467 "aggregation.c" +#line 3475 "aggregation.c" FolksIndividual* _tmp54_; FolksIndividual* _tmp55_; #line 587 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -3472,23 +3480,23 @@ _tmp55_ = i; #line 587 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp52_ = _tmp54_ != _tmp55_; -#line 3476 "aggregation.c" +#line 3484 "aggregation.c" } else { #line 587 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp52_ = FALSE; -#line 3480 "aggregation.c" +#line 3488 "aggregation.c" } #line 587 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp56_ = _tmp52_; #line 587 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp56_) { -#line 3486 "aggregation.c" +#line 3494 "aggregation.c" FolksIndividual* _tmp57_; #line 589 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp57_ = i; #line 589 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" *individual1 = _tmp57_; -#line 3492 "aggregation.c" +#line 3500 "aggregation.c" } else { gboolean _tmp58_ = FALSE; FolksIndividual* _tmp59_; @@ -3497,7 +3505,7 @@ _tmp59_ = *individual2; #line 591 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp59_ == NULL) { -#line 3501 "aggregation.c" +#line 3509 "aggregation.c" FolksIndividual* _tmp60_; FolksIndividual* _tmp61_; #line 591 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -3506,23 +3514,23 @@ _tmp61_ = i; #line 591 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp58_ = _tmp60_ != _tmp61_; -#line 3510 "aggregation.c" +#line 3518 "aggregation.c" } else { #line 591 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp58_ = FALSE; -#line 3514 "aggregation.c" +#line 3522 "aggregation.c" } #line 591 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp62_ = _tmp58_; #line 591 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp62_) { -#line 3520 "aggregation.c" +#line 3528 "aggregation.c" FolksIndividual* _tmp63_; #line 593 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp63_ = i; #line 593 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" *individual2 = _tmp63_; -#line 3526 "aggregation.c" +#line 3534 "aggregation.c" } else { gboolean _tmp64_ = FALSE; FolksIndividual* _tmp65_; @@ -3534,7 +3542,7 @@ _tmp66_ = i; #line 595 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp65_ != _tmp66_) { -#line 3538 "aggregation.c" +#line 3546 "aggregation.c" FolksIndividual* _tmp67_; FolksIndividual* _tmp68_; #line 595 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -3543,17 +3551,17 @@ _tmp68_ = i; #line 595 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp64_ = _tmp67_ != _tmp68_; -#line 3547 "aggregation.c" +#line 3555 "aggregation.c" } else { #line 595 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp64_ = FALSE; -#line 3551 "aggregation.c" +#line 3559 "aggregation.c" } #line 595 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp69_ = _tmp64_; #line 595 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp69_) { -#line 3557 "aggregation.c" +#line 3565 "aggregation.c" guint _tmp70_; FolksIndividual* _tmp71_; const gchar* _tmp72_; @@ -3570,18 +3578,18 @@ g_critical ("aggregation.vala:597: Unknown %u-persona individual: %s", _tmp70_, _tmp73_); #line 599 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_assert_not_reached (); -#line 3574 "aggregation.c" +#line 3582 "aggregation.c" } } } } #line 577 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (i); -#line 3581 "aggregation.c" +#line 3589 "aggregation.c" } #line 577 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_i_it); -#line 3585 "aggregation.c" +#line 3593 "aggregation.c" } } @@ -3591,15 +3599,17 @@ g_atomic_int_inc (&_data4_->_ref_count_); #line 607 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return _data4_; -#line 3595 "aggregation.c" +#line 3603 "aggregation.c" } static void block4_data_unref (Block4Data* _data4_) { #line 607 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) { +#line 3610 "aggregation.c" + AggregationTests * self; #line 607 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - _g_object_unref0 (_data4_->self); + self = _data4_->self; #line 607 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_data4_->aggregator); #line 607 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -3609,8 +3619,10 @@ #line 607 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_main_loop_unref0 (_data4_->main_loop); #line 607 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" + _g_object_unref0 (self); +#line 607 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_slice_free (Block4Data, _data4_); -#line 3614 "aggregation.c" +#line 3626 "aggregation.c" } } @@ -3645,14 +3657,14 @@ _g_object_unref0 (added); #line 623 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (removed); -#line 3649 "aggregation.c" +#line 3661 "aggregation.c" } static void ___lambda17__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 623 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" __lambda17_ (self, changes); -#line 3656 "aggregation.c" +#line 3668 "aggregation.c" } @@ -3672,14 +3684,14 @@ _tmp1_ = removed; #line 633 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _aggregation_tests_test_user_individuals_changed (self, FALSE, (GeeCollection*) _tmp0_, _tmp1_, &_data4_->user_individual); -#line 3676 "aggregation.c" +#line 3688 "aggregation.c" } static void ___lambda18__folks_individual_aggregator_individuals_changed (FolksIndividualAggregator* _sender, GeeSet* added, GeeSet* removed, const gchar* message, FolksPersona* actor, FolksGroupDetailsChangeReason reason, gpointer self) { #line 631 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" __lambda18_ (self, added, removed, message, actor, reason); -#line 3683 "aggregation.c" +#line 3695 "aggregation.c" } @@ -3697,7 +3709,7 @@ result = FALSE; #line 643 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 3701 "aggregation.c" +#line 3713 "aggregation.c" } @@ -3706,7 +3718,7 @@ result = __lambda19_ (self); #line 640 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 3710 "aggregation.c" +#line 3722 "aggregation.c" } @@ -3717,7 +3729,7 @@ self = _data4_->self; #line 648 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_return_if_fail (r != NULL); -#line 3721 "aggregation.c" +#line 3733 "aggregation.c" { FolksIndividualAggregator* _tmp0_; GAsyncResult* _tmp1_; @@ -3729,7 +3741,7 @@ folks_individual_aggregator_prepare_finish (_tmp0_, _tmp1_, &_inner_error_); #line 652 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_inner_error_ != NULL) { -#line 3733 "aggregation.c" +#line 3745 "aggregation.c" goto __catch3_g_error; } } @@ -3750,7 +3762,7 @@ g_assert_not_reached (); #line 650 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_error_free0 (e1); -#line 3754 "aggregation.c" +#line 3766 "aggregation.c" } __finally3: #line 650 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -3761,7 +3773,7 @@ g_clear_error (&_inner_error_); #line 650 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return; -#line 3765 "aggregation.c" +#line 3777 "aggregation.c" } } @@ -3771,7 +3783,7 @@ __lambda21_ (self, source_object, res); #line 648 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" block4_data_unref (self); -#line 3775 "aggregation.c" +#line 3787 "aggregation.c" } @@ -3789,7 +3801,7 @@ result = FALSE; #line 662 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 3793 "aggregation.c" +#line 3805 "aggregation.c" } @@ -3798,7 +3810,7 @@ result = __lambda20_ (self); #line 646 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 3802 "aggregation.c" +#line 3814 "aggregation.c" } @@ -3954,7 +3966,7 @@ _tmp29_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL); #line 676 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" display_ids = _tmp29_; -#line 3958 "aggregation.c" +#line 3970 "aggregation.c" { FolksIndividual* _tmp30_; GeeSet* _tmp31_; @@ -3973,7 +3985,7 @@ _persona_it = _tmp33_; #line 677 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 3977 "aggregation.c" +#line 3989 "aggregation.c" GeeIterator* _tmp34_; gboolean _tmp35_ = FALSE; GeeIterator* _tmp36_; @@ -3991,7 +4003,7 @@ if (!_tmp35_) { #line 677 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 3995 "aggregation.c" +#line 4007 "aggregation.c" } #line 677 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp36_ = _persona_it; @@ -4011,11 +4023,11 @@ gee_abstract_collection_add ((GeeAbstractCollection*) _tmp38_, _tmp41_); #line 677 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (persona); -#line 4015 "aggregation.c" +#line 4027 "aggregation.c" } #line 677 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_persona_it); -#line 4019 "aggregation.c" +#line 4031 "aggregation.c" } #line 682 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp43_ = display_ids; @@ -4023,7 +4035,7 @@ _tmp44_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp43_, "me@example.com"); #line 682 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp44_) { -#line 4027 "aggregation.c" +#line 4039 "aggregation.c" GeeHashSet* _tmp45_; gboolean _tmp46_ = FALSE; #line 683 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -4032,11 +4044,11 @@ _tmp46_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp45_, "me2@example.com"); #line 683 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp42_ = _tmp46_; -#line 4036 "aggregation.c" +#line 4048 "aggregation.c" } else { #line 682 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp42_ = FALSE; -#line 4040 "aggregation.c" +#line 4052 "aggregation.c" } #line 682 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp47_ = _tmp42_; @@ -4046,7 +4058,7 @@ _tmp48_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL); #line 685 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" display_ids_detailed = _tmp48_; -#line 4050 "aggregation.c" +#line 4062 "aggregation.c" { FolksIndividual* _tmp49_; GeeSet* _tmp50_; @@ -4065,7 +4077,7 @@ _persona_it = _tmp52_; #line 686 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 4069 "aggregation.c" +#line 4081 "aggregation.c" GeeIterator* _tmp53_; gboolean _tmp54_ = FALSE; GeeIterator* _tmp55_; @@ -4083,7 +4095,7 @@ if (!_tmp54_) { #line 686 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 4087 "aggregation.c" +#line 4099 "aggregation.c" } #line 686 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp55_ = _persona_it; @@ -4103,11 +4115,11 @@ gee_abstract_collection_add ((GeeAbstractCollection*) _tmp57_, _tmp60_); #line 686 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (persona); -#line 4107 "aggregation.c" +#line 4119 "aggregation.c" } #line 686 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_persona_it); -#line 4111 "aggregation.c" +#line 4123 "aggregation.c" } #line 691 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp62_ = display_ids_detailed; @@ -4115,7 +4127,7 @@ _tmp63_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp62_, "me@example.com"); #line 691 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp63_) { -#line 4119 "aggregation.c" +#line 4131 "aggregation.c" GeeHashSet* _tmp64_; gboolean _tmp65_ = FALSE; #line 692 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -4124,11 +4136,11 @@ _tmp65_ = gee_abstract_collection_contains ((GeeAbstractCollection*) _tmp64_, "me2@example.com"); #line 692 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp61_ = _tmp65_; -#line 4128 "aggregation.c" +#line 4140 "aggregation.c" } else { #line 691 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp61_ = FALSE; -#line 4132 "aggregation.c" +#line 4144 "aggregation.c" } #line 691 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp66_ = _tmp61_; @@ -4162,7 +4174,7 @@ block4_data_unref (_data4_); #line 607 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _data4_ = NULL; -#line 4166 "aggregation.c" +#line 4178 "aggregation.c" } @@ -4173,9 +4185,7 @@ g_return_if_fail (added != NULL); #line 701 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_return_if_fail (removed != NULL); -#line 701 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - g_return_if_fail (user_individual != NULL); -#line 4179 "aggregation.c" +#line 4189 "aggregation.c" { GeeSet* _tmp0_; GeeIterator* _tmp1_ = NULL; @@ -4188,7 +4198,7 @@ _i_it = _tmp1_; #line 706 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 4192 "aggregation.c" +#line 4202 "aggregation.c" GeeIterator* _tmp2_; gboolean _tmp3_ = FALSE; GeeIterator* _tmp4_; @@ -4209,7 +4219,7 @@ if (!_tmp3_) { #line 706 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 4213 "aggregation.c" +#line 4223 "aggregation.c" } #line 706 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp4_ = _i_it; @@ -4223,14 +4233,14 @@ if (_tmp7_ != NULL) { #line 708 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp6_ = TRUE; -#line 4227 "aggregation.c" +#line 4237 "aggregation.c" } else { gboolean _tmp8_; #line 708 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp8_ = detailed; #line 708 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp6_ = _tmp8_ == TRUE; -#line 4234 "aggregation.c" +#line 4244 "aggregation.c" } #line 708 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp9_ = _tmp6_; @@ -4244,7 +4254,7 @@ _g_object_unref0 (i); #line 711 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" continue; -#line 4248 "aggregation.c" +#line 4258 "aggregation.c" } #line 714 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp11_ = i; @@ -4254,7 +4264,7 @@ _tmp13_ = _tmp12_; #line 714 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp13_) { -#line 4258 "aggregation.c" +#line 4268 "aggregation.c" FolksIndividual* _tmp14_; FolksIndividual* _tmp15_; #line 716 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -4267,15 +4277,15 @@ _g_object_unref0 (*user_individual); #line 717 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" *user_individual = NULL; -#line 4271 "aggregation.c" +#line 4281 "aggregation.c" } #line 706 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (i); -#line 4275 "aggregation.c" +#line 4285 "aggregation.c" } #line 706 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_i_it); -#line 4279 "aggregation.c" +#line 4289 "aggregation.c" } { GeeCollection* _tmp16_; @@ -4289,7 +4299,7 @@ _i_it = _tmp17_; #line 721 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 4293 "aggregation.c" +#line 4303 "aggregation.c" GeeIterator* _tmp18_; gboolean _tmp19_ = FALSE; GeeIterator* _tmp20_; @@ -4310,7 +4320,7 @@ if (!_tmp19_) { #line 721 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 4314 "aggregation.c" +#line 4324 "aggregation.c" } #line 721 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp20_ = _i_it; @@ -4324,14 +4334,14 @@ if (_tmp23_ != NULL) { #line 723 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp22_ = TRUE; -#line 4328 "aggregation.c" +#line 4338 "aggregation.c" } else { gboolean _tmp24_; #line 723 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp24_ = detailed; #line 723 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp22_ = _tmp24_ == TRUE; -#line 4335 "aggregation.c" +#line 4345 "aggregation.c" } #line 723 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp25_ = _tmp22_; @@ -4345,7 +4355,7 @@ _g_object_unref0 (i); #line 726 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" continue; -#line 4349 "aggregation.c" +#line 4359 "aggregation.c" } #line 729 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp27_ = i; @@ -4355,7 +4365,7 @@ _tmp29_ = _tmp28_; #line 729 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp29_) { -#line 4359 "aggregation.c" +#line 4369 "aggregation.c" FolksIndividual* _tmp30_; FolksIndividual* _tmp31_; FolksIndividual* _tmp32_; @@ -4371,15 +4381,15 @@ _g_object_unref0 (*user_individual); #line 732 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" *user_individual = _tmp32_; -#line 4375 "aggregation.c" +#line 4385 "aggregation.c" } #line 721 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (i); -#line 4379 "aggregation.c" +#line 4389 "aggregation.c" } #line 721 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_i_it); -#line 4383 "aggregation.c" +#line 4393 "aggregation.c" } } @@ -4389,22 +4399,26 @@ g_atomic_int_inc (&_data5_->_ref_count_); #line 740 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return _data5_; -#line 4393 "aggregation.c" +#line 4403 "aggregation.c" } static void block5_data_unref (Block5Data* _data5_) { #line 740 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) { +#line 4410 "aggregation.c" + AggregationTests * self; #line 740 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - _g_object_unref0 (_data5_->self); + self = _data5_->self; #line 740 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_data5_->aggregator); #line 740 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_main_loop_unref0 (_data5_->main_loop); #line 740 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" + _g_object_unref0 (self); +#line 740 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_slice_free (Block5Data, _data5_); -#line 4408 "aggregation.c" +#line 4422 "aggregation.c" } } @@ -4436,14 +4450,14 @@ _g_object_unref0 (added); #line 753 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (removed); -#line 4440 "aggregation.c" +#line 4454 "aggregation.c" } static void ___lambda22__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 753 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" __lambda22_ (self, changes); -#line 4447 "aggregation.c" +#line 4461 "aggregation.c" } @@ -4460,14 +4474,14 @@ _tmp1_ = removed; #line 762 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _aggregation_tests_test_untrusted_store_individuals_changed (self, FALSE, (GeeCollection*) _tmp0_, _tmp1_); -#line 4464 "aggregation.c" +#line 4478 "aggregation.c" } static void ___lambda23__folks_individual_aggregator_individuals_changed (FolksIndividualAggregator* _sender, GeeSet* added, GeeSet* removed, const gchar* message, FolksPersona* actor, FolksGroupDetailsChangeReason reason, gpointer self) { #line 760 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" __lambda23_ (self, added, removed, message, actor, reason); -#line 4471 "aggregation.c" +#line 4485 "aggregation.c" } @@ -4482,7 +4496,7 @@ result = FALSE; #line 772 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 4486 "aggregation.c" +#line 4500 "aggregation.c" } @@ -4491,7 +4505,7 @@ result = __lambda24_ (self); #line 769 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 4495 "aggregation.c" +#line 4509 "aggregation.c" } @@ -4502,7 +4516,7 @@ self = _data5_->self; #line 777 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_return_if_fail (r != NULL); -#line 4506 "aggregation.c" +#line 4520 "aggregation.c" { FolksIndividualAggregator* _tmp0_; GAsyncResult* _tmp1_; @@ -4514,7 +4528,7 @@ folks_individual_aggregator_prepare_finish (_tmp0_, _tmp1_, &_inner_error_); #line 781 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_inner_error_ != NULL) { -#line 4518 "aggregation.c" +#line 4532 "aggregation.c" goto __catch4_g_error; } } @@ -4535,7 +4549,7 @@ g_assert_not_reached (); #line 779 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_error_free0 (e1); -#line 4539 "aggregation.c" +#line 4553 "aggregation.c" } __finally4: #line 779 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -4546,7 +4560,7 @@ g_clear_error (&_inner_error_); #line 779 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return; -#line 4550 "aggregation.c" +#line 4564 "aggregation.c" } } @@ -4556,7 +4570,7 @@ __lambda26_ (self, source_object, res); #line 777 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" block5_data_unref (self); -#line 4560 "aggregation.c" +#line 4574 "aggregation.c" } @@ -4574,7 +4588,7 @@ result = FALSE; #line 791 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 4578 "aggregation.c" +#line 4592 "aggregation.c" } @@ -4583,7 +4597,7 @@ result = __lambda25_ (self); #line 775 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 4587 "aggregation.c" +#line 4601 "aggregation.c" } @@ -4672,7 +4686,7 @@ block5_data_unref (_data5_); #line 740 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _data5_ = NULL; -#line 4676 "aggregation.c" +#line 4690 "aggregation.c" } @@ -4683,7 +4697,7 @@ g_return_if_fail (added != NULL); #line 803 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_return_if_fail (removed != NULL); -#line 4687 "aggregation.c" +#line 4701 "aggregation.c" { GeeSet* _tmp0_; GeeIterator* _tmp1_ = NULL; @@ -4696,7 +4710,7 @@ _i_it = _tmp1_; #line 808 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 4700 "aggregation.c" +#line 4714 "aggregation.c" GeeIterator* _tmp2_; gboolean _tmp3_ = FALSE; GeeIterator* _tmp4_; @@ -4719,7 +4733,7 @@ if (!_tmp3_) { #line 808 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 4723 "aggregation.c" +#line 4737 "aggregation.c" } #line 808 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp4_ = _i_it; @@ -4733,14 +4747,14 @@ if (_tmp7_ != NULL) { #line 810 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp6_ = TRUE; -#line 4737 "aggregation.c" +#line 4751 "aggregation.c" } else { gboolean _tmp8_; #line 810 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp8_ = detailed; #line 810 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp6_ = _tmp8_ == TRUE; -#line 4744 "aggregation.c" +#line 4758 "aggregation.c" } #line 810 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp9_ = _tmp6_; @@ -4754,7 +4768,7 @@ _g_object_unref0 (i); #line 813 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" continue; -#line 4758 "aggregation.c" +#line 4772 "aggregation.c" } #line 816 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp12_ = i; @@ -4766,7 +4780,7 @@ if (_tmp14_) { #line 816 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp11_ = TRUE; -#line 4770 "aggregation.c" +#line 4784 "aggregation.c" } else { FolksIndividual* _tmp15_; GeeSet* _tmp16_; @@ -4785,7 +4799,7 @@ _tmp19_ = _tmp18_; #line 816 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp11_ = _tmp19_ == 1; -#line 4789 "aggregation.c" +#line 4803 "aggregation.c" } #line 816 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp20_ = _tmp11_; @@ -4793,11 +4807,11 @@ g_assert (_tmp20_); #line 808 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (i); -#line 4797 "aggregation.c" +#line 4811 "aggregation.c" } #line 808 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_i_it); -#line 4801 "aggregation.c" +#line 4815 "aggregation.c" } { GeeCollection* _tmp21_; @@ -4811,7 +4825,7 @@ _i_it = _tmp22_; #line 819 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 4815 "aggregation.c" +#line 4829 "aggregation.c" GeeIterator* _tmp23_; gboolean _tmp24_ = FALSE; GeeIterator* _tmp25_; @@ -4834,7 +4848,7 @@ if (!_tmp24_) { #line 819 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 4838 "aggregation.c" +#line 4852 "aggregation.c" } #line 819 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp25_ = _i_it; @@ -4848,14 +4862,14 @@ if (_tmp28_ != NULL) { #line 821 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp27_ = TRUE; -#line 4852 "aggregation.c" +#line 4866 "aggregation.c" } else { gboolean _tmp29_; #line 821 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp29_ = detailed; #line 821 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp27_ = _tmp29_ == TRUE; -#line 4859 "aggregation.c" +#line 4873 "aggregation.c" } #line 821 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp30_ = _tmp27_; @@ -4869,7 +4883,7 @@ _g_object_unref0 (i); #line 824 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" continue; -#line 4873 "aggregation.c" +#line 4887 "aggregation.c" } #line 827 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp33_ = i; @@ -4881,7 +4895,7 @@ if (_tmp35_) { #line 827 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp32_ = TRUE; -#line 4885 "aggregation.c" +#line 4899 "aggregation.c" } else { FolksIndividual* _tmp36_; GeeSet* _tmp37_; @@ -4900,7 +4914,7 @@ _tmp40_ = _tmp39_; #line 827 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp32_ = _tmp40_ == 1; -#line 4904 "aggregation.c" +#line 4918 "aggregation.c" } #line 827 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp41_ = _tmp32_; @@ -4908,11 +4922,11 @@ g_assert (_tmp41_); #line 819 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (i); -#line 4912 "aggregation.c" +#line 4926 "aggregation.c" } #line 819 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_i_it); -#line 4916 "aggregation.c" +#line 4930 "aggregation.c" } } @@ -4922,15 +4936,17 @@ g_atomic_int_inc (&_data6_->_ref_count_); #line 845 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return _data6_; -#line 4926 "aggregation.c" +#line 4940 "aggregation.c" } static void block6_data_unref (Block6Data* _data6_) { #line 845 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) { +#line 4947 "aggregation.c" + AggregationTests * self; #line 845 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - _g_object_unref0 (_data6_->self); + self = _data6_->self; #line 845 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_data6_->aggregator); #line 845 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -4938,8 +4954,10 @@ #line 845 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_main_loop_unref0 (_data6_->main_loop); #line 845 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" + _g_object_unref0 (self); +#line 845 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_slice_free (Block6Data, _data6_); -#line 4943 "aggregation.c" +#line 4961 "aggregation.c" } } @@ -5008,7 +5026,7 @@ if (_tmp13_ == AGGREGATION_TESTS_INDIVIDUAL_STATE_REMOVED) { #line 909 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp12_ = TRUE; -#line 5012 "aggregation.c" +#line 5030 "aggregation.c" } else { gboolean _tmp14_ = FALSE; gboolean _tmp15_; @@ -5017,23 +5035,23 @@ _tmp15_ = _data6_->aggregator_is_finalising; #line 910 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp15_ == TRUE) { -#line 5021 "aggregation.c" +#line 5039 "aggregation.c" AggregationTestsIndividualState _tmp16_; #line 911 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp16_ = state; #line 911 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp14_ = _tmp16_ == AGGREGATION_TESTS_INDIVIDUAL_STATE_ADDED; -#line 5027 "aggregation.c" +#line 5045 "aggregation.c" } else { #line 910 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp14_ = FALSE; -#line 5031 "aggregation.c" +#line 5049 "aggregation.c" } #line 910 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp17_ = _tmp14_; #line 910 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp12_ = _tmp17_; -#line 5037 "aggregation.c" +#line 5055 "aggregation.c" } #line 909 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp18_ = _tmp12_; @@ -5047,14 +5065,14 @@ gee_abstract_map_set ((GeeAbstractMap*) _tmp19_, _tmp20_, GINT_TO_POINTER (AGGREGATION_TESTS_INDIVIDUAL_STATE_FINALISED)); #line 902 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_free0 (weak_key); -#line 5051 "aggregation.c" +#line 5069 "aggregation.c" } static void _____lambda28__gweak_notify (gpointer self, GObject* object) { #line 902 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" ____lambda28_ (self, object); -#line 5058 "aggregation.c" +#line 5076 "aggregation.c" } @@ -5066,7 +5084,7 @@ g_return_if_fail (added != NULL); #line 877 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_return_if_fail (removed != NULL); -#line 5070 "aggregation.c" +#line 5088 "aggregation.c" { GeeSet* _tmp0_; GeeIterator* _tmp1_ = NULL; @@ -5079,7 +5097,7 @@ _i_it = _tmp1_; #line 879 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 5083 "aggregation.c" +#line 5101 "aggregation.c" GeeIterator* _tmp2_; gboolean _tmp3_ = FALSE; GeeIterator* _tmp4_; @@ -5107,7 +5125,7 @@ if (!_tmp3_) { #line 879 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 5111 "aggregation.c" +#line 5129 "aggregation.c" } #line 879 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp4_ = _i_it; @@ -5153,11 +5171,11 @@ _g_free0 (key); #line 879 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (i); -#line 5157 "aggregation.c" +#line 5175 "aggregation.c" } #line 879 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_i_it); -#line 5161 "aggregation.c" +#line 5179 "aggregation.c" } { GeeSet* _tmp19_; @@ -5171,7 +5189,7 @@ _i_it = _tmp20_; #line 889 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 5175 "aggregation.c" +#line 5193 "aggregation.c" GeeIterator* _tmp21_; gboolean _tmp22_ = FALSE; GeeIterator* _tmp23_; @@ -5197,7 +5215,7 @@ if (!_tmp22_) { #line 889 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 5201 "aggregation.c" +#line 5219 "aggregation.c" } #line 889 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp23_ = _i_it; @@ -5239,11 +5257,11 @@ _g_free0 (key); #line 889 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (i); -#line 5243 "aggregation.c" +#line 5261 "aggregation.c" } #line 889 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_i_it); -#line 5247 "aggregation.c" +#line 5265 "aggregation.c" } } @@ -5251,7 +5269,7 @@ static void ___lambda27__folks_individual_aggregator_individuals_changed (FolksIndividualAggregator* _sender, GeeSet* added, GeeSet* removed, const gchar* message, FolksPersona* actor, FolksGroupDetailsChangeReason reason, gpointer self) { #line 877 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" __lambda27_ (self, added, removed, message, actor, reason); -#line 5255 "aggregation.c" +#line 5273 "aggregation.c" } @@ -5269,7 +5287,7 @@ result = FALSE; #line 923 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 5273 "aggregation.c" +#line 5291 "aggregation.c" } @@ -5278,7 +5296,7 @@ result = __lambda29_ (self); #line 920 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 5282 "aggregation.c" +#line 5300 "aggregation.c" } @@ -5289,7 +5307,7 @@ self = _data6_->self; #line 928 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_return_if_fail (r != NULL); -#line 5293 "aggregation.c" +#line 5311 "aggregation.c" { FolksIndividualAggregator* _tmp0_; GAsyncResult* _tmp1_; @@ -5301,7 +5319,7 @@ folks_individual_aggregator_prepare_finish (_tmp0_, _tmp1_, &_inner_error_); #line 932 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_inner_error_ != NULL) { -#line 5305 "aggregation.c" +#line 5323 "aggregation.c" goto __catch5_g_error; } } @@ -5322,7 +5340,7 @@ g_assert_not_reached (); #line 930 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_error_free0 (e1); -#line 5326 "aggregation.c" +#line 5344 "aggregation.c" } __finally5: #line 930 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -5333,7 +5351,7 @@ g_clear_error (&_inner_error_); #line 930 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return; -#line 5337 "aggregation.c" +#line 5355 "aggregation.c" } } @@ -5343,7 +5361,7 @@ __lambda31_ (self, source_object, res); #line 928 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" block6_data_unref (self); -#line 5347 "aggregation.c" +#line 5365 "aggregation.c" } @@ -5361,7 +5379,7 @@ result = FALSE; #line 942 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 5365 "aggregation.c" +#line 5383 "aggregation.c" } @@ -5370,7 +5388,7 @@ result = __lambda30_ (self); #line 926 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 5374 "aggregation.c" +#line 5392 "aggregation.c" } @@ -5388,7 +5406,7 @@ result = FALSE; #line 968 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 5392 "aggregation.c" +#line 5410 "aggregation.c" } @@ -5397,7 +5415,7 @@ result = __lambda32_ (self); #line 965 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 5401 "aggregation.c" +#line 5419 "aggregation.c" } @@ -5477,7 +5495,7 @@ iter = _tmp10_; #line 950 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 5481 "aggregation.c" +#line 5499 "aggregation.c" GeeMapIterator* _tmp11_; gboolean _tmp12_ = FALSE; GeeMapIterator* _tmp13_; @@ -5494,7 +5512,7 @@ if (!(_tmp12_ == TRUE)) { #line 950 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 5498 "aggregation.c" +#line 5516 "aggregation.c" } #line 952 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp13_ = iter; @@ -5508,20 +5526,20 @@ if (_tmp16_ == AGGREGATION_TESTS_INDIVIDUAL_STATE_ADDED) { #line 953 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp15_ = TRUE; -#line 5512 "aggregation.c" +#line 5530 "aggregation.c" } else { AggregationTestsIndividualState _tmp17_; #line 954 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp17_ = state; #line 954 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp15_ = _tmp17_ == AGGREGATION_TESTS_INDIVIDUAL_STATE_FINALISED; -#line 5519 "aggregation.c" +#line 5537 "aggregation.c" } #line 953 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp18_ = _tmp15_; #line 953 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_assert (_tmp18_); -#line 5525 "aggregation.c" +#line 5543 "aggregation.c" } #line 958 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp19_ = self->priv->_tp_backend; @@ -5557,7 +5575,7 @@ iter = _tmp25_; #line 976 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 5561 "aggregation.c" +#line 5579 "aggregation.c" GeeMapIterator* _tmp26_; gboolean _tmp27_ = FALSE; GeeMapIterator* _tmp28_; @@ -5570,7 +5588,7 @@ if (!(_tmp27_ == TRUE)) { #line 976 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 5574 "aggregation.c" +#line 5592 "aggregation.c" } #line 978 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp28_ = iter; @@ -5578,7 +5596,7 @@ _tmp29_ = gee_map_iterator_get_value (_tmp28_); #line 978 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_assert (GPOINTER_TO_INT (_tmp29_) == AGGREGATION_TESTS_INDIVIDUAL_STATE_FINALISED); -#line 5582 "aggregation.c" +#line 5600 "aggregation.c" } #line 845 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (iter); @@ -5586,7 +5604,7 @@ block6_data_unref (_data6_); #line 845 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _data6_ = NULL; -#line 5590 "aggregation.c" +#line 5608 "aggregation.c" } @@ -5595,15 +5613,17 @@ g_atomic_int_inc (&_data7_->_ref_count_); #line 988 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return _data7_; -#line 5599 "aggregation.c" +#line 5617 "aggregation.c" } static void block7_data_unref (Block7Data* _data7_) { #line 988 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) { +#line 5624 "aggregation.c" + AggregationTests * self; #line 988 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - _g_object_unref0 (_data7_->self); + self = _data7_->self; #line 988 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_data7_->writeable_persona); #line 988 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -5613,8 +5633,10 @@ #line 988 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_main_loop_unref0 (_data7_->main_loop); #line 988 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" + _g_object_unref0 (self); +#line 988 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_slice_free (Block7Data, _data7_); -#line 5618 "aggregation.c" +#line 5640 "aggregation.c" } } @@ -5636,7 +5658,7 @@ _tmp2_ = _tmp1_; #line 1001 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_assert (_tmp2_ == 1); -#line 5640 "aggregation.c" +#line 5662 "aggregation.c" { GeeMultiMap* _tmp3_; GeeSet* _tmp4_ = NULL; @@ -5660,7 +5682,7 @@ _removed_it = _tmp7_; #line 1003 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 5664 "aggregation.c" +#line 5686 "aggregation.c" GeeIterator* _tmp8_; gboolean _tmp9_ = FALSE; GeeIterator* _tmp10_; @@ -5675,7 +5697,7 @@ if (!_tmp9_) { #line 1003 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 5679 "aggregation.c" +#line 5701 "aggregation.c" } #line 1003 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp10_ = _removed_it; @@ -5687,7 +5709,7 @@ _tmp12_ = removed; #line 1005 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_assert (_tmp12_ == NULL); -#line 5691 "aggregation.c" +#line 5713 "aggregation.c" { GeeMultiMap* _tmp13_; FolksIndividual* _tmp14_; @@ -5714,7 +5736,7 @@ _i_it = _tmp18_; #line 1007 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 5718 "aggregation.c" +#line 5740 "aggregation.c" GeeIterator* _tmp19_; gboolean _tmp20_ = FALSE; GeeIterator* _tmp21_; @@ -5731,7 +5753,7 @@ if (!_tmp20_) { #line 1007 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 5735 "aggregation.c" +#line 5757 "aggregation.c" } #line 1007 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp21_ = _i_it; @@ -5757,19 +5779,19 @@ g_main_loop_quit (_data7_->main_loop); #line 1007 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (i); -#line 5761 "aggregation.c" +#line 5783 "aggregation.c" } #line 1007 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_i_it); -#line 5765 "aggregation.c" +#line 5787 "aggregation.c" } #line 1003 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (removed); -#line 5769 "aggregation.c" +#line 5791 "aggregation.c" } #line 1003 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_removed_it); -#line 5773 "aggregation.c" +#line 5795 "aggregation.c" } } @@ -5777,7 +5799,7 @@ static void ___lambda33__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 999 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" __lambda33_ (self, changes); -#line 5781 "aggregation.c" +#line 5803 "aggregation.c" } @@ -5792,7 +5814,7 @@ result = FALSE; #line 1022 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 5796 "aggregation.c" +#line 5818 "aggregation.c" } @@ -5801,7 +5823,7 @@ result = __lambda34_ (self); #line 1019 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 5805 "aggregation.c" +#line 5827 "aggregation.c" } @@ -5812,7 +5834,7 @@ self = _data7_->self; #line 1027 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_return_if_fail (r != NULL); -#line 5816 "aggregation.c" +#line 5838 "aggregation.c" { FolksIndividualAggregator* _tmp0_; GAsyncResult* _tmp1_; @@ -5824,7 +5846,7 @@ folks_individual_aggregator_prepare_finish (_tmp0_, _tmp1_, &_inner_error_); #line 1031 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_inner_error_ != NULL) { -#line 5828 "aggregation.c" +#line 5850 "aggregation.c" goto __catch6_g_error; } } @@ -5845,7 +5867,7 @@ g_assert_not_reached (); #line 1029 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_error_free0 (e1); -#line 5849 "aggregation.c" +#line 5871 "aggregation.c" } __finally6: #line 1029 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -5856,7 +5878,7 @@ g_clear_error (&_inner_error_); #line 1029 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return; -#line 5860 "aggregation.c" +#line 5882 "aggregation.c" } } @@ -5866,7 +5888,7 @@ __lambda36_ (self, source_object, res); #line 1027 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" block7_data_unref (self); -#line 5870 "aggregation.c" +#line 5892 "aggregation.c" } @@ -5884,7 +5906,7 @@ result = FALSE; #line 1041 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 5888 "aggregation.c" +#line 5910 "aggregation.c" } @@ -5893,7 +5915,7 @@ result = __lambda35_ (self); #line 1025 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 5897 "aggregation.c" +#line 5919 "aggregation.c" } @@ -5905,12 +5927,12 @@ if (g_strcmp0 (stack[i], needle) == 0) { #line 1058 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return TRUE; -#line 5909 "aggregation.c" +#line 5931 "aggregation.c" } } #line 1058 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return FALSE; -#line 5914 "aggregation.c" +#line 5936 "aggregation.c" } @@ -5925,7 +5947,7 @@ result = FALSE; #line 1066 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 5929 "aggregation.c" +#line 5951 "aggregation.c" } @@ -5934,7 +5956,7 @@ result = __lambda37_ (self); #line 1063 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 5938 "aggregation.c" +#line 5960 "aggregation.c" } @@ -5945,7 +5967,7 @@ self = _data7_->self; #line 1072 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_return_if_fail (res != NULL); -#line 5949 "aggregation.c" +#line 5971 "aggregation.c" { FolksIndividualAggregator* _tmp0_; GAsyncResult* _tmp1_; @@ -5961,7 +5983,7 @@ _tmp3_ = _tmp2_; #line 1077 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_inner_error_ != NULL) { -#line 5965 "aggregation.c" +#line 5987 "aggregation.c" goto __catch7_g_error; } #line 1076 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -5970,7 +5992,7 @@ _data7_->writeable_persona = _tmp3_; #line 1079 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_main_loop_quit (_data7_->main_loop); -#line 5974 "aggregation.c" +#line 5996 "aggregation.c" } goto __finally7; __catch7_g_error: @@ -5989,7 +6011,7 @@ g_assert_not_reached (); #line 1074 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_error_free0 (e1); -#line 5993 "aggregation.c" +#line 6015 "aggregation.c" } __finally7: #line 1074 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -6000,7 +6022,7 @@ g_clear_error (&_inner_error_); #line 1074 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return; -#line 6004 "aggregation.c" +#line 6026 "aggregation.c" } } @@ -6010,7 +6032,7 @@ __lambda39_ (self, source_object, res); #line 1071 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" block7_data_unref (self); -#line 6014 "aggregation.c" +#line 6036 "aggregation.c" } @@ -6028,7 +6050,7 @@ result = FALSE; #line 1089 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 6032 "aggregation.c" +#line 6054 "aggregation.c" } @@ -6037,7 +6059,7 @@ result = __lambda38_ (self); #line 1069 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 6041 "aggregation.c" +#line 6063 "aggregation.c" } @@ -6096,7 +6118,7 @@ g_assert (_data7_->individual != NULL); #line 1049 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" persona = NULL; -#line 6100 "aggregation.c" +#line 6122 "aggregation.c" { GeeSet* _tmp5_; GeeSet* _tmp6_; @@ -6112,7 +6134,7 @@ _p_it = _tmp7_; #line 1050 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 6116 "aggregation.c" +#line 6138 "aggregation.c" gboolean _tmp8_ = FALSE; gpointer _tmp9_ = NULL; FolksPersona* p; @@ -6124,7 +6146,7 @@ if (!_tmp8_) { #line 1050 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 6128 "aggregation.c" +#line 6150 "aggregation.c" } #line 1050 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp9_ = gee_iterator_get (_p_it); @@ -6142,11 +6164,11 @@ _g_object_unref0 (p); #line 1053 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 6146 "aggregation.c" +#line 6168 "aggregation.c" } #line 1050 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_p_it); -#line 6150 "aggregation.c" +#line 6172 "aggregation.c" } #line 1057 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp12_ = persona; @@ -6192,7 +6214,7 @@ block7_data_unref (_data7_); #line 988 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _data7_ = NULL; -#line 6196 "aggregation.c" +#line 6218 "aggregation.c" } @@ -6201,15 +6223,17 @@ g_atomic_int_inc (&_data8_->_ref_count_); #line 1112 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return _data8_; -#line 6205 "aggregation.c" +#line 6227 "aggregation.c" } static void block8_data_unref (Block8Data* _data8_) { #line 1112 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) { +#line 6234 "aggregation.c" + AggregationTests * self; #line 1112 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - _g_object_unref0 (_data8_->self); + self = _data8_->self; #line 1112 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_data8_->writeable_persona); #line 1112 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -6219,8 +6243,10 @@ #line 1112 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_main_loop_unref0 (_data8_->main_loop); #line 1112 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" + _g_object_unref0 (self); +#line 1112 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_slice_free (Block8Data, _data8_); -#line 6224 "aggregation.c" +#line 6250 "aggregation.c" } } @@ -6252,7 +6278,7 @@ _tmp3_ = gee_multi_map_get_keys (_tmp2_); #line 1128 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" removed = _tmp3_; -#line 6256 "aggregation.c" +#line 6282 "aggregation.c" { GeeCollection* _tmp4_; GeeIterator* _tmp5_ = NULL; @@ -6265,7 +6291,7 @@ _i_it = _tmp5_; #line 1130 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 6269 "aggregation.c" +#line 6295 "aggregation.c" GeeIterator* _tmp6_; gboolean _tmp7_ = FALSE; GeeIterator* _tmp8_; @@ -6283,7 +6309,7 @@ if (!_tmp7_) { #line 1130 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 6287 "aggregation.c" +#line 6313 "aggregation.c" } #line 1130 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp8_ = _i_it; @@ -6303,7 +6329,7 @@ _tmp13_ = _tmp12_; #line 1135 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (g_strcmp0 (_tmp13_, "0e46c5e74f61908f49550d241f2a1651892a1695") == 0) { -#line 6307 "aggregation.c" +#line 6333 "aggregation.c" FolksIndividual* _tmp14_; FolksIndividual* _tmp15_; FolksIndividual* _tmp16_; @@ -6329,15 +6355,15 @@ _g_object_unref0 (added); #line 1139 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return; -#line 6333 "aggregation.c" +#line 6359 "aggregation.c" } #line 1130 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (i); -#line 6337 "aggregation.c" +#line 6363 "aggregation.c" } #line 1130 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_i_it); -#line 6341 "aggregation.c" +#line 6367 "aggregation.c" } #line 1143 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp17_ = removed; @@ -6347,7 +6373,7 @@ _tmp19_ = _tmp18_; #line 1143 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_assert (_tmp19_ == 1); -#line 6351 "aggregation.c" +#line 6377 "aggregation.c" { GeeSet* _tmp20_; GeeIterator* _tmp21_ = NULL; @@ -6360,7 +6386,7 @@ _i_it = _tmp21_; #line 1145 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 6364 "aggregation.c" +#line 6390 "aggregation.c" GeeIterator* _tmp22_; gboolean _tmp23_ = FALSE; GeeIterator* _tmp24_; @@ -6375,7 +6401,7 @@ if (!_tmp23_) { #line 1145 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 6379 "aggregation.c" +#line 6405 "aggregation.c" } #line 1145 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp24_ = _i_it; @@ -6389,24 +6415,24 @@ g_assert (_tmp26_ == NULL); #line 1145 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (i); -#line 6393 "aggregation.c" +#line 6419 "aggregation.c" } #line 1145 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_i_it); -#line 6397 "aggregation.c" +#line 6423 "aggregation.c" } #line 1125 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (removed); #line 1125 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (added); -#line 6403 "aggregation.c" +#line 6429 "aggregation.c" } static void ___lambda40__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 1124 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" __lambda40_ (self, changes); -#line 6410 "aggregation.c" +#line 6436 "aggregation.c" } @@ -6421,7 +6447,7 @@ result = FALSE; #line 1155 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 6425 "aggregation.c" +#line 6451 "aggregation.c" } @@ -6430,7 +6456,7 @@ result = __lambda41_ (self); #line 1152 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 6434 "aggregation.c" +#line 6460 "aggregation.c" } @@ -6441,7 +6467,7 @@ self = _data8_->self; #line 1160 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_return_if_fail (r != NULL); -#line 6445 "aggregation.c" +#line 6471 "aggregation.c" { FolksIndividualAggregator* _tmp0_; GAsyncResult* _tmp1_; @@ -6453,7 +6479,7 @@ folks_individual_aggregator_prepare_finish (_tmp0_, _tmp1_, &_inner_error_); #line 1164 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_inner_error_ != NULL) { -#line 6457 "aggregation.c" +#line 6483 "aggregation.c" goto __catch8_g_error; } } @@ -6474,7 +6500,7 @@ g_assert_not_reached (); #line 1162 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_error_free0 (e1); -#line 6478 "aggregation.c" +#line 6504 "aggregation.c" } __finally8: #line 1162 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -6485,7 +6511,7 @@ g_clear_error (&_inner_error_); #line 1162 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return; -#line 6489 "aggregation.c" +#line 6515 "aggregation.c" } } @@ -6495,7 +6521,7 @@ __lambda43_ (self, source_object, res); #line 1160 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" block8_data_unref (self); -#line 6499 "aggregation.c" +#line 6525 "aggregation.c" } @@ -6513,7 +6539,7 @@ result = FALSE; #line 1174 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 6517 "aggregation.c" +#line 6543 "aggregation.c" } @@ -6522,7 +6548,7 @@ result = __lambda42_ (self); #line 1158 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 6526 "aggregation.c" +#line 6552 "aggregation.c" } @@ -6550,7 +6576,7 @@ _tmp3_ = gee_multi_map_get_keys (_tmp2_); #line 1201 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" removed = _tmp3_; -#line 6554 "aggregation.c" +#line 6580 "aggregation.c" { GeeSet* _tmp4_; GeeIterator* _tmp5_ = NULL; @@ -6563,7 +6589,7 @@ _i_it = _tmp5_; #line 1203 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 6567 "aggregation.c" +#line 6593 "aggregation.c" GeeIterator* _tmp6_; gboolean _tmp7_ = FALSE; GeeIterator* _tmp8_; @@ -6581,7 +6607,7 @@ if (!_tmp7_) { #line 1203 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 6585 "aggregation.c" +#line 6611 "aggregation.c" } #line 1203 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp8_ = _i_it; @@ -6597,7 +6623,7 @@ _g_object_unref0 (i); #line 1207 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" continue; -#line 6601 "aggregation.c" +#line 6627 "aggregation.c" } #line 1210 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp11_ = _data8_->individual; @@ -6615,11 +6641,11 @@ _data8_->individual = NULL; #line 1203 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (i); -#line 6619 "aggregation.c" +#line 6645 "aggregation.c" } #line 1203 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_i_it); -#line 6623 "aggregation.c" +#line 6649 "aggregation.c" } { GeeCollection* _tmp14_; @@ -6633,7 +6659,7 @@ _i_it = _tmp15_; #line 1215 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 6637 "aggregation.c" +#line 6663 "aggregation.c" GeeIterator* _tmp16_; gboolean _tmp17_ = FALSE; GeeIterator* _tmp18_; @@ -6653,7 +6679,7 @@ if (!_tmp17_) { #line 1215 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 6657 "aggregation.c" +#line 6683 "aggregation.c" } #line 1215 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp18_ = _i_it; @@ -6669,13 +6695,13 @@ _g_object_unref0 (i); #line 1219 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" continue; -#line 6673 "aggregation.c" +#line 6699 "aggregation.c" } #line 1222 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" got_tpf = FALSE; #line 1223 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" got_kf = FALSE; -#line 6679 "aggregation.c" +#line 6705 "aggregation.c" { FolksIndividual* _tmp21_; GeeSet* _tmp22_; @@ -6694,7 +6720,7 @@ _p_it = _tmp24_; #line 1228 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 6698 "aggregation.c" +#line 6724 "aggregation.c" GeeIterator* _tmp25_; gboolean _tmp26_ = FALSE; GeeIterator* _tmp27_; @@ -6711,7 +6737,7 @@ if (!_tmp26_) { #line 1228 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 6715 "aggregation.c" +#line 6741 "aggregation.c" } #line 1228 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp27_ = _p_it; @@ -6730,7 +6756,7 @@ "er@example.com") == 0) { #line 1232 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" got_tpf = TRUE; -#line 6733 "aggregation.c" +#line 6759 "aggregation.c" } else { FolksPersona* _tmp32_; FolksPersonaStore* _tmp33_; @@ -6751,38 +6777,38 @@ if (g_strcmp0 (_tmp36_, "key-file") == 0) { #line 1236 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" got_kf = TRUE; -#line 6754 "aggregation.c" +#line 6780 "aggregation.c" } } #line 1228 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (p); -#line 6759 "aggregation.c" +#line 6785 "aggregation.c" } #line 1228 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_p_it); -#line 6763 "aggregation.c" +#line 6789 "aggregation.c" } #line 1240 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp38_ = got_tpf; #line 1240 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp38_ == TRUE) { -#line 6769 "aggregation.c" +#line 6795 "aggregation.c" gboolean _tmp39_; #line 1240 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp39_ = got_kf; #line 1240 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp37_ = _tmp39_ == TRUE; -#line 6775 "aggregation.c" +#line 6801 "aggregation.c" } else { #line 1240 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp37_ = FALSE; -#line 6779 "aggregation.c" +#line 6805 "aggregation.c" } #line 1240 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp40_ = _tmp37_; #line 1240 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_tmp40_) { -#line 6785 "aggregation.c" +#line 6811 "aggregation.c" FolksIndividual* _tmp41_; FolksIndividual* _tmp42_; #line 1242 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -6803,28 +6829,28 @@ _g_object_unref0 (added); #line 1243 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return; -#line 6806 "aggregation.c" +#line 6832 "aggregation.c" } #line 1215 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (i); -#line 6810 "aggregation.c" +#line 6836 "aggregation.c" } #line 1215 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_i_it); -#line 6814 "aggregation.c" +#line 6840 "aggregation.c" } #line 1198 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (removed); #line 1198 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (added); -#line 6820 "aggregation.c" +#line 6846 "aggregation.c" } static void ___lambda44__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 1198 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" __lambda44_ (self, changes); -#line 6827 "aggregation.c" +#line 6853 "aggregation.c" } @@ -6839,7 +6865,7 @@ result = FALSE; #line 1252 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 6842 "aggregation.c" +#line 6868 "aggregation.c" } @@ -6848,7 +6874,7 @@ result = __lambda45_ (self); #line 1249 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 6851 "aggregation.c" +#line 6877 "aggregation.c" } @@ -6859,7 +6885,7 @@ self = _data8_->self; #line 1258 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_return_if_fail (res != NULL); -#line 6862 "aggregation.c" +#line 6888 "aggregation.c" { FolksIndividualAggregator* _tmp0_; GAsyncResult* _tmp1_; @@ -6875,7 +6901,7 @@ _tmp3_ = _tmp2_; #line 1263 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_inner_error_ != NULL) { -#line 6878 "aggregation.c" +#line 6904 "aggregation.c" goto __catch9_g_error; } #line 1262 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -6884,7 +6910,7 @@ _data8_->writeable_persona = _tmp3_; #line 1265 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_main_loop_quit (_data8_->main_loop); -#line 6887 "aggregation.c" +#line 6913 "aggregation.c" } goto __finally9; __catch9_g_error: @@ -6903,7 +6929,7 @@ g_assert_not_reached (); #line 1260 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_error_free0 (e1); -#line 6906 "aggregation.c" +#line 6932 "aggregation.c" } __finally9: #line 1260 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -6914,7 +6940,7 @@ g_clear_error (&_inner_error_); #line 1260 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return; -#line 6917 "aggregation.c" +#line 6943 "aggregation.c" } } @@ -6924,7 +6950,7 @@ __lambda47_ (self, source_object, res); #line 1257 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" block8_data_unref (self); -#line 6927 "aggregation.c" +#line 6953 "aggregation.c" } @@ -6945,7 +6971,7 @@ result = FALSE; #line 1275 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 6948 "aggregation.c" +#line 6974 "aggregation.c" } @@ -6954,7 +6980,7 @@ result = __lambda46_ (self); #line 1255 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 6957 "aggregation.c" +#line 6983 "aggregation.c" } @@ -7038,7 +7064,7 @@ g_assert (_tmp9_ != NULL); #line 1182 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" persona = NULL; -#line 7041 "aggregation.c" +#line 7067 "aggregation.c" { FolksIndividual* _tmp10_; GeeSet* _tmp11_; @@ -7057,7 +7083,7 @@ _p_it = _tmp13_; #line 1183 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 7060 "aggregation.c" +#line 7086 "aggregation.c" gboolean _tmp14_ = FALSE; gpointer _tmp15_ = NULL; FolksPersona* p; @@ -7069,7 +7095,7 @@ if (!_tmp14_) { #line 1183 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 7072 "aggregation.c" +#line 7098 "aggregation.c" } #line 1183 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp15_ = gee_iterator_get (_p_it); @@ -7087,11 +7113,11 @@ _g_object_unref0 (p); #line 1186 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 7090 "aggregation.c" +#line 7116 "aggregation.c" } #line 1183 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_p_it); -#line 7094 "aggregation.c" +#line 7120 "aggregation.c" } #line 1190 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp18_ = persona; @@ -7167,7 +7193,7 @@ block8_data_unref (_data8_); #line 1112 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _data8_ = NULL; -#line 7170 "aggregation.c" +#line 7196 "aggregation.c" } @@ -7176,15 +7202,17 @@ g_atomic_int_inc (&_data9_->_ref_count_); #line 1301 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return _data9_; -#line 7179 "aggregation.c" +#line 7205 "aggregation.c" } static void block9_data_unref (Block9Data* _data9_) { #line 1301 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) { +#line 7212 "aggregation.c" + AggregationTests * self; #line 1301 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" - _g_object_unref0 (_data9_->self); + self = _data9_->self; #line 1301 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_data9_->writeable_persona); #line 1301 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -7194,8 +7222,10 @@ #line 1301 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_main_loop_unref0 (_data9_->main_loop); #line 1301 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" + _g_object_unref0 (self); +#line 1301 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_slice_free (Block9Data, _data9_); -#line 7198 "aggregation.c" +#line 7228 "aggregation.c" } } @@ -7217,7 +7247,7 @@ _tmp2_ = _tmp1_; #line 1314 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_assert (_tmp2_ == 1); -#line 7220 "aggregation.c" +#line 7250 "aggregation.c" { GeeMultiMap* _tmp3_; GeeSet* _tmp4_ = NULL; @@ -7241,7 +7271,7 @@ _removed_it = _tmp7_; #line 1316 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 7244 "aggregation.c" +#line 7274 "aggregation.c" GeeIterator* _tmp8_; gboolean _tmp9_ = FALSE; GeeIterator* _tmp10_; @@ -7256,7 +7286,7 @@ if (!_tmp9_) { #line 1316 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 7259 "aggregation.c" +#line 7289 "aggregation.c" } #line 1316 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp10_ = _removed_it; @@ -7268,7 +7298,7 @@ _tmp12_ = removed; #line 1318 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_assert (_tmp12_ == NULL); -#line 7271 "aggregation.c" +#line 7301 "aggregation.c" { GeeMultiMap* _tmp13_; FolksIndividual* _tmp14_; @@ -7295,7 +7325,7 @@ _i_it = _tmp18_; #line 1320 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 7298 "aggregation.c" +#line 7328 "aggregation.c" GeeIterator* _tmp19_; gboolean _tmp20_ = FALSE; GeeIterator* _tmp21_; @@ -7312,7 +7342,7 @@ if (!_tmp20_) { #line 1320 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 7315 "aggregation.c" +#line 7345 "aggregation.c" } #line 1320 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp21_ = _i_it; @@ -7338,19 +7368,19 @@ g_main_loop_quit (_data9_->main_loop); #line 1320 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (i); -#line 7341 "aggregation.c" +#line 7371 "aggregation.c" } #line 1320 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_i_it); -#line 7345 "aggregation.c" +#line 7375 "aggregation.c" } #line 1316 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (removed); -#line 7349 "aggregation.c" +#line 7379 "aggregation.c" } #line 1316 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_removed_it); -#line 7353 "aggregation.c" +#line 7383 "aggregation.c" } } @@ -7358,7 +7388,7 @@ static void ___lambda48__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 1312 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" __lambda48_ (self, changes); -#line 7361 "aggregation.c" +#line 7391 "aggregation.c" } @@ -7373,7 +7403,7 @@ result = FALSE; #line 1335 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 7376 "aggregation.c" +#line 7406 "aggregation.c" } @@ -7382,7 +7412,7 @@ result = __lambda49_ (self); #line 1332 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 7385 "aggregation.c" +#line 7415 "aggregation.c" } @@ -7393,7 +7423,7 @@ self = _data9_->self; #line 1340 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_return_if_fail (r != NULL); -#line 7396 "aggregation.c" +#line 7426 "aggregation.c" { FolksIndividualAggregator* _tmp0_; GAsyncResult* _tmp1_; @@ -7405,7 +7435,7 @@ folks_individual_aggregator_prepare_finish (_tmp0_, _tmp1_, &_inner_error_); #line 1344 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_inner_error_ != NULL) { -#line 7408 "aggregation.c" +#line 7438 "aggregation.c" goto __catch10_g_error; } } @@ -7426,7 +7456,7 @@ g_assert_not_reached (); #line 1342 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_error_free0 (e1); -#line 7429 "aggregation.c" +#line 7459 "aggregation.c" } __finally10: #line 1342 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -7437,7 +7467,7 @@ g_clear_error (&_inner_error_); #line 1342 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return; -#line 7440 "aggregation.c" +#line 7470 "aggregation.c" } } @@ -7447,7 +7477,7 @@ __lambda51_ (self, source_object, res); #line 1340 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" block9_data_unref (self); -#line 7450 "aggregation.c" +#line 7480 "aggregation.c" } @@ -7465,7 +7495,7 @@ result = FALSE; #line 1354 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 7468 "aggregation.c" +#line 7498 "aggregation.c" } @@ -7474,7 +7504,7 @@ result = __lambda50_ (self); #line 1338 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 7477 "aggregation.c" +#line 7507 "aggregation.c" } @@ -7489,7 +7519,7 @@ result = FALSE; #line 1379 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 7492 "aggregation.c" +#line 7522 "aggregation.c" } @@ -7498,7 +7528,7 @@ result = __lambda52_ (self); #line 1376 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 7501 "aggregation.c" +#line 7531 "aggregation.c" } @@ -7509,7 +7539,7 @@ self = _data9_->self; #line 1385 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_return_if_fail (res != NULL); -#line 7512 "aggregation.c" +#line 7542 "aggregation.c" { FolksIndividualAggregator* _tmp0_; GAsyncResult* _tmp1_; @@ -7525,7 +7555,7 @@ _tmp3_ = _tmp2_; #line 1390 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (_inner_error_ != NULL) { -#line 7528 "aggregation.c" +#line 7558 "aggregation.c" goto __catch11_g_error; } #line 1389 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -7534,7 +7564,7 @@ _data9_->writeable_persona = _tmp3_; #line 1391 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_assert_not_reached (); -#line 7537 "aggregation.c" +#line 7567 "aggregation.c" } goto __finally11; __catch11_g_error: @@ -7546,7 +7576,7 @@ _inner_error_ = NULL; #line 1396 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" if (!g_error_matches (e1, FOLKS_INDIVIDUAL_AGGREGATOR_ERROR, FOLKS_INDIVIDUAL_AGGREGATOR_ERROR_PROPERTY_NOT_WRITEABLE)) { -#line 7549 "aggregation.c" +#line 7579 "aggregation.c" const gchar* _tmp4_; #line 1398 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp4_ = e1->message; @@ -7554,13 +7584,13 @@ g_critical ("aggregation.vala:1398: Wrong error received: %s", _tmp4_); #line 1399 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_assert_not_reached (); -#line 7557 "aggregation.c" +#line 7587 "aggregation.c" } #line 1402 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" g_main_loop_quit (_data9_->main_loop); #line 1387 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_error_free0 (e1); -#line 7563 "aggregation.c" +#line 7593 "aggregation.c" } __finally11: #line 1387 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" @@ -7571,7 +7601,7 @@ g_clear_error (&_inner_error_); #line 1387 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return; -#line 7574 "aggregation.c" +#line 7604 "aggregation.c" } } @@ -7581,7 +7611,7 @@ __lambda54_ (self, source_object, res); #line 1384 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" block9_data_unref (self); -#line 7584 "aggregation.c" +#line 7614 "aggregation.c" } @@ -7599,7 +7629,7 @@ result = FALSE; #line 1406 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 7602 "aggregation.c" +#line 7632 "aggregation.c" } @@ -7608,7 +7638,7 @@ result = __lambda53_ (self); #line 1382 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 7611 "aggregation.c" +#line 7641 "aggregation.c" } @@ -7666,7 +7696,7 @@ g_assert (_data9_->individual != NULL); #line 1362 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" persona = NULL; -#line 7669 "aggregation.c" +#line 7699 "aggregation.c" { GeeSet* _tmp5_; GeeSet* _tmp6_; @@ -7682,7 +7712,7 @@ _p_it = _tmp7_; #line 1363 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" while (TRUE) { -#line 7685 "aggregation.c" +#line 7715 "aggregation.c" gboolean _tmp8_ = FALSE; gpointer _tmp9_ = NULL; FolksPersona* p; @@ -7694,7 +7724,7 @@ if (!_tmp8_) { #line 1363 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 7697 "aggregation.c" +#line 7727 "aggregation.c" } #line 1363 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp9_ = gee_iterator_get (_p_it); @@ -7712,11 +7742,11 @@ _g_object_unref0 (p); #line 1366 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" break; -#line 7715 "aggregation.c" +#line 7745 "aggregation.c" } #line 1363 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _g_object_unref0 (_p_it); -#line 7719 "aggregation.c" +#line 7749 "aggregation.c" } #line 1370 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _tmp12_ = persona; @@ -7758,7 +7788,7 @@ block9_data_unref (_data9_); #line 1301 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" _data9_ = NULL; -#line 7761 "aggregation.c" +#line 7791 "aggregation.c" } @@ -7773,7 +7803,7 @@ FOLKS_TEST_CASE_CLASS (klass)->tear_down = aggregation_tests_real_tear_down; #line 24 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" G_OBJECT_CLASS (klass)->finalize = aggregation_tests_finalize; -#line 7776 "aggregation.c" +#line 7806 "aggregation.c" } @@ -7782,7 +7812,7 @@ self->priv = AGGREGATION_TESTS_GET_PRIVATE (self); #line 29 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" self->priv->_test_timeout = 3; -#line 7785 "aggregation.c" +#line 7815 "aggregation.c" } @@ -7798,7 +7828,7 @@ _g_object_unref0 (self->priv->_default_personas); #line 24 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" G_OBJECT_CLASS (aggregation_tests_parent_class)->finalize (obj); -#line 7801 "aggregation.c" +#line 7831 "aggregation.c" } @@ -7843,7 +7873,7 @@ result = 0; #line 1428 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return result; -#line 7846 "aggregation.c" +#line 7876 "aggregation.c" } @@ -7852,7 +7882,7 @@ g_type_init (); #line 1419 "/home/treitter/collabora/folks/tests/folks/aggregation.vala" return _vala_main (argv, argc); -#line 7855 "aggregation.c" +#line 7885 "aggregation.c" } diff -Nru folks-0.6.6/tests/folks/aggregation.vala folks-0.6.7/tests/folks/aggregation.vala --- folks-0.6.6/tests/folks/aggregation.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/tests/folks/aggregation.vala 2012-02-17 23:07:32.000000000 +0000 @@ -544,8 +544,8 @@ private void _test_linkable_properties_individuals_changed (bool detailed, uint num_personas, Collection added, - Set removed, ref weak Individual individual1, - ref weak Individual individual2) + Set removed, ref weak Individual? individual1, + ref weak Individual? individual2) { foreach (Individual i in removed) { @@ -700,7 +700,7 @@ private void _test_user_individuals_changed (bool detailed, Collection added, Set removed, - ref Individual user_individual) + ref Individual? user_individual) { /* Keep track of the user individual */ foreach (Individual i in removed) diff -Nru folks-0.6.6/tests/folks/avatar-cache.c folks-0.6.7/tests/folks/avatar-cache.c --- folks-0.6.6/tests/folks/avatar-cache.c 2011-12-13 23:41:37.000000000 +0000 +++ folks-0.6.7/tests/folks/avatar-cache.c 2012-02-23 00:02:22.000000000 +0000 @@ -1,4 +1,4 @@ -/* avatar-cache.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* avatar-cache.c generated by valac 0.15.1, the Vala compiler * generated from avatar-cache.vala, do not modify */ /* @@ -623,13 +623,17 @@ static void block1_data_unref (Block1Data* _data1_) { #line 135 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { +#line 627 "avatar-cache.c" + AvatarCacheTests * self; #line 135 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" - _g_object_unref0 (_data1_->self); + self = _data1_->self; #line 135 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" _g_object_unref0 (_data1_->avatar); #line 135 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" + _g_object_unref0 (self); +#line 135 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" g_slice_free (Block1Data, _data1_); -#line 633 "avatar-cache.c" +#line 637 "avatar-cache.c" } } @@ -642,7 +646,7 @@ self = _data1_->self; #line 139 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" g_return_if_fail (res != NULL); -#line 646 "avatar-cache.c" +#line 650 "avatar-cache.c" { FolksAvatarCache* _tmp0_; GAsyncResult* _tmp1_; @@ -658,14 +662,14 @@ _tmp3_ = _tmp2_; #line 143 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" if (_inner_error_ != NULL) { -#line 662 "avatar-cache.c" +#line 666 "avatar-cache.c" goto __catch2_g_error; } #line 143 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" _g_object_unref0 (_data1_->avatar); #line 143 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" _data1_->avatar = _tmp3_; -#line 669 "avatar-cache.c" +#line 673 "avatar-cache.c" } goto __finally2; __catch2_g_error: @@ -682,7 +686,7 @@ g_error ("avatar-cache.vala:147: Error loading avatar: %s", _tmp4_); #line 141 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" _g_error_free0 (e); -#line 686 "avatar-cache.c" +#line 690 "avatar-cache.c" } __finally2: #line 141 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" @@ -693,13 +697,13 @@ g_clear_error (&_inner_error_); #line 141 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" return; -#line 697 "avatar-cache.c" +#line 701 "avatar-cache.c" } #line 150 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" _tmp5_ = self->priv->_main_loop; #line 150 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" g_main_loop_quit (_tmp5_); -#line 703 "avatar-cache.c" +#line 707 "avatar-cache.c" } @@ -708,14 +712,14 @@ __lambda3_ (self, source_object, res); #line 139 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" block1_data_unref (self); -#line 712 "avatar-cache.c" +#line 716 "avatar-cache.c" } static gpointer _g_object_ref0 (gpointer self) { #line 155 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" return self ? g_object_ref (self) : NULL; -#line 719 "avatar-cache.c" +#line 723 "avatar-cache.c" } @@ -758,7 +762,7 @@ _data1_ = NULL; #line 155 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" return result; -#line 762 "avatar-cache.c" +#line 766 "avatar-cache.c" } @@ -767,7 +771,7 @@ GError * _inner_error_ = NULL; #line 160 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" g_return_if_fail (res != NULL); -#line 771 "avatar-cache.c" +#line 775 "avatar-cache.c" { FolksAvatarCache* _tmp0_; GAsyncResult* _tmp1_; @@ -779,7 +783,7 @@ folks_avatar_cache_remove_avatar_finish (_tmp0_, _tmp1_, &_inner_error_); #line 164 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" if (_inner_error_ != NULL) { -#line 783 "avatar-cache.c" +#line 787 "avatar-cache.c" goto __catch3_g_error; } } @@ -798,7 +802,7 @@ g_error ("avatar-cache.vala:168: Error removing avatar: %s", _tmp2_); #line 162 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" _g_error_free0 (e); -#line 802 "avatar-cache.c" +#line 806 "avatar-cache.c" } __finally3: #line 162 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" @@ -809,13 +813,13 @@ g_clear_error (&_inner_error_); #line 162 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" return; -#line 813 "avatar-cache.c" +#line 817 "avatar-cache.c" } #line 171 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" _tmp3_ = self->priv->_main_loop; #line 171 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" g_main_loop_quit (_tmp3_); -#line 819 "avatar-cache.c" +#line 823 "avatar-cache.c" } @@ -824,7 +828,7 @@ __lambda5_ (self, source_object, res); #line 160 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" g_object_unref (self); -#line 828 "avatar-cache.c" +#line 832 "avatar-cache.c" } @@ -846,7 +850,7 @@ _tmp2_ = self->priv->_main_loop; #line 174 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" g_main_loop_run (_tmp2_); -#line 850 "avatar-cache.c" +#line 854 "avatar-cache.c" } @@ -866,7 +870,7 @@ _tmp2_ = self->priv->_main_loop; #line 182 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" g_main_loop_quit (_tmp2_); -#line 870 "avatar-cache.c" +#line 874 "avatar-cache.c" } @@ -875,7 +879,7 @@ __lambda4_ (self, source_object, res); #line 179 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" g_object_unref (self); -#line 879 "avatar-cache.c" +#line 883 "avatar-cache.c" } @@ -899,7 +903,7 @@ _tmp2_ = self->priv->_main_loop; #line 185 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" g_main_loop_run (_tmp2_); -#line 903 "avatar-cache.c" +#line 907 "avatar-cache.c" } @@ -928,7 +932,7 @@ _avatar_cache_tests_assert_avatars_equal (self, _tmp2_, avatar); #line 188 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" _g_object_unref0 (avatar); -#line 932 "avatar-cache.c" +#line 936 "avatar-cache.c" } @@ -962,7 +966,7 @@ _avatar_cache_tests_assert_avatars_equal (self, _tmp3_, avatar); #line 202 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" _g_object_unref0 (avatar); -#line 966 "avatar-cache.c" +#line 970 "avatar-cache.c" } @@ -979,7 +983,7 @@ g_assert (avatar == NULL); #line 217 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" _g_object_unref0 (avatar); -#line 983 "avatar-cache.c" +#line 987 "avatar-cache.c" } @@ -1022,7 +1026,7 @@ g_assert (_tmp4_ == NULL); #line 224 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" _g_object_unref0 (avatar); -#line 1026 "avatar-cache.c" +#line 1030 "avatar-cache.c" } @@ -1041,7 +1045,7 @@ _avatar_cache_tests_assert_remove_avatar (self, "test-remove-avatar-non-existent"); #line 243 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" _g_object_unref0 (avatar); -#line 1045 "avatar-cache.c" +#line 1049 "avatar-cache.c" } @@ -1071,7 +1075,7 @@ _g_free0 (_tmp3_); #line 253 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" _g_free0 (uri); -#line 1075 "avatar-cache.c" +#line 1079 "avatar-cache.c" } @@ -1086,14 +1090,14 @@ FOLKS_TEST_CASE_CLASS (klass)->tear_down = avatar_cache_tests_real_tear_down; #line 25 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" G_OBJECT_CLASS (klass)->finalize = avatar_cache_tests_finalize; -#line 1090 "avatar-cache.c" +#line 1094 "avatar-cache.c" } static void avatar_cache_tests_instance_init (AvatarCacheTests * self) { #line 25 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" self->priv = AVATAR_CACHE_TESTS_GET_PRIVATE (self); -#line 1097 "avatar-cache.c" +#line 1101 "avatar-cache.c" } @@ -1111,7 +1115,7 @@ _g_main_loop_unref0 (self->priv->_main_loop); #line 25 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" G_OBJECT_CLASS (avatar_cache_tests_parent_class)->finalize (obj); -#line 1115 "avatar-cache.c" +#line 1119 "avatar-cache.c" } @@ -1156,7 +1160,7 @@ result = 0; #line 271 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" return result; -#line 1160 "avatar-cache.c" +#line 1164 "avatar-cache.c" } @@ -1165,7 +1169,7 @@ g_type_init (); #line 262 "/home/treitter/collabora/folks/tests/folks/avatar-cache.vala" return _vala_main (argv, argc); -#line 1169 "avatar-cache.c" +#line 1173 "avatar-cache.c" } diff -Nru folks-0.6.6/tests/folks/backend-loading.c folks-0.6.7/tests/folks/backend-loading.c --- folks-0.6.6/tests/folks/backend-loading.c 2011-12-13 23:41:44.000000000 +0000 +++ folks-0.6.7/tests/folks/backend-loading.c 2012-02-23 00:02:22.000000000 +0000 @@ -1,4 +1,4 @@ -/* backend-loading.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* backend-loading.c generated by valac 0.15.1, the Vala compiler * generated from backend-loading.vala, do not modify */ /* @@ -360,6 +360,56 @@ } +static guint8* string_get_data (const gchar* self, int* result_length1) { + guint8* result; + guint8* res; + gint res_length1; + gint _res_size_; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + guint8* _tmp3_; + gint _tmp3__length1; + guint8* _tmp4_; + gint _tmp4__length1; +#line 1407 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + g_return_val_if_fail (self != NULL, NULL); +#line 1408 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + res = (guint8*) self; +#line 1408 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + res_length1 = -1; +#line 1408 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + _res_size_ = res_length1; +#line 1409 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + _tmp0_ = strlen (self); +#line 1409 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + _tmp1_ = _tmp0_; +#line 1409 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + res_length1 = (gint) _tmp1_; +#line 1409 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + _tmp2_ = res_length1; +#line 1410 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + _tmp3_ = res; +#line 1410 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + _tmp3__length1 = res_length1; +#line 1410 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1410 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + _tmp4__length1 = _tmp3__length1; +#line 1410 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + if (result_length1) { +#line 1410 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + *result_length1 = _tmp4__length1; +#line 404 "backend-loading.c" + } +#line 1410 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + result = _tmp4_; +#line 1410 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + return result; +#line 410 "backend-loading.c" +} + + static void backend_loading_tests_real_set_up (FolksTestCase* base) { BackendLoadingTests * self; TpTestBackend* _tmp0_; @@ -401,14 +451,16 @@ g_key_file_set_boolean (kf, "telepathy", "enabled", TRUE); #line 56 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_key_file_set_boolean (kf, "key-file", "enabled", TRUE); -#line 405 "backend-loading.c" +#line 455 "backend-loading.c" { GFile* _tmp6_ = NULL; GFile* backend_f; gchar* _tmp7_ = NULL; gchar* data; - gint _tmp8_; - gint _tmp9_; + guint8* _tmp8_; + gint _tmp8__length1; + guint8* _tmp9_; + gint _tmp9__length1; #line 60 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _tmp6_ = g_file_new_for_path (kf_path); #line 60 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" @@ -418,25 +470,27 @@ #line 61 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" data = _tmp7_; #line 62 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" - _tmp8_ = strlen (data); + _tmp8_ = string_get_data (data, &_tmp8__length1); #line 62 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _tmp9_ = _tmp8_; #line 62 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" - g_file_replace_contents (backend_f, data, (gsize) _tmp9_, NULL, FALSE, G_FILE_CREATE_PRIVATE, NULL, NULL, &_inner_error_); + _tmp9__length1 = _tmp8__length1; +#line 62 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" + g_file_replace_contents (backend_f, _tmp9_, (gsize) _tmp9__length1, NULL, FALSE, G_FILE_CREATE_PRIVATE, NULL, NULL, &_inner_error_); #line 62 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" if (_inner_error_ != NULL) { #line 62 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_free0 (data); #line 62 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (backend_f); -#line 433 "backend-loading.c" +#line 487 "backend-loading.c" goto __catch0_g_error; } #line 58 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_free0 (data); #line 58 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (backend_f); -#line 440 "backend-loading.c" +#line 494 "backend-loading.c" } goto __finally0; __catch0_g_error: @@ -457,7 +511,7 @@ ": %s", kf_path, _tmp11_); #line 58 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_error_free0 (e); -#line 460 "backend-loading.c" +#line 514 "backend-loading.c" } __finally0: #line 58 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" @@ -472,7 +526,7 @@ g_clear_error (&_inner_error_); #line 58 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return; -#line 475 "backend-loading.c" +#line 529 "backend-loading.c" } #line 72 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_setenv ("FOLKS_BACKEND_STORE_KEY_FILE_PATH", kf_path, TRUE); @@ -480,7 +534,7 @@ _g_key_file_free0 (kf); #line 41 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_free0 (kf_path); -#line 483 "backend-loading.c" +#line 537 "backend-loading.c" } @@ -514,7 +568,7 @@ _tmp5_ = self->priv->_tp_backend; #line 82 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" tp_test_backend_tear_down (_tmp5_); -#line 517 "backend-loading.c" +#line 571 "backend-loading.c" } @@ -523,15 +577,17 @@ g_atomic_int_inc (&_data1_->_ref_count_); #line 85 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return _data1_; -#line 526 "backend-loading.c" +#line 580 "backend-loading.c" } static void block1_data_unref (Block1Data* _data1_) { #line 85 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { +#line 587 "backend-loading.c" + BackendLoadingTests * self; #line 85 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" - _g_object_unref0 (_data1_->self); + self = _data1_->self; #line 85 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (_data1_->store); #line 85 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" @@ -539,8 +595,10 @@ #line 85 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_main_loop_unref0 (_data1_->main_loop); #line 85 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" + _g_object_unref0 (self); +#line 85 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_slice_free (Block1Data, _data1_); -#line 543 "backend-loading.c" +#line 601 "backend-loading.c" } } @@ -556,7 +614,7 @@ _tmp0_ = r; #line 96 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" folks_backend_store_prepare_finish (_data1_->store, _tmp0_); -#line 559 "backend-loading.c" +#line 617 "backend-loading.c" } @@ -565,7 +623,7 @@ __lambda2_ (self, source_object, res); #line 94 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" block1_data_unref (self); -#line 568 "backend-loading.c" +#line 626 "backend-loading.c" } @@ -576,7 +634,7 @@ self = _data1_->self; #line 99 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_return_if_fail (r != NULL); -#line 579 "backend-loading.c" +#line 637 "backend-loading.c" { GAsyncResult* _tmp0_; gint _tmp19_; @@ -587,7 +645,7 @@ folks_backend_store_load_backends_finish (_data1_->store, _tmp0_, &_inner_error_); #line 103 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" if (_inner_error_ != NULL) { -#line 590 "backend-loading.c" +#line 648 "backend-loading.c" goto __catch1_g_error; } { @@ -619,7 +677,7 @@ _backend_it = _tmp7_; #line 105 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" while (TRUE) { -#line 622 "backend-loading.c" +#line 680 "backend-loading.c" GeeIterator* _tmp8_; gboolean _tmp9_ = FALSE; GeeIterator* _tmp10_; @@ -640,7 +698,7 @@ if (!_tmp9_) { #line 105 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" break; -#line 643 "backend-loading.c" +#line 701 "backend-loading.c" } #line 105 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _tmp10_ = _backend_it; @@ -668,21 +726,21 @@ gee_abstract_collection_remove ((GeeAbstractCollection*) _data1_->backends_expected, _tmp18_); #line 105 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (backend); -#line 671 "backend-loading.c" +#line 729 "backend-loading.c" } #line 105 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (_backend_it); -#line 675 "backend-loading.c" +#line 733 "backend-loading.c" } #line 111 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" - _tmp19_ = gee_collection_get_size ((GeeCollection*) _data1_->backends_expected); + _tmp19_ = gee_abstract_collection_get_size ((GeeCollection*) _data1_->backends_expected); #line 111 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _tmp20_ = _tmp19_; #line 111 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_assert (_tmp20_ == 0); #line 112 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_main_loop_quit (_data1_->main_loop); -#line 685 "backend-loading.c" +#line 743 "backend-loading.c" } goto __finally1; __catch1_g_error: @@ -699,7 +757,7 @@ g_error ("backend-loading.vala:116: Failed to load backends: %s", _tmp21_); #line 101 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_error_free0 (e); -#line 702 "backend-loading.c" +#line 760 "backend-loading.c" } __finally1: #line 101 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" @@ -710,7 +768,7 @@ g_clear_error (&_inner_error_); #line 101 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return; -#line 713 "backend-loading.c" +#line 771 "backend-loading.c" } } @@ -720,7 +778,7 @@ __lambda3_ (self, source_object, res); #line 99 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" block1_data_unref (self); -#line 723 "backend-loading.c" +#line 781 "backend-loading.c" } @@ -769,7 +827,7 @@ block1_data_unref (_data1_); #line 85 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data1_ = NULL; -#line 772 "backend-loading.c" +#line 830 "backend-loading.c" } @@ -781,7 +839,7 @@ _tmp0_ = r; #line 130 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" backend_loading_tests_test_disabling_finish (self, _tmp0_); -#line 784 "backend-loading.c" +#line 842 "backend-loading.c" } @@ -790,7 +848,7 @@ __lambda4_ (self, source_object, res); #line 128 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_object_unref (self); -#line 793 "backend-loading.c" +#line 851 "backend-loading.c" } @@ -819,7 +877,7 @@ g_main_loop_run (_tmp2_); #line 123 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (store); -#line 822 "backend-loading.c" +#line 880 "backend-loading.c" } @@ -832,14 +890,14 @@ _g_object_unref0 (_data_->self); #line 23 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_slice_free (BackendLoadingTestsTestDisablingAsyncData, _data_); -#line 835 "backend-loading.c" +#line 893 "backend-loading.c" } static gpointer _g_object_ref0 (gpointer self) { #line 23 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return self ? g_object_ref (self) : NULL; -#line 842 "backend-loading.c" +#line 900 "backend-loading.c" } @@ -866,7 +924,7 @@ _data_->store = _tmp2_; #line 23 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" backend_loading_tests_test_disabling_async_co (_data_); -#line 869 "backend-loading.c" +#line 927 "backend-loading.c" } @@ -874,7 +932,7 @@ BackendLoadingTestsTestDisablingAsyncData* _data_; #line 23 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 877 "backend-loading.c" +#line 935 "backend-loading.c" } @@ -888,7 +946,7 @@ _data_->_res_ = _res_; #line 142 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" backend_loading_tests_test_disabling_async_co (_data_); -#line 891 "backend-loading.c" +#line 949 "backend-loading.c" } @@ -897,24 +955,24 @@ switch (_data_->_state_) { #line 136 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" case 0: -#line 900 "backend-loading.c" +#line 958 "backend-loading.c" goto _state_0; #line 136 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" case 1: -#line 904 "backend-loading.c" +#line 962 "backend-loading.c" goto _state_1; #line 136 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" case 2: -#line 908 "backend-loading.c" +#line 966 "backend-loading.c" goto _state_2; #line 136 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" case 3: -#line 912 "backend-loading.c" +#line 970 "backend-loading.c" goto _state_3; default: #line 136 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_assert_not_reached (); -#line 917 "backend-loading.c" +#line 975 "backend-loading.c" } _state_0: #line 138 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" @@ -935,7 +993,7 @@ folks_backend_store_prepare (_data_->_tmp3_, backend_loading_tests_test_disabling_async_ready, _data_); #line 142 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return FALSE; -#line 938 "backend-loading.c" +#line 996 "backend-loading.c" _state_1: #line 142 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" folks_backend_store_prepare_finish (_data_->_tmp3_, _data_->_res_); @@ -947,11 +1005,11 @@ folks_backend_store_disable_backend (_data_->_tmp4_, "telepathy", backend_loading_tests_test_disabling_async_ready, _data_); #line 143 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return FALSE; -#line 950 "backend-loading.c" +#line 1008 "backend-loading.c" _state_2: #line 143 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" folks_backend_store_disable_backend_finish (_data_->_tmp4_, _data_->_res_); -#line 954 "backend-loading.c" +#line 1012 "backend-loading.c" { #line 147 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp5_ = _data_->store; @@ -961,13 +1019,13 @@ folks_backend_store_load_backends (_data_->_tmp5_, backend_loading_tests_test_disabling_async_ready, _data_); #line 147 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return FALSE; -#line 964 "backend-loading.c" +#line 1022 "backend-loading.c" _state_3: #line 147 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" folks_backend_store_load_backends_finish (_data_->_tmp5_, _data_->_res_, &_data_->_inner_error_); #line 147 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" if (_data_->_inner_error_ != NULL) { -#line 970 "backend-loading.c" +#line 1028 "backend-loading.c" goto __catch2_g_error; } { @@ -1005,7 +1063,7 @@ if (!_data_->_tmp15_) { #line 149 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" break; -#line 1008 "backend-loading.c" +#line 1066 "backend-loading.c" } #line 149 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp16_ = _data_->_backend_it; @@ -1037,14 +1095,14 @@ gee_abstract_collection_remove ((GeeAbstractCollection*) _data_->backends_expected, _data_->_tmp24_); #line 149 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (_data_->backend); -#line 1040 "backend-loading.c" +#line 1098 "backend-loading.c" } #line 149 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (_data_->_backend_it); -#line 1044 "backend-loading.c" +#line 1102 "backend-loading.c" } #line 155 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" - _data_->_tmp25_ = gee_collection_get_size ((GeeCollection*) _data_->backends_expected); + _data_->_tmp25_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->backends_expected); #line 155 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp26_ = _data_->_tmp25_; #line 155 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" @@ -1053,7 +1111,7 @@ _data_->_tmp27_ = _data_->self->priv->main_loop; #line 156 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_main_loop_quit (_data_->_tmp27_); -#line 1056 "backend-loading.c" +#line 1114 "backend-loading.c" } goto __finally2; __catch2_g_error: @@ -1068,7 +1126,7 @@ g_error ("backend-loading.vala:160: Failed to load backends: %s", _data_->_tmp28_); #line 145 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_error_free0 (_data_->e); -#line 1071 "backend-loading.c" +#line 1129 "backend-loading.c" } __finally2: #line 145 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" @@ -1081,7 +1139,7 @@ g_clear_error (&_data_->_inner_error_); #line 145 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return FALSE; -#line 1084 "backend-loading.c" +#line 1142 "backend-loading.c" } #line 136 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (_data_->backends_expected); @@ -1089,17 +1147,17 @@ if (_data_->_state_ == 0) { #line 136 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1092 "backend-loading.c" +#line 1150 "backend-loading.c" } else { #line 136 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1096 "backend-loading.c" +#line 1154 "backend-loading.c" } #line 136 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_object_unref (_data_->_async_result); #line 136 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return FALSE; -#line 1102 "backend-loading.c" +#line 1160 "backend-loading.c" } @@ -1111,7 +1169,7 @@ _tmp0_ = r; #line 171 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" backend_loading_tests_test_reloading_finish (self, _tmp0_); -#line 1114 "backend-loading.c" +#line 1172 "backend-loading.c" } @@ -1120,7 +1178,7 @@ __lambda5_ (self, source_object, res); #line 169 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_object_unref (self); -#line 1123 "backend-loading.c" +#line 1181 "backend-loading.c" } @@ -1149,7 +1207,7 @@ g_main_loop_run (_tmp2_); #line 164 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (store); -#line 1152 "backend-loading.c" +#line 1210 "backend-loading.c" } @@ -1162,7 +1220,7 @@ _g_object_unref0 (_data_->self); #line 23 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_slice_free (BackendLoadingTestsTestReloadingAsyncData, _data_); -#line 1165 "backend-loading.c" +#line 1223 "backend-loading.c" } @@ -1189,7 +1247,7 @@ _data_->store = _tmp2_; #line 23 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" backend_loading_tests_test_reloading_async_co (_data_); -#line 1192 "backend-loading.c" +#line 1250 "backend-loading.c" } @@ -1197,7 +1255,7 @@ BackendLoadingTestsTestReloadingAsyncData* _data_; #line 23 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 1200 "backend-loading.c" +#line 1258 "backend-loading.c" } @@ -1211,7 +1269,7 @@ _data_->_res_ = _res_; #line 190 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" backend_loading_tests_test_reloading_async_co (_data_); -#line 1214 "backend-loading.c" +#line 1272 "backend-loading.c" } @@ -1220,36 +1278,36 @@ switch (_data_->_state_) { #line 177 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" case 0: -#line 1223 "backend-loading.c" +#line 1281 "backend-loading.c" goto _state_0; #line 177 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" case 1: -#line 1227 "backend-loading.c" +#line 1285 "backend-loading.c" goto _state_1; #line 177 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" case 2: -#line 1231 "backend-loading.c" +#line 1289 "backend-loading.c" goto _state_2; #line 177 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" case 3: -#line 1235 "backend-loading.c" +#line 1293 "backend-loading.c" goto _state_3; #line 177 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" case 4: -#line 1239 "backend-loading.c" +#line 1297 "backend-loading.c" goto _state_4; #line 177 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" case 5: -#line 1243 "backend-loading.c" +#line 1301 "backend-loading.c" goto _state_5; #line 177 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" case 6: -#line 1247 "backend-loading.c" +#line 1305 "backend-loading.c" goto _state_6; default: #line 177 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_assert_not_reached (); -#line 1252 "backend-loading.c" +#line 1310 "backend-loading.c" } _state_0: #line 184 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" @@ -1270,7 +1328,7 @@ _data_->_tmp4_ = _data_->backends_expected; #line 186 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp4_, "telepathy"); -#line 1273 "backend-loading.c" +#line 1331 "backend-loading.c" { #line 190 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp5_ = _data_->store; @@ -1280,13 +1338,13 @@ folks_backend_store_load_backends (_data_->_tmp5_, backend_loading_tests_test_reloading_async_ready, _data_); #line 190 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return FALSE; -#line 1283 "backend-loading.c" +#line 1341 "backend-loading.c" _state_1: #line 190 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" folks_backend_store_load_backends_finish (_data_->_tmp5_, _data_->_res_, &_data_->_inner_error_); #line 190 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" if (_data_->_inner_error_ != NULL) { -#line 1289 "backend-loading.c" +#line 1347 "backend-loading.c" goto __catch3_g_error; } { @@ -1324,7 +1382,7 @@ if (!_data_->_tmp15_) { #line 192 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" break; -#line 1327 "backend-loading.c" +#line 1385 "backend-loading.c" } #line 192 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp16_ = _data_->_backend1_it; @@ -1360,21 +1418,21 @@ gee_abstract_collection_remove ((GeeAbstractCollection*) _data_->_tmp23_, _data_->_tmp26_); #line 192 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (_data_->backend1); -#line 1363 "backend-loading.c" +#line 1421 "backend-loading.c" } #line 192 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (_data_->_backend1_it); -#line 1367 "backend-loading.c" +#line 1425 "backend-loading.c" } #line 198 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp27_ = _data_->backends_expected; #line 198 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" - _data_->_tmp28_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp27_); + _data_->_tmp28_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp27_); #line 198 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp29_ = _data_->_tmp28_; #line 198 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_assert (_data_->_tmp29_ == 0); -#line 1377 "backend-loading.c" +#line 1435 "backend-loading.c" } goto __finally3; __catch3_g_error: @@ -1389,7 +1447,7 @@ g_error ("backend-loading.vala:202: Failed to load backends: %s", _data_->_tmp30_); #line 188 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_error_free0 (_data_->e1); -#line 1392 "backend-loading.c" +#line 1450 "backend-loading.c" } __finally3: #line 188 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" @@ -1402,7 +1460,7 @@ g_clear_error (&_data_->_inner_error_); #line 188 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return FALSE; -#line 1405 "backend-loading.c" +#line 1463 "backend-loading.c" } #line 208 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp31_ = g_str_hash; @@ -1426,11 +1484,11 @@ folks_backend_store_disable_backend (_data_->_tmp35_, "key-file", backend_loading_tests_test_reloading_async_ready, _data_); #line 212 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return FALSE; -#line 1429 "backend-loading.c" +#line 1487 "backend-loading.c" _state_2: #line 212 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" folks_backend_store_disable_backend_finish (_data_->_tmp35_, _data_->_res_); -#line 1433 "backend-loading.c" +#line 1491 "backend-loading.c" { #line 217 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp36_ = _data_->store; @@ -1440,13 +1498,13 @@ folks_backend_store_load_backends (_data_->_tmp36_, backend_loading_tests_test_reloading_async_ready, _data_); #line 217 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return FALSE; -#line 1443 "backend-loading.c" +#line 1501 "backend-loading.c" _state_3: #line 217 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" folks_backend_store_load_backends_finish (_data_->_tmp36_, _data_->_res_, &_data_->_inner_error_); #line 217 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" if (_data_->_inner_error_ != NULL) { -#line 1449 "backend-loading.c" +#line 1507 "backend-loading.c" goto __catch4_g_error; } { @@ -1484,7 +1542,7 @@ if (!_data_->_tmp46_) { #line 219 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" break; -#line 1487 "backend-loading.c" +#line 1545 "backend-loading.c" } #line 219 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp47_ = _data_->_backend2_it; @@ -1520,21 +1578,21 @@ gee_abstract_collection_remove ((GeeAbstractCollection*) _data_->_tmp54_, _data_->_tmp57_); #line 219 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (_data_->backend2); -#line 1523 "backend-loading.c" +#line 1581 "backend-loading.c" } #line 219 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (_data_->_backend2_it); -#line 1527 "backend-loading.c" +#line 1585 "backend-loading.c" } #line 225 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp58_ = _data_->backends_expected; #line 225 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" - _data_->_tmp59_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp58_); + _data_->_tmp59_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp58_); #line 225 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp60_ = _data_->_tmp59_; #line 225 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_assert (_data_->_tmp60_ == 0); -#line 1537 "backend-loading.c" +#line 1595 "backend-loading.c" } goto __finally4; __catch4_g_error: @@ -1549,7 +1607,7 @@ g_error ("backend-loading.vala:229: Failed to load backends: %s", _data_->_tmp61_); #line 215 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_error_free0 (_data_->e2); -#line 1552 "backend-loading.c" +#line 1610 "backend-loading.c" } __finally4: #line 215 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" @@ -1562,7 +1620,7 @@ g_clear_error (&_data_->_inner_error_); #line 215 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return FALSE; -#line 1565 "backend-loading.c" +#line 1623 "backend-loading.c" } #line 235 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp62_ = g_str_hash; @@ -1590,11 +1648,11 @@ folks_backend_store_enable_backend (_data_->_tmp67_, "key-file", backend_loading_tests_test_reloading_async_ready, _data_); #line 240 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return FALSE; -#line 1593 "backend-loading.c" +#line 1651 "backend-loading.c" _state_4: #line 240 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" folks_backend_store_enable_backend_finish (_data_->_tmp67_, _data_->_res_); -#line 1597 "backend-loading.c" +#line 1655 "backend-loading.c" { #line 245 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp68_ = _data_->store; @@ -1604,13 +1662,13 @@ folks_backend_store_load_backends (_data_->_tmp68_, backend_loading_tests_test_reloading_async_ready, _data_); #line 245 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return FALSE; -#line 1607 "backend-loading.c" +#line 1665 "backend-loading.c" _state_5: #line 245 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" folks_backend_store_load_backends_finish (_data_->_tmp68_, _data_->_res_, &_data_->_inner_error_); #line 245 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" if (_data_->_inner_error_ != NULL) { -#line 1613 "backend-loading.c" +#line 1671 "backend-loading.c" goto __catch5_g_error; } { @@ -1648,7 +1706,7 @@ if (!_data_->_tmp78_) { #line 247 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" break; -#line 1651 "backend-loading.c" +#line 1709 "backend-loading.c" } #line 247 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp79_ = _data_->_backend3_it; @@ -1684,21 +1742,21 @@ gee_abstract_collection_remove ((GeeAbstractCollection*) _data_->_tmp86_, _data_->_tmp89_); #line 247 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (_data_->backend3); -#line 1687 "backend-loading.c" +#line 1745 "backend-loading.c" } #line 247 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (_data_->_backend3_it); -#line 1691 "backend-loading.c" +#line 1749 "backend-loading.c" } #line 253 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp90_ = _data_->backends_expected; #line 253 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" - _data_->_tmp91_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp90_); + _data_->_tmp91_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp90_); #line 253 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp92_ = _data_->_tmp91_; #line 253 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_assert (_data_->_tmp92_ == 0); -#line 1701 "backend-loading.c" +#line 1759 "backend-loading.c" } goto __finally5; __catch5_g_error: @@ -1713,7 +1771,7 @@ g_error ("backend-loading.vala:257: Failed to load backends: %s", _data_->_tmp93_); #line 243 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_error_free0 (_data_->e3); -#line 1716 "backend-loading.c" +#line 1774 "backend-loading.c" } __finally5: #line 243 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" @@ -1726,7 +1784,7 @@ g_clear_error (&_data_->_inner_error_); #line 243 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return FALSE; -#line 1729 "backend-loading.c" +#line 1787 "backend-loading.c" } #line 264 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp94_ = g_str_hash; @@ -1746,7 +1804,7 @@ _data_->_tmp98_ = _data_->backends_expected; #line 266 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp98_, "telepathy"); -#line 1749 "backend-loading.c" +#line 1807 "backend-loading.c" { #line 271 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp99_ = _data_->store; @@ -1756,13 +1814,13 @@ folks_backend_store_load_backends (_data_->_tmp99_, backend_loading_tests_test_reloading_async_ready, _data_); #line 271 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return FALSE; -#line 1759 "backend-loading.c" +#line 1817 "backend-loading.c" _state_6: #line 271 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" folks_backend_store_load_backends_finish (_data_->_tmp99_, _data_->_res_, &_data_->_inner_error_); #line 271 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" if (_data_->_inner_error_ != NULL) { -#line 1765 "backend-loading.c" +#line 1823 "backend-loading.c" goto __catch6_g_error; } { @@ -1800,7 +1858,7 @@ if (!_data_->_tmp109_) { #line 273 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" break; -#line 1803 "backend-loading.c" +#line 1861 "backend-loading.c" } #line 273 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp110_ = _data_->_backend_it; @@ -1836,21 +1894,21 @@ gee_abstract_collection_remove ((GeeAbstractCollection*) _data_->_tmp117_, _data_->_tmp120_); #line 273 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (_data_->backend); -#line 1839 "backend-loading.c" +#line 1897 "backend-loading.c" } #line 273 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_object_unref0 (_data_->_backend_it); -#line 1843 "backend-loading.c" +#line 1901 "backend-loading.c" } #line 279 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp121_ = _data_->backends_expected; #line 279 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" - _data_->_tmp122_ = gee_collection_get_size ((GeeCollection*) _data_->_tmp121_); + _data_->_tmp122_ = gee_abstract_collection_get_size ((GeeCollection*) _data_->_tmp121_); #line 279 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp123_ = _data_->_tmp122_; #line 279 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_assert (_data_->_tmp123_ == 0); -#line 1853 "backend-loading.c" +#line 1911 "backend-loading.c" } goto __finally6; __catch6_g_error: @@ -1865,7 +1923,7 @@ g_error ("backend-loading.vala:283: Failed to load backends: %s", _data_->_tmp124_); #line 269 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _g_error_free0 (_data_->e4); -#line 1868 "backend-loading.c" +#line 1926 "backend-loading.c" } __finally6: #line 269 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" @@ -1878,7 +1936,7 @@ g_clear_error (&_data_->_inner_error_); #line 269 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return FALSE; -#line 1881 "backend-loading.c" +#line 1939 "backend-loading.c" } #line 286 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" _data_->_tmp125_ = _data_->self->priv->main_loop; @@ -1890,17 +1948,17 @@ if (_data_->_state_ == 0) { #line 177 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1893 "backend-loading.c" +#line 1951 "backend-loading.c" } else { #line 177 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1897 "backend-loading.c" +#line 1955 "backend-loading.c" } #line 177 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" g_object_unref (_data_->_async_result); #line 177 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return FALSE; -#line 1903 "backend-loading.c" +#line 1961 "backend-loading.c" } @@ -1915,14 +1973,14 @@ FOLKS_TEST_CASE_CLASS (klass)->tear_down = backend_loading_tests_real_tear_down; #line 23 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" G_OBJECT_CLASS (klass)->finalize = backend_loading_tests_finalize; -#line 1918 "backend-loading.c" +#line 1976 "backend-loading.c" } static void backend_loading_tests_instance_init (BackendLoadingTests * self) { #line 23 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" self->priv = BACKEND_LOADING_TESTS_GET_PRIVATE (self); -#line 1925 "backend-loading.c" +#line 1983 "backend-loading.c" } @@ -1936,7 +1994,7 @@ _g_main_loop_unref0 (self->priv->main_loop); #line 23 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" G_OBJECT_CLASS (backend_loading_tests_parent_class)->finalize (obj); -#line 1939 "backend-loading.c" +#line 1997 "backend-loading.c" } @@ -1981,7 +2039,7 @@ result = 0; #line 299 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return result; -#line 1984 "backend-loading.c" +#line 2042 "backend-loading.c" } @@ -1990,7 +2048,7 @@ g_type_init (); #line 290 "/home/treitter/collabora/folks/tests/folks/backend-loading.vala" return _vala_main (argv, argc); -#line 1993 "backend-loading.c" +#line 2051 "backend-loading.c" } diff -Nru folks-0.6.6/tests/folks/backend-loading.vala folks-0.6.7/tests/folks/backend-loading.vala --- folks-0.6.6/tests/folks/backend-loading.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/tests/folks/backend-loading.vala 2012-02-17 23:39:51.000000000 +0000 @@ -59,9 +59,9 @@ { File backend_f = File.new_for_path (kf_path); string data = kf.to_data (); - backend_f.replace_contents (data, - data.length, null, false, FileCreateFlags.PRIVATE, - null); + backend_f.replace_contents (data.data, + null, false, FileCreateFlags.PRIVATE, + null, null); } catch (Error e) { diff -Nru folks-0.6.6/tests/folks/init.c folks-0.6.7/tests/folks/init.c --- folks-0.6.6/tests/folks/init.c 2011-12-13 23:41:32.000000000 +0000 +++ folks-0.6.7/tests/folks/init.c 2012-02-23 00:02:22.000000000 +0000 @@ -1,4 +1,4 @@ -/* init.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* init.c generated by valac 0.15.1, the Vala compiler * generated from init.vala, do not modify */ /* @@ -18,6 +18,7 @@ * along with this library. If not, see . * * Authors: Guillaume Desmottes + * Philip Withnall */ #include @@ -26,8 +27,10 @@ #include #include #include +#include #include #include +#include #define TYPE_INIT_TESTS (init_tests_get_type ()) @@ -44,6 +47,10 @@ #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) typedef struct _Block1Data Block1Data; #define _g_main_loop_unref0(var) ((var == NULL) ? NULL : (var = (g_main_loop_unref (var), NULL))) +typedef struct _Block2Data Block2Data; +#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) +#define _g_free0(var) (var = (g_free (var), NULL)) +typedef struct _InitTestsTestIndividualCountLoopData InitTestsTestIndividualCountLoopData; struct _InitTests { FolksTestCase parent_instance; @@ -66,6 +73,78 @@ GMainLoop* main_loop; }; +struct _Block2Data { + int _ref_count_; + InitTests * self; + GMainLoop* main_loop; +}; + +struct _InitTestsTestIndividualCountLoopData { + int _state_; + GObject* _source_object_; + GAsyncResult* _res_; + GSimpleAsyncResult* _async_result; + InitTests* self; + gchar** previous_individual_ids; + gint previous_individual_ids_length1; + gint _previous_individual_ids_size_; + guint i; + gboolean _tmp0_; + gboolean _tmp1_; + guint _tmp2_; + guint _tmp3_; + FolksIndividualAggregator* _tmp4_; + FolksIndividualAggregator* aggregator; + FolksIndividualAggregator* _tmp5_; + GError* e1; + GError* _tmp6_; + const gchar* _tmp7_; + gchar** _tmp8_; + gint _tmp8__length1; + FolksIndividualAggregator* _tmp9_; + GeeMap* _tmp10_; + GeeMap* _tmp11_; + GeeSet* _tmp12_; + GeeSet* _tmp13_; + GeeSet* _tmp14_; + gint _tmp15_; + gpointer* _tmp16_; + gchar** _tmp17_; + gint _tmp17__length1; + FolksIndividualAggregator* _tmp18_; + GeeMap* _tmp19_; + GeeMap* _tmp20_; + gint _tmp21_; + gint _tmp22_; + gchar** _tmp23_; + gint _tmp23__length1; + FolksIndividualAggregator* _tmp24_; + GeeMap* _tmp25_; + GeeMap* _tmp26_; + gint _tmp27_; + gint _tmp28_; + FolksIndividualAggregator* _tmp29_; + GeeMap* _tmp30_; + GeeMap* _tmp31_; + gint _tmp32_; + gint _tmp33_; + gchar** _tmp34_; + gint _tmp34__length1; + gchar** id_collection; + gint id_collection_length1; + gint _id_collection_size_; + gint id_it; + gchar* _tmp35_; + gchar* id; + const gchar* _tmp36_; + FolksIndividualAggregator* _tmp37_; + GeeMap* _tmp38_; + GeeMap* _tmp39_; + const gchar* _tmp40_; + gboolean _tmp41_; + GError * _inner_error_; +}; + static gpointer init_tests_parent_class = NULL; @@ -78,20 +157,42 @@ InitTests* init_tests_construct (GType object_type); void init_tests_test_looped (InitTests* self); static void _init_tests_test_looped_folks_test_case_test_method (gpointer self); +void init_tests_test_individual_count (InitTests* self); +static void _init_tests_test_individual_count_folks_test_case_test_method (gpointer self); static void init_tests_real_set_up (FolksTestCase* base); static void init_tests_real_tear_down (FolksTestCase* base); static Block1Data* block1_data_ref (Block1Data* _data1_); static void block1_data_unref (Block1Data* _data1_); static gboolean __lambda2_ (Block1Data* _data1_); static gboolean ___lambda2__gsource_func (gpointer self); +static Block2Data* block2_data_ref (Block2Data* _data2_); +static void block2_data_unref (Block2Data* _data2_); +static gboolean __lambda3_ (Block2Data* _data2_); +static void _init_tests_test_individual_count_loop (InitTests* self, GAsyncReadyCallback _callback_, gpointer _user_data_); +static void _init_tests_test_individual_count_loop_finish (InitTests* self, GAsyncResult* _res_); +static void __lambda4_ (Block2Data* _data2_, GObject* obj, GAsyncResult* res); +static void ___lambda4__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); +static gboolean ___lambda3__gsource_func (gpointer self); +static void _init_tests_test_individual_count_loop_data_free (gpointer _data); +static gboolean _init_tests_test_individual_count_loop_co (InitTestsTestIndividualCountLoopData* _data_); +static void _init_tests_test_individual_count_loop_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); static void init_tests_finalize (GObject* obj); gint _vala_main (gchar** args, int args_length1); +static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _init_tests_test_looped_folks_test_case_test_method (gpointer self) { -#line 37 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 38 "/home/treitter/collabora/folks/tests/folks/init.vala" init_tests_test_looped (self); -#line 95 "init.c" +#line 189 "init.c" +} + + +static void _init_tests_test_individual_count_folks_test_case_test_method (gpointer self) { +#line 39 "/home/treitter/collabora/folks/tests/folks/init.vala" + init_tests_test_individual_count (self); +#line 196 "init.c" } @@ -99,80 +200,86 @@ InitTests * self = NULL; KfTestBackend* _tmp0_; TpTestBackend* _tmp1_; -#line 31 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 32 "/home/treitter/collabora/folks/tests/folks/init.vala" self = (InitTests*) folks_test_case_construct (object_type, "Init"); -#line 33 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 34 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp0_ = kf_test_backend_new (); -#line 33 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 34 "/home/treitter/collabora/folks/tests/folks/init.vala" _kf_test_backend_unref0 (self->priv->_kf_backend); -#line 33 "/home/treitter/collabora/folks/tests/folks/init.vala" - self->priv->_kf_backend = _tmp0_; #line 34 "/home/treitter/collabora/folks/tests/folks/init.vala" + self->priv->_kf_backend = _tmp0_; +#line 35 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp1_ = tp_test_backend_new (); -#line 34 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 35 "/home/treitter/collabora/folks/tests/folks/init.vala" _g_object_unref0 (self->priv->_tp_backend); -#line 34 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 35 "/home/treitter/collabora/folks/tests/folks/init.vala" self->priv->_tp_backend = _tmp1_; -#line 37 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 38 "/home/treitter/collabora/folks/tests/folks/init.vala" folks_test_case_add_test ((FolksTestCase*) self, "looped", _init_tests_test_looped_folks_test_case_test_method, self); -#line 29 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 39 "/home/treitter/collabora/folks/tests/folks/init.vala" + folks_test_case_add_test ((FolksTestCase*) self, "individual-count", _init_tests_test_individual_count_folks_test_case_test_method, self); +#line 30 "/home/treitter/collabora/folks/tests/folks/init.vala" return self; -#line 121 "init.c" +#line 224 "init.c" } InitTests* init_tests_new (void) { -#line 29 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 30 "/home/treitter/collabora/folks/tests/folks/init.vala" return init_tests_construct (TYPE_INIT_TESTS); -#line 128 "init.c" +#line 231 "init.c" } static void init_tests_real_set_up (FolksTestCase* base) { InitTests * self; TpTestBackend* _tmp0_; -#line 40 "/home/treitter/collabora/folks/tests/folks/init.vala" - self = (InitTests*) base; #line 42 "/home/treitter/collabora/folks/tests/folks/init.vala" + self = (InitTests*) base; +#line 44 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp0_ = self->priv->_tp_backend; -#line 42 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 44 "/home/treitter/collabora/folks/tests/folks/init.vala" tp_test_backend_set_up (_tmp0_); -#line 141 "init.c" +#line 244 "init.c" } static void init_tests_real_tear_down (FolksTestCase* base) { InitTests * self; TpTestBackend* _tmp0_; -#line 45 "/home/treitter/collabora/folks/tests/folks/init.vala" - self = (InitTests*) base; #line 47 "/home/treitter/collabora/folks/tests/folks/init.vala" + self = (InitTests*) base; +#line 49 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp0_ = self->priv->_tp_backend; -#line 47 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 49 "/home/treitter/collabora/folks/tests/folks/init.vala" tp_test_backend_tear_down (_tmp0_); -#line 154 "init.c" +#line 257 "init.c" } static Block1Data* block1_data_ref (Block1Data* _data1_) { -#line 54 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 56 "/home/treitter/collabora/folks/tests/folks/init.vala" g_atomic_int_inc (&_data1_->_ref_count_); -#line 54 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 56 "/home/treitter/collabora/folks/tests/folks/init.vala" return _data1_; -#line 163 "init.c" +#line 266 "init.c" } static void block1_data_unref (Block1Data* _data1_) { -#line 54 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 56 "/home/treitter/collabora/folks/tests/folks/init.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { -#line 54 "/home/treitter/collabora/folks/tests/folks/init.vala" - _g_object_unref0 (_data1_->self); -#line 54 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 273 "init.c" + InitTests * self; +#line 56 "/home/treitter/collabora/folks/tests/folks/init.vala" + self = _data1_->self; +#line 56 "/home/treitter/collabora/folks/tests/folks/init.vala" _g_main_loop_unref0 (_data1_->main_loop); -#line 54 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 56 "/home/treitter/collabora/folks/tests/folks/init.vala" + _g_object_unref0 (self); +#line 56 "/home/treitter/collabora/folks/tests/folks/init.vala" g_slice_free (Block1Data, _data1_); -#line 176 "init.c" +#line 283 "init.c" } } @@ -181,26 +288,26 @@ InitTests * self; gboolean result = FALSE; GMainLoop* _tmp0_; -#line 74 "/home/treitter/collabora/folks/tests/folks/init.vala" - self = _data1_->self; #line 76 "/home/treitter/collabora/folks/tests/folks/init.vala" + self = _data1_->self; +#line 78 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp0_ = _data1_->main_loop; -#line 76 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 78 "/home/treitter/collabora/folks/tests/folks/init.vala" g_main_loop_quit (_tmp0_); -#line 77 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 79 "/home/treitter/collabora/folks/tests/folks/init.vala" result = FALSE; -#line 77 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 79 "/home/treitter/collabora/folks/tests/folks/init.vala" return result; -#line 195 "init.c" +#line 302 "init.c" } static gboolean ___lambda2__gsource_func (gpointer self) { gboolean result; result = __lambda2_ (self); -#line 74 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 76 "/home/treitter/collabora/folks/tests/folks/init.vala" return result; -#line 204 "init.c" +#line 311 "init.c" } @@ -221,159 +328,626 @@ TpTestBackend* _tmp16_; void* _tmp17_; KfTestBackend* _tmp18_; -#line 54 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 56 "/home/treitter/collabora/folks/tests/folks/init.vala" g_return_if_fail (self != NULL); -#line 54 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 56 "/home/treitter/collabora/folks/tests/folks/init.vala" _data1_ = g_slice_new0 (Block1Data); -#line 54 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 56 "/home/treitter/collabora/folks/tests/folks/init.vala" _data1_->_ref_count_ = 1; -#line 54 "/home/treitter/collabora/folks/tests/folks/init.vala" - _data1_->self = g_object_ref (self); #line 56 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data1_->self = g_object_ref (self); +#line 58 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp0_ = g_main_loop_new (NULL, FALSE); -#line 56 "/home/treitter/collabora/folks/tests/folks/init.vala" - _data1_->main_loop = _tmp0_; #line 58 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data1_->main_loop = _tmp0_; +#line 60 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp1_ = self->priv->_kf_backend; -#line 58 "/home/treitter/collabora/folks/tests/folks/init.vala" - kf_test_backend_set_up (_tmp1_, ""); #line 60 "/home/treitter/collabora/folks/tests/folks/init.vala" + kf_test_backend_set_up (_tmp1_, ""); +#line 62 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp2_ = self->priv->_tp_backend; -#line 60 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 62 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp3_ = tp_test_backend_add_account (_tmp2_, "protocol", "me@example.com", "cm", "account"); -#line 60 "/home/treitter/collabora/folks/tests/folks/init.vala" - account1_handle = _tmp3_; #line 62 "/home/treitter/collabora/folks/tests/folks/init.vala" + account1_handle = _tmp3_; +#line 64 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp4_ = self->priv->_tp_backend; -#line 62 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 64 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp5_ = tp_test_backend_add_account (_tmp4_, "protocol", "me2@example.com", "cm", "account2"); -#line 62 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 64 "/home/treitter/collabora/folks/tests/folks/init.vala" account2_handle = _tmp5_; -#line 253 "init.c" +#line 360 "init.c" { guint i; -#line 66 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 68 "/home/treitter/collabora/folks/tests/folks/init.vala" i = (guint) 0; -#line 258 "init.c" +#line 365 "init.c" { gboolean _tmp6_; -#line 66 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 68 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp6_ = TRUE; -#line 66 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 68 "/home/treitter/collabora/folks/tests/folks/init.vala" while (TRUE) { -#line 265 "init.c" +#line 372 "init.c" gboolean _tmp7_; guint _tmp9_; FolksIndividualAggregator* _tmp10_; FolksIndividualAggregator* aggregator; FolksIndividualAggregator* _tmp11_; -#line 66 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 68 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp7_ = _tmp6_; -#line 66 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 68 "/home/treitter/collabora/folks/tests/folks/init.vala" if (!_tmp7_) { -#line 275 "init.c" +#line 382 "init.c" guint _tmp8_; -#line 66 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 68 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp8_ = i; -#line 66 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 68 "/home/treitter/collabora/folks/tests/folks/init.vala" i = _tmp8_ + 1; -#line 281 "init.c" +#line 388 "init.c" } -#line 66 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 68 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp6_ = FALSE; -#line 66 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 68 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp9_ = i; -#line 66 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 68 "/home/treitter/collabora/folks/tests/folks/init.vala" if (!(_tmp9_ < ((guint) 10))) { -#line 66 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 68 "/home/treitter/collabora/folks/tests/folks/init.vala" break; -#line 291 "init.c" +#line 398 "init.c" } -#line 68 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 70 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp10_ = folks_individual_aggregator_new (); -#line 68 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 70 "/home/treitter/collabora/folks/tests/folks/init.vala" aggregator = _tmp10_; -#line 69 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 71 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp11_ = aggregator; -#line 69 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 71 "/home/treitter/collabora/folks/tests/folks/init.vala" folks_individual_aggregator_prepare (_tmp11_, NULL, NULL); -#line 70 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 72 "/home/treitter/collabora/folks/tests/folks/init.vala" _g_object_unref0 (aggregator); -#line 70 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 72 "/home/treitter/collabora/folks/tests/folks/init.vala" aggregator = NULL; -#line 66 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 68 "/home/treitter/collabora/folks/tests/folks/init.vala" _g_object_unref0 (aggregator); -#line 307 "init.c" +#line 414 "init.c" } } } -#line 74 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 76 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp12_ = self->priv->_test_timeout; -#line 74 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 76 "/home/treitter/collabora/folks/tests/folks/init.vala" g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) _tmp12_, ___lambda2__gsource_func, block1_data_ref (_data1_), block1_data_unref); -#line 80 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 82 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp13_ = _data1_->main_loop; -#line 80 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 82 "/home/treitter/collabora/folks/tests/folks/init.vala" g_main_loop_run (_tmp13_); -#line 83 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 85 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp14_ = self->priv->_tp_backend; -#line 83 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 85 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp15_ = account2_handle; -#line 83 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 85 "/home/treitter/collabora/folks/tests/folks/init.vala" tp_test_backend_remove_account (_tmp14_, _tmp15_); -#line 84 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 86 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp16_ = self->priv->_tp_backend; -#line 84 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 86 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp17_ = account1_handle; -#line 84 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 86 "/home/treitter/collabora/folks/tests/folks/init.vala" tp_test_backend_remove_account (_tmp16_, _tmp17_); -#line 85 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 87 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp18_ = self->priv->_kf_backend; -#line 85 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 87 "/home/treitter/collabora/folks/tests/folks/init.vala" kf_test_backend_tear_down (_tmp18_); -#line 54 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 56 "/home/treitter/collabora/folks/tests/folks/init.vala" block1_data_unref (_data1_); -#line 54 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 56 "/home/treitter/collabora/folks/tests/folks/init.vala" _data1_ = NULL; -#line 339 "init.c" +#line 446 "init.c" +} + + +static Block2Data* block2_data_ref (Block2Data* _data2_) { +#line 98 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_atomic_int_inc (&_data2_->_ref_count_); +#line 98 "/home/treitter/collabora/folks/tests/folks/init.vala" + return _data2_; +#line 455 "init.c" +} + + +static void block2_data_unref (Block2Data* _data2_) { +#line 98 "/home/treitter/collabora/folks/tests/folks/init.vala" + if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { +#line 462 "init.c" + InitTests * self; +#line 98 "/home/treitter/collabora/folks/tests/folks/init.vala" + self = _data2_->self; +#line 98 "/home/treitter/collabora/folks/tests/folks/init.vala" + _g_main_loop_unref0 (_data2_->main_loop); +#line 98 "/home/treitter/collabora/folks/tests/folks/init.vala" + _g_object_unref0 (self); +#line 98 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_slice_free (Block2Data, _data2_); +#line 472 "init.c" + } +} + + +static void __lambda4_ (Block2Data* _data2_, GObject* obj, GAsyncResult* res) { + InitTests * self; + GAsyncResult* _tmp0_; +#line 117 "/home/treitter/collabora/folks/tests/folks/init.vala" + self = _data2_->self; +#line 117 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_return_if_fail (res != NULL); +#line 119 "/home/treitter/collabora/folks/tests/folks/init.vala" + _tmp0_ = res; +#line 119 "/home/treitter/collabora/folks/tests/folks/init.vala" + _init_tests_test_individual_count_loop_finish (self, _tmp0_); +#line 120 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_main_loop_quit (_data2_->main_loop); +#line 490 "init.c" +} + + +static void ___lambda4__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { +#line 117 "/home/treitter/collabora/folks/tests/folks/init.vala" + __lambda4_ (self, source_object, res); +#line 117 "/home/treitter/collabora/folks/tests/folks/init.vala" + block2_data_unref (self); +#line 499 "init.c" +} + + +static gboolean __lambda3_ (Block2Data* _data2_) { + InitTests * self; + gboolean result = FALSE; +#line 115 "/home/treitter/collabora/folks/tests/folks/init.vala" + self = _data2_->self; +#line 117 "/home/treitter/collabora/folks/tests/folks/init.vala" + _init_tests_test_individual_count_loop (self, ___lambda4__gasync_ready_callback, block2_data_ref (_data2_)); +#line 123 "/home/treitter/collabora/folks/tests/folks/init.vala" + result = FALSE; +#line 123 "/home/treitter/collabora/folks/tests/folks/init.vala" + return result; +#line 514 "init.c" +} + + +static gboolean ___lambda3__gsource_func (gpointer self) { + gboolean result; + result = __lambda3_ (self); +#line 115 "/home/treitter/collabora/folks/tests/folks/init.vala" + return result; +#line 523 "init.c" +} + + +void init_tests_test_individual_count (InitTests* self) { + Block2Data* _data2_; + GMainLoop* _tmp0_; + KfTestBackend* _tmp1_; + TpTestBackend* _tmp2_; + void* _tmp3_ = NULL; + void* account1_handle; + TpTestBackend* _tmp4_; + void* _tmp5_ = NULL; + void* account2_handle; + TpTestBackend* _tmp6_; + TpTestBackend* _tmp7_; + KfTestBackend* _tmp8_; +#line 98 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_return_if_fail (self != NULL); +#line 98 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data2_ = g_slice_new0 (Block2Data); +#line 98 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data2_->_ref_count_ = 1; +#line 98 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data2_->self = g_object_ref (self); +#line 100 "/home/treitter/collabora/folks/tests/folks/init.vala" + _tmp0_ = g_main_loop_new (NULL, FALSE); +#line 100 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data2_->main_loop = _tmp0_; +#line 102 "/home/treitter/collabora/folks/tests/folks/init.vala" + _tmp1_ = self->priv->_kf_backend; +#line 102 "/home/treitter/collabora/folks/tests/folks/init.vala" + kf_test_backend_set_up (_tmp1_, "[0]\n" "msn=foo@hotmail.com\n" "[1]\n" "__alias=Bar McBadgerson\n" "jabber=bar@jabber.org\n"); +#line 109 "/home/treitter/collabora/folks/tests/folks/init.vala" + _tmp2_ = self->priv->_tp_backend; +#line 109 "/home/treitter/collabora/folks/tests/folks/init.vala" + _tmp3_ = tp_test_backend_add_account (_tmp2_, "protocol", "me@example.com", "cm", "account"); +#line 109 "/home/treitter/collabora/folks/tests/folks/init.vala" + account1_handle = _tmp3_; +#line 111 "/home/treitter/collabora/folks/tests/folks/init.vala" + _tmp4_ = self->priv->_tp_backend; +#line 111 "/home/treitter/collabora/folks/tests/folks/init.vala" + _tmp5_ = tp_test_backend_add_account (_tmp4_, "protocol", "me2@example.com", "cm", "account2"); +#line 111 "/home/treitter/collabora/folks/tests/folks/init.vala" + account2_handle = _tmp5_; +#line 115 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda3__gsource_func, block2_data_ref (_data2_), block2_data_unref); +#line 126 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_main_loop_run (_data2_->main_loop); +#line 129 "/home/treitter/collabora/folks/tests/folks/init.vala" + _tmp6_ = self->priv->_tp_backend; +#line 129 "/home/treitter/collabora/folks/tests/folks/init.vala" + tp_test_backend_remove_account (_tmp6_, account2_handle); +#line 130 "/home/treitter/collabora/folks/tests/folks/init.vala" + _tmp7_ = self->priv->_tp_backend; +#line 130 "/home/treitter/collabora/folks/tests/folks/init.vala" + tp_test_backend_remove_account (_tmp7_, account1_handle); +#line 132 "/home/treitter/collabora/folks/tests/folks/init.vala" + _tmp8_ = self->priv->_kf_backend; +#line 132 "/home/treitter/collabora/folks/tests/folks/init.vala" + kf_test_backend_tear_down (_tmp8_); +#line 98 "/home/treitter/collabora/folks/tests/folks/init.vala" + block2_data_unref (_data2_); +#line 98 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data2_ = NULL; +#line 588 "init.c" +} + + +static void _init_tests_test_individual_count_loop_data_free (gpointer _data) { + InitTestsTestIndividualCountLoopData* _data_; + _data_ = _data; +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" + _g_object_unref0 (_data_->self); +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_slice_free (InitTestsTestIndividualCountLoopData, _data_); +#line 599 "init.c" +} + + +static gpointer _g_object_ref0 (gpointer self) { +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" + return self ? g_object_ref (self) : NULL; +#line 606 "init.c" +} + + +static void _init_tests_test_individual_count_loop (InitTests* self, GAsyncReadyCallback _callback_, gpointer _user_data_) { + InitTestsTestIndividualCountLoopData* _data_; + InitTests* _tmp0_; +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_ = g_slice_new0 (InitTestsTestIndividualCountLoopData); +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _init_tests_test_individual_count_loop); +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _init_tests_test_individual_count_loop_data_free); +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" + _tmp0_ = _g_object_ref0 (self); +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->self = _tmp0_; +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" + _init_tests_test_individual_count_loop_co (_data_); +#line 625 "init.c" +} + + +static void _init_tests_test_individual_count_loop_finish (InitTests* self, GAsyncResult* _res_) { + InitTestsTestIndividualCountLoopData* _data_; +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); +#line 633 "init.c" +} + + +static void _init_tests_test_individual_count_loop_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { + InitTestsTestIndividualCountLoopData* _data_; +#line 145 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_ = _user_data_; +#line 145 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_source_object_ = source_object; +#line 145 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_res_ = _res_; +#line 145 "/home/treitter/collabora/folks/tests/folks/init.vala" + _init_tests_test_individual_count_loop_co (_data_); +#line 647 "init.c" +} + + +static gboolean _init_tests_test_individual_count_loop_co (InitTestsTestIndividualCountLoopData* _data_) { +#line 135 "/home/treitter/collabora/folks/tests/folks/init.vala" + switch (_data_->_state_) { +#line 135 "/home/treitter/collabora/folks/tests/folks/init.vala" + case 0: +#line 656 "init.c" + goto _state_0; +#line 135 "/home/treitter/collabora/folks/tests/folks/init.vala" + case 1: +#line 660 "init.c" + goto _state_1; + default: +#line 135 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_assert_not_reached (); +#line 665 "init.c" + } + _state_0: +#line 137 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->previous_individual_ids = NULL; +#line 137 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->previous_individual_ids_length1 = 0; +#line 137 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_previous_individual_ids_size_ = _data_->previous_individual_ids_length1; +#line 674 "init.c" + { +#line 139 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->i = (guint) 0; +#line 678 "init.c" + { +#line 139 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp0_ = TRUE; +#line 139 "/home/treitter/collabora/folks/tests/folks/init.vala" + while (TRUE) { +#line 139 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp1_ = _data_->_tmp0_; +#line 139 "/home/treitter/collabora/folks/tests/folks/init.vala" + if (!_data_->_tmp1_) { +#line 139 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp2_ = _data_->i; +#line 139 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->i = _data_->_tmp2_ + 1; +#line 692 "init.c" + } +#line 139 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp0_ = FALSE; +#line 139 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp3_ = _data_->i; +#line 139 "/home/treitter/collabora/folks/tests/folks/init.vala" + if (!(_data_->_tmp3_ < ((guint) 10))) { +#line 139 "/home/treitter/collabora/folks/tests/folks/init.vala" + break; +#line 702 "init.c" + } +#line 141 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp4_ = folks_individual_aggregator_new (); +#line 141 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->aggregator = _data_->_tmp4_; +#line 708 "init.c" + { +#line 145 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp5_ = _data_->aggregator; +#line 145 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_state_ = 1; +#line 145 "/home/treitter/collabora/folks/tests/folks/init.vala" + folks_test_utils_aggregator_prepare_and_wait_for_quiescence (_data_->_tmp5_, _init_tests_test_individual_count_loop_ready, _data_); +#line 145 "/home/treitter/collabora/folks/tests/folks/init.vala" + return FALSE; +#line 718 "init.c" + _state_1: +#line 145 "/home/treitter/collabora/folks/tests/folks/init.vala" + folks_test_utils_aggregator_prepare_and_wait_for_quiescence_finish (_data_->_res_, &_data_->_inner_error_); +#line 145 "/home/treitter/collabora/folks/tests/folks/init.vala" + if (_data_->_inner_error_ != NULL) { +#line 724 "init.c" + goto __catch0_g_error; + } + } + goto __finally0; + __catch0_g_error: + { +#line 143 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->e1 = _data_->_inner_error_; +#line 143 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_inner_error_ = NULL; +#line 150 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp6_ = _data_->e1; +#line 150 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp7_ = _data_->_tmp6_->message; +#line 150 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_critical ("init.vala:150: Error preparing aggregator: %s", _data_->_tmp7_); +#line 143 "/home/treitter/collabora/folks/tests/folks/init.vala" + _g_error_free0 (_data_->e1); +#line 743 "init.c" + } + __finally0: +#line 143 "/home/treitter/collabora/folks/tests/folks/init.vala" + if (_data_->_inner_error_ != NULL) { +#line 143 "/home/treitter/collabora/folks/tests/folks/init.vala" + _g_object_unref0 (_data_->aggregator); +#line 143 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->previous_individual_ids = (_vala_array_free (_data_->previous_individual_ids, _data_->previous_individual_ids_length1, (GDestroyNotify) g_free), NULL); +#line 143 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); +#line 143 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_clear_error (&_data_->_inner_error_); +#line 143 "/home/treitter/collabora/folks/tests/folks/init.vala" + return FALSE; +#line 758 "init.c" + } +#line 153 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp8_ = _data_->previous_individual_ids; +#line 153 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp8__length1 = _data_->previous_individual_ids_length1; +#line 153 "/home/treitter/collabora/folks/tests/folks/init.vala" + if (_data_->_tmp8_ == NULL) { +#line 156 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp9_ = _data_->aggregator; +#line 156 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp10_ = folks_individual_aggregator_get_individuals (_data_->_tmp9_); +#line 156 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp11_ = _data_->_tmp10_; +#line 156 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp12_ = gee_map_get_keys (_data_->_tmp11_); +#line 156 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp13_ = _data_->_tmp12_; +#line 156 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp14_ = _data_->_tmp13_; +#line 156 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp15_ = 0; +#line 156 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp16_ = NULL; +#line 156 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp16_ = gee_collection_to_array ((GeeCollection*) _data_->_tmp14_, &_data_->_tmp15_); +#line 156 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->previous_individual_ids = (_vala_array_free (_data_->previous_individual_ids, _data_->previous_individual_ids_length1, (GDestroyNotify) g_free), NULL); +#line 156 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->previous_individual_ids = _data_->_tmp16_; +#line 156 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->previous_individual_ids_length1 = _data_->_tmp15_; +#line 156 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_previous_individual_ids_size_ = _data_->previous_individual_ids_length1; +#line 156 "/home/treitter/collabora/folks/tests/folks/init.vala" + _g_object_unref0 (_data_->_tmp14_); +#line 794 "init.c" + } else { +#line 161 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp17_ = _data_->previous_individual_ids; +#line 161 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp17__length1 = _data_->previous_individual_ids_length1; +#line 161 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp18_ = _data_->aggregator; +#line 161 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp19_ = folks_individual_aggregator_get_individuals (_data_->_tmp18_); +#line 161 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp20_ = _data_->_tmp19_; +#line 161 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp21_ = gee_map_get_size (_data_->_tmp20_); +#line 161 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp22_ = _data_->_tmp21_; +#line 161 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_debug ("init.vala:161: %u vs %u individuals:", (guint) _data_->_tmp17__length1, (guint) _data_->_tmp22_); +#line 163 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp23_ = _data_->previous_individual_ids; +#line 163 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp23__length1 = _data_->previous_individual_ids_length1; +#line 163 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp24_ = _data_->aggregator; +#line 163 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp25_ = folks_individual_aggregator_get_individuals (_data_->_tmp24_); +#line 163 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp26_ = _data_->_tmp25_; +#line 163 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp27_ = gee_map_get_size (_data_->_tmp26_); +#line 163 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp28_ = _data_->_tmp27_; +#line 163 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_assert (_data_->_tmp23__length1 == _data_->_tmp28_); +#line 165 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp29_ = _data_->aggregator; +#line 165 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp30_ = folks_individual_aggregator_get_individuals (_data_->_tmp29_); +#line 165 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp31_ = _data_->_tmp30_; +#line 165 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp32_ = gee_map_get_size (_data_->_tmp31_); +#line 165 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp33_ = _data_->_tmp32_; +#line 165 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_assert (_data_->_tmp33_ > 0); +#line 167 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp34_ = _data_->previous_individual_ids; +#line 167 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp34__length1 = _data_->previous_individual_ids_length1; +#line 844 "init.c" + { +#line 167 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->id_collection_length1 = 0; +#line 167 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_id_collection_size_ = 0; +#line 167 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->id_collection = _data_->_tmp34_; +#line 167 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->id_collection_length1 = _data_->_tmp34__length1; +#line 167 "/home/treitter/collabora/folks/tests/folks/init.vala" + for (_data_->id_it = 0; _data_->id_it < _data_->_tmp34__length1; _data_->id_it = _data_->id_it + 1) { +#line 167 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp35_ = g_strdup (_data_->id_collection[_data_->id_it]); +#line 167 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->id = _data_->_tmp35_; +#line 860 "init.c" + { +#line 169 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp36_ = _data_->id; +#line 169 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_debug ("init.vala:169: %s", _data_->_tmp36_); +#line 170 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp37_ = _data_->aggregator; +#line 170 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp38_ = folks_individual_aggregator_get_individuals (_data_->_tmp37_); +#line 170 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp39_ = _data_->_tmp38_; +#line 170 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp40_ = _data_->id; +#line 170 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp41_ = FALSE; +#line 170 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->_tmp41_ = gee_map_has_key (_data_->_tmp39_, _data_->_tmp40_); +#line 170 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_assert (_data_->_tmp41_ == TRUE); +#line 167 "/home/treitter/collabora/folks/tests/folks/init.vala" + _g_free0 (_data_->id); +#line 882 "init.c" + } + } + } + } +#line 175 "/home/treitter/collabora/folks/tests/folks/init.vala" + _g_object_unref0 (_data_->aggregator); +#line 175 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->aggregator = NULL; +#line 139 "/home/treitter/collabora/folks/tests/folks/init.vala" + _g_object_unref0 (_data_->aggregator); +#line 893 "init.c" + } + } + } +#line 135 "/home/treitter/collabora/folks/tests/folks/init.vala" + _data_->previous_individual_ids = (_vala_array_free (_data_->previous_individual_ids, _data_->previous_individual_ids_length1, (GDestroyNotify) g_free), NULL); +#line 135 "/home/treitter/collabora/folks/tests/folks/init.vala" + if (_data_->_state_ == 0) { +#line 135 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_simple_async_result_complete_in_idle (_data_->_async_result); +#line 903 "init.c" + } else { +#line 135 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_simple_async_result_complete (_data_->_async_result); +#line 907 "init.c" + } +#line 135 "/home/treitter/collabora/folks/tests/folks/init.vala" + g_object_unref (_data_->_async_result); +#line 135 "/home/treitter/collabora/folks/tests/folks/init.vala" + return FALSE; +#line 913 "init.c" } static void init_tests_class_init (InitTestsClass * klass) { -#line 23 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" init_tests_parent_class = g_type_class_peek_parent (klass); -#line 23 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" g_type_class_add_private (klass, sizeof (InitTestsPrivate)); -#line 23 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" FOLKS_TEST_CASE_CLASS (klass)->set_up = init_tests_real_set_up; -#line 23 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" FOLKS_TEST_CASE_CLASS (klass)->tear_down = init_tests_real_tear_down; -#line 23 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" G_OBJECT_CLASS (klass)->finalize = init_tests_finalize; -#line 354 "init.c" +#line 928 "init.c" } static void init_tests_instance_init (InitTests * self) { -#line 23 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" self->priv = INIT_TESTS_GET_PRIVATE (self); -#line 27 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 28 "/home/treitter/collabora/folks/tests/folks/init.vala" self->priv->_test_timeout = 5; -#line 363 "init.c" +#line 937 "init.c" } static void init_tests_finalize (GObject* obj) { InitTests * self; -#line 23 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" self = INIT_TESTS (obj); -#line 25 "/home/treitter/collabora/folks/tests/folks/init.vala" - _kf_test_backend_unref0 (self->priv->_kf_backend); #line 26 "/home/treitter/collabora/folks/tests/folks/init.vala" + _kf_test_backend_unref0 (self->priv->_kf_backend); +#line 27 "/home/treitter/collabora/folks/tests/folks/init.vala" _g_object_unref0 (self->priv->_tp_backend); -#line 23 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 24 "/home/treitter/collabora/folks/tests/folks/init.vala" G_OBJECT_CLASS (init_tests_parent_class)->finalize (obj); -#line 377 "init.c" +#line 951 "init.c" } @@ -396,38 +970,56 @@ InitTests* _tmp1_; InitTests* _tmp2_; GTestSuite* _tmp3_ = NULL; -#line 91 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 182 "/home/treitter/collabora/folks/tests/folks/init.vala" g_test_init (&args_length1, &args, NULL); -#line 93 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 184 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp0_ = g_test_get_root (); -#line 93 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 184 "/home/treitter/collabora/folks/tests/folks/init.vala" root = _tmp0_; -#line 94 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 185 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp1_ = init_tests_new (); -#line 94 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 185 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp2_ = _tmp1_; -#line 94 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 185 "/home/treitter/collabora/folks/tests/folks/init.vala" _tmp3_ = folks_test_case_get_suite ((FolksTestCase*) _tmp2_); -#line 94 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 185 "/home/treitter/collabora/folks/tests/folks/init.vala" g_test_suite_add_suite (root, _tmp3_); -#line 94 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 185 "/home/treitter/collabora/folks/tests/folks/init.vala" _g_object_unref0 (_tmp2_); -#line 96 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 187 "/home/treitter/collabora/folks/tests/folks/init.vala" g_test_run (); -#line 98 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 189 "/home/treitter/collabora/folks/tests/folks/init.vala" result = 0; -#line 98 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 189 "/home/treitter/collabora/folks/tests/folks/init.vala" return result; -#line 422 "init.c" +#line 996 "init.c" } int main (int argc, char ** argv) { -#line 89 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 180 "/home/treitter/collabora/folks/tests/folks/init.vala" g_type_init (); -#line 89 "/home/treitter/collabora/folks/tests/folks/init.vala" +#line 180 "/home/treitter/collabora/folks/tests/folks/init.vala" return _vala_main (argv, argc); -#line 431 "init.c" +#line 1005 "init.c" +} + + +static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { + if ((array != NULL) && (destroy_func != NULL)) { + int i; + for (i = 0; i < array_length; i = i + 1) { + if (((gpointer*) array)[i] != NULL) { + destroy_func (((gpointer*) array)[i]); + } + } + } +} + + +static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { + _vala_array_destroy (array, array_length, destroy_func); + g_free (array); } diff -Nru folks-0.6.6/tests/folks/init.vala folks-0.6.7/tests/folks/init.vala --- folks-0.6.6/tests/folks/init.vala 2011-12-13 23:32:49.000000000 +0000 +++ folks-0.6.7/tests/folks/init.vala 2012-01-12 17:25:24.000000000 +0000 @@ -15,6 +15,7 @@ * along with this library. If not, see . * * Authors: Guillaume Desmottes + * Philip Withnall */ using Gee; @@ -35,6 +36,7 @@ /* Set up the tests */ this.add_test ("looped", this.test_looped); + this.add_test ("individual-count", this.test_individual_count); } public override void set_up () @@ -84,6 +86,95 @@ this._tp_backend.remove_account (account1_handle); this._kf_backend.tear_down (); } + + /* Prepare an aggregator and wait for quiescence, then count how many + * individuals it contains. Loop and do the same thing again, then compare + * the numbers of individuals and their IDs. Do this several times. + * + * This tests that the preparation code in IndividualAggregator can handle + * Backends and PersonaStores which have been prepared before the aggregator + * was created. To a lesser extent, it also tests that the aggregation code + * is deterministic. See: bgo#667410. */ + public void test_individual_count () + { + var main_loop = new GLib.MainLoop (null, false); + + this._kf_backend.set_up ( + "[0]\n" + + "msn=foo@hotmail.com\n" + + "[1]\n" + + "__alias=Bar McBadgerson\n" + + "jabber=bar@jabber.org\n"); + + void* account1_handle = this._tp_backend.add_account ("protocol", + "me@example.com", "cm", "account"); + void* account2_handle = this._tp_backend.add_account ("protocol", + "me2@example.com", "cm", "account2"); + + /* Run the test loop. */ + Idle.add (() => + { + this._test_individual_count_loop.begin ((obj, res) => + { + this._test_individual_count_loop.end (res); + main_loop.quit (); + }); + + return false; + }); + + main_loop.run (); + + /* Clean up for the next test */ + this._tp_backend.remove_account (account2_handle); + this._tp_backend.remove_account (account1_handle); + + this._kf_backend.tear_down (); + } + + private async void _test_individual_count_loop () + { + string[]? previous_individual_ids = null; + + for (uint i = 0; i < 10; i++) + { + var aggregator = new IndividualAggregator (); + + try + { + yield TestUtils.aggregator_prepare_and_wait_for_quiescence ( + aggregator); + } + catch (GLib.Error e1) + { + GLib.critical ("Error preparing aggregator: %s", e1.message); + } + + if (previous_individual_ids == null) + { + /* First iteration; store the set of IDs. */ + previous_individual_ids = aggregator.individuals.keys.to_array (); + } + else + { + /* Compare this set to the previous aggregator's set. */ + debug ("%u vs %u individuals:", previous_individual_ids.length, + aggregator.individuals.size); + assert (previous_individual_ids.length == + aggregator.individuals.size); + assert (aggregator.individuals.size > 0); + + foreach (var id in previous_individual_ids) + { + debug (" %s", id); + assert (aggregator.individuals.has_key (id) == true); + } + } + + /* Destroy the aggregator and loop. */ + aggregator = null; + } + } } public int main (string[] args) diff -Nru folks-0.6.6/tests/folks/Makefile.in folks-0.6.7/tests/folks/Makefile.in --- folks-0.6.6/tests/folks/Makefile.in 2011-12-13 23:38:41.000000000 +0000 +++ folks-0.6.7/tests/folks/Makefile.in 2012-02-23 00:04:12.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -47,10 +47,11 @@ utils_vala.stamp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -194,6 +195,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -550,77 +553,74 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< $(srcdir)/init.c: $(srcdir)/init_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/init_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/init_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) init_vala.stamp; \ fi init_vala.stamp: $(init_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(init_SOURCES) $(AM_V_at)touch $@ $(srcdir)/backend-loading.c: $(srcdir)/backend_loading_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/backend_loading_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/backend_loading_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) backend_loading_vala.stamp; \ fi backend_loading_vala.stamp: $(backend_loading_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(backend_loading_SOURCES) $(AM_V_at)touch $@ $(srcdir)/avatar-cache.c: $(srcdir)/avatar_cache_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/avatar_cache_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/avatar_cache_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) avatar_cache_vala.stamp; \ fi avatar_cache_vala.stamp: $(avatar_cache_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(avatar_cache_SOURCES) $(AM_V_at)touch $@ $(srcdir)/utils.c: $(srcdir)/utils_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/utils_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/utils_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) utils_vala.stamp; \ fi utils_vala.stamp: $(utils_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(utils_SOURCES) $(AM_V_at)touch $@ $(srcdir)/object-cache.c: $(srcdir)/object_cache_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/object_cache_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/object_cache_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) object_cache_vala.stamp; \ fi object_cache_vala.stamp: $(object_cache_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(object_cache_SOURCES) $(AM_V_at)touch $@ $(srcdir)/aggregation.c: $(srcdir)/aggregation_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/aggregation_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/aggregation_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) aggregation_vala.stamp; \ fi aggregation_vala.stamp: $(aggregation_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(aggregation_SOURCES) $(AM_V_at)touch $@ $(srcdir)/abstract-field-details.c: $(srcdir)/abstract_field_details_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/abstract_field_details_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/abstract_field_details_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) abstract_field_details_vala.stamp; \ fi abstract_field_details_vala.stamp: $(abstract_field_details_SOURCES) @@ -766,14 +766,15 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ test "$$failed" -eq 0; \ else :; fi @@ -822,10 +823,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/tests/folks/object-cache.c folks-0.6.7/tests/folks/object-cache.c --- folks-0.6.6/tests/folks/object-cache.c 2011-12-13 23:41:33.000000000 +0000 +++ folks-0.6.7/tests/folks/object-cache.c 2012-02-23 00:02:23.000000000 +0000 @@ -1,4 +1,4 @@ -/* object-cache.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* object-cache.c generated by valac 0.15.1, the Vala compiler * generated from object-cache.vala, do not modify */ @@ -1360,15 +1360,19 @@ static void block1_data_unref (Block1Data* _data1_) { #line 155 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { +#line 1364 "object-cache.c" + ObjectCacheTests * self; #line 155 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" - _g_object_unref0 (_data1_->self); + self = _data1_->self; #line 155 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_object_unref0 (_data1_->cache); #line 155 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_main_loop_unref0 (_data1_->main_loop); #line 155 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" + _g_object_unref0 (self); +#line 155 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_slice_free (Block1Data, _data1_); -#line 1372 "object-cache.c" +#line 1376 "object-cache.c" } } @@ -1386,7 +1390,7 @@ folks_object_cache_store_objects_finish ((FolksObjectCache*) _data1_->cache, _tmp0_); #line 169 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_data1_->main_loop); -#line 1390 "object-cache.c" +#line 1394 "object-cache.c" } @@ -1395,7 +1399,7 @@ __lambda2_ (self, source_object, res); #line 166 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block1_data_unref (self); -#line 1399 "object-cache.c" +#line 1403 "object-cache.c" } @@ -1475,7 +1479,7 @@ block1_data_unref (_data1_); #line 155 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _data1_ = NULL; -#line 1479 "object-cache.c" +#line 1483 "object-cache.c" } @@ -1484,22 +1488,26 @@ g_atomic_int_inc (&_data2_->_ref_count_); #line 175 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" return _data2_; -#line 1488 "object-cache.c" +#line 1492 "object-cache.c" } static void block2_data_unref (Block2Data* _data2_) { #line 175 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { +#line 1499 "object-cache.c" + ObjectCacheTests * self; #line 175 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" - _g_object_unref0 (_data2_->self); + self = _data2_->self; #line 175 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_object_unref0 (_data2_->cache); #line 175 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_main_loop_unref0 (_data2_->main_loop); #line 175 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" + _g_object_unref0 (self); +#line 175 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_slice_free (Block2Data, _data2_); -#line 1503 "object-cache.c" +#line 1511 "object-cache.c" } } @@ -1517,7 +1525,7 @@ folks_object_cache_store_objects_finish ((FolksObjectCache*) _data2_->cache, _tmp0_); #line 183 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_data2_->main_loop); -#line 1521 "object-cache.c" +#line 1529 "object-cache.c" } @@ -1526,7 +1534,7 @@ __lambda3_ (self, source_object, res); #line 180 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block2_data_unref (self); -#line 1530 "object-cache.c" +#line 1538 "object-cache.c" } @@ -1566,7 +1574,7 @@ block2_data_unref (_data2_); #line 175 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _data2_ = NULL; -#line 1570 "object-cache.c" +#line 1578 "object-cache.c" } @@ -1575,15 +1583,17 @@ g_atomic_int_inc (&_data3_->_ref_count_); #line 189 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" return _data3_; -#line 1579 "object-cache.c" +#line 1587 "object-cache.c" } static void block3_data_unref (Block3Data* _data3_) { #line 189 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { +#line 1594 "object-cache.c" + ObjectCacheTests * self; #line 189 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" - _g_object_unref0 (_data3_->self); + self = _data3_->self; #line 189 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_object_unref0 (_data3_->new_obj_set); #line 189 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" @@ -1591,8 +1601,10 @@ #line 189 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_main_loop_unref0 (_data3_->main_loop); #line 189 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" + _g_object_unref0 (self); +#line 189 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_slice_free (Block3Data, _data3_); -#line 1596 "object-cache.c" +#line 1608 "object-cache.c" } } @@ -1616,7 +1628,7 @@ _tmp2_ = _data3_->main_loop; #line 206 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_tmp2_); -#line 1620 "object-cache.c" +#line 1632 "object-cache.c" } @@ -1625,7 +1637,7 @@ __lambda4_ (self, source_object, res); #line 203 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block3_data_unref (self); -#line 1629 "object-cache.c" +#line 1641 "object-cache.c" } @@ -1653,7 +1665,7 @@ _tmp3_ = _data3_->main_loop; #line 216 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_tmp3_); -#line 1657 "object-cache.c" +#line 1669 "object-cache.c" } @@ -1662,7 +1674,7 @@ __lambda5_ (self, source_object, res); #line 213 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block3_data_unref (self); -#line 1666 "object-cache.c" +#line 1678 "object-cache.c" } @@ -1768,12 +1780,12 @@ #line 223 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _tmp18_ = obj_set; #line 223 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" - _tmp19_ = gee_collection_get_size ((GeeCollection*) _tmp18_); + _tmp19_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp18_); #line 223 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _tmp20_ = _tmp19_; #line 223 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_assert (_tmp17_ == _tmp20_); -#line 1777 "object-cache.c" +#line 1789 "object-cache.c" { GeeSet* _tmp21_; GeeIterator* _tmp22_ = NULL; @@ -1786,7 +1798,7 @@ _new_obj_it = _tmp22_; #line 225 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" while (TRUE) { -#line 1790 "object-cache.c" +#line 1802 "object-cache.c" GeeIterator* _tmp23_; gboolean _tmp24_ = FALSE; GeeIterator* _tmp25_; @@ -1802,7 +1814,7 @@ if (!_tmp24_) { #line 225 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" break; -#line 1806 "object-cache.c" +#line 1818 "object-cache.c" } #line 225 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _tmp25_ = _new_obj_it; @@ -1812,7 +1824,7 @@ new_obj = (TestObject*) _tmp26_; #line 227 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" partner_found = FALSE; -#line 1816 "object-cache.c" +#line 1828 "object-cache.c" { GeeHashSet* _tmp27_; GeeIterator* _tmp28_ = NULL; @@ -1825,7 +1837,7 @@ _original_obj_it = _tmp28_; #line 229 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" while (TRUE) { -#line 1829 "object-cache.c" +#line 1841 "object-cache.c" GeeIterator* _tmp29_; gboolean _tmp30_ = FALSE; GeeIterator* _tmp31_; @@ -1847,7 +1859,7 @@ if (!_tmp30_) { #line 229 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" break; -#line 1851 "object-cache.c" +#line 1863 "object-cache.c" } #line 229 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _tmp31_ = _original_obj_it; @@ -1869,7 +1881,7 @@ _tmp39_ = _tmp38_; #line 231 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" if (g_strcmp0 (_tmp36_, _tmp39_) == 0) { -#line 1873 "object-cache.c" +#line 1885 "object-cache.c" TestObject* _tmp40_; guint _tmp41_; guint _tmp42_; @@ -1890,17 +1902,17 @@ _tmp45_ = _tmp44_; #line 232 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _tmp33_ = _tmp42_ == _tmp45_; -#line 1894 "object-cache.c" +#line 1906 "object-cache.c" } else { #line 231 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _tmp33_ = FALSE; -#line 1898 "object-cache.c" +#line 1910 "object-cache.c" } #line 231 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _tmp46_ = _tmp33_; #line 231 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" if (_tmp46_) { -#line 1904 "object-cache.c" +#line 1916 "object-cache.c" GeeHashSet* _tmp47_; TestObject* _tmp48_; #line 234 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" @@ -1915,15 +1927,15 @@ _test_object_unref0 (original_obj); #line 236 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" break; -#line 1919 "object-cache.c" +#line 1931 "object-cache.c" } #line 229 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _test_object_unref0 (original_obj); -#line 1923 "object-cache.c" +#line 1935 "object-cache.c" } #line 229 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_object_unref0 (_original_obj_it); -#line 1927 "object-cache.c" +#line 1939 "object-cache.c" } #line 240 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _tmp49_ = partner_found; @@ -1931,16 +1943,16 @@ g_assert (_tmp49_); #line 225 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _test_object_unref0 (new_obj); -#line 1935 "object-cache.c" +#line 1947 "object-cache.c" } #line 225 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_object_unref0 (_new_obj_it); -#line 1939 "object-cache.c" +#line 1951 "object-cache.c" } #line 243 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _tmp50_ = obj_set; #line 243 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" - _tmp51_ = gee_collection_get_size ((GeeCollection*) _tmp50_); + _tmp51_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp50_); #line 243 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _tmp52_ = _tmp51_; #line 243 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" @@ -1955,7 +1967,7 @@ block3_data_unref (_data3_); #line 189 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _data3_ = NULL; -#line 1959 "object-cache.c" +#line 1971 "object-cache.c" } @@ -1964,15 +1976,17 @@ g_atomic_int_inc (&_data4_->_ref_count_); #line 246 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" return _data4_; -#line 1968 "object-cache.c" +#line 1980 "object-cache.c" } static void block4_data_unref (Block4Data* _data4_) { #line 246 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) { +#line 1987 "object-cache.c" + ObjectCacheTests * self; #line 246 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" - _g_object_unref0 (_data4_->self); + self = _data4_->self; #line 246 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_object_unref0 (_data4_->new_obj_set); #line 246 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" @@ -1980,8 +1994,10 @@ #line 246 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_main_loop_unref0 (_data4_->main_loop); #line 246 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" + _g_object_unref0 (self); +#line 246 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_slice_free (Block4Data, _data4_); -#line 1985 "object-cache.c" +#line 2001 "object-cache.c" } } @@ -1999,7 +2015,7 @@ folks_object_cache_store_objects_finish ((FolksObjectCache*) _data4_->cache, _tmp0_); #line 255 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_data4_->main_loop); -#line 2003 "object-cache.c" +#line 2019 "object-cache.c" } @@ -2008,7 +2024,7 @@ __lambda6_ (self, source_object, res); #line 252 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block4_data_unref (self); -#line 2012 "object-cache.c" +#line 2028 "object-cache.c" } @@ -2030,7 +2046,7 @@ _data4_->new_obj_set = _tmp1_; #line 265 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_data4_->main_loop); -#line 2034 "object-cache.c" +#line 2050 "object-cache.c" } @@ -2039,7 +2055,7 @@ __lambda7_ (self, source_object, res); #line 262 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block4_data_unref (self); -#line 2043 "object-cache.c" +#line 2059 "object-cache.c" } @@ -2095,7 +2111,7 @@ block4_data_unref (_data4_); #line 246 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _data4_ = NULL; -#line 2099 "object-cache.c" +#line 2115 "object-cache.c" } @@ -2104,15 +2120,17 @@ g_atomic_int_inc (&_data5_->_ref_count_); #line 275 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" return _data5_; -#line 2108 "object-cache.c" +#line 2124 "object-cache.c" } static void block5_data_unref (Block5Data* _data5_) { #line 275 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) { +#line 2131 "object-cache.c" + ObjectCacheTests * self; #line 275 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" - _g_object_unref0 (_data5_->self); + self = _data5_->self; #line 275 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_object_unref0 (_data5_->new_obj_set); #line 275 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" @@ -2120,8 +2138,10 @@ #line 275 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_main_loop_unref0 (_data5_->main_loop); #line 275 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" + _g_object_unref0 (self); +#line 275 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_slice_free (Block5Data, _data5_); -#line 2125 "object-cache.c" +#line 2145 "object-cache.c" } } @@ -2144,7 +2164,7 @@ _data5_->new_obj_set = _tmp1_; #line 288 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_data5_->main_loop); -#line 2148 "object-cache.c" +#line 2168 "object-cache.c" } @@ -2153,7 +2173,7 @@ __lambda8_ (self, source_object, res); #line 285 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block5_data_unref (self); -#line 2157 "object-cache.c" +#line 2177 "object-cache.c" } @@ -2191,7 +2211,7 @@ block5_data_unref (_data5_); #line 275 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _data5_ = NULL; -#line 2195 "object-cache.c" +#line 2215 "object-cache.c" } @@ -2200,15 +2220,17 @@ g_atomic_int_inc (&_data6_->_ref_count_); #line 297 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" return _data6_; -#line 2204 "object-cache.c" +#line 2224 "object-cache.c" } static void block6_data_unref (Block6Data* _data6_) { #line 297 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) { +#line 2231 "object-cache.c" + ObjectCacheTests * self; #line 297 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" - _g_object_unref0 (_data6_->self); + self = _data6_->self; #line 297 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_object_unref0 (_data6_->new_obj_set); #line 297 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" @@ -2216,8 +2238,10 @@ #line 297 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_main_loop_unref0 (_data6_->main_loop); #line 297 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" + _g_object_unref0 (self); +#line 297 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_slice_free (Block6Data, _data6_); -#line 2221 "object-cache.c" +#line 2245 "object-cache.c" } } @@ -2235,7 +2259,7 @@ folks_object_cache_store_objects_finish ((FolksObjectCache*) _data6_->cache, _tmp0_); #line 314 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_data6_->main_loop); -#line 2239 "object-cache.c" +#line 2263 "object-cache.c" } @@ -2244,7 +2268,7 @@ __lambda9_ (self, source_object, res); #line 311 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block6_data_unref (self); -#line 2248 "object-cache.c" +#line 2272 "object-cache.c" } @@ -2261,7 +2285,7 @@ folks_object_cache_clear_cache_finish ((FolksObjectCache*) _data6_->cache, _tmp0_); #line 323 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_data6_->main_loop); -#line 2265 "object-cache.c" +#line 2289 "object-cache.c" } @@ -2270,7 +2294,7 @@ __lambda10_ (self, source_object, res); #line 320 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block6_data_unref (self); -#line 2274 "object-cache.c" +#line 2298 "object-cache.c" } @@ -2292,7 +2316,7 @@ _data6_->new_obj_set = _tmp1_; #line 333 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_data6_->main_loop); -#line 2296 "object-cache.c" +#line 2320 "object-cache.c" } @@ -2301,7 +2325,7 @@ __lambda11_ (self, source_object, res); #line 330 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block6_data_unref (self); -#line 2305 "object-cache.c" +#line 2329 "object-cache.c" } @@ -2373,7 +2397,7 @@ block6_data_unref (_data6_); #line 297 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _data6_ = NULL; -#line 2377 "object-cache.c" +#line 2401 "object-cache.c" } @@ -2382,15 +2406,17 @@ g_atomic_int_inc (&_data7_->_ref_count_); #line 341 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" return _data7_; -#line 2386 "object-cache.c" +#line 2410 "object-cache.c" } static void block7_data_unref (Block7Data* _data7_) { #line 341 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) { +#line 2417 "object-cache.c" + ObjectCacheTests * self; #line 341 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" - _g_object_unref0 (_data7_->self); + self = _data7_->self; #line 341 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_object_unref0 (_data7_->new_obj_set); #line 341 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" @@ -2398,8 +2424,10 @@ #line 341 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_main_loop_unref0 (_data7_->main_loop); #line 341 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" + _g_object_unref0 (self); +#line 341 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_slice_free (Block7Data, _data7_); -#line 2403 "object-cache.c" +#line 2431 "object-cache.c" } } @@ -2417,7 +2445,7 @@ folks_object_cache_store_objects_finish ((FolksObjectCache*) _data7_->cache, _tmp0_); #line 350 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_data7_->main_loop); -#line 2421 "object-cache.c" +#line 2449 "object-cache.c" } @@ -2426,7 +2454,7 @@ __lambda12_ (self, source_object, res); #line 347 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block7_data_unref (self); -#line 2430 "object-cache.c" +#line 2458 "object-cache.c" } @@ -2443,7 +2471,7 @@ folks_object_cache_clear_cache_finish ((FolksObjectCache*) _data7_->cache, _tmp0_); #line 359 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_data7_->main_loop); -#line 2447 "object-cache.c" +#line 2475 "object-cache.c" } @@ -2452,7 +2480,7 @@ __lambda13_ (self, source_object, res); #line 356 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block7_data_unref (self); -#line 2456 "object-cache.c" +#line 2484 "object-cache.c" } @@ -2474,7 +2502,7 @@ _data7_->new_obj_set = _tmp1_; #line 369 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_data7_->main_loop); -#line 2478 "object-cache.c" +#line 2506 "object-cache.c" } @@ -2483,7 +2511,7 @@ __lambda14_ (self, source_object, res); #line 366 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block7_data_unref (self); -#line 2487 "object-cache.c" +#line 2515 "object-cache.c" } @@ -2535,7 +2563,7 @@ block7_data_unref (_data7_); #line 341 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _data7_ = NULL; -#line 2539 "object-cache.c" +#line 2567 "object-cache.c" } @@ -2544,15 +2572,17 @@ g_atomic_int_inc (&_data8_->_ref_count_); #line 377 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" return _data8_; -#line 2548 "object-cache.c" +#line 2576 "object-cache.c" } static void block8_data_unref (Block8Data* _data8_) { #line 377 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" if (g_atomic_int_dec_and_test (&_data8_->_ref_count_)) { +#line 2583 "object-cache.c" + ObjectCacheTests * self; #line 377 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" - _g_object_unref0 (_data8_->self); + self = _data8_->self; #line 377 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_object_unref0 (_data8_->new_obj_set); #line 377 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" @@ -2560,8 +2590,10 @@ #line 377 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_main_loop_unref0 (_data8_->main_loop); #line 377 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" + _g_object_unref0 (self); +#line 377 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_slice_free (Block8Data, _data8_); -#line 2565 "object-cache.c" +#line 2597 "object-cache.c" } } @@ -2579,7 +2611,7 @@ folks_object_cache_clear_cache_finish ((FolksObjectCache*) _data8_->cache, _tmp0_); #line 389 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_data8_->main_loop); -#line 2583 "object-cache.c" +#line 2615 "object-cache.c" } @@ -2588,7 +2620,7 @@ __lambda15_ (self, source_object, res); #line 386 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block8_data_unref (self); -#line 2592 "object-cache.c" +#line 2624 "object-cache.c" } @@ -2610,7 +2642,7 @@ _data8_->new_obj_set = _tmp1_; #line 399 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_data8_->main_loop); -#line 2614 "object-cache.c" +#line 2646 "object-cache.c" } @@ -2619,7 +2651,7 @@ __lambda16_ (self, source_object, res); #line 396 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block8_data_unref (self); -#line 2623 "object-cache.c" +#line 2655 "object-cache.c" } @@ -2661,7 +2693,7 @@ block8_data_unref (_data8_); #line 377 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _data8_ = NULL; -#line 2665 "object-cache.c" +#line 2697 "object-cache.c" } @@ -2670,15 +2702,17 @@ g_atomic_int_inc (&_data9_->_ref_count_); #line 407 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" return _data9_; -#line 2674 "object-cache.c" +#line 2706 "object-cache.c" } static void block9_data_unref (Block9Data* _data9_) { #line 407 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" if (g_atomic_int_dec_and_test (&_data9_->_ref_count_)) { +#line 2713 "object-cache.c" + ObjectCacheTests * self; #line 407 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" - _g_object_unref0 (_data9_->self); + self = _data9_->self; #line 407 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_object_unref0 (_data9_->new_obj_set); #line 407 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" @@ -2686,8 +2720,10 @@ #line 407 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_main_loop_unref0 (_data9_->main_loop); #line 407 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" + _g_object_unref0 (self); +#line 407 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_slice_free (Block9Data, _data9_); -#line 2691 "object-cache.c" +#line 2727 "object-cache.c" } } @@ -2705,7 +2741,7 @@ folks_object_cache_store_objects_finish ((FolksObjectCache*) _data9_->cache, _tmp0_); #line 423 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_data9_->main_loop); -#line 2709 "object-cache.c" +#line 2745 "object-cache.c" } @@ -2714,7 +2750,7 @@ __lambda17_ (self, source_object, res); #line 420 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block9_data_unref (self); -#line 2718 "object-cache.c" +#line 2754 "object-cache.c" } @@ -2736,7 +2772,7 @@ _data9_->new_obj_set = _tmp1_; #line 435 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_data9_->main_loop); -#line 2740 "object-cache.c" +#line 2776 "object-cache.c" } @@ -2745,7 +2781,7 @@ __lambda18_ (self, source_object, res); #line 432 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block9_data_unref (self); -#line 2749 "object-cache.c" +#line 2785 "object-cache.c" } @@ -2843,7 +2879,7 @@ block9_data_unref (_data9_); #line 407 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _data9_ = NULL; -#line 2847 "object-cache.c" +#line 2883 "object-cache.c" } @@ -2852,15 +2888,17 @@ g_atomic_int_inc (&_data10_->_ref_count_); #line 443 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" return _data10_; -#line 2856 "object-cache.c" +#line 2892 "object-cache.c" } static void block10_data_unref (Block10Data* _data10_) { #line 443 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" if (g_atomic_int_dec_and_test (&_data10_->_ref_count_)) { +#line 2899 "object-cache.c" + ObjectCacheTests * self; #line 443 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" - _g_object_unref0 (_data10_->self); + self = _data10_->self; #line 443 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_object_unref0 (_data10_->new_obj_set); #line 443 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" @@ -2868,8 +2906,10 @@ #line 443 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_main_loop_unref0 (_data10_->main_loop); #line 443 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" + _g_object_unref0 (self); +#line 443 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_slice_free (Block10Data, _data10_); -#line 2873 "object-cache.c" +#line 2913 "object-cache.c" } } @@ -2887,7 +2927,7 @@ folks_object_cache_store_objects_finish ((FolksObjectCache*) _data10_->cache, _tmp0_); #line 460 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_data10_->main_loop); -#line 2891 "object-cache.c" +#line 2931 "object-cache.c" } @@ -2896,7 +2936,7 @@ __lambda19_ (self, source_object, res); #line 457 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block10_data_unref (self); -#line 2900 "object-cache.c" +#line 2940 "object-cache.c" } @@ -2918,7 +2958,7 @@ _data10_->new_obj_set = _tmp1_; #line 472 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_data10_->main_loop); -#line 2922 "object-cache.c" +#line 2962 "object-cache.c" } @@ -2927,7 +2967,7 @@ __lambda20_ (self, source_object, res); #line 469 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block10_data_unref (self); -#line 2931 "object-cache.c" +#line 2971 "object-cache.c" } @@ -3005,7 +3045,7 @@ block10_data_unref (_data10_); #line 443 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _data10_ = NULL; -#line 3009 "object-cache.c" +#line 3049 "object-cache.c" } @@ -3014,15 +3054,17 @@ g_atomic_int_inc (&_data11_->_ref_count_); #line 482 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" return _data11_; -#line 3018 "object-cache.c" +#line 3058 "object-cache.c" } static void block11_data_unref (Block11Data* _data11_) { #line 482 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" if (g_atomic_int_dec_and_test (&_data11_->_ref_count_)) { +#line 3065 "object-cache.c" + ObjectCacheTests * self; #line 482 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" - _g_object_unref0 (_data11_->self); + self = _data11_->self; #line 482 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_object_unref0 (_data11_->new_obj_set); #line 482 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" @@ -3030,8 +3072,10 @@ #line 482 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _g_main_loop_unref0 (_data11_->main_loop); #line 482 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" + _g_object_unref0 (self); +#line 482 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_slice_free (Block11Data, _data11_); -#line 3035 "object-cache.c" +#line 3079 "object-cache.c" } } @@ -3067,7 +3111,7 @@ _tmp4_ = _data11_->main_loop; #line 506 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_tmp4_); -#line 3070 "object-cache.c" +#line 3114 "object-cache.c" } @@ -3076,7 +3120,7 @@ __lambda21_ (self, source_object, res); #line 499 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block11_data_unref (self); -#line 3079 "object-cache.c" +#line 3123 "object-cache.c" } @@ -3116,7 +3160,7 @@ _tmp5_ = _data11_->main_loop; #line 522 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" g_main_loop_quit (_tmp5_); -#line 3118 "object-cache.c" +#line 3162 "object-cache.c" } @@ -3125,7 +3169,7 @@ __lambda22_ (self, source_object, res); #line 515 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" block11_data_unref (self); -#line 3127 "object-cache.c" +#line 3171 "object-cache.c" } @@ -3167,19 +3211,19 @@ _tmp2_ = gee_hash_set_new (TYPE_TEST_OBJECT, (GBoxedCopyFunc) test_object_ref, test_object_unref, NULL, NULL); #line 489 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" obj_set = _tmp2_; -#line 3169 "object-cache.c" +#line 3213 "object-cache.c" { gint i; #line 491 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" i = 0; -#line 3174 "object-cache.c" +#line 3218 "object-cache.c" { gboolean _tmp3_; #line 491 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _tmp3_ = TRUE; #line 491 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" while (TRUE) { -#line 3181 "object-cache.c" +#line 3225 "object-cache.c" gboolean _tmp4_; gint _tmp6_; gint _tmp7_; @@ -3191,13 +3235,13 @@ _tmp4_ = _tmp3_; #line 491 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" if (!_tmp4_) { -#line 3193 "object-cache.c" +#line 3237 "object-cache.c" gint _tmp5_; #line 491 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _tmp5_ = i; #line 491 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" i = _tmp5_ + 1; -#line 3199 "object-cache.c" +#line 3243 "object-cache.c" } #line 491 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _tmp3_ = FALSE; @@ -3209,7 +3253,7 @@ if (!(_tmp6_ < _tmp7_)) { #line 491 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" break; -#line 3211 "object-cache.c" +#line 3255 "object-cache.c" } #line 493 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _tmp8_ = obj_set; @@ -3223,7 +3267,7 @@ gee_abstract_collection_add ((GeeAbstractCollection*) _tmp8_, _tmp11_); #line 493 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _test_object_unref0 (_tmp11_); -#line 3225 "object-cache.c" +#line 3269 "object-cache.c" } } } @@ -3260,7 +3304,7 @@ #line 530 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _tmp19_ = obj_set; #line 530 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" - _tmp20_ = gee_collection_get_size ((GeeCollection*) _tmp19_); + _tmp20_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp19_); #line 530 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _tmp21_ = _tmp20_; #line 530 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" @@ -3271,7 +3315,7 @@ block11_data_unref (_data11_); #line 482 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" _data11_ = NULL; -#line 3273 "object-cache.c" +#line 3317 "object-cache.c" } @@ -3286,14 +3330,14 @@ FOLKS_TEST_CASE_CLASS (klass)->tear_down = object_cache_tests_real_tear_down; #line 58 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" G_OBJECT_CLASS (klass)->finalize = object_cache_tests_finalize; -#line 3288 "object-cache.c" +#line 3332 "object-cache.c" } static void object_cache_tests_instance_init (ObjectCacheTests * self) { #line 58 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" self->priv = OBJECT_CACHE_TESTS_GET_PRIVATE (self); -#line 3295 "object-cache.c" +#line 3339 "object-cache.c" } @@ -3305,7 +3349,7 @@ _g_object_unref0 (self->priv->_cache_dir); #line 58 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" G_OBJECT_CLASS (object_cache_tests_parent_class)->finalize (obj); -#line 3307 "object-cache.c" +#line 3351 "object-cache.c" } @@ -3350,7 +3394,7 @@ result = 0; #line 543 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" return result; -#line 3352 "object-cache.c" +#line 3396 "object-cache.c" } @@ -3359,7 +3403,7 @@ g_type_init (); #line 534 "/home/treitter/collabora/folks/tests/folks/object-cache.vala" return _vala_main (argv, argc); -#line 3361 "object-cache.c" +#line 3405 "object-cache.c" } diff -Nru folks-0.6.6/tests/folks/utils.c folks-0.6.7/tests/folks/utils.c --- folks-0.6.6/tests/folks/utils.c 2011-12-13 23:41:45.000000000 +0000 +++ folks-0.6.7/tests/folks/utils.c 2012-02-23 00:02:22.000000000 +0000 @@ -1,4 +1,4 @@ -/* utils.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* utils.c generated by valac 0.15.1, the Vala compiler * generated from utils.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/key-file/individual-retrieval.c folks-0.6.7/tests/key-file/individual-retrieval.c --- folks-0.6.6/tests/key-file/individual-retrieval.c 2011-12-13 23:43:09.000000000 +0000 +++ folks-0.6.7/tests/key-file/individual-retrieval.c 2012-02-23 00:02:48.000000000 +0000 @@ -1,4 +1,4 @@ -/* individual-retrieval.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* individual-retrieval.c generated by valac 0.15.1, the Vala compiler * generated from individual-retrieval.vala, do not modify */ /* @@ -185,15 +185,19 @@ static void block1_data_unref (Block1Data* _data1_) { #line 50 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { +#line 189 "individual-retrieval.c" + IndividualRetrievalTests * self; #line 50 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" - _g_object_unref0 (_data1_->self); + self = _data1_->self; #line 50 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _g_object_unref0 (_data1_->expected_individuals); #line 50 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _g_main_loop_unref0 (_data1_->main_loop); #line 50 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" + _g_object_unref0 (self); +#line 50 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" g_slice_free (Block1Data, _data1_); -#line 197 "individual-retrieval.c" +#line 201 "individual-retrieval.c" } } @@ -225,7 +229,7 @@ _tmp3_ = gee_multi_map_get_keys (_tmp2_); #line 72 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" removed = _tmp3_; -#line 229 "individual-retrieval.c" +#line 233 "individual-retrieval.c" { GeeCollection* _tmp4_; GeeIterator* _tmp5_ = NULL; @@ -238,7 +242,7 @@ _i_it = _tmp5_; #line 74 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" while (TRUE) { -#line 242 "individual-retrieval.c" +#line 246 "individual-retrieval.c" GeeIterator* _tmp6_; gboolean _tmp7_ = FALSE; GeeIterator* _tmp8_; @@ -258,7 +262,7 @@ if (!_tmp7_) { #line 74 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" break; -#line 262 "individual-retrieval.c" +#line 266 "individual-retrieval.c" } #line 74 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _tmp8_ = _i_it; @@ -282,7 +286,7 @@ _tmp15_ = _tmp14_; #line 77 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" g_assert (_tmp15_ == 1); -#line 286 "individual-retrieval.c" +#line 290 "individual-retrieval.c" { FolksIndividual* _tmp16_; GeeSet* _tmp17_; @@ -301,7 +305,7 @@ _persona_it = _tmp19_; #line 82 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" while (TRUE) { -#line 305 "individual-retrieval.c" +#line 309 "individual-retrieval.c" GeeIterator* _tmp20_; gboolean _tmp21_ = FALSE; GeeIterator* _tmp22_; @@ -318,7 +322,7 @@ if (!_tmp21_) { #line 82 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" break; -#line 322 "individual-retrieval.c" +#line 326 "individual-retrieval.c" } #line 82 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _tmp22_ = _persona_it; @@ -336,19 +340,19 @@ gee_abstract_collection_remove ((GeeAbstractCollection*) _data1_->expected_individuals, _tmp26_); #line 82 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _g_object_unref0 (persona); -#line 340 "individual-retrieval.c" +#line 344 "individual-retrieval.c" } #line 82 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _g_object_unref0 (_persona_it); -#line 344 "individual-retrieval.c" +#line 348 "individual-retrieval.c" } #line 74 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _g_object_unref0 (i); -#line 348 "individual-retrieval.c" +#line 352 "individual-retrieval.c" } #line 74 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _g_object_unref0 (_i_it); -#line 352 "individual-retrieval.c" +#line 356 "individual-retrieval.c" } #line 88 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _tmp27_ = removed; @@ -358,7 +362,7 @@ _tmp29_ = _tmp28_; #line 88 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" g_assert (_tmp29_ == 1); -#line 362 "individual-retrieval.c" +#line 366 "individual-retrieval.c" { GeeSet* _tmp30_; GeeIterator* _tmp31_ = NULL; @@ -371,7 +375,7 @@ _i_it = _tmp31_; #line 90 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" while (TRUE) { -#line 375 "individual-retrieval.c" +#line 379 "individual-retrieval.c" GeeIterator* _tmp32_; gboolean _tmp33_ = FALSE; GeeIterator* _tmp34_; @@ -386,7 +390,7 @@ if (!_tmp33_) { #line 90 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" break; -#line 390 "individual-retrieval.c" +#line 394 "individual-retrieval.c" } #line 90 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _tmp34_ = _i_it; @@ -400,24 +404,24 @@ g_assert (_tmp36_ == NULL); #line 90 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _g_object_unref0 (i); -#line 404 "individual-retrieval.c" +#line 408 "individual-retrieval.c" } #line 90 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _g_object_unref0 (_i_it); -#line 408 "individual-retrieval.c" +#line 412 "individual-retrieval.c" } #line 69 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _g_object_unref0 (removed); #line 69 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _g_object_unref0 (added); -#line 414 "individual-retrieval.c" +#line 418 "individual-retrieval.c" } static void ___lambda2__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 69 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" __lambda2_ (self, changes); -#line 421 "individual-retrieval.c" +#line 425 "individual-retrieval.c" } @@ -432,7 +436,7 @@ result = FALSE; #line 103 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" return result; -#line 436 "individual-retrieval.c" +#line 440 "individual-retrieval.c" } @@ -441,7 +445,7 @@ result = __lambda3_ (self); #line 100 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" return result; -#line 445 "individual-retrieval.c" +#line 449 "individual-retrieval.c" } @@ -501,7 +505,7 @@ #line 106 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" g_main_loop_run (_data1_->main_loop); #line 109 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" - _tmp7_ = gee_collection_get_size ((GeeCollection*) _data1_->expected_individuals); + _tmp7_ = gee_abstract_collection_get_size ((GeeCollection*) _data1_->expected_individuals); #line 109 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _tmp8_ = _tmp7_; #line 109 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" @@ -516,7 +520,7 @@ block1_data_unref (_data1_); #line 50 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _data1_ = NULL; -#line 520 "individual-retrieval.c" +#line 524 "individual-retrieval.c" } @@ -525,20 +529,24 @@ g_atomic_int_inc (&_data2_->_ref_count_); #line 114 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" return _data2_; -#line 529 "individual-retrieval.c" +#line 533 "individual-retrieval.c" } static void block2_data_unref (Block2Data* _data2_) { #line 114 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { +#line 540 "individual-retrieval.c" + IndividualRetrievalTests * self; #line 114 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" - _g_object_unref0 (_data2_->self); + self = _data2_->self; #line 114 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _g_main_loop_unref0 (_data2_->main_loop); #line 114 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" + _g_object_unref0 (self); +#line 114 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" g_slice_free (Block2Data, _data2_); -#line 542 "individual-retrieval.c" +#line 550 "individual-retrieval.c" } } @@ -594,7 +602,7 @@ _tmp10_ = _tmp9_; #line 133 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" g_assert (_tmp10_ == 1); -#line 598 "individual-retrieval.c" +#line 606 "individual-retrieval.c" { GeeCollection* _tmp11_; GeeIterator* _tmp12_ = NULL; @@ -607,7 +615,7 @@ _i_it = _tmp12_; #line 136 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" while (TRUE) { -#line 611 "individual-retrieval.c" +#line 619 "individual-retrieval.c" GeeIterator* _tmp13_; gboolean _tmp14_ = FALSE; GeeIterator* _tmp15_; @@ -624,7 +632,7 @@ if (!_tmp14_) { #line 136 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" break; -#line 628 "individual-retrieval.c" +#line 636 "individual-retrieval.c" } #line 136 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _tmp15_ = _i_it; @@ -642,11 +650,11 @@ g_assert (g_strcmp0 (_tmp19_, "Brian Briansson") == 0); #line 136 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _g_object_unref0 (i); -#line 646 "individual-retrieval.c" +#line 654 "individual-retrieval.c" } #line 136 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _g_object_unref0 (_i_it); -#line 650 "individual-retrieval.c" +#line 658 "individual-retrieval.c" } { GeeSet* _tmp20_; @@ -660,7 +668,7 @@ _i_it = _tmp21_; #line 141 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" while (TRUE) { -#line 664 "individual-retrieval.c" +#line 672 "individual-retrieval.c" GeeIterator* _tmp22_; gboolean _tmp23_ = FALSE; GeeIterator* _tmp24_; @@ -675,7 +683,7 @@ if (!_tmp23_) { #line 141 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" break; -#line 679 "individual-retrieval.c" +#line 687 "individual-retrieval.c" } #line 141 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _tmp24_ = _i_it; @@ -689,24 +697,24 @@ g_assert (_tmp26_ == NULL); #line 141 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _g_object_unref0 (i); -#line 693 "individual-retrieval.c" +#line 701 "individual-retrieval.c" } #line 141 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _g_object_unref0 (_i_it); -#line 697 "individual-retrieval.c" +#line 705 "individual-retrieval.c" } #line 125 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _g_object_unref0 (removed); #line 125 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _g_object_unref0 (added); -#line 703 "individual-retrieval.c" +#line 711 "individual-retrieval.c" } static void ___lambda4__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 125 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" __lambda4_ (self, changes); -#line 710 "individual-retrieval.c" +#line 718 "individual-retrieval.c" } @@ -721,7 +729,7 @@ result = FALSE; #line 154 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" return result; -#line 725 "individual-retrieval.c" +#line 733 "individual-retrieval.c" } @@ -730,7 +738,7 @@ result = __lambda5_ (self); #line 151 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" return result; -#line 734 "individual-retrieval.c" +#line 742 "individual-retrieval.c" } @@ -786,7 +794,7 @@ block2_data_unref (_data2_); #line 114 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" _data2_ = NULL; -#line 790 "individual-retrieval.c" +#line 798 "individual-retrieval.c" } @@ -801,7 +809,7 @@ FOLKS_TEST_CASE_CLASS (klass)->tear_down = individual_retrieval_tests_real_tear_down; #line 24 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" G_OBJECT_CLASS (klass)->finalize = individual_retrieval_tests_finalize; -#line 805 "individual-retrieval.c" +#line 813 "individual-retrieval.c" } @@ -810,7 +818,7 @@ self->priv = INDIVIDUAL_RETRIEVAL_TESTS_GET_PRIVATE (self); #line 27 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" self->priv->_test_timeout = 3; -#line 814 "individual-retrieval.c" +#line 822 "individual-retrieval.c" } @@ -822,7 +830,7 @@ _kf_test_backend_unref0 (self->priv->kf_backend); #line 24 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" G_OBJECT_CLASS (individual_retrieval_tests_parent_class)->finalize (obj); -#line 826 "individual-retrieval.c" +#line 834 "individual-retrieval.c" } @@ -867,7 +875,7 @@ result = 0; #line 175 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" return result; -#line 871 "individual-retrieval.c" +#line 879 "individual-retrieval.c" } @@ -876,7 +884,7 @@ g_type_init (); #line 166 "/home/treitter/collabora/folks/tests/key-file/individual-retrieval.vala" return _vala_main (argv, argc); -#line 880 "individual-retrieval.c" +#line 888 "individual-retrieval.c" } diff -Nru folks-0.6.6/tests/key-file/Makefile.in folks-0.6.7/tests/key-file/Makefile.in --- folks-0.6.6/tests/key-file/Makefile.in 2011-12-13 23:38:42.000000000 +0000 +++ folks-0.6.7/tests/key-file/Makefile.in 2012-02-23 00:04:12.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -40,10 +40,11 @@ individual-retrieval.c individual_retrieval_vala.stamp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -123,6 +124,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -408,29 +411,26 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< $(srcdir)/individual-retrieval.c: $(srcdir)/individual_retrieval_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/individual_retrieval_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/individual_retrieval_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) individual_retrieval_vala.stamp; \ fi individual_retrieval_vala.stamp: $(individual_retrieval_SOURCES) @@ -576,14 +576,15 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ test "$$failed" -eq 0; \ else :; fi @@ -632,10 +633,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/tests/lib/eds/backend.c folks-0.6.7/tests/lib/eds/backend.c --- folks-0.6.6/tests/lib/eds/backend.c 2011-12-13 23:41:25.000000000 +0000 +++ folks-0.6.7/tests/lib/eds/backend.c 2012-02-23 00:02:19.000000000 +0000 @@ -1,4 +1,4 @@ -/* backend.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* backend.c generated by valac 0.15.1, the Vala compiler * generated from backend.vala, do not modify */ /* @@ -1212,107 +1212,107 @@ glong _tmp21_; glong _tmp22_; gchar* _tmp23_ = NULL; -#line 1334 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1337 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1338 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1335 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1338 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1335 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1338 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1336 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1339 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1336 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1339 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { #line 1228 "backend.c" glong _tmp3_; glong _tmp4_; -#line 1337 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1340 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1337 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1340 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1337 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1340 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; #line 1237 "backend.c" } -#line 1339 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1342 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1339 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1342 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { #line 1243 "backend.c" glong _tmp6_; glong _tmp7_; -#line 1340 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1343 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1340 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1343 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1340 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1343 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; #line 1252 "backend.c" } -#line 1342 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1345 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1342 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1345 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { #line 1258 "backend.c" glong _tmp10_; glong _tmp11_; -#line 1342 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1345 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1342 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1345 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1342 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1345 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; #line 1267 "backend.c" } else { -#line 1342 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1345 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp8_ = FALSE; #line 1271 "backend.c" } -#line 1342 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1345 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp12_ = _tmp8_; -#line 1342 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1345 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1343 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1346 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1343 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1346 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" if (_tmp14_ >= ((glong) 0)) { #line 1281 "backend.c" glong _tmp15_; glong _tmp16_; -#line 1343 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1346 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp15_ = end; -#line 1343 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1346 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp16_ = string_length; -#line 1343 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1346 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp13_ = _tmp15_ <= _tmp16_; #line 1290 "backend.c" } else { -#line 1343 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1346 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp13_ = FALSE; #line 1294 "backend.c" } -#line 1343 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1346 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp17_ = _tmp13_; -#line 1343 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1346 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp17_, NULL); -#line 1344 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1347 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1344 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1347 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1344 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1347 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp18_ <= _tmp19_, NULL); -#line 1345 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1348 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1345 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1348 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp21_ = end; -#line 1345 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1348 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp22_ = start; -#line 1345 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1348 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp23_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) (_tmp21_ - _tmp22_)); -#line 1345 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1348 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" result = _tmp23_; -#line 1345 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1348 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" return result; #line 1318 "backend.c" } @@ -1334,35 +1334,35 @@ gchar* _tmp2_ = NULL; gchar* _result_; gchar* _tmp3_; -#line 1055 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1058 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 1055 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1058 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, 0); -#line 1056 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1059 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 1056 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1059 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp1_ = needle; -#line 1056 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1059 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_); -#line 1056 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1059 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 1058 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1061 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 1058 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1061 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 1354 "backend.c" gchar* _tmp4_; -#line 1059 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1062 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 1059 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1062 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 1059 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1062 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" return result; #line 1362 "backend.c" } else { -#line 1061 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1064 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" result = -1; -#line 1061 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" +#line 1064 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" return result; #line 1368 "backend.c" } @@ -1438,7 +1438,7 @@ #line 192 "/home/treitter/collabora/folks/tests/lib/eds/backend.vala" _tmp5_ = c; #line 192 "/home/treitter/collabora/folks/tests/lib/eds/backend.vala" - _tmp6_ = gee_map_get_keys ((GeeMap*) _tmp5_); + _tmp6_ = gee_abstract_map_get_keys ((GeeMap*) _tmp5_); #line 192 "/home/treitter/collabora/folks/tests/lib/eds/backend.vala" _tmp7_ = _tmp6_; #line 192 "/home/treitter/collabora/folks/tests/lib/eds/backend.vala" @@ -1726,7 +1726,7 @@ { GFile* _tmp68_; guint8* _tmp69_ = NULL; - gint _tmp70_ = 0; + gsize _tmp70_; EContactPhoto* _tmp71_; EContactPhoto* cp; EContactPhoto* _tmp72_; @@ -1890,7 +1890,7 @@ #line 246 "/home/treitter/collabora/folks/tests/lib/eds/backend.vala" _tmp91_ = addresses; #line 246 "/home/treitter/collabora/folks/tests/lib/eds/backend.vala" - _tmp92_ = gee_map_get_keys ((GeeMap*) _tmp91_); + _tmp92_ = gee_abstract_map_get_keys ((GeeMap*) _tmp91_); #line 246 "/home/treitter/collabora/folks/tests/lib/eds/backend.vala" _tmp93_ = _tmp92_; #line 246 "/home/treitter/collabora/folks/tests/lib/eds/backend.vala" diff -Nru folks-0.6.6/tests/lib/eds/backend.vala folks-0.6.7/tests/lib/eds/backend.vala --- folks-0.6.6/tests/lib/eds/backend.vala 2011-12-13 23:32:35.000000000 +0000 +++ folks-0.6.7/tests/lib/eds/backend.vala 2012-02-18 00:29:15.000000000 +0000 @@ -225,7 +225,7 @@ try { - file.load_contents (null, out photo_content); + file.load_contents (null, out photo_content, null); var cp = new ContactPhoto (); cp.type = ContactPhotoType.INLINED; diff -Nru folks-0.6.6/tests/lib/eds/eds-test.h folks-0.6.7/tests/lib/eds/eds-test.h --- folks-0.6.6/tests/lib/eds/eds-test.h 2011-12-13 23:41:25.000000000 +0000 +++ folks-0.6.7/tests/lib/eds/eds-test.h 2012-02-23 00:02:19.000000000 +0000 @@ -1,4 +1,4 @@ -/* eds-test.h generated by valac 0.14.0.50-58097f, the Vala compiler, do not modify */ +/* eds-test.h generated by valac 0.15.1, the Vala compiler, do not modify */ #ifndef __EDS_TEST_H__ diff -Nru folks-0.6.6/tests/lib/eds/eds-test.vapi folks-0.6.7/tests/lib/eds/eds-test.vapi --- folks-0.6.6/tests/lib/eds/eds-test.vapi 2011-12-13 23:41:25.000000000 +0000 +++ folks-0.6.7/tests/lib/eds/eds-test.vapi 2012-02-23 00:02:19.000000000 +0000 @@ -1,4 +1,4 @@ -/* eds-test.vapi generated by valac 0.14.0.50-58097f, do not modify. */ +/* eds-test.vapi generated by valac 0.15.1, do not modify. */ namespace EdsTest { [CCode (cheader_filename = "eds-test.h")] diff -Nru folks-0.6.6/tests/lib/eds/Makefile.in folks-0.6.7/tests/lib/eds/Makefile.in --- folks-0.6.6/tests/lib/eds/Makefile.in 2011-12-13 23:38:42.000000000 +0000 +++ folks-0.6.7/tests/lib/eds/Makefile.in 2012-02-23 00:04:13.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,10 +39,11 @@ libeds_test_la_vala.stamp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -122,6 +123,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -391,37 +394,33 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libeds_test_la-backend.lo: backend.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeds_test_la_CFLAGS) $(CFLAGS) -MT libeds_test_la-backend.lo -MD -MP -MF $(DEPDIR)/libeds_test_la-backend.Tpo -c -o libeds_test_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libeds_test_la-backend.Tpo $(DEPDIR)/libeds_test_la-backend.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='backend.c' object='libeds_test_la-backend.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='backend.c' object='libeds_test_la-backend.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeds_test_la_CFLAGS) $(CFLAGS) -c -o libeds_test_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libeds_test_la_CFLAGS) $(CFLAGS) -c -o libeds_test_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c $(srcdir)/backend.c: $(srcdir)/libeds_test_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libeds_test_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libeds_test_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libeds_test_la_vala.stamp; \ fi libeds_test_la_vala.stamp: $(libeds_test_la_SOURCES) @@ -530,10 +529,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/tests/lib/folks-test.h folks-0.6.7/tests/lib/folks-test.h --- folks-0.6.6/tests/lib/folks-test.h 2011-12-13 23:41:28.000000000 +0000 +++ folks-0.6.7/tests/lib/folks-test.h 2012-02-23 00:02:21.000000000 +0000 @@ -1,4 +1,4 @@ -/* folks-test.h generated by valac 0.14.0.50-58097f, the Vala compiler, do not modify */ +/* folks-test.h generated by valac 0.15.1, the Vala compiler, do not modify */ #ifndef __FOLKS_TEST_H__ @@ -9,6 +9,7 @@ #include #include #include +#include G_BEGIN_DECLS @@ -74,6 +75,8 @@ GType folks_test_utils_get_type (void) G_GNUC_CONST; void folks_test_utils_loadable_icons_content_equal (GLoadableIcon* a, GLoadableIcon* b, gint icon_size, GAsyncReadyCallback _callback_, gpointer _user_data_); gboolean folks_test_utils_loadable_icons_content_equal_finish (GAsyncResult* _res_); +void folks_test_utils_aggregator_prepare_and_wait_for_quiescence (FolksIndividualAggregator* aggregator, GAsyncReadyCallback _callback_, gpointer _user_data_); +void folks_test_utils_aggregator_prepare_and_wait_for_quiescence_finish (GAsyncResult* _res_, GError** error); FolksTestUtils* folks_test_utils_new (void); FolksTestUtils* folks_test_utils_construct (GType object_type); diff -Nru folks-0.6.6/tests/lib/folks-test.vapi folks-0.6.7/tests/lib/folks-test.vapi --- folks-0.6.6/tests/lib/folks-test.vapi 2011-12-13 23:41:28.000000000 +0000 +++ folks-0.6.7/tests/lib/folks-test.vapi 2012-02-23 00:02:21.000000000 +0000 @@ -1,4 +1,4 @@ -/* folks-test.vapi generated by valac 0.14.0.50-58097f, do not modify. */ +/* folks-test.vapi generated by valac 0.15.1, do not modify. */ namespace Folks { [CCode (cheader_filename = "folks-test.h")] @@ -13,6 +13,7 @@ [CCode (cheader_filename = "folks-test.h")] public class TestUtils { public TestUtils (); + public static async void aggregator_prepare_and_wait_for_quiescence (Folks.IndividualAggregator aggregator) throws GLib.Error; public static async bool loadable_icons_content_equal (GLib.LoadableIcon a, GLib.LoadableIcon b, int icon_size); } } diff -Nru folks-0.6.6/tests/lib/key-file/backend.c folks-0.6.7/tests/lib/key-file/backend.c --- folks-0.6.6/tests/lib/key-file/backend.c 2011-12-13 23:41:06.000000000 +0000 +++ folks-0.6.7/tests/lib/key-file/backend.c 2012-02-23 00:02:13.000000000 +0000 @@ -1,4 +1,4 @@ -/* backend.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* backend.c generated by valac 0.15.1, the Vala compiler * generated from backend.vala, do not modify */ diff -Nru folks-0.6.6/tests/lib/key-file/kf-test.h folks-0.6.7/tests/lib/key-file/kf-test.h --- folks-0.6.6/tests/lib/key-file/kf-test.h 2011-12-13 23:41:06.000000000 +0000 +++ folks-0.6.7/tests/lib/key-file/kf-test.h 2012-02-23 00:02:13.000000000 +0000 @@ -1,4 +1,4 @@ -/* kf-test.h generated by valac 0.14.0.50-58097f, the Vala compiler, do not modify */ +/* kf-test.h generated by valac 0.15.1, the Vala compiler, do not modify */ #ifndef __KF_TEST_H__ diff -Nru folks-0.6.6/tests/lib/key-file/kf-test.vapi folks-0.6.7/tests/lib/key-file/kf-test.vapi --- folks-0.6.6/tests/lib/key-file/kf-test.vapi 2011-12-13 23:41:06.000000000 +0000 +++ folks-0.6.7/tests/lib/key-file/kf-test.vapi 2012-02-23 00:02:13.000000000 +0000 @@ -1,4 +1,4 @@ -/* kf-test.vapi generated by valac 0.14.0.50-58097f, do not modify. */ +/* kf-test.vapi generated by valac 0.15.1, do not modify. */ namespace KfTest { [CCode (cheader_filename = "kf-test.h")] diff -Nru folks-0.6.6/tests/lib/key-file/Makefile.in folks-0.6.7/tests/lib/key-file/Makefile.in --- folks-0.6.6/tests/lib/key-file/Makefile.in 2011-12-13 23:38:43.000000000 +0000 +++ folks-0.6.7/tests/lib/key-file/Makefile.in 2012-02-23 00:04:13.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -39,10 +39,11 @@ libkf_test_la_vala.stamp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -118,6 +119,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -371,37 +374,33 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libkf_test_la-backend.lo: backend.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkf_test_la_CFLAGS) $(CFLAGS) -MT libkf_test_la-backend.lo -MD -MP -MF $(DEPDIR)/libkf_test_la-backend.Tpo -c -o libkf_test_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libkf_test_la-backend.Tpo $(DEPDIR)/libkf_test_la-backend.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='backend.c' object='libkf_test_la-backend.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='backend.c' object='libkf_test_la-backend.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkf_test_la_CFLAGS) $(CFLAGS) -c -o libkf_test_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libkf_test_la_CFLAGS) $(CFLAGS) -c -o libkf_test_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c $(srcdir)/backend.c: $(srcdir)/libkf_test_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libkf_test_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libkf_test_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libkf_test_la_vala.stamp; \ fi libkf_test_la_vala.stamp: $(libkf_test_la_SOURCES) @@ -510,10 +509,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/tests/lib/libsocialweb/backend.c folks-0.6.7/tests/lib/libsocialweb/backend.c --- folks-0.6.6/tests/lib/libsocialweb/backend.c 2011-12-13 23:41:18.000000000 +0000 +++ folks-0.6.7/tests/lib/libsocialweb/backend.c 2012-02-23 00:02:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* backend.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* backend.c generated by valac 0.15.1, the Vala compiler * generated from backend.vala, do not modify */ /* @@ -629,9 +629,9 @@ void libsocialweb_test_contact_view_contacts_added_element_copy (const LibsocialwebTestContactViewContactsAddedElement* self, LibsocialwebTestContactViewContactsAddedElement* dest) { const gchar* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; + gchar* _tmp3_; gint64 _tmp4_; GVariant* _tmp5_; GVariant* _tmp6_; @@ -712,9 +712,9 @@ void libsocialweb_test_contact_view_contacts_removed_element_copy (const LibsocialwebTestContactViewContactsRemovedElement* self, LibsocialwebTestContactViewContactsRemovedElement* dest) { const gchar* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; + gchar* _tmp3_; #line 36 "/home/treitter/collabora/folks/tests/lib/libsocialweb/backend.vala" _tmp0_ = (*self).service; #line 36 "/home/treitter/collabora/folks/tests/lib/libsocialweb/backend.vala" @@ -1819,9 +1819,9 @@ void libsocialweb_test_libsocialweb_contact_view_test_contacts_added_element_copy (const LibsocialwebTestLibsocialwebContactViewTestContactsAddedElement* self, LibsocialwebTestLibsocialwebContactViewTestContactsAddedElement* dest) { const gchar* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; + gchar* _tmp3_; gint64 _tmp4_; GVariant* _tmp5_; GVariant* _tmp6_; @@ -1902,9 +1902,9 @@ void libsocialweb_test_libsocialweb_contact_view_test_contacts_removed_element_copy (const LibsocialwebTestLibsocialwebContactViewTestContactsRemovedElement* self, LibsocialwebTestLibsocialwebContactViewTestContactsRemovedElement* dest) { const gchar* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; const gchar* _tmp2_; - const gchar* _tmp3_; + gchar* _tmp3_; #line 67 "/home/treitter/collabora/folks/tests/lib/libsocialweb/backend.vala" _tmp0_ = (*self).service; #line 67 "/home/treitter/collabora/folks/tests/lib/libsocialweb/backend.vala" diff -Nru folks-0.6.6/tests/lib/libsocialweb/libsocialweb-test.h folks-0.6.7/tests/lib/libsocialweb/libsocialweb-test.h --- folks-0.6.6/tests/lib/libsocialweb/libsocialweb-test.h 2011-12-13 23:41:18.000000000 +0000 +++ folks-0.6.7/tests/lib/libsocialweb/libsocialweb-test.h 2012-02-23 00:02:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* libsocialweb-test.h generated by valac 0.14.0.50-58097f, the Vala compiler, do not modify */ +/* libsocialweb-test.h generated by valac 0.15.1, the Vala compiler, do not modify */ #ifndef __LIBSOCIALWEB_TEST_H__ diff -Nru folks-0.6.6/tests/lib/libsocialweb/libsocialweb-test.vapi folks-0.6.7/tests/lib/libsocialweb/libsocialweb-test.vapi --- folks-0.6.6/tests/lib/libsocialweb/libsocialweb-test.vapi 2011-12-13 23:41:18.000000000 +0000 +++ folks-0.6.7/tests/lib/libsocialweb/libsocialweb-test.vapi 2012-02-23 00:02:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* libsocialweb-test.vapi generated by valac 0.14.0.50-58097f, do not modify. */ +/* libsocialweb-test.vapi generated by valac 0.15.1, do not modify. */ namespace LibsocialwebTest { [CCode (cheader_filename = "libsocialweb-test.h")] diff -Nru folks-0.6.6/tests/lib/libsocialweb/Makefile.in folks-0.6.7/tests/lib/libsocialweb/Makefile.in --- folks-0.6.6/tests/lib/libsocialweb/Makefile.in 2011-12-13 23:38:43.000000000 +0000 +++ folks-0.6.7/tests/lib/libsocialweb/Makefile.in 2012-02-23 00:04:13.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -40,10 +40,11 @@ libsocialweb_test_la_vala.stamp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -123,6 +124,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -393,37 +396,33 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libsocialweb_test_la-backend.lo: backend.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsocialweb_test_la_CFLAGS) $(CFLAGS) -MT libsocialweb_test_la-backend.lo -MD -MP -MF $(DEPDIR)/libsocialweb_test_la-backend.Tpo -c -o libsocialweb_test_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsocialweb_test_la-backend.Tpo $(DEPDIR)/libsocialweb_test_la-backend.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='backend.c' object='libsocialweb_test_la-backend.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='backend.c' object='libsocialweb_test_la-backend.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsocialweb_test_la_CFLAGS) $(CFLAGS) -c -o libsocialweb_test_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsocialweb_test_la_CFLAGS) $(CFLAGS) -c -o libsocialweb_test_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c $(srcdir)/backend.c: $(srcdir)/libsocialweb_test_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libsocialweb_test_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libsocialweb_test_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libsocialweb_test_la_vala.stamp; \ fi libsocialweb_test_la_vala.stamp: $(libsocialweb_test_la_SOURCES) @@ -532,10 +531,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/tests/lib/Makefile.am folks-0.6.7/tests/lib/Makefile.am --- folks-0.6.6/tests/lib/Makefile.am 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/tests/lib/Makefile.am 2012-01-12 17:25:24.000000000 +0000 @@ -26,14 +26,35 @@ noinst_LTLIBRARIES = libfolks-test.la libfolks_test_la_SOURCES = test-case.vala test-utils.vala -libfolks_test_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) -libfolks_test_la_LIBADD = $(GLIB_LIBS) $(GIO_LIBS) + +libfolks_test_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) \ + $(GEE_CFLAGS) \ + $(NULL) + +libfolks_test_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I$(top_srcdir)/folks \ + $(NULL) + +libfolks_test_la_LIBADD = \ + $(AM_LIBADD) \ + $(top_builddir)/folks/libfolks.la \ + $(GLIB_LIBS) \ + $(GIO_LIBS) \ + $(GEE_LIBS) \ + $(NULL) libfolks_test_la_VALAFLAGS = \ $(ERROR_VALAFLAGS) \ $(VALAFLAGS) \ + --vapidir=$(top_srcdir)/folks \ --pkg gobject-2.0 \ --pkg gio-2.0 \ + --pkg gee-1.0 \ + --pkg folks \ --library folks-test \ -H folks-test.h \ -g \ diff -Nru folks-0.6.6/tests/lib/Makefile.in folks-0.6.7/tests/lib/Makefile.in --- folks-0.6.6/tests/lib/Makefile.in 2011-12-13 23:38:42.000000000 +0000 +++ folks-0.6.7/tests/lib/Makefile.in 2012-02-23 00:04:13.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -43,10 +43,11 @@ libfolks_test_la_vala.stamp test-case.c test-utils.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -55,7 +56,8 @@ CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = -libfolks_test_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +libfolks_test_la_DEPENDENCIES = $(top_builddir)/folks/libfolks.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_libfolks_test_la_OBJECTS = libfolks_test_la-test-case.lo \ libfolks_test_la-test-utils.lo @@ -162,6 +164,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -341,13 +345,34 @@ noinst_LTLIBRARIES = libfolks-test.la libfolks_test_la_SOURCES = test-case.vala test-utils.vala -libfolks_test_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) -libfolks_test_la_LIBADD = $(GLIB_LIBS) $(GIO_LIBS) +libfolks_test_la_CFLAGS = \ + $(AM_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) \ + $(GEE_CFLAGS) \ + $(NULL) + +libfolks_test_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I$(top_srcdir)/folks \ + $(NULL) + +libfolks_test_la_LIBADD = \ + $(AM_LIBADD) \ + $(top_builddir)/folks/libfolks.la \ + $(GLIB_LIBS) \ + $(GIO_LIBS) \ + $(GEE_LIBS) \ + $(NULL) + libfolks_test_la_VALAFLAGS = \ $(ERROR_VALAFLAGS) \ $(VALAFLAGS) \ + --vapidir=$(top_srcdir)/folks \ --pkg gobject-2.0 \ --pkg gio-2.0 \ + --pkg gee-1.0 \ + --pkg folks \ --library folks-test \ -H folks-test.h \ -g \ @@ -424,55 +449,50 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libfolks_test_la-test-case.lo: test-case.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_test_la_CFLAGS) $(CFLAGS) -MT libfolks_test_la-test-case.lo -MD -MP -MF $(DEPDIR)/libfolks_test_la-test-case.Tpo -c -o libfolks_test_la-test-case.lo `test -f 'test-case.c' || echo '$(srcdir)/'`test-case.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfolks_test_la_CPPFLAGS) $(CPPFLAGS) $(libfolks_test_la_CFLAGS) $(CFLAGS) -MT libfolks_test_la-test-case.lo -MD -MP -MF $(DEPDIR)/libfolks_test_la-test-case.Tpo -c -o libfolks_test_la-test-case.lo `test -f 'test-case.c' || echo '$(srcdir)/'`test-case.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_test_la-test-case.Tpo $(DEPDIR)/libfolks_test_la-test-case.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-case.c' object='libfolks_test_la-test-case.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-case.c' object='libfolks_test_la-test-case.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_test_la_CFLAGS) $(CFLAGS) -c -o libfolks_test_la-test-case.lo `test -f 'test-case.c' || echo '$(srcdir)/'`test-case.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfolks_test_la_CPPFLAGS) $(CPPFLAGS) $(libfolks_test_la_CFLAGS) $(CFLAGS) -c -o libfolks_test_la-test-case.lo `test -f 'test-case.c' || echo '$(srcdir)/'`test-case.c libfolks_test_la-test-utils.lo: test-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_test_la_CFLAGS) $(CFLAGS) -MT libfolks_test_la-test-utils.lo -MD -MP -MF $(DEPDIR)/libfolks_test_la-test-utils.Tpo -c -o libfolks_test_la-test-utils.lo `test -f 'test-utils.c' || echo '$(srcdir)/'`test-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfolks_test_la_CPPFLAGS) $(CPPFLAGS) $(libfolks_test_la_CFLAGS) $(CFLAGS) -MT libfolks_test_la-test-utils.lo -MD -MP -MF $(DEPDIR)/libfolks_test_la-test-utils.Tpo -c -o libfolks_test_la-test-utils.lo `test -f 'test-utils.c' || echo '$(srcdir)/'`test-utils.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfolks_test_la-test-utils.Tpo $(DEPDIR)/libfolks_test_la-test-utils.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='test-utils.c' object='libfolks_test_la-test-utils.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test-utils.c' object='libfolks_test_la-test-utils.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libfolks_test_la_CFLAGS) $(CFLAGS) -c -o libfolks_test_la-test-utils.lo `test -f 'test-utils.c' || echo '$(srcdir)/'`test-utils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfolks_test_la_CPPFLAGS) $(CPPFLAGS) $(libfolks_test_la_CFLAGS) $(CFLAGS) -c -o libfolks_test_la-test-utils.lo `test -f 'test-utils.c' || echo '$(srcdir)/'`test-utils.c $(srcdir)/test-case.c: $(srcdir)/libfolks_test_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_test_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_test_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_test_la_vala.stamp; \ fi $(srcdir)/test-utils.c: $(srcdir)/libfolks_test_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_test_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_test_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_test_la_vala.stamp; \ fi $(srcdir)/folks-test.h: $(srcdir)/libfolks_test_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libfolks_test_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libfolks_test_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libfolks_test_la_vala.stamp; \ fi libfolks_test_la_vala.stamp: $(libfolks_test_la_SOURCES) @@ -693,10 +713,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/tests/lib/telepathy/contactlist/conn.c folks-0.6.7/tests/lib/telepathy/contactlist/conn.c --- folks-0.6.6/tests/lib/telepathy/contactlist/conn.c 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/tests/lib/telepathy/contactlist/conn.c 2012-02-18 00:46:31.000000000 +0000 @@ -9,6 +9,9 @@ * notice and this notice are preserved. */ + +#include "config.h" + #include "conn.h" #include diff -Nru folks-0.6.6/tests/lib/telepathy/contactlist/contact-list-manager.c folks-0.6.7/tests/lib/telepathy/contactlist/contact-list-manager.c --- folks-0.6.6/tests/lib/telepathy/contactlist/contact-list-manager.c 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/tests/lib/telepathy/contactlist/contact-list-manager.c 2012-02-18 00:46:31.000000000 +0000 @@ -9,6 +9,8 @@ * notice and this notice are preserved. */ +#include "config.h" + #include "contact-list-manager.h" #include diff -Nru folks-0.6.6/tests/lib/telepathy/contactlist/Makefile.in folks-0.6.7/tests/lib/telepathy/contactlist/Makefile.in --- folks-0.6.6/tests/lib/telepathy/contactlist/Makefile.in 2011-12-13 23:38:43.000000000 +0000 +++ folks-0.6.7/tests/lib/telepathy/contactlist/Makefile.in 2012-02-23 00:04:13.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -46,10 +46,11 @@ $(srcdir)/Makefile.in $(srcdir)/session.conf.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -128,6 +129,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -427,74 +430,65 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libtp_test_contactlist_la-account.lo: account.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -MT libtp_test_contactlist_la-account.lo -MD -MP -MF $(DEPDIR)/libtp_test_contactlist_la-account.Tpo -c -o libtp_test_contactlist_la-account.lo `test -f 'account.c' || echo '$(srcdir)/'`account.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtp_test_contactlist_la-account.Tpo $(DEPDIR)/libtp_test_contactlist_la-account.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='account.c' object='libtp_test_contactlist_la-account.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='account.c' object='libtp_test_contactlist_la-account.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -c -o libtp_test_contactlist_la-account.lo `test -f 'account.c' || echo '$(srcdir)/'`account.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -c -o libtp_test_contactlist_la-account.lo `test -f 'account.c' || echo '$(srcdir)/'`account.c libtp_test_contactlist_la-account-manager.lo: account-manager.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -MT libtp_test_contactlist_la-account-manager.lo -MD -MP -MF $(DEPDIR)/libtp_test_contactlist_la-account-manager.Tpo -c -o libtp_test_contactlist_la-account-manager.lo `test -f 'account-manager.c' || echo '$(srcdir)/'`account-manager.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtp_test_contactlist_la-account-manager.Tpo $(DEPDIR)/libtp_test_contactlist_la-account-manager.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='account-manager.c' object='libtp_test_contactlist_la-account-manager.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='account-manager.c' object='libtp_test_contactlist_la-account-manager.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -c -o libtp_test_contactlist_la-account-manager.lo `test -f 'account-manager.c' || echo '$(srcdir)/'`account-manager.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -c -o libtp_test_contactlist_la-account-manager.lo `test -f 'account-manager.c' || echo '$(srcdir)/'`account-manager.c libtp_test_contactlist_la-backend.lo: backend.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -MT libtp_test_contactlist_la-backend.lo -MD -MP -MF $(DEPDIR)/libtp_test_contactlist_la-backend.Tpo -c -o libtp_test_contactlist_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtp_test_contactlist_la-backend.Tpo $(DEPDIR)/libtp_test_contactlist_la-backend.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='backend.c' object='libtp_test_contactlist_la-backend.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='backend.c' object='libtp_test_contactlist_la-backend.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -c -o libtp_test_contactlist_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -c -o libtp_test_contactlist_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c libtp_test_contactlist_la-conn.lo: conn.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -MT libtp_test_contactlist_la-conn.lo -MD -MP -MF $(DEPDIR)/libtp_test_contactlist_la-conn.Tpo -c -o libtp_test_contactlist_la-conn.lo `test -f 'conn.c' || echo '$(srcdir)/'`conn.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtp_test_contactlist_la-conn.Tpo $(DEPDIR)/libtp_test_contactlist_la-conn.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='conn.c' object='libtp_test_contactlist_la-conn.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='conn.c' object='libtp_test_contactlist_la-conn.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -c -o libtp_test_contactlist_la-conn.lo `test -f 'conn.c' || echo '$(srcdir)/'`conn.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -c -o libtp_test_contactlist_la-conn.lo `test -f 'conn.c' || echo '$(srcdir)/'`conn.c libtp_test_contactlist_la-contact-list.lo: contact-list.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -MT libtp_test_contactlist_la-contact-list.lo -MD -MP -MF $(DEPDIR)/libtp_test_contactlist_la-contact-list.Tpo -c -o libtp_test_contactlist_la-contact-list.lo `test -f 'contact-list.c' || echo '$(srcdir)/'`contact-list.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtp_test_contactlist_la-contact-list.Tpo $(DEPDIR)/libtp_test_contactlist_la-contact-list.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='contact-list.c' object='libtp_test_contactlist_la-contact-list.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='contact-list.c' object='libtp_test_contactlist_la-contact-list.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -c -o libtp_test_contactlist_la-contact-list.lo `test -f 'contact-list.c' || echo '$(srcdir)/'`contact-list.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -c -o libtp_test_contactlist_la-contact-list.lo `test -f 'contact-list.c' || echo '$(srcdir)/'`contact-list.c libtp_test_contactlist_la-contact-list-manager.lo: contact-list-manager.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -MT libtp_test_contactlist_la-contact-list-manager.lo -MD -MP -MF $(DEPDIR)/libtp_test_contactlist_la-contact-list-manager.Tpo -c -o libtp_test_contactlist_la-contact-list-manager.lo `test -f 'contact-list-manager.c' || echo '$(srcdir)/'`contact-list-manager.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtp_test_contactlist_la-contact-list-manager.Tpo $(DEPDIR)/libtp_test_contactlist_la-contact-list-manager.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='contact-list-manager.c' object='libtp_test_contactlist_la-contact-list-manager.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='contact-list-manager.c' object='libtp_test_contactlist_la-contact-list-manager.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -c -o libtp_test_contactlist_la-contact-list-manager.lo `test -f 'contact-list-manager.c' || echo '$(srcdir)/'`contact-list-manager.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtp_test_contactlist_la_CFLAGS) $(CFLAGS) -c -o libtp_test_contactlist_la-contact-list-manager.lo `test -f 'contact-list-manager.c' || echo '$(srcdir)/'`contact-list-manager.c mostlyclean-libtool: -rm -f *.lo @@ -598,10 +592,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/tests/lib/telepathy/Makefile.in folks-0.6.7/tests/lib/telepathy/Makefile.in --- folks-0.6.6/tests/lib/telepathy/Makefile.in 2011-12-13 23:38:43.000000000 +0000 +++ folks-0.6.7/tests/lib/telepathy/Makefile.in 2012-02-23 00:04:13.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -37,10 +37,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -116,6 +117,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -535,10 +538,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/tests/lib/test-case.c folks-0.6.7/tests/lib/test-case.c --- folks-0.6.6/tests/lib/test-case.c 2011-12-13 23:41:28.000000000 +0000 +++ folks-0.6.7/tests/lib/test-case.c 2012-02-23 00:02:21.000000000 +0000 @@ -1,4 +1,4 @@ -/* test-case.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* test-case.c generated by valac 0.15.1, the Vala compiler * generated from test-case.vala, do not modify */ /* testcase.vala @@ -137,7 +137,8 @@ enum { FOLKS_TEST_CASE_ADAPTOR_DUMMY_PROPERTY }; -static void _folks_test_case_adaptor_printerr_func_stack_trace (FolksTestCaseAdaptor* self, const gchar* text); +static void _folks_test_case_adaptor_printerr_func_stack_trace (const gchar* text); +static void __folks_test_case_adaptor_printerr_func_stack_trace_gprint_func (const gchar* text); static void _folks_test_case_adaptor_log_func_stack_trace (FolksTestCaseAdaptor* self, const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message); static void __folks_test_case_adaptor_log_func_stack_trace_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self); static void folks_test_case_adaptor_set_name (FolksTestCaseAdaptor* self, const gchar* value); @@ -163,14 +164,14 @@ self->priv->_suite = _tmp1_; #line 32 "/home/treitter/collabora/folks/tests/lib/test-case.vala" return self; -#line 167 "test-case.c" +#line 168 "test-case.c" } static gpointer _folks_test_case_adaptor_ref0 (gpointer self) { #line 40 "/home/treitter/collabora/folks/tests/lib/test-case.vala" return self ? folks_test_case_adaptor_ref (self) : NULL; -#line 174 "test-case.c" +#line 175 "test-case.c" } @@ -181,34 +182,34 @@ *size = (*size) ? (2 * (*size)) : 4; #line 40 "/home/treitter/collabora/folks/tests/lib/test-case.vala" *array = g_renew (FolksTestCaseAdaptor*, *array, (*size) + 1); -#line 185 "test-case.c" +#line 186 "test-case.c" } #line 40 "/home/treitter/collabora/folks/tests/lib/test-case.vala" (*array)[(*length)++] = value; #line 40 "/home/treitter/collabora/folks/tests/lib/test-case.vala" (*array)[*length] = NULL; -#line 191 "test-case.c" +#line 192 "test-case.c" } static void _folks_test_case_adaptor_set_up_gtest_func (void* fixture, gpointer self) { #line 42 "/home/treitter/collabora/folks/tests/lib/test-case.vala" folks_test_case_adaptor_set_up (self, fixture); -#line 198 "test-case.c" +#line 199 "test-case.c" } static void _folks_test_case_adaptor_run_gtest_func (void* fixture, gpointer self) { #line 42 "/home/treitter/collabora/folks/tests/lib/test-case.vala" folks_test_case_adaptor_run (self, fixture); -#line 205 "test-case.c" +#line 206 "test-case.c" } static void _folks_test_case_adaptor_tear_down_gtest_func (void* fixture, gpointer self) { #line 42 "/home/treitter/collabora/folks/tests/lib/test-case.vala" folks_test_case_adaptor_tear_down (self, fixture); -#line 212 "test-case.c" +#line 213 "test-case.c" } @@ -259,7 +260,7 @@ g_test_suite_add (_tmp5_, _tmp8_); #line 37 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _folks_test_case_adaptor_unref0 (adaptor); -#line 263 "test-case.c" +#line 264 "test-case.c" } @@ -272,7 +273,7 @@ g_return_if_fail (self != NULL); #line 46 "/home/treitter/collabora/folks/tests/lib/test-case.vala" FOLKS_TEST_CASE_GET_CLASS (self)->set_up (self); -#line 276 "test-case.c" +#line 277 "test-case.c" } @@ -285,7 +286,7 @@ g_return_if_fail (self != NULL); #line 50 "/home/treitter/collabora/folks/tests/lib/test-case.vala" FOLKS_TEST_CASE_GET_CLASS (self)->tear_down (self); -#line 289 "test-case.c" +#line 290 "test-case.c" } @@ -300,14 +301,14 @@ result = _tmp0_; #line 56 "/home/treitter/collabora/folks/tests/lib/test-case.vala" return result; -#line 304 "test-case.c" +#line 305 "test-case.c" } static gpointer _g_object_ref0 (gpointer self) { #line 69 "/home/treitter/collabora/folks/tests/lib/test-case.vala" return self ? g_object_ref (self) : NULL; -#line 311 "test-case.c" +#line 312 "test-case.c" } @@ -351,21 +352,28 @@ self->priv->_test_case = _tmp4_; #line 65 "/home/treitter/collabora/folks/tests/lib/test-case.vala" return self; -#line 355 "test-case.c" +#line 356 "test-case.c" } static FolksTestCaseAdaptor* folks_test_case_adaptor_new (const gchar* name, FolksTestCaseTestMethod test, void* test_target, FolksTestCase* test_case) { #line 65 "/home/treitter/collabora/folks/tests/lib/test-case.vala" return folks_test_case_adaptor_construct (FOLKS_TEST_CASE_TYPE_ADAPTOR, name, test, test_target, test_case); -#line 362 "test-case.c" +#line 363 "test-case.c" +} + + +static void __folks_test_case_adaptor_printerr_func_stack_trace_gprint_func (const gchar* text) { +#line 74 "/home/treitter/collabora/folks/tests/lib/test-case.vala" + _folks_test_case_adaptor_printerr_func_stack_trace (text); +#line 370 "test-case.c" } static void __folks_test_case_adaptor_log_func_stack_trace_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) { -#line 76 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 75 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _folks_test_case_adaptor_log_func_stack_trace (self, log_domain, log_levels, message); -#line 369 "test-case.c" +#line 377 "test-case.c" } @@ -374,63 +382,61 @@ #line 72 "/home/treitter/collabora/folks/tests/lib/test-case.vala" g_return_if_fail (self != NULL); #line 74 "/home/treitter/collabora/folks/tests/lib/test-case.vala" - g_set_printerr_handler ((GPrintFunc) _folks_test_case_adaptor_printerr_func_stack_trace); -#line 76 "/home/treitter/collabora/folks/tests/lib/test-case.vala" + g_set_printerr_handler (__folks_test_case_adaptor_printerr_func_stack_trace_gprint_func); +#line 75 "/home/treitter/collabora/folks/tests/lib/test-case.vala" g_log_set_default_handler (__folks_test_case_adaptor_log_func_stack_trace_glog_func, self); -#line 78 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 77 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp0_ = self->priv->_test_case; -#line 78 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 77 "/home/treitter/collabora/folks/tests/lib/test-case.vala" folks_test_case_set_up (_tmp0_); -#line 385 "test-case.c" +#line 393 "test-case.c" } -static void _folks_test_case_adaptor_printerr_func_stack_trace (FolksTestCaseAdaptor* self, const gchar* text) { +static void _folks_test_case_adaptor_printerr_func_stack_trace (const gchar* text) { gboolean _tmp0_ = FALSE; const gchar* _tmp1_; gboolean _tmp5_; FILE* _tmp6_; const gchar* _tmp7_; -#line 81 "/home/treitter/collabora/folks/tests/lib/test-case.vala" - g_return_if_fail (self != NULL); -#line 83 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 82 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp1_ = text; -#line 83 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 82 "/home/treitter/collabora/folks/tests/lib/test-case.vala" if (_tmp1_ == NULL) { -#line 83 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 82 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp0_ = TRUE; -#line 403 "test-case.c" +#line 409 "test-case.c" } else { GEqualFunc _tmp2_; const gchar* _tmp3_; gboolean _tmp4_ = FALSE; -#line 83 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 82 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp2_ = g_str_equal; -#line 83 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 82 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp3_ = text; -#line 83 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 82 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp4_ = _tmp2_ (_tmp3_, ""); -#line 83 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 82 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp0_ = _tmp4_; -#line 416 "test-case.c" +#line 422 "test-case.c" } -#line 83 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 82 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp5_ = _tmp0_; -#line 83 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 82 "/home/treitter/collabora/folks/tests/lib/test-case.vala" if (_tmp5_) { -#line 84 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 83 "/home/treitter/collabora/folks/tests/lib/test-case.vala" return; -#line 424 "test-case.c" +#line 430 "test-case.c" } -#line 86 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 85 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp6_ = stderr; -#line 86 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 85 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp7_ = text; -#line 86 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 85 "/home/treitter/collabora/folks/tests/lib/test-case.vala" fprintf (_tmp6_, "%s", _tmp7_); -#line 89 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 88 "/home/treitter/collabora/folks/tests/lib/test-case.vala" g_on_error_stack_trace ("libtool --mode=execute gdb"); -#line 434 "test-case.c" +#line 440 "test-case.c" } @@ -441,29 +447,29 @@ GLogLevelFlags _tmp2_; const gchar* _tmp3_; GLogLevelFlags _tmp4_; -#line 92 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 91 "/home/treitter/collabora/folks/tests/lib/test-case.vala" g_return_if_fail (self != NULL); -#line 92 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 91 "/home/treitter/collabora/folks/tests/lib/test-case.vala" g_return_if_fail (message != NULL); -#line 96 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 95 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp0_ = g_log_default_handler; -#line 96 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 95 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp0__target = NULL; -#line 96 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 95 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp1_ = log_domain; -#line 96 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 95 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp2_ = log_levels; -#line 96 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 95 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp3_ = message; -#line 96 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 95 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp0_ (_tmp1_, _tmp2_, _tmp3_, _tmp0__target); -#line 100 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 99 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp4_ = log_levels; -#line 100 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 99 "/home/treitter/collabora/folks/tests/lib/test-case.vala" if ((_tmp4_ & ((G_LOG_LEVEL_WARNING | G_LOG_LEVEL_ERROR) | G_LOG_LEVEL_CRITICAL)) != 0) { -#line 105 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 104 "/home/treitter/collabora/folks/tests/lib/test-case.vala" g_on_error_stack_trace ("libtool --mode=execute gdb"); -#line 467 "test-case.c" +#line 473 "test-case.c" } } @@ -471,27 +477,27 @@ static void folks_test_case_adaptor_run (FolksTestCaseAdaptor* self, void* fixture) { FolksTestCaseTestMethod _tmp0_; void* _tmp0__target; -#line 109 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 108 "/home/treitter/collabora/folks/tests/lib/test-case.vala" g_return_if_fail (self != NULL); -#line 111 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 110 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp0_ = self->priv->_test; -#line 111 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 110 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp0__target = self->priv->_test_target; -#line 111 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 110 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp0_ (_tmp0__target); -#line 483 "test-case.c" +#line 489 "test-case.c" } static void folks_test_case_adaptor_tear_down (FolksTestCaseAdaptor* self, void* fixture) { FolksTestCase* _tmp0_; -#line 114 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 113 "/home/treitter/collabora/folks/tests/lib/test-case.vala" g_return_if_fail (self != NULL); -#line 116 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 115 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _tmp0_ = self->priv->_test_case; -#line 116 "/home/treitter/collabora/folks/tests/lib/test-case.vala" +#line 115 "/home/treitter/collabora/folks/tests/lib/test-case.vala" folks_test_case_tear_down (_tmp0_); -#line 495 "test-case.c" +#line 501 "test-case.c" } @@ -506,7 +512,7 @@ result = _tmp0_; #line 61 "/home/treitter/collabora/folks/tests/lib/test-case.vala" return result; -#line 510 "test-case.c" +#line 516 "test-case.c" } @@ -523,14 +529,14 @@ _g_free0 (self->priv->_name); #line 61 "/home/treitter/collabora/folks/tests/lib/test-case.vala" self->priv->_name = _tmp1_; -#line 527 "test-case.c" +#line 533 "test-case.c" } static void folks_test_case_value_adaptor_init (GValue* value) { #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" value->data[0].v_pointer = NULL; -#line 534 "test-case.c" +#line 540 "test-case.c" } @@ -539,7 +545,7 @@ if (value->data[0].v_pointer) { #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" folks_test_case_adaptor_unref (value->data[0].v_pointer); -#line 543 "test-case.c" +#line 549 "test-case.c" } } @@ -549,11 +555,11 @@ if (src_value->data[0].v_pointer) { #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" dest_value->data[0].v_pointer = folks_test_case_adaptor_ref (src_value->data[0].v_pointer); -#line 553 "test-case.c" +#line 559 "test-case.c" } else { #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" dest_value->data[0].v_pointer = NULL; -#line 557 "test-case.c" +#line 563 "test-case.c" } } @@ -561,37 +567,37 @@ static gpointer folks_test_case_value_adaptor_peek_pointer (const GValue* value) { #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" return value->data[0].v_pointer; -#line 565 "test-case.c" +#line 571 "test-case.c" } static gchar* folks_test_case_value_adaptor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" if (collect_values[0].v_pointer) { -#line 572 "test-case.c" +#line 578 "test-case.c" FolksTestCaseAdaptor* object; object = collect_values[0].v_pointer; #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" if (object->parent_instance.g_class == NULL) { #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 579 "test-case.c" +#line 585 "test-case.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 583 "test-case.c" +#line 589 "test-case.c" } #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" value->data[0].v_pointer = folks_test_case_adaptor_ref (object); -#line 587 "test-case.c" +#line 593 "test-case.c" } else { #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" value->data[0].v_pointer = NULL; -#line 591 "test-case.c" +#line 597 "test-case.c" } #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" return NULL; -#line 595 "test-case.c" +#line 601 "test-case.c" } @@ -602,25 +608,25 @@ if (!object_p) { #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 606 "test-case.c" +#line 612 "test-case.c" } #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" if (!value->data[0].v_pointer) { #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" *object_p = NULL; -#line 612 "test-case.c" +#line 618 "test-case.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" *object_p = value->data[0].v_pointer; -#line 616 "test-case.c" +#line 622 "test-case.c" } else { #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" *object_p = folks_test_case_adaptor_ref (value->data[0].v_pointer); -#line 620 "test-case.c" +#line 626 "test-case.c" } #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" return NULL; -#line 624 "test-case.c" +#line 630 "test-case.c" } @@ -634,7 +640,7 @@ G_PARAM_SPEC (spec)->value_type = object_type; #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" return G_PARAM_SPEC (spec); -#line 638 "test-case.c" +#line 644 "test-case.c" } @@ -643,7 +649,7 @@ g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, FOLKS_TEST_CASE_TYPE_ADAPTOR), NULL); #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" return value->data[0].v_pointer; -#line 647 "test-case.c" +#line 653 "test-case.c" } @@ -663,17 +669,17 @@ value->data[0].v_pointer = v_object; #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" folks_test_case_adaptor_ref (value->data[0].v_pointer); -#line 667 "test-case.c" +#line 673 "test-case.c" } else { #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" value->data[0].v_pointer = NULL; -#line 671 "test-case.c" +#line 677 "test-case.c" } #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" if (old) { #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" folks_test_case_adaptor_unref (old); -#line 677 "test-case.c" +#line 683 "test-case.c" } } @@ -692,17 +698,17 @@ g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" value->data[0].v_pointer = v_object; -#line 696 "test-case.c" +#line 702 "test-case.c" } else { #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" value->data[0].v_pointer = NULL; -#line 700 "test-case.c" +#line 706 "test-case.c" } #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" if (old) { #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" folks_test_case_adaptor_unref (old); -#line 706 "test-case.c" +#line 712 "test-case.c" } } @@ -714,7 +720,7 @@ FOLKS_TEST_CASE_ADAPTOR_CLASS (klass)->finalize = folks_test_case_adaptor_finalize; #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" g_type_class_add_private (klass, sizeof (FolksTestCaseAdaptorPrivate)); -#line 718 "test-case.c" +#line 724 "test-case.c" } @@ -723,7 +729,7 @@ self->priv = FOLKS_TEST_CASE_ADAPTOR_GET_PRIVATE (self); #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" self->ref_count = 1; -#line 727 "test-case.c" +#line 733 "test-case.c" } @@ -735,7 +741,7 @@ _g_free0 (self->priv->_name); #line 63 "/home/treitter/collabora/folks/tests/lib/test-case.vala" _g_object_unref0 (self->priv->_test_case); -#line 739 "test-case.c" +#line 745 "test-case.c" } @@ -760,7 +766,7 @@ g_atomic_int_inc (&self->ref_count); #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" return instance; -#line 764 "test-case.c" +#line 770 "test-case.c" } @@ -773,7 +779,7 @@ FOLKS_TEST_CASE_ADAPTOR_GET_CLASS (self)->finalize (self); #line 59 "/home/treitter/collabora/folks/tests/lib/test-case.vala" g_type_free_instance ((GTypeInstance *) self); -#line 777 "test-case.c" +#line 783 "test-case.c" } } @@ -789,7 +795,7 @@ FOLKS_TEST_CASE_CLASS (klass)->tear_down = folks_test_case_real_tear_down; #line 25 "/home/treitter/collabora/folks/tests/lib/test-case.vala" G_OBJECT_CLASS (klass)->finalize = folks_test_case_finalize; -#line 793 "test-case.c" +#line 799 "test-case.c" } @@ -805,7 +811,7 @@ self->priv->_adaptors_length1 = 0; #line 28 "/home/treitter/collabora/folks/tests/lib/test-case.vala" self->priv->__adaptors_size_ = self->priv->_adaptors_length1; -#line 809 "test-case.c" +#line 815 "test-case.c" } @@ -817,7 +823,7 @@ self->priv->_adaptors = (_vala_array_free (self->priv->_adaptors, self->priv->_adaptors_length1, (GDestroyNotify) folks_test_case_adaptor_unref), NULL); #line 25 "/home/treitter/collabora/folks/tests/lib/test-case.vala" G_OBJECT_CLASS (folks_test_case_parent_class)->finalize (obj); -#line 821 "test-case.c" +#line 827 "test-case.c" } diff -Nru folks-0.6.6/tests/lib/test-case.vala folks-0.6.7/tests/lib/test-case.vala --- folks-0.6.6/tests/lib/test-case.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/tests/lib/test-case.vala 2012-01-12 17:25:24.000000000 +0000 @@ -71,14 +71,13 @@ public void set_up (void* fixture) { - GLib.set_printerr_handler ( - (PrintFunc) this._printerr_func_stack_trace); + GLib.set_printerr_handler (this._printerr_func_stack_trace); Log.set_default_handler (this._log_func_stack_trace); this._test_case.set_up (); } - private void _printerr_func_stack_trace (string? text) + private static void _printerr_func_stack_trace (string? text) { if (text == null || str_equal (text, "")) return; diff -Nru folks-0.6.6/tests/lib/test-utils.c folks-0.6.7/tests/lib/test-utils.c --- folks-0.6.6/tests/lib/test-utils.c 2011-12-13 23:41:28.000000000 +0000 +++ folks-0.6.7/tests/lib/test-utils.c 2012-02-23 00:02:21.000000000 +0000 @@ -1,8 +1,9 @@ -/* test-utils.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* test-utils.c generated by valac 0.15.1, the Vala compiler * generated from test-utils.vala, do not modify */ /* * Copyright (C) 2011 Collabora Ltd. + * Copyright (C) 2012 Philip Withnall * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -18,6 +19,7 @@ * along with this library. If not, see . * * Authors: Travis Reitter + * Philip Withnall * */ @@ -26,6 +28,7 @@ #include #include #include +#include #include @@ -43,6 +46,8 @@ #define _g_free0(var) (var = (g_free (var), NULL)) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) typedef struct _FolksTestUtilsLoadableIconsContentEqualData FolksTestUtilsLoadableIconsContentEqualData; +typedef struct _Block1Data Block1Data; +typedef struct _FolksTestUtilsAggregatorPrepareAndWaitForQuiescenceData FolksTestUtilsAggregatorPrepareAndWaitForQuiescenceData; typedef struct _FolksParamSpecTestUtils FolksParamSpecTestUtils; struct _FolksTestUtils { @@ -127,6 +132,34 @@ GError * _inner_error_; }; +struct _Block1Data { + int _ref_count_; + gboolean has_yielded; + gpointer _async_data_; +}; + +struct _FolksTestUtilsAggregatorPrepareAndWaitForQuiescenceData { + int _state_; + GObject* _source_object_; + GAsyncResult* _res_; + GSimpleAsyncResult* _async_result; + FolksIndividualAggregator* aggregator; + Block1Data* _data1_; + FolksIndividualAggregator* _tmp0_; + gulong _tmp1_; + gulong signal_id; + FolksIndividualAggregator* _tmp2_; + FolksIndividualAggregator* _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; + FolksIndividualAggregator* _tmp6_; + gulong _tmp7_; + FolksIndividualAggregator* _tmp8_; + gboolean _tmp9_; + gboolean _tmp10_; + GError * _inner_error_; +}; + struct _FolksParamSpecTestUtils { GParamSpec parent_instance; }; @@ -149,6 +182,15 @@ gboolean folks_test_utils_loadable_icons_content_equal_finish (GAsyncResult* _res_); static gboolean folks_test_utils_loadable_icons_content_equal_co (FolksTestUtilsLoadableIconsContentEqualData* _data_); static void folks_test_utils_loadable_icons_content_equal_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); +static void folks_test_utils_aggregator_prepare_and_wait_for_quiescence_data_free (gpointer _data); +void folks_test_utils_aggregator_prepare_and_wait_for_quiescence (FolksIndividualAggregator* aggregator, GAsyncReadyCallback _callback_, gpointer _user_data_); +void folks_test_utils_aggregator_prepare_and_wait_for_quiescence_finish (GAsyncResult* _res_, GError** error); +static gboolean folks_test_utils_aggregator_prepare_and_wait_for_quiescence_co (FolksTestUtilsAggregatorPrepareAndWaitForQuiescenceData* _data_); +static Block1Data* block1_data_ref (Block1Data* _data1_); +static void block1_data_unref (Block1Data* _data1_); +static void __lambda2_ (Block1Data* _data1_, GObject* obj, GParamSpec* pspec); +static void ___lambda2__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void folks_test_utils_aggregator_prepare_and_wait_for_quiescence_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); FolksTestUtils* folks_test_utils_new (void); FolksTestUtils* folks_test_utils_construct (GType object_type); static void folks_test_utils_finalize (FolksTestUtils* obj); @@ -157,20 +199,20 @@ static void folks_test_utils_loadable_icons_content_equal_data_free (gpointer _data) { FolksTestUtilsLoadableIconsContentEqualData* _data_; _data_ = _data; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_object_unref0 (_data_->a); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_object_unref0 (_data_->b); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_slice_free (FolksTestUtilsLoadableIconsContentEqualData, _data_); -#line 167 "test-utils.c" +#line 209 "test-utils.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return self ? g_object_ref (self) : NULL; -#line 174 "test-utils.c" +#line 216 "test-utils.c" } @@ -181,44 +223,44 @@ GLoadableIcon* _tmp2_; GLoadableIcon* _tmp3_; gint _tmp4_; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_ = g_slice_new0 (FolksTestUtilsLoadableIconsContentEqualData); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_async_result = g_simple_async_result_new (NULL, _callback_, _user_data_, folks_test_utils_loadable_icons_content_equal); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, folks_test_utils_loadable_icons_content_equal_data_free); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _tmp0_ = a; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->a = _tmp1_; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _tmp2_ = b; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->b = _tmp3_; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _tmp4_ = icon_size; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->icon_size = _tmp4_; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" folks_test_utils_loadable_icons_content_equal_co (_data_); -#line 209 "test-utils.c" +#line 251 "test-utils.c" } gboolean folks_test_utils_loadable_icons_content_equal_finish (GAsyncResult* _res_) { gboolean result; FolksTestUtilsLoadableIconsContentEqualData* _data_; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" result = _data_->result; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return result; -#line 222 "test-utils.c" +#line 264 "test-utils.c" } @@ -240,689 +282,946 @@ */ static void folks_test_utils_loadable_icons_content_equal_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { FolksTestUtilsLoadableIconsContentEqualData* _data_; -#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 58 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_ = _user_data_; -#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 58 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_source_object_ = source_object; -#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 58 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_res_ = _res_; -#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 58 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" folks_test_utils_loadable_icons_content_equal_co (_data_); -#line 252 "test-utils.c" +#line 294 "test-utils.c" } static gboolean folks_test_utils_loadable_icons_content_equal_co (FolksTestUtilsLoadableIconsContentEqualData* _data_) { -#line 41 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 44 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" switch (_data_->_state_) { -#line 41 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 44 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" case 0: -#line 261 "test-utils.c" +#line 303 "test-utils.c" goto _state_0; -#line 41 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 44 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" case 1: -#line 265 "test-utils.c" +#line 307 "test-utils.c" goto _state_1; -#line 41 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 44 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" case 2: -#line 269 "test-utils.c" +#line 311 "test-utils.c" goto _state_2; -#line 41 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 44 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" case 3: -#line 273 "test-utils.c" +#line 315 "test-utils.c" goto _state_3; -#line 41 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 44 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" case 4: -#line 277 "test-utils.c" +#line 319 "test-utils.c" goto _state_4; -#line 41 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 44 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" case 5: -#line 281 "test-utils.c" +#line 323 "test-utils.c" goto _state_5; -#line 41 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 44 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" case 6: -#line 285 "test-utils.c" +#line 327 "test-utils.c" goto _state_6; default: -#line 41 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 44 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_assert_not_reached (); -#line 290 "test-utils.c" +#line 332 "test-utils.c" } _state_0: -#line 45 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 48 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->retval = FALSE; -#line 47 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 50 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp0_ = _data_->a; -#line 47 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 50 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp1_ = _data_->b; -#line 47 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 50 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (_data_->_tmp0_ == _data_->_tmp1_) { -#line 48 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 51 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->result = TRUE; -#line 48 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 51 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (_data_->_state_ == 0) { -#line 48 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 51 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 307 "test-utils.c" +#line 349 "test-utils.c" } else { -#line 48 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 51 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_simple_async_result_complete (_data_->_async_result); -#line 311 "test-utils.c" +#line 353 "test-utils.c" } -#line 48 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 51 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_object_unref (_data_->_async_result); -#line 48 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 51 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return FALSE; -#line 317 "test-utils.c" +#line 359 "test-utils.c" } -#line 50 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 53 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp3_ = _data_->a; -#line 50 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 53 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (_data_->_tmp3_ != NULL) { -#line 50 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 53 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp4_ = _data_->b; -#line 50 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 53 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp2_ = _data_->_tmp4_ != NULL; -#line 327 "test-utils.c" +#line 369 "test-utils.c" } else { -#line 50 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 53 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp2_ = FALSE; -#line 331 "test-utils.c" +#line 373 "test-utils.c" } -#line 50 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 53 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp5_ = _data_->_tmp2_; -#line 50 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 53 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (_data_->_tmp5_) { -#line 337 "test-utils.c" +#line 379 "test-utils.c" { -#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 58 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp6_ = _data_->a; -#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 58 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp7_ = _data_->icon_size; -#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 58 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp8_ = NULL; -#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 58 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_state_ = 1; -#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 58 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_loadable_icon_load_async (_data_->_tmp6_, _data_->_tmp7_, NULL, folks_test_utils_loadable_icons_content_equal_ready, _data_); -#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 58 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return FALSE; -#line 351 "test-utils.c" +#line 393 "test-utils.c" _state_1: -#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 58 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp9_ = NULL; -#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 58 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp9_ = g_loadable_icon_load_finish (_data_->_tmp6_, _data_->_res_, &_data_->_tmp8_, &_data_->_inner_error_); -#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 58 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_free0 (_data_->a_type); -#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 58 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->a_type = _data_->_tmp8_; -#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 58 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->a_input = _data_->_tmp9_; -#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 58 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (_data_->_inner_error_ != NULL) { -#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 58 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_free0 (_data_->a_type); -#line 367 "test-utils.c" +#line 409 "test-utils.c" goto __catch0_g_error; } -#line 57 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 60 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp10_ = _data_->b; -#line 57 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 60 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp11_ = _data_->icon_size; -#line 57 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 60 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp12_ = NULL; -#line 57 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 60 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_state_ = 2; -#line 57 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 60 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_loadable_icon_load_async (_data_->_tmp10_, _data_->_tmp11_, NULL, folks_test_utils_loadable_icons_content_equal_ready, _data_); -#line 57 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 60 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return FALSE; -#line 382 "test-utils.c" +#line 424 "test-utils.c" _state_2: -#line 57 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 60 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp13_ = NULL; -#line 57 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 60 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp13_ = g_loadable_icon_load_finish (_data_->_tmp10_, _data_->_res_, &_data_->_tmp12_, &_data_->_inner_error_); -#line 57 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 60 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_free0 (_data_->b_type); -#line 57 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 60 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->b_type = _data_->_tmp12_; -#line 57 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 60 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->b_input = _data_->_tmp13_; -#line 57 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 60 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (_data_->_inner_error_ != NULL) { -#line 57 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 60 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_free0 (_data_->b_type); -#line 57 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 60 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_object_unref0 (_data_->a_input); -#line 57 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 60 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_free0 (_data_->a_type); -#line 402 "test-utils.c" +#line 444 "test-utils.c" goto __catch0_g_error; } -#line 60 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 63 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->bufsize = (gsize) 2048; -#line 61 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 64 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp14_ = _data_->bufsize; -#line 61 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 64 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp15_ = NULL; -#line 61 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 64 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp15_ = g_new0 (guint8, _data_->_tmp14_); -#line 61 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 64 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->a_data = _data_->_tmp15_; -#line 61 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 64 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->a_data_length1 = _data_->_tmp14_; -#line 61 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 64 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_a_data_size_ = _data_->a_data_length1; -#line 62 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 65 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp16_ = _data_->bufsize; -#line 62 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 65 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp17_ = NULL; -#line 62 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 65 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp17_ = g_new0 (guint8, _data_->_tmp16_); -#line 62 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 65 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->b_data = _data_->_tmp17_; -#line 62 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 65 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->b_data_length1 = _data_->_tmp16_; -#line 62 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" - _data_->_b_data_size_ = _data_->b_data_length1; #line 65 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_b_data_size_ = _data_->b_data_length1; +#line 68 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->retval = TRUE; -#line 66 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->a_read_size = (gsize) (-1); -#line 435 "test-utils.c" +#line 477 "test-utils.c" { -#line 67 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp18_ = TRUE; -#line 67 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" while (TRUE) { -#line 67 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp19_ = _data_->_tmp18_; -#line 67 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (!_data_->_tmp19_) { -#line 79 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 82 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp20_ = _data_->a_read_size; -#line 79 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 82 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (!(_data_->_tmp20_ > ((gsize) 0))) { -#line 79 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 82 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" break; -#line 451 "test-utils.c" +#line 493 "test-utils.c" } } -#line 67 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp18_ = FALSE; -#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp21_ = _data_->a_input; -#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp22_ = _data_->a_data; -#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp22__length1 = _data_->a_data_length1; -#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_state_ = 3; -#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_input_stream_read_async (_data_->_tmp21_, _data_->_tmp22_, (gsize) _data_->_tmp22__length1, G_PRIORITY_DEFAULT, NULL, folks_test_utils_loadable_icons_content_equal_ready, _data_); -#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return FALSE; -#line 468 "test-utils.c" +#line 510 "test-utils.c" _state_3: -#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp23_ = 0L; -#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp23_ = g_input_stream_read_finish (_data_->_tmp21_, _data_->_res_, &_data_->_inner_error_); -#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp24_ = _data_->_tmp23_; -#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (_data_->_inner_error_ != NULL) { -#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->b_data = (g_free (_data_->b_data), NULL); -#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->a_data = (g_free (_data_->a_data), NULL); -#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_object_unref0 (_data_->b_input); -#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_free0 (_data_->b_type); -#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_object_unref0 (_data_->a_input); -#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_free0 (_data_->a_type); -#line 490 "test-utils.c" +#line 532 "test-utils.c" goto __catch0_g_error; } -#line 69 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->a_read_size = (gsize) _data_->_tmp24_; -#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp25_ = _data_->b_input; -#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp26_ = _data_->b_data; -#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp26__length1 = _data_->b_data_length1; -#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_state_ = 4; -#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_input_stream_read_async (_data_->_tmp25_, _data_->_tmp26_, (gsize) _data_->_tmp26__length1, G_PRIORITY_DEFAULT, NULL, folks_test_utils_loadable_icons_content_equal_ready, _data_); -#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return FALSE; -#line 507 "test-utils.c" +#line 549 "test-utils.c" _state_4: -#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp27_ = 0L; -#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp27_ = g_input_stream_read_finish (_data_->_tmp25_, _data_->_res_, &_data_->_inner_error_); -#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->b_read_size = _data_->_tmp27_; -#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (_data_->_inner_error_ != NULL) { -#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->b_data = (g_free (_data_->b_data), NULL); -#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->a_data = (g_free (_data_->a_data), NULL); -#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_object_unref0 (_data_->b_input); -#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_free0 (_data_->b_type); -#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_object_unref0 (_data_->a_input); -#line 70 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_free0 (_data_->a_type); -#line 529 "test-utils.c" +#line 571 "test-utils.c" goto __catch0_g_error; } -#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 75 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp29_ = _data_->a_read_size; -#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 75 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp30_ = _data_->b_read_size; -#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 75 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (_data_->_tmp29_ != ((gsize) _data_->_tmp30_)) { -#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 75 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp28_ = TRUE; -#line 540 "test-utils.c" +#line 582 "test-utils.c" } else { -#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 76 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp31_ = _data_->a_data; -#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 76 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp31__length1 = _data_->a_data_length1; -#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 76 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp32_ = _data_->b_data; -#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 76 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp32__length1 = _data_->b_data_length1; -#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 76 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp33_ = _data_->a_read_size; -#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 76 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp34_ = 0; -#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 76 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp34_ = memcmp (_data_->_tmp31_, _data_->_tmp32_, _data_->_tmp33_); -#line 73 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 76 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp28_ = _data_->_tmp34_ != 0; -#line 558 "test-utils.c" +#line 600 "test-utils.c" } -#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 75 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp35_ = _data_->_tmp28_; -#line 72 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" - if (_data_->_tmp35_) { #line 75 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + if (_data_->_tmp35_) { +#line 78 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->retval = FALSE; -#line 76 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 79 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" break; -#line 568 "test-utils.c" +#line 610 "test-utils.c" } } } -#line 81 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 84 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp36_ = _data_->a_input; -#line 81 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 84 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_state_ = 5; -#line 81 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 84 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_input_stream_close_async (_data_->_tmp36_, G_PRIORITY_DEFAULT, NULL, folks_test_utils_loadable_icons_content_equal_ready, _data_); -#line 81 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 84 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return FALSE; -#line 580 "test-utils.c" +#line 622 "test-utils.c" _state_5: -#line 81 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 84 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_input_stream_close_finish (_data_->_tmp36_, _data_->_res_, &_data_->_inner_error_); -#line 81 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 84 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (_data_->_inner_error_ != NULL) { -#line 81 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 84 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->b_data = (g_free (_data_->b_data), NULL); -#line 81 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 84 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->a_data = (g_free (_data_->a_data), NULL); -#line 81 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 84 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_object_unref0 (_data_->b_input); -#line 81 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 84 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_free0 (_data_->b_type); -#line 81 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 84 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_object_unref0 (_data_->a_input); -#line 81 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 84 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_free0 (_data_->a_type); -#line 598 "test-utils.c" +#line 640 "test-utils.c" goto __catch0_g_error; } -#line 82 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 85 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp37_ = _data_->b_input; -#line 82 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 85 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_state_ = 6; -#line 82 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 85 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_input_stream_close_async (_data_->_tmp37_, G_PRIORITY_DEFAULT, NULL, folks_test_utils_loadable_icons_content_equal_ready, _data_); -#line 82 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 85 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return FALSE; -#line 609 "test-utils.c" +#line 651 "test-utils.c" _state_6: -#line 82 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 85 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_input_stream_close_finish (_data_->_tmp37_, _data_->_res_, &_data_->_inner_error_); -#line 82 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 85 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (_data_->_inner_error_ != NULL) { -#line 82 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 85 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->b_data = (g_free (_data_->b_data), NULL); -#line 82 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 85 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->a_data = (g_free (_data_->a_data), NULL); -#line 82 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 85 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_object_unref0 (_data_->b_input); -#line 82 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 85 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_free0 (_data_->b_type); -#line 82 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 85 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_object_unref0 (_data_->a_input); -#line 82 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 85 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_free0 (_data_->a_type); -#line 627 "test-utils.c" +#line 669 "test-utils.c" goto __catch0_g_error; } -#line 52 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->b_data = (g_free (_data_->b_data), NULL); -#line 52 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->a_data = (g_free (_data_->a_data), NULL); -#line 52 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_object_unref0 (_data_->b_input); -#line 52 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_free0 (_data_->b_type); -#line 52 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_object_unref0 (_data_->a_input); -#line 52 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_free0 (_data_->a_type); -#line 642 "test-utils.c" +#line 684 "test-utils.c" } goto __finally0; __catch0_g_error: { -#line 52 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->e1 = _data_->_inner_error_; -#line 52 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_inner_error_ = NULL; -#line 86 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 89 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->retval = FALSE; -#line 87 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 90 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp38_ = _data_->e1; -#line 87 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 90 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->_tmp39_ = _data_->_tmp38_->message; -#line 87 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" - g_warning ("test-utils.vala:87: Failed to read loadable icon for comparison: %s", _data_->_tmp39_); -#line 52 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 90 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_warning ("test-utils.vala:90: Failed to read loadable icon for comparison: %s", _data_->_tmp39_); +#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _g_error_free0 (_data_->e1); -#line 661 "test-utils.c" +#line 703 "test-utils.c" } __finally0: -#line 52 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (_data_->_inner_error_ != NULL) { -#line 52 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _data_->_inner_error_->message, g_quark_to_string (_data_->_inner_error_->domain), _data_->_inner_error_->code); -#line 52 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_clear_error (&_data_->_inner_error_); -#line 52 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 55 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return FALSE; -#line 672 "test-utils.c" +#line 714 "test-utils.c" } } -#line 92 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 95 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" _data_->result = _data_->retval; -#line 92 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 95 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (_data_->_state_ == 0) { -#line 92 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 95 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 681 "test-utils.c" +#line 723 "test-utils.c" } else { -#line 92 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 95 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_simple_async_result_complete (_data_->_async_result); -#line 685 "test-utils.c" +#line 727 "test-utils.c" } -#line 92 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 95 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_object_unref (_data_->_async_result); -#line 92 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 95 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return FALSE; -#line 41 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 44 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (_data_->_state_ == 0) { -#line 41 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 44 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 695 "test-utils.c" +#line 737 "test-utils.c" } else { -#line 41 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 44 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_simple_async_result_complete (_data_->_async_result); -#line 699 "test-utils.c" +#line 741 "test-utils.c" } -#line 41 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 44 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_object_unref (_data_->_async_result); -#line 41 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 44 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return FALSE; -#line 705 "test-utils.c" +#line 747 "test-utils.c" +} + + +static void folks_test_utils_aggregator_prepare_and_wait_for_quiescence_data_free (gpointer _data) { + FolksTestUtilsAggregatorPrepareAndWaitForQuiescenceData* _data_; + _data_ = _data; +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _g_object_unref0 (_data_->aggregator); +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_slice_free (FolksTestUtilsAggregatorPrepareAndWaitForQuiescenceData, _data_); +#line 758 "test-utils.c" +} + + +void folks_test_utils_aggregator_prepare_and_wait_for_quiescence (FolksIndividualAggregator* aggregator, GAsyncReadyCallback _callback_, gpointer _user_data_) { + FolksTestUtilsAggregatorPrepareAndWaitForQuiescenceData* _data_; + FolksIndividualAggregator* _tmp0_; + FolksIndividualAggregator* _tmp1_; +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_ = g_slice_new0 (FolksTestUtilsAggregatorPrepareAndWaitForQuiescenceData); +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_async_result = g_simple_async_result_new (NULL, _callback_, _user_data_, folks_test_utils_aggregator_prepare_and_wait_for_quiescence); +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, folks_test_utils_aggregator_prepare_and_wait_for_quiescence_data_free); +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _tmp0_ = aggregator; +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _tmp1_ = _g_object_ref0 (_tmp0_); +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->aggregator = _tmp1_; +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + folks_test_utils_aggregator_prepare_and_wait_for_quiescence_co (_data_); +#line 780 "test-utils.c" +} + + +void folks_test_utils_aggregator_prepare_and_wait_for_quiescence_finish (GAsyncResult* _res_, GError** error) { + FolksTestUtilsAggregatorPrepareAndWaitForQuiescenceData* _data_; +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + return; +#line 790 "test-utils.c" + } +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); +#line 794 "test-utils.c" +} + + +/** + * Prepare an aggregator and wait for it to reach quiescence. + * + * This will prepare the given {@link IndividualAggregator} then yield until + * it reaches quiescence. No timeout is used, so if the aggregator never + * reaches quiescence, this function will never return; callers must add their + * own timeout to avoid this if necessary. + * + * When this returns, the aggregator is guaranteed to be quiescent. + * + * @param aggregator the aggregator to prepare + */ +static Block1Data* block1_data_ref (Block1Data* _data1_) { +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_atomic_int_inc (&_data1_->_ref_count_); +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + return _data1_; +#line 815 "test-utils.c" +} + + +static void block1_data_unref (Block1Data* _data1_) { +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_slice_free (Block1Data, _data1_); +#line 824 "test-utils.c" + } +} + + +static void __lambda2_ (Block1Data* _data1_, GObject* obj, GParamSpec* pspec) { + gboolean _tmp0_; +#line 114 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_return_if_fail (obj != NULL); +#line 114 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_return_if_fail (pspec != NULL); +#line 116 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _tmp0_ = _data1_->has_yielded; +#line 116 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + if (_tmp0_ == TRUE) { +#line 118 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + folks_test_utils_aggregator_prepare_and_wait_for_quiescence_co (_data1_->_async_data_); +#line 841 "test-utils.c" + } +} + + +static void ___lambda2__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { +#line 114 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + __lambda2_ (self, _sender, pspec); +#line 849 "test-utils.c" +} + + +static void folks_test_utils_aggregator_prepare_and_wait_for_quiescence_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { + FolksTestUtilsAggregatorPrepareAndWaitForQuiescenceData* _data_; +#line 124 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_ = _user_data_; +#line 124 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_source_object_ = source_object; +#line 124 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_res_ = _res_; +#line 124 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + folks_test_utils_aggregator_prepare_and_wait_for_quiescence_co (_data_); +#line 863 "test-utils.c" +} + + +static gboolean folks_test_utils_aggregator_prepare_and_wait_for_quiescence_co (FolksTestUtilsAggregatorPrepareAndWaitForQuiescenceData* _data_) { +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + switch (_data_->_state_) { +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + case 0: +#line 872 "test-utils.c" + goto _state_0; +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + case 1: +#line 876 "test-utils.c" + goto _state_1; +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + case 2: +#line 880 "test-utils.c" + goto _state_2; + default: +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_assert_not_reached (); +#line 885 "test-utils.c" + } + _state_0: +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_data1_ = g_slice_new0 (Block1Data); +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_data1_->_ref_count_ = 1; +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_data1_->_async_data_ = _data_; +#line 113 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_data1_->has_yielded = FALSE; +#line 114 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_tmp0_ = _data_->aggregator; +#line 114 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_tmp1_ = 0UL; +#line 114 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_tmp1_ = g_signal_connect_data ((GObject*) _data_->_tmp0_, "notify::is-quiescent", (GCallback) ___lambda2__g_object_notify, block1_data_ref (_data_->_data1_), (GClosureNotify) block1_data_unref, 0); +#line 114 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->signal_id = _data_->_tmp1_; +#line 904 "test-utils.c" + { +#line 124 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_tmp2_ = _data_->aggregator; +#line 124 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_state_ = 1; +#line 124 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + folks_individual_aggregator_prepare (_data_->_tmp2_, folks_test_utils_aggregator_prepare_and_wait_for_quiescence_ready, _data_); +#line 124 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + return FALSE; +#line 914 "test-utils.c" + _state_1: +#line 124 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + folks_individual_aggregator_prepare_finish (_data_->_tmp2_, _data_->_res_, &_data_->_inner_error_); +#line 124 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + if (_data_->_inner_error_ != NULL) { +#line 920 "test-utils.c" + goto __finally1; + } +#line 126 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_tmp3_ = _data_->aggregator; +#line 126 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_tmp4_ = folks_individual_aggregator_get_is_quiescent (_data_->_tmp3_); +#line 126 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_tmp5_ = _data_->_tmp4_; +#line 126 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + if (_data_->_tmp5_ == FALSE) { +#line 128 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_data1_->has_yielded = TRUE; +#line 129 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_state_ = 2; +#line 129 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + return FALSE; +#line 937 "test-utils.c" + _state_2: + ; + } + } + __finally1: + { +#line 134 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_tmp6_ = _data_->aggregator; +#line 134 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_tmp7_ = _data_->signal_id; +#line 134 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_signal_handler_disconnect ((GObject*) _data_->_tmp6_, _data_->_tmp7_); +#line 135 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_tmp8_ = _data_->aggregator; +#line 135 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_tmp9_ = folks_individual_aggregator_get_is_quiescent (_data_->_tmp8_); +#line 135 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_tmp10_ = _data_->_tmp9_; +#line 135 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_assert (_data_->_tmp10_ == TRUE); +#line 958 "test-utils.c" + } +#line 122 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + if (_data_->_inner_error_ != NULL) { +#line 122 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); +#line 122 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_error_free (_data_->_inner_error_); +#line 122 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + block1_data_unref (_data_->_data1_); +#line 122 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_data1_ = NULL; +#line 122 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + if (_data_->_state_ == 0) { +#line 122 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_simple_async_result_complete_in_idle (_data_->_async_result); +#line 974 "test-utils.c" + } else { +#line 122 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_simple_async_result_complete (_data_->_async_result); +#line 978 "test-utils.c" + } +#line 122 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_object_unref (_data_->_async_result); +#line 122 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + return FALSE; +#line 984 "test-utils.c" + } +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + block1_data_unref (_data_->_data1_); +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + _data_->_data1_ = NULL; +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + if (_data_->_state_ == 0) { +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_simple_async_result_complete_in_idle (_data_->_async_result); +#line 994 "test-utils.c" + } else { +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_simple_async_result_complete (_data_->_async_result); +#line 998 "test-utils.c" + } +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + g_object_unref (_data_->_async_result); +#line 110 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" + return FALSE; +#line 1004 "test-utils.c" } FolksTestUtils* folks_test_utils_construct (GType object_type) { FolksTestUtils* self = NULL; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" self = (FolksTestUtils*) g_type_create_instance (object_type); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return self; -#line 715 "test-utils.c" +#line 1014 "test-utils.c" } FolksTestUtils* folks_test_utils_new (void) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return folks_test_utils_construct (FOLKS_TYPE_TEST_UTILS); -#line 722 "test-utils.c" +#line 1021 "test-utils.c" } static void folks_value_test_utils_init (GValue* value) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" value->data[0].v_pointer = NULL; -#line 729 "test-utils.c" +#line 1028 "test-utils.c" } static void folks_value_test_utils_free_value (GValue* value) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (value->data[0].v_pointer) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" folks_test_utils_unref (value->data[0].v_pointer); -#line 738 "test-utils.c" +#line 1037 "test-utils.c" } } static void folks_value_test_utils_copy_value (const GValue* src_value, GValue* dest_value) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (src_value->data[0].v_pointer) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" dest_value->data[0].v_pointer = folks_test_utils_ref (src_value->data[0].v_pointer); -#line 748 "test-utils.c" +#line 1047 "test-utils.c" } else { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" dest_value->data[0].v_pointer = NULL; -#line 752 "test-utils.c" +#line 1051 "test-utils.c" } } static gpointer folks_value_test_utils_peek_pointer (const GValue* value) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return value->data[0].v_pointer; -#line 760 "test-utils.c" +#line 1059 "test-utils.c" } static gchar* folks_value_test_utils_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (collect_values[0].v_pointer) { -#line 767 "test-utils.c" +#line 1066 "test-utils.c" FolksTestUtils* object; object = collect_values[0].v_pointer; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (object->parent_instance.g_class == NULL) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 774 "test-utils.c" +#line 1073 "test-utils.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 778 "test-utils.c" +#line 1077 "test-utils.c" } -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" value->data[0].v_pointer = folks_test_utils_ref (object); -#line 782 "test-utils.c" +#line 1081 "test-utils.c" } else { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" value->data[0].v_pointer = NULL; -#line 786 "test-utils.c" +#line 1085 "test-utils.c" } -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return NULL; -#line 790 "test-utils.c" +#line 1089 "test-utils.c" } static gchar* folks_value_test_utils_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { FolksTestUtils** object_p; object_p = collect_values[0].v_pointer; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (!object_p) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 801 "test-utils.c" +#line 1100 "test-utils.c" } -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (!value->data[0].v_pointer) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" *object_p = NULL; -#line 807 "test-utils.c" +#line 1106 "test-utils.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" *object_p = value->data[0].v_pointer; -#line 811 "test-utils.c" +#line 1110 "test-utils.c" } else { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" *object_p = folks_test_utils_ref (value->data[0].v_pointer); -#line 815 "test-utils.c" +#line 1114 "test-utils.c" } -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return NULL; -#line 819 "test-utils.c" +#line 1118 "test-utils.c" } GParamSpec* folks_param_spec_test_utils (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { FolksParamSpecTestUtils* spec; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_return_val_if_fail (g_type_is_a (object_type, FOLKS_TYPE_TEST_UTILS), NULL); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return G_PARAM_SPEC (spec); -#line 833 "test-utils.c" +#line 1132 "test-utils.c" } gpointer folks_value_get_test_utils (const GValue* value) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, FOLKS_TYPE_TEST_UTILS), NULL); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return value->data[0].v_pointer; -#line 842 "test-utils.c" +#line 1141 "test-utils.c" } void folks_value_set_test_utils (GValue* value, gpointer v_object) { FolksTestUtils* old; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, FOLKS_TYPE_TEST_UTILS)); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" old = value->data[0].v_pointer; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (v_object) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, FOLKS_TYPE_TEST_UTILS)); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" value->data[0].v_pointer = v_object; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" folks_test_utils_ref (value->data[0].v_pointer); -#line 862 "test-utils.c" +#line 1161 "test-utils.c" } else { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" value->data[0].v_pointer = NULL; -#line 866 "test-utils.c" +#line 1165 "test-utils.c" } -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (old) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" folks_test_utils_unref (old); -#line 872 "test-utils.c" +#line 1171 "test-utils.c" } } void folks_value_take_test_utils (GValue* value, gpointer v_object) { FolksTestUtils* old; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, FOLKS_TYPE_TEST_UTILS)); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" old = value->data[0].v_pointer; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (v_object) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, FOLKS_TYPE_TEST_UTILS)); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" value->data[0].v_pointer = v_object; -#line 891 "test-utils.c" +#line 1190 "test-utils.c" } else { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" value->data[0].v_pointer = NULL; -#line 895 "test-utils.c" +#line 1194 "test-utils.c" } -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (old) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" folks_test_utils_unref (old); -#line 901 "test-utils.c" +#line 1200 "test-utils.c" } } static void folks_test_utils_class_init (FolksTestUtilsClass * klass) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" folks_test_utils_parent_class = g_type_class_peek_parent (klass); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" FOLKS_TEST_UTILS_CLASS (klass)->finalize = folks_test_utils_finalize; -#line 911 "test-utils.c" +#line 1210 "test-utils.c" } static void folks_test_utils_instance_init (FolksTestUtils * self) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" self->ref_count = 1; -#line 918 "test-utils.c" +#line 1217 "test-utils.c" } static void folks_test_utils_finalize (FolksTestUtils* obj) { FolksTestUtils * self; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" self = FOLKS_TEST_UTILS (obj); -#line 926 "test-utils.c" +#line 1225 "test-utils.c" } @@ -943,24 +1242,24 @@ gpointer folks_test_utils_ref (gpointer instance) { FolksTestUtils* self; self = instance; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_atomic_int_inc (&self->ref_count); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" return instance; -#line 951 "test-utils.c" +#line 1250 "test-utils.c" } void folks_test_utils_unref (gpointer instance) { FolksTestUtils* self; self = instance; -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" FOLKS_TEST_UTILS_GET_CLASS (self)->finalize (self); -#line 23 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" +#line 26 "/home/treitter/collabora/folks/tests/lib/test-utils.vala" g_type_free_instance ((GTypeInstance *) self); -#line 964 "test-utils.c" +#line 1263 "test-utils.c" } } diff -Nru folks-0.6.6/tests/lib/test-utils.vala folks-0.6.7/tests/lib/test-utils.vala --- folks-0.6.6/tests/lib/test-utils.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/tests/lib/test-utils.vala 2012-01-12 17:25:24.000000000 +0000 @@ -1,5 +1,6 @@ /* * Copyright (C) 2011 Collabora Ltd. + * Copyright (C) 2012 Philip Withnall * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -15,9 +16,11 @@ * along with this library. If not, see . * * Authors: Travis Reitter + * Philip Withnall * */ +using Folks; using GLib; public class Folks.TestUtils @@ -91,4 +94,45 @@ return retval; } + + /** + * Prepare an aggregator and wait for it to reach quiescence. + * + * This will prepare the given {@link IndividualAggregator} then yield until + * it reaches quiescence. No timeout is used, so if the aggregator never + * reaches quiescence, this function will never return; callers must add their + * own timeout to avoid this if necessary. + * + * When this returns, the aggregator is guaranteed to be quiescent. + * + * @param aggregator the aggregator to prepare + */ + public static async void aggregator_prepare_and_wait_for_quiescence ( + IndividualAggregator aggregator) throws GLib.Error + { + var has_yielded = false; + var signal_id = aggregator.notify["is-quiescent"].connect ((obj, pspec) => + { + if (has_yielded == true) + { + TestUtils.aggregator_prepare_and_wait_for_quiescence.callback (); + } + }); + + try + { + yield aggregator.prepare (); + + if (aggregator.is_quiescent == false) + { + has_yielded = true; + yield; + } + } + finally + { + aggregator.disconnect (signal_id); + assert (aggregator.is_quiescent == true); + } + } } diff -Nru folks-0.6.6/tests/lib/tracker/backend.c folks-0.6.7/tests/lib/tracker/backend.c --- folks-0.6.6/tests/lib/tracker/backend.c 2011-12-13 23:41:22.000000000 +0000 +++ folks-0.6.7/tests/lib/tracker/backend.c 2012-02-23 00:02:18.000000000 +0000 @@ -1,4 +1,4 @@ -/* backend.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* backend.c generated by valac 0.15.1, the Vala compiler * generated from backend.vala, do not modify */ /* @@ -959,7 +959,7 @@ #line 229 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" _tmp1_ = orig; #line 229 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" - _tmp2_ = gee_map_get_keys ((GeeMap*) _tmp1_); + _tmp2_ = gee_abstract_map_get_keys ((GeeMap*) _tmp1_); #line 229 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" _tmp3_ = _tmp2_; #line 229 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" @@ -1568,7 +1568,7 @@ #line 342 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" _tmp12_ = contact; #line 342 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" - _tmp13_ = gee_map_get_keys ((GeeMap*) _tmp12_); + _tmp13_ = gee_abstract_map_get_keys ((GeeMap*) _tmp12_); #line 342 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" _tmp14_ = _tmp13_; #line 342 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" @@ -1707,7 +1707,7 @@ #line 355 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" _tmp37_ = addresses; #line 355 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" - _tmp38_ = gee_map_get_keys ((GeeMap*) _tmp37_); + _tmp38_ = gee_abstract_map_get_keys ((GeeMap*) _tmp37_); #line 355 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" _tmp39_ = _tmp38_; #line 355 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" @@ -2150,7 +2150,7 @@ #line 422 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" _tmp119_ = addresses; #line 422 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" - _tmp120_ = gee_map_get_size ((GeeMap*) _tmp119_); + _tmp120_ = gee_abstract_map_get_size ((GeeMap*) _tmp119_); #line 422 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" _tmp121_ = _tmp120_; #line 422 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" @@ -2177,7 +2177,7 @@ #line 424 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" _tmp123_ = addresses; #line 424 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" - _tmp124_ = gee_map_get_keys ((GeeMap*) _tmp123_); + _tmp124_ = gee_abstract_map_get_keys ((GeeMap*) _tmp123_); #line 424 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" _tmp125_ = _tmp124_; #line 424 "/home/treitter/collabora/folks/tests/lib/tracker/backend.vala" diff -Nru folks-0.6.6/tests/lib/tracker/Makefile.in folks-0.6.7/tests/lib/tracker/Makefile.in --- folks-0.6.6/tests/lib/tracker/Makefile.in 2011-12-13 23:38:43.000000000 +0000 +++ folks-0.6.7/tests/lib/tracker/Makefile.in 2012-02-23 00:04:13.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -40,10 +40,11 @@ $(srcdir)/Makefile.in backend.c libtracker_test_la_vala.stamp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -124,6 +125,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -393,37 +396,33 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libtracker_test_la-backend.lo: backend.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtracker_test_la_CFLAGS) $(CFLAGS) -MT libtracker_test_la-backend.lo -MD -MP -MF $(DEPDIR)/libtracker_test_la-backend.Tpo -c -o libtracker_test_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtracker_test_la-backend.Tpo $(DEPDIR)/libtracker_test_la-backend.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='backend.c' object='libtracker_test_la-backend.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='backend.c' object='libtracker_test_la-backend.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtracker_test_la_CFLAGS) $(CFLAGS) -c -o libtracker_test_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtracker_test_la_CFLAGS) $(CFLAGS) -c -o libtracker_test_la-backend.lo `test -f 'backend.c' || echo '$(srcdir)/'`backend.c $(srcdir)/backend.c: $(srcdir)/libtracker_test_la_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/libtracker_test_la_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/libtracker_test_la_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) libtracker_test_la_vala.stamp; \ fi libtracker_test_la_vala.stamp: $(libtracker_test_la_SOURCES) @@ -532,10 +531,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/tests/lib/tracker/tracker-test.h folks-0.6.7/tests/lib/tracker/tracker-test.h --- folks-0.6.6/tests/lib/tracker/tracker-test.h 2011-12-13 23:41:22.000000000 +0000 +++ folks-0.6.7/tests/lib/tracker/tracker-test.h 2012-02-23 00:02:18.000000000 +0000 @@ -1,4 +1,4 @@ -/* tracker-test.h generated by valac 0.14.0.50-58097f, the Vala compiler, do not modify */ +/* tracker-test.h generated by valac 0.15.1, the Vala compiler, do not modify */ #ifndef __TRACKER_TEST_H__ diff -Nru folks-0.6.6/tests/lib/tracker/tracker-test.vapi folks-0.6.7/tests/lib/tracker/tracker-test.vapi --- folks-0.6.6/tests/lib/tracker/tracker-test.vapi 2011-12-13 23:41:22.000000000 +0000 +++ folks-0.6.7/tests/lib/tracker/tracker-test.vapi 2012-02-23 00:02:18.000000000 +0000 @@ -1,4 +1,4 @@ -/* tracker-test.vapi generated by valac 0.14.0.50-58097f, do not modify. */ +/* tracker-test.vapi generated by valac 0.15.1, do not modify. */ namespace TrackerTest { [CCode (cheader_filename = "tracker-test.h")] diff -Nru folks-0.6.6/tests/libsocialweb/aggregation.c folks-0.6.7/tests/libsocialweb/aggregation.c --- folks-0.6.6/tests/libsocialweb/aggregation.c 2011-12-13 23:41:57.000000000 +0000 +++ folks-0.6.7/tests/libsocialweb/aggregation.c 2012-02-23 00:02:28.000000000 +0000 @@ -1,4 +1,4 @@ -/* aggregation.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* aggregation.c generated by valac 0.15.1, the Vala compiler * generated from aggregation.vala, do not modify */ /* @@ -181,6 +181,56 @@ } +static guint8* string_get_data (const gchar* self, int* result_length1) { + guint8* result; + guint8* res; + gint res_length1; + gint _res_size_; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + guint8* _tmp3_; + gint _tmp3__length1; + guint8* _tmp4_; + gint _tmp4__length1; +#line 1407 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + g_return_val_if_fail (self != NULL, NULL); +#line 1408 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + res = (guint8*) self; +#line 1408 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + res_length1 = -1; +#line 1408 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + _res_size_ = res_length1; +#line 1409 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + _tmp0_ = strlen (self); +#line 1409 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + _tmp1_ = _tmp0_; +#line 1409 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + res_length1 = (gint) _tmp1_; +#line 1409 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + _tmp2_ = res_length1; +#line 1410 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + _tmp3_ = res; +#line 1410 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + _tmp3__length1 = res_length1; +#line 1410 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1410 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + _tmp4__length1 = _tmp3__length1; +#line 1410 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + if (result_length1) { +#line 1410 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + *result_length1 = _tmp4__length1; +#line 225 "aggregation.c" + } +#line 1410 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + result = _tmp4_; +#line 1410 "/opt/gnome/share/vala-0.16/vapi/glib-2.0.vapi" + return result; +#line 231 "aggregation.c" +} + + static void aggregation_tests_real_set_up (FolksTestCase* base) { AggregationTests * self; const gchar* _tmp0_ = NULL; @@ -216,19 +266,23 @@ _tmp3_ = g_file_new_for_path (kf_relationships_path); #line 55 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" kf_relationships_f = _tmp3_; -#line 220 "aggregation.c" +#line 270 "aggregation.c" { - gint _tmp4_; - gint _tmp5_; + guint8* _tmp4_; + gint _tmp4__length1; + guint8* _tmp5_; + gint _tmp5__length1; #line 58 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - _tmp4_ = strlen (kf_relationships_data); + _tmp4_ = string_get_data (kf_relationships_data, &_tmp4__length1); #line 58 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp5_ = _tmp4_; #line 58 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - g_file_replace_contents (kf_relationships_f, kf_relationships_data, (gsize) _tmp5_, NULL, FALSE, G_FILE_CREATE_PRIVATE, NULL, NULL, &_inner_error_); + _tmp5__length1 = _tmp4__length1; +#line 58 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + g_file_replace_contents (kf_relationships_f, _tmp5_, (gsize) _tmp5__length1, NULL, FALSE, G_FILE_CREATE_PRIVATE, NULL, NULL, &_inner_error_); #line 58 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (_inner_error_ != NULL) { -#line 232 "aggregation.c" +#line 286 "aggregation.c" goto __catch0_g_error; } } @@ -241,13 +295,13 @@ e = _inner_error_; #line 56 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _inner_error_ = NULL; -#line 64 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 63 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp6_ = e->message; -#line 64 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - g_error ("aggregation.vala:64: Could not write relationship file '%s': %s", kf_relationships_path, _tmp6_); +#line 63 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + g_error ("aggregation.vala:63: Could not write relationship file '%s': %s", kf_relationships_path, _tmp6_); #line 56 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_error_free0 (e); -#line 251 "aggregation.c" +#line 305 "aggregation.c" } __finally0: #line 56 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" @@ -264,102 +318,106 @@ g_clear_error (&_inner_error_); #line 56 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return; -#line 268 "aggregation.c" +#line 322 "aggregation.c" } -#line 69 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 68 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp7_ = g_get_tmp_dir (); -#line 69 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 68 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp8_ = g_build_filename (_tmp7_, AGGREGATION_TESTS_STORE_FILE_PATH, NULL, NULL); -#line 69 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 68 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" kf_path = _tmp8_; -#line 72 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 71 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_remove (kf_path); -#line 74 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 73 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp9_ = g_key_file_new (); -#line 74 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 73 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" kf = _tmp9_; -#line 75 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 74 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_key_file_set_boolean (kf, "all-others", "enabled", FALSE); -#line 76 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 75 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_key_file_set_boolean (kf, "libsocialweb", "enabled", TRUE); -#line 77 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 76 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_key_file_set_boolean (kf, "key-file", "enabled", TRUE); -#line 288 "aggregation.c" +#line 342 "aggregation.c" { GFile* _tmp10_ = NULL; GFile* backend_f; gchar* _tmp11_ = NULL; gchar* data; - gint _tmp12_; - gint _tmp13_; -#line 81 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + guint8* _tmp12_; + gint _tmp12__length1; + guint8* _tmp13_; + gint _tmp13__length1; +#line 80 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp10_ = g_file_new_for_path (kf_path); -#line 81 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 80 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" backend_f = _tmp10_; -#line 82 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 81 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp11_ = g_key_file_to_data (kf, NULL, NULL); -#line 82 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 81 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" data = _tmp11_; -#line 83 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - _tmp12_ = strlen (data); -#line 83 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 82 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + _tmp12_ = string_get_data (data, &_tmp12__length1); +#line 82 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp13_ = _tmp12_; -#line 83 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - g_file_replace_contents (backend_f, data, (gsize) _tmp13_, NULL, FALSE, G_FILE_CREATE_PRIVATE, NULL, NULL, &_inner_error_); -#line 83 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 82 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + _tmp13__length1 = _tmp12__length1; +#line 82 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + g_file_replace_contents (backend_f, _tmp13_, (gsize) _tmp13__length1, NULL, FALSE, G_FILE_CREATE_PRIVATE, NULL, NULL, &_inner_error_); +#line 82 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (_inner_error_ != NULL) { -#line 83 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 82 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_free0 (data); -#line 83 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 82 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (backend_f); -#line 316 "aggregation.c" +#line 374 "aggregation.c" goto __catch1_g_error; } -#line 79 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 78 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_free0 (data); -#line 79 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 78 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (backend_f); -#line 323 "aggregation.c" +#line 381 "aggregation.c" } goto __finally1; __catch1_g_error: { GError* e = NULL; const gchar* _tmp14_; -#line 79 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 78 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" e = _inner_error_; -#line 79 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 78 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _inner_error_ = NULL; -#line 89 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 87 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp14_ = e->message; -#line 89 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - g_error ("aggregation.vala:89: Could not write updated backend key file '%s': %s", kf_path, _tmp14_); -#line 79 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 87 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + g_error ("aggregation.vala:87: Could not write updated backend key file '%s': %s", kf_path, _tmp14_); +#line 78 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_error_free0 (e); -#line 340 "aggregation.c" +#line 398 "aggregation.c" } __finally1: -#line 79 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 78 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (_inner_error_ != NULL) { -#line 79 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 78 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_key_file_free0 (kf); -#line 79 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 78 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_free0 (kf_path); -#line 79 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 78 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (kf_relationships_f); -#line 79 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 78 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_free0 (kf_relationships_data); -#line 79 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 78 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_free0 (kf_relationships_path); -#line 79 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 78 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 79 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 78 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_clear_error (&_inner_error_); -#line 79 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 78 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return; -#line 361 "aggregation.c" +#line 419 "aggregation.c" } -#line 93 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 91 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_setenv ("FOLKS_BACKEND_STORE_KEY_FILE_PATH", kf_path, TRUE); #line 43 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_key_file_free0 (kf); @@ -371,47 +429,51 @@ _g_free0 (kf_relationships_data); #line 43 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_free0 (kf_relationships_path); -#line 375 "aggregation.c" +#line 433 "aggregation.c" } static void aggregation_tests_real_tear_down (FolksTestCase* base) { AggregationTests * self; -#line 97 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 95 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" self = (AggregationTests*) base; -#line 383 "aggregation.c" +#line 441 "aggregation.c" } static Block1Data* block1_data_ref (Block1Data* _data1_) { -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_atomic_int_inc (&_data1_->_ref_count_); -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return _data1_; -#line 392 "aggregation.c" +#line 450 "aggregation.c" } static void block1_data_unref (Block1Data* _data1_) { -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - _g_object_unref0 (_data1_->self); -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 457 "aggregation.c" + AggregationTests * self; +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + self = _data1_->self; +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (_data1_->personas); -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data1_->individual_gathered = (_vala_array_free (_data1_->individual_gathered, _data1_->individual_gathered_length1, (GDestroyNotify) g_object_unref), NULL); -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (_data1_->aggregator); -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (_data1_->mysocialnetwork2); -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (_data1_->mysocialnetwork1); -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_main_loop_unref0 (_data1_->main_loop); -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + _g_object_unref0 (self); +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_slice_free (Block1Data, _data1_); -#line 415 "aggregation.c" +#line 477 "aggregation.c" } } @@ -419,61 +481,65 @@ static void __lambda2_ (Block1Data* _data1_) { AggregationTests * self; GMainLoop* _tmp0_; -#line 105 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 103 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" self = _data1_->self; -#line 107 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 105 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp0_ = _data1_->main_loop; -#line 107 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 105 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_main_loop_quit (_tmp0_); -#line 429 "aggregation.c" +#line 491 "aggregation.c" } static void ___lambda2__libsocialweb_test_backend_ready (LibsocialwebTestBackend* _sender, gpointer self) { -#line 105 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 103 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" __lambda2_ (self); -#line 436 "aggregation.c" +#line 498 "aggregation.c" } static gboolean __lambda3_ (AggregationTests* self) { gboolean result = FALSE; -#line 111 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - g_assert_not_reached (); #line 109 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + g_assert_not_reached (); +#line 107 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return result; -#line 446 "aggregation.c" +#line 508 "aggregation.c" } static gboolean ___lambda3__gsource_func (gpointer self) { gboolean result; result = __lambda3_ (self); -#line 109 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 107 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return result; -#line 455 "aggregation.c" +#line 517 "aggregation.c" } static Block2Data* block2_data_ref (Block2Data* _data2_) { -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_atomic_int_inc (&_data2_->_ref_count_); -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return _data2_; -#line 464 "aggregation.c" +#line 526 "aggregation.c" } static void block2_data_unref (Block2Data* _data2_) { -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - _g_object_unref0 (_data2_->self); -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 533 "aggregation.c" + AggregationTests * self; +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + self = _data2_->self; +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_free0 (_data2_->path); -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + _g_object_unref0 (self); +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_slice_free (Block2Data, _data2_); -#line 477 "aggregation.c" +#line 543 "aggregation.c" } } @@ -488,159 +554,159 @@ GVariant* _tmp3_; GVariant* v; GError * _inner_error_ = NULL; -#line 125 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" self = _data2_->self; -#line 127 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 125 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp0_ = g_strdup ("([('mysocialnetwork1', 'garg', %x, " "{'id': ['garg'], 'name': ['Gargantua']})],)"); -#line 127 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 125 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" text = _tmp0_; -#line 129 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 127 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp1_ = text; -#line 129 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 127 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp2_ = g_variant_new_parsed (_tmp1_, 1300792578, NULL); -#line 129 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 127 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp3_ = g_variant_ref_sink (_tmp2_); -#line 129 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 127 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" v = _tmp3_; -#line 506 "aggregation.c" +#line 572 "aggregation.c" { GDBusConnection* _tmp4_ = NULL; GDBusConnection* conn; GDBusConnection* _tmp5_; const gchar* _tmp6_; GVariant* _tmp7_; -#line 132 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 130 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp4_ = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &_inner_error_); -#line 132 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 130 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" conn = _tmp4_; -#line 132 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 130 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (_inner_error_ != NULL) { -#line 132 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 130 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (_inner_error_->domain == G_IO_ERROR) { -#line 521 "aggregation.c" +#line 587 "aggregation.c" goto __catch2_g_io_error; } goto __catch2_g_error; } -#line 133 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 131 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp5_ = conn; -#line 133 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 131 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp6_ = _data2_->path; -#line 133 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 131 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp7_ = v; -#line 133 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 131 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_dbus_connection_emit_signal (_tmp5_, NULL, _tmp6_, "com.meego.libsocialweb.ContactView", "ContactsAdded", _tmp7_, &_inner_error_); -#line 133 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 131 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (_inner_error_ != NULL) { -#line 133 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 131 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (conn); -#line 133 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 131 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (_inner_error_->domain == G_IO_ERROR) { -#line 540 "aggregation.c" +#line 606 "aggregation.c" goto __catch2_g_io_error; } goto __catch2_g_error; } -#line 130 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 128 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (conn); -#line 547 "aggregation.c" +#line 613 "aggregation.c" } goto __finally2; __catch2_g_io_error: { GError* e = NULL; -#line 130 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 128 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" e = _inner_error_; -#line 130 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 128 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _inner_error_ = NULL; -#line 139 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 137 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_assert_not_reached (); -#line 130 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 128 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_error_free0 (e); -#line 561 "aggregation.c" +#line 627 "aggregation.c" } goto __finally2; __catch2_g_error: { GError* e = NULL; -#line 130 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 128 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" e = _inner_error_; -#line 130 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 128 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _inner_error_ = NULL; -#line 143 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 141 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_assert_not_reached (); -#line 130 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 128 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_error_free0 (e); -#line 575 "aggregation.c" +#line 641 "aggregation.c" } __finally2: -#line 130 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 128 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (_inner_error_ != NULL) { -#line 130 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 128 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_variant_unref0 (v); -#line 130 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 128 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_free0 (text); -#line 130 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 128 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 130 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 128 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_clear_error (&_inner_error_); -#line 130 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 128 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return FALSE; -#line 590 "aggregation.c" +#line 656 "aggregation.c" } -#line 145 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 143 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" result = FALSE; -#line 145 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 143 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_variant_unref0 (v); -#line 145 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 143 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_free0 (text); -#line 145 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 143 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return result; -#line 600 "aggregation.c" +#line 666 "aggregation.c" } static gboolean ___lambda6__gsource_func (gpointer self) { gboolean result; result = __lambda6_ (self); -#line 125 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return result; -#line 609 "aggregation.c" +#line 675 "aggregation.c" } static void __lambda5_ (AggregationTests* self, const gchar* path) { Block2Data* _data2_; const gchar* _tmp0_; - const gchar* _tmp1_; -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + gchar* _tmp1_; +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_return_if_fail (path != NULL); -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data2_ = g_slice_new0 (Block2Data); -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data2_->_ref_count_ = 1; -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data2_->self = g_object_ref (self); -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp0_ = path; -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp1_ = g_strdup (_tmp0_); -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data2_->path = _tmp1_; -#line 125 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda6__gsource_func, block2_data_ref (_data2_), block2_data_unref); #line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda6__gsource_func, block2_data_ref (_data2_), block2_data_unref); +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" block2_data_unref (_data2_); -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data2_ = NULL; -#line 637 "aggregation.c" +#line 703 "aggregation.c" } static void ___lambda5__libsocialweb_test_libsocialweb_contact_view_test_start_called (LibsocialwebTestLibsocialwebContactViewTest* _sender, const gchar* path, gpointer self) { -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" __lambda5_ (self, path); -#line 644 "aggregation.c" +#line 710 "aggregation.c" } @@ -651,58 +717,62 @@ const gchar* _tmp2_; gpointer _tmp3_ = NULL; LibsocialwebTestLibsocialwebContactViewTest* _tmp4_; -#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 119 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" self = _data1_->self; -#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 119 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_return_if_fail (query != NULL); -#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 119 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_return_if_fail (p != NULL); -#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 119 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_return_if_fail (path != NULL); -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp0_ = _data1_->mysocialnetwork1; -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp1_ = _tmp0_->contact_views; -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp2_ = path; -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp3_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp1_, _tmp2_); -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp4_ = (LibsocialwebTestLibsocialwebContactViewTest*) _tmp3_; -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_signal_connect_object (_tmp4_, "start-called", (GCallback) ___lambda5__libsocialweb_test_libsocialweb_contact_view_test_start_called, self, 0); -#line 123 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (_tmp4_); -#line 677 "aggregation.c" +#line 743 "aggregation.c" } static void ___lambda4__libsocialweb_test_libsocialweb_service_test_open_view_called (LibsocialwebTestLibsocialwebServiceTest* _sender, const gchar* query, GHashTable* p, const gchar* path, gpointer self) { -#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 119 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" __lambda4_ (self, query, p, path); -#line 684 "aggregation.c" +#line 750 "aggregation.c" } static Block3Data* block3_data_ref (Block3Data* _data3_) { -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_atomic_int_inc (&_data3_->_ref_count_); -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return _data3_; -#line 693 "aggregation.c" +#line 759 "aggregation.c" } static void block3_data_unref (Block3Data* _data3_) { -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - _g_object_unref0 (_data3_->self); -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 766 "aggregation.c" + AggregationTests * self; +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + self = _data3_->self; +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_free0 (_data3_->path); -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + _g_object_unref0 (self); +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_slice_free (Block3Data, _data3_); -#line 706 "aggregation.c" +#line 776 "aggregation.c" } } @@ -717,159 +787,159 @@ GVariant* _tmp3_; GVariant* v; GError * _inner_error_ = NULL; -#line 155 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" self = _data3_->self; -#line 157 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 155 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp0_ = g_strdup ("([('mysocialnetwork2', 'panta', %x, " "{'id': ['panta'], 'name': ['Pantagruel']})],)"); -#line 157 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 155 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" text = _tmp0_; -#line 159 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 157 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp1_ = text; -#line 159 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 157 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp2_ = g_variant_new_parsed (_tmp1_, 1300792579, NULL); -#line 159 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 157 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp3_ = g_variant_ref_sink (_tmp2_); -#line 159 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 157 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" v = _tmp3_; -#line 735 "aggregation.c" +#line 805 "aggregation.c" { GDBusConnection* _tmp4_ = NULL; GDBusConnection* conn; GDBusConnection* _tmp5_; const gchar* _tmp6_; GVariant* _tmp7_; -#line 162 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 160 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp4_ = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &_inner_error_); -#line 162 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 160 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" conn = _tmp4_; -#line 162 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 160 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (_inner_error_ != NULL) { -#line 162 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 160 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (_inner_error_->domain == G_IO_ERROR) { -#line 750 "aggregation.c" +#line 820 "aggregation.c" goto __catch3_g_io_error; } goto __catch3_g_error; } -#line 163 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 161 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp5_ = conn; -#line 163 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 161 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp6_ = _data3_->path; -#line 163 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 161 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp7_ = v; -#line 163 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 161 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_dbus_connection_emit_signal (_tmp5_, NULL, _tmp6_, "com.meego.libsocialweb.ContactView", "ContactsAdded", _tmp7_, &_inner_error_); -#line 163 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 161 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (_inner_error_ != NULL) { -#line 163 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 161 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (conn); -#line 163 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 161 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (_inner_error_->domain == G_IO_ERROR) { -#line 769 "aggregation.c" +#line 839 "aggregation.c" goto __catch3_g_io_error; } goto __catch3_g_error; } -#line 160 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 158 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (conn); -#line 776 "aggregation.c" +#line 846 "aggregation.c" } goto __finally3; __catch3_g_io_error: { GError* e = NULL; -#line 160 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 158 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" e = _inner_error_; -#line 160 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 158 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _inner_error_ = NULL; -#line 169 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 167 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_assert_not_reached (); -#line 160 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 158 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_error_free0 (e); -#line 790 "aggregation.c" +#line 860 "aggregation.c" } goto __finally3; __catch3_g_error: { GError* e = NULL; -#line 160 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 158 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" e = _inner_error_; -#line 160 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 158 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _inner_error_ = NULL; -#line 173 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 171 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_assert_not_reached (); -#line 160 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 158 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_error_free0 (e); -#line 804 "aggregation.c" +#line 874 "aggregation.c" } __finally3: -#line 160 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 158 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (_inner_error_ != NULL) { -#line 160 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 158 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_variant_unref0 (v); -#line 160 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 158 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_free0 (text); -#line 160 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 158 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 160 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 158 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_clear_error (&_inner_error_); -#line 160 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 158 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return FALSE; -#line 819 "aggregation.c" +#line 889 "aggregation.c" } -#line 175 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 173 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" result = FALSE; -#line 175 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 173 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_variant_unref0 (v); -#line 175 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 173 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_free0 (text); -#line 175 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 173 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return result; -#line 829 "aggregation.c" +#line 899 "aggregation.c" } static gboolean ___lambda9__gsource_func (gpointer self) { gboolean result; result = __lambda9_ (self); -#line 155 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return result; -#line 838 "aggregation.c" +#line 908 "aggregation.c" } static void __lambda8_ (AggregationTests* self, const gchar* path) { Block3Data* _data3_; const gchar* _tmp0_; - const gchar* _tmp1_; -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + gchar* _tmp1_; +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_return_if_fail (path != NULL); -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data3_ = g_slice_new0 (Block3Data); -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data3_->_ref_count_ = 1; -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data3_->self = g_object_ref (self); -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp0_ = path; -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp1_ = g_strdup (_tmp0_); -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data3_->path = _tmp1_; -#line 155 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda9__gsource_func, block3_data_ref (_data3_), block3_data_unref); #line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda9__gsource_func, block3_data_ref (_data3_), block3_data_unref); +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" block3_data_unref (_data3_); -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data3_ = NULL; -#line 866 "aggregation.c" +#line 936 "aggregation.c" } static void ___lambda8__libsocialweb_test_libsocialweb_contact_view_test_start_called (LibsocialwebTestLibsocialwebContactViewTest* _sender, const gchar* path, gpointer self) { -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" __lambda8_ (self, path); -#line 873 "aggregation.c" +#line 943 "aggregation.c" } @@ -880,60 +950,60 @@ const gchar* _tmp2_; gpointer _tmp3_ = NULL; LibsocialwebTestLibsocialwebContactViewTest* _tmp4_; -#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 149 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" self = _data1_->self; -#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 149 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_return_if_fail (query != NULL); -#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 149 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_return_if_fail (p != NULL); -#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 149 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_return_if_fail (path != NULL); -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp0_ = _data1_->mysocialnetwork2; -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp1_ = _tmp0_->contact_views; -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp2_ = path; -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp3_ = gee_abstract_map_get ((GeeAbstractMap*) _tmp1_, _tmp2_); -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp4_ = (LibsocialwebTestLibsocialwebContactViewTest*) _tmp3_; -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_signal_connect_object (_tmp4_, "start-called", (GCallback) ___lambda8__libsocialweb_test_libsocialweb_contact_view_test_start_called, self, 0); -#line 153 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (_tmp4_); -#line 906 "aggregation.c" +#line 976 "aggregation.c" } static void ___lambda7__libsocialweb_test_libsocialweb_service_test_open_view_called (LibsocialwebTestLibsocialwebServiceTest* _sender, const gchar* query, GHashTable* p, const gchar* path, gpointer self) { -#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 149 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" __lambda7_ (self, query, p, path); -#line 913 "aggregation.c" +#line 983 "aggregation.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 195 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 193 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return self ? g_object_ref (self) : NULL; -#line 920 "aggregation.c" +#line 990 "aggregation.c" } static void _vala_array_add1 (FolksIndividual*** array, int* length, int* size, FolksIndividual* value) { -#line 195 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 193 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if ((*length) == (*size)) { -#line 195 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 193 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 195 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 193 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" *array = g_renew (FolksIndividual*, *array, (*size) + 1); -#line 931 "aggregation.c" +#line 1001 "aggregation.c" } -#line 195 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 193 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" (*array)[(*length)++] = value; -#line 195 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 193 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" (*array)[*length] = NULL; -#line 937 "aggregation.c" +#line 1007 "aggregation.c" } @@ -944,32 +1014,32 @@ GeeCollection* added; FolksIndividual** _tmp12_; gint _tmp12__length1; -#line 183 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 181 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" self = _data1_->self; -#line 183 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 181 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_return_if_fail (changes != NULL); -#line 185 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 183 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp0_ = changes; -#line 185 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 183 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp1_ = gee_multi_map_get_values (_tmp0_); -#line 185 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 183 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" added = _tmp1_; -#line 187 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - g_debug ("aggregation.vala:187: initial individuals_changed"); -#line 960 "aggregation.c" +#line 185 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + g_debug ("aggregation.vala:185: initial individuals_changed"); +#line 1030 "aggregation.c" { GeeCollection* _tmp2_; GeeIterator* _tmp3_ = NULL; GeeIterator* _i_it; -#line 188 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 186 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp2_ = added; -#line 188 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 186 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp3_ = gee_iterable_iterator ((GeeIterable*) _tmp2_); -#line 188 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 186 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _i_it = _tmp3_; -#line 188 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 186 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" while (TRUE) { -#line 973 "aggregation.c" +#line 1043 "aggregation.c" GeeIterator* _tmp4_; gboolean _tmp5_ = FALSE; GeeIterator* _tmp6_; @@ -980,93 +1050,93 @@ gint _tmp9__length1; FolksIndividual* _tmp10_; FolksIndividual* _tmp11_; -#line 188 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 186 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp4_ = _i_it; -#line 188 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 186 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp5_ = gee_iterator_next (_tmp4_); -#line 188 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 186 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (!_tmp5_) { -#line 188 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 186 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" break; -#line 992 "aggregation.c" +#line 1062 "aggregation.c" } -#line 188 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 186 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp6_ = _i_it; -#line 188 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 186 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp7_ = gee_iterator_get (_tmp6_); -#line 188 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 186 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" i = (FolksIndividual*) _tmp7_; -#line 190 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 188 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp8_ = i; -#line 190 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 188 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (_tmp8_ == NULL) { -#line 192 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 190 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (i); -#line 192 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 190 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" continue; -#line 1008 "aggregation.c" +#line 1078 "aggregation.c" } -#line 195 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 193 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp9_ = _data1_->individual_gathered; -#line 195 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 193 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp9__length1 = _data1_->individual_gathered_length1; -#line 195 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 193 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp10_ = i; -#line 195 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 193 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp11_ = _g_object_ref0 (_tmp10_); -#line 195 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 193 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _vala_array_add1 (&_data1_->individual_gathered, &_data1_->individual_gathered_length1, &_data1_->_individual_gathered_size_, _tmp11_); -#line 188 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 186 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (i); -#line 1022 "aggregation.c" +#line 1092 "aggregation.c" } -#line 188 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 186 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (_i_it); -#line 1026 "aggregation.c" +#line 1096 "aggregation.c" } -#line 197 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 195 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp12_ = _data1_->individual_gathered; -#line 197 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 195 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp12__length1 = _data1_->individual_gathered_length1; -#line 197 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 195 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (_tmp12__length1 >= 2) { -#line 1034 "aggregation.c" +#line 1104 "aggregation.c" GMainLoop* _tmp13_; -#line 198 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 196 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp13_ = _data1_->main_loop; -#line 198 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 196 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_main_loop_quit (_tmp13_); -#line 1040 "aggregation.c" +#line 1110 "aggregation.c" } -#line 183 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 181 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (added); -#line 1044 "aggregation.c" +#line 1114 "aggregation.c" } static void ___lambda10__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { -#line 182 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 180 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" __lambda10_ (self, changes); -#line 1051 "aggregation.c" +#line 1121 "aggregation.c" } static gboolean __lambda11_ (AggregationTests* self) { gboolean result = FALSE; -#line 204 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - g_assert_not_reached (); #line 202 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + g_assert_not_reached (); +#line 200 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return result; -#line 1061 "aggregation.c" +#line 1131 "aggregation.c" } static gboolean ___lambda11__gsource_func (gpointer self) { gboolean result; result = __lambda11_ (self); -#line 202 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 200 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return result; -#line 1070 "aggregation.c" +#line 1140 "aggregation.c" } @@ -1092,69 +1162,69 @@ gint _tmp15_; FolksIndividual* added_ind; GMainLoop* _tmp47_; -#line 220 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 218 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" self = _data1_->self; -#line 220 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 218 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_return_if_fail (changes != NULL); -#line 222 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 220 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp0_ = changes; -#line 222 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 220 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp1_ = gee_multi_map_get_values (_tmp0_); -#line 222 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 220 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" added = _tmp1_; -#line 223 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 221 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp2_ = changes; -#line 223 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 221 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp3_ = gee_multi_map_get_keys (_tmp2_); -#line 223 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 221 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" removed = _tmp3_; -#line 225 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 223 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp4_ = added; -#line 225 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 223 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp5_ = gee_collection_get_size (_tmp4_); -#line 225 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 223 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp6_ = _tmp5_; -#line 225 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 223 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp7_ = removed; -#line 225 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 223 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp8_ = gee_collection_get_size ((GeeCollection*) _tmp7_); -#line 225 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 223 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp9_ = _tmp8_; -#line 225 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - g_debug ("aggregation.vala:225: individuals_changed after link: added:%u removed" \ +#line 223 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + g_debug ("aggregation.vala:223: individuals_changed after link: added:%u removed" \ ":%u", (guint) _tmp6_, (guint) _tmp9_); -#line 228 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 226 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp10_ = added; -#line 228 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 226 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp11_ = gee_collection_get_size (_tmp10_); -#line 228 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 226 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp12_ = _tmp11_; -#line 228 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 226 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_assert (_tmp12_ == 2); -#line 229 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 227 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp13_ = removed; -#line 229 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 227 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp14_ = gee_collection_get_size ((GeeCollection*) _tmp13_); -#line 229 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 227 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp15_ = _tmp14_; -#line 229 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 227 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_assert (_tmp15_ == 2); -#line 231 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 229 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" added_ind = NULL; -#line 1144 "aggregation.c" +#line 1214 "aggregation.c" { GeeCollection* _tmp16_; GeeIterator* _tmp17_ = NULL; GeeIterator* _i_it; -#line 233 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 231 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp16_ = added; -#line 233 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 231 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp17_ = gee_iterable_iterator ((GeeIterable*) _tmp16_); -#line 233 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 231 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _i_it = _tmp17_; -#line 233 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 231 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" while (TRUE) { -#line 1157 "aggregation.c" +#line 1227 "aggregation.c" GeeIterator* _tmp18_; gboolean _tmp19_ = FALSE; GeeIterator* _tmp20_; @@ -1176,154 +1246,154 @@ GeeSet* _tmp37_; gint _tmp38_; gint _tmp39_; -#line 233 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 231 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp18_ = _i_it; -#line 233 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 231 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp19_ = gee_iterator_next (_tmp18_); -#line 233 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 231 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (!_tmp19_) { -#line 233 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 231 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" break; -#line 1187 "aggregation.c" +#line 1257 "aggregation.c" } -#line 233 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 231 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp20_ = _i_it; -#line 233 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 231 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp21_ = gee_iterator_get (_tmp20_); -#line 233 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 231 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" i = (FolksIndividual*) _tmp21_; -#line 235 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 233 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp22_ = i; -#line 235 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 233 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_assert (_tmp22_ != NULL); -#line 236 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 234 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp24_ = added_ind; -#line 236 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 234 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (_tmp24_ == NULL) { -#line 236 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 234 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp23_ = TRUE; -#line 1205 "aggregation.c" +#line 1275 "aggregation.c" } else { FolksIndividual* _tmp25_; FolksIndividual* _tmp26_; -#line 236 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 234 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp25_ = added_ind; -#line 236 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 234 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp26_ = i; -#line 236 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 234 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp23_ = _tmp25_ == _tmp26_; -#line 1215 "aggregation.c" +#line 1285 "aggregation.c" } -#line 236 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 234 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp27_ = _tmp23_; -#line 236 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 234 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_assert (_tmp27_); -#line 237 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 235 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp28_ = i; -#line 237 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 235 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp29_ = _g_object_ref0 (_tmp28_); -#line 237 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 235 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (added_ind); -#line 237 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 235 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" added_ind = _tmp29_; -#line 239 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 237 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp30_ = i; -#line 239 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 237 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp31_ = folks_individual_get_personas (_tmp30_); -#line 239 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 237 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp32_ = _tmp31_; -#line 239 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 237 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp33_ = gee_collection_get_size ((GeeCollection*) _tmp32_); -#line 239 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 237 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp34_ = _tmp33_; -#line 239 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 237 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_assert (_tmp34_ == 3); -#line 240 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 238 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp35_ = i; -#line 240 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 238 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp36_ = folks_individual_get_personas (_tmp35_); -#line 240 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 238 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp37_ = _tmp36_; -#line 240 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 238 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp38_ = gee_collection_get_size ((GeeCollection*) _tmp37_); -#line 240 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 238 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp39_ = _tmp38_; -#line 240 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - g_debug ("aggregation.vala:240: individuals_changed: 1 individual containing %u " \ +#line 238 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + g_debug ("aggregation.vala:238: individuals_changed: 1 individual containing %u " \ "personas", (guint) _tmp39_); -#line 233 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 231 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (i); -#line 1255 "aggregation.c" +#line 1325 "aggregation.c" } -#line 233 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 231 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (_i_it); -#line 1259 "aggregation.c" +#line 1329 "aggregation.c" } { GeeSet* _tmp40_; GeeIterator* _tmp41_ = NULL; GeeIterator* _i_it; -#line 244 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 242 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp40_ = removed; -#line 244 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 242 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp41_ = gee_iterable_iterator ((GeeIterable*) _tmp40_); -#line 244 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 242 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _i_it = _tmp41_; -#line 244 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 242 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" while (TRUE) { -#line 1273 "aggregation.c" +#line 1343 "aggregation.c" GeeIterator* _tmp42_; gboolean _tmp43_ = FALSE; GeeIterator* _tmp44_; gpointer _tmp45_ = NULL; FolksIndividual* i; FolksIndividual* _tmp46_; -#line 244 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 242 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp42_ = _i_it; -#line 244 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 242 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp43_ = gee_iterator_next (_tmp42_); -#line 244 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 242 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (!_tmp43_) { -#line 244 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 242 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" break; -#line 1288 "aggregation.c" +#line 1358 "aggregation.c" } -#line 244 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 242 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp44_ = _i_it; -#line 244 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 242 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp45_ = gee_iterator_get (_tmp44_); -#line 244 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 242 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" i = (FolksIndividual*) _tmp45_; -#line 246 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 244 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp46_ = i; -#line 246 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - g_assert (_tmp46_ != NULL); #line 244 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + g_assert (_tmp46_ != NULL); +#line 242 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (i); -#line 1302 "aggregation.c" +#line 1372 "aggregation.c" } -#line 244 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 242 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (_i_it); -#line 1306 "aggregation.c" +#line 1376 "aggregation.c" } -#line 249 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 247 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp47_ = _data1_->main_loop; -#line 249 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 247 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_main_loop_quit (_tmp47_); -#line 220 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 218 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (added_ind); -#line 220 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 218 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (removed); -#line 220 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 218 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (added); -#line 1318 "aggregation.c" +#line 1388 "aggregation.c" } static void ___lambda12__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { -#line 220 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 218 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" __lambda12_ (self, changes); -#line 1325 "aggregation.c" +#line 1395 "aggregation.c" } @@ -1332,47 +1402,47 @@ gboolean result = FALSE; FolksIndividualAggregator* _tmp0_; GeeHashSet* _tmp1_; -#line 271 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 269 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" self = _data1_->self; -#line 273 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 271 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp0_ = _data1_->aggregator; -#line 273 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 271 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp1_ = _data1_->personas; -#line 273 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 271 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" folks_individual_aggregator_link_personas (_tmp0_, (GeeSet*) _tmp1_, NULL, NULL); -#line 274 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 272 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" result = FALSE; -#line 274 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 272 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return result; -#line 1346 "aggregation.c" +#line 1416 "aggregation.c" } static gboolean ___lambda13__gsource_func (gpointer self) { gboolean result; result = __lambda13_ (self); -#line 271 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 269 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return result; -#line 1355 "aggregation.c" +#line 1425 "aggregation.c" } static gboolean __lambda14_ (AggregationTests* self) { gboolean result = FALSE; -#line 279 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - g_assert_not_reached (); #line 277 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + g_assert_not_reached (); +#line 275 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return result; -#line 1365 "aggregation.c" +#line 1435 "aggregation.c" } static gboolean ___lambda14__gsource_func (gpointer self) { gboolean result; result = __lambda14_ (self); -#line 277 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 275 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return result; -#line 1374 "aggregation.c" +#line 1444 "aggregation.c" } @@ -1424,147 +1494,147 @@ GMainLoop* _tmp75_; guint _tmp76_; LibsocialwebTestBackend* _tmp77_; -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_return_if_fail (self != NULL); -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data1_ = g_slice_new0 (Block1Data); -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data1_->_ref_count_ = 1; -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data1_->self = g_object_ref (self); -#line 103 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp0_ = g_main_loop_new (NULL, FALSE); -#line 103 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data1_->main_loop = _tmp0_; -#line 105 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 103 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp1_ = self->priv->_lsw_backend; -#line 105 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 103 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_signal_connect_data (_tmp1_, "ready", (GCallback) ___lambda2__libsocialweb_test_backend_ready, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); -#line 109 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 107 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp2_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 5, ___lambda3__gsource_func, g_object_ref (self), g_object_unref); -#line 109 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 107 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" timer_id = _tmp2_; -#line 113 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 111 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp3_ = self->priv->_lsw_backend; -#line 113 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 111 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" libsocialweb_test_backend_set_up (_tmp3_); -#line 114 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 112 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp4_ = _data1_->main_loop; -#line 114 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 112 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_main_loop_run (_tmp4_); -#line 115 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 113 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp5_ = timer_id; -#line 115 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 113 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_source_remove (_tmp5_); -#line 117 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 115 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp6_ = self->priv->_lsw_backend; -#line 117 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 115 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp7_ = libsocialweb_test_backend_add_service (_tmp6_, "mysocialnetwork1"); -#line 117 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 115 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data1_->mysocialnetwork1 = _tmp7_; -#line 118 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 116 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp8_ = self->priv->_lsw_backend; -#line 118 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 116 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp9_ = libsocialweb_test_backend_add_service (_tmp8_, "mysocialnetwork2"); -#line 118 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 116 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data1_->mysocialnetwork2 = _tmp9_; -#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 119 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp10_ = _data1_->mysocialnetwork1; -#line 121 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 119 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_signal_connect_data (_tmp10_, "open-view-called", (GCallback) ___lambda4__libsocialweb_test_libsocialweb_service_test_open_view_called, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); -#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 149 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp11_ = _data1_->mysocialnetwork2; -#line 151 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 149 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_signal_connect_data (_tmp11_, "open-view-called", (GCallback) ___lambda7__libsocialweb_test_libsocialweb_service_test_open_view_called, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); -#line 180 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 178 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp12_ = folks_individual_aggregator_new (); -#line 180 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 178 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data1_->aggregator = _tmp12_; -#line 181 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 179 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp13_ = g_new0 (FolksIndividual*, 0 + 1); -#line 181 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 179 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data1_->individual_gathered = _tmp13_; -#line 181 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 179 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data1_->individual_gathered_length1 = 0; -#line 181 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 179 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data1_->_individual_gathered_size_ = _data1_->individual_gathered_length1; -#line 182 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 180 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp14_ = _data1_->aggregator; -#line 182 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 180 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp15_ = g_signal_connect_data (_tmp14_, "individuals-changed-detailed", (GCallback) ___lambda10__folks_individual_aggregator_individuals_changed_detailed, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); -#line 182 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 180 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" handler_id = _tmp15_; -#line 200 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 198 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp16_ = _data1_->aggregator; -#line 200 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 198 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" folks_individual_aggregator_prepare (_tmp16_, NULL, NULL); -#line 202 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 200 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp17_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 5, ___lambda11__gsource_func, g_object_ref (self), g_object_unref); -#line 202 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 200 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" timer_id = _tmp17_; -#line 206 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 204 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp18_ = _data1_->main_loop; -#line 206 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 204 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_main_loop_run (_tmp18_); -#line 207 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 205 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp19_ = timer_id; -#line 207 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 205 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_source_remove (_tmp19_); -#line 208 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 206 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp20_ = _data1_->aggregator; -#line 208 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 206 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp21_ = handler_id; -#line 208 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 206 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_signal_handler_disconnect ((GObject*) _tmp20_, _tmp21_); -#line 211 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 209 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp22_ = _data1_->individual_gathered; -#line 211 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 209 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp22__length1 = _data1_->individual_gathered_length1; -#line 211 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 209 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_assert (_tmp22__length1 == 2); -#line 213 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 211 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp25_ = _data1_->individual_gathered; -#line 213 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 211 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp25__length1 = _data1_->individual_gathered_length1; -#line 213 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 211 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp26_ = _tmp25_[0]; -#line 213 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 211 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp27_ = folks_name_details_get_nickname (FOLKS_NAME_DETAILS (_tmp26_)); -#line 213 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 211 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp28_ = _tmp27_; -#line 213 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 211 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (g_strcmp0 (_tmp28_, "Gargantua") == 0) { -#line 1536 "aggregation.c" +#line 1606 "aggregation.c" FolksIndividual** _tmp29_; gint _tmp29__length1; FolksIndividual* _tmp30_; const gchar* _tmp31_; const gchar* _tmp32_; -#line 214 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 212 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp29_ = _data1_->individual_gathered; -#line 214 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 212 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp29__length1 = _data1_->individual_gathered_length1; -#line 214 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 212 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp30_ = _tmp29_[1]; -#line 214 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 212 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp31_ = folks_name_details_get_nickname (FOLKS_NAME_DETAILS (_tmp30_)); -#line 214 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 212 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp32_ = _tmp31_; -#line 214 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 212 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp24_ = g_strcmp0 (_tmp32_, "Pantagruel") == 0; -#line 1554 "aggregation.c" +#line 1624 "aggregation.c" } else { -#line 213 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 211 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp24_ = FALSE; -#line 1558 "aggregation.c" +#line 1628 "aggregation.c" } -#line 213 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 211 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp33_ = _tmp24_; -#line 213 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 211 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (_tmp33_) { -#line 213 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 211 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp23_ = TRUE; -#line 1566 "aggregation.c" +#line 1636 "aggregation.c" } else { gboolean _tmp34_ = FALSE; FolksIndividual** _tmp35_; @@ -1573,63 +1643,63 @@ const gchar* _tmp37_; const gchar* _tmp38_; gboolean _tmp43_; -#line 216 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 214 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp35_ = _data1_->individual_gathered; -#line 216 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 214 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp35__length1 = _data1_->individual_gathered_length1; -#line 216 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 214 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp36_ = _tmp35_[0]; -#line 216 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 214 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp37_ = folks_name_details_get_nickname (FOLKS_NAME_DETAILS (_tmp36_)); -#line 216 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 214 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp38_ = _tmp37_; -#line 216 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 214 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (g_strcmp0 (_tmp38_, "Pantagruel") == 0) { -#line 1587 "aggregation.c" +#line 1657 "aggregation.c" FolksIndividual** _tmp39_; gint _tmp39__length1; FolksIndividual* _tmp40_; const gchar* _tmp41_; const gchar* _tmp42_; -#line 217 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 215 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp39_ = _data1_->individual_gathered; -#line 217 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 215 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp39__length1 = _data1_->individual_gathered_length1; -#line 217 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 215 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp40_ = _tmp39_[1]; -#line 217 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 215 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp41_ = folks_name_details_get_nickname (FOLKS_NAME_DETAILS (_tmp40_)); -#line 217 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 215 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp42_ = _tmp41_; -#line 217 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 215 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp34_ = g_strcmp0 (_tmp42_, "Gargantua") == 0; -#line 1605 "aggregation.c" +#line 1675 "aggregation.c" } else { -#line 216 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 214 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp34_ = FALSE; -#line 1609 "aggregation.c" +#line 1679 "aggregation.c" } -#line 216 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 214 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp43_ = _tmp34_; -#line 216 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 214 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp23_ = _tmp43_; -#line 1615 "aggregation.c" +#line 1685 "aggregation.c" } -#line 212 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 210 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp44_ = _tmp23_; -#line 212 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 210 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_assert (_tmp44_); -#line 220 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 218 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp45_ = _data1_->aggregator; -#line 220 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 218 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_signal_connect_data (_tmp45_, "individuals-changed-detailed", (GCallback) ___lambda12__folks_individual_aggregator_individuals_changed_detailed, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); -#line 253 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 251 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp46_ = gee_hash_set_new (FOLKS_TYPE_PERSONA, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL); -#line 253 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 251 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data1_->personas = _tmp46_; -#line 255 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 253 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" personas1 = NULL; -#line 1631 "aggregation.c" +#line 1701 "aggregation.c" { FolksIndividual** _tmp47_; gint _tmp47__length1; @@ -1638,23 +1708,23 @@ GeeSet* _tmp50_; GeeIterator* _tmp51_ = NULL; GeeIterator* _p1_it; -#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 254 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp47_ = _data1_->individual_gathered; -#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 254 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp47__length1 = _data1_->individual_gathered_length1; -#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 254 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp48_ = _tmp47_[0]; -#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 254 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp49_ = folks_individual_get_personas (_tmp48_); -#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 254 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp50_ = _tmp49_; -#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 254 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp51_ = gee_iterable_iterator ((GeeIterable*) _tmp50_); -#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 254 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _p1_it = _tmp51_; -#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 254 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" while (TRUE) { -#line 1656 "aggregation.c" +#line 1726 "aggregation.c" GeeIterator* _tmp52_; gboolean _tmp53_ = FALSE; GeeIterator* _tmp54_; @@ -1663,43 +1733,43 @@ GeeHashSet* _tmp56_; FolksPersona* _tmp57_; FolksPersona* _tmp58_; -#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 254 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp52_ = _p1_it; -#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 254 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp53_ = gee_iterator_next (_tmp52_); -#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 254 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (!_tmp53_) { -#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 254 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" break; -#line 1673 "aggregation.c" +#line 1743 "aggregation.c" } -#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 254 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp54_ = _p1_it; -#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 254 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp55_ = gee_iterator_get (_tmp54_); -#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 254 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" p1 = (FolksPersona*) _tmp55_; -#line 258 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp56_ = _data1_->personas; -#line 258 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp57_ = p1; -#line 258 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _tmp56_, _tmp57_); -#line 259 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 257 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp58_ = p1; -#line 259 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 257 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" personas1 = g_list_append (personas1, _tmp58_); -#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 254 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (p1); -#line 1693 "aggregation.c" +#line 1763 "aggregation.c" } -#line 256 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 254 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (_p1_it); -#line 1697 "aggregation.c" +#line 1767 "aggregation.c" } -#line 262 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 260 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" personas2 = NULL; -#line 1701 "aggregation.c" +#line 1771 "aggregation.c" { FolksIndividual** _tmp59_; gint _tmp59__length1; @@ -1708,23 +1778,23 @@ GeeSet* _tmp62_; GeeIterator* _tmp63_ = NULL; GeeIterator* _p2_it; -#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 261 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp59_ = _data1_->individual_gathered; -#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 261 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp59__length1 = _data1_->individual_gathered_length1; -#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 261 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp60_ = _tmp59_[1]; -#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 261 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp61_ = folks_individual_get_personas (_tmp60_); -#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 261 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp62_ = _tmp61_; -#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 261 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp63_ = gee_iterable_iterator ((GeeIterable*) _tmp62_); -#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 261 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _p2_it = _tmp63_; -#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 261 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" while (TRUE) { -#line 1726 "aggregation.c" +#line 1796 "aggregation.c" GeeIterator* _tmp64_; gboolean _tmp65_ = FALSE; GeeIterator* _tmp66_; @@ -1733,75 +1803,75 @@ GeeHashSet* _tmp68_; FolksPersona* _tmp69_; FolksPersona* _tmp70_; -#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 261 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp64_ = _p2_it; -#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 261 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp65_ = gee_iterator_next (_tmp64_); -#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 261 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" if (!_tmp65_) { -#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 261 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" break; -#line 1743 "aggregation.c" +#line 1813 "aggregation.c" } -#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 261 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp66_ = _p2_it; -#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 261 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp67_ = gee_iterator_get (_tmp66_); -#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 261 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" p2 = (FolksPersona*) _tmp67_; -#line 265 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp68_ = _data1_->personas; -#line 265 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp69_ = p2; -#line 265 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _tmp68_, _tmp69_); -#line 266 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 264 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp70_ = p2; -#line 266 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 264 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" personas2 = g_list_append (personas2, _tmp70_); -#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 261 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (p2); -#line 1763 "aggregation.c" +#line 1833 "aggregation.c" } -#line 263 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 261 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (_p2_it); -#line 1767 "aggregation.c" +#line 1837 "aggregation.c" } -#line 269 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 267 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp71_ = _data1_->personas; -#line 269 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" - _tmp72_ = gee_collection_get_size ((GeeCollection*) _tmp71_); -#line 269 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 267 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" + _tmp72_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp71_); +#line 267 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp73_ = _tmp72_; -#line 269 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 267 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_assert (_tmp73_ == 2); -#line 271 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 269 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda13__gsource_func, block1_data_ref (_data1_), block1_data_unref); -#line 277 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 275 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp74_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 5, ___lambda14__gsource_func, g_object_ref (self), g_object_unref); -#line 277 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 275 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" timer_id = _tmp74_; -#line 281 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 279 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp75_ = _data1_->main_loop; -#line 281 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 279 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_main_loop_run (_tmp75_); -#line 282 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 280 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp76_ = timer_id; -#line 282 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 280 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_source_remove (_tmp76_); -#line 284 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 282 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp77_ = self->priv->_lsw_backend; -#line 284 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 282 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" libsocialweb_test_backend_tear_down (_tmp77_); -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_list_free0 (personas2); -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_list_free0 (personas1); -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" block1_data_unref (_data1_); -#line 101 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 99 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _data1_ = NULL; -#line 1803 "aggregation.c" +#line 1873 "aggregation.c" } @@ -1816,14 +1886,14 @@ FOLKS_TEST_CASE_CLASS (klass)->tear_down = aggregation_tests_real_tear_down; #line 26 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" G_OBJECT_CLASS (klass)->finalize = aggregation_tests_finalize; -#line 1818 "aggregation.c" +#line 1888 "aggregation.c" } static void aggregation_tests_instance_init (AggregationTests * self) { #line 26 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" self->priv = AGGREGATION_TESTS_GET_PRIVATE (self); -#line 1825 "aggregation.c" +#line 1895 "aggregation.c" } @@ -1835,7 +1905,7 @@ _libsocialweb_test_backend_unref0 (self->priv->_lsw_backend); #line 26 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" G_OBJECT_CLASS (aggregation_tests_parent_class)->finalize (obj); -#line 1837 "aggregation.c" +#line 1907 "aggregation.c" } @@ -1858,38 +1928,38 @@ AggregationTests* _tmp1_; AggregationTests* _tmp2_; GTestSuite* _tmp3_ = NULL; -#line 290 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 288 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_test_init (&args_length1, &args, NULL); -#line 292 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 290 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp0_ = g_test_get_root (); -#line 292 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 290 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" root = _tmp0_; -#line 293 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 291 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp1_ = aggregation_tests_new (); -#line 293 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 291 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp2_ = _tmp1_; -#line 293 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 291 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _tmp3_ = folks_test_case_get_suite ((FolksTestCase*) _tmp2_); -#line 293 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 291 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_test_suite_add_suite (root, _tmp3_); -#line 293 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 291 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" _g_object_unref0 (_tmp2_); -#line 295 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 293 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_test_run (); -#line 297 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 295 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" result = 0; -#line 297 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 295 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return result; -#line 1882 "aggregation.c" +#line 1952 "aggregation.c" } int main (int argc, char ** argv) { -#line 288 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 286 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" g_type_init (); -#line 288 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" +#line 286 "/home/treitter/collabora/folks/tests/libsocialweb/aggregation.vala" return _vala_main (argv, argc); -#line 1891 "aggregation.c" +#line 1961 "aggregation.c" } diff -Nru folks-0.6.6/tests/libsocialweb/aggregation.vala folks-0.6.7/tests/libsocialweb/aggregation.vala --- folks-0.6.6/tests/libsocialweb/aggregation.vala 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/tests/libsocialweb/aggregation.vala 2012-02-17 23:39:51.000000000 +0000 @@ -55,9 +55,8 @@ File kf_relationships_f = File.new_for_path (kf_relationships_path); try { - kf_relationships_f.replace_contents (kf_relationships_data, - kf_relationships_data.length, null, false, - FileCreateFlags.PRIVATE, null); + kf_relationships_f.replace_contents (kf_relationships_data.data, null, + false, FileCreateFlags.PRIVATE, null); } catch (Error e) { @@ -80,9 +79,8 @@ { File backend_f = File.new_for_path (kf_path); string data = kf.to_data (); - backend_f.replace_contents (data, - data.length, null, false, FileCreateFlags.PRIVATE, - null); + backend_f.replace_contents (data.data, null, false, + FileCreateFlags.PRIVATE, null); } catch (Error e) { diff -Nru folks-0.6.6/tests/libsocialweb/dummy-lsw.c folks-0.6.7/tests/libsocialweb/dummy-lsw.c --- folks-0.6.6/tests/libsocialweb/dummy-lsw.c 2011-12-13 23:41:56.000000000 +0000 +++ folks-0.6.7/tests/libsocialweb/dummy-lsw.c 2012-02-23 00:02:28.000000000 +0000 @@ -1,4 +1,4 @@ -/* dummy-lsw.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* dummy-lsw.c generated by valac 0.15.1, the Vala compiler * generated from dummy-lsw.vala, do not modify */ /* @@ -46,8 +46,8 @@ typedef struct _DummyLswTestsPrivate DummyLswTestsPrivate; #define _libsocialweb_test_backend_unref0(var) ((var == NULL) ? NULL : (var = (libsocialweb_test_backend_unref (var), NULL))) typedef struct _Block1Data Block1Data; -#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define __vala_SwContact_free0(var) ((var == NULL) ? NULL : (var = (_vala_SwContact_free (var), NULL))) +#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) #define _g_main_loop_unref0(var) ((var == NULL) ? NULL : (var = (g_main_loop_unref (var), NULL))) typedef struct _Block2Data Block2Data; @@ -218,8 +218,10 @@ static void block1_data_unref (Block1Data* _data1_) { #line 48 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { +#line 222 "dummy-lsw.c" + DummyLswTests * self; #line 48 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" - _g_object_unref0 (_data1_->self); + self = _data1_->self; #line 48 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" __vala_SwContact_free0 (_data1_->contact1); #line 48 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" @@ -233,8 +235,10 @@ #line 48 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_main_loop_unref0 (_data1_->main_loop); #line 48 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" + _g_object_unref0 (self); +#line 48 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" g_slice_free (Block1Data, _data1_); -#line 238 "dummy-lsw.c" +#line 242 "dummy-lsw.c" } } @@ -248,14 +252,14 @@ _tmp0_ = _data1_->main_loop; #line 54 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" g_main_loop_quit (_tmp0_); -#line 252 "dummy-lsw.c" +#line 256 "dummy-lsw.c" } static void ___lambda2__libsocialweb_test_backend_ready (LibsocialwebTestBackend* _sender, gpointer self) { #line 52 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" __lambda2_ (self); -#line 259 "dummy-lsw.c" +#line 263 "dummy-lsw.c" } @@ -265,7 +269,7 @@ g_assert_not_reached (); #line 56 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return result; -#line 269 "dummy-lsw.c" +#line 273 "dummy-lsw.c" } @@ -274,14 +278,14 @@ result = __lambda3_ (self); #line 56 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return result; -#line 278 "dummy-lsw.c" +#line 282 "dummy-lsw.c" } static void _g_free0_ (gpointer var) { #line 65 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" var = (g_free (var), NULL); -#line 285 "dummy-lsw.c" +#line 289 "dummy-lsw.c" } @@ -290,22 +294,26 @@ g_atomic_int_inc (&_data2_->_ref_count_); #line 67 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return _data2_; -#line 294 "dummy-lsw.c" +#line 298 "dummy-lsw.c" } static void block2_data_unref (Block2Data* _data2_) { #line 67 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { +#line 305 "dummy-lsw.c" + DummyLswTests * self; +#line 67 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" + self = _data2_->_data1_->self; +#line 67 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" + _g_free0 (_data2_->view_path); #line 67 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" block1_data_unref (_data2_->_data1_); #line 67 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _data2_->_data1_ = NULL; #line 67 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" - _g_free0 (_data2_->view_path); -#line 67 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" g_slice_free (Block2Data, _data2_); -#line 309 "dummy-lsw.c" +#line 317 "dummy-lsw.c" } } @@ -313,25 +321,25 @@ static gpointer _g_object_ref0 (gpointer self) { #line 75 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return self ? g_object_ref (self) : NULL; -#line 317 "dummy-lsw.c" +#line 325 "dummy-lsw.c" } static void _vala_LibsocialwebTestLibsocialwebContactViewTestContactsAddedElement_array_free (LibsocialwebTestLibsocialwebContactViewTestContactsAddedElement* array, gint array_length) { #line 78 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" if (array != NULL) { -#line 324 "dummy-lsw.c" +#line 332 "dummy-lsw.c" int i; #line 78 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" for (i = 0; i < array_length; i = i + 1) { #line 78 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" libsocialweb_test_libsocialweb_contact_view_test_contacts_added_element_destroy (&array[i]); -#line 330 "dummy-lsw.c" +#line 338 "dummy-lsw.c" } } #line 78 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" g_free (array); -#line 335 "dummy-lsw.c" +#line 343 "dummy-lsw.c" } @@ -420,7 +428,7 @@ g_main_loop_quit (_tmp16_); #line 73 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_object_unref0 (view); -#line 424 "dummy-lsw.c" +#line 432 "dummy-lsw.c" } @@ -429,7 +437,7 @@ ___lambda4_ (self, source_object); #line 71 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" block2_data_unref (self); -#line 433 "dummy-lsw.c" +#line 441 "dummy-lsw.c" } @@ -439,7 +447,7 @@ g_assert_not_reached (); #line 93 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return result; -#line 443 "dummy-lsw.c" +#line 451 "dummy-lsw.c" } @@ -448,7 +456,7 @@ result = __lambda5_ (self); #line 93 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return result; -#line 452 "dummy-lsw.c" +#line 460 "dummy-lsw.c" } @@ -457,20 +465,24 @@ g_atomic_int_inc (&_data3_->_ref_count_); #line 107 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return _data3_; -#line 461 "dummy-lsw.c" +#line 469 "dummy-lsw.c" } static void block3_data_unref (Block3Data* _data3_) { #line 107 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { +#line 476 "dummy-lsw.c" + DummyLswTests * self; #line 107 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" - _g_object_unref0 (_data3_->self); + self = _data3_->self; #line 107 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_free0 (_data3_->path); #line 107 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" + _g_object_unref0 (self); +#line 107 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" g_slice_free (Block3Data, _data3_); -#line 474 "dummy-lsw.c" +#line 486 "dummy-lsw.c" } } @@ -499,7 +511,7 @@ _tmp3_ = g_variant_ref_sink (_tmp2_); #line 117 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" v = _tmp3_; -#line 503 "dummy-lsw.c" +#line 515 "dummy-lsw.c" { GDBusConnection* _tmp4_ = NULL; GDBusConnection* conn; @@ -514,7 +526,7 @@ if (_inner_error_ != NULL) { #line 120 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" if (_inner_error_->domain == G_IO_ERROR) { -#line 518 "dummy-lsw.c" +#line 530 "dummy-lsw.c" goto __catch1_g_io_error; } goto __catch1_g_error; @@ -533,14 +545,14 @@ _g_object_unref0 (conn); #line 121 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" if (_inner_error_->domain == G_IO_ERROR) { -#line 537 "dummy-lsw.c" +#line 549 "dummy-lsw.c" goto __catch1_g_io_error; } goto __catch1_g_error; } #line 118 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_object_unref0 (conn); -#line 544 "dummy-lsw.c" +#line 556 "dummy-lsw.c" } goto __finally1; __catch1_g_io_error: @@ -554,7 +566,7 @@ g_assert_not_reached (); #line 118 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_error_free0 (e); -#line 558 "dummy-lsw.c" +#line 570 "dummy-lsw.c" } goto __finally1; __catch1_g_error: @@ -568,7 +580,7 @@ g_assert_not_reached (); #line 118 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_error_free0 (e); -#line 572 "dummy-lsw.c" +#line 584 "dummy-lsw.c" } __finally1: #line 118 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" @@ -583,7 +595,7 @@ g_clear_error (&_inner_error_); #line 118 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return FALSE; -#line 587 "dummy-lsw.c" +#line 599 "dummy-lsw.c" } #line 133 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" result = FALSE; @@ -593,7 +605,7 @@ _g_free0 (text); #line 133 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return result; -#line 597 "dummy-lsw.c" +#line 609 "dummy-lsw.c" } @@ -602,14 +614,14 @@ result = __lambda8_ (self); #line 110 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return result; -#line 606 "dummy-lsw.c" +#line 618 "dummy-lsw.c" } static void __lambda7_ (DummyLswTests* self, const gchar* path) { Block3Data* _data3_; const gchar* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; #line 107 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" g_return_if_fail (path != NULL); #line 107 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" @@ -632,14 +644,14 @@ block3_data_unref (_data3_); #line 107 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _data3_ = NULL; -#line 636 "dummy-lsw.c" +#line 648 "dummy-lsw.c" } static void ___lambda7__libsocialweb_test_libsocialweb_contact_view_test_start_called (LibsocialwebTestLibsocialwebContactViewTest* _sender, const gchar* path, gpointer self) { #line 107 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" __lambda7_ (self, path); -#line 643 "dummy-lsw.c" +#line 655 "dummy-lsw.c" } @@ -684,14 +696,14 @@ g_signal_connect_object (_tmp6_, "start-called", (GCallback) ___lambda7__libsocialweb_test_libsocialweb_contact_view_test_start_called, self, 0); #line 107 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_object_unref0 (_tmp6_); -#line 688 "dummy-lsw.c" +#line 700 "dummy-lsw.c" } static void ___lambda6__libsocialweb_test_libsocialweb_service_test_open_view_called (LibsocialwebTestLibsocialwebServiceTest* _sender, const gchar* query, GHashTable* p, const gchar* path, gpointer self) { #line 103 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" __lambda6_ (self, query, p, path); -#line 695 "dummy-lsw.c" +#line 707 "dummy-lsw.c" } @@ -744,7 +756,7 @@ _tmp9_ = _tmp8_; #line 149 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" g_assert (_tmp9_ == 1); -#line 748 "dummy-lsw.c" +#line 760 "dummy-lsw.c" { GeeCollection* _tmp10_; GeeIterator* _tmp11_ = NULL; @@ -757,7 +769,7 @@ _i_it = _tmp11_; #line 150 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" while (TRUE) { -#line 761 "dummy-lsw.c" +#line 773 "dummy-lsw.c" GeeIterator* _tmp12_; gboolean _tmp13_ = FALSE; GeeIterator* _tmp14_; @@ -778,7 +790,7 @@ if (!_tmp13_) { #line 150 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" break; -#line 782 "dummy-lsw.c" +#line 794 "dummy-lsw.c" } #line 150 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _tmp14_ = _i_it; @@ -800,7 +812,7 @@ _tmp20_ = nickname; #line 153 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" if (g_strcmp0 (_tmp20_, "Gargantua") == 0) { -#line 804 "dummy-lsw.c" +#line 816 "dummy-lsw.c" FolksIndividual* _tmp21_; FolksIndividual* _tmp22_; #line 154 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" @@ -811,13 +823,13 @@ _g_object_unref0 (_data1_->i1); #line 154 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _data1_->i1 = _tmp22_; -#line 815 "dummy-lsw.c" +#line 827 "dummy-lsw.c" } #line 155 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _tmp23_ = nickname; #line 155 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" if (g_strcmp0 (_tmp23_, "Pantagruel") == 0) { -#line 821 "dummy-lsw.c" +#line 833 "dummy-lsw.c" FolksIndividual* _tmp24_; FolksIndividual* _tmp25_; #line 156 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" @@ -828,17 +840,17 @@ _g_object_unref0 (_data1_->i2); #line 156 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _data1_->i2 = _tmp25_; -#line 832 "dummy-lsw.c" +#line 844 "dummy-lsw.c" } #line 150 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_free0 (nickname); #line 150 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_object_unref0 (i); -#line 838 "dummy-lsw.c" +#line 850 "dummy-lsw.c" } #line 150 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_object_unref0 (_i_it); -#line 842 "dummy-lsw.c" +#line 854 "dummy-lsw.c" } { GeeSet* _tmp26_; @@ -852,7 +864,7 @@ _i_it = _tmp27_; #line 159 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" while (TRUE) { -#line 856 "dummy-lsw.c" +#line 868 "dummy-lsw.c" GeeIterator* _tmp28_; gboolean _tmp29_ = FALSE; GeeIterator* _tmp30_; @@ -867,7 +879,7 @@ if (!_tmp29_) { #line 159 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" break; -#line 871 "dummy-lsw.c" +#line 883 "dummy-lsw.c" } #line 159 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _tmp30_ = _i_it; @@ -881,11 +893,11 @@ g_assert (_tmp32_ == NULL); #line 159 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_object_unref0 (i); -#line 885 "dummy-lsw.c" +#line 897 "dummy-lsw.c" } #line 159 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_object_unref0 (_i_it); -#line 889 "dummy-lsw.c" +#line 901 "dummy-lsw.c" } #line 164 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _tmp33_ = _data1_->main_loop; @@ -895,14 +907,14 @@ _g_object_unref0 (removed); #line 142 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_object_unref0 (added); -#line 899 "dummy-lsw.c" +#line 911 "dummy-lsw.c" } static void ___lambda9__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 141 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" __lambda9_ (self, changes); -#line 906 "dummy-lsw.c" +#line 918 "dummy-lsw.c" } @@ -912,7 +924,7 @@ g_assert_not_reached (); #line 168 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return result; -#line 916 "dummy-lsw.c" +#line 928 "dummy-lsw.c" } @@ -921,21 +933,21 @@ result = __lambda10_ (self); #line 168 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return result; -#line 925 "dummy-lsw.c" +#line 937 "dummy-lsw.c" } static SwContact* _vala_SwContact_copy (SwContact* self) { #line 191 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return g_boxed_copy (sw_contact_get_type (), self); -#line 932 "dummy-lsw.c" +#line 944 "dummy-lsw.c" } static gpointer __vala_SwContact_copy0 (gpointer self) { #line 191 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return self ? _vala_SwContact_copy (self) : NULL; -#line 939 "dummy-lsw.c" +#line 951 "dummy-lsw.c" } @@ -963,7 +975,7 @@ _tmp3_ = g_variant_ref_sink (_tmp2_); #line 208 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" v = _tmp3_; -#line 967 "dummy-lsw.c" +#line 979 "dummy-lsw.c" { GDBusConnection* _tmp4_ = NULL; GDBusConnection* conn; @@ -977,7 +989,7 @@ if (_inner_error_ != NULL) { #line 211 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" if (_inner_error_->domain == G_IO_ERROR) { -#line 981 "dummy-lsw.c" +#line 993 "dummy-lsw.c" goto __catch2_g_io_error; } goto __catch2_g_error; @@ -994,14 +1006,14 @@ _g_object_unref0 (conn); #line 212 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" if (_inner_error_->domain == G_IO_ERROR) { -#line 998 "dummy-lsw.c" +#line 1010 "dummy-lsw.c" goto __catch2_g_io_error; } goto __catch2_g_error; } #line 209 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_object_unref0 (conn); -#line 1005 "dummy-lsw.c" +#line 1017 "dummy-lsw.c" } goto __finally2; __catch2_g_io_error: @@ -1015,7 +1027,7 @@ g_assert_not_reached (); #line 209 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_error_free0 (e); -#line 1019 "dummy-lsw.c" +#line 1031 "dummy-lsw.c" } goto __finally2; __catch2_g_error: @@ -1029,7 +1041,7 @@ g_assert_not_reached (); #line 209 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_error_free0 (e); -#line 1033 "dummy-lsw.c" +#line 1045 "dummy-lsw.c" } __finally2: #line 209 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" @@ -1044,7 +1056,7 @@ g_clear_error (&_inner_error_); #line 209 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return FALSE; -#line 1048 "dummy-lsw.c" +#line 1060 "dummy-lsw.c" } #line 224 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" result = FALSE; @@ -1054,7 +1066,7 @@ _g_free0 (text); #line 224 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return result; -#line 1058 "dummy-lsw.c" +#line 1070 "dummy-lsw.c" } @@ -1063,7 +1075,7 @@ result = __lambda11_ (self); #line 203 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return result; -#line 1067 "dummy-lsw.c" +#line 1079 "dummy-lsw.c" } @@ -1109,14 +1121,14 @@ g_main_loop_quit (_tmp6_); #line 227 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_free0 (nickname); -#line 1113 "dummy-lsw.c" +#line 1125 "dummy-lsw.c" } static void ___lambda12__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 226 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" __lambda12_ (self); -#line 1120 "dummy-lsw.c" +#line 1132 "dummy-lsw.c" } @@ -1126,7 +1138,7 @@ g_assert_not_reached (); #line 238 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return result; -#line 1130 "dummy-lsw.c" +#line 1142 "dummy-lsw.c" } @@ -1135,7 +1147,7 @@ result = __lambda13_ (self); #line 238 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return result; -#line 1139 "dummy-lsw.c" +#line 1151 "dummy-lsw.c" } @@ -1163,7 +1175,7 @@ _tmp3_ = g_variant_ref_sink (_tmp2_); #line 251 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" v = _tmp3_; -#line 1167 "dummy-lsw.c" +#line 1179 "dummy-lsw.c" { GDBusConnection* _tmp4_ = NULL; GDBusConnection* conn; @@ -1177,7 +1189,7 @@ if (_inner_error_ != NULL) { #line 254 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" if (_inner_error_->domain == G_IO_ERROR) { -#line 1181 "dummy-lsw.c" +#line 1193 "dummy-lsw.c" goto __catch3_g_io_error; } goto __catch3_g_error; @@ -1194,14 +1206,14 @@ _g_object_unref0 (conn); #line 255 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" if (_inner_error_->domain == G_IO_ERROR) { -#line 1198 "dummy-lsw.c" +#line 1210 "dummy-lsw.c" goto __catch3_g_io_error; } goto __catch3_g_error; } #line 252 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_object_unref0 (conn); -#line 1205 "dummy-lsw.c" +#line 1217 "dummy-lsw.c" } goto __finally3; __catch3_g_io_error: @@ -1215,7 +1227,7 @@ g_assert_not_reached (); #line 252 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_error_free0 (e); -#line 1219 "dummy-lsw.c" +#line 1231 "dummy-lsw.c" } goto __finally3; __catch3_g_error: @@ -1229,7 +1241,7 @@ g_assert_not_reached (); #line 252 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_error_free0 (e); -#line 1233 "dummy-lsw.c" +#line 1245 "dummy-lsw.c" } __finally3: #line 252 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" @@ -1244,7 +1256,7 @@ g_clear_error (&_inner_error_); #line 252 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return FALSE; -#line 1248 "dummy-lsw.c" +#line 1260 "dummy-lsw.c" } #line 267 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" result = FALSE; @@ -1254,7 +1266,7 @@ _g_free0 (text); #line 267 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return result; -#line 1258 "dummy-lsw.c" +#line 1270 "dummy-lsw.c" } @@ -1263,7 +1275,7 @@ result = __lambda14_ (self); #line 247 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return result; -#line 1267 "dummy-lsw.c" +#line 1279 "dummy-lsw.c" } @@ -1316,7 +1328,7 @@ _tmp9_ = _tmp8_; #line 277 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" g_assert (_tmp9_ == 2); -#line 1320 "dummy-lsw.c" +#line 1332 "dummy-lsw.c" { GeeSet* _tmp10_; GeeIterator* _tmp11_ = NULL; @@ -1329,7 +1341,7 @@ _i_it = _tmp11_; #line 279 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" while (TRUE) { -#line 1333 "dummy-lsw.c" +#line 1345 "dummy-lsw.c" GeeIterator* _tmp12_; gboolean _tmp13_ = FALSE; GeeIterator* _tmp14_; @@ -1350,7 +1362,7 @@ if (!_tmp13_) { #line 279 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" break; -#line 1354 "dummy-lsw.c" +#line 1366 "dummy-lsw.c" } #line 279 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _tmp14_ = _i_it; @@ -1380,11 +1392,11 @@ _g_free0 (nickname); #line 279 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_object_unref0 (i); -#line 1384 "dummy-lsw.c" +#line 1396 "dummy-lsw.c" } #line 279 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_object_unref0 (_i_it); -#line 1388 "dummy-lsw.c" +#line 1400 "dummy-lsw.c" } { GeeCollection* _tmp22_; @@ -1398,7 +1410,7 @@ _i_it = _tmp23_; #line 287 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" while (TRUE) { -#line 1402 "dummy-lsw.c" +#line 1414 "dummy-lsw.c" GeeIterator* _tmp24_; gboolean _tmp25_ = FALSE; GeeIterator* _tmp26_; @@ -1413,7 +1425,7 @@ if (!_tmp25_) { #line 287 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" break; -#line 1417 "dummy-lsw.c" +#line 1429 "dummy-lsw.c" } #line 287 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _tmp26_ = _i_it; @@ -1427,11 +1439,11 @@ g_assert (_tmp28_ == NULL); #line 287 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_object_unref0 (i); -#line 1431 "dummy-lsw.c" +#line 1443 "dummy-lsw.c" } #line 287 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_object_unref0 (_i_it); -#line 1435 "dummy-lsw.c" +#line 1447 "dummy-lsw.c" } #line 292 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _tmp29_ = _data1_->main_loop; @@ -1441,14 +1453,14 @@ _g_object_unref0 (removed); #line 270 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_object_unref0 (added); -#line 1445 "dummy-lsw.c" +#line 1457 "dummy-lsw.c" } static void ___lambda15__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 270 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" __lambda15_ (self, changes); -#line 1452 "dummy-lsw.c" +#line 1464 "dummy-lsw.c" } @@ -1458,7 +1470,7 @@ g_assert_not_reached (); #line 295 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return result; -#line 1462 "dummy-lsw.c" +#line 1474 "dummy-lsw.c" } @@ -1467,7 +1479,7 @@ result = __lambda16_ (self); #line 295 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return result; -#line 1471 "dummy-lsw.c" +#line 1483 "dummy-lsw.c" } @@ -1569,7 +1581,7 @@ _tmp8_ = g_hash_table_new_full (NULL, NULL, _g_free0_, _g_free0_); #line 65 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" p = _tmp8_; -#line 1573 "dummy-lsw.c" +#line 1585 "dummy-lsw.c" { Block2Data* _data2_; LibsocialwebTestLibsocialwebServiceTest* _tmp9_; @@ -1601,7 +1613,7 @@ _data2_ = NULL; #line 69 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" if (_inner_error_->domain == G_IO_ERROR) { -#line 1605 "dummy-lsw.c" +#line 1617 "dummy-lsw.c" goto __catch0_g_io_error; } #line 69 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" @@ -1620,7 +1632,7 @@ g_clear_error (&_inner_error_); #line 69 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return; -#line 1624 "dummy-lsw.c" +#line 1636 "dummy-lsw.c" } #line 70 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _tmp12_ = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &_inner_error_); @@ -1634,7 +1646,7 @@ _data2_ = NULL; #line 70 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" if (_inner_error_->domain == G_IO_ERROR) { -#line 1638 "dummy-lsw.c" +#line 1650 "dummy-lsw.c" goto __catch0_g_io_error; } #line 70 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" @@ -1653,7 +1665,7 @@ g_clear_error (&_inner_error_); #line 70 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return; -#line 1657 "dummy-lsw.c" +#line 1669 "dummy-lsw.c" } #line 71 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _tmp13_ = conn; @@ -1667,7 +1679,7 @@ block2_data_unref (_data2_); #line 67 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _data2_ = NULL; -#line 1671 "dummy-lsw.c" +#line 1683 "dummy-lsw.c" } goto __finally0; __catch0_g_io_error: @@ -1681,7 +1693,7 @@ g_assert_not_reached (); #line 67 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_error_free0 (e); -#line 1685 "dummy-lsw.c" +#line 1697 "dummy-lsw.c" } __finally0: #line 67 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" @@ -1698,7 +1710,7 @@ g_clear_error (&_inner_error_); #line 67 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return; -#line 1702 "dummy-lsw.c" +#line 1714 "dummy-lsw.c" } #line 93 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _tmp15_ = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) 5, ___lambda5__gsource_func, g_object_ref (self), g_object_unref); @@ -1758,7 +1770,7 @@ persona1 = NULL; #line 178 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" persona2 = NULL; -#line 1762 "dummy-lsw.c" +#line 1774 "dummy-lsw.c" { GeeSet* _tmp26_; GeeSet* _tmp27_; @@ -1774,7 +1786,7 @@ _p1_it = _tmp28_; #line 179 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" while (TRUE) { -#line 1778 "dummy-lsw.c" +#line 1790 "dummy-lsw.c" gboolean _tmp29_ = FALSE; gpointer _tmp30_ = NULL; FolksPersona* p1; @@ -1786,7 +1798,7 @@ if (!_tmp29_) { #line 179 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" break; -#line 1790 "dummy-lsw.c" +#line 1802 "dummy-lsw.c" } #line 179 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _tmp30_ = gee_iterator_get (_p1_it); @@ -1804,11 +1816,11 @@ _g_object_unref0 (p1); #line 182 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" break; -#line 1808 "dummy-lsw.c" +#line 1820 "dummy-lsw.c" } #line 179 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_object_unref0 (_p1_it); -#line 1812 "dummy-lsw.c" +#line 1824 "dummy-lsw.c" } { GeeSet* _tmp33_; @@ -1825,7 +1837,7 @@ _p2_it = _tmp35_; #line 184 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" while (TRUE) { -#line 1829 "dummy-lsw.c" +#line 1841 "dummy-lsw.c" gboolean _tmp36_ = FALSE; gpointer _tmp37_ = NULL; FolksPersona* p2; @@ -1837,7 +1849,7 @@ if (!_tmp36_) { #line 184 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" break; -#line 1841 "dummy-lsw.c" +#line 1853 "dummy-lsw.c" } #line 184 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _tmp37_ = gee_iterator_get (_p2_it); @@ -1855,11 +1867,11 @@ _g_object_unref0 (p2); #line 187 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" break; -#line 1859 "dummy-lsw.c" +#line 1871 "dummy-lsw.c" } #line 184 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _g_object_unref0 (_p2_it); -#line 1863 "dummy-lsw.c" +#line 1875 "dummy-lsw.c" } #line 189 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _tmp40_ = persona1; @@ -1975,7 +1987,7 @@ block1_data_unref (_data1_); #line 48 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" _data1_ = NULL; -#line 1979 "dummy-lsw.c" +#line 1991 "dummy-lsw.c" } @@ -1990,14 +2002,14 @@ FOLKS_TEST_CASE_CLASS (klass)->tear_down = dummy_lsw_tests_real_tear_down; #line 27 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" G_OBJECT_CLASS (klass)->finalize = dummy_lsw_tests_finalize; -#line 1994 "dummy-lsw.c" +#line 2006 "dummy-lsw.c" } static void dummy_lsw_tests_instance_init (DummyLswTests * self) { #line 27 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" self->priv = DUMMY_LSW_TESTS_GET_PRIVATE (self); -#line 2001 "dummy-lsw.c" +#line 2013 "dummy-lsw.c" } @@ -2009,7 +2021,7 @@ _libsocialweb_test_backend_unref0 (self->priv->_lsw_backend); #line 27 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" G_OBJECT_CLASS (dummy_lsw_tests_parent_class)->finalize (obj); -#line 2013 "dummy-lsw.c" +#line 2025 "dummy-lsw.c" } @@ -2054,7 +2066,7 @@ result = 0; #line 316 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return result; -#line 2058 "dummy-lsw.c" +#line 2070 "dummy-lsw.c" } @@ -2063,7 +2075,7 @@ g_type_init (); #line 307 "/home/treitter/collabora/folks/tests/libsocialweb/dummy-lsw.vala" return _vala_main (argv, argc); -#line 2067 "dummy-lsw.c" +#line 2079 "dummy-lsw.c" } diff -Nru folks-0.6.6/tests/libsocialweb/Makefile.in folks-0.6.7/tests/libsocialweb/Makefile.in --- folks-0.6.6/tests/libsocialweb/Makefile.in 2011-12-13 23:38:44.000000000 +0000 +++ folks-0.6.7/tests/libsocialweb/Makefile.in 2012-02-23 00:04:13.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -41,10 +41,11 @@ dummy_lsw_vala.stamp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -134,6 +135,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -444,37 +447,34 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< $(srcdir)/dummy-lsw.c: $(srcdir)/dummy_lsw_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/dummy_lsw_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/dummy_lsw_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) dummy_lsw_vala.stamp; \ fi dummy_lsw_vala.stamp: $(dummy_lsw_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(dummy_lsw_SOURCES) $(AM_V_at)touch $@ $(srcdir)/aggregation.c: $(srcdir)/aggregation_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/aggregation_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/aggregation_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) aggregation_vala.stamp; \ fi aggregation_vala.stamp: $(aggregation_SOURCES) @@ -620,14 +620,15 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ test "$$failed" -eq 0; \ else :; fi @@ -676,10 +677,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/tests/Makefile.in folks-0.6.7/tests/Makefile.in --- folks-0.6.6/tests/Makefile.in 2011-12-13 23:38:40.000000000 +0000 +++ folks-0.6.7/tests/Makefile.in 2012-02-23 00:04:12.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -43,10 +43,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -121,6 +122,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -561,10 +564,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/tests/telepathy/fake-tp-backend.c folks-0.6.7/tests/telepathy/fake-tp-backend.c --- folks-0.6.6/tests/telepathy/fake-tp-backend.c 1970-01-01 00:00:00.000000000 +0000 +++ folks-0.6.7/tests/telepathy/fake-tp-backend.c 2012-02-23 00:02:26.000000000 +0000 @@ -0,0 +1,228 @@ +/* fake-tp-backend.c generated by valac 0.15.1, the Vala compiler + * generated from fake-tp-backend.vala, do not modify */ + +/* + * Copyright (C) 2012 Philip Withnall + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + * + * Authors: Philip Withnall + */ + +#include +#include +#include +#include +#include +#include +#include + +typedef struct _Block1Data Block1Data; +#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) +#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) +#define _g_main_loop_unref0(var) ((var == NULL) ? NULL : (var = (g_main_loop_unref (var), NULL))) + +struct _Block1Data { + int _ref_count_; + FolksIndividualAggregator* aggregator; +}; + + + +gint _vala_main (gchar** args, int args_length1); +static Block1Data* block1_data_ref (Block1Data* _data1_); +static void block1_data_unref (Block1Data* _data1_); +static gboolean __lambda2_ (Block1Data* _data1_); +static void __lambda3_ (Block1Data* _data1_, GObject* s, GAsyncResult* r); +static void ___lambda3__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); +static gboolean ___lambda2__gsource_func (gpointer self); + + +static Block1Data* block1_data_ref (Block1Data* _data1_) { +#line 27 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + g_atomic_int_inc (&_data1_->_ref_count_); +#line 27 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + return _data1_; +#line 58 "fake-tp-backend.c" +} + + +static void block1_data_unref (Block1Data* _data1_) { +#line 27 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { +#line 27 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _g_object_unref0 (_data1_->aggregator); +#line 27 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + g_slice_free (Block1Data, _data1_); +#line 69 "fake-tp-backend.c" + } +} + + +static void __lambda3_ (Block1Data* _data1_, GObject* s, GAsyncResult* r) { + GError * _inner_error_ = NULL; +#line 42 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + g_return_if_fail (r != NULL); +#line 78 "fake-tp-backend.c" + { + FolksIndividualAggregator* _tmp0_; + GAsyncResult* _tmp1_; +#line 46 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _tmp0_ = _data1_->aggregator; +#line 46 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _tmp1_ = r; +#line 46 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + folks_individual_aggregator_prepare_finish (_tmp0_, _tmp1_, &_inner_error_); +#line 46 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + if (_inner_error_ != NULL) { +#line 90 "fake-tp-backend.c" + goto __catch0_g_error; + } + } + goto __finally0; + __catch0_g_error: + { + GError* e1 = NULL; + const gchar* _tmp2_; +#line 44 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + e1 = _inner_error_; +#line 44 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _inner_error_ = NULL; +#line 50 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _tmp2_ = e1->message; +#line 50 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + g_critical ("fake-tp-backend.vala:50: Failed to prepare aggregator: %s", _tmp2_); +#line 51 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + g_assert_not_reached (); +#line 44 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _g_error_free0 (e1); +#line 111 "fake-tp-backend.c" + } + __finally0: +#line 44 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + if (_inner_error_ != NULL) { +#line 44 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); +#line 44 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + g_clear_error (&_inner_error_); +#line 44 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + return; +#line 122 "fake-tp-backend.c" + } +} + + +static void ___lambda3__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { +#line 42 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + __lambda3_ (self, source_object, res); +#line 42 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + block1_data_unref (self); +#line 132 "fake-tp-backend.c" +} + + +static gboolean __lambda2_ (Block1Data* _data1_) { + gboolean result = FALSE; + FolksIndividualAggregator* _tmp0_; +#line 42 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _tmp0_ = _data1_->aggregator; +#line 42 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + folks_individual_aggregator_prepare (_tmp0_, ___lambda3__gasync_ready_callback, block1_data_ref (_data1_)); +#line 55 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + result = FALSE; +#line 55 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + return result; +#line 147 "fake-tp-backend.c" +} + + +static gboolean ___lambda2__gsource_func (gpointer self) { + gboolean result; + result = __lambda2_ (self); +#line 40 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + return result; +#line 156 "fake-tp-backend.c" +} + + +gint _vala_main (gchar** args, int args_length1) { + gint result = 0; + Block1Data* _data1_; + TpTestBackend* _tmp0_; + TpTestBackend* tp_backend; + void* _tmp1_ = NULL; + void* account_handle; + GMainLoop* _tmp2_; + GMainLoop* main_loop; + FolksIndividualAggregator* _tmp3_; +#line 27 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _data1_ = g_slice_new0 (Block1Data); +#line 27 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _data1_->_ref_count_ = 1; +#line 29 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _tmp0_ = tp_test_backend_new (); +#line 29 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + tp_backend = _tmp0_; +#line 31 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + tp_test_backend_set_up (tp_backend); +#line 32 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _tmp1_ = tp_test_backend_add_account (tp_backend, "protocol", "me@example.com", "cm", "account"); +#line 32 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + account_handle = _tmp1_; +#line 35 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _tmp2_ = g_main_loop_new (NULL, FALSE); +#line 35 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + main_loop = _tmp2_; +#line 38 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _tmp3_ = folks_individual_aggregator_new (); +#line 38 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _data1_->aggregator = _tmp3_; +#line 40 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda2__gsource_func, block1_data_ref (_data1_), block1_data_unref); +#line 59 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + g_main_loop_run (main_loop); +#line 62 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _g_object_unref0 (_data1_->aggregator); +#line 62 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _data1_->aggregator = NULL; +#line 64 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + tp_test_backend_remove_account (tp_backend, account_handle); +#line 65 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + tp_test_backend_tear_down (tp_backend); +#line 67 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + result = 0; +#line 67 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _g_main_loop_unref0 (main_loop); +#line 67 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _g_object_unref0 (tp_backend); +#line 67 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + block1_data_unref (_data1_); +#line 67 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + _data1_ = NULL; +#line 67 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + return result; +#line 216 "fake-tp-backend.c" +} + + +int main (int argc, char ** argv) { +#line 27 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + g_type_init (); +#line 27 "/home/treitter/collabora/folks/tests/telepathy/fake-tp-backend.vala" + return _vala_main (argv, argc); +#line 225 "fake-tp-backend.c" +} + + + diff -Nru folks-0.6.6/tests/telepathy/fake-tp-backend.vala folks-0.6.7/tests/telepathy/fake-tp-backend.vala --- folks-0.6.6/tests/telepathy/fake-tp-backend.vala 1970-01-01 00:00:00.000000000 +0000 +++ folks-0.6.7/tests/telepathy/fake-tp-backend.vala 2012-01-12 17:25:24.000000000 +0000 @@ -0,0 +1,68 @@ +/* + * Copyright (C) 2012 Philip Withnall + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + * + * Authors: Philip Withnall + */ + +using TpTest; +using Folks; + +/* A simple test program to expose the test Telepathy account used by folks’ + * Telepathy tests on the current D-Bus bus. This is intended to be used for + * manual testing using the test Telepathy account. */ + +public int main (string[] args) +{ + var tp_backend = new TpTest.Backend (); + + tp_backend.set_up (); + void *account_handle = tp_backend.add_account ("protocol", "me@example.com", + "cm", "account"); + + var main_loop = new GLib.MainLoop (null, false); + + /* Set up the aggregator */ + var aggregator = new IndividualAggregator (); + + Idle.add (() => + { + aggregator.prepare.begin ((s,r) => + { + try + { + aggregator.prepare.end (r); + } + catch (GLib.Error e1) + { + GLib.critical ("Failed to prepare aggregator: %s", e1.message); + assert_not_reached (); + } + }); + + return false; + }); + + /* Run until we're killed. */ + main_loop.run (); + + /* Tear down .*/ + aggregator = null; + + tp_backend.remove_account (account_handle); + tp_backend.tear_down (); + + return 0; +} diff -Nru folks-0.6.6/tests/telepathy/individual-properties.c folks-0.6.7/tests/telepathy/individual-properties.c --- folks-0.6.6/tests/telepathy/individual-properties.c 2011-12-13 23:41:48.000000000 +0000 +++ folks-0.6.7/tests/telepathy/individual-properties.c 2012-02-23 00:02:26.000000000 +0000 @@ -1,4 +1,4 @@ -/* individual-properties.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* individual-properties.c generated by valac 0.15.1, the Vala compiler * generated from individual-properties.vala, do not modify */ /* @@ -494,13 +494,17 @@ static void block1_data_unref (Block1Data* _data1_) { #line 67 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { +#line 498 "individual-properties.c" + IndividualPropertiesTests * self; #line 67 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" - _g_object_unref0 (_data1_->self); + self = _data1_->self; #line 67 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_main_loop_unref0 (_data1_->main_loop); #line 67 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" + _g_object_unref0 (self); +#line 67 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" g_slice_free (Block1Data, _data1_); -#line 504 "individual-properties.c" +#line 508 "individual-properties.c" } } @@ -508,7 +512,7 @@ static gpointer _g_object_ref0 (gpointer self) { #line 101 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return self ? g_object_ref (self) : NULL; -#line 512 "individual-properties.c" +#line 516 "individual-properties.c" } @@ -520,12 +524,12 @@ if (g_strcmp0 (stack[i], needle) == 0) { #line 106 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return TRUE; -#line 524 "individual-properties.c" +#line 528 "individual-properties.c" } } #line 106 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return FALSE; -#line 529 "individual-properties.c" +#line 533 "individual-properties.c" } @@ -553,7 +557,7 @@ _tmp3_ = gee_multi_map_get_keys (_tmp2_); #line 76 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" removed = _tmp3_; -#line 557 "individual-properties.c" +#line 561 "individual-properties.c" { GeeCollection* _tmp4_; GeeIterator* _tmp5_ = NULL; @@ -566,7 +570,7 @@ _i_it = _tmp5_; #line 78 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" while (TRUE) { -#line 570 "individual-properties.c" +#line 574 "individual-properties.c" GeeIterator* _tmp6_; gboolean _tmp7_ = FALSE; GeeIterator* _tmp8_; @@ -584,7 +588,7 @@ if (!_tmp7_) { #line 78 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 588 "individual-properties.c" +#line 592 "individual-properties.c" } #line 78 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp8_ = _i_it; @@ -604,7 +608,7 @@ _tmp13_ = _tmp12_; #line 83 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (_tmp13_) { -#line 608 "individual-properties.c" +#line 612 "individual-properties.c" FolksIndividual* _tmp14_; const gchar* _tmp15_; const gchar* _tmp16_; @@ -729,7 +733,7 @@ g_assert (_tmp32_ == 0); #line 96 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" tpf_persona = NULL; -#line 733 "individual-properties.c" +#line 737 "individual-properties.c" { FolksIndividual* _tmp33_; GeeSet* _tmp34_; @@ -748,7 +752,7 @@ _p_it = _tmp36_; #line 97 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" while (TRUE) { -#line 752 "individual-properties.c" +#line 756 "individual-properties.c" GeeIterator* _tmp37_; gboolean _tmp38_ = FALSE; GeeIterator* _tmp39_; @@ -763,7 +767,7 @@ if (!_tmp38_) { #line 97 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 767 "individual-properties.c" +#line 771 "individual-properties.c" } #line 97 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp39_ = _p_it; @@ -775,7 +779,7 @@ _tmp41_ = p; #line 99 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (TPF_IS_PERSONA (_tmp41_)) { -#line 779 "individual-properties.c" +#line 783 "individual-properties.c" FolksPersona* _tmp42_; TpfPersona* _tmp43_; #line 101 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -790,15 +794,15 @@ _g_object_unref0 (p); #line 102 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 794 "individual-properties.c" +#line 798 "individual-properties.c" } #line 97 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (p); -#line 798 "individual-properties.c" +#line 802 "individual-properties.c" } #line 97 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (_p_it); -#line 802 "individual-properties.c" +#line 806 "individual-properties.c" } #line 105 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp44_ = tpf_persona; @@ -914,7 +918,7 @@ g_assert (_tmp79_ == 0); #line 83 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (tpf_persona); -#line 918 "individual-properties.c" +#line 922 "individual-properties.c" } else { FolksIndividual* _tmp80_; const gchar* _tmp81_; @@ -927,7 +931,7 @@ _tmp82_ = _tmp81_; #line 126 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (g_strcmp0 (_tmp82_, "0e46c5e74f61908f49550d241f2a1651892a1695") == 0) { -#line 931 "individual-properties.c" +#line 935 "individual-properties.c" FolksIndividual* _tmp83_; const gchar* _tmp84_; const gchar* _tmp85_; @@ -1093,7 +1097,7 @@ g_assert (_tmp109_ == TRUE); #line 141 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" tpf_persona = NULL; -#line 1097 "individual-properties.c" +#line 1101 "individual-properties.c" { FolksIndividual* _tmp110_; GeeSet* _tmp111_; @@ -1112,7 +1116,7 @@ _p_it = _tmp113_; #line 142 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" while (TRUE) { -#line 1116 "individual-properties.c" +#line 1120 "individual-properties.c" GeeIterator* _tmp114_; gboolean _tmp115_ = FALSE; GeeIterator* _tmp116_; @@ -1127,7 +1131,7 @@ if (!_tmp115_) { #line 142 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 1131 "individual-properties.c" +#line 1135 "individual-properties.c" } #line 142 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp116_ = _p_it; @@ -1139,7 +1143,7 @@ _tmp118_ = p; #line 144 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (TPF_IS_PERSONA (_tmp118_)) { -#line 1143 "individual-properties.c" +#line 1147 "individual-properties.c" FolksPersona* _tmp119_; TpfPersona* _tmp120_; #line 146 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -1154,15 +1158,15 @@ _g_object_unref0 (p); #line 147 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 1158 "individual-properties.c" +#line 1162 "individual-properties.c" } #line 142 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (p); -#line 1162 "individual-properties.c" +#line 1166 "individual-properties.c" } #line 142 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (_p_it); -#line 1166 "individual-properties.c" +#line 1170 "individual-properties.c" } #line 150 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp121_ = tpf_persona; @@ -1314,16 +1318,16 @@ _g_object_unref0 (_tmp168_); #line 126 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (tpf_persona); -#line 1318 "individual-properties.c" +#line 1322 "individual-properties.c" } } #line 78 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (i); -#line 1323 "individual-properties.c" +#line 1327 "individual-properties.c" } #line 78 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (_i_it); -#line 1327 "individual-properties.c" +#line 1331 "individual-properties.c" } #line 174 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp170_ = removed; @@ -1333,7 +1337,7 @@ _tmp172_ = _tmp171_; #line 174 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" g_assert (_tmp172_ == 1); -#line 1337 "individual-properties.c" +#line 1341 "individual-properties.c" { GeeSet* _tmp173_; GeeIterator* _tmp174_ = NULL; @@ -1346,7 +1350,7 @@ _i_it = _tmp174_; #line 176 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" while (TRUE) { -#line 1350 "individual-properties.c" +#line 1354 "individual-properties.c" GeeIterator* _tmp175_; gboolean _tmp176_ = FALSE; GeeIterator* _tmp177_; @@ -1361,7 +1365,7 @@ if (!_tmp176_) { #line 176 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 1365 "individual-properties.c" +#line 1369 "individual-properties.c" } #line 176 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp177_ = _i_it; @@ -1375,24 +1379,24 @@ g_assert (_tmp179_ == NULL); #line 176 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (i); -#line 1379 "individual-properties.c" +#line 1383 "individual-properties.c" } #line 176 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (_i_it); -#line 1383 "individual-properties.c" +#line 1387 "individual-properties.c" } #line 73 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (removed); #line 73 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (added); -#line 1389 "individual-properties.c" +#line 1393 "individual-properties.c" } static void ___lambda2__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 73 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" __lambda2_ (self, changes); -#line 1396 "individual-properties.c" +#line 1400 "individual-properties.c" } @@ -1407,7 +1411,7 @@ result = FALSE; #line 189 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return result; -#line 1411 "individual-properties.c" +#line 1415 "individual-properties.c" } @@ -1416,7 +1420,7 @@ result = __lambda3_ (self); #line 186 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return result; -#line 1420 "individual-properties.c" +#line 1424 "individual-properties.c" } @@ -1468,7 +1472,7 @@ block1_data_unref (_data1_); #line 67 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data1_ = NULL; -#line 1472 "individual-properties.c" +#line 1476 "individual-properties.c" } @@ -1477,20 +1481,24 @@ g_atomic_int_inc (&_data2_->_ref_count_); #line 198 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return _data2_; -#line 1481 "individual-properties.c" +#line 1485 "individual-properties.c" } static void block2_data_unref (Block2Data* _data2_) { #line 198 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { +#line 1492 "individual-properties.c" + IndividualPropertiesTests * self; #line 198 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" - _g_object_unref0 (_data2_->self); + self = _data2_->self; #line 198 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_main_loop_unref0 (_data2_->main_loop); #line 198 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" + _g_object_unref0 (self); +#line 198 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" g_slice_free (Block2Data, _data2_); -#line 1494 "individual-properties.c" +#line 1502 "individual-properties.c" } } @@ -1500,22 +1508,26 @@ g_atomic_int_inc (&_data3_->_ref_count_); #line 205 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return _data3_; -#line 1504 "individual-properties.c" +#line 1512 "individual-properties.c" } static void block3_data_unref (Block3Data* _data3_) { #line 205 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { +#line 1519 "individual-properties.c" + IndividualPropertiesTests * self; +#line 205 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" + self = _data3_->_data2_->self; +#line 205 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" + _g_free0 (_data3_->new_alias); #line 205 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" block2_data_unref (_data3_->_data2_); #line 205 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data3_->_data2_ = NULL; #line 205 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" - _g_free0 (_data3_->new_alias); -#line 205 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" g_slice_free (Block3Data, _data3_); -#line 1519 "individual-properties.c" +#line 1531 "individual-properties.c" } } @@ -1556,18 +1568,18 @@ if (g_strcmp0 (_tmp4_, _tmp5_) == 0) { #line 232 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data2_->alias_notified = TRUE; -#line 1560 "individual-properties.c" +#line 1572 "individual-properties.c" } #line 226 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (ind); -#line 1564 "individual-properties.c" +#line 1576 "individual-properties.c" } static void _____lambda5__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 226 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" ____lambda5_ (self, _sender, pspec); -#line 1571 "individual-properties.c" +#line 1583 "individual-properties.c" } @@ -1610,7 +1622,7 @@ _tmp4_ = g_strdup ("New Alias"); #line 210 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data3_->new_alias = _tmp4_; -#line 1614 "individual-properties.c" +#line 1626 "individual-properties.c" { GeeCollection* _tmp5_; GeeIterator* _tmp6_ = NULL; @@ -1623,7 +1635,7 @@ _i_it = _tmp6_; #line 212 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" while (TRUE) { -#line 1627 "individual-properties.c" +#line 1639 "individual-properties.c" GeeIterator* _tmp7_; gboolean _tmp8_ = FALSE; GeeIterator* _tmp9_; @@ -1650,7 +1662,7 @@ if (!_tmp8_) { #line 212 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 1654 "individual-properties.c" +#line 1666 "individual-properties.c" } #line 212 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp9_ = _i_it; @@ -1674,7 +1686,7 @@ _g_object_unref0 (i); #line 220 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" continue; -#line 1678 "individual-properties.c" +#line 1690 "individual-properties.c" } #line 224 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp15_ = i; @@ -1692,7 +1704,7 @@ g_signal_connect_data ((GObject*) _tmp19_, "notify::alias", (GCallback) _____lambda5__g_object_notify, block3_data_ref (_data3_), (GClosureNotify) block3_data_unref, 0); #line 237 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" persona = NULL; -#line 1696 "individual-properties.c" +#line 1708 "individual-properties.c" { FolksIndividual* _tmp20_; GeeSet* _tmp21_; @@ -1711,7 +1723,7 @@ _p_it = _tmp23_; #line 238 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" while (TRUE) { -#line 1715 "individual-properties.c" +#line 1727 "individual-properties.c" GeeIterator* _tmp24_; gboolean _tmp25_ = FALSE; GeeIterator* _tmp26_; @@ -1727,7 +1739,7 @@ if (!_tmp25_) { #line 238 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 1731 "individual-properties.c" +#line 1743 "individual-properties.c" } #line 238 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp26_ = _p_it; @@ -1747,11 +1759,11 @@ _g_object_unref0 (p); #line 241 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 1751 "individual-properties.c" +#line 1763 "individual-properties.c" } #line 238 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (_p_it); -#line 1755 "individual-properties.c" +#line 1767 "individual-properties.c" } #line 243 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp30_ = persona; @@ -1767,11 +1779,11 @@ _g_object_unref0 (persona); #line 212 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (i); -#line 1771 "individual-properties.c" +#line 1783 "individual-properties.c" } #line 212 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (_i_it); -#line 1775 "individual-properties.c" +#line 1787 "individual-properties.c" } #line 251 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp33_ = removed; @@ -1781,7 +1793,7 @@ _tmp35_ = _tmp34_; #line 251 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" g_assert (_tmp35_ == 1); -#line 1785 "individual-properties.c" +#line 1797 "individual-properties.c" { GeeSet* _tmp36_; GeeIterator* _tmp37_ = NULL; @@ -1794,7 +1806,7 @@ _i_it = _tmp37_; #line 253 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" while (TRUE) { -#line 1798 "individual-properties.c" +#line 1810 "individual-properties.c" GeeIterator* _tmp38_; gboolean _tmp39_ = FALSE; GeeIterator* _tmp40_; @@ -1809,7 +1821,7 @@ if (!_tmp39_) { #line 253 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 1813 "individual-properties.c" +#line 1825 "individual-properties.c" } #line 253 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp40_ = _i_it; @@ -1823,11 +1835,11 @@ g_assert (_tmp42_ == NULL); #line 253 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (i); -#line 1827 "individual-properties.c" +#line 1839 "individual-properties.c" } #line 253 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (_i_it); -#line 1831 "individual-properties.c" +#line 1843 "individual-properties.c" } #line 205 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (removed); @@ -1837,14 +1849,14 @@ block3_data_unref (_data3_); #line 205 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data3_ = NULL; -#line 1841 "individual-properties.c" +#line 1853 "individual-properties.c" } static void ___lambda4__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 205 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" __lambda4_ (self, changes); -#line 1848 "individual-properties.c" +#line 1860 "individual-properties.c" } @@ -1859,7 +1871,7 @@ result = FALSE; #line 266 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return result; -#line 1863 "individual-properties.c" +#line 1875 "individual-properties.c" } @@ -1868,7 +1880,7 @@ result = __lambda6_ (self); #line 263 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return result; -#line 1872 "individual-properties.c" +#line 1884 "individual-properties.c" } @@ -1924,7 +1936,7 @@ block2_data_unref (_data2_); #line 198 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data2_ = NULL; -#line 1928 "individual-properties.c" +#line 1940 "individual-properties.c" } @@ -1933,20 +1945,24 @@ g_atomic_int_inc (&_data4_->_ref_count_); #line 277 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return _data4_; -#line 1937 "individual-properties.c" +#line 1949 "individual-properties.c" } static void block4_data_unref (Block4Data* _data4_) { #line 277 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) { +#line 1956 "individual-properties.c" + IndividualPropertiesTests * self; #line 277 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" - _g_object_unref0 (_data4_->self); + self = _data4_->self; #line 277 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_main_loop_unref0 (_data4_->main_loop); #line 277 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" + _g_object_unref0 (self); +#line 277 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" g_slice_free (Block4Data, _data4_); -#line 1950 "individual-properties.c" +#line 1966 "individual-properties.c" } } @@ -1956,22 +1972,26 @@ g_atomic_int_inc (&_data5_->_ref_count_); #line 284 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return _data5_; -#line 1960 "individual-properties.c" +#line 1976 "individual-properties.c" } static void block5_data_unref (Block5Data* _data5_) { #line 284 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) { +#line 1983 "individual-properties.c" + IndividualPropertiesTests * self; +#line 284 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" + self = _data5_->_data4_->self; +#line 284 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" + _g_free0 (_data5_->new_alias); #line 284 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" block4_data_unref (_data5_->_data4_); #line 284 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data5_->_data4_ = NULL; #line 284 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" - _g_free0 (_data5_->new_alias); -#line 284 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" g_slice_free (Block5Data, _data5_); -#line 1975 "individual-properties.c" +#line 1995 "individual-properties.c" } } @@ -2012,18 +2032,18 @@ if (g_strcmp0 (_tmp4_, _tmp5_) == 0) { #line 311 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data4_->alias_notified = TRUE; -#line 2016 "individual-properties.c" +#line 2036 "individual-properties.c" } #line 305 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (ind); -#line 2020 "individual-properties.c" +#line 2040 "individual-properties.c" } static void _____lambda8__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 305 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" ____lambda8_ (self, _sender, pspec); -#line 2027 "individual-properties.c" +#line 2047 "individual-properties.c" } @@ -2066,7 +2086,7 @@ _tmp4_ = g_strdup ("New Alias"); #line 289 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data5_->new_alias = _tmp4_; -#line 2070 "individual-properties.c" +#line 2090 "individual-properties.c" { GeeCollection* _tmp5_; GeeIterator* _tmp6_ = NULL; @@ -2079,7 +2099,7 @@ _i_it = _tmp6_; #line 291 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" while (TRUE) { -#line 2083 "individual-properties.c" +#line 2103 "individual-properties.c" GeeIterator* _tmp7_; gboolean _tmp8_ = FALSE; GeeIterator* _tmp9_; @@ -2117,7 +2137,7 @@ if (!_tmp8_) { #line 291 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 2121 "individual-properties.c" +#line 2141 "individual-properties.c" } #line 291 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp9_ = _i_it; @@ -2141,7 +2161,7 @@ _g_object_unref0 (i); #line 299 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" continue; -#line 2145 "individual-properties.c" +#line 2165 "individual-properties.c" } #line 303 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp15_ = i; @@ -2159,7 +2179,7 @@ g_signal_connect_data ((GObject*) _tmp19_, "notify::alias", (GCallback) _____lambda8__g_object_notify, block5_data_ref (_data5_), (GClosureNotify) block5_data_unref, 0); #line 316 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" persona = NULL; -#line 2163 "individual-properties.c" +#line 2183 "individual-properties.c" { FolksIndividual* _tmp20_; GeeSet* _tmp21_; @@ -2178,7 +2198,7 @@ _p_it = _tmp23_; #line 317 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" while (TRUE) { -#line 2182 "individual-properties.c" +#line 2202 "individual-properties.c" GeeIterator* _tmp24_; gboolean _tmp25_ = FALSE; GeeIterator* _tmp26_; @@ -2194,7 +2214,7 @@ if (!_tmp25_) { #line 317 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 2198 "individual-properties.c" +#line 2218 "individual-properties.c" } #line 317 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp26_ = _p_it; @@ -2214,11 +2234,11 @@ _g_object_unref0 (p); #line 320 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 2218 "individual-properties.c" +#line 2238 "individual-properties.c" } #line 317 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (_p_it); -#line 2222 "individual-properties.c" +#line 2242 "individual-properties.c" } #line 322 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp30_ = persona; @@ -2256,11 +2276,11 @@ _g_object_unref0 (persona); #line 291 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (i); -#line 2260 "individual-properties.c" +#line 2280 "individual-properties.c" } #line 291 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (_i_it); -#line 2264 "individual-properties.c" +#line 2284 "individual-properties.c" } #line 331 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp43_ = removed; @@ -2270,7 +2290,7 @@ _tmp45_ = _tmp44_; #line 331 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" g_assert (_tmp45_ == 1); -#line 2274 "individual-properties.c" +#line 2294 "individual-properties.c" { GeeSet* _tmp46_; GeeIterator* _tmp47_ = NULL; @@ -2283,7 +2303,7 @@ _i_it = _tmp47_; #line 333 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" while (TRUE) { -#line 2287 "individual-properties.c" +#line 2307 "individual-properties.c" GeeIterator* _tmp48_; gboolean _tmp49_ = FALSE; GeeIterator* _tmp50_; @@ -2298,7 +2318,7 @@ if (!_tmp49_) { #line 333 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 2302 "individual-properties.c" +#line 2322 "individual-properties.c" } #line 333 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp50_ = _i_it; @@ -2312,11 +2332,11 @@ g_assert (_tmp52_ == NULL); #line 333 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (i); -#line 2316 "individual-properties.c" +#line 2336 "individual-properties.c" } #line 333 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (_i_it); -#line 2320 "individual-properties.c" +#line 2340 "individual-properties.c" } #line 284 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (removed); @@ -2326,14 +2346,14 @@ block5_data_unref (_data5_); #line 284 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data5_ = NULL; -#line 2330 "individual-properties.c" +#line 2350 "individual-properties.c" } static void ___lambda7__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 284 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" __lambda7_ (self, changes); -#line 2337 "individual-properties.c" +#line 2357 "individual-properties.c" } @@ -2348,7 +2368,7 @@ result = FALSE; #line 346 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return result; -#line 2352 "individual-properties.c" +#line 2372 "individual-properties.c" } @@ -2357,7 +2377,7 @@ result = __lambda9_ (self); #line 343 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return result; -#line 2361 "individual-properties.c" +#line 2381 "individual-properties.c" } @@ -2413,7 +2433,7 @@ block4_data_unref (_data4_); #line 277 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data4_ = NULL; -#line 2417 "individual-properties.c" +#line 2437 "individual-properties.c" } @@ -2422,20 +2442,24 @@ g_atomic_int_inc (&_data6_->_ref_count_); #line 357 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return _data6_; -#line 2426 "individual-properties.c" +#line 2446 "individual-properties.c" } static void block6_data_unref (Block6Data* _data6_) { #line 357 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) { +#line 2453 "individual-properties.c" + IndividualPropertiesTests * self; #line 357 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" - _g_object_unref0 (_data6_->self); + self = _data6_->self; #line 357 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_main_loop_unref0 (_data6_->main_loop); #line 357 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" + _g_object_unref0 (self); +#line 357 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" g_slice_free (Block6Data, _data6_); -#line 2439 "individual-properties.c" +#line 2463 "individual-properties.c" } } @@ -2448,14 +2472,14 @@ _tmp0_ = changes; #line 370 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _individual_properties_tests_change_contact_info_aggregator_individuals_added (self, _tmp0_, NULL, NULL); -#line 2452 "individual-properties.c" +#line 2476 "individual-properties.c" } static void ___lambda10__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 368 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" __lambda10_ (self, changes); -#line 2459 "individual-properties.c" +#line 2483 "individual-properties.c" } @@ -2470,7 +2494,7 @@ result = FALSE; #line 381 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return result; -#line 2474 "individual-properties.c" +#line 2498 "individual-properties.c" } @@ -2479,7 +2503,7 @@ result = __lambda16_ (self); #line 378 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return result; -#line 2483 "individual-properties.c" +#line 2507 "individual-properties.c" } @@ -2552,7 +2576,7 @@ #line 386 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp10_ = self->priv->_changes_pending; #line 386 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" - _tmp11_ = gee_collection_get_size ((GeeCollection*) _tmp10_); + _tmp11_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp10_); #line 386 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp12_ = _tmp11_; #line 386 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -2567,7 +2591,7 @@ block6_data_unref (_data6_); #line 357 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data6_ = NULL; -#line 2571 "individual-properties.c" +#line 2595 "individual-properties.c" } @@ -2580,7 +2604,7 @@ _g_object_unref0 (_data_->self); #line 27 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" g_slice_free (IndividualPropertiesTestsChangeContactInfoAggregatorIndividualsAddedData, _data_); -#line 2584 "individual-properties.c" +#line 2608 "individual-properties.c" } @@ -2607,7 +2631,7 @@ _data_->changes = _tmp2_; #line 27 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _individual_properties_tests_change_contact_info_aggregator_individuals_added_co (_data_); -#line 2611 "individual-properties.c" +#line 2635 "individual-properties.c" } @@ -2615,7 +2639,7 @@ IndividualPropertiesTestsChangeContactInfoAggregatorIndividualsAddedData* _data_; #line 27 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 2619 "individual-properties.c" +#line 2643 "individual-properties.c" } @@ -2624,15 +2648,17 @@ g_atomic_int_inc (&_data7_->_ref_count_); #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return _data7_; -#line 2628 "individual-properties.c" +#line 2652 "individual-properties.c" } static void block7_data_unref (Block7Data* _data7_) { #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) { +#line 2659 "individual-properties.c" + IndividualPropertiesTests * self; #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" - _g_object_unref0 (_data7_->self); + self = _data7_->self; #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_free0 (_data7_->new_full_name); #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -2644,8 +2670,10 @@ #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_date_time_unref0 (_data7_->new_birthday); #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" + _g_object_unref0 (self); +#line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" g_slice_free (Block7Data, _data7_); -#line 2649 "individual-properties.c" +#line 2677 "individual-properties.c" } } @@ -2682,23 +2710,23 @@ _tmp6_ = _tmp5_; #line 428 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (_tmp6_ != NULL) { -#line 2686 "individual-properties.c" +#line 2714 "individual-properties.c" GDateTime* _tmp7_; #line 428 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp7_ = _data7_->new_birthday; #line 428 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp3_ = _tmp7_ != NULL; -#line 2692 "individual-properties.c" +#line 2720 "individual-properties.c" } else { #line 428 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp3_ = FALSE; -#line 2696 "individual-properties.c" +#line 2724 "individual-properties.c" } #line 428 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp8_ = _tmp3_; #line 428 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (_tmp8_) { -#line 2702 "individual-properties.c" +#line 2730 "individual-properties.c" FolksIndividual* _tmp9_; GDateTime* _tmp10_; GDateTime* _tmp11_; @@ -2716,34 +2744,34 @@ _tmp13_ = g_date_time_equal (_tmp11_, _tmp12_); #line 429 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp2_ = _tmp13_; -#line 2720 "individual-properties.c" +#line 2748 "individual-properties.c" } else { #line 428 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp2_ = FALSE; -#line 2724 "individual-properties.c" +#line 2752 "individual-properties.c" } #line 428 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp14_ = _tmp2_; #line 428 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (_tmp14_) { -#line 2730 "individual-properties.c" +#line 2758 "individual-properties.c" GeeHashSet* _tmp15_; #line 431 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp15_ = self->priv->_changes_pending; #line 431 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" gee_abstract_collection_remove ((GeeAbstractCollection*) _tmp15_, "birthday"); -#line 2736 "individual-properties.c" +#line 2764 "individual-properties.c" } #line 423 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (ind); -#line 2740 "individual-properties.c" +#line 2768 "individual-properties.c" } static void _____lambda11__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 423 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" ____lambda11_ (self, _sender, pspec); -#line 2747 "individual-properties.c" +#line 2775 "individual-properties.c" } @@ -2781,24 +2809,24 @@ _tmp6_ = gee_collection_contains ((GeeCollection*) _tmp4_, _tmp5_); #line 440 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (_tmp6_) { -#line 2785 "individual-properties.c" +#line 2813 "individual-properties.c" GeeHashSet* _tmp7_; #line 442 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp7_ = self->priv->_changes_pending; #line 442 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" gee_abstract_collection_remove ((GeeAbstractCollection*) _tmp7_, "email-addresses"); -#line 2791 "individual-properties.c" +#line 2819 "individual-properties.c" } #line 435 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (ind); -#line 2795 "individual-properties.c" +#line 2823 "individual-properties.c" } static void _____lambda12__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 435 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" ____lambda12_ (self, _sender, pspec); -#line 2802 "individual-properties.c" +#line 2830 "individual-properties.c" } @@ -2833,24 +2861,24 @@ _tmp5_ = _data7_->new_full_name; #line 451 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (g_strcmp0 (_tmp4_, _tmp5_) == 0) { -#line 2837 "individual-properties.c" +#line 2865 "individual-properties.c" GeeHashSet* _tmp6_; #line 452 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp6_ = self->priv->_changes_pending; #line 452 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" gee_abstract_collection_remove ((GeeAbstractCollection*) _tmp6_, "full-name"); -#line 2843 "individual-properties.c" +#line 2871 "individual-properties.c" } #line 446 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (ind); -#line 2847 "individual-properties.c" +#line 2875 "individual-properties.c" } static void _____lambda13__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 446 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" ____lambda13_ (self, _sender, pspec); -#line 2854 "individual-properties.c" +#line 2882 "individual-properties.c" } @@ -2888,24 +2916,24 @@ _tmp6_ = gee_collection_contains ((GeeCollection*) _tmp4_, _tmp5_); #line 460 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (_tmp6_) { -#line 2892 "individual-properties.c" +#line 2920 "individual-properties.c" GeeHashSet* _tmp7_; #line 462 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp7_ = self->priv->_changes_pending; #line 462 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" gee_abstract_collection_remove ((GeeAbstractCollection*) _tmp7_, "phone-numbers"); -#line 2898 "individual-properties.c" +#line 2926 "individual-properties.c" } #line 455 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (ind); -#line 2902 "individual-properties.c" +#line 2930 "individual-properties.c" } static void _____lambda14__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 455 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" ____lambda14_ (self, _sender, pspec); -#line 2909 "individual-properties.c" +#line 2937 "individual-properties.c" } @@ -2943,24 +2971,24 @@ _tmp6_ = gee_collection_contains ((GeeCollection*) _tmp4_, _tmp5_); #line 471 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (_tmp6_) { -#line 2947 "individual-properties.c" +#line 2975 "individual-properties.c" GeeHashSet* _tmp7_; #line 473 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _tmp7_ = self->priv->_changes_pending; #line 473 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" gee_abstract_collection_remove ((GeeAbstractCollection*) _tmp7_, "urls"); -#line 2953 "individual-properties.c" +#line 2981 "individual-properties.c" } #line 466 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (ind); -#line 2957 "individual-properties.c" +#line 2985 "individual-properties.c" } static void _____lambda15__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 466 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" ____lambda15_ (self, _sender, pspec); -#line 2964 "individual-properties.c" +#line 2992 "individual-properties.c" } @@ -2974,7 +3002,7 @@ _data_->_res_ = _res_; #line 512 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _individual_properties_tests_change_contact_info_aggregator_individuals_added_co (_data_); -#line 2978 "individual-properties.c" +#line 3006 "individual-properties.c" } @@ -2983,32 +3011,32 @@ switch (_data_->_state_) { #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" case 0: -#line 2987 "individual-properties.c" +#line 3015 "individual-properties.c" goto _state_0; #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" case 1: -#line 2991 "individual-properties.c" +#line 3019 "individual-properties.c" goto _state_1; #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" case 2: -#line 2995 "individual-properties.c" +#line 3023 "individual-properties.c" goto _state_2; #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" case 3: -#line 2999 "individual-properties.c" +#line 3027 "individual-properties.c" goto _state_3; #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" case 4: -#line 3003 "individual-properties.c" +#line 3031 "individual-properties.c" goto _state_4; #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" case 5: -#line 3007 "individual-properties.c" +#line 3035 "individual-properties.c" goto _state_5; default: #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" g_assert_not_reached (); -#line 3012 "individual-properties.c" +#line 3040 "individual-properties.c" } _state_0: #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -3073,7 +3101,7 @@ _data_->_tmp12_ = g_strdup ("Cave Johnson"); #line 410 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_data7_->new_full_name = _data_->_tmp12_; -#line 3077 "individual-properties.c" +#line 3105 "individual-properties.c" { #line 412 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_tmp13_ = _data_->added; @@ -3095,7 +3123,7 @@ if (!_data_->_tmp16_) { #line 412 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 3099 "individual-properties.c" +#line 3127 "individual-properties.c" } #line 412 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_tmp17_ = _data_->_i_it; @@ -3119,7 +3147,7 @@ if (_data_->_tmp23_ == NULL) { #line 417 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_tmp20_ = TRUE; -#line 3123 "individual-properties.c" +#line 3151 "individual-properties.c" } else { #line 417 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_tmp24_ = _data_->_data7_->new_birthday; @@ -3135,7 +3163,7 @@ _data_->_tmp28_ = g_date_time_equal (_data_->_tmp24_, _data_->_tmp27_); #line 417 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_tmp20_ = !_data_->_tmp28_; -#line 3139 "individual-properties.c" +#line 3167 "individual-properties.c" } #line 417 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_tmp29_ = _data_->_tmp20_; @@ -3215,7 +3243,7 @@ g_signal_connect_data ((GObject*) _data_->_tmp53_, "notify::urls", (GCallback) _____lambda15__g_object_notify, block7_data_ref (_data_->_data7_), (GClosureNotify) block7_data_unref, 0); #line 479 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->persona = NULL; -#line 3219 "individual-properties.c" +#line 3247 "individual-properties.c" { #line 480 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_tmp54_ = _data_->i; @@ -3241,7 +3269,7 @@ if (!_data_->_tmp59_) { #line 480 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 3245 "individual-properties.c" +#line 3273 "individual-properties.c" } #line 480 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_tmp60_ = _data_->_p_it; @@ -3263,11 +3291,11 @@ _g_object_unref0 (_data_->p); #line 483 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 3267 "individual-properties.c" +#line 3295 "individual-properties.c" } #line 480 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (_data_->_p_it); -#line 3271 "individual-properties.c" +#line 3299 "individual-properties.c" } #line 485 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_tmp64_ = _data_->persona; @@ -3317,7 +3345,7 @@ _data_->_tmp77_ = _data_->uncaught_errors; #line 509 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->uncaught_errors = _data_->_tmp77_ + 1; -#line 3321 "individual-properties.c" +#line 3349 "individual-properties.c" } { #line 512 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -3330,7 +3358,7 @@ folks_birthday_details_change_birthday ((FolksBirthdayDetails*) TPF_PERSONA (_data_->_tmp78_), _data_->_tmp79_, _individual_properties_tests_change_contact_info_aggregator_individuals_added_ready, _data_); #line 512 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return FALSE; -#line 3334 "individual-properties.c" +#line 3362 "individual-properties.c" _state_1: #line 512 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" folks_birthday_details_change_birthday_finish ((FolksBirthdayDetails*) TPF_PERSONA (_data_->_tmp78_), _data_->_res_, &_data_->_inner_error_); @@ -3338,7 +3366,7 @@ if (_data_->_inner_error_ != NULL) { #line 512 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (_data_->_inner_error_->domain == FOLKS_PROPERTY_ERROR) { -#line 3342 "individual-properties.c" +#line 3370 "individual-properties.c" goto __catch0_folks_property_error; } #line 512 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -3367,7 +3395,7 @@ g_clear_error (&_data_->_inner_error_); #line 512 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return FALSE; -#line 3371 "individual-properties.c" +#line 3399 "individual-properties.c" } } goto __finally0; @@ -3389,11 +3417,11 @@ _data_->_tmp83_ = _data_->uncaught_errors; #line 517 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->uncaught_errors = _data_->_tmp83_ - 1; -#line 3393 "individual-properties.c" +#line 3421 "individual-properties.c" } #line 510 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_error_free0 (_data_->e_birthday); -#line 3397 "individual-properties.c" +#line 3425 "individual-properties.c" } __finally0: #line 510 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -3424,7 +3452,7 @@ g_clear_error (&_data_->_inner_error_); #line 510 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return FALSE; -#line 3428 "individual-properties.c" +#line 3456 "individual-properties.c" } #line 520 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_tmp84_ = _data_->i; @@ -3438,7 +3466,7 @@ _data_->_tmp87_ = _data_->uncaught_errors; #line 521 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->uncaught_errors = _data_->_tmp87_ + 1; -#line 3442 "individual-properties.c" +#line 3470 "individual-properties.c" } { #line 524 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -3451,7 +3479,7 @@ folks_email_details_change_email_addresses ((FolksEmailDetails*) TPF_PERSONA (_data_->_tmp88_), (GeeSet*) _data_->_tmp89_, _individual_properties_tests_change_contact_info_aggregator_individuals_added_ready, _data_); #line 524 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return FALSE; -#line 3455 "individual-properties.c" +#line 3483 "individual-properties.c" _state_2: #line 524 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" folks_email_details_change_email_addresses_finish ((FolksEmailDetails*) TPF_PERSONA (_data_->_tmp88_), _data_->_res_, &_data_->_inner_error_); @@ -3459,7 +3487,7 @@ if (_data_->_inner_error_ != NULL) { #line 524 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (_data_->_inner_error_->domain == FOLKS_PROPERTY_ERROR) { -#line 3463 "individual-properties.c" +#line 3491 "individual-properties.c" goto __catch1_folks_property_error; } #line 524 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -3488,7 +3516,7 @@ g_clear_error (&_data_->_inner_error_); #line 524 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return FALSE; -#line 3492 "individual-properties.c" +#line 3520 "individual-properties.c" } } goto __finally1; @@ -3510,11 +3538,11 @@ _data_->_tmp93_ = _data_->uncaught_errors; #line 531 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->uncaught_errors = _data_->_tmp93_ - 1; -#line 3514 "individual-properties.c" +#line 3542 "individual-properties.c" } #line 522 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_error_free0 (_data_->e0); -#line 3518 "individual-properties.c" +#line 3546 "individual-properties.c" } __finally1: #line 522 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -3545,7 +3573,7 @@ g_clear_error (&_data_->_inner_error_); #line 522 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return FALSE; -#line 3549 "individual-properties.c" +#line 3577 "individual-properties.c" } #line 534 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_tmp94_ = _data_->i; @@ -3559,7 +3587,7 @@ _data_->_tmp97_ = _data_->uncaught_errors; #line 535 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->uncaught_errors = _data_->_tmp97_ + 1; -#line 3563 "individual-properties.c" +#line 3591 "individual-properties.c" } { #line 538 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -3572,7 +3600,7 @@ folks_name_details_change_full_name ((FolksNameDetails*) TPF_PERSONA (_data_->_tmp98_), _data_->_tmp99_, _individual_properties_tests_change_contact_info_aggregator_individuals_added_ready, _data_); #line 538 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return FALSE; -#line 3576 "individual-properties.c" +#line 3604 "individual-properties.c" _state_3: #line 538 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" folks_name_details_change_full_name_finish ((FolksNameDetails*) TPF_PERSONA (_data_->_tmp98_), _data_->_res_, &_data_->_inner_error_); @@ -3580,7 +3608,7 @@ if (_data_->_inner_error_ != NULL) { #line 538 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (_data_->_inner_error_->domain == FOLKS_PROPERTY_ERROR) { -#line 3584 "individual-properties.c" +#line 3612 "individual-properties.c" goto __catch2_folks_property_error; } #line 538 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -3609,7 +3637,7 @@ g_clear_error (&_data_->_inner_error_); #line 538 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return FALSE; -#line 3613 "individual-properties.c" +#line 3641 "individual-properties.c" } } goto __finally2; @@ -3631,11 +3659,11 @@ _data_->_tmp103_ = _data_->uncaught_errors; #line 543 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->uncaught_errors = _data_->_tmp103_ - 1; -#line 3635 "individual-properties.c" +#line 3663 "individual-properties.c" } #line 536 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_error_free0 (_data_->e1); -#line 3639 "individual-properties.c" +#line 3667 "individual-properties.c" } __finally2: #line 536 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -3666,7 +3694,7 @@ g_clear_error (&_data_->_inner_error_); #line 536 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return FALSE; -#line 3670 "individual-properties.c" +#line 3698 "individual-properties.c" } #line 546 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_tmp104_ = _data_->i; @@ -3680,7 +3708,7 @@ _data_->_tmp107_ = _data_->uncaught_errors; #line 547 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->uncaught_errors = _data_->_tmp107_ + 1; -#line 3684 "individual-properties.c" +#line 3712 "individual-properties.c" } { #line 550 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -3693,7 +3721,7 @@ folks_phone_details_change_phone_numbers ((FolksPhoneDetails*) TPF_PERSONA (_data_->_tmp108_), (GeeSet*) _data_->_tmp109_, _individual_properties_tests_change_contact_info_aggregator_individuals_added_ready, _data_); #line 550 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return FALSE; -#line 3697 "individual-properties.c" +#line 3725 "individual-properties.c" _state_4: #line 550 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" folks_phone_details_change_phone_numbers_finish ((FolksPhoneDetails*) TPF_PERSONA (_data_->_tmp108_), _data_->_res_, &_data_->_inner_error_); @@ -3701,7 +3729,7 @@ if (_data_->_inner_error_ != NULL) { #line 550 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (_data_->_inner_error_->domain == FOLKS_PROPERTY_ERROR) { -#line 3705 "individual-properties.c" +#line 3733 "individual-properties.c" goto __catch3_folks_property_error; } #line 550 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -3730,7 +3758,7 @@ g_clear_error (&_data_->_inner_error_); #line 550 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return FALSE; -#line 3734 "individual-properties.c" +#line 3762 "individual-properties.c" } } goto __finally3; @@ -3752,11 +3780,11 @@ _data_->_tmp113_ = _data_->uncaught_errors; #line 557 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->uncaught_errors = _data_->_tmp113_ - 1; -#line 3756 "individual-properties.c" +#line 3784 "individual-properties.c" } #line 548 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_error_free0 (_data_->e2); -#line 3760 "individual-properties.c" +#line 3788 "individual-properties.c" } __finally3: #line 548 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -3787,7 +3815,7 @@ g_clear_error (&_data_->_inner_error_); #line 548 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return FALSE; -#line 3791 "individual-properties.c" +#line 3819 "individual-properties.c" } #line 560 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_tmp114_ = _data_->i; @@ -3801,7 +3829,7 @@ _data_->_tmp117_ = _data_->uncaught_errors; #line 561 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->uncaught_errors = _data_->_tmp117_ + 1; -#line 3805 "individual-properties.c" +#line 3833 "individual-properties.c" } { #line 564 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -3814,7 +3842,7 @@ folks_url_details_change_urls ((FolksUrlDetails*) TPF_PERSONA (_data_->_tmp118_), (GeeSet*) _data_->_tmp119_, _individual_properties_tests_change_contact_info_aggregator_individuals_added_ready, _data_); #line 564 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return FALSE; -#line 3818 "individual-properties.c" +#line 3846 "individual-properties.c" _state_5: #line 564 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" folks_url_details_change_urls_finish ((FolksUrlDetails*) TPF_PERSONA (_data_->_tmp118_), _data_->_res_, &_data_->_inner_error_); @@ -3822,7 +3850,7 @@ if (_data_->_inner_error_ != NULL) { #line 564 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" if (_data_->_inner_error_->domain == FOLKS_PROPERTY_ERROR) { -#line 3826 "individual-properties.c" +#line 3854 "individual-properties.c" goto __catch4_folks_property_error; } #line 564 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -3851,7 +3879,7 @@ g_clear_error (&_data_->_inner_error_); #line 564 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return FALSE; -#line 3855 "individual-properties.c" +#line 3883 "individual-properties.c" } } goto __finally4; @@ -3873,11 +3901,11 @@ _data_->_tmp123_ = _data_->uncaught_errors; #line 571 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->uncaught_errors = _data_->_tmp123_ - 1; -#line 3877 "individual-properties.c" +#line 3905 "individual-properties.c" } #line 562 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_error_free0 (_data_->e3); -#line 3881 "individual-properties.c" +#line 3909 "individual-properties.c" } __finally4: #line 562 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" @@ -3908,7 +3936,7 @@ g_clear_error (&_data_->_inner_error_); #line 562 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return FALSE; -#line 3912 "individual-properties.c" +#line 3940 "individual-properties.c" } #line 574 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_tmp124_ = _data_->i; @@ -3922,7 +3950,7 @@ _data_->_tmp127_ = _data_->uncaught_errors; #line 576 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" g_assert (_data_->_tmp127_ == 0); -#line 3926 "individual-properties.c" +#line 3954 "individual-properties.c" } #line 412 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (_data_->urls); @@ -3934,11 +3962,11 @@ _g_object_unref0 (_data_->persona); #line 412 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (_data_->i); -#line 3938 "individual-properties.c" +#line 3966 "individual-properties.c" } #line 412 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (_data_->_i_it); -#line 3942 "individual-properties.c" +#line 3970 "individual-properties.c" } #line 580 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_tmp128_ = _data_->removed; @@ -3948,7 +3976,7 @@ _data_->_tmp130_ = _data_->_tmp129_; #line 580 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" g_assert (_data_->_tmp130_ == 1); -#line 3952 "individual-properties.c" +#line 3980 "individual-properties.c" { #line 582 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_tmp131_ = _data_->removed; @@ -3970,7 +3998,7 @@ if (!_data_->_tmp134_) { #line 582 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" break; -#line 3974 "individual-properties.c" +#line 4002 "individual-properties.c" } #line 582 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _data_->_tmp135_ = _data_->_r_it; @@ -3986,11 +4014,11 @@ g_assert (_data_->_tmp137_ == NULL); #line 582 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (_data_->r); -#line 3990 "individual-properties.c" +#line 4018 "individual-properties.c" } #line 582 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (_data_->_r_it); -#line 3994 "individual-properties.c" +#line 4022 "individual-properties.c" } #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" _g_object_unref0 (_data_->removed); @@ -4004,17 +4032,17 @@ if (_data_->_state_ == 0) { #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 4008 "individual-properties.c" +#line 4036 "individual-properties.c" } else { #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" g_simple_async_result_complete (_data_->_async_result); -#line 4012 "individual-properties.c" +#line 4040 "individual-properties.c" } #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" g_object_unref (_data_->_async_result); #line 392 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return FALSE; -#line 4018 "individual-properties.c" +#line 4046 "individual-properties.c" } @@ -4029,7 +4057,7 @@ FOLKS_TEST_CASE_CLASS (klass)->tear_down = individual_properties_tests_real_tear_down; #line 27 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" G_OBJECT_CLASS (klass)->finalize = individual_properties_tests_finalize; -#line 4033 "individual-properties.c" +#line 4061 "individual-properties.c" } @@ -4038,7 +4066,7 @@ self->priv = INDIVIDUAL_PROPERTIES_TESTS_GET_PRIVATE (self); #line 31 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" self->priv->_test_timeout = 3; -#line 4042 "individual-properties.c" +#line 4070 "individual-properties.c" } @@ -4052,7 +4080,7 @@ _g_object_unref0 (self->priv->_changes_pending); #line 27 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" G_OBJECT_CLASS (individual_properties_tests_parent_class)->finalize (obj); -#line 4056 "individual-properties.c" +#line 4084 "individual-properties.c" } @@ -4097,7 +4125,7 @@ result = 0; #line 598 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return result; -#line 4101 "individual-properties.c" +#line 4129 "individual-properties.c" } @@ -4106,7 +4134,7 @@ g_type_init (); #line 589 "/home/treitter/collabora/folks/tests/telepathy/individual-properties.vala" return _vala_main (argv, argc); -#line 4110 "individual-properties.c" +#line 4138 "individual-properties.c" } diff -Nru folks-0.6.6/tests/telepathy/individual-retrieval.c folks-0.6.7/tests/telepathy/individual-retrieval.c --- folks-0.6.6/tests/telepathy/individual-retrieval.c 2011-12-13 23:41:50.000000000 +0000 +++ folks-0.6.7/tests/telepathy/individual-retrieval.c 2012-02-23 00:02:26.000000000 +0000 @@ -1,4 +1,4 @@ -/* individual-retrieval.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* individual-retrieval.c generated by valac 0.15.1, the Vala compiler * generated from individual-retrieval.vala, do not modify */ /* @@ -373,8 +373,10 @@ static void block1_data_unref (Block1Data* _data1_) { #line 88 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { +#line 377 "individual-retrieval.c" + IndividualRetrievalTests * self; #line 88 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" - _g_object_unref0 (_data1_->self); + self = _data1_->self; #line 88 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (_data1_->aggregator); #line 88 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" @@ -382,8 +384,10 @@ #line 88 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_main_loop_unref0 (_data1_->main_loop); #line 88 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" + _g_object_unref0 (self); +#line 88 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_slice_free (Block1Data, _data1_); -#line 387 "individual-retrieval.c" +#line 391 "individual-retrieval.c" } } @@ -415,7 +419,7 @@ _tmp3_ = gee_multi_map_get_keys (_tmp2_); #line 102 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" removed = _tmp3_; -#line 419 "individual-retrieval.c" +#line 423 "individual-retrieval.c" { GeeCollection* _tmp4_; GeeIterator* _tmp5_ = NULL; @@ -428,7 +432,7 @@ _i_it = _tmp5_; #line 104 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" while (TRUE) { -#line 432 "individual-retrieval.c" +#line 436 "individual-retrieval.c" GeeIterator* _tmp6_; gboolean _tmp7_ = FALSE; GeeIterator* _tmp8_; @@ -447,7 +451,7 @@ if (!_tmp7_) { #line 104 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" break; -#line 451 "individual-retrieval.c" +#line 455 "individual-retrieval.c" } #line 104 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp8_ = _i_it; @@ -471,11 +475,11 @@ gee_abstract_collection_remove ((GeeAbstractCollection*) _tmp11_, _tmp14_); #line 104 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (i); -#line 475 "individual-retrieval.c" +#line 479 "individual-retrieval.c" } #line 104 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (_i_it); -#line 479 "individual-retrieval.c" +#line 483 "individual-retrieval.c" } #line 110 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp15_ = removed; @@ -485,7 +489,7 @@ _tmp17_ = _tmp16_; #line 110 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_assert (_tmp17_ == 1); -#line 489 "individual-retrieval.c" +#line 493 "individual-retrieval.c" { GeeSet* _tmp18_; GeeIterator* _tmp19_ = NULL; @@ -498,7 +502,7 @@ _i_it = _tmp19_; #line 112 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" while (TRUE) { -#line 502 "individual-retrieval.c" +#line 506 "individual-retrieval.c" GeeIterator* _tmp20_; gboolean _tmp21_ = FALSE; GeeIterator* _tmp22_; @@ -513,7 +517,7 @@ if (!_tmp21_) { #line 112 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" break; -#line 517 "individual-retrieval.c" +#line 521 "individual-retrieval.c" } #line 112 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp22_ = _i_it; @@ -527,24 +531,24 @@ g_assert (_tmp24_ == NULL); #line 112 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (i); -#line 531 "individual-retrieval.c" +#line 535 "individual-retrieval.c" } #line 112 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (_i_it); -#line 535 "individual-retrieval.c" +#line 539 "individual-retrieval.c" } #line 99 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (removed); #line 99 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (added); -#line 541 "individual-retrieval.c" +#line 545 "individual-retrieval.c" } static void ___lambda2__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 99 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" __lambda2_ (self, changes); -#line 548 "individual-retrieval.c" +#line 552 "individual-retrieval.c" } @@ -562,7 +566,7 @@ result = FALSE; #line 124 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return result; -#line 566 "individual-retrieval.c" +#line 570 "individual-retrieval.c" } @@ -571,7 +575,7 @@ result = __lambda3_ (self); #line 121 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return result; -#line 575 "individual-retrieval.c" +#line 579 "individual-retrieval.c" } @@ -582,7 +586,7 @@ self = _data1_->self; #line 129 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_return_if_fail (r != NULL); -#line 586 "individual-retrieval.c" +#line 590 "individual-retrieval.c" { FolksIndividualAggregator* _tmp0_; GAsyncResult* _tmp1_; @@ -594,7 +598,7 @@ folks_individual_aggregator_prepare_finish (_tmp0_, _tmp1_, &_inner_error_); #line 133 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" if (_inner_error_ != NULL) { -#line 598 "individual-retrieval.c" +#line 602 "individual-retrieval.c" goto __catch0_g_error; } } @@ -615,7 +619,7 @@ g_assert_not_reached (); #line 131 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_error_free0 (e1); -#line 619 "individual-retrieval.c" +#line 623 "individual-retrieval.c" } __finally0: #line 131 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" @@ -626,7 +630,7 @@ g_clear_error (&_inner_error_); #line 131 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return; -#line 630 "individual-retrieval.c" +#line 634 "individual-retrieval.c" } } @@ -636,7 +640,7 @@ __lambda5_ (self, source_object, res); #line 129 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" block1_data_unref (self); -#line 640 "individual-retrieval.c" +#line 644 "individual-retrieval.c" } @@ -654,7 +658,7 @@ result = FALSE; #line 143 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return result; -#line 658 "individual-retrieval.c" +#line 662 "individual-retrieval.c" } @@ -663,7 +667,7 @@ result = __lambda4_ (self); #line 127 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return result; -#line 667 "individual-retrieval.c" +#line 671 "individual-retrieval.c" } @@ -694,7 +698,7 @@ _tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL); #line 93 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data1_->expected_individuals = _tmp1_; -#line 698 "individual-retrieval.c" +#line 702 "individual-retrieval.c" { GeeHashSet* _tmp2_; GeeIterator* _tmp3_ = NULL; @@ -707,7 +711,7 @@ _id_it = _tmp3_; #line 94 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" while (TRUE) { -#line 711 "individual-retrieval.c" +#line 715 "individual-retrieval.c" GeeIterator* _tmp4_; gboolean _tmp5_ = FALSE; GeeIterator* _tmp6_; @@ -723,7 +727,7 @@ if (!_tmp5_) { #line 94 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" break; -#line 727 "individual-retrieval.c" +#line 731 "individual-retrieval.c" } #line 94 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp6_ = _id_it; @@ -739,11 +743,11 @@ gee_abstract_collection_add ((GeeAbstractCollection*) _tmp8_, _tmp9_); #line 94 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_free0 (id); -#line 743 "individual-retrieval.c" +#line 747 "individual-retrieval.c" } #line 94 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (_id_it); -#line 747 "individual-retrieval.c" +#line 751 "individual-retrieval.c" } #line 98 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp10_ = folks_individual_aggregator_new (); @@ -766,7 +770,7 @@ #line 149 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp14_ = _data1_->expected_individuals; #line 149 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" - _tmp15_ = gee_collection_get_size ((GeeCollection*) _tmp14_); + _tmp15_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp14_); #line 149 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp16_ = _tmp15_; #line 149 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" @@ -779,7 +783,7 @@ block1_data_unref (_data1_); #line 88 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data1_ = NULL; -#line 783 "individual-retrieval.c" +#line 787 "individual-retrieval.c" } @@ -788,15 +792,17 @@ g_atomic_int_inc (&_data2_->_ref_count_); #line 155 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return _data2_; -#line 792 "individual-retrieval.c" +#line 796 "individual-retrieval.c" } static void block2_data_unref (Block2Data* _data2_) { #line 155 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { +#line 803 "individual-retrieval.c" + IndividualRetrievalTests * self; #line 155 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" - _g_object_unref0 (_data2_->self); + self = _data2_->self; #line 155 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (_data2_->aggregator); #line 155 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" @@ -804,8 +810,10 @@ #line 155 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_main_loop_unref0 (_data2_->main_loop); #line 155 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" + _g_object_unref0 (self); +#line 155 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_slice_free (Block2Data, _data2_); -#line 809 "individual-retrieval.c" +#line 817 "individual-retrieval.c" } } @@ -837,7 +845,7 @@ _tmp3_ = gee_multi_map_get_keys (_tmp2_); #line 170 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" removed = _tmp3_; -#line 841 "individual-retrieval.c" +#line 849 "individual-retrieval.c" { GeeCollection* _tmp4_; GeeIterator* _tmp5_ = NULL; @@ -850,7 +858,7 @@ _i_it = _tmp5_; #line 174 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" while (TRUE) { -#line 854 "individual-retrieval.c" +#line 862 "individual-retrieval.c" GeeIterator* _tmp6_; gboolean _tmp7_ = FALSE; GeeIterator* _tmp8_; @@ -865,7 +873,7 @@ if (!_tmp7_) { #line 174 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" break; -#line 869 "individual-retrieval.c" +#line 877 "individual-retrieval.c" } #line 174 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp8_ = _i_it; @@ -877,7 +885,7 @@ _tmp10_ = i; #line 176 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_assert (_tmp10_ != NULL); -#line 881 "individual-retrieval.c" +#line 889 "individual-retrieval.c" { FolksIndividual* _tmp11_; GeeSet* _tmp12_; @@ -896,7 +904,7 @@ _p_it = _tmp14_; #line 182 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" while (TRUE) { -#line 900 "individual-retrieval.c" +#line 908 "individual-retrieval.c" GeeIterator* _tmp15_; gboolean _tmp16_ = FALSE; GeeIterator* _tmp17_; @@ -911,7 +919,7 @@ if (!_tmp16_) { #line 182 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" break; -#line 915 "individual-retrieval.c" +#line 923 "individual-retrieval.c" } #line 182 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp17_ = _p_it; @@ -923,7 +931,7 @@ _tmp19_ = p; #line 184 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" if (TPF_IS_PERSONA (_tmp19_)) { -#line 927 "individual-retrieval.c" +#line 935 "individual-retrieval.c" FolksPersona* _tmp20_; const gchar* _tmp21_; const gchar* _tmp22_; @@ -942,24 +950,24 @@ _g_object_unref0 (p); #line 186 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" break; -#line 946 "individual-retrieval.c" +#line 954 "individual-retrieval.c" } } #line 182 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (p); -#line 951 "individual-retrieval.c" +#line 959 "individual-retrieval.c" } #line 182 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (_p_it); -#line 955 "individual-retrieval.c" +#line 963 "individual-retrieval.c" } #line 174 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (i); -#line 959 "individual-retrieval.c" +#line 967 "individual-retrieval.c" } #line 174 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (_i_it); -#line 963 "individual-retrieval.c" +#line 971 "individual-retrieval.c" } #line 190 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp24_ = removed; @@ -969,7 +977,7 @@ _tmp26_ = _tmp25_; #line 190 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_assert (_tmp26_ == 1); -#line 973 "individual-retrieval.c" +#line 981 "individual-retrieval.c" { GeeSet* _tmp27_; GeeIterator* _tmp28_ = NULL; @@ -982,7 +990,7 @@ _i_it = _tmp28_; #line 192 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" while (TRUE) { -#line 986 "individual-retrieval.c" +#line 994 "individual-retrieval.c" GeeIterator* _tmp29_; gboolean _tmp30_ = FALSE; GeeIterator* _tmp31_; @@ -997,7 +1005,7 @@ if (!_tmp30_) { #line 192 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" break; -#line 1001 "individual-retrieval.c" +#line 1009 "individual-retrieval.c" } #line 192 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp31_ = _i_it; @@ -1011,24 +1019,24 @@ g_assert (_tmp33_ == NULL); #line 192 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (i); -#line 1015 "individual-retrieval.c" +#line 1023 "individual-retrieval.c" } #line 192 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (_i_it); -#line 1019 "individual-retrieval.c" +#line 1027 "individual-retrieval.c" } #line 167 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (removed); #line 167 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (added); -#line 1025 "individual-retrieval.c" +#line 1033 "individual-retrieval.c" } static void ___lambda6__folks_individual_aggregator_individuals_changed_detailed (FolksIndividualAggregator* _sender, GeeMultiMap* changes, gpointer self) { #line 167 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" __lambda6_ (self, changes); -#line 1032 "individual-retrieval.c" +#line 1040 "individual-retrieval.c" } @@ -1043,7 +1051,7 @@ result = FALSE; #line 204 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return result; -#line 1047 "individual-retrieval.c" +#line 1055 "individual-retrieval.c" } @@ -1052,7 +1060,7 @@ result = __lambda7_ (self); #line 201 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return result; -#line 1056 "individual-retrieval.c" +#line 1064 "individual-retrieval.c" } @@ -1061,20 +1069,24 @@ g_atomic_int_inc (&_data3_->_ref_count_); #line 209 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return _data3_; -#line 1065 "individual-retrieval.c" +#line 1073 "individual-retrieval.c" } static void block3_data_unref (Block3Data* _data3_) { #line 209 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { +#line 1080 "individual-retrieval.c" + IndividualRetrievalTests * self; +#line 209 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" + self = _data3_->_data2_->self; #line 209 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" block2_data_unref (_data3_->_data2_); #line 209 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data3_->_data2_ = NULL; #line 209 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_slice_free (Block3Data, _data3_); -#line 1078 "individual-retrieval.c" +#line 1090 "individual-retrieval.c" } } @@ -1095,23 +1107,23 @@ _tmp1_ = store; #line 236 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" if (TPF_IS_PERSONA_STORE (_tmp1_)) { -#line 1099 "individual-retrieval.c" +#line 1111 "individual-retrieval.c" gboolean _tmp2_; #line 236 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp2_ = _data3_->adding_done; #line 236 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp0_ = !_tmp2_; -#line 1105 "individual-retrieval.c" +#line 1117 "individual-retrieval.c" } else { #line 236 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp0_ = FALSE; -#line 1109 "individual-retrieval.c" +#line 1121 "individual-retrieval.c" } #line 236 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp3_ = _tmp0_; #line 236 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" if (_tmp3_) { -#line 1115 "individual-retrieval.c" +#line 1127 "individual-retrieval.c" FolksPersonaStore* _tmp4_; #line 238 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp4_ = store; @@ -1119,7 +1131,7 @@ individual_retrieval_tests_add_personas (self, TPF_PERSONA_STORE (_tmp4_), _data2_->added_individuals, NULL, NULL); #line 240 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data3_->adding_done = TRUE; -#line 1123 "individual-retrieval.c" +#line 1135 "individual-retrieval.c" } } @@ -1127,7 +1139,7 @@ static void _____lambda10__folks_backend_persona_store_added (FolksBackend* _sender, FolksPersonaStore* store, gpointer self) { #line 234 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" ____lambda10_ (self, store); -#line 1131 "individual-retrieval.c" +#line 1143 "individual-retrieval.c" } @@ -1147,7 +1159,7 @@ _data3_->_ref_count_ = 1; #line 209 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data3_->_data2_ = block2_data_ref (_data2_); -#line 1151 "individual-retrieval.c" +#line 1163 "individual-retrieval.c" { FolksIndividualAggregator* _tmp0_; GAsyncResult* _tmp1_; @@ -1159,7 +1171,7 @@ folks_individual_aggregator_prepare_finish (_tmp0_, _tmp1_, &_inner_error_); #line 213 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" if (_inner_error_ != NULL) { -#line 1163 "individual-retrieval.c" +#line 1175 "individual-retrieval.c" goto __catch1_g_error; } } @@ -1180,7 +1192,7 @@ g_assert_not_reached (); #line 211 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_error_free0 (e1); -#line 1184 "individual-retrieval.c" +#line 1196 "individual-retrieval.c" } __finally1: #line 211 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" @@ -1195,7 +1207,7 @@ g_clear_error (&_inner_error_); #line 211 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return; -#line 1199 "individual-retrieval.c" +#line 1211 "individual-retrieval.c" } #line 227 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data3_->adding_done = FALSE; @@ -1203,7 +1215,7 @@ _tmp3_ = folks_backend_store_dup (); #line 230 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" backend_store = _tmp3_; -#line 1207 "individual-retrieval.c" +#line 1219 "individual-retrieval.c" { FolksBackendStore* _tmp4_; GeeMap* _tmp5_; @@ -1236,7 +1248,7 @@ _backend_it = _tmp11_; #line 231 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" while (TRUE) { -#line 1240 "individual-retrieval.c" +#line 1252 "individual-retrieval.c" GeeIterator* _tmp12_; gboolean _tmp13_ = FALSE; GeeIterator* _tmp14_; @@ -1251,7 +1263,7 @@ if (!_tmp13_) { #line 231 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" break; -#line 1255 "individual-retrieval.c" +#line 1267 "individual-retrieval.c" } #line 231 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp14_ = _backend_it; @@ -1263,7 +1275,7 @@ _tmp16_ = backend; #line 234 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_signal_connect_data (_tmp16_, "persona-store-added", (GCallback) _____lambda10__folks_backend_persona_store_added, block3_data_ref (_data3_), (GClosureNotify) block3_data_unref, 0); -#line 1267 "individual-retrieval.c" +#line 1279 "individual-retrieval.c" { FolksBackend* _tmp17_; GeeMap* _tmp18_; @@ -1296,7 +1308,7 @@ _store_it = _tmp24_; #line 244 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" while (TRUE) { -#line 1300 "individual-retrieval.c" +#line 1312 "individual-retrieval.c" GeeIterator* _tmp25_; gboolean _tmp26_ = FALSE; GeeIterator* _tmp27_; @@ -1313,7 +1325,7 @@ if (!_tmp26_) { #line 244 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" break; -#line 1317 "individual-retrieval.c" +#line 1329 "individual-retrieval.c" } #line 244 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp27_ = _store_it; @@ -1325,23 +1337,23 @@ _tmp30_ = store; #line 246 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" if (TPF_IS_PERSONA_STORE (_tmp30_)) { -#line 1329 "individual-retrieval.c" +#line 1341 "individual-retrieval.c" gboolean _tmp31_; #line 246 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp31_ = _data3_->adding_done; #line 246 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp29_ = !_tmp31_; -#line 1335 "individual-retrieval.c" +#line 1347 "individual-retrieval.c" } else { #line 246 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp29_ = FALSE; -#line 1339 "individual-retrieval.c" +#line 1351 "individual-retrieval.c" } #line 246 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp32_ = _tmp29_; #line 246 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" if (_tmp32_) { -#line 1345 "individual-retrieval.c" +#line 1357 "individual-retrieval.c" FolksPersonaStore* _tmp33_; #line 248 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp33_ = store; @@ -1349,23 +1361,23 @@ individual_retrieval_tests_add_personas (self, TPF_PERSONA_STORE (_tmp33_), _data2_->added_individuals, NULL, NULL); #line 250 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data3_->adding_done = TRUE; -#line 1353 "individual-retrieval.c" +#line 1365 "individual-retrieval.c" } #line 244 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (store); -#line 1357 "individual-retrieval.c" +#line 1369 "individual-retrieval.c" } #line 244 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (_store_it); -#line 1361 "individual-retrieval.c" +#line 1373 "individual-retrieval.c" } #line 231 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (backend); -#line 1365 "individual-retrieval.c" +#line 1377 "individual-retrieval.c" } #line 231 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (_backend_it); -#line 1369 "individual-retrieval.c" +#line 1381 "individual-retrieval.c" } #line 209 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (backend_store); @@ -1373,7 +1385,7 @@ block3_data_unref (_data3_); #line 209 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data3_ = NULL; -#line 1377 "individual-retrieval.c" +#line 1389 "individual-retrieval.c" } @@ -1382,7 +1394,7 @@ __lambda9_ (self, source_object, res); #line 209 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" block2_data_unref (self); -#line 1386 "individual-retrieval.c" +#line 1398 "individual-retrieval.c" } @@ -1400,7 +1412,7 @@ result = FALSE; #line 256 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return result; -#line 1404 "individual-retrieval.c" +#line 1416 "individual-retrieval.c" } @@ -1409,7 +1421,7 @@ result = __lambda8_ (self); #line 207 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return result; -#line 1413 "individual-retrieval.c" +#line 1425 "individual-retrieval.c" } @@ -1461,7 +1473,7 @@ #line 259 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_main_loop_run (_data2_->main_loop); #line 262 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" - _tmp5_ = gee_collection_get_size ((GeeCollection*) _data2_->added_individuals); + _tmp5_ = gee_abstract_collection_get_size ((GeeCollection*) _data2_->added_individuals); #line 262 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp6_ = _tmp5_; #line 262 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" @@ -1474,7 +1486,7 @@ block2_data_unref (_data2_); #line 155 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data2_ = NULL; -#line 1478 "individual-retrieval.c" +#line 1490 "individual-retrieval.c" } @@ -1489,14 +1501,14 @@ _g_object_unref0 (_data_->self); #line 27 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_slice_free (IndividualRetrievalTestsAddPersonasData, _data_); -#line 1493 "individual-retrieval.c" +#line 1505 "individual-retrieval.c" } static gpointer _g_object_ref0 (gpointer self) { #line 27 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return self ? g_object_ref (self) : NULL; -#line 1500 "individual-retrieval.c" +#line 1512 "individual-retrieval.c" } @@ -1531,7 +1543,7 @@ _data_->ids_add = _tmp4_; #line 27 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" individual_retrieval_tests_add_personas_co (_data_); -#line 1535 "individual-retrieval.c" +#line 1547 "individual-retrieval.c" } @@ -1539,7 +1551,7 @@ IndividualRetrievalTestsAddPersonasData* _data_; #line 27 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 1543 "individual-retrieval.c" +#line 1555 "individual-retrieval.c" } @@ -1548,20 +1560,24 @@ g_atomic_int_inc (&_data4_->_ref_count_); #line 268 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return _data4_; -#line 1552 "individual-retrieval.c" +#line 1564 "individual-retrieval.c" } static void block4_data_unref (Block4Data* _data4_) { #line 268 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) { +#line 1571 "individual-retrieval.c" + IndividualRetrievalTests * self; #line 268 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" - _g_object_unref0 (_data4_->self); + self = _data4_->self; #line 268 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (_data4_->store); #line 268 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" + _g_object_unref0 (self); +#line 268 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_slice_free (Block4Data, _data4_); -#line 1565 "individual-retrieval.c" +#line 1581 "individual-retrieval.c" } } @@ -1571,22 +1587,26 @@ g_atomic_int_inc (&_data5_->_ref_count_); #line 271 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return _data5_; -#line 1575 "individual-retrieval.c" +#line 1591 "individual-retrieval.c" } static void block5_data_unref (Block5Data* _data5_) { #line 271 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) { +#line 1598 "individual-retrieval.c" + IndividualRetrievalTests * self; +#line 271 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" + self = _data5_->_data4_->self; +#line 271 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" + _g_object_unref0 (_data5_->ids_remaining); #line 271 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" block4_data_unref (_data5_->_data4_); #line 271 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data5_->_data4_ = NULL; #line 271 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" - _g_object_unref0 (_data5_->ids_remaining); -#line 271 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_slice_free (Block5Data, _data5_); -#line 1590 "individual-retrieval.c" +#line 1610 "individual-retrieval.c" } } @@ -1601,7 +1621,7 @@ _data_->_res_ = _res_; #line 273 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" individual_retrieval_tests_add_personas_co (_data_); -#line 1605 "individual-retrieval.c" +#line 1625 "individual-retrieval.c" } @@ -1610,22 +1630,26 @@ g_atomic_int_inc (&_data6_->_ref_count_); #line 287 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return _data6_; -#line 1614 "individual-retrieval.c" +#line 1634 "individual-retrieval.c" } static void block6_data_unref (Block6Data* _data6_) { #line 287 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) { +#line 1641 "individual-retrieval.c" + IndividualRetrievalTests * self; +#line 287 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" + self = _data6_->_data5_->_data4_->self; +#line 287 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" + _g_hash_table_unref0 (_data6_->details); #line 287 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" block5_data_unref (_data6_->_data5_); #line 287 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data6_->_data5_ = NULL; #line 287 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" - _g_hash_table_unref0 (_data6_->details); -#line 287 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_slice_free (Block6Data, _data6_); -#line 1629 "individual-retrieval.c" +#line 1653 "individual-retrieval.c" } } @@ -1633,7 +1657,7 @@ static void _g_free0_ (gpointer var) { #line 289 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" var = (g_free (var), NULL); -#line 1637 "individual-retrieval.c" +#line 1661 "individual-retrieval.c" } @@ -1642,28 +1666,28 @@ g_value_unset (self); #line 289 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_free (self); -#line 1646 "individual-retrieval.c" +#line 1670 "individual-retrieval.c" } static void __vala_GValue_free0_ (gpointer var) { #line 289 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" (var == NULL) ? NULL : (var = (_vala_GValue_free (var), NULL)); -#line 1653 "individual-retrieval.c" +#line 1677 "individual-retrieval.c" } static GValue* _g_value_dup (GValue* self) { #line 303 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return g_boxed_copy (G_TYPE_VALUE, self); -#line 1660 "individual-retrieval.c" +#line 1684 "individual-retrieval.c" } static gpointer __g_value_dup0 (gpointer self) { #line 303 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return self ? _g_value_dup (self) : NULL; -#line 1667 "individual-retrieval.c" +#line 1691 "individual-retrieval.c" } @@ -1680,7 +1704,7 @@ self = _data4_->self; #line 297 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_return_if_fail (res != NULL); -#line 1684 "individual-retrieval.c" +#line 1708 "individual-retrieval.c" { TpfPersonaStore* _tmp0_; GAsyncResult* _tmp1_; @@ -1707,7 +1731,7 @@ _g_object_unref0 (_tmp3_); #line 301 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" if (_inner_error_ != NULL) { -#line 1711 "individual-retrieval.c" +#line 1735 "individual-retrieval.c" goto __catch3_g_error; } #line 303 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" @@ -1730,7 +1754,7 @@ _tmp10_ = id_added; #line 305 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" if (_tmp10_ != NULL) { -#line 1734 "individual-retrieval.c" +#line 1758 "individual-retrieval.c" GeeHashSet* _tmp11_; const gchar* _tmp12_; #line 306 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" @@ -1739,13 +1763,13 @@ _tmp12_ = id_added; #line 306 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" gee_abstract_collection_remove ((GeeAbstractCollection*) _tmp11_, _tmp12_); -#line 1743 "individual-retrieval.c" +#line 1767 "individual-retrieval.c" } #line 299 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_free0 (id_added); #line 299 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" __vala_GValue_free0 (id_added_value); -#line 1749 "individual-retrieval.c" +#line 1773 "individual-retrieval.c" } goto __finally3; __catch3_g_error: @@ -1760,7 +1784,7 @@ _tmp13_ = e1; #line 311 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" if (!g_error_matches (_tmp13_, FOLKS_PERSONA_STORE_ERROR, FOLKS_PERSONA_STORE_ERROR_STORE_OFFLINE)) { -#line 1764 "individual-retrieval.c" +#line 1788 "individual-retrieval.c" GError* _tmp14_; const gchar* _tmp15_; #line 313 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" @@ -1771,11 +1795,11 @@ g_critical ("individual-retrieval.vala:313: failed to add persona: %s", _tmp15_); #line 315 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_assert_not_reached (); -#line 1775 "individual-retrieval.c" +#line 1799 "individual-retrieval.c" } #line 299 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_error_free0 (e1); -#line 1779 "individual-retrieval.c" +#line 1803 "individual-retrieval.c" } __finally3: #line 299 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" @@ -1786,7 +1810,7 @@ g_clear_error (&_inner_error_); #line 299 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return; -#line 1790 "individual-retrieval.c" +#line 1814 "individual-retrieval.c" } } @@ -1796,7 +1820,7 @@ ____lambda12_ (self, source_object, res); #line 297 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" block6_data_unref (self); -#line 1800 "individual-retrieval.c" +#line 1824 "individual-retrieval.c" } @@ -1811,7 +1835,7 @@ self = _data4_->self; #line 285 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" try_again = FALSE; -#line 1815 "individual-retrieval.c" +#line 1839 "individual-retrieval.c" { GeeHashSet* _tmp0_; GeeIterator* _tmp1_ = NULL; @@ -1824,7 +1848,7 @@ _id_it = _tmp1_; #line 287 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" while (TRUE) { -#line 1828 "individual-retrieval.c" +#line 1852 "individual-retrieval.c" Block6Data* _data6_; GeeIterator* _tmp2_; gboolean _tmp3_ = FALSE; @@ -1862,7 +1886,7 @@ _data6_ = NULL; #line 287 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" break; -#line 1866 "individual-retrieval.c" +#line 1890 "individual-retrieval.c" } #line 287 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp4_ = _id_it; @@ -1901,7 +1925,7 @@ #line 320 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp15_ = _data5_->ids_remaining; #line 320 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" - _tmp16_ = gee_collection_get_size ((GeeCollection*) _tmp15_); + _tmp16_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp15_); #line 320 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _tmp17_ = _tmp16_; #line 320 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" @@ -1918,7 +1942,7 @@ _data6_ = NULL; #line 322 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" break; -#line 1922 "individual-retrieval.c" +#line 1946 "individual-retrieval.c" } #line 287 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_free0 (id); @@ -1926,17 +1950,17 @@ block6_data_unref (_data6_); #line 287 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data6_ = NULL; -#line 1930 "individual-retrieval.c" +#line 1954 "individual-retrieval.c" } #line 287 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (_id_it); -#line 1934 "individual-retrieval.c" +#line 1958 "individual-retrieval.c" } #line 325 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" result = try_again; #line 325 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return result; -#line 1940 "individual-retrieval.c" +#line 1964 "individual-retrieval.c" } @@ -1945,7 +1969,7 @@ result = ___lambda11_ (self); #line 283 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return result; -#line 1949 "individual-retrieval.c" +#line 1973 "individual-retrieval.c" } @@ -1954,16 +1978,16 @@ switch (_data_->_state_) { #line 268 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" case 0: -#line 1958 "individual-retrieval.c" +#line 1982 "individual-retrieval.c" goto _state_0; #line 268 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" case 1: -#line 1962 "individual-retrieval.c" +#line 1986 "individual-retrieval.c" goto _state_1; default: #line 268 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_assert_not_reached (); -#line 1967 "individual-retrieval.c" +#line 1991 "individual-retrieval.c" } _state_0: #line 268 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" @@ -1980,7 +2004,7 @@ _data_->_data4_->store = _data_->_tmp1_; #line 268 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data_->_data4_->_async_data_ = _data_; -#line 1984 "individual-retrieval.c" +#line 2008 "individual-retrieval.c" { #line 271 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data_->_data5_ = g_slice_new0 (Block5Data); @@ -1996,7 +2020,7 @@ folks_persona_store_prepare ((FolksPersonaStore*) _data_->_tmp2_, individual_retrieval_tests_add_personas_ready, _data_); #line 273 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return FALSE; -#line 2000 "individual-retrieval.c" +#line 2024 "individual-retrieval.c" _state_1: #line 273 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" folks_persona_store_prepare_finish ((FolksPersonaStore*) _data_->_tmp2_, _data_->_res_, &_data_->_inner_error_); @@ -2006,7 +2030,7 @@ block5_data_unref (_data_->_data5_); #line 273 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data_->_data5_ = NULL; -#line 2010 "individual-retrieval.c" +#line 2034 "individual-retrieval.c" goto __catch2_g_error; } #line 279 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" @@ -2017,7 +2041,7 @@ _data_->_tmp5_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, _data_->_tmp3_, _data_->_tmp4_); #line 279 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data_->_data5_->ids_remaining = _data_->_tmp5_; -#line 2021 "individual-retrieval.c" +#line 2045 "individual-retrieval.c" { #line 280 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data_->_tmp6_ = _data_->ids_add; @@ -2039,7 +2063,7 @@ if (!_data_->_tmp9_) { #line 280 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" break; -#line 2043 "individual-retrieval.c" +#line 2067 "individual-retrieval.c" } #line 280 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data_->_tmp10_ = _data_->_contact_id_it; @@ -2057,11 +2081,11 @@ gee_abstract_collection_add ((GeeAbstractCollection*) _data_->_tmp12_, _data_->_tmp13_); #line 280 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_free0 (_data_->contact_id); -#line 2061 "individual-retrieval.c" +#line 2085 "individual-retrieval.c" } #line 280 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_object_unref0 (_data_->_contact_id_it); -#line 2065 "individual-retrieval.c" +#line 2089 "individual-retrieval.c" } #line 283 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda11__gsource_func, block5_data_ref (_data_->_data5_), block5_data_unref); @@ -2069,7 +2093,7 @@ block5_data_unref (_data_->_data5_); #line 271 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _data_->_data5_ = NULL; -#line 2073 "individual-retrieval.c" +#line 2097 "individual-retrieval.c" } goto __finally2; __catch2_g_error: @@ -2092,7 +2116,7 @@ g_assert_not_reached (); #line 271 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" _g_error_free0 (_data_->e2); -#line 2096 "individual-retrieval.c" +#line 2120 "individual-retrieval.c" } __finally2: #line 271 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" @@ -2107,7 +2131,7 @@ g_clear_error (&_data_->_inner_error_); #line 271 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return FALSE; -#line 2111 "individual-retrieval.c" +#line 2135 "individual-retrieval.c" } #line 268 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" block4_data_unref (_data_->_data4_); @@ -2117,17 +2141,17 @@ if (_data_->_state_ == 0) { #line 268 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 2121 "individual-retrieval.c" +#line 2145 "individual-retrieval.c" } else { #line 268 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_simple_async_result_complete (_data_->_async_result); -#line 2125 "individual-retrieval.c" +#line 2149 "individual-retrieval.c" } #line 268 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" g_object_unref (_data_->_async_result); #line 268 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return FALSE; -#line 2131 "individual-retrieval.c" +#line 2155 "individual-retrieval.c" } @@ -2142,7 +2166,7 @@ FOLKS_TEST_CASE_CLASS (klass)->tear_down = individual_retrieval_tests_real_tear_down; #line 27 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" G_OBJECT_CLASS (klass)->finalize = individual_retrieval_tests_finalize; -#line 2146 "individual-retrieval.c" +#line 2170 "individual-retrieval.c" } @@ -2151,7 +2175,7 @@ self->priv = INDIVIDUAL_RETRIEVAL_TESTS_GET_PRIVATE (self); #line 32 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" self->priv->_test_timeout = 3; -#line 2155 "individual-retrieval.c" +#line 2179 "individual-retrieval.c" } @@ -2165,7 +2189,7 @@ _g_object_unref0 (self->priv->default_individuals); #line 27 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" G_OBJECT_CLASS (individual_retrieval_tests_parent_class)->finalize (obj); -#line 2169 "individual-retrieval.c" +#line 2193 "individual-retrieval.c" } @@ -2210,7 +2234,7 @@ result = 0; #line 346 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return result; -#line 2214 "individual-retrieval.c" +#line 2238 "individual-retrieval.c" } @@ -2219,7 +2243,7 @@ g_type_init (); #line 337 "/home/treitter/collabora/folks/tests/telepathy/individual-retrieval.vala" return _vala_main (argv, argc); -#line 2223 "individual-retrieval.c" +#line 2247 "individual-retrieval.c" } diff -Nru folks-0.6.6/tests/telepathy/init.c folks-0.6.7/tests/telepathy/init.c --- folks-0.6.6/tests/telepathy/init.c 1970-01-01 00:00:00.000000000 +0000 +++ folks-0.6.7/tests/telepathy/init.c 2012-02-23 00:02:26.000000000 +0000 @@ -0,0 +1,461 @@ +/* init.c generated by valac 0.15.1, the Vala compiler + * generated from init.vala, do not modify */ + +/* + * Copyright (C) 2012 Philip Withnall + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + * + * Authors: Philip Withnall + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +#define TYPE_INIT_TESTS (init_tests_get_type ()) +#define INIT_TESTS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_INIT_TESTS, InitTests)) +#define INIT_TESTS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_INIT_TESTS, InitTestsClass)) +#define IS_INIT_TESTS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_INIT_TESTS)) +#define IS_INIT_TESTS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_INIT_TESTS)) +#define INIT_TESTS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_INIT_TESTS, InitTestsClass)) + +typedef struct _InitTests InitTests; +typedef struct _InitTestsClass InitTestsClass; +typedef struct _InitTestsPrivate InitTestsPrivate; +#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) +typedef struct _Block1Data Block1Data; +#define _g_main_loop_unref0(var) ((var == NULL) ? NULL : (var = (g_main_loop_unref (var), NULL))) +#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) + +struct _InitTests { + FolksTestCase parent_instance; + InitTestsPrivate * priv; +}; + +struct _InitTestsClass { + FolksTestCaseClass parent_class; +}; + +struct _InitTestsPrivate { + TpTestBackend* _tp_backend; + gint _test_timeout; +}; + +struct _Block1Data { + int _ref_count_; + InitTests * self; + GMainLoop* main_loop; + FolksIndividualAggregator* aggregator; +}; + + +static gpointer init_tests_parent_class = NULL; + +GType init_tests_get_type (void) G_GNUC_CONST; +#define INIT_TESTS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_INIT_TESTS, InitTestsPrivate)) +enum { + INIT_TESTS_DUMMY_PROPERTY +}; +InitTests* init_tests_new (void); +InitTests* init_tests_construct (GType object_type); +void init_tests_test_quiescence (InitTests* self); +static void _init_tests_test_quiescence_folks_test_case_test_method (gpointer self); +static void init_tests_real_set_up (FolksTestCase* base); +static void init_tests_real_tear_down (FolksTestCase* base); +static Block1Data* block1_data_ref (Block1Data* _data1_); +static void block1_data_unref (Block1Data* _data1_); +static gboolean __lambda2_ (Block1Data* _data1_); +static void __lambda3_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res); +static void ___lambda3__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); +static gboolean ___lambda2__gsource_func (gpointer self); +static gboolean __lambda4_ (Block1Data* _data1_); +static gboolean ___lambda4__gsource_func (gpointer self); +static void init_tests_finalize (GObject* obj); +gint _vala_main (gchar** args, int args_length1); + + +static void _init_tests_test_quiescence_folks_test_case_test_method (gpointer self) { +#line 35 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + init_tests_test_quiescence (self); +#line 100 "init.c" +} + + +InitTests* init_tests_construct (GType object_type) { + InitTests * self = NULL; + TpTestBackend* _tmp0_; +#line 30 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + self = (InitTests*) folks_test_case_construct (object_type, "Init"); +#line 32 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp0_ = tp_test_backend_new (); +#line 32 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _g_object_unref0 (self->priv->_tp_backend); +#line 32 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + self->priv->_tp_backend = _tmp0_; +#line 35 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + folks_test_case_add_test ((FolksTestCase*) self, "quiescence", _init_tests_test_quiescence_folks_test_case_test_method, self); +#line 28 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + return self; +#line 119 "init.c" +} + + +InitTests* init_tests_new (void) { +#line 28 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + return init_tests_construct (TYPE_INIT_TESTS); +#line 126 "init.c" +} + + +static void init_tests_real_set_up (FolksTestCase* base) { + InitTests * self; + TpTestBackend* _tmp0_; +#line 38 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + self = (InitTests*) base; +#line 40 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp0_ = self->priv->_tp_backend; +#line 40 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + tp_test_backend_set_up (_tmp0_); +#line 139 "init.c" +} + + +static void init_tests_real_tear_down (FolksTestCase* base) { + InitTests * self; + TpTestBackend* _tmp0_; +#line 43 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + self = (InitTests*) base; +#line 45 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp0_ = self->priv->_tp_backend; +#line 45 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + tp_test_backend_tear_down (_tmp0_); +#line 152 "init.c" +} + + +static Block1Data* block1_data_ref (Block1Data* _data1_) { +#line 50 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_atomic_int_inc (&_data1_->_ref_count_); +#line 50 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + return _data1_; +#line 161 "init.c" +} + + +static void block1_data_unref (Block1Data* _data1_) { +#line 50 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { +#line 168 "init.c" + InitTests * self; +#line 50 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + self = _data1_->self; +#line 50 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _g_object_unref0 (_data1_->aggregator); +#line 50 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _g_main_loop_unref0 (_data1_->main_loop); +#line 50 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _g_object_unref0 (self); +#line 50 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_slice_free (Block1Data, _data1_); +#line 180 "init.c" + } +} + + +static void __lambda3_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) { + InitTests * self; + GError * _inner_error_ = NULL; +#line 63 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + self = _data1_->self; +#line 63 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_return_if_fail (res != NULL); +#line 192 "init.c" + { + GAsyncResult* _tmp0_; +#line 67 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp0_ = res; +#line 67 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + folks_test_utils_aggregator_prepare_and_wait_for_quiescence_finish (_tmp0_, &_inner_error_); +#line 67 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + if (_inner_error_ != NULL) { +#line 201 "init.c" + goto __catch0_g_error; + } + } + goto __finally0; + __catch0_g_error: + { + GError* e1 = NULL; + GError* _tmp1_; + const gchar* _tmp2_; +#line 65 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + e1 = _inner_error_; +#line 65 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _inner_error_ = NULL; +#line 72 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp1_ = e1; +#line 72 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp2_ = _tmp1_->message; +#line 72 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_critical ("init.vala:72: Error preparing aggregator: %s", _tmp2_); +#line 65 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _g_error_free0 (e1); +#line 223 "init.c" + } + __finally0: +#line 65 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + if (_inner_error_ != NULL) { +#line 65 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); +#line 65 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_clear_error (&_inner_error_); +#line 65 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + return; +#line 234 "init.c" + } +#line 75 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_main_loop_quit (_data1_->main_loop); +#line 238 "init.c" +} + + +static void ___lambda3__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { +#line 62 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + __lambda3_ (self, source_object, res); +#line 62 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + block1_data_unref (self); +#line 247 "init.c" +} + + +static gboolean __lambda2_ (Block1Data* _data1_) { + InitTests * self; + gboolean result = FALSE; +#line 60 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + self = _data1_->self; +#line 62 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + folks_test_utils_aggregator_prepare_and_wait_for_quiescence (_data1_->aggregator, ___lambda3__gasync_ready_callback, block1_data_ref (_data1_)); +#line 78 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + result = FALSE; +#line 78 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + return result; +#line 262 "init.c" +} + + +static gboolean ___lambda2__gsource_func (gpointer self) { + gboolean result; + result = __lambda2_ (self); +#line 60 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + return result; +#line 271 "init.c" +} + + +static gboolean __lambda4_ (Block1Data* _data1_) { + InitTests * self; + gboolean result = FALSE; +#line 82 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + self = _data1_->self; +#line 84 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_main_loop_quit (_data1_->main_loop); +#line 85 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + result = FALSE; +#line 85 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + return result; +#line 286 "init.c" +} + + +static gboolean ___lambda4__gsource_func (gpointer self) { + gboolean result; + result = __lambda4_ (self); +#line 82 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + return result; +#line 295 "init.c" +} + + +void init_tests_test_quiescence (InitTests* self) { + Block1Data* _data1_; + GMainLoop* _tmp0_; + TpTestBackend* _tmp1_; + void* _tmp2_ = NULL; + void* account_handle; + FolksIndividualAggregator* _tmp3_; + gint _tmp4_; + gboolean _tmp5_; + gboolean _tmp6_; + GeeMap* _tmp7_; + GeeMap* _tmp8_; + gint _tmp9_; + gint _tmp10_; + TpTestBackend* _tmp11_; +#line 50 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_return_if_fail (self != NULL); +#line 50 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _data1_ = g_slice_new0 (Block1Data); +#line 50 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _data1_->_ref_count_ = 1; +#line 50 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _data1_->self = g_object_ref (self); +#line 52 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp0_ = g_main_loop_new (NULL, FALSE); +#line 52 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _data1_->main_loop = _tmp0_; +#line 54 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp1_ = self->priv->_tp_backend; +#line 54 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp2_ = tp_test_backend_add_account (_tmp1_, "protocol", "me@example.com", "cm", "account"); +#line 54 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + account_handle = _tmp2_; +#line 58 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp3_ = folks_individual_aggregator_new (); +#line 58 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _data1_->aggregator = _tmp3_; +#line 60 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda2__gsource_func, block1_data_ref (_data1_), block1_data_unref); +#line 82 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp4_ = self->priv->_test_timeout; +#line 82 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, (guint) _tmp4_, ___lambda4__gsource_func, block1_data_ref (_data1_), block1_data_unref); +#line 88 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_main_loop_run (_data1_->main_loop); +#line 91 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp5_ = folks_individual_aggregator_get_is_quiescent (_data1_->aggregator); +#line 91 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp6_ = _tmp5_; +#line 91 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_assert (_tmp6_ == TRUE); +#line 92 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp7_ = folks_individual_aggregator_get_individuals (_data1_->aggregator); +#line 92 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp8_ = _tmp7_; +#line 92 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp9_ = gee_map_get_size (_tmp8_); +#line 92 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp10_ = _tmp9_; +#line 92 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_assert (_tmp10_ > 0); +#line 95 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp11_ = self->priv->_tp_backend; +#line 95 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + tp_test_backend_remove_account (_tmp11_, account_handle); +#line 50 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + block1_data_unref (_data1_); +#line 50 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _data1_ = NULL; +#line 368 "init.c" +} + + +static void init_tests_class_init (InitTestsClass * klass) { +#line 23 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + init_tests_parent_class = g_type_class_peek_parent (klass); +#line 23 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_type_class_add_private (klass, sizeof (InitTestsPrivate)); +#line 23 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + FOLKS_TEST_CASE_CLASS (klass)->set_up = init_tests_real_set_up; +#line 23 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + FOLKS_TEST_CASE_CLASS (klass)->tear_down = init_tests_real_tear_down; +#line 23 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + G_OBJECT_CLASS (klass)->finalize = init_tests_finalize; +#line 383 "init.c" +} + + +static void init_tests_instance_init (InitTests * self) { +#line 23 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + self->priv = INIT_TESTS_GET_PRIVATE (self); +#line 26 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + self->priv->_test_timeout = 5; +#line 392 "init.c" +} + + +static void init_tests_finalize (GObject* obj) { + InitTests * self; +#line 23 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + self = INIT_TESTS (obj); +#line 25 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _g_object_unref0 (self->priv->_tp_backend); +#line 23 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + G_OBJECT_CLASS (init_tests_parent_class)->finalize (obj); +#line 404 "init.c" +} + + +GType init_tests_get_type (void) { + static volatile gsize init_tests_type_id__volatile = 0; + if (g_once_init_enter (&init_tests_type_id__volatile)) { + static const GTypeInfo g_define_type_info = { sizeof (InitTestsClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) init_tests_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (InitTests), 0, (GInstanceInitFunc) init_tests_instance_init, NULL }; + GType init_tests_type_id; + init_tests_type_id = g_type_register_static (FOLKS_TYPE_TEST_CASE, "InitTests", &g_define_type_info, 0); + g_once_init_leave (&init_tests_type_id__volatile, init_tests_type_id); + } + return init_tests_type_id__volatile; +} + + +gint _vala_main (gchar** args, int args_length1) { + gint result = 0; + GTestSuite* _tmp0_ = NULL; + GTestSuite* root; + InitTests* _tmp1_; + InitTests* _tmp2_; + GTestSuite* _tmp3_ = NULL; +#line 101 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_test_init (&args_length1, &args, NULL); +#line 103 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp0_ = g_test_get_root (); +#line 103 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + root = _tmp0_; +#line 104 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp1_ = init_tests_new (); +#line 104 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp2_ = _tmp1_; +#line 104 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _tmp3_ = folks_test_case_get_suite ((FolksTestCase*) _tmp2_); +#line 104 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_test_suite_add_suite (root, _tmp3_); +#line 104 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + _g_object_unref0 (_tmp2_); +#line 106 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_test_run (); +#line 108 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + result = 0; +#line 108 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + return result; +#line 449 "init.c" +} + + +int main (int argc, char ** argv) { +#line 99 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + g_type_init (); +#line 99 "/home/treitter/collabora/folks/tests/telepathy/init.vala" + return _vala_main (argv, argc); +#line 458 "init.c" +} + + + diff -Nru folks-0.6.6/tests/telepathy/init.vala folks-0.6.7/tests/telepathy/init.vala --- folks-0.6.6/tests/telepathy/init.vala 1970-01-01 00:00:00.000000000 +0000 +++ folks-0.6.7/tests/telepathy/init.vala 2012-01-12 17:25:24.000000000 +0000 @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2012 Philip Withnall + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 2.1 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + * + * Authors: Philip Withnall + */ + +using Gee; +using Folks; + +public class InitTests : Folks.TestCase +{ + private TpTest.Backend _tp_backend; + private int _test_timeout = 5; + + public InitTests () + { + base ("Init"); + + this._tp_backend = new TpTest.Backend (); + + /* Set up the tests */ + this.add_test ("quiescence", this.test_quiescence); + } + + public override void set_up () + { + this._tp_backend.set_up (); + } + + public override void tear_down () + { + this._tp_backend.tear_down (); + } + + /* Prepare an aggregator and wait for quiescence, then quit. Error if reaching + * quiescence takes too long. */ + public void test_quiescence () + { + var main_loop = new GLib.MainLoop (null, false); + + void* account_handle = this._tp_backend.add_account ("protocol", + "me@example.com", "cm", "account"); + + /* Main test code. */ + var aggregator = new IndividualAggregator (); + + Idle.add (() => + { + TestUtils.aggregator_prepare_and_wait_for_quiescence.begin ( + aggregator, (obj, res) => + { + try + { + TestUtils.aggregator_prepare_and_wait_for_quiescence.end ( + res); + } + catch (GLib.Error e1) + { + GLib.critical ("Error preparing aggregator: %s", e1.message); + } + + main_loop.quit (); + }); + + return false; + }); + + /* Add a timeout for failure. */ + Timeout.add_seconds (this._test_timeout, () => + { + main_loop.quit (); + return false; + }); + + main_loop.run (); + + /* Check results. */ + assert (aggregator.is_quiescent == true); + assert (aggregator.individuals.size > 0); + + /* Clean up for the next test */ + this._tp_backend.remove_account (account_handle); + } +} + +public int main (string[] args) +{ + Test.init (ref args); + + TestSuite root = TestSuite.get_root (); + root.add_suite (new InitTests ().get_suite ()); + + Test.run (); + + return 0; +} diff -Nru folks-0.6.6/tests/telepathy/Makefile.am folks-0.6.7/tests/telepathy/Makefile.am --- folks-0.6.6/tests/telepathy/Makefile.am 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/tests/telepathy/Makefile.am 2012-01-12 17:25:24.000000000 +0000 @@ -44,11 +44,12 @@ -g \ $(NULL) -# in order from least to most complex noinst_PROGRAMS = \ + fake-tp-backend \ persona-store-capabilities \ individual-retrieval \ individual-properties \ + init \ $(NULL) SESSION_CONF = $(top_builddir)/tests/lib/telepathy/contactlist/session.conf @@ -61,7 +62,11 @@ $(RUN_WITH_PRIVATE_BUS) \ --config-file=$(SESSION_CONF) \ -- -TESTS = $(noinst_PROGRAMS) +TESTS = $(filter-out fake-tp-backend,$(noinst_PROGRAMS)) + +fake_tp_backend_SOURCES = \ + fake-tp-backend.vala \ + $(NULL) individual_retrieval_SOURCES = \ individual-retrieval.vala \ @@ -71,13 +76,19 @@ individual-properties.vala \ $(NULL) +init_SOURCES = \ + init.vala \ + $(NULL) + persona_store_capabilities_SOURCES = \ persona-store-capabilities.vala \ $(NULL) BUILT_SOURCES = \ + fake_tp_backend_vala.stamp \ individual_properties_vala.stamp \ individual_retrieval_vala.stamp \ + init_vala.stamp \ persona_store_capabilities_vala.stamp \ $(NULL) diff -Nru folks-0.6.6/tests/telepathy/Makefile.in folks-0.6.7/tests/telepathy/Makefile.in --- folks-0.6.6/tests/telepathy/Makefile.in 2011-12-13 23:38:44.000000000 +0000 +++ folks-0.6.7/tests/telepathy/Makefile.in 2012-02-23 00:04:13.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -34,20 +34,25 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -noinst_PROGRAMS = persona-store-capabilities$(EXEEXT) \ - individual-retrieval$(EXEEXT) individual-properties$(EXEEXT) +noinst_PROGRAMS = fake-tp-backend$(EXEEXT) \ + persona-store-capabilities$(EXEEXT) \ + individual-retrieval$(EXEEXT) individual-properties$(EXEEXT) \ + init$(EXEEXT) subdir = tests/telepathy DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + fake-tp-backend.c fake_tp_backend_vala.stamp \ individual-properties.c individual-retrieval.c \ individual_properties_vala.stamp \ - individual_retrieval_vala.stamp persona-store-capabilities.c \ + individual_retrieval_vala.stamp init.c init_vala.stamp \ + persona-store-capabilities.c \ persona_store_capabilities_vala.stamp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -55,11 +60,11 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) -am_individual_properties_OBJECTS = individual-properties.$(OBJEXT) -individual_properties_OBJECTS = $(am_individual_properties_OBJECTS) -individual_properties_LDADD = $(LDADD) +am_fake_tp_backend_OBJECTS = fake-tp-backend.$(OBJEXT) +fake_tp_backend_OBJECTS = $(am_fake_tp_backend_OBJECTS) +fake_tp_backend_LDADD = $(LDADD) am__DEPENDENCIES_1 = -individual_properties_DEPENDENCIES = \ +fake_tp_backend_DEPENDENCIES = \ $(top_builddir)/tests/lib/libfolks-test.la \ $(top_builddir)/tests/lib/telepathy/contactlist/libtp-test-contactlist.la \ $(top_builddir)/backends/telepathy/lib/libfolks-telepathy.la \ @@ -69,6 +74,16 @@ AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent +am_individual_properties_OBJECTS = individual-properties.$(OBJEXT) +individual_properties_OBJECTS = $(am_individual_properties_OBJECTS) +individual_properties_LDADD = $(LDADD) +individual_properties_DEPENDENCIES = \ + $(top_builddir)/tests/lib/libfolks-test.la \ + $(top_builddir)/tests/lib/telepathy/contactlist/libtp-test-contactlist.la \ + $(top_builddir)/backends/telepathy/lib/libfolks-telepathy.la \ + $(top_builddir)/folks/libfolks.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_individual_retrieval_OBJECTS = individual-retrieval.$(OBJEXT) individual_retrieval_OBJECTS = $(am_individual_retrieval_OBJECTS) individual_retrieval_LDADD = $(LDADD) @@ -79,6 +94,15 @@ $(top_builddir)/folks/libfolks.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) +am_init_OBJECTS = init.$(OBJEXT) +init_OBJECTS = $(am_init_OBJECTS) +init_LDADD = $(LDADD) +init_DEPENDENCIES = $(top_builddir)/tests/lib/libfolks-test.la \ + $(top_builddir)/tests/lib/telepathy/contactlist/libtp-test-contactlist.la \ + $(top_builddir)/backends/telepathy/lib/libfolks-telepathy.la \ + $(top_builddir)/folks/libfolks.la $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am_persona_store_capabilities_OBJECTS = \ persona-store-capabilities.$(OBJEXT) persona_store_capabilities_OBJECTS = \ @@ -124,11 +148,12 @@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(individual_properties_SOURCES) \ - $(individual_retrieval_SOURCES) \ +SOURCES = $(fake_tp_backend_SOURCES) $(individual_properties_SOURCES) \ + $(individual_retrieval_SOURCES) $(init_SOURCES) \ $(persona_store_capabilities_SOURCES) -DIST_SOURCES = $(individual_properties_SOURCES) \ - $(individual_retrieval_SOURCES) \ +DIST_SOURCES = $(fake_tp_backend_SOURCES) \ + $(individual_properties_SOURCES) \ + $(individual_retrieval_SOURCES) $(init_SOURCES) \ $(persona_store_capabilities_SOURCES) ETAGS = etags CTAGS = ctags @@ -155,6 +180,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -378,7 +405,11 @@ --config-file=$(SESSION_CONF) \ -- -TESTS = $(noinst_PROGRAMS) +TESTS = $(filter-out fake-tp-backend,$(noinst_PROGRAMS)) +fake_tp_backend_SOURCES = \ + fake-tp-backend.vala \ + $(NULL) + individual_retrieval_SOURCES = \ individual-retrieval.vala \ $(NULL) @@ -387,13 +418,19 @@ individual-properties.vala \ $(NULL) +init_SOURCES = \ + init.vala \ + $(NULL) + persona_store_capabilities_SOURCES = \ persona-store-capabilities.vala \ $(NULL) BUILT_SOURCES = \ + fake_tp_backend_vala.stamp \ individual_properties_vala.stamp \ individual_retrieval_vala.stamp \ + init_vala.stamp \ persona_store_capabilities_vala.stamp \ $(NULL) @@ -458,12 +495,18 @@ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list +fake-tp-backend$(EXEEXT): $(fake_tp_backend_OBJECTS) $(fake_tp_backend_DEPENDENCIES) + @rm -f fake-tp-backend$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(fake_tp_backend_OBJECTS) $(fake_tp_backend_LDADD) $(LIBS) individual-properties$(EXEEXT): $(individual_properties_OBJECTS) $(individual_properties_DEPENDENCIES) @rm -f individual-properties$(EXEEXT) $(AM_V_CCLD)$(LINK) $(individual_properties_OBJECTS) $(individual_properties_LDADD) $(LIBS) individual-retrieval$(EXEEXT): $(individual_retrieval_OBJECTS) $(individual_retrieval_DEPENDENCIES) @rm -f individual-retrieval$(EXEEXT) $(AM_V_CCLD)$(LINK) $(individual_retrieval_OBJECTS) $(individual_retrieval_LDADD) $(LIBS) +init$(EXEEXT): $(init_OBJECTS) $(init_DEPENDENCIES) + @rm -f init$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(init_OBJECTS) $(init_LDADD) $(LIBS) persona-store-capabilities$(EXEEXT): $(persona_store_capabilities_OBJECTS) $(persona_store_capabilities_DEPENDENCIES) @rm -f persona-store-capabilities$(EXEEXT) $(AM_V_CCLD)$(LINK) $(persona_store_capabilities_OBJECTS) $(persona_store_capabilities_LDADD) $(LIBS) @@ -474,57 +517,72 @@ distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fake-tp-backend.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/individual-properties.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/individual-retrieval.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/init.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/persona-store-capabilities.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +$(srcdir)/init.c: $(srcdir)/init_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/init_vala.stamp; fi + @if test -f $@; then :; else \ + $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) init_vala.stamp; \ + fi +init_vala.stamp: $(init_SOURCES) + $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(init_SOURCES) + $(AM_V_at)touch $@ $(srcdir)/persona-store-capabilities.c: $(srcdir)/persona_store_capabilities_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/persona_store_capabilities_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/persona_store_capabilities_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) persona_store_capabilities_vala.stamp; \ fi persona_store_capabilities_vala.stamp: $(persona_store_capabilities_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(persona_store_capabilities_SOURCES) $(AM_V_at)touch $@ $(srcdir)/individual-retrieval.c: $(srcdir)/individual_retrieval_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/individual_retrieval_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/individual_retrieval_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) individual_retrieval_vala.stamp; \ fi individual_retrieval_vala.stamp: $(individual_retrieval_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(individual_retrieval_SOURCES) $(AM_V_at)touch $@ $(srcdir)/individual-properties.c: $(srcdir)/individual_properties_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/individual_properties_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/individual_properties_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) individual_properties_vala.stamp; \ fi individual_properties_vala.stamp: $(individual_properties_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(individual_properties_SOURCES) $(AM_V_at)touch $@ +$(srcdir)/fake-tp-backend.c: $(srcdir)/fake_tp_backend_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/fake_tp_backend_vala.stamp; fi + @if test -f $@; then :; else \ + $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) fake_tp_backend_vala.stamp; \ + fi +fake_tp_backend_vala.stamp: $(fake_tp_backend_SOURCES) + $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(fake_tp_backend_SOURCES) + $(AM_V_at)touch $@ mostlyclean-libtool: -rm -f *.lo @@ -665,14 +723,15 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ test "$$failed" -eq 0; \ else :; fi @@ -723,10 +782,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -739,10 +803,14 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." + -rm -f fake-tp-backend.c + -rm -f fake_tp_backend_vala.stamp -rm -f individual-properties.c -rm -f individual-retrieval.c -rm -f individual_properties_vala.stamp -rm -f individual_retrieval_vala.stamp + -rm -f init.c + -rm -f init_vala.stamp -rm -f persona-store-capabilities.c -rm -f persona_store_capabilities_vala.stamp -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) diff -Nru folks-0.6.6/tests/telepathy/persona-store-capabilities.c folks-0.6.7/tests/telepathy/persona-store-capabilities.c --- folks-0.6.6/tests/telepathy/persona-store-capabilities.c 2011-12-13 23:41:49.000000000 +0000 +++ folks-0.6.7/tests/telepathy/persona-store-capabilities.c 2012-02-23 00:02:26.000000000 +0000 @@ -1,4 +1,4 @@ -/* persona-store-capabilities.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* persona-store-capabilities.c generated by valac 0.15.1, the Vala compiler * generated from persona-store-capabilities.vala, do not modify */ /* @@ -217,13 +217,17 @@ static void block1_data_unref (Block1Data* _data1_) { #line 62 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { +#line 221 "persona-store-capabilities.c" + PersonaStoreCapabilitiesTests * self; #line 62 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" - _g_object_unref0 (_data1_->self); + self = _data1_->self; #line 62 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _g_main_loop_unref0 (_data1_->main_loop); #line 62 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" + _g_object_unref0 (self); +#line 62 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" g_slice_free (Block1Data, _data1_); -#line 227 "persona-store-capabilities.c" +#line 231 "persona-store-capabilities.c" } } @@ -236,14 +240,14 @@ _tmp0_ = ps; #line 73 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" persona_store_capabilities_tests_set_up_persona_store (self, _tmp0_); -#line 240 "persona-store-capabilities.c" +#line 244 "persona-store-capabilities.c" } static void ____lambda3__folks_backend_persona_store_added (FolksBackend* _sender, FolksPersonaStore* store, gpointer self) { #line 71 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" ___lambda3_ (self, store); -#line 247 "persona-store-capabilities.c" +#line 251 "persona-store-capabilities.c" } @@ -261,13 +265,13 @@ _tmp2_ = _tmp1_; #line 69 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" if (g_strcmp0 (_tmp2_, "telepathy") == 0) { -#line 265 "persona-store-capabilities.c" +#line 269 "persona-store-capabilities.c" FolksBackend* _tmp3_; #line 71 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _tmp3_ = b; #line 71 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" g_signal_connect_object (_tmp3_, "persona-store-added", (GCallback) ____lambda3__folks_backend_persona_store_added, self, 0); -#line 271 "persona-store-capabilities.c" +#line 275 "persona-store-capabilities.c" { FolksBackend* _tmp4_; GeeMap* _tmp5_; @@ -300,7 +304,7 @@ _store_it = _tmp11_; #line 76 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" while (TRUE) { -#line 304 "persona-store-capabilities.c" +#line 308 "persona-store-capabilities.c" GeeIterator* _tmp12_; gboolean _tmp13_ = FALSE; GeeIterator* _tmp14_; @@ -315,7 +319,7 @@ if (!_tmp13_) { #line 76 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" break; -#line 319 "persona-store-capabilities.c" +#line 323 "persona-store-capabilities.c" } #line 76 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _tmp14_ = _store_it; @@ -329,11 +333,11 @@ persona_store_capabilities_tests_set_up_persona_store (self, _tmp16_); #line 76 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _g_object_unref0 (store); -#line 333 "persona-store-capabilities.c" +#line 337 "persona-store-capabilities.c" } #line 76 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _g_object_unref0 (_store_it); -#line 337 "persona-store-capabilities.c" +#line 341 "persona-store-capabilities.c" } } } @@ -342,7 +346,7 @@ static void ___lambda2__folks_backend_store_backend_available (FolksBackendStore* _sender, FolksBackend* backend, gpointer self) { #line 67 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" __lambda2_ (self, backend); -#line 346 "persona-store-capabilities.c" +#line 350 "persona-store-capabilities.c" } @@ -357,7 +361,7 @@ result = FALSE; #line 90 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" return result; -#line 361 "persona-store-capabilities.c" +#line 365 "persona-store-capabilities.c" } @@ -366,7 +370,7 @@ result = __lambda5_ (self); #line 87 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" return result; -#line 370 "persona-store-capabilities.c" +#line 374 "persona-store-capabilities.c" } @@ -440,14 +444,14 @@ block1_data_unref (_data1_); #line 62 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _data1_ = NULL; -#line 444 "persona-store-capabilities.c" +#line 448 "persona-store-capabilities.c" } static gpointer _g_object_ref0 (gpointer self) { #line 101 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" return self ? g_object_ref (self) : NULL; -#line 451 "persona-store-capabilities.c" +#line 455 "persona-store-capabilities.c" } @@ -456,20 +460,24 @@ g_atomic_int_inc (&_data2_->_ref_count_); #line 101 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" return _data2_; -#line 460 "persona-store-capabilities.c" +#line 464 "persona-store-capabilities.c" } static void block2_data_unref (Block2Data* _data2_) { #line 101 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { +#line 471 "persona-store-capabilities.c" + PersonaStoreCapabilitiesTests * self; #line 101 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" - _g_object_unref0 (_data2_->self); + self = _data2_->self; #line 101 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _g_object_unref0 (_data2_->store); #line 101 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" + _g_object_unref0 (self); +#line 101 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" g_slice_free (Block2Data, _data2_); -#line 473 "persona-store-capabilities.c" +#line 481 "persona-store-capabilities.c" } } @@ -477,14 +485,14 @@ static void _persona_store_capabilities_tests_can_add_personas_cb_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 112 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" persona_store_capabilities_tests_can_add_personas_cb (self, _sender, pspec); -#line 481 "persona-store-capabilities.c" +#line 489 "persona-store-capabilities.c" } static void _persona_store_capabilities_tests_can_remove_personas_cb_g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { #line 118 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" persona_store_capabilities_tests_can_remove_personas_cb (self, _sender, pspec); -#line 488 "persona-store-capabilities.c" +#line 496 "persona-store-capabilities.c" } @@ -496,12 +504,12 @@ if (g_strcmp0 (stack[i], needle) == 0) { #line 121 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" return TRUE; -#line 500 "persona-store-capabilities.c" +#line 508 "persona-store-capabilities.c" } } #line 121 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" return FALSE; -#line 505 "persona-store-capabilities.c" +#line 513 "persona-store-capabilities.c" } @@ -512,7 +520,7 @@ self = _data2_->self; #line 103 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" g_return_if_fail (_result_ != NULL); -#line 516 "persona-store-capabilities.c" +#line 524 "persona-store-capabilities.c" { FolksPersonaStore* _tmp0_; GAsyncResult* _tmp1_; @@ -540,7 +548,7 @@ folks_persona_store_prepare_finish (_tmp0_, _tmp1_, &_inner_error_); #line 107 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" if (_inner_error_ != NULL) { -#line 544 "persona-store-capabilities.c" +#line 552 "persona-store-capabilities.c" goto __catch0_g_error; } #line 109 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" @@ -551,20 +559,20 @@ _tmp4_ = _tmp3_; #line 109 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" if (_tmp4_ != FOLKS_MAYBE_BOOL_UNSET) { -#line 555 "persona-store-capabilities.c" +#line 563 "persona-store-capabilities.c" FolksPersonaStore* _tmp5_; #line 110 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _tmp5_ = _data2_->store; #line 110 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" persona_store_capabilities_tests_can_add_personas_cb (self, (GObject*) _tmp5_, NULL); -#line 561 "persona-store-capabilities.c" +#line 569 "persona-store-capabilities.c" } else { FolksPersonaStore* _tmp6_; #line 112 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _tmp6_ = _data2_->store; #line 112 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" g_signal_connect_object ((GObject*) _tmp6_, "notify::can-add-personas", (GCallback) _persona_store_capabilities_tests_can_add_personas_cb_g_object_notify, self, 0); -#line 568 "persona-store-capabilities.c" +#line 576 "persona-store-capabilities.c" } #line 115 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _tmp7_ = _data2_->store; @@ -574,20 +582,20 @@ _tmp9_ = _tmp8_; #line 115 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" if (_tmp9_ != FOLKS_MAYBE_BOOL_UNSET) { -#line 578 "persona-store-capabilities.c" +#line 586 "persona-store-capabilities.c" FolksPersonaStore* _tmp10_; #line 116 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _tmp10_ = _data2_->store; #line 116 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" persona_store_capabilities_tests_can_remove_personas_cb (self, (GObject*) _tmp10_, NULL); -#line 584 "persona-store-capabilities.c" +#line 592 "persona-store-capabilities.c" } else { FolksPersonaStore* _tmp11_; #line 118 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _tmp11_ = _data2_->store; #line 118 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" g_signal_connect_object ((GObject*) _tmp11_, "notify::can-remove-personas", (GCallback) _persona_store_capabilities_tests_can_remove_personas_cb_g_object_notify, self, 0); -#line 591 "persona-store-capabilities.c" +#line 599 "persona-store-capabilities.c" } #line 121 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _tmp12_ = _data2_->store; @@ -599,13 +607,13 @@ _tmp14__length1 = _tmp13__length1; #line 121 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" if (_vala_string_array_contains (_tmp14_, _tmp14__length1, "alias")) { -#line 603 "persona-store-capabilities.c" +#line 611 "persona-store-capabilities.c" FolksPersonaStore* _tmp15_; #line 122 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _tmp15_ = _data2_->store; #line 122 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" persona_store_capabilities_tests_check_can_alias_personas (self, (GObject*) _tmp15_, NULL); -#line 609 "persona-store-capabilities.c" +#line 617 "persona-store-capabilities.c" } #line 124 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _tmp16_ = _data2_->store; @@ -617,13 +625,13 @@ _tmp18__length1 = _tmp17__length1; #line 124 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" if (_vala_string_array_contains (_tmp18_, _tmp18__length1, "groups")) { -#line 621 "persona-store-capabilities.c" +#line 629 "persona-store-capabilities.c" FolksPersonaStore* _tmp19_; #line 125 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _tmp19_ = _data2_->store; #line 125 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" persona_store_capabilities_tests_check_can_group_personas_cb (self, (GObject*) _tmp19_, NULL); -#line 627 "persona-store-capabilities.c" +#line 635 "persona-store-capabilities.c" } } goto __finally0; @@ -662,7 +670,7 @@ g_warning ("Error preparing PersonaStore type: %s, id: %s: " "'%s'", _tmp22_, _tmp25_, _tmp27_); #line 105 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _g_error_free0 (e); -#line 666 "persona-store-capabilities.c" +#line 674 "persona-store-capabilities.c" } __finally0: #line 105 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" @@ -673,7 +681,7 @@ g_clear_error (&_inner_error_); #line 105 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" return; -#line 677 "persona-store-capabilities.c" +#line 685 "persona-store-capabilities.c" } } @@ -683,7 +691,7 @@ __lambda4_ (self, source_object, res); #line 103 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" block2_data_unref (self); -#line 687 "persona-store-capabilities.c" +#line 695 "persona-store-capabilities.c" } @@ -716,7 +724,7 @@ block2_data_unref (_data2_); #line 101 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _data2_ = NULL; -#line 720 "persona-store-capabilities.c" +#line 728 "persona-store-capabilities.c" } @@ -750,7 +758,7 @@ _tmp5_ = _tmp4_; #line 140 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" if (_tmp5_ != FOLKS_MAYBE_BOOL_UNSET) { -#line 754 "persona-store-capabilities.c" +#line 762 "persona-store-capabilities.c" TpfPersonaStore* _tmp6_; FolksMaybeBool _tmp7_; FolksMaybeBool _tmp8_; @@ -776,11 +784,11 @@ g_signal_parse_name ("notify::can-add-personas", G_TYPE_OBJECT, &_tmp11_, &_tmp12_, TRUE); #line 146 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" g_signal_handlers_disconnect_matched ((GObject*) _tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DETAIL | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, _tmp12_, NULL, (GCallback) _persona_store_capabilities_tests_can_add_personas_cb_g_object_notify, self); -#line 780 "persona-store-capabilities.c" +#line 788 "persona-store-capabilities.c" } #line 135 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _g_object_unref0 (store); -#line 784 "persona-store-capabilities.c" +#line 792 "persona-store-capabilities.c" } @@ -814,7 +822,7 @@ _tmp5_ = _tmp4_; #line 156 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" if (_tmp5_ != FOLKS_MAYBE_BOOL_UNSET) { -#line 818 "persona-store-capabilities.c" +#line 826 "persona-store-capabilities.c" TpfPersonaStore* _tmp6_; FolksMaybeBool _tmp7_; FolksMaybeBool _tmp8_; @@ -840,11 +848,11 @@ g_signal_parse_name ("notify::can-remove-personas", G_TYPE_OBJECT, &_tmp11_, &_tmp12_, TRUE); #line 162 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" g_signal_handlers_disconnect_matched ((GObject*) _tmp10_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DETAIL | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp11_, _tmp12_, NULL, (GCallback) _persona_store_capabilities_tests_can_remove_personas_cb_g_object_notify, self); -#line 844 "persona-store-capabilities.c" +#line 852 "persona-store-capabilities.c" } #line 151 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _g_object_unref0 (store); -#line 848 "persona-store-capabilities.c" +#line 856 "persona-store-capabilities.c" } @@ -882,17 +890,17 @@ _tmp5__length1 = _tmp4__length1; #line 172 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" if (_vala_string_array_contains (_tmp5_, _tmp5__length1, "alias")) { -#line 886 "persona-store-capabilities.c" +#line 894 "persona-store-capabilities.c" GeeHashSet* _tmp6_; #line 173 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _tmp6_ = self->priv->_capabilities_received; #line 173 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _tmp6_, "can-alias-personas"); -#line 892 "persona-store-capabilities.c" +#line 900 "persona-store-capabilities.c" } #line 167 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _g_object_unref0 (store); -#line 896 "persona-store-capabilities.c" +#line 904 "persona-store-capabilities.c" } @@ -930,17 +938,17 @@ _tmp5__length1 = _tmp4__length1; #line 181 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" if (_vala_string_array_contains (_tmp5_, _tmp5__length1, "groups")) { -#line 934 "persona-store-capabilities.c" +#line 942 "persona-store-capabilities.c" GeeHashSet* _tmp6_; #line 182 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _tmp6_ = self->priv->_capabilities_received; #line 182 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" gee_abstract_collection_add ((GeeAbstractCollection*) _tmp6_, "can-group-personas"); -#line 940 "persona-store-capabilities.c" +#line 948 "persona-store-capabilities.c" } #line 176 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" _g_object_unref0 (store); -#line 944 "persona-store-capabilities.c" +#line 952 "persona-store-capabilities.c" } @@ -955,7 +963,7 @@ FOLKS_TEST_CASE_CLASS (klass)->tear_down = persona_store_capabilities_tests_real_tear_down; #line 27 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" G_OBJECT_CLASS (klass)->finalize = persona_store_capabilities_tests_finalize; -#line 959 "persona-store-capabilities.c" +#line 967 "persona-store-capabilities.c" } @@ -964,7 +972,7 @@ self->priv = PERSONA_STORE_CAPABILITIES_TESTS_GET_PRIVATE (self); #line 32 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" self->priv->_test_timeout = 3; -#line 968 "persona-store-capabilities.c" +#line 976 "persona-store-capabilities.c" } @@ -978,7 +986,7 @@ _g_object_unref0 (self->priv->_capabilities_received); #line 27 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" G_OBJECT_CLASS (persona_store_capabilities_tests_parent_class)->finalize (obj); -#line 982 "persona-store-capabilities.c" +#line 990 "persona-store-capabilities.c" } @@ -1023,7 +1031,7 @@ result = 0; #line 195 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" return result; -#line 1027 "persona-store-capabilities.c" +#line 1035 "persona-store-capabilities.c" } @@ -1032,7 +1040,7 @@ g_type_init (); #line 186 "/home/treitter/collabora/folks/tests/telepathy/persona-store-capabilities.vala" return _vala_main (argv, argc); -#line 1036 "persona-store-capabilities.c" +#line 1044 "persona-store-capabilities.c" } diff -Nru folks-0.6.6/tests/tools/Makefile.in folks-0.6.7/tests/tools/Makefile.in --- folks-0.6.6/tests/tools/Makefile.in 2011-12-13 23:38:44.000000000 +0000 +++ folks-0.6.7/tests/tools/Makefile.in 2012-02-23 00:04:13.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -37,10 +37,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -76,6 +77,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -343,10 +346,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/tests/tracker/add-contact.c folks-0.6.7/tests/tracker/add-contact.c --- folks-0.6.6/tests/tracker/add-contact.c 2011-12-13 23:44:55.000000000 +0000 +++ folks-0.6.7/tests/tracker/add-contact.c 2012-02-23 00:03:12.000000000 +0000 @@ -1,4 +1,4 @@ -/* add-contact.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* add-contact.c generated by valac 0.15.1, the Vala compiler * generated from add-contact.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/additional-names-updates.c folks-0.6.7/tests/tracker/additional-names-updates.c --- folks-0.6.6/tests/tracker/additional-names-updates.c 2011-12-13 23:44:42.000000000 +0000 +++ folks-0.6.7/tests/tracker/additional-names-updates.c 2012-02-23 00:03:10.000000000 +0000 @@ -1,4 +1,4 @@ -/* additional-names-updates.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* additional-names-updates.c generated by valac 0.15.1, the Vala compiler * generated from additional-names-updates.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/add-persona.c folks-0.6.7/tests/tracker/add-persona.c --- folks-0.6.6/tests/tracker/add-persona.c 2011-12-13 23:44:11.000000000 +0000 +++ folks-0.6.7/tests/tracker/add-persona.c 2012-02-23 00:03:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* add-persona.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* add-persona.c generated by valac 0.15.1, the Vala compiler * generated from add-persona.vala, do not modify */ /* @@ -1426,7 +1426,7 @@ #line 208 "/home/treitter/collabora/folks/tests/tracker/add-persona.vala" memset (&_data_->_tmp40_, 0, sizeof (GValue)); #line 208 "/home/treitter/collabora/folks/tests/tracker/add-persona.vala" - g_value_init (&_data_->_tmp40_, G_TYPE_LOADABLE_ICON); + g_value_init (&_data_->_tmp40_, g_loadable_icon_get_type ()); #line 208 "/home/treitter/collabora/folks/tests/tracker/add-persona.vala" _data_->_tmp41_ = _data_->_tmp40_; #line 208 "/home/treitter/collabora/folks/tests/tracker/add-persona.vala" diff -Nru folks-0.6.6/tests/tracker/add-persona.vala folks-0.6.7/tests/tracker/add-persona.vala --- folks-0.6.6/tests/tracker/add-persona.vala 2011-11-10 22:36:54.000000000 +0000 +++ folks-0.6.7/tests/tracker/add-persona.vala 2012-02-17 23:39:51.000000000 +0000 @@ -223,7 +223,7 @@ details.insert (Folks.PersonaStore.detail_key (PersonaDetail.GENDER), (owned) v7); - Value? v8 = Value (typeof (Set)); + Value? v8 = Value (typeof (Set)); var emails = new HashSet ( (GLib.HashFunc) EmailFieldDetails.hash, (GLib.EqualFunc) EmailFieldDetails.equal); @@ -236,7 +236,7 @@ Folks.PersonaStore.detail_key (PersonaDetail.EMAIL_ADDRESSES), (owned) v8); - Value? v9 = Value (typeof (MultiMap)); + Value? v9 = Value (typeof (MultiMap)); var im_addrs = new HashMultiMap (null, null, (GLib.HashFunc) ImFieldDetails.hash, (GLib.EqualFunc) ImFieldDetails.equal); @@ -246,7 +246,7 @@ details.insert ( Folks.PersonaStore.detail_key (PersonaDetail.IM_ADDRESSES), v9); - Value? v10 = Value (typeof (Set)); + Value? v10 = Value (typeof (Set)); var notes = new HashSet ( (GLib.HashFunc) NoteFieldDetails.hash, (GLib.EqualFunc) NoteFieldDetails.equal); @@ -256,7 +256,7 @@ details.insert (Folks.PersonaStore.detail_key (PersonaDetail.NOTES), (owned) v10); - Value? v11 = Value (typeof (Set)); + Value? v11 = Value (typeof (Set)); var phones = new HashSet ( (GLib.HashFunc) PhoneFieldDetails.hash, (GLib.EqualFunc) PhoneFieldDetails.equal); @@ -270,7 +270,7 @@ Folks.PersonaStore.detail_key (PersonaDetail.PHONE_NUMBERS), (owned) v11); - Value? v12 = Value (typeof (Set)); + Value? v12 = Value (typeof (Set)); var role_fds = new HashSet ( (GLib.HashFunc) RoleFieldDetails.hash, (GLib.EqualFunc) RoleFieldDetails.equal); @@ -282,7 +282,7 @@ details.insert (Folks.PersonaStore.detail_key (PersonaDetail.ROLES), (owned) v12); - Value? v13 = Value (typeof (Set)); + Value? v13 = Value (typeof (Set)); var postal_addresses = new HashSet ( (GLib.HashFunc) PostalAddressFieldDetails.hash, (GLib.EqualFunc) PostalAddressFieldDetails.equal); @@ -298,7 +298,7 @@ Folks.PersonaStore.detail_key (PersonaDetail.POSTAL_ADDRESSES), (owned) v13); - Value? v14 = Value (typeof (Set)); + Value? v14 = Value (typeof (Set)); var urls = new HashSet ( (GLib.HashFunc) UrlFieldDetails.hash, (GLib.EqualFunc) UrlFieldDetails.equal); diff -Nru folks-0.6.6/tests/tracker/avatar-details-interface.c folks-0.6.7/tests/tracker/avatar-details-interface.c --- folks-0.6.6/tests/tracker/avatar-details-interface.c 2011-12-13 23:45:11.000000000 +0000 +++ folks-0.6.7/tests/tracker/avatar-details-interface.c 2012-02-23 00:02:49.000000000 +0000 @@ -1,4 +1,4 @@ -/* avatar-details-interface.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* avatar-details-interface.c generated by valac 0.15.1, the Vala compiler * generated from avatar-details-interface.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/avatar-updates.c folks-0.6.7/tests/tracker/avatar-updates.c --- folks-0.6.6/tests/tracker/avatar-updates.c 2011-12-13 23:44:16.000000000 +0000 +++ folks-0.6.7/tests/tracker/avatar-updates.c 2012-02-23 00:03:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* avatar-updates.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* avatar-updates.c generated by valac 0.15.1, the Vala compiler * generated from avatar-updates.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/birthday-details-interface.c folks-0.6.7/tests/tracker/birthday-details-interface.c --- folks-0.6.6/tests/tracker/birthday-details-interface.c 2011-12-13 23:44:24.000000000 +0000 +++ folks-0.6.7/tests/tracker/birthday-details-interface.c 2012-02-23 00:03:07.000000000 +0000 @@ -1,4 +1,4 @@ -/* birthday-details-interface.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* birthday-details-interface.c generated by valac 0.15.1, the Vala compiler * generated from birthday-details-interface.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/birthday-updates.c folks-0.6.7/tests/tracker/birthday-updates.c --- folks-0.6.6/tests/tracker/birthday-updates.c 2011-12-13 23:44:24.000000000 +0000 +++ folks-0.6.7/tests/tracker/birthday-updates.c 2012-02-23 00:03:06.000000000 +0000 @@ -1,4 +1,4 @@ -/* birthday-updates.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* birthday-updates.c generated by valac 0.15.1, the Vala compiler * generated from birthday-updates.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/default-contact.c folks-0.6.7/tests/tracker/default-contact.c --- folks-0.6.6/tests/tracker/default-contact.c 2011-12-13 23:44:53.000000000 +0000 +++ folks-0.6.7/tests/tracker/default-contact.c 2012-02-23 00:03:12.000000000 +0000 @@ -1,4 +1,4 @@ -/* default-contact.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* default-contact.c generated by valac 0.15.1, the Vala compiler * generated from default-contact.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/duplicated-emails.c folks-0.6.7/tests/tracker/duplicated-emails.c --- folks-0.6.6/tests/tracker/duplicated-emails.c 2011-12-13 23:43:34.000000000 +0000 +++ folks-0.6.7/tests/tracker/duplicated-emails.c 2012-02-23 00:02:53.000000000 +0000 @@ -1,4 +1,4 @@ -/* duplicated-emails.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* duplicated-emails.c generated by valac 0.15.1, the Vala compiler * generated from duplicated-emails.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/duplicated-emails.vala folks-0.6.7/tests/tracker/duplicated-emails.vala --- folks-0.6.6/tests/tracker/duplicated-emails.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/tests/tracker/duplicated-emails.vala 2012-02-17 23:39:51.000000000 +0000 @@ -172,7 +172,7 @@ details1.insert (Folks.PersonaStore.detail_key (PersonaDetail.FULL_NAME), (owned) val); - val = Value (typeof (Set)); + val = Value (typeof (Set)); var emails1 = new HashSet ( (GLib.HashFunc) EmailFieldDetails.hash, (GLib.EqualFunc) EmailFieldDetails.equal); @@ -188,7 +188,7 @@ details2.insert (Folks.PersonaStore.detail_key (PersonaDetail.FULL_NAME), (owned) val); - val = Value (typeof (Set)); + val = Value (typeof (Set)); var emails2 = new HashSet ( (GLib.HashFunc) EmailFieldDetails.hash, (GLib.EqualFunc) EmailFieldDetails.equal); diff -Nru folks-0.6.6/tests/tracker/duplicated-phones.c folks-0.6.7/tests/tracker/duplicated-phones.c --- folks-0.6.6/tests/tracker/duplicated-phones.c 2011-12-13 23:43:31.000000000 +0000 +++ folks-0.6.7/tests/tracker/duplicated-phones.c 2012-02-23 00:02:53.000000000 +0000 @@ -1,4 +1,4 @@ -/* duplicated-phones.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* duplicated-phones.c generated by valac 0.15.1, the Vala compiler * generated from duplicated-phones.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/duplicated-phones.vala folks-0.6.7/tests/tracker/duplicated-phones.vala --- folks-0.6.6/tests/tracker/duplicated-phones.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/tests/tracker/duplicated-phones.vala 2012-02-17 23:39:51.000000000 +0000 @@ -172,7 +172,7 @@ details1.insert (Folks.PersonaStore.detail_key (PersonaDetail.FULL_NAME), (owned) val); - val = Value (typeof (Set)); + val = Value (typeof (Set)); var phones1 = new HashSet ( (GLib.HashFunc) PhoneFieldDetails.hash, (GLib.EqualFunc) PhoneFieldDetails.equal); @@ -188,7 +188,7 @@ details2.insert (Folks.PersonaStore.detail_key (PersonaDetail.FULL_NAME), (owned) val); - val = Value (typeof (Set)); + val = Value (typeof (Set)); var phones2 = new HashSet ( (GLib.HashFunc) PhoneFieldDetails.hash, (GLib.EqualFunc) PhoneFieldDetails.equal); diff -Nru folks-0.6.6/tests/tracker/email-details-interface.c folks-0.6.7/tests/tracker/email-details-interface.c --- folks-0.6.6/tests/tracker/email-details-interface.c 2011-12-13 23:45:06.000000000 +0000 +++ folks-0.6.7/tests/tracker/email-details-interface.c 2012-02-23 00:03:16.000000000 +0000 @@ -1,4 +1,4 @@ -/* email-details-interface.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* email-details-interface.c generated by valac 0.15.1, the Vala compiler * generated from email-details-interface.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/emails-updates.c folks-0.6.7/tests/tracker/emails-updates.c --- folks-0.6.6/tests/tracker/emails-updates.c 2011-12-13 23:44:34.000000000 +0000 +++ folks-0.6.7/tests/tracker/emails-updates.c 2012-02-23 00:03:08.000000000 +0000 @@ -1,4 +1,4 @@ -/* emails-updates.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* emails-updates.c generated by valac 0.15.1, the Vala compiler * generated from emails-updates.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/family-name-updates.c folks-0.6.7/tests/tracker/family-name-updates.c --- folks-0.6.6/tests/tracker/family-name-updates.c 2011-12-13 23:44:46.000000000 +0000 +++ folks-0.6.7/tests/tracker/family-name-updates.c 2012-02-23 00:03:11.000000000 +0000 @@ -1,4 +1,4 @@ -/* family-name-updates.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* family-name-updates.c generated by valac 0.15.1, the Vala compiler * generated from family-name-updates.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/favourite-details-interface.c folks-0.6.7/tests/tracker/favourite-details-interface.c --- folks-0.6.6/tests/tracker/favourite-details-interface.c 2011-12-13 23:45:01.000000000 +0000 +++ folks-0.6.7/tests/tracker/favourite-details-interface.c 2012-02-23 00:03:13.000000000 +0000 @@ -1,4 +1,4 @@ -/* favourite-details-interface.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* favourite-details-interface.c generated by valac 0.15.1, the Vala compiler * generated from favourite-details-interface.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/favourite-updates.c folks-0.6.7/tests/tracker/favourite-updates.c --- folks-0.6.6/tests/tracker/favourite-updates.c 2011-12-13 23:44:35.000000000 +0000 +++ folks-0.6.7/tests/tracker/favourite-updates.c 2012-02-23 00:03:08.000000000 +0000 @@ -1,4 +1,4 @@ -/* favourite-updates.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* favourite-updates.c generated by valac 0.15.1, the Vala compiler * generated from favourite-updates.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/fullname-updates.c folks-0.6.7/tests/tracker/fullname-updates.c --- folks-0.6.6/tests/tracker/fullname-updates.c 2011-12-13 23:44:59.000000000 +0000 +++ folks-0.6.7/tests/tracker/fullname-updates.c 2012-02-23 00:03:13.000000000 +0000 @@ -1,4 +1,4 @@ -/* fullname-updates.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* fullname-updates.c generated by valac 0.15.1, the Vala compiler * generated from fullname-updates.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/gender-details-interface.c folks-0.6.7/tests/tracker/gender-details-interface.c --- folks-0.6.6/tests/tracker/gender-details-interface.c 2011-12-13 23:44:20.000000000 +0000 +++ folks-0.6.7/tests/tracker/gender-details-interface.c 2012-02-23 00:03:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* gender-details-interface.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* gender-details-interface.c generated by valac 0.15.1, the Vala compiler * generated from gender-details-interface.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/given-name-updates.c folks-0.6.7/tests/tracker/given-name-updates.c --- folks-0.6.6/tests/tracker/given-name-updates.c 2011-12-13 23:44:42.000000000 +0000 +++ folks-0.6.7/tests/tracker/given-name-updates.c 2012-02-23 00:03:10.000000000 +0000 @@ -1,4 +1,4 @@ -/* given-name-updates.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* given-name-updates.c generated by valac 0.15.1, the Vala compiler * generated from given-name-updates.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/imaddresses-updates.c folks-0.6.7/tests/tracker/imaddresses-updates.c --- folks-0.6.6/tests/tracker/imaddresses-updates.c 2011-12-13 23:44:29.000000000 +0000 +++ folks-0.6.7/tests/tracker/imaddresses-updates.c 2012-02-23 00:03:07.000000000 +0000 @@ -1,4 +1,4 @@ -/* imaddresses-updates.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* imaddresses-updates.c generated by valac 0.15.1, the Vala compiler * generated from imaddresses-updates.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/im-details-interface.c folks-0.6.7/tests/tracker/im-details-interface.c --- folks-0.6.6/tests/tracker/im-details-interface.c 2011-12-13 23:45:09.000000000 +0000 +++ folks-0.6.7/tests/tracker/im-details-interface.c 2012-02-23 00:03:18.000000000 +0000 @@ -1,4 +1,4 @@ -/* im-details-interface.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* im-details-interface.c generated by valac 0.15.1, the Vala compiler * generated from im-details-interface.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/individual-retrieval.c folks-0.6.7/tests/tracker/individual-retrieval.c --- folks-0.6.6/tests/tracker/individual-retrieval.c 2011-12-13 23:43:12.000000000 +0000 +++ folks-0.6.7/tests/tracker/individual-retrieval.c 2012-02-23 00:02:49.000000000 +0000 @@ -1,4 +1,4 @@ -/* individual-retrieval.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* individual-retrieval.c generated by valac 0.15.1, the Vala compiler * generated from individual-retrieval.vala, do not modify */ /* @@ -258,7 +258,7 @@ #line 73 "/home/treitter/collabora/folks/tests/tracker/individual-retrieval.vala" _tmp11_ = self->priv->_c1; #line 73 "/home/treitter/collabora/folks/tests/tracker/individual-retrieval.vala" - _tmp12_ = gee_map_get_size ((GeeMap*) _tmp11_); + _tmp12_ = gee_abstract_map_get_size ((GeeMap*) _tmp11_); #line 73 "/home/treitter/collabora/folks/tests/tracker/individual-retrieval.vala" _tmp13_ = _tmp12_; #line 73 "/home/treitter/collabora/folks/tests/tracker/individual-retrieval.vala" @@ -266,7 +266,7 @@ #line 74 "/home/treitter/collabora/folks/tests/tracker/individual-retrieval.vala" _tmp14_ = self->priv->_c2; #line 74 "/home/treitter/collabora/folks/tests/tracker/individual-retrieval.vala" - _tmp15_ = gee_map_get_size ((GeeMap*) _tmp14_); + _tmp15_ = gee_abstract_map_get_size ((GeeMap*) _tmp14_); #line 74 "/home/treitter/collabora/folks/tests/tracker/individual-retrieval.vala" _tmp16_ = _tmp15_; #line 74 "/home/treitter/collabora/folks/tests/tracker/individual-retrieval.vala" @@ -622,7 +622,7 @@ #line 121 "/home/treitter/collabora/folks/tests/tracker/individual-retrieval.vala" _tmp29_ = self->priv->_c1; #line 121 "/home/treitter/collabora/folks/tests/tracker/individual-retrieval.vala" - _tmp30_ = gee_map_get_size ((GeeMap*) _tmp29_); + _tmp30_ = gee_abstract_map_get_size ((GeeMap*) _tmp29_); #line 121 "/home/treitter/collabora/folks/tests/tracker/individual-retrieval.vala" _tmp31_ = _tmp30_; #line 121 "/home/treitter/collabora/folks/tests/tracker/individual-retrieval.vala" @@ -634,7 +634,7 @@ #line 122 "/home/treitter/collabora/folks/tests/tracker/individual-retrieval.vala" _tmp32_ = self->priv->_c2; #line 122 "/home/treitter/collabora/folks/tests/tracker/individual-retrieval.vala" - _tmp33_ = gee_map_get_size ((GeeMap*) _tmp32_); + _tmp33_ = gee_abstract_map_get_size ((GeeMap*) _tmp32_); #line 122 "/home/treitter/collabora/folks/tests/tracker/individual-retrieval.vala" _tmp34_ = _tmp33_; #line 122 "/home/treitter/collabora/folks/tests/tracker/individual-retrieval.vala" diff -Nru folks-0.6.6/tests/tracker/link-personas.c folks-0.6.7/tests/tracker/link-personas.c --- folks-0.6.6/tests/tracker/link-personas.c 2011-12-13 23:43:35.000000000 +0000 +++ folks-0.6.7/tests/tracker/link-personas.c 2012-02-23 00:02:53.000000000 +0000 @@ -1,4 +1,4 @@ -/* link-personas.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* link-personas.c generated by valac 0.15.1, the Vala compiler * generated from link-personas.vala, do not modify */ /* @@ -405,7 +405,7 @@ #line 100 "/home/treitter/collabora/folks/tests/tracker/link-personas.vala" _tmp10_ = self->priv->_linking_props; #line 100 "/home/treitter/collabora/folks/tests/tracker/link-personas.vala" - _tmp11_ = gee_map_get_size ((GeeMap*) _tmp10_); + _tmp11_ = gee_abstract_map_get_size ((GeeMap*) _tmp10_); #line 100 "/home/treitter/collabora/folks/tests/tracker/link-personas.vala" _tmp12_ = _tmp11_; #line 100 "/home/treitter/collabora/folks/tests/tracker/link-personas.vala" @@ -1738,7 +1738,7 @@ #line 263 "/home/treitter/collabora/folks/tests/tracker/link-personas.vala" _tmp77_ = self->priv->_linking_props; #line 263 "/home/treitter/collabora/folks/tests/tracker/link-personas.vala" - _tmp78_ = gee_map_get_size ((GeeMap*) _tmp77_); + _tmp78_ = gee_abstract_map_get_size ((GeeMap*) _tmp77_); #line 263 "/home/treitter/collabora/folks/tests/tracker/link-personas.vala" _tmp79_ = _tmp78_; #line 263 "/home/treitter/collabora/folks/tests/tracker/link-personas.vala" @@ -1757,7 +1757,7 @@ #line 271 "/home/treitter/collabora/folks/tests/tracker/link-personas.vala" _tmp82_ = self->priv->_personas; #line 271 "/home/treitter/collabora/folks/tests/tracker/link-personas.vala" - _tmp83_ = gee_collection_get_size ((GeeCollection*) _tmp82_); + _tmp83_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp82_); #line 271 "/home/treitter/collabora/folks/tests/tracker/link-personas.vala" _tmp84_ = _tmp83_; #line 271 "/home/treitter/collabora/folks/tests/tracker/link-personas.vala" diff -Nru folks-0.6.6/tests/tracker/link-personas.vala folks-0.6.7/tests/tracker/link-personas.vala --- folks-0.6.6/tests/tracker/link-personas.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/tests/tracker/link-personas.vala 2012-02-17 23:39:51.000000000 +0000 @@ -140,7 +140,7 @@ { HashTable details1 = new HashTable (str_hash, str_equal); - Value? v1 = Value (typeof (MultiMap)); + Value? v1 = Value (typeof (MultiMap)); var im_addrs1 = new HashMultiMap (null, null, (GLib.HashFunc) ImFieldDetails.hash, (GLib.EqualFunc) ImFieldDetails.equal); @@ -154,7 +154,7 @@ HashTable details2 = new HashTable (str_hash, str_equal); - Value? v3 = Value (typeof (MultiMap)); + Value? v3 = Value (typeof (MultiMap)); var im_addrs2 = new HashMultiMap (null, null, (GLib.HashFunc) ImFieldDetails.hash, (GLib.EqualFunc) ImFieldDetails.equal); diff -Nru folks-0.6.6/tests/tracker/link-personas-via-local-ids.c folks-0.6.7/tests/tracker/link-personas-via-local-ids.c --- folks-0.6.6/tests/tracker/link-personas-via-local-ids.c 2011-12-13 23:43:30.000000000 +0000 +++ folks-0.6.7/tests/tracker/link-personas-via-local-ids.c 2012-02-23 00:02:52.000000000 +0000 @@ -1,4 +1,4 @@ -/* link-personas-via-local-ids.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* link-personas-via-local-ids.c generated by valac 0.15.1, the Vala compiler * generated from link-personas-via-local-ids.vala, do not modify */ /* @@ -354,7 +354,7 @@ #line 98 "/home/treitter/collabora/folks/tests/tracker/link-personas-via-local-ids.vala" _tmp6_ = self->priv->_local_ids; #line 98 "/home/treitter/collabora/folks/tests/tracker/link-personas-via-local-ids.vala" - _tmp7_ = gee_collection_get_size ((GeeCollection*) _tmp6_); + _tmp7_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp6_); #line 98 "/home/treitter/collabora/folks/tests/tracker/link-personas-via-local-ids.vala" _tmp8_ = _tmp7_; #line 98 "/home/treitter/collabora/folks/tests/tracker/link-personas-via-local-ids.vala" @@ -1529,7 +1529,7 @@ #line 251 "/home/treitter/collabora/folks/tests/tracker/link-personas-via-local-ids.vala" _tmp56_ = self->priv->_local_ids; #line 251 "/home/treitter/collabora/folks/tests/tracker/link-personas-via-local-ids.vala" - _tmp57_ = gee_collection_get_size ((GeeCollection*) _tmp56_); + _tmp57_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp56_); #line 251 "/home/treitter/collabora/folks/tests/tracker/link-personas-via-local-ids.vala" _tmp58_ = _tmp57_; #line 251 "/home/treitter/collabora/folks/tests/tracker/link-personas-via-local-ids.vala" @@ -1548,7 +1548,7 @@ #line 259 "/home/treitter/collabora/folks/tests/tracker/link-personas-via-local-ids.vala" _tmp61_ = self->priv->_personas; #line 259 "/home/treitter/collabora/folks/tests/tracker/link-personas-via-local-ids.vala" - _tmp62_ = gee_collection_get_size ((GeeCollection*) _tmp61_); + _tmp62_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp61_); #line 259 "/home/treitter/collabora/folks/tests/tracker/link-personas-via-local-ids.vala" _tmp63_ = _tmp62_; #line 259 "/home/treitter/collabora/folks/tests/tracker/link-personas-via-local-ids.vala" diff -Nru folks-0.6.6/tests/tracker/Makefile.in folks-0.6.7/tests/tracker/Makefile.in --- folks-0.6.6/tests/tracker/Makefile.in 2011-12-13 23:38:45.000000000 +0000 +++ folks-0.6.7/tests/tracker/Makefile.in 2012-02-23 00:04:14.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -125,10 +125,11 @@ website-updates.c website_updates_vala.stamp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -795,6 +796,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -1608,485 +1611,482 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< $(srcdir)/set-nickname.c: $(srcdir)/set_nickname_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_nickname_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_nickname_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_nickname_vala.stamp; \ fi set_nickname_vala.stamp: $(set_nickname_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_nickname_SOURCES) $(AM_V_at)touch $@ $(srcdir)/match-known-emails.c: $(srcdir)/match_known_emails_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/match_known_emails_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/match_known_emails_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) match_known_emails_vala.stamp; \ fi match_known_emails_vala.stamp: $(match_known_emails_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(match_known_emails_SOURCES) $(AM_V_at)touch $@ $(srcdir)/nickname-updates.c: $(srcdir)/nickname_updates_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/nickname_updates_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/nickname_updates_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) nickname_updates_vala.stamp; \ fi nickname_updates_vala.stamp: $(nickname_updates_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(nickname_updates_SOURCES) $(AM_V_at)touch $@ $(srcdir)/match-im-addresses.c: $(srcdir)/match_im_addresses_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/match_im_addresses_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/match_im_addresses_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) match_im_addresses_vala.stamp; \ fi match_im_addresses_vala.stamp: $(match_im_addresses_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(match_im_addresses_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-phones.c: $(srcdir)/set_phones_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_phones_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_phones_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_phones_vala.stamp; \ fi set_phones_vala.stamp: $(set_phones_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_phones_SOURCES) $(AM_V_at)touch $@ $(srcdir)/emails-updates.c: $(srcdir)/emails_updates_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/emails_updates_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/emails_updates_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) emails_updates_vala.stamp; \ fi emails_updates_vala.stamp: $(emails_updates_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(emails_updates_SOURCES) $(AM_V_at)touch $@ $(srcdir)/additional-names-updates.c: $(srcdir)/additional_names_updates_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/additional_names_updates_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/additional_names_updates_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) additional_names_updates_vala.stamp; \ fi additional_names_updates_vala.stamp: $(additional_names_updates_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(additional_names_updates_SOURCES) $(AM_V_at)touch $@ $(srcdir)/individual-retrieval.c: $(srcdir)/individual_retrieval_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/individual_retrieval_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/individual_retrieval_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) individual_retrieval_vala.stamp; \ fi individual_retrieval_vala.stamp: $(individual_retrieval_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(individual_retrieval_SOURCES) $(AM_V_at)touch $@ $(srcdir)/given-name-updates.c: $(srcdir)/given_name_updates_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/given_name_updates_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/given_name_updates_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) given_name_updates_vala.stamp; \ fi given_name_updates_vala.stamp: $(given_name_updates_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(given_name_updates_SOURCES) $(AM_V_at)touch $@ $(srcdir)/match-email-addresses.c: $(srcdir)/match_email_addresses_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/match_email_addresses_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/match_email_addresses_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) match_email_addresses_vala.stamp; \ fi match_email_addresses_vala.stamp: $(match_email_addresses_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(match_email_addresses_SOURCES) $(AM_V_at)touch $@ $(srcdir)/birthday-details-interface.c: $(srcdir)/birthday_details_interface_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/birthday_details_interface_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/birthday_details_interface_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) birthday_details_interface_vala.stamp; \ fi birthday_details_interface_vala.stamp: $(birthday_details_interface_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(birthday_details_interface_SOURCES) $(AM_V_at)touch $@ $(srcdir)/prefix-name-updates.c: $(srcdir)/prefix_name_updates_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/prefix_name_updates_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/prefix_name_updates_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) prefix_name_updates_vala.stamp; \ fi prefix_name_updates_vala.stamp: $(prefix_name_updates_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(prefix_name_updates_SOURCES) $(AM_V_at)touch $@ $(srcdir)/add-persona.c: $(srcdir)/add_persona_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/add_persona_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/add_persona_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) add_persona_vala.stamp; \ fi add_persona_vala.stamp: $(add_persona_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(add_persona_SOURCES) $(AM_V_at)touch $@ $(srcdir)/fullname-updates.c: $(srcdir)/fullname_updates_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/fullname_updates_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/fullname_updates_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) fullname_updates_vala.stamp; \ fi fullname_updates_vala.stamp: $(fullname_updates_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(fullname_updates_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-roles.c: $(srcdir)/set_roles_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_roles_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_roles_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_roles_vala.stamp; \ fi set_roles_vala.stamp: $(set_roles_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_roles_SOURCES) $(AM_V_at)touch $@ $(srcdir)/suffix-name-updates.c: $(srcdir)/suffix_name_updates_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/suffix_name_updates_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/suffix_name_updates_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) suffix_name_updates_vala.stamp; \ fi suffix_name_updates_vala.stamp: $(suffix_name_updates_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(suffix_name_updates_SOURCES) $(AM_V_at)touch $@ $(srcdir)/link-personas.c: $(srcdir)/link_personas_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/link_personas_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/link_personas_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) link_personas_vala.stamp; \ fi link_personas_vala.stamp: $(link_personas_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(link_personas_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-null-avatar.c: $(srcdir)/set_null_avatar_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_null_avatar_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_null_avatar_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_null_avatar_vala.stamp; \ fi set_null_avatar_vala.stamp: $(set_null_avatar_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_null_avatar_SOURCES) $(AM_V_at)touch $@ $(srcdir)/avatar-updates.c: $(srcdir)/avatar_updates_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/avatar_updates_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/avatar_updates_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) avatar_updates_vala.stamp; \ fi avatar_updates_vala.stamp: $(avatar_updates_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(avatar_updates_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-postal-addresses.c: $(srcdir)/set_postal_addresses_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_postal_addresses_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_postal_addresses_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_postal_addresses_vala.stamp; \ fi set_postal_addresses_vala.stamp: $(set_postal_addresses_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_postal_addresses_SOURCES) $(AM_V_at)touch $@ $(srcdir)/match-phone-number.c: $(srcdir)/match_phone_number_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/match_phone_number_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/match_phone_number_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) match_phone_number_vala.stamp; \ fi match_phone_number_vala.stamp: $(match_phone_number_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(match_phone_number_SOURCES) $(AM_V_at)touch $@ $(srcdir)/duplicated-emails.c: $(srcdir)/duplicated_emails_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/duplicated_emails_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/duplicated_emails_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) duplicated_emails_vala.stamp; \ fi duplicated_emails_vala.stamp: $(duplicated_emails_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(duplicated_emails_SOURCES) $(AM_V_at)touch $@ $(srcdir)/match-all.c: $(srcdir)/match_all_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/match_all_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/match_all_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) match_all_vala.stamp; \ fi match_all_vala.stamp: $(match_all_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(match_all_SOURCES) $(AM_V_at)touch $@ $(srcdir)/url-details-interface.c: $(srcdir)/url_details_interface_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/url_details_interface_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/url_details_interface_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) url_details_interface_vala.stamp; \ fi url_details_interface_vala.stamp: $(url_details_interface_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(url_details_interface_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-notes.c: $(srcdir)/set_notes_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_notes_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_notes_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_notes_vala.stamp; \ fi set_notes_vala.stamp: $(set_notes_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_notes_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-favourite.c: $(srcdir)/set_favourite_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_favourite_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_favourite_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_favourite_vala.stamp; \ fi set_favourite_vala.stamp: $(set_favourite_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_favourite_SOURCES) $(AM_V_at)touch $@ $(srcdir)/phone-details-interface.c: $(srcdir)/phone_details_interface_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/phone_details_interface_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/phone_details_interface_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) phone_details_interface_vala.stamp; \ fi phone_details_interface_vala.stamp: $(phone_details_interface_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(phone_details_interface_SOURCES) $(AM_V_at)touch $@ $(srcdir)/name-details-interface.c: $(srcdir)/name_details_interface_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/name_details_interface_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/name_details_interface_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) name_details_interface_vala.stamp; \ fi name_details_interface_vala.stamp: $(name_details_interface_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(name_details_interface_SOURCES) $(AM_V_at)touch $@ $(srcdir)/im-details-interface.c: $(srcdir)/im_details_interface_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/im_details_interface_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/im_details_interface_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) im_details_interface_vala.stamp; \ fi im_details_interface_vala.stamp: $(im_details_interface_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(im_details_interface_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-im-addresses.c: $(srcdir)/set_im_addresses_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_im_addresses_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_im_addresses_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_im_addresses_vala.stamp; \ fi set_im_addresses_vala.stamp: $(set_im_addresses_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_im_addresses_SOURCES) $(AM_V_at)touch $@ $(srcdir)/note-details-interface.c: $(srcdir)/note_details_interface_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/note_details_interface_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/note_details_interface_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) note_details_interface_vala.stamp; \ fi note_details_interface_vala.stamp: $(note_details_interface_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(note_details_interface_SOURCES) $(AM_V_at)touch $@ $(srcdir)/birthday-updates.c: $(srcdir)/birthday_updates_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/birthday_updates_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/birthday_updates_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) birthday_updates_vala.stamp; \ fi birthday_updates_vala.stamp: $(birthday_updates_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(birthday_updates_SOURCES) $(AM_V_at)touch $@ $(srcdir)/gender-details-interface.c: $(srcdir)/gender_details_interface_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/gender_details_interface_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/gender_details_interface_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) gender_details_interface_vala.stamp; \ fi gender_details_interface_vala.stamp: $(gender_details_interface_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(gender_details_interface_SOURCES) $(AM_V_at)touch $@ $(srcdir)/match-name.c: $(srcdir)/match_name_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/match_name_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/match_name_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) match_name_vala.stamp; \ fi match_name_vala.stamp: $(match_name_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(match_name_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-duplicate-email.c: $(srcdir)/set_duplicate_email_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_duplicate_email_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_duplicate_email_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_duplicate_email_vala.stamp; \ fi set_duplicate_email_vala.stamp: $(set_duplicate_email_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_duplicate_email_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-urls.c: $(srcdir)/set_urls_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_urls_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_urls_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_urls_vala.stamp; \ fi set_urls_vala.stamp: $(set_urls_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_urls_SOURCES) $(AM_V_at)touch $@ $(srcdir)/default-contact.c: $(srcdir)/default_contact_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/default_contact_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/default_contact_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) default_contact_vala.stamp; \ fi default_contact_vala.stamp: $(default_contact_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(default_contact_SOURCES) $(AM_V_at)touch $@ $(srcdir)/imaddresses-updates.c: $(srcdir)/imaddresses_updates_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/imaddresses_updates_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/imaddresses_updates_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) imaddresses_updates_vala.stamp; \ fi imaddresses_updates_vala.stamp: $(imaddresses_updates_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(imaddresses_updates_SOURCES) $(AM_V_at)touch $@ $(srcdir)/role-details-interface.c: $(srcdir)/role_details_interface_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/role_details_interface_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/role_details_interface_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) role_details_interface_vala.stamp; \ fi role_details_interface_vala.stamp: $(role_details_interface_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(role_details_interface_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-full-name.c: $(srcdir)/set_full_name_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_full_name_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_full_name_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_full_name_vala.stamp; \ fi set_full_name_vala.stamp: $(set_full_name_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_full_name_SOURCES) $(AM_V_at)touch $@ $(srcdir)/family-name-updates.c: $(srcdir)/family_name_updates_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/family_name_updates_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/family_name_updates_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) family_name_updates_vala.stamp; \ fi family_name_updates_vala.stamp: $(family_name_updates_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(family_name_updates_SOURCES) $(AM_V_at)touch $@ $(srcdir)/email-details-interface.c: $(srcdir)/email_details_interface_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/email_details_interface_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/email_details_interface_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) email_details_interface_vala.stamp; \ fi email_details_interface_vala.stamp: $(email_details_interface_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(email_details_interface_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-gender.c: $(srcdir)/set_gender_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_gender_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_gender_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_gender_vala.stamp; \ fi set_gender_vala.stamp: $(set_gender_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_gender_SOURCES) $(AM_V_at)touch $@ $(srcdir)/remove-contact.c: $(srcdir)/remove_contact_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/remove_contact_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/remove_contact_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) remove_contact_vala.stamp; \ fi remove_contact_vala.stamp: $(remove_contact_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(remove_contact_SOURCES) $(AM_V_at)touch $@ $(srcdir)/duplicated-phones.c: $(srcdir)/duplicated_phones_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/duplicated_phones_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/duplicated_phones_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) duplicated_phones_vala.stamp; \ fi duplicated_phones_vala.stamp: $(duplicated_phones_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(duplicated_phones_SOURCES) $(AM_V_at)touch $@ $(srcdir)/remove-persona.c: $(srcdir)/remove_persona_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/remove_persona_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/remove_persona_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) remove_persona_vala.stamp; \ fi remove_persona_vala.stamp: $(remove_persona_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(remove_persona_SOURCES) $(AM_V_at)touch $@ $(srcdir)/website-updates.c: $(srcdir)/website_updates_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/website_updates_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/website_updates_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) website_updates_vala.stamp; \ fi website_updates_vala.stamp: $(website_updates_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(website_updates_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-structured-name.c: $(srcdir)/set_structured_name_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_structured_name_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_structured_name_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_structured_name_vala.stamp; \ fi set_structured_name_vala.stamp: $(set_structured_name_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_structured_name_SOURCES) $(AM_V_at)touch $@ $(srcdir)/add-contact.c: $(srcdir)/add_contact_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/add_contact_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/add_contact_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) add_contact_vala.stamp; \ fi add_contact_vala.stamp: $(add_contact_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(add_contact_SOURCES) $(AM_V_at)touch $@ $(srcdir)/postal-address-details-interface.c: $(srcdir)/postal_address_details_interface_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/postal_address_details_interface_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/postal_address_details_interface_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) postal_address_details_interface_vala.stamp; \ fi postal_address_details_interface_vala.stamp: $(postal_address_details_interface_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(postal_address_details_interface_SOURCES) $(AM_V_at)touch $@ $(srcdir)/avatar-details-interface.c: $(srcdir)/avatar_details_interface_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/avatar_details_interface_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/avatar_details_interface_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) avatar_details_interface_vala.stamp; \ fi avatar_details_interface_vala.stamp: $(avatar_details_interface_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(avatar_details_interface_SOURCES) $(AM_V_at)touch $@ $(srcdir)/favourite-updates.c: $(srcdir)/favourite_updates_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/favourite_updates_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/favourite_updates_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) favourite_updates_vala.stamp; \ fi favourite_updates_vala.stamp: $(favourite_updates_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(favourite_updates_SOURCES) $(AM_V_at)touch $@ $(srcdir)/link-personas-via-local-ids.c: $(srcdir)/link_personas_via_local_ids_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/link_personas_via_local_ids_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/link_personas_via_local_ids_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) link_personas_via_local_ids_vala.stamp; \ fi link_personas_via_local_ids_vala.stamp: $(link_personas_via_local_ids_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(link_personas_via_local_ids_SOURCES) $(AM_V_at)touch $@ $(srcdir)/phones-updates.c: $(srcdir)/phones_updates_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/phones_updates_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/phones_updates_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) phones_updates_vala.stamp; \ fi phones_updates_vala.stamp: $(phones_updates_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(phones_updates_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-emails.c: $(srcdir)/set_emails_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_emails_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_emails_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_emails_vala.stamp; \ fi set_emails_vala.stamp: $(set_emails_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_emails_SOURCES) $(AM_V_at)touch $@ $(srcdir)/favourite-details-interface.c: $(srcdir)/favourite_details_interface_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/favourite_details_interface_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/favourite_details_interface_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) favourite_details_interface_vala.stamp; \ fi favourite_details_interface_vala.stamp: $(favourite_details_interface_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(favourite_details_interface_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-birthday.c: $(srcdir)/set_birthday_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_birthday_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_birthday_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_birthday_vala.stamp; \ fi set_birthday_vala.stamp: $(set_birthday_SOURCES) $(AM_V_VALAC)$(VALAC) $(AM_VALAFLAGS) $(VALAFLAGS) -C $(set_birthday_SOURCES) $(AM_V_at)touch $@ $(srcdir)/set-avatar.c: $(srcdir)/set_avatar_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/set_avatar_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/set_avatar_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) set_avatar_vala.stamp; \ fi set_avatar_vala.stamp: $(set_avatar_SOURCES) @@ -2232,14 +2232,15 @@ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ test "$$failed" -eq 0; \ else :; fi @@ -2288,10 +2289,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/tests/tracker/match-all.c folks-0.6.7/tests/tracker/match-all.c --- folks-0.6.6/tests/tracker/match-all.c 2011-12-13 23:43:18.000000000 +0000 +++ folks-0.6.7/tests/tracker/match-all.c 2012-02-23 00:02:50.000000000 +0000 @@ -1,4 +1,4 @@ -/* match-all.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* match-all.c generated by valac 0.15.1, the Vala compiler * generated from match-all.vala, do not modify */ /* @@ -1491,7 +1491,7 @@ MatchAllTestsDoAddPersonaData* _data_; MatchAllTests* _tmp0_; const gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp2_; #line 26 "/home/treitter/collabora/folks/tests/tracker/match-all.vala" _data_ = g_slice_new0 (MatchAllTestsDoAddPersonaData); #line 26 "/home/treitter/collabora/folks/tests/tracker/match-all.vala" diff -Nru folks-0.6.6/tests/tracker/match-email-addresses.c folks-0.6.7/tests/tracker/match-email-addresses.c --- folks-0.6.6/tests/tracker/match-email-addresses.c 2011-12-13 23:43:26.000000000 +0000 +++ folks-0.6.7/tests/tracker/match-email-addresses.c 2012-02-23 00:02:51.000000000 +0000 @@ -1,4 +1,4 @@ -/* match-email-addresses.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* match-email-addresses.c generated by valac 0.15.1, the Vala compiler * generated from match-email-addresses.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/match-email-addresses.vala folks-0.6.7/tests/tracker/match-email-addresses.vala --- folks-0.6.6/tests/tracker/match-email-addresses.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/tests/tracker/match-email-addresses.vala 2012-02-17 23:39:51.000000000 +0000 @@ -177,7 +177,7 @@ details1.insert (Folks.PersonaStore.detail_key (PersonaDetail.FULL_NAME), (owned) val); - val = Value (typeof (Set)); + val = Value (typeof (Set)); var emails1 = new HashSet ( (GLib.HashFunc) EmailFieldDetails.hash, (GLib.EqualFunc) EmailFieldDetails.equal); @@ -193,7 +193,7 @@ details2.insert (Folks.PersonaStore.detail_key (PersonaDetail.FULL_NAME), (owned) val); - val = Value (typeof (Set)); + val = Value (typeof (Set)); var emails2 = new HashSet ( (GLib.HashFunc) EmailFieldDetails.hash, (GLib.EqualFunc) EmailFieldDetails.equal); diff -Nru folks-0.6.6/tests/tracker/match-im-addresses.c folks-0.6.7/tests/tracker/match-im-addresses.c --- folks-0.6.6/tests/tracker/match-im-addresses.c 2011-12-13 23:43:27.000000000 +0000 +++ folks-0.6.7/tests/tracker/match-im-addresses.c 2012-02-23 00:02:52.000000000 +0000 @@ -1,4 +1,4 @@ -/* match-im-addresses.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* match-im-addresses.c generated by valac 0.15.1, the Vala compiler * generated from match-im-addresses.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/match-im-addresses.vala folks-0.6.7/tests/tracker/match-im-addresses.vala --- folks-0.6.6/tests/tracker/match-im-addresses.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/tests/tracker/match-im-addresses.vala 2012-02-17 23:39:51.000000000 +0000 @@ -178,7 +178,7 @@ details1.insert (Folks.PersonaStore.detail_key (PersonaDetail.FULL_NAME), (owned) val); - val = Value (typeof (MultiMap)); + val = Value (typeof (MultiMap)); im_addrs = new HashMultiMap (null, null, (GLib.HashFunc) ImFieldDetails.hash, (GLib.EqualFunc) ImFieldDetails.equal); @@ -194,7 +194,7 @@ details2.insert (Folks.PersonaStore.detail_key (PersonaDetail.FULL_NAME), (owned) val); - val = Value (typeof (MultiMap)); + val = Value (typeof (MultiMap)); im_addrs = new HashMultiMap (null, null, (GLib.HashFunc) ImFieldDetails.hash, (GLib.EqualFunc) ImFieldDetails.equal); diff -Nru folks-0.6.6/tests/tracker/match-known-emails.c folks-0.6.7/tests/tracker/match-known-emails.c --- folks-0.6.6/tests/tracker/match-known-emails.c 2011-12-13 23:43:23.000000000 +0000 +++ folks-0.6.7/tests/tracker/match-known-emails.c 2012-02-23 00:02:51.000000000 +0000 @@ -1,4 +1,4 @@ -/* match-known-emails.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* match-known-emails.c generated by valac 0.15.1, the Vala compiler * generated from match-known-emails.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/match-known-emails.vala folks-0.6.7/tests/tracker/match-known-emails.vala --- folks-0.6.6/tests/tracker/match-known-emails.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/tests/tracker/match-known-emails.vala 2012-02-17 23:39:51.000000000 +0000 @@ -185,7 +185,7 @@ details1.insert (Folks.PersonaStore.detail_key (PersonaDetail.FULL_NAME), (owned) val); - val = Value (typeof (Set)); + val = Value (typeof (Set)); var emails1 = new HashSet ( (GLib.HashFunc) EmailFieldDetails.hash, (GLib.EqualFunc) EmailFieldDetails.equal); @@ -201,7 +201,7 @@ details2.insert (Folks.PersonaStore.detail_key (PersonaDetail.FULL_NAME), (owned) val); - val = Value (typeof (Set)); + val = Value (typeof (Set)); var emails2 = new HashSet ( (GLib.HashFunc) EmailFieldDetails.hash, (GLib.EqualFunc) EmailFieldDetails.equal); diff -Nru folks-0.6.6/tests/tracker/match-name.c folks-0.6.7/tests/tracker/match-name.c --- folks-0.6.6/tests/tracker/match-name.c 2011-12-13 23:43:19.000000000 +0000 +++ folks-0.6.7/tests/tracker/match-name.c 2012-02-23 00:02:50.000000000 +0000 @@ -1,4 +1,4 @@ -/* match-name.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* match-name.c generated by valac 0.15.1, the Vala compiler * generated from match-name.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/match-phone-number.c folks-0.6.7/tests/tracker/match-phone-number.c --- folks-0.6.6/tests/tracker/match-phone-number.c 2011-12-13 23:43:22.000000000 +0000 +++ folks-0.6.7/tests/tracker/match-phone-number.c 2012-02-23 00:02:51.000000000 +0000 @@ -1,4 +1,4 @@ -/* match-phone-number.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* match-phone-number.c generated by valac 0.15.1, the Vala compiler * generated from match-phone-number.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/match-phone-number.vala folks-0.6.7/tests/tracker/match-phone-number.vala --- folks-0.6.6/tests/tracker/match-phone-number.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/tests/tracker/match-phone-number.vala 2012-02-17 23:39:51.000000000 +0000 @@ -179,7 +179,7 @@ details1.insert (Folks.PersonaStore.detail_key (PersonaDetail.FULL_NAME), (owned) val); - val = Value (typeof (Set)); + val = Value (typeof (Set)); var phone_numbers1 = new HashSet ( (GLib.HashFunc) PhoneFieldDetails.hash, (GLib.EqualFunc) PhoneFieldDetails.equal); @@ -195,7 +195,7 @@ details2.insert (Folks.PersonaStore.detail_key (PersonaDetail.FULL_NAME), (owned) val); - val = Value (typeof (Set)); + val = Value (typeof (Set)); var phone_numbers2 = new HashSet ( (GLib.HashFunc) PhoneFieldDetails.hash, (GLib.EqualFunc) PhoneFieldDetails.equal); diff -Nru folks-0.6.6/tests/tracker/name-details-interface.c folks-0.6.7/tests/tracker/name-details-interface.c --- folks-0.6.6/tests/tracker/name-details-interface.c 2011-12-13 23:45:15.000000000 +0000 +++ folks-0.6.7/tests/tracker/name-details-interface.c 2012-02-23 00:02:49.000000000 +0000 @@ -1,4 +1,4 @@ -/* name-details-interface.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* name-details-interface.c generated by valac 0.15.1, the Vala compiler * generated from name-details-interface.vala, do not modify */ /* @@ -283,7 +283,7 @@ #line 81 "/home/treitter/collabora/folks/tests/tracker/name-details-interface.vala" _tmp16_ = self->priv->_c1; #line 81 "/home/treitter/collabora/folks/tests/tracker/name-details-interface.vala" - _tmp17_ = gee_map_get_size ((GeeMap*) _tmp16_); + _tmp17_ = gee_abstract_map_get_size ((GeeMap*) _tmp16_); #line 81 "/home/treitter/collabora/folks/tests/tracker/name-details-interface.vala" _tmp18_ = _tmp17_; #line 81 "/home/treitter/collabora/folks/tests/tracker/name-details-interface.vala" @@ -291,7 +291,7 @@ #line 82 "/home/treitter/collabora/folks/tests/tracker/name-details-interface.vala" _tmp19_ = self->priv->_c2; #line 82 "/home/treitter/collabora/folks/tests/tracker/name-details-interface.vala" - _tmp20_ = gee_map_get_size ((GeeMap*) _tmp19_); + _tmp20_ = gee_abstract_map_get_size ((GeeMap*) _tmp19_); #line 82 "/home/treitter/collabora/folks/tests/tracker/name-details-interface.vala" _tmp21_ = _tmp20_; #line 82 "/home/treitter/collabora/folks/tests/tracker/name-details-interface.vala" @@ -861,7 +861,7 @@ #line 159 "/home/treitter/collabora/folks/tests/tracker/name-details-interface.vala" _tmp77_ = self->priv->_c1; #line 159 "/home/treitter/collabora/folks/tests/tracker/name-details-interface.vala" - _tmp78_ = gee_map_get_size ((GeeMap*) _tmp77_); + _tmp78_ = gee_abstract_map_get_size ((GeeMap*) _tmp77_); #line 159 "/home/treitter/collabora/folks/tests/tracker/name-details-interface.vala" _tmp79_ = _tmp78_; #line 159 "/home/treitter/collabora/folks/tests/tracker/name-details-interface.vala" @@ -873,7 +873,7 @@ #line 160 "/home/treitter/collabora/folks/tests/tracker/name-details-interface.vala" _tmp80_ = self->priv->_c2; #line 160 "/home/treitter/collabora/folks/tests/tracker/name-details-interface.vala" - _tmp81_ = gee_map_get_size ((GeeMap*) _tmp80_); + _tmp81_ = gee_abstract_map_get_size ((GeeMap*) _tmp80_); #line 160 "/home/treitter/collabora/folks/tests/tracker/name-details-interface.vala" _tmp82_ = _tmp81_; #line 160 "/home/treitter/collabora/folks/tests/tracker/name-details-interface.vala" diff -Nru folks-0.6.6/tests/tracker/nickname-updates.c folks-0.6.7/tests/tracker/nickname-updates.c --- folks-0.6.6/tests/tracker/nickname-updates.c 2011-12-13 23:44:48.000000000 +0000 +++ folks-0.6.7/tests/tracker/nickname-updates.c 2012-02-23 00:03:11.000000000 +0000 @@ -1,4 +1,4 @@ -/* nickname-updates.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* nickname-updates.c generated by valac 0.15.1, the Vala compiler * generated from nickname-updates.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/note-details-interface.c folks-0.6.7/tests/tracker/note-details-interface.c --- folks-0.6.6/tests/tracker/note-details-interface.c 2011-12-13 23:44:21.000000000 +0000 +++ folks-0.6.7/tests/tracker/note-details-interface.c 2012-02-23 00:03:06.000000000 +0000 @@ -1,4 +1,4 @@ -/* note-details-interface.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* note-details-interface.c generated by valac 0.15.1, the Vala compiler * generated from note-details-interface.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/phone-details-interface.c folks-0.6.7/tests/tracker/phone-details-interface.c --- folks-0.6.6/tests/tracker/phone-details-interface.c 2011-12-13 23:45:07.000000000 +0000 +++ folks-0.6.7/tests/tracker/phone-details-interface.c 2012-02-23 00:03:17.000000000 +0000 @@ -1,4 +1,4 @@ -/* phone-details-interface.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* phone-details-interface.c generated by valac 0.15.1, the Vala compiler * generated from phone-details-interface.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/phones-updates.c folks-0.6.7/tests/tracker/phones-updates.c --- folks-0.6.6/tests/tracker/phones-updates.c 2011-12-13 23:44:30.000000000 +0000 +++ folks-0.6.7/tests/tracker/phones-updates.c 2012-02-23 00:03:07.000000000 +0000 @@ -1,4 +1,4 @@ -/* phones-updates.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* phones-updates.c generated by valac 0.15.1, the Vala compiler * generated from phones-updates.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/postal-address-details-interface.c folks-0.6.7/tests/tracker/postal-address-details-interface.c --- folks-0.6.6/tests/tracker/postal-address-details-interface.c 2011-12-13 23:44:17.000000000 +0000 +++ folks-0.6.7/tests/tracker/postal-address-details-interface.c 2012-02-23 00:03:05.000000000 +0000 @@ -1,4 +1,4 @@ -/* postal-address-details-interface.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* postal-address-details-interface.c generated by valac 0.15.1, the Vala compiler * generated from postal-address-details-interface.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/prefix-name-updates.c folks-0.6.7/tests/tracker/prefix-name-updates.c --- folks-0.6.6/tests/tracker/prefix-name-updates.c 2011-12-13 23:44:41.000000000 +0000 +++ folks-0.6.7/tests/tracker/prefix-name-updates.c 2012-02-23 00:03:10.000000000 +0000 @@ -1,4 +1,4 @@ -/* prefix-name-updates.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* prefix-name-updates.c generated by valac 0.15.1, the Vala compiler * generated from prefix-name-updates.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/remove-contact.c folks-0.6.7/tests/tracker/remove-contact.c --- folks-0.6.6/tests/tracker/remove-contact.c 2011-12-13 23:44:50.000000000 +0000 +++ folks-0.6.7/tests/tracker/remove-contact.c 2012-02-23 00:03:11.000000000 +0000 @@ -1,4 +1,4 @@ -/* remove-contact.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* remove-contact.c generated by valac 0.15.1, the Vala compiler * generated from remove-contact.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/remove-persona.c folks-0.6.7/tests/tracker/remove-persona.c --- folks-0.6.6/tests/tracker/remove-persona.c 2011-12-13 23:44:11.000000000 +0000 +++ folks-0.6.7/tests/tracker/remove-persona.c 2012-02-23 00:03:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* remove-persona.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* remove-persona.c generated by valac 0.15.1, the Vala compiler * generated from remove-persona.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/remove-persona.vala folks-0.6.7/tests/tracker/remove-persona.vala --- folks-0.6.6/tests/tracker/remove-persona.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/tests/tracker/remove-persona.vala 2012-02-17 23:39:51.000000000 +0000 @@ -131,7 +131,7 @@ details.insert (Folks.PersonaStore.detail_key (PersonaDetail.FULL_NAME), (owned) v1); - Value? v2 = Value (typeof (Set)); + Value? v2 = Value (typeof (Set)); var emails = new HashSet ( (GLib.HashFunc) EmailFieldDetails.hash, (GLib.EqualFunc) EmailFieldDetails.equal); diff -Nru folks-0.6.6/tests/tracker/role-details-interface.c folks-0.6.7/tests/tracker/role-details-interface.c --- folks-0.6.6/tests/tracker/role-details-interface.c 2011-12-13 23:44:28.000000000 +0000 +++ folks-0.6.7/tests/tracker/role-details-interface.c 2012-02-23 00:03:07.000000000 +0000 @@ -1,4 +1,4 @@ -/* role-details-interface.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* role-details-interface.c generated by valac 0.15.1, the Vala compiler * generated from role-details-interface.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/set-avatar.c folks-0.6.7/tests/tracker/set-avatar.c --- folks-0.6.6/tests/tracker/set-avatar.c 2011-12-13 23:43:59.000000000 +0000 +++ folks-0.6.7/tests/tracker/set-avatar.c 2012-02-23 00:03:02.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-avatar.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-avatar.c generated by valac 0.15.1, the Vala compiler * generated from set-avatar.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/set-birthday.c folks-0.6.7/tests/tracker/set-birthday.c --- folks-0.6.6/tests/tracker/set-birthday.c 2011-12-13 23:43:40.000000000 +0000 +++ folks-0.6.7/tests/tracker/set-birthday.c 2012-02-23 00:02:58.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-birthday.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-birthday.c generated by valac 0.15.1, the Vala compiler * generated from set-birthday.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/set-duplicate-email.c folks-0.6.7/tests/tracker/set-duplicate-email.c --- folks-0.6.6/tests/tracker/set-duplicate-email.c 2011-12-13 23:43:15.000000000 +0000 +++ folks-0.6.7/tests/tracker/set-duplicate-email.c 2012-02-23 00:02:49.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-duplicate-email.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-duplicate-email.c generated by valac 0.15.1, the Vala compiler * generated from set-duplicate-email.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/set-duplicate-email.vala folks-0.6.7/tests/tracker/set-duplicate-email.vala --- folks-0.6.6/tests/tracker/set-duplicate-email.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/tests/tracker/set-duplicate-email.vala 2012-02-17 23:39:51.000000000 +0000 @@ -202,7 +202,7 @@ details1.insert (Folks.PersonaStore.detail_key (PersonaDetail.FULL_NAME), (owned) val); - val = Value (typeof (Set)); + val = Value (typeof (Set)); var emails1 = new HashSet ( (GLib.HashFunc) EmailFieldDetails.hash, (GLib.EqualFunc) EmailFieldDetails.equal); diff -Nru folks-0.6.6/tests/tracker/set-emails.c folks-0.6.7/tests/tracker/set-emails.c --- folks-0.6.6/tests/tracker/set-emails.c 2011-12-13 23:44:00.000000000 +0000 +++ folks-0.6.7/tests/tracker/set-emails.c 2012-02-23 00:03:02.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-emails.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-emails.c generated by valac 0.15.1, the Vala compiler * generated from set-emails.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/set-favourite.c folks-0.6.7/tests/tracker/set-favourite.c --- folks-0.6.6/tests/tracker/set-favourite.c 2011-12-13 23:44:04.000000000 +0000 +++ folks-0.6.7/tests/tracker/set-favourite.c 2012-02-23 00:03:03.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-favourite.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-favourite.c generated by valac 0.15.1, the Vala compiler * generated from set-favourite.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/set-full-name.c folks-0.6.7/tests/tracker/set-full-name.c --- folks-0.6.6/tests/tracker/set-full-name.c 2011-12-13 23:43:54.000000000 +0000 +++ folks-0.6.7/tests/tracker/set-full-name.c 2012-02-23 00:03:01.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-full-name.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-full-name.c generated by valac 0.15.1, the Vala compiler * generated from set-full-name.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/set-gender.c folks-0.6.7/tests/tracker/set-gender.c --- folks-0.6.6/tests/tracker/set-gender.c 2011-12-13 23:43:38.000000000 +0000 +++ folks-0.6.7/tests/tracker/set-gender.c 2012-02-23 00:02:58.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-gender.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-gender.c generated by valac 0.15.1, the Vala compiler * generated from set-gender.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/set-im-addresses.c folks-0.6.7/tests/tracker/set-im-addresses.c --- folks-0.6.6/tests/tracker/set-im-addresses.c 2011-12-13 23:43:50.000000000 +0000 +++ folks-0.6.7/tests/tracker/set-im-addresses.c 2012-02-23 00:03:01.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-im-addresses.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-im-addresses.c generated by valac 0.15.1, the Vala compiler * generated from set-im-addresses.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/set-nickname.c folks-0.6.7/tests/tracker/set-nickname.c --- folks-0.6.6/tests/tracker/set-nickname.c 2011-12-13 23:44:06.000000000 +0000 +++ folks-0.6.7/tests/tracker/set-nickname.c 2012-02-23 00:03:04.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-nickname.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-nickname.c generated by valac 0.15.1, the Vala compiler * generated from set-nickname.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/set-notes.c folks-0.6.7/tests/tracker/set-notes.c --- folks-0.6.6/tests/tracker/set-notes.c 2011-12-13 23:43:43.000000000 +0000 +++ folks-0.6.7/tests/tracker/set-notes.c 2012-02-23 00:02:59.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-notes.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-notes.c generated by valac 0.15.1, the Vala compiler * generated from set-notes.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/set-null-avatar.c folks-0.6.7/tests/tracker/set-null-avatar.c --- folks-0.6.6/tests/tracker/set-null-avatar.c 2011-12-13 23:43:14.000000000 +0000 +++ folks-0.6.7/tests/tracker/set-null-avatar.c 2012-02-23 00:02:49.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-null-avatar.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-null-avatar.c generated by valac 0.15.1, the Vala compiler * generated from set-null-avatar.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/set-phones.c folks-0.6.7/tests/tracker/set-phones.c --- folks-0.6.6/tests/tracker/set-phones.c 2011-12-13 23:44:02.000000000 +0000 +++ folks-0.6.7/tests/tracker/set-phones.c 2012-02-23 00:03:03.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-phones.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-phones.c generated by valac 0.15.1, the Vala compiler * generated from set-phones.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/set-postal-addresses.c folks-0.6.7/tests/tracker/set-postal-addresses.c --- folks-0.6.6/tests/tracker/set-postal-addresses.c 2011-12-13 23:43:48.000000000 +0000 +++ folks-0.6.7/tests/tracker/set-postal-addresses.c 2012-02-23 00:02:59.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-postal-addresses.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-postal-addresses.c generated by valac 0.15.1, the Vala compiler * generated from set-postal-addresses.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/set-roles.c folks-0.6.7/tests/tracker/set-roles.c --- folks-0.6.6/tests/tracker/set-roles.c 2011-12-13 23:43:45.000000000 +0000 +++ folks-0.6.7/tests/tracker/set-roles.c 2012-02-23 00:02:59.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-roles.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-roles.c generated by valac 0.15.1, the Vala compiler * generated from set-roles.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/set-structured-name.c folks-0.6.7/tests/tracker/set-structured-name.c --- folks-0.6.6/tests/tracker/set-structured-name.c 2011-12-13 23:43:56.000000000 +0000 +++ folks-0.6.7/tests/tracker/set-structured-name.c 2012-02-23 00:03:02.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-structured-name.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-structured-name.c generated by valac 0.15.1, the Vala compiler * generated from set-structured-name.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/set-urls.c folks-0.6.7/tests/tracker/set-urls.c --- folks-0.6.6/tests/tracker/set-urls.c 2011-12-13 23:43:51.000000000 +0000 +++ folks-0.6.7/tests/tracker/set-urls.c 2012-02-23 00:03:01.000000000 +0000 @@ -1,4 +1,4 @@ -/* set-urls.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* set-urls.c generated by valac 0.15.1, the Vala compiler * generated from set-urls.vala, do not modify */ /* @@ -262,7 +262,7 @@ #line 79 "/home/treitter/collabora/folks/tests/tracker/set-urls.vala" _tmp11_ = self->priv->_urls; #line 79 "/home/treitter/collabora/folks/tests/tracker/set-urls.vala" - _tmp12_ = gee_map_get_size ((GeeMap*) _tmp11_); + _tmp12_ = gee_abstract_map_get_size ((GeeMap*) _tmp11_); #line 79 "/home/treitter/collabora/folks/tests/tracker/set-urls.vala" _tmp13_ = _tmp12_; #line 79 "/home/treitter/collabora/folks/tests/tracker/set-urls.vala" @@ -1116,7 +1116,7 @@ #line 174 "/home/treitter/collabora/folks/tests/tracker/set-urls.vala" _tmp63_ = self->priv->_urls; #line 174 "/home/treitter/collabora/folks/tests/tracker/set-urls.vala" - _tmp64_ = gee_map_get_size ((GeeMap*) _tmp63_); + _tmp64_ = gee_abstract_map_get_size ((GeeMap*) _tmp63_); #line 174 "/home/treitter/collabora/folks/tests/tracker/set-urls.vala" _tmp65_ = _tmp64_; #line 174 "/home/treitter/collabora/folks/tests/tracker/set-urls.vala" diff -Nru folks-0.6.6/tests/tracker/suffix-name-updates.c folks-0.6.7/tests/tracker/suffix-name-updates.c --- folks-0.6.6/tests/tracker/suffix-name-updates.c 2011-12-13 23:44:38.000000000 +0000 +++ folks-0.6.7/tests/tracker/suffix-name-updates.c 2012-02-23 00:03:10.000000000 +0000 @@ -1,4 +1,4 @@ -/* suffix-name-updates.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* suffix-name-updates.c generated by valac 0.15.1, the Vala compiler * generated from suffix-name-updates.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/url-details-interface.c folks-0.6.7/tests/tracker/url-details-interface.c --- folks-0.6.6/tests/tracker/url-details-interface.c 2011-12-13 23:45:02.000000000 +0000 +++ folks-0.6.7/tests/tracker/url-details-interface.c 2012-02-23 00:03:15.000000000 +0000 @@ -1,4 +1,4 @@ -/* url-details-interface.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* url-details-interface.c generated by valac 0.15.1, the Vala compiler * generated from url-details-interface.vala, do not modify */ /* diff -Nru folks-0.6.6/tests/tracker/website-updates.c folks-0.6.7/tests/tracker/website-updates.c --- folks-0.6.6/tests/tracker/website-updates.c 2011-12-13 23:44:38.000000000 +0000 +++ folks-0.6.7/tests/tracker/website-updates.c 2012-02-23 00:03:09.000000000 +0000 @@ -1,4 +1,4 @@ -/* website-updates.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* website-updates.c generated by valac 0.15.1, the Vala compiler * generated from website-updates.vala, do not modify */ /* diff -Nru folks-0.6.6/tools/import.c folks-0.6.7/tools/import.c --- folks-0.6.6/tools/import.c 2011-12-13 23:45:26.000000000 +0000 +++ folks-0.6.7/tools/import.c 2012-02-23 00:03:24.000000000 +0000 @@ -1,4 +1,4 @@ -/* import.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* import.c generated by valac 0.15.1, the Vala compiler * generated from import.vala, do not modify */ /* diff -Nru folks-0.6.6/tools/import-pidgin.c folks-0.6.7/tools/import-pidgin.c --- folks-0.6.6/tools/import-pidgin.c 2011-12-13 23:45:26.000000000 +0000 +++ folks-0.6.7/tools/import-pidgin.c 2012-02-23 00:03:24.000000000 +0000 @@ -1,4 +1,4 @@ -/* import-pidgin.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* import-pidgin.c generated by valac 0.15.1, the Vala compiler * generated from import-pidgin.vala, do not modify */ /* @@ -449,7 +449,7 @@ FolksPersonaStore* _tmp1_; FolksPersonaStore* _tmp2_; const gchar* _tmp3_; - const gchar* _tmp4_; + gchar* _tmp4_; self = (FolksImportersPidgin*) base; _data_ = g_slice_new0 (FolksImportersPidginImportData); _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, folks_importers_pidgin_real_import); diff -Nru folks-0.6.6/tools/inspect/command-backends.c folks-0.6.7/tools/inspect/command-backends.c --- folks-0.6.6/tools/inspect/command-backends.c 2011-12-13 23:45:19.000000000 +0000 +++ folks-0.6.7/tools/inspect/command-backends.c 2012-02-23 00:03:20.000000000 +0000 @@ -1,4 +1,4 @@ -/* command-backends.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* command-backends.c generated by valac 0.15.1, the Vala compiler * generated from command-backends.vala, do not modify */ /* diff -Nru folks-0.6.6/tools/inspect/command-debug.c folks-0.6.7/tools/inspect/command-debug.c --- folks-0.6.6/tools/inspect/command-debug.c 2011-12-13 23:45:19.000000000 +0000 +++ folks-0.6.7/tools/inspect/command-debug.c 2012-02-23 00:03:20.000000000 +0000 @@ -1,4 +1,4 @@ -/* command-debug.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* command-debug.c generated by valac 0.15.1, the Vala compiler * generated from command-debug.vala, do not modify */ /* diff -Nru folks-0.6.6/tools/inspect/command-help.c folks-0.6.7/tools/inspect/command-help.c --- folks-0.6.6/tools/inspect/command-help.c 2011-12-13 23:45:19.000000000 +0000 +++ folks-0.6.7/tools/inspect/command-help.c 2012-02-23 00:03:20.000000000 +0000 @@ -1,4 +1,4 @@ -/* command-help.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* command-help.c generated by valac 0.15.1, the Vala compiler * generated from command-help.vala, do not modify */ /* diff -Nru folks-0.6.6/tools/inspect/command-individuals.c folks-0.6.7/tools/inspect/command-individuals.c --- folks-0.6.6/tools/inspect/command-individuals.c 2011-12-13 23:45:19.000000000 +0000 +++ folks-0.6.7/tools/inspect/command-individuals.c 2012-02-23 00:03:20.000000000 +0000 @@ -1,4 +1,4 @@ -/* command-individuals.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* command-individuals.c generated by valac 0.15.1, the Vala compiler * generated from command-individuals.vala, do not modify */ /* diff -Nru folks-0.6.6/tools/inspect/command-linking.c folks-0.6.7/tools/inspect/command-linking.c --- folks-0.6.6/tools/inspect/command-linking.c 2011-12-13 23:45:19.000000000 +0000 +++ folks-0.6.7/tools/inspect/command-linking.c 2012-02-23 00:03:20.000000000 +0000 @@ -1,4 +1,4 @@ -/* command-linking.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* command-linking.c generated by valac 0.15.1, the Vala compiler * generated from command-linking.vala, do not modify */ /* @@ -64,8 +64,8 @@ typedef struct _FolksInspectCommandsLinkingClass FolksInspectCommandsLinkingClass; typedef struct _FolksInspectCommandsLinkingPrivate FolksInspectCommandsLinkingPrivate; typedef struct _Block1Data Block1Data; -#define _folks_inspect_command_unref0(var) ((var == NULL) ? NULL : (var = (folks_inspect_command_unref (var), NULL))) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) +#define _folks_inspect_command_unref0(var) ((var == NULL) ? NULL : (var = (folks_inspect_command_unref (var), NULL))) #define _g_free0(var) (var = (g_free (var), NULL)) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) typedef struct _Block2Data Block2Data; @@ -183,8 +183,10 @@ static void block1_data_unref (Block1Data* _data1_) { if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { - _folks_inspect_command_unref0 (_data1_->self); + FolksInspectCommandsLinking * self; + self = _data1_->self; _g_object_unref0 (_data1_->personas); + _folks_inspect_command_unref0 (self); g_slice_free (Block1Data, _data1_); } } @@ -252,7 +254,7 @@ _tmp6_ = e; _tmp7_ = _tmp6_->code; _tmp8_ = _data1_->personas; - _tmp9_ = gee_collection_get_size ((GeeCollection*) _tmp8_); + _tmp9_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp8_); _tmp10_ = _tmp9_; _tmp11_ = e; _tmp12_ = _tmp11_->message; @@ -266,7 +268,7 @@ return; } _tmp13_ = _data1_->personas; - _tmp14_ = gee_collection_get_size ((GeeCollection*) _tmp13_); + _tmp14_ = gee_abstract_collection_get_size ((GeeCollection*) _tmp13_); _tmp15_ = _tmp14_; folks_inspect_utils_print_line ("Linking of %u personas was successful.", (guint) _tmp15_); } @@ -286,8 +288,10 @@ static void block2_data_unref (Block2Data* _data2_) { if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { - _folks_inspect_command_unref0 (_data2_->self); + FolksInspectCommandsLinking * self; + self = _data2_->self; _g_object_unref0 (_data2_->ind); + _folks_inspect_command_unref0 (self); g_slice_free (Block2Data, _data2_); } } diff -Nru folks-0.6.6/tools/inspect/command-personas.c folks-0.6.7/tools/inspect/command-personas.c --- folks-0.6.6/tools/inspect/command-personas.c 2011-12-13 23:45:19.000000000 +0000 +++ folks-0.6.7/tools/inspect/command-personas.c 2012-02-23 00:03:20.000000000 +0000 @@ -1,4 +1,4 @@ -/* command-personas.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* command-personas.c generated by valac 0.15.1, the Vala compiler * generated from command-personas.vala, do not modify */ /* diff -Nru folks-0.6.6/tools/inspect/command-persona-stores.c folks-0.6.7/tools/inspect/command-persona-stores.c --- folks-0.6.6/tools/inspect/command-persona-stores.c 2011-12-13 23:45:19.000000000 +0000 +++ folks-0.6.7/tools/inspect/command-persona-stores.c 2012-02-23 00:03:20.000000000 +0000 @@ -1,4 +1,4 @@ -/* command-persona-stores.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* command-persona-stores.c generated by valac 0.15.1, the Vala compiler * generated from command-persona-stores.vala, do not modify */ /* diff -Nru folks-0.6.6/tools/inspect/command-quit.c folks-0.6.7/tools/inspect/command-quit.c --- folks-0.6.6/tools/inspect/command-quit.c 2011-12-13 23:45:19.000000000 +0000 +++ folks-0.6.7/tools/inspect/command-quit.c 2012-02-23 00:03:20.000000000 +0000 @@ -1,4 +1,4 @@ -/* command-quit.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* command-quit.c generated by valac 0.15.1, the Vala compiler * generated from command-quit.vala, do not modify */ /* diff -Nru folks-0.6.6/tools/inspect/command-signals.c folks-0.6.7/tools/inspect/command-signals.c --- folks-0.6.6/tools/inspect/command-signals.c 2011-12-13 23:45:19.000000000 +0000 +++ folks-0.6.7/tools/inspect/command-signals.c 2012-02-23 00:03:20.000000000 +0000 @@ -1,4 +1,4 @@ -/* command-signals.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* command-signals.c generated by valac 0.15.1, the Vala compiler * generated from command-signals.vala, do not modify */ /* diff -Nru folks-0.6.6/tools/inspect/inspect.c folks-0.6.7/tools/inspect/inspect.c --- folks-0.6.6/tools/inspect/inspect.c 2011-12-13 23:45:19.000000000 +0000 +++ folks-0.6.7/tools/inspect/inspect.c 2012-02-23 00:03:20.000000000 +0000 @@ -1,4 +1,4 @@ -/* inspect.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* inspect.c generated by valac 0.15.1, the Vala compiler * generated from inspect.vala, do not modify */ /* @@ -27,8 +27,10 @@ #include #include #include -#include +#include +#include #include +#include #include #include #include @@ -66,8 +68,9 @@ typedef struct _FolksInspectSignalManagerClass FolksInspectSignalManagerClass; #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) #define _g_main_loop_unref0(var) ((var == NULL) ? NULL : (var = (g_main_loop_unref (var), NULL))) -typedef struct _Block3Data Block3Data; +#define _g_option_context_free0(var) ((var == NULL) ? NULL : (var = (g_option_context_free (var), NULL))) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) +#define _g_free0(var) (var = (g_free (var), NULL)) #define FOLKS_INSPECT_COMMANDS_TYPE_QUIT (folks_inspect_commands_quit_get_type ()) #define FOLKS_INSPECT_COMMANDS_QUIT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), FOLKS_INSPECT_COMMANDS_TYPE_QUIT, FolksInspectCommandsQuit)) @@ -159,7 +162,9 @@ typedef struct _FolksInspectCommandsDebug FolksInspectCommandsDebug; typedef struct _FolksInspectCommandsDebugClass FolksInspectCommandsDebugClass; -#define _g_free0(var) (var = (g_free (var), NULL)) +typedef struct _Block3Data Block3Data; +typedef struct _FolksInspectClientWaitForQuiescenceData FolksInspectClientWaitForQuiescenceData; +typedef struct _Block4Data Block4Data; typedef struct _FolksInspectCommandPrivate FolksInspectCommandPrivate; typedef struct _FolksInspectParamSpecCommand FolksInspectParamSpecCommand; @@ -184,7 +189,37 @@ struct _Block3Data { int _ref_count_; FolksInspectClient * self; - FolksBackend* backend; + gboolean has_yielded; + gpointer _async_data_; +}; + +struct _FolksInspectClientWaitForQuiescenceData { + int _state_; + GObject* _source_object_; + GAsyncResult* _res_; + GSimpleAsyncResult* _async_result; + FolksInspectClient* self; + Block3Data* _data3_; + FolksIndividualAggregator* _tmp0_; + gulong _tmp1_; + gulong signal_id; + FolksIndividualAggregator* _tmp2_; + FolksIndividualAggregator* _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; + FolksIndividualAggregator* _tmp6_; + gulong _tmp7_; + FolksIndividualAggregator* _tmp8_; + gboolean _tmp9_; + gboolean _tmp10_; + GError * _inner_error_; +}; + +struct _Block4Data { + int _ref_count_; + FolksInspectClient * self; + gchar* subcommand; + FolksInspectCommand* command; }; struct _FolksInspectCommand { @@ -234,20 +269,7 @@ FolksInspectClient* folks_inspect_client_new (void); FolksInspectClient* folks_inspect_client_construct (GType object_type); void folks_inspect_client_run_interactive (FolksInspectClient* self); -static void* folks_inspect_client_folks_thread_main (FolksInspectClient* self); -FolksInspectSignalManager* folks_inspect_signal_manager_new (void); -FolksInspectSignalManager* folks_inspect_signal_manager_construct (GType object_type); -static void folks_inspect_client_set_signal_manager (FolksInspectClient* self, FolksInspectSignalManager* value); -static void folks_inspect_client_set_aggregator (FolksInspectClient* self, FolksIndividualAggregator* value); -FolksIndividualAggregator* folks_inspect_client_get_aggregator (FolksInspectClient* self); -static void folks_inspect_client_set_backend_store (FolksInspectClient* self, FolksBackendStore* value); -FolksBackendStore* folks_inspect_client_get_backend_store (FolksInspectClient* self); -static void __lambda2_ (FolksInspectClient* self, FolksBackendStore* bs, FolksBackend* b); -static Block3Data* block3_data_ref (Block3Data* _data3_); -static void block3_data_unref (Block3Data* _data3_); -static void __lambda3_ (Block3Data* _data3_, GObject* obj, GAsyncResult* _result_); -static void ___lambda3__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); -static void ___lambda2__folks_backend_store_backend_available (FolksBackendStore* _sender, FolksBackend* backend, gpointer self); +void folks_inspect_client_run_non_interactive (FolksInspectClient* self, const gchar* command_line); void folks_inspect_utils_init (void); FolksInspectCommandsQuit* folks_inspect_commands_quit_new (FolksInspectClient* client); FolksInspectCommandsQuit* folks_inspect_commands_quit_construct (GType object_type, FolksInspectClient* client); @@ -276,15 +298,36 @@ FolksInspectCommandsDebug* folks_inspect_commands_debug_new (FolksInspectClient* client); FolksInspectCommandsDebug* folks_inspect_commands_debug_construct (GType object_type, FolksInspectClient* client); GType folks_inspect_commands_debug_get_type (void) G_GNUC_CONST; +FolksInspectSignalManager* folks_inspect_signal_manager_new (void); +FolksInspectSignalManager* folks_inspect_signal_manager_construct (GType object_type); +static void folks_inspect_client_set_signal_manager (FolksInspectClient* self, FolksInspectSignalManager* value); +static void folks_inspect_client_set_backend_store (FolksInspectClient* self, FolksBackendStore* value); +static void folks_inspect_client_set_aggregator (FolksInspectClient* self, FolksIndividualAggregator* value); +static void _folks_inspect_client_wait_for_quiescence_data_free (gpointer _data); +static void _folks_inspect_client_wait_for_quiescence (FolksInspectClient* self, GAsyncReadyCallback _callback_, gpointer _user_data_); +static void _folks_inspect_client_wait_for_quiescence_finish (FolksInspectClient* self, GAsyncResult* _res_, GError** error); +static gboolean _folks_inspect_client_wait_for_quiescence_co (FolksInspectClientWaitForQuiescenceData* _data_); +static Block3Data* block3_data_ref (Block3Data* _data3_); +static void block3_data_unref (Block3Data* _data3_); +FolksIndividualAggregator* folks_inspect_client_get_aggregator (FolksInspectClient* self); +static void __lambda2_ (Block3Data* _data3_, GObject* obj, GParamSpec* pspec); +static void ___lambda2__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self); +static void _folks_inspect_client_wait_for_quiescence_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); +static Block4Data* block4_data_ref (Block4Data* _data4_); +static void block4_data_unref (Block4Data* _data4_); +static FolksInspectCommand* folks_inspect_client_parse_command_line (const gchar* command_line, gchar** command_name, gchar** subcommand); +static void __lambda3_ (Block4Data* _data4_, GObject* obj, GAsyncResult* res); +void folks_inspect_command_run (FolksInspectCommand* self, const gchar* command_string); +static void ___lambda3__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); +static void* folks_inspect_client_folks_thread_main (FolksInspectClient* self); static gpointer _folks_inspect_client_folks_thread_main_gthread_func (gpointer self); static gchar** folks_inspect_client_completion_cb (const gchar* word, gint start, gint end); static gchar** _folks_inspect_client_completion_cb_rl_completion_func_t (const gchar* str, gint a, gint b); -static FolksInspectCommand* folks_inspect_client_parse_command_line (const gchar* command_line, gchar** command_name, gchar** subcommand); -void folks_inspect_command_run (FolksInspectCommand* self, const gchar* command_string); gchar* folks_inspect_utils_command_name_completion_cb (const gchar* word, gint state); static gchar* _folks_inspect_utils_command_name_completion_cb_rl_compentry_func_t (const gchar* str, gint a); static gchar** _vala_array_dup11 (gchar** self, int length); gchar** folks_inspect_command_complete_subcommand (FolksInspectCommand* self, const gchar* subcommand, int* result_length1); +FolksBackendStore* folks_inspect_client_get_backend_store (FolksInspectClient* self); FolksInspectSignalManager* folks_inspect_client_get_signal_manager (FolksInspectClient* self); static void folks_inspect_client_finalize (GObject* obj); static void _vala_folks_inspect_client_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec); @@ -306,158 +349,115 @@ gint folks_inspect_client_main (gchar** args, int args_length1) { gint result = 0; - FolksInspectClient* _tmp0_; - FolksInspectClient* _tmp1_; - _tmp0_ = folks_inspect_client_new (); - _g_object_unref0 (main_client); - main_client = _tmp0_; - _tmp1_ = main_client; - folks_inspect_client_run_interactive (_tmp1_); - result = 0; - return result; -} - - -int main (int argc, char ** argv) { - g_type_init (); - return folks_inspect_client_main (argv, argc); -} - - -static Block3Data* block3_data_ref (Block3Data* _data3_) { - g_atomic_int_inc (&_data3_->_ref_count_); - return _data3_; -} - - -static void block3_data_unref (Block3Data* _data3_) { - if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { - _g_object_unref0 (_data3_->self); - _g_object_unref0 (_data3_->backend); - g_slice_free (Block3Data, _data3_); - } -} - - -static gpointer _g_object_ref0 (gpointer self) { - return self ? g_object_ref (self) : NULL; -} - - -static void __lambda3_ (Block3Data* _data3_, GObject* obj, GAsyncResult* _result_) { - FolksInspectClient * self; + GOptionContext* _tmp0_; + GOptionContext* context; + GOptionContext* _tmp1_; + FolksInspectClient* _tmp6_; + gchar** _tmp7_; + gint _tmp7__length1; GError * _inner_error_ = NULL; - self = _data3_->self; - g_return_if_fail (_result_ != NULL); + bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR); + textdomain (GETTEXT_PACKAGE); + _tmp0_ = g_option_context_new ("[COMMAND]"); + context = _tmp0_; + _tmp1_ = context; + g_option_context_set_summary (_tmp1_, "Inspect meta-contact information in libfolks."); { - GAsyncResult* _tmp0_; - _tmp0_ = _result_; - folks_backend_prepare_finish (_data3_->backend, _tmp0_, &_inner_error_); + GOptionContext* _tmp2_; + _tmp2_ = context; + g_option_context_parse (_tmp2_, &args_length1, &args, &_inner_error_); if (_inner_error_ != NULL) { - goto __catch2_g_error; + if (_inner_error_->domain == G_OPTION_ERROR) { + goto __catch2_g_option_error; + } + _g_option_context_free0 (context); + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return 0; } } goto __finally2; - __catch2_g_error: + __catch2_g_option_error: { - GError* e = NULL; - const gchar* _tmp1_; - const gchar* _tmp2_; - GError* _tmp3_; - const gchar* _tmp4_; - e = _inner_error_; + GError* e1 = NULL; + FILE* _tmp3_; + GError* _tmp4_; + const gchar* _tmp5_; + e1 = _inner_error_; _inner_error_ = NULL; - _tmp1_ = folks_backend_get_name (_data3_->backend); - _tmp2_ = _tmp1_; - _tmp3_ = e; - _tmp4_ = _tmp3_->message; - g_warning ("inspect.vala:70: Error preparing Backend '%s': %s", _tmp2_, _tmp4_); - _g_error_free0 (e); + _tmp3_ = stderr; + _tmp4_ = e1; + _tmp5_ = _tmp4_->message; + fprintf (_tmp3_, "Couldn’t parse command line options: %s\n", _tmp5_); + result = 1; + _g_error_free0 (e1); + _g_option_context_free0 (context); + return result; } __finally2: if (_inner_error_ != NULL) { + _g_option_context_free0 (context); g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); - return; + return 0; } -} - - -static void ___lambda3__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { - __lambda3_ (self, source_object, res); - block3_data_unref (self); -} - - -static void __lambda2_ (FolksInspectClient* self, FolksBackendStore* bs, FolksBackend* b) { - Block3Data* _data3_; - FolksBackend* _tmp0_; - FolksBackend* _tmp1_; - g_return_if_fail (bs != NULL); - g_return_if_fail (b != NULL); - _data3_ = g_slice_new0 (Block3Data); - _data3_->_ref_count_ = 1; - _data3_->self = g_object_ref (self); - _tmp0_ = b; - _tmp1_ = _g_object_ref0 (FOLKS_BACKEND (_tmp0_)); - _data3_->backend = _tmp1_; - folks_backend_prepare (_data3_->backend, ___lambda3__gasync_ready_callback, block3_data_ref (_data3_)); - block3_data_unref (_data3_); - _data3_ = NULL; -} - - -static void ___lambda2__folks_backend_store_backend_available (FolksBackendStore* _sender, FolksBackend* backend, gpointer self) { - __lambda2_ (self, _sender, backend); -} - - -static void* folks_inspect_client_folks_thread_main (FolksInspectClient* self) { - void* result = NULL; - GMainLoop* _tmp0_; - FolksInspectSignalManager* _tmp1_; - FolksInspectSignalManager* _tmp2_; - FolksIndividualAggregator* _tmp3_; - FolksIndividualAggregator* _tmp4_; - FolksIndividualAggregator* _tmp5_; - FolksBackendStore* _tmp6_ = NULL; - FolksBackendStore* _tmp7_; - FolksBackendStore* _tmp8_; - FolksBackendStore* _tmp9_; - GMainLoop* _tmp10_; - g_return_val_if_fail (self != NULL, NULL); - _tmp0_ = g_main_loop_new (NULL, FALSE); - _g_main_loop_unref0 (self->priv->main_loop); - self->priv->main_loop = _tmp0_; - _tmp1_ = folks_inspect_signal_manager_new (); - _tmp2_ = _tmp1_; - folks_inspect_client_set_signal_manager (self, _tmp2_); - _g_object_unref0 (_tmp2_); - _tmp3_ = folks_individual_aggregator_new (); - _tmp4_ = _tmp3_; - folks_inspect_client_set_aggregator (self, _tmp4_); - _g_object_unref0 (_tmp4_); - _tmp5_ = self->priv->_aggregator; - folks_individual_aggregator_prepare (_tmp5_, NULL, NULL); - _tmp6_ = folks_backend_store_dup (); - _tmp7_ = _tmp6_; - folks_inspect_client_set_backend_store (self, _tmp7_); - _g_object_unref0 (_tmp7_); - _tmp8_ = self->priv->_backend_store; - g_signal_connect_object (_tmp8_, "backend-available", (GCallback) ___lambda2__folks_backend_store_backend_available, self, 0); - _tmp9_ = self->priv->_backend_store; - folks_backend_store_load_backends (_tmp9_, NULL, NULL); - _tmp10_ = self->priv->main_loop; - g_main_loop_run (_tmp10_); - result = NULL; + _tmp6_ = folks_inspect_client_new (); + _g_object_unref0 (main_client); + main_client = _tmp6_; + _tmp7_ = args; + _tmp7__length1 = args_length1; + if (_tmp7__length1 == 1) { + FolksInspectClient* _tmp8_; + _tmp8_ = main_client; + folks_inspect_client_run_interactive (_tmp8_); + } else { + gchar** _tmp9_; + gint _tmp9__length1; + gchar* command_line = NULL; + gchar** _tmp10_; + gint _tmp10__length1; + const gchar* _tmp11_; + FolksInspectClient* _tmp16_; + const gchar* _tmp17_; + _tmp9_ = args; + _tmp9__length1 = args_length1; + g_assert (_tmp9__length1 > 1); + _tmp10_ = args; + _tmp10__length1 = args_length1; + _tmp11_ = _tmp10_[1]; + if (g_strcmp0 (_tmp11_, "--") == 0) { + gchar** _tmp12_; + gint _tmp12__length1; + gchar* _tmp13_ = NULL; + _tmp12_ = args; + _tmp12__length1 = args_length1; + _tmp13_ = g_strjoinv (" ", _tmp12_ + 2); + _g_free0 (command_line); + command_line = _tmp13_; + } else { + gchar** _tmp14_; + gint _tmp14__length1; + gchar* _tmp15_ = NULL; + _tmp14_ = args; + _tmp14__length1 = args_length1; + _tmp15_ = g_strjoinv (" ", _tmp14_ + 1); + _g_free0 (command_line); + command_line = _tmp15_; + } + _tmp16_ = main_client; + _tmp17_ = command_line; + folks_inspect_client_run_non_interactive (_tmp16_, _tmp17_); + _g_free0 (command_line); + } + result = 0; + _g_option_context_free0 (context); return result; } -static gpointer _folks_inspect_client_folks_thread_main_gthread_func (gpointer self) { - gpointer result; - result = folks_inspect_client_folks_thread_main (self); - return result; +int main (int argc, char ** argv) { + g_type_init (); + return folks_inspect_client_main (argv, argc); } @@ -493,7 +493,13 @@ GeeHashMap* _tmp27_; FolksInspectCommandsDebug* _tmp28_; FolksInspectCommandsDebug* _tmp29_; - GError * _inner_error_ = NULL; + GMainLoop* _tmp30_; + FolksInspectSignalManager* _tmp31_; + FolksInspectSignalManager* _tmp32_; + FolksBackendStore* _tmp33_ = NULL; + FolksBackendStore* _tmp34_; + FolksIndividualAggregator* _tmp35_; + FolksIndividualAggregator* _tmp36_; self = (FolksInspectClient*) g_object_new (object_type, NULL); folks_inspect_utils_init (); _tmp0_ = g_str_hash; @@ -546,47 +552,312 @@ _tmp29_ = _tmp28_; gee_abstract_map_set ((GeeAbstractMap*) _tmp27_, "debug", (FolksInspectCommand*) _tmp29_); _folks_inspect_command_unref0 (_tmp29_); + _tmp30_ = g_main_loop_new (NULL, FALSE); + _g_main_loop_unref0 (self->priv->main_loop); + self->priv->main_loop = _tmp30_; + _tmp31_ = folks_inspect_signal_manager_new (); + _tmp32_ = _tmp31_; + folks_inspect_client_set_signal_manager (self, _tmp32_); + _g_object_unref0 (_tmp32_); + _tmp33_ = folks_backend_store_dup (); + _tmp34_ = _tmp33_; + folks_inspect_client_set_backend_store (self, _tmp34_); + _g_object_unref0 (_tmp34_); + _tmp35_ = folks_individual_aggregator_new (); + _tmp36_ = _tmp35_; + folks_inspect_client_set_aggregator (self, _tmp36_); + _g_object_unref0 (_tmp36_); + return self; +} + + +FolksInspectClient* folks_inspect_client_new (void) { + return folks_inspect_client_construct (FOLKS_INSPECT_TYPE_CLIENT); +} + + +static void _folks_inspect_client_wait_for_quiescence_data_free (gpointer _data) { + FolksInspectClientWaitForQuiescenceData* _data_; + _data_ = _data; + _g_object_unref0 (_data_->self); + g_slice_free (FolksInspectClientWaitForQuiescenceData, _data_); +} + + +static gpointer _g_object_ref0 (gpointer self) { + return self ? g_object_ref (self) : NULL; +} + + +static void _folks_inspect_client_wait_for_quiescence (FolksInspectClient* self, GAsyncReadyCallback _callback_, gpointer _user_data_) { + FolksInspectClientWaitForQuiescenceData* _data_; + FolksInspectClient* _tmp0_; + _data_ = g_slice_new0 (FolksInspectClientWaitForQuiescenceData); + _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, _folks_inspect_client_wait_for_quiescence); + g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, _folks_inspect_client_wait_for_quiescence_data_free); + _tmp0_ = _g_object_ref0 (self); + _data_->self = _tmp0_; + _folks_inspect_client_wait_for_quiescence_co (_data_); +} + + +static void _folks_inspect_client_wait_for_quiescence_finish (FolksInspectClient* self, GAsyncResult* _res_, GError** error) { + FolksInspectClientWaitForQuiescenceData* _data_; + if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { + return; + } + _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); +} + + +static Block3Data* block3_data_ref (Block3Data* _data3_) { + g_atomic_int_inc (&_data3_->_ref_count_); + return _data3_; +} + + +static void block3_data_unref (Block3Data* _data3_) { + if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { + FolksInspectClient * self; + self = _data3_->self; + _g_object_unref0 (self); + g_slice_free (Block3Data, _data3_); + } +} + + +static void __lambda2_ (Block3Data* _data3_, GObject* obj, GParamSpec* pspec) { + FolksInspectClient * self; + gboolean _tmp0_; + self = _data3_->self; + g_return_if_fail (obj != NULL); + g_return_if_fail (pspec != NULL); + _tmp0_ = _data3_->has_yielded; + if (_tmp0_ == TRUE) { + _folks_inspect_client_wait_for_quiescence_co (_data3_->_async_data_); + } +} + + +static void ___lambda2__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { + __lambda2_ (self, _sender, pspec); +} + + +static void _folks_inspect_client_wait_for_quiescence_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { + FolksInspectClientWaitForQuiescenceData* _data_; + _data_ = _user_data_; + _data_->_source_object_ = source_object; + _data_->_res_ = _res_; + _folks_inspect_client_wait_for_quiescence_co (_data_); +} + + +static gboolean _folks_inspect_client_wait_for_quiescence_co (FolksInspectClientWaitForQuiescenceData* _data_) { + switch (_data_->_state_) { + case 0: + goto _state_0; + case 1: + goto _state_1; + case 2: + goto _state_2; + default: + g_assert_not_reached (); + } + _state_0: + _data_->_data3_ = g_slice_new0 (Block3Data); + _data_->_data3_->_ref_count_ = 1; + _data_->_data3_->self = g_object_ref (_data_->self); + _data_->_data3_->_async_data_ = _data_; + _data_->_data3_->has_yielded = FALSE; + _data_->_tmp0_ = _data_->self->priv->_aggregator; + _data_->_tmp1_ = 0UL; + _data_->_tmp1_ = g_signal_connect_data ((GObject*) _data_->_tmp0_, "notify::is-quiescent", (GCallback) ___lambda2__g_object_notify, block3_data_ref (_data_->_data3_), (GClosureNotify) block3_data_unref, 0); + _data_->signal_id = _data_->_tmp1_; + { + _data_->_tmp2_ = _data_->self->priv->_aggregator; + _data_->_state_ = 1; + folks_individual_aggregator_prepare (_data_->_tmp2_, _folks_inspect_client_wait_for_quiescence_ready, _data_); + return FALSE; + _state_1: + folks_individual_aggregator_prepare_finish (_data_->_tmp2_, _data_->_res_, &_data_->_inner_error_); + if (_data_->_inner_error_ != NULL) { + goto __finally3; + } + _data_->_tmp3_ = _data_->self->priv->_aggregator; + _data_->_tmp4_ = folks_individual_aggregator_get_is_quiescent (_data_->_tmp3_); + _data_->_tmp5_ = _data_->_tmp4_; + if (_data_->_tmp5_ == FALSE) { + _data_->_data3_->has_yielded = TRUE; + _data_->_state_ = 2; + return FALSE; + _state_2: + ; + } + } + __finally3: { - GThread* _tmp30_ = NULL; - GThread* _tmp31_; - _tmp30_ = g_thread_create (_folks_inspect_client_folks_thread_main_gthread_func, self, TRUE, &_inner_error_); - _tmp31_ = _tmp30_; + _data_->_tmp6_ = _data_->self->priv->_aggregator; + _data_->_tmp7_ = _data_->signal_id; + g_signal_handler_disconnect ((GObject*) _data_->_tmp6_, _data_->_tmp7_); + _data_->_tmp8_ = _data_->self->priv->_aggregator; + _data_->_tmp9_ = folks_individual_aggregator_get_is_quiescent (_data_->_tmp8_); + _data_->_tmp10_ = _data_->_tmp9_; + g_assert (_data_->_tmp10_ == TRUE); + } + if (_data_->_inner_error_ != NULL) { + g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); + g_error_free (_data_->_inner_error_); + block3_data_unref (_data_->_data3_); + _data_->_data3_ = NULL; + if (_data_->_state_ == 0) { + g_simple_async_result_complete_in_idle (_data_->_async_result); + } else { + g_simple_async_result_complete (_data_->_async_result); + } + g_object_unref (_data_->_async_result); + return FALSE; + } + block3_data_unref (_data_->_data3_); + _data_->_data3_ = NULL; + if (_data_->_state_ == 0) { + g_simple_async_result_complete_in_idle (_data_->_async_result); + } else { + g_simple_async_result_complete (_data_->_async_result); + } + g_object_unref (_data_->_async_result); + return FALSE; +} + + +static Block4Data* block4_data_ref (Block4Data* _data4_) { + g_atomic_int_inc (&_data4_->_ref_count_); + return _data4_; +} + + +static void block4_data_unref (Block4Data* _data4_) { + if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) { + FolksInspectClient * self; + self = _data4_->self; + _folks_inspect_command_unref0 (_data4_->command); + _g_free0 (_data4_->subcommand); + _g_object_unref0 (self); + g_slice_free (Block4Data, _data4_); + } +} + + +static void __lambda3_ (Block4Data* _data4_, GObject* obj, GAsyncResult* res) { + FolksInspectClient * self; + FolksInspectCommand* _tmp3_; + const gchar* _tmp4_; + GMainLoop* _tmp5_; + GError * _inner_error_ = NULL; + self = _data4_->self; + g_return_if_fail (res != NULL); + { + GAsyncResult* _tmp0_; + _tmp0_ = res; + _folks_inspect_client_wait_for_quiescence_finish (self, _tmp0_, &_inner_error_); if (_inner_error_ != NULL) { - if (_inner_error_->domain == G_THREAD_ERROR) { - goto __catch3_g_thread_error; - } - g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); - g_clear_error (&_inner_error_); - return NULL; + goto __catch4_g_error; } - self->priv->folks_thread = _tmp31_; } - goto __finally3; - __catch3_g_thread_error: + goto __finally4; + __catch4_g_error: { - GError* e = NULL; - FILE* _tmp32_; - const gchar* _tmp33_; - e = _inner_error_; + GError* e1 = NULL; + FILE* _tmp1_; + const gchar* _tmp2_; + e1 = _inner_error_; _inner_error_ = NULL; - _tmp32_ = stdout; - _tmp33_ = e->message; - fprintf (_tmp32_, "Couldn't create aggregator thread: %s", _tmp33_); + _tmp1_ = stderr; + _tmp2_ = e1->message; + fprintf (_tmp1_, "Error preparing aggregator: %s\n", _tmp2_); exit (1); - _g_error_free0 (e); + _g_error_free0 (e1); } - __finally3: + __finally4: if (_inner_error_ != NULL) { g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); g_clear_error (&_inner_error_); - return NULL; + return; } - return self; + _tmp3_ = _data4_->command; + _tmp4_ = _data4_->subcommand; + folks_inspect_command_run (_tmp3_, _tmp4_); + _tmp5_ = self->priv->main_loop; + g_main_loop_quit (_tmp5_); } -FolksInspectClient* folks_inspect_client_new (void) { - return folks_inspect_client_construct (FOLKS_INSPECT_TYPE_CLIENT); +static void ___lambda3__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { + __lambda3_ (self, source_object, res); + block4_data_unref (self); +} + + +void folks_inspect_client_run_non_interactive (FolksInspectClient* self, const gchar* command_line) { + Block4Data* _data4_; + gchar* command_name = NULL; + const gchar* _tmp0_; + gchar* _tmp1_ = NULL; + gchar* _tmp2_ = NULL; + FolksInspectCommand* _tmp3_ = NULL; + FolksInspectCommand* _tmp4_; + GMainLoop* _tmp7_; + g_return_if_fail (self != NULL); + g_return_if_fail (command_line != NULL); + _data4_ = g_slice_new0 (Block4Data); + _data4_->_ref_count_ = 1; + _data4_->self = g_object_ref (self); + _tmp0_ = command_line; + _tmp3_ = folks_inspect_client_parse_command_line (_tmp0_, &_tmp1_, &_tmp2_); + _g_free0 (command_name); + command_name = _tmp1_; + _g_free0 (_data4_->subcommand); + _data4_->subcommand = _tmp2_; + _data4_->command = _tmp3_; + _tmp4_ = _data4_->command; + if (_tmp4_ == NULL) { + FILE* _tmp5_; + const gchar* _tmp6_; + _tmp5_ = stdout; + _tmp6_ = command_name; + fprintf (_tmp5_, "Unrecognised command ‘%s’.\n", _tmp6_); + _g_free0 (command_name); + block4_data_unref (_data4_); + _data4_ = NULL; + return; + } + _folks_inspect_client_wait_for_quiescence (self, ___lambda3__gasync_ready_callback, block4_data_ref (_data4_)); + _tmp7_ = self->priv->main_loop; + g_main_loop_run (_tmp7_); + _g_free0 (command_name); + block4_data_unref (_data4_); + _data4_ = NULL; +} + + +static void* folks_inspect_client_folks_thread_main (FolksInspectClient* self) { + void* result = NULL; + FolksIndividualAggregator* _tmp0_; + GMainLoop* _tmp1_; + g_return_val_if_fail (self != NULL, NULL); + _tmp0_ = self->priv->_aggregator; + folks_individual_aggregator_prepare (_tmp0_, NULL, NULL); + _tmp1_ = self->priv->main_loop; + g_main_loop_run (_tmp1_); + result = NULL; + return result; +} + + +static gpointer _folks_inspect_client_folks_thread_main_gthread_func (gpointer self) { + gpointer result; + result = folks_inspect_client_folks_thread_main (self); + return result; } @@ -641,64 +912,100 @@ void folks_inspect_client_run_interactive (FolksInspectClient* self) { + GError * _inner_error_ = NULL; g_return_if_fail (self != NULL); + { + GThread* _tmp0_ = NULL; + GThread* _tmp1_; + _tmp0_ = g_thread_create (_folks_inspect_client_folks_thread_main_gthread_func, self, TRUE, &_inner_error_); + _tmp1_ = _tmp0_; + if (_inner_error_ != NULL) { + if (_inner_error_->domain == G_THREAD_ERROR) { + goto __catch5_g_thread_error; + } + g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return; + } + self->priv->folks_thread = _tmp1_; + } + goto __finally5; + __catch5_g_thread_error: + { + GError* e = NULL; + FILE* _tmp2_; + const gchar* _tmp3_; + e = _inner_error_; + _inner_error_ = NULL; + _tmp2_ = stdout; + _tmp3_ = e->message; + fprintf (_tmp2_, "Couldn't create aggregator thread: %s", _tmp3_); + exit (1); + _g_error_free0 (e); + } + __finally5: + if (_inner_error_ != NULL) { + g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); + g_clear_error (&_inner_error_); + return; + } rl_readline_name = "folks-inspect"; rl_attempted_completion_function = _folks_inspect_client_completion_cb_rl_completion_func_t; while (TRUE) { - gchar* _tmp0_ = NULL; + gchar* _tmp4_ = NULL; gchar* command_line; - const gchar* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_; - gchar* subcommand = NULL; - gchar* command_name = NULL; const gchar* _tmp5_; - gchar* _tmp6_ = NULL; + const gchar* _tmp6_; gchar* _tmp7_ = NULL; - FolksInspectCommand* _tmp8_ = NULL; + const gchar* _tmp8_; + gchar* subcommand = NULL; + gchar* command_name = NULL; + const gchar* _tmp9_; + gchar* _tmp10_ = NULL; + gchar* _tmp11_ = NULL; + FolksInspectCommand* _tmp12_ = NULL; FolksInspectCommand* command; - FolksInspectCommand* _tmp9_; - const gchar* _tmp14_; - _tmp0_ = __readline ("> "); - command_line = _tmp0_; - _tmp1_ = command_line; - if (_tmp1_ == NULL) { + FolksInspectCommand* _tmp13_; + const gchar* _tmp18_; + _tmp4_ = __readline ("> "); + command_line = _tmp4_; + _tmp5_ = command_line; + if (_tmp5_ == NULL) { _g_free0 (command_line); continue; } - _tmp2_ = command_line; - _tmp3_ = string_strip (_tmp2_); + _tmp6_ = command_line; + _tmp7_ = string_strip (_tmp6_); _g_free0 (command_line); - command_line = _tmp3_; - _tmp4_ = command_line; - if (g_strcmp0 (_tmp4_, "") == 0) { + command_line = _tmp7_; + _tmp8_ = command_line; + if (g_strcmp0 (_tmp8_, "") == 0) { _g_free0 (command_line); continue; } - _tmp5_ = command_line; - _tmp8_ = folks_inspect_client_parse_command_line (_tmp5_, &_tmp6_, &_tmp7_); + _tmp9_ = command_line; + _tmp12_ = folks_inspect_client_parse_command_line (_tmp9_, &_tmp10_, &_tmp11_); _g_free0 (command_name); - command_name = _tmp6_; + command_name = _tmp10_; _g_free0 (subcommand); - subcommand = _tmp7_; - command = _tmp8_; - _tmp9_ = command; - if (_tmp9_ != NULL) { - FolksInspectCommand* _tmp10_; - const gchar* _tmp11_; - _tmp10_ = command; - _tmp11_ = subcommand; - folks_inspect_command_run (_tmp10_, _tmp11_); + subcommand = _tmp11_; + command = _tmp12_; + _tmp13_ = command; + if (_tmp13_ != NULL) { + FolksInspectCommand* _tmp14_; + const gchar* _tmp15_; + _tmp14_ = command; + _tmp15_ = subcommand; + folks_inspect_command_run (_tmp14_, _tmp15_); } else { - FILE* _tmp12_; - const gchar* _tmp13_; - _tmp12_ = stdout; - _tmp13_ = command_name; - fprintf (_tmp12_, "Unrecognised command '%s'.\n", _tmp13_); + FILE* _tmp16_; + const gchar* _tmp17_; + _tmp16_ = stdout; + _tmp17_ = command_name; + fprintf (_tmp16_, "Unrecognised command '%s'.\n", _tmp17_); } - _tmp14_ = command_line; - add_history (_tmp14_); + _tmp18_ = command_line; + add_history (_tmp18_); _folks_inspect_command_unref0 (command); _g_free0 (command_name); _g_free0 (subcommand); diff -Nru folks-0.6.6/tools/inspect/inspect.vala folks-0.6.7/tools/inspect/inspect.vala --- folks-0.6.6/tools/inspect/inspect.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/tools/inspect/inspect.vala 2012-02-17 23:39:51.000000000 +0000 @@ -39,45 +39,52 @@ public static int main (string[] args) { - main_client = new Client (); - main_client.run_interactive (); + Intl.bindtextdomain (BuildConf.GETTEXT_PACKAGE, BuildConf.LOCALE_DIR); + Intl.textdomain (BuildConf.GETTEXT_PACKAGE); - return 0; - } + /* Parse command line options. */ + OptionContext context = new OptionContext ("[COMMAND]"); + context.set_summary ("Inspect meta-contact information in libfolks."); - private void *folks_thread_main () - { - this.main_loop = new MainLoop (); - - this.signal_manager = new SignalManager (); + try + { + context.parse (ref args); + } + catch (OptionError e1) + { + stderr.printf ("Couldn’t parse command line options: %s\n", + e1.message); + return 1; + } - this.aggregator = new IndividualAggregator (); - this.aggregator.prepare (); + /* Create the client and run the command. */ + main_client = new Client (); - this.backend_store = BackendStore.dup (); - this.backend_store.backend_available.connect ((bs, b) => + if (args.length == 1) { - Backend backend = (Backend) b; + main_client.run_interactive (); + } + else + { + assert (args.length > 1); - backend.prepare.begin ((obj, result) => + /* Drop the first argument and parse the rest as a command line. If + * the first argument is ‘--’ then the command was passed after some + * flags. */ + string command_line; + if (args[1] == "--") { - try - { - backend.prepare.end (result); - } - catch (GLib.Error e) - { - warning ("Error preparing Backend '%s': %s", backend.name, - e.message); - } - }); - }); - - this.backend_store.load_backends (); + command_line = string.joinv (" ", args[2:0]); + } + else + { + command_line = string.joinv (" ", args[1:0]); + } - this.main_loop.run (); + main_client.run_non_interactive (command_line); + } - return null; + return 0; } public Client () @@ -98,22 +105,109 @@ this.commands.set ("signals", new Commands.Signals (this)); this.commands.set ("debug", new Commands.Debug (this)); + /* Create various bits of folks machinery. */ + this.main_loop = new MainLoop (); + this.signal_manager = new SignalManager (); + this.backend_store = BackendStore.dup (); + this.aggregator = new IndividualAggregator (); + } + + private async void _wait_for_quiescence () throws GLib.Error + { + var has_yielded = false; + var signal_id = this.aggregator.notify["is-quiescent"].connect ( + (obj, pspec) => + { + if (has_yielded == true) + { + this._wait_for_quiescence.callback (); + } + }); + try { - this.folks_thread = Thread.create ( - this.folks_thread_main, true); + yield this.aggregator.prepare (); + + if (this.aggregator.is_quiescent == false) + { + has_yielded = true; + yield; + } } - catch (ThreadError e) + finally { - stdout.printf ("Couldn't create aggregator thread: %s", e.message); - Process.exit (1); + this.aggregator.disconnect (signal_id); + assert (this.aggregator.is_quiescent == true); } } + public void run_non_interactive (string command_line) + { + /* Non-interactive mode: run a single command and output the results. + * We do this all from the main thread, in a main loop, waiting for + * quiescence before running the command. */ + + /* Check we can parse the command first. */ + string subcommand; + string command_name; + var command = this.parse_command_line (command_line, out command_name, + out subcommand); + + if (command == null) + { + stdout.printf ("Unrecognised command ‘%s’.\n", command_name); + return; + } + + /* Wait until we reach quiescence, or the results will probably be + * useless. */ + this._wait_for_quiescence.begin ((obj, res) => + { + try + { + this._wait_for_quiescence.end (res); + } + catch (GLib.Error e1) + { + stderr.printf ("Error preparing aggregator: %s\n", e1.message); + Process.exit (1); + } + + /* Run the command */ + command.run (subcommand); + + this.main_loop.quit (); + }); + + this.main_loop.run (); + } + + private void *folks_thread_main () + { + this.aggregator.prepare (); + this.main_loop.run (); + + return null; + } + public void run_interactive () { /* Interactive mode: have a little shell which allows the data from - * libfolks to be browsed and edited in real time. */ + * libfolks to be browsed and edited in real time. We do this by spawning + * a second thread which takes care of the main loop and aggregator. The + * main thread then sits in a readline loop. */ + + /* Spawn the folks worker thread. */ + try + { + this.folks_thread = Thread.create ( + this.folks_thread_main, true); + } + catch (ThreadError e) + { + stdout.printf ("Couldn't create aggregator thread: %s", e.message); + Process.exit (1); + } /* Allow things to be set for folks-inspect in ~/.inputrc, and install our * own completion function. */ @@ -205,7 +299,7 @@ } } -private abstract class Folks.Inspect.Command +public abstract class Folks.Inspect.Command { protected Client client; diff -Nru folks-0.6.6/tools/inspect/Makefile.am folks-0.6.7/tools/inspect/Makefile.am --- folks-0.6.6/tools/inspect/Makefile.am 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/tools/inspect/Makefile.am 2012-01-12 17:25:24.000000000 +0000 @@ -1,10 +1,12 @@ VALAFLAGS = \ + $(AM_VALAFLAGS) \ --vapidir=$(top_srcdir)/folks \ --pkg=readline \ --pkg=gobject-2.0 \ --pkg=gio-2.0 \ --pkg=gee-1.0 \ --pkg=folks \ + --pkg=build-conf \ $(NULL) bin_PROGRAMS = folks-inspect @@ -24,14 +26,21 @@ inspect.vala \ $(NULL) folks_inspect_LDADD = \ + $(AM_LDADD) \ $(LIBREADLINE) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(top_builddir)/folks/libfolks.la \ $(NULL) -folks_inspect_CFLAGS = \ +folks_inspect_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -include $(CONFIG_HEADER) \ + -DLOCALE_DIR=\"$(pkgdatadir)/locale\" \ -I$(top_srcdir)/folks \ + $(NULL) +folks_inspect_CFLAGS = \ + $(AM_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ diff -Nru folks-0.6.6/tools/inspect/Makefile.in folks-0.6.7/tools/inspect/Makefile.in --- folks-0.6.6/tools/inspect/Makefile.in 2011-12-13 23:38:46.000000000 +0000 +++ folks-0.6.7/tools/inspect/Makefile.in 2012-02-23 00:04:14.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -44,10 +44,11 @@ signal-manager.c utils.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -136,6 +137,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -246,12 +249,14 @@ VALADOC_CFLAGS = @VALADOC_CFLAGS@ VALADOC_LIBS = @VALADOC_LIBS@ VALAFLAGS = \ + $(AM_VALAFLAGS) \ --vapidir=$(top_srcdir)/folks \ --pkg=readline \ --pkg=gobject-2.0 \ --pkg=gio-2.0 \ --pkg=gee-1.0 \ --pkg=folks \ + --pkg=build-conf \ $(NULL) VAPIDIR = @VAPIDIR@ @@ -327,6 +332,7 @@ $(NULL) folks_inspect_LDADD = \ + $(AM_LDADD) \ $(LIBREADLINE) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ @@ -334,8 +340,15 @@ $(top_builddir)/folks/libfolks.la \ $(NULL) -folks_inspect_CFLAGS = \ +folks_inspect_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -include $(CONFIG_HEADER) \ + -DLOCALE_DIR=\"$(pkgdatadir)/locale\" \ -I$(top_srcdir)/folks \ + $(NULL) + +folks_inspect_CFLAGS = \ + $(AM_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ @@ -449,276 +462,249 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< folks_inspect-command-backends.o: command-backends.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-backends.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-backends.Tpo -c -o folks_inspect-command-backends.o `test -f 'command-backends.c' || echo '$(srcdir)/'`command-backends.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-backends.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-backends.Tpo -c -o folks_inspect-command-backends.o `test -f 'command-backends.c' || echo '$(srcdir)/'`command-backends.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-backends.Tpo $(DEPDIR)/folks_inspect-command-backends.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-backends.c' object='folks_inspect-command-backends.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-backends.c' object='folks_inspect-command-backends.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-backends.o `test -f 'command-backends.c' || echo '$(srcdir)/'`command-backends.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-backends.o `test -f 'command-backends.c' || echo '$(srcdir)/'`command-backends.c folks_inspect-command-backends.obj: command-backends.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-backends.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-backends.Tpo -c -o folks_inspect-command-backends.obj `if test -f 'command-backends.c'; then $(CYGPATH_W) 'command-backends.c'; else $(CYGPATH_W) '$(srcdir)/command-backends.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-backends.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-backends.Tpo -c -o folks_inspect-command-backends.obj `if test -f 'command-backends.c'; then $(CYGPATH_W) 'command-backends.c'; else $(CYGPATH_W) '$(srcdir)/command-backends.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-backends.Tpo $(DEPDIR)/folks_inspect-command-backends.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-backends.c' object='folks_inspect-command-backends.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-backends.c' object='folks_inspect-command-backends.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-backends.obj `if test -f 'command-backends.c'; then $(CYGPATH_W) 'command-backends.c'; else $(CYGPATH_W) '$(srcdir)/command-backends.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-backends.obj `if test -f 'command-backends.c'; then $(CYGPATH_W) 'command-backends.c'; else $(CYGPATH_W) '$(srcdir)/command-backends.c'; fi` folks_inspect-command-debug.o: command-debug.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-debug.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-debug.Tpo -c -o folks_inspect-command-debug.o `test -f 'command-debug.c' || echo '$(srcdir)/'`command-debug.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-debug.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-debug.Tpo -c -o folks_inspect-command-debug.o `test -f 'command-debug.c' || echo '$(srcdir)/'`command-debug.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-debug.Tpo $(DEPDIR)/folks_inspect-command-debug.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-debug.c' object='folks_inspect-command-debug.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-debug.c' object='folks_inspect-command-debug.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-debug.o `test -f 'command-debug.c' || echo '$(srcdir)/'`command-debug.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-debug.o `test -f 'command-debug.c' || echo '$(srcdir)/'`command-debug.c folks_inspect-command-debug.obj: command-debug.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-debug.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-debug.Tpo -c -o folks_inspect-command-debug.obj `if test -f 'command-debug.c'; then $(CYGPATH_W) 'command-debug.c'; else $(CYGPATH_W) '$(srcdir)/command-debug.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-debug.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-debug.Tpo -c -o folks_inspect-command-debug.obj `if test -f 'command-debug.c'; then $(CYGPATH_W) 'command-debug.c'; else $(CYGPATH_W) '$(srcdir)/command-debug.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-debug.Tpo $(DEPDIR)/folks_inspect-command-debug.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-debug.c' object='folks_inspect-command-debug.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-debug.c' object='folks_inspect-command-debug.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-debug.obj `if test -f 'command-debug.c'; then $(CYGPATH_W) 'command-debug.c'; else $(CYGPATH_W) '$(srcdir)/command-debug.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-debug.obj `if test -f 'command-debug.c'; then $(CYGPATH_W) 'command-debug.c'; else $(CYGPATH_W) '$(srcdir)/command-debug.c'; fi` folks_inspect-command-help.o: command-help.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-help.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-help.Tpo -c -o folks_inspect-command-help.o `test -f 'command-help.c' || echo '$(srcdir)/'`command-help.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-help.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-help.Tpo -c -o folks_inspect-command-help.o `test -f 'command-help.c' || echo '$(srcdir)/'`command-help.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-help.Tpo $(DEPDIR)/folks_inspect-command-help.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-help.c' object='folks_inspect-command-help.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-help.c' object='folks_inspect-command-help.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-help.o `test -f 'command-help.c' || echo '$(srcdir)/'`command-help.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-help.o `test -f 'command-help.c' || echo '$(srcdir)/'`command-help.c folks_inspect-command-help.obj: command-help.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-help.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-help.Tpo -c -o folks_inspect-command-help.obj `if test -f 'command-help.c'; then $(CYGPATH_W) 'command-help.c'; else $(CYGPATH_W) '$(srcdir)/command-help.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-help.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-help.Tpo -c -o folks_inspect-command-help.obj `if test -f 'command-help.c'; then $(CYGPATH_W) 'command-help.c'; else $(CYGPATH_W) '$(srcdir)/command-help.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-help.Tpo $(DEPDIR)/folks_inspect-command-help.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-help.c' object='folks_inspect-command-help.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-help.c' object='folks_inspect-command-help.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-help.obj `if test -f 'command-help.c'; then $(CYGPATH_W) 'command-help.c'; else $(CYGPATH_W) '$(srcdir)/command-help.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-help.obj `if test -f 'command-help.c'; then $(CYGPATH_W) 'command-help.c'; else $(CYGPATH_W) '$(srcdir)/command-help.c'; fi` folks_inspect-command-individuals.o: command-individuals.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-individuals.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-individuals.Tpo -c -o folks_inspect-command-individuals.o `test -f 'command-individuals.c' || echo '$(srcdir)/'`command-individuals.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-individuals.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-individuals.Tpo -c -o folks_inspect-command-individuals.o `test -f 'command-individuals.c' || echo '$(srcdir)/'`command-individuals.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-individuals.Tpo $(DEPDIR)/folks_inspect-command-individuals.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-individuals.c' object='folks_inspect-command-individuals.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-individuals.c' object='folks_inspect-command-individuals.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-individuals.o `test -f 'command-individuals.c' || echo '$(srcdir)/'`command-individuals.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-individuals.o `test -f 'command-individuals.c' || echo '$(srcdir)/'`command-individuals.c folks_inspect-command-individuals.obj: command-individuals.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-individuals.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-individuals.Tpo -c -o folks_inspect-command-individuals.obj `if test -f 'command-individuals.c'; then $(CYGPATH_W) 'command-individuals.c'; else $(CYGPATH_W) '$(srcdir)/command-individuals.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-individuals.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-individuals.Tpo -c -o folks_inspect-command-individuals.obj `if test -f 'command-individuals.c'; then $(CYGPATH_W) 'command-individuals.c'; else $(CYGPATH_W) '$(srcdir)/command-individuals.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-individuals.Tpo $(DEPDIR)/folks_inspect-command-individuals.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-individuals.c' object='folks_inspect-command-individuals.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-individuals.c' object='folks_inspect-command-individuals.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-individuals.obj `if test -f 'command-individuals.c'; then $(CYGPATH_W) 'command-individuals.c'; else $(CYGPATH_W) '$(srcdir)/command-individuals.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-individuals.obj `if test -f 'command-individuals.c'; then $(CYGPATH_W) 'command-individuals.c'; else $(CYGPATH_W) '$(srcdir)/command-individuals.c'; fi` folks_inspect-command-linking.o: command-linking.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-linking.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-linking.Tpo -c -o folks_inspect-command-linking.o `test -f 'command-linking.c' || echo '$(srcdir)/'`command-linking.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-linking.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-linking.Tpo -c -o folks_inspect-command-linking.o `test -f 'command-linking.c' || echo '$(srcdir)/'`command-linking.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-linking.Tpo $(DEPDIR)/folks_inspect-command-linking.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-linking.c' object='folks_inspect-command-linking.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-linking.c' object='folks_inspect-command-linking.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-linking.o `test -f 'command-linking.c' || echo '$(srcdir)/'`command-linking.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-linking.o `test -f 'command-linking.c' || echo '$(srcdir)/'`command-linking.c folks_inspect-command-linking.obj: command-linking.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-linking.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-linking.Tpo -c -o folks_inspect-command-linking.obj `if test -f 'command-linking.c'; then $(CYGPATH_W) 'command-linking.c'; else $(CYGPATH_W) '$(srcdir)/command-linking.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-linking.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-linking.Tpo -c -o folks_inspect-command-linking.obj `if test -f 'command-linking.c'; then $(CYGPATH_W) 'command-linking.c'; else $(CYGPATH_W) '$(srcdir)/command-linking.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-linking.Tpo $(DEPDIR)/folks_inspect-command-linking.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-linking.c' object='folks_inspect-command-linking.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-linking.c' object='folks_inspect-command-linking.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-linking.obj `if test -f 'command-linking.c'; then $(CYGPATH_W) 'command-linking.c'; else $(CYGPATH_W) '$(srcdir)/command-linking.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-linking.obj `if test -f 'command-linking.c'; then $(CYGPATH_W) 'command-linking.c'; else $(CYGPATH_W) '$(srcdir)/command-linking.c'; fi` folks_inspect-command-persona-stores.o: command-persona-stores.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-persona-stores.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-persona-stores.Tpo -c -o folks_inspect-command-persona-stores.o `test -f 'command-persona-stores.c' || echo '$(srcdir)/'`command-persona-stores.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-persona-stores.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-persona-stores.Tpo -c -o folks_inspect-command-persona-stores.o `test -f 'command-persona-stores.c' || echo '$(srcdir)/'`command-persona-stores.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-persona-stores.Tpo $(DEPDIR)/folks_inspect-command-persona-stores.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-persona-stores.c' object='folks_inspect-command-persona-stores.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-persona-stores.c' object='folks_inspect-command-persona-stores.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-persona-stores.o `test -f 'command-persona-stores.c' || echo '$(srcdir)/'`command-persona-stores.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-persona-stores.o `test -f 'command-persona-stores.c' || echo '$(srcdir)/'`command-persona-stores.c folks_inspect-command-persona-stores.obj: command-persona-stores.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-persona-stores.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-persona-stores.Tpo -c -o folks_inspect-command-persona-stores.obj `if test -f 'command-persona-stores.c'; then $(CYGPATH_W) 'command-persona-stores.c'; else $(CYGPATH_W) '$(srcdir)/command-persona-stores.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-persona-stores.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-persona-stores.Tpo -c -o folks_inspect-command-persona-stores.obj `if test -f 'command-persona-stores.c'; then $(CYGPATH_W) 'command-persona-stores.c'; else $(CYGPATH_W) '$(srcdir)/command-persona-stores.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-persona-stores.Tpo $(DEPDIR)/folks_inspect-command-persona-stores.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-persona-stores.c' object='folks_inspect-command-persona-stores.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-persona-stores.c' object='folks_inspect-command-persona-stores.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-persona-stores.obj `if test -f 'command-persona-stores.c'; then $(CYGPATH_W) 'command-persona-stores.c'; else $(CYGPATH_W) '$(srcdir)/command-persona-stores.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-persona-stores.obj `if test -f 'command-persona-stores.c'; then $(CYGPATH_W) 'command-persona-stores.c'; else $(CYGPATH_W) '$(srcdir)/command-persona-stores.c'; fi` folks_inspect-command-personas.o: command-personas.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-personas.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-personas.Tpo -c -o folks_inspect-command-personas.o `test -f 'command-personas.c' || echo '$(srcdir)/'`command-personas.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-personas.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-personas.Tpo -c -o folks_inspect-command-personas.o `test -f 'command-personas.c' || echo '$(srcdir)/'`command-personas.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-personas.Tpo $(DEPDIR)/folks_inspect-command-personas.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-personas.c' object='folks_inspect-command-personas.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-personas.c' object='folks_inspect-command-personas.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-personas.o `test -f 'command-personas.c' || echo '$(srcdir)/'`command-personas.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-personas.o `test -f 'command-personas.c' || echo '$(srcdir)/'`command-personas.c folks_inspect-command-personas.obj: command-personas.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-personas.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-personas.Tpo -c -o folks_inspect-command-personas.obj `if test -f 'command-personas.c'; then $(CYGPATH_W) 'command-personas.c'; else $(CYGPATH_W) '$(srcdir)/command-personas.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-personas.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-personas.Tpo -c -o folks_inspect-command-personas.obj `if test -f 'command-personas.c'; then $(CYGPATH_W) 'command-personas.c'; else $(CYGPATH_W) '$(srcdir)/command-personas.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-personas.Tpo $(DEPDIR)/folks_inspect-command-personas.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-personas.c' object='folks_inspect-command-personas.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-personas.c' object='folks_inspect-command-personas.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-personas.obj `if test -f 'command-personas.c'; then $(CYGPATH_W) 'command-personas.c'; else $(CYGPATH_W) '$(srcdir)/command-personas.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-personas.obj `if test -f 'command-personas.c'; then $(CYGPATH_W) 'command-personas.c'; else $(CYGPATH_W) '$(srcdir)/command-personas.c'; fi` folks_inspect-command-quit.o: command-quit.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-quit.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-quit.Tpo -c -o folks_inspect-command-quit.o `test -f 'command-quit.c' || echo '$(srcdir)/'`command-quit.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-quit.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-quit.Tpo -c -o folks_inspect-command-quit.o `test -f 'command-quit.c' || echo '$(srcdir)/'`command-quit.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-quit.Tpo $(DEPDIR)/folks_inspect-command-quit.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-quit.c' object='folks_inspect-command-quit.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-quit.c' object='folks_inspect-command-quit.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-quit.o `test -f 'command-quit.c' || echo '$(srcdir)/'`command-quit.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-quit.o `test -f 'command-quit.c' || echo '$(srcdir)/'`command-quit.c folks_inspect-command-quit.obj: command-quit.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-quit.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-quit.Tpo -c -o folks_inspect-command-quit.obj `if test -f 'command-quit.c'; then $(CYGPATH_W) 'command-quit.c'; else $(CYGPATH_W) '$(srcdir)/command-quit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-quit.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-quit.Tpo -c -o folks_inspect-command-quit.obj `if test -f 'command-quit.c'; then $(CYGPATH_W) 'command-quit.c'; else $(CYGPATH_W) '$(srcdir)/command-quit.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-quit.Tpo $(DEPDIR)/folks_inspect-command-quit.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-quit.c' object='folks_inspect-command-quit.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-quit.c' object='folks_inspect-command-quit.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-quit.obj `if test -f 'command-quit.c'; then $(CYGPATH_W) 'command-quit.c'; else $(CYGPATH_W) '$(srcdir)/command-quit.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-quit.obj `if test -f 'command-quit.c'; then $(CYGPATH_W) 'command-quit.c'; else $(CYGPATH_W) '$(srcdir)/command-quit.c'; fi` folks_inspect-command-signals.o: command-signals.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-signals.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-signals.Tpo -c -o folks_inspect-command-signals.o `test -f 'command-signals.c' || echo '$(srcdir)/'`command-signals.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-signals.o -MD -MP -MF $(DEPDIR)/folks_inspect-command-signals.Tpo -c -o folks_inspect-command-signals.o `test -f 'command-signals.c' || echo '$(srcdir)/'`command-signals.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-signals.Tpo $(DEPDIR)/folks_inspect-command-signals.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-signals.c' object='folks_inspect-command-signals.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-signals.c' object='folks_inspect-command-signals.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-signals.o `test -f 'command-signals.c' || echo '$(srcdir)/'`command-signals.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-signals.o `test -f 'command-signals.c' || echo '$(srcdir)/'`command-signals.c folks_inspect-command-signals.obj: command-signals.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-signals.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-signals.Tpo -c -o folks_inspect-command-signals.obj `if test -f 'command-signals.c'; then $(CYGPATH_W) 'command-signals.c'; else $(CYGPATH_W) '$(srcdir)/command-signals.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-command-signals.obj -MD -MP -MF $(DEPDIR)/folks_inspect-command-signals.Tpo -c -o folks_inspect-command-signals.obj `if test -f 'command-signals.c'; then $(CYGPATH_W) 'command-signals.c'; else $(CYGPATH_W) '$(srcdir)/command-signals.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-command-signals.Tpo $(DEPDIR)/folks_inspect-command-signals.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='command-signals.c' object='folks_inspect-command-signals.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='command-signals.c' object='folks_inspect-command-signals.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-signals.obj `if test -f 'command-signals.c'; then $(CYGPATH_W) 'command-signals.c'; else $(CYGPATH_W) '$(srcdir)/command-signals.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-command-signals.obj `if test -f 'command-signals.c'; then $(CYGPATH_W) 'command-signals.c'; else $(CYGPATH_W) '$(srcdir)/command-signals.c'; fi` folks_inspect-signal-manager.o: signal-manager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-signal-manager.o -MD -MP -MF $(DEPDIR)/folks_inspect-signal-manager.Tpo -c -o folks_inspect-signal-manager.o `test -f 'signal-manager.c' || echo '$(srcdir)/'`signal-manager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-signal-manager.o -MD -MP -MF $(DEPDIR)/folks_inspect-signal-manager.Tpo -c -o folks_inspect-signal-manager.o `test -f 'signal-manager.c' || echo '$(srcdir)/'`signal-manager.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-signal-manager.Tpo $(DEPDIR)/folks_inspect-signal-manager.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='signal-manager.c' object='folks_inspect-signal-manager.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='signal-manager.c' object='folks_inspect-signal-manager.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-signal-manager.o `test -f 'signal-manager.c' || echo '$(srcdir)/'`signal-manager.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-signal-manager.o `test -f 'signal-manager.c' || echo '$(srcdir)/'`signal-manager.c folks_inspect-signal-manager.obj: signal-manager.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-signal-manager.obj -MD -MP -MF $(DEPDIR)/folks_inspect-signal-manager.Tpo -c -o folks_inspect-signal-manager.obj `if test -f 'signal-manager.c'; then $(CYGPATH_W) 'signal-manager.c'; else $(CYGPATH_W) '$(srcdir)/signal-manager.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-signal-manager.obj -MD -MP -MF $(DEPDIR)/folks_inspect-signal-manager.Tpo -c -o folks_inspect-signal-manager.obj `if test -f 'signal-manager.c'; then $(CYGPATH_W) 'signal-manager.c'; else $(CYGPATH_W) '$(srcdir)/signal-manager.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-signal-manager.Tpo $(DEPDIR)/folks_inspect-signal-manager.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='signal-manager.c' object='folks_inspect-signal-manager.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='signal-manager.c' object='folks_inspect-signal-manager.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-signal-manager.obj `if test -f 'signal-manager.c'; then $(CYGPATH_W) 'signal-manager.c'; else $(CYGPATH_W) '$(srcdir)/signal-manager.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-signal-manager.obj `if test -f 'signal-manager.c'; then $(CYGPATH_W) 'signal-manager.c'; else $(CYGPATH_W) '$(srcdir)/signal-manager.c'; fi` folks_inspect-utils.o: utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-utils.o -MD -MP -MF $(DEPDIR)/folks_inspect-utils.Tpo -c -o folks_inspect-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-utils.o -MD -MP -MF $(DEPDIR)/folks_inspect-utils.Tpo -c -o folks_inspect-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-utils.Tpo $(DEPDIR)/folks_inspect-utils.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='utils.c' object='folks_inspect-utils.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utils.c' object='folks_inspect-utils.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c folks_inspect-utils.obj: utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-utils.obj -MD -MP -MF $(DEPDIR)/folks_inspect-utils.Tpo -c -o folks_inspect-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-utils.obj -MD -MP -MF $(DEPDIR)/folks_inspect-utils.Tpo -c -o folks_inspect-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-utils.Tpo $(DEPDIR)/folks_inspect-utils.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='utils.c' object='folks_inspect-utils.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='utils.c' object='folks_inspect-utils.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi` folks_inspect-inspect.o: inspect.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-inspect.o -MD -MP -MF $(DEPDIR)/folks_inspect-inspect.Tpo -c -o folks_inspect-inspect.o `test -f 'inspect.c' || echo '$(srcdir)/'`inspect.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-inspect.o -MD -MP -MF $(DEPDIR)/folks_inspect-inspect.Tpo -c -o folks_inspect-inspect.o `test -f 'inspect.c' || echo '$(srcdir)/'`inspect.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-inspect.Tpo $(DEPDIR)/folks_inspect-inspect.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='inspect.c' object='folks_inspect-inspect.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='inspect.c' object='folks_inspect-inspect.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-inspect.o `test -f 'inspect.c' || echo '$(srcdir)/'`inspect.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-inspect.o `test -f 'inspect.c' || echo '$(srcdir)/'`inspect.c folks_inspect-inspect.obj: inspect.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-inspect.obj -MD -MP -MF $(DEPDIR)/folks_inspect-inspect.Tpo -c -o folks_inspect-inspect.obj `if test -f 'inspect.c'; then $(CYGPATH_W) 'inspect.c'; else $(CYGPATH_W) '$(srcdir)/inspect.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -MT folks_inspect-inspect.obj -MD -MP -MF $(DEPDIR)/folks_inspect-inspect.Tpo -c -o folks_inspect-inspect.obj `if test -f 'inspect.c'; then $(CYGPATH_W) 'inspect.c'; else $(CYGPATH_W) '$(srcdir)/inspect.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_inspect-inspect.Tpo $(DEPDIR)/folks_inspect-inspect.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='inspect.c' object='folks_inspect-inspect.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='inspect.c' object='folks_inspect-inspect.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-inspect.obj `if test -f 'inspect.c'; then $(CYGPATH_W) 'inspect.c'; else $(CYGPATH_W) '$(srcdir)/inspect.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_inspect_CPPFLAGS) $(CPPFLAGS) $(folks_inspect_CFLAGS) $(CFLAGS) -c -o folks_inspect-inspect.obj `if test -f 'inspect.c'; then $(CYGPATH_W) 'inspect.c'; else $(CYGPATH_W) '$(srcdir)/inspect.c'; fi` $(srcdir)/command-backends.c: $(srcdir)/folks_inspect_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/folks_inspect_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/folks_inspect_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) folks_inspect_vala.stamp; \ fi $(srcdir)/command-debug.c: $(srcdir)/folks_inspect_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/folks_inspect_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/folks_inspect_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) folks_inspect_vala.stamp; \ fi $(srcdir)/command-help.c: $(srcdir)/folks_inspect_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/folks_inspect_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/folks_inspect_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) folks_inspect_vala.stamp; \ fi $(srcdir)/command-individuals.c: $(srcdir)/folks_inspect_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/folks_inspect_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/folks_inspect_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) folks_inspect_vala.stamp; \ fi $(srcdir)/command-linking.c: $(srcdir)/folks_inspect_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/folks_inspect_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/folks_inspect_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) folks_inspect_vala.stamp; \ fi $(srcdir)/command-persona-stores.c: $(srcdir)/folks_inspect_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/folks_inspect_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/folks_inspect_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) folks_inspect_vala.stamp; \ fi $(srcdir)/command-personas.c: $(srcdir)/folks_inspect_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/folks_inspect_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/folks_inspect_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) folks_inspect_vala.stamp; \ fi $(srcdir)/command-quit.c: $(srcdir)/folks_inspect_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/folks_inspect_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/folks_inspect_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) folks_inspect_vala.stamp; \ fi $(srcdir)/command-signals.c: $(srcdir)/folks_inspect_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/folks_inspect_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/folks_inspect_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) folks_inspect_vala.stamp; \ fi $(srcdir)/signal-manager.c: $(srcdir)/folks_inspect_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/folks_inspect_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/folks_inspect_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) folks_inspect_vala.stamp; \ fi $(srcdir)/utils.c: $(srcdir)/folks_inspect_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/folks_inspect_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/folks_inspect_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) folks_inspect_vala.stamp; \ fi $(srcdir)/inspect.c: $(srcdir)/folks_inspect_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/folks_inspect_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/folks_inspect_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) folks_inspect_vala.stamp; \ fi folks_inspect_vala.stamp: $(folks_inspect_SOURCES) @@ -830,10 +816,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: diff -Nru folks-0.6.6/tools/inspect/signal-manager.c folks-0.6.7/tools/inspect/signal-manager.c --- folks-0.6.6/tools/inspect/signal-manager.c 2011-12-13 23:45:19.000000000 +0000 +++ folks-0.6.7/tools/inspect/signal-manager.c 2012-02-23 00:03:20.000000000 +0000 @@ -1,4 +1,4 @@ -/* signal-manager.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* signal-manager.c generated by valac 0.15.1, the Vala compiler * generated from signal-manager.vala, do not modify */ /* diff -Nru folks-0.6.6/tools/inspect/utils.c folks-0.6.7/tools/inspect/utils.c --- folks-0.6.6/tools/inspect/utils.c 2011-12-13 23:45:19.000000000 +0000 +++ folks-0.6.7/tools/inspect/utils.c 2012-02-23 00:03:20.000000000 +0000 @@ -1,4 +1,4 @@ -/* utils.c generated by valac 0.14.0.50-58097f, the Vala compiler +/* utils.c generated by valac 0.15.1, the Vala compiler * generated from utils.vala, do not modify */ /* @@ -405,7 +405,7 @@ gint _properties_size_; GParamSpec** _tmp12_; gint _tmp12__length1; - gboolean _tmp33_; + gboolean _tmp34_; g_return_if_fail (individual != NULL); _tmp0_ = individual; _tmp1_ = folks_individual_get_id (_tmp0_); @@ -444,18 +444,19 @@ GParamSpec* _tmp18_; GType _tmp19_; GValue _tmp20_ = {0}; - FolksIndividual* _tmp21_; - GParamSpec* _tmp22_; - const gchar* _tmp23_ = NULL; - FolksIndividual* _tmp24_; - GType _tmp25_ = 0UL; - GParamSpec* _tmp26_; - const gchar* _tmp27_ = NULL; - GValue _tmp28_; - gchar* _tmp29_ = NULL; - GParamSpec* _tmp30_; - const gchar* _tmp31_ = NULL; - const gchar* _tmp32_; + GValue _tmp21_; + FolksIndividual* _tmp22_; + GParamSpec* _tmp23_; + const gchar* _tmp24_ = NULL; + FolksIndividual* _tmp25_; + GType _tmp26_ = 0UL; + GParamSpec* _tmp27_; + const gchar* _tmp28_ = NULL; + GValue _tmp29_; + gchar* _tmp30_ = NULL; + GParamSpec* _tmp31_; + const gchar* _tmp32_ = NULL; + const gchar* _tmp33_; _tmp14_ = show_personas; if (_tmp14_ == TRUE) { GParamSpec* _tmp15_; @@ -477,60 +478,61 @@ g_value_init (&_tmp20_, _tmp19_); G_IS_VALUE (&prop_value) ? (g_value_unset (&prop_value), NULL) : NULL; prop_value = _tmp20_; - _tmp21_ = individual; - _tmp22_ = pspec; - _tmp23_ = g_param_spec_get_name (_tmp22_); - g_object_get_property ((GObject*) _tmp21_, _tmp23_, &prop_value); - _tmp24_ = individual; - _tmp25_ = G_TYPE_FROM_INSTANCE ((GObject*) _tmp24_); - _tmp26_ = pspec; - _tmp27_ = g_param_spec_get_name (_tmp26_); - _tmp28_ = prop_value; - _tmp29_ = folks_inspect_utils_property_to_string (_tmp25_, _tmp27_, &_tmp28_); + _tmp21_ = prop_value; + _tmp22_ = individual; + _tmp23_ = pspec; + _tmp24_ = g_param_spec_get_name (_tmp23_); + g_object_get_property ((GObject*) _tmp22_, _tmp24_, &prop_value); + _tmp25_ = individual; + _tmp26_ = G_TYPE_FROM_INSTANCE ((GObject*) _tmp25_); + _tmp27_ = pspec; + _tmp28_ = g_param_spec_get_name (_tmp27_); + _tmp29_ = prop_value; + _tmp30_ = folks_inspect_utils_property_to_string (_tmp26_, _tmp28_, &_tmp29_); _g_free0 (output_string); - output_string = _tmp29_; - _tmp30_ = pspec; - _tmp31_ = g_param_spec_get_nick (_tmp30_); - _tmp32_ = output_string; - folks_inspect_utils_print_line ("%-20s %s", _tmp31_, _tmp32_); + output_string = _tmp30_; + _tmp31_ = pspec; + _tmp32_ = g_param_spec_get_nick (_tmp31_); + _tmp33_ = output_string; + folks_inspect_utils_print_line ("%-20s %s", _tmp32_, _tmp33_); _g_free0 (output_string); G_IS_VALUE (&prop_value) ? (g_value_unset (&prop_value), NULL) : NULL; } } } - _tmp33_ = show_personas; - if (_tmp33_ == TRUE) { + _tmp34_ = show_personas; + if (_tmp34_ == TRUE) { folks_inspect_utils_print_line (""); folks_inspect_utils_print_line ("Personas:"); folks_inspect_utils_indent (); { - FolksIndividual* _tmp34_; - GeeSet* _tmp35_; + FolksIndividual* _tmp35_; GeeSet* _tmp36_; - GeeIterator* _tmp37_ = NULL; + GeeSet* _tmp37_; + GeeIterator* _tmp38_ = NULL; GeeIterator* _persona_it; - _tmp34_ = individual; - _tmp35_ = folks_individual_get_personas (_tmp34_); - _tmp36_ = _tmp35_; - _tmp37_ = gee_iterable_iterator ((GeeIterable*) _tmp36_); - _persona_it = _tmp37_; + _tmp35_ = individual; + _tmp36_ = folks_individual_get_personas (_tmp35_); + _tmp37_ = _tmp36_; + _tmp38_ = gee_iterable_iterator ((GeeIterable*) _tmp37_); + _persona_it = _tmp38_; while (TRUE) { - GeeIterator* _tmp38_; - gboolean _tmp39_ = FALSE; - GeeIterator* _tmp40_; - gpointer _tmp41_ = NULL; + GeeIterator* _tmp39_; + gboolean _tmp40_ = FALSE; + GeeIterator* _tmp41_; + gpointer _tmp42_ = NULL; FolksPersona* persona; - FolksPersona* _tmp42_; - _tmp38_ = _persona_it; - _tmp39_ = gee_iterator_next (_tmp38_); - if (!_tmp39_) { + FolksPersona* _tmp43_; + _tmp39_ = _persona_it; + _tmp40_ = gee_iterator_next (_tmp39_); + if (!_tmp40_) { break; } - _tmp40_ = _persona_it; - _tmp41_ = gee_iterator_get (_tmp40_); - persona = (FolksPersona*) _tmp41_; - _tmp42_ = persona; - folks_inspect_utils_print_persona (_tmp42_); + _tmp41_ = _persona_it; + _tmp42_ = gee_iterator_get (_tmp41_); + persona = (FolksPersona*) _tmp42_; + _tmp43_ = persona; + folks_inspect_utils_print_persona (_tmp43_); _g_object_unref0 (persona); } _g_object_unref0 (_persona_it); @@ -584,39 +586,41 @@ GParamSpec* _tmp8_; GType _tmp9_; GValue _tmp10_ = {0}; - FolksPersona* _tmp11_; - GParamSpec* _tmp12_; - const gchar* _tmp13_ = NULL; - FolksPersona* _tmp14_; - GType _tmp15_ = 0UL; - GParamSpec* _tmp16_; - const gchar* _tmp17_ = NULL; - GValue _tmp18_; - gchar* _tmp19_ = NULL; - GParamSpec* _tmp20_; - const gchar* _tmp21_ = NULL; - const gchar* _tmp22_; + GValue _tmp11_; + FolksPersona* _tmp12_; + GParamSpec* _tmp13_; + const gchar* _tmp14_ = NULL; + FolksPersona* _tmp15_; + GType _tmp16_ = 0UL; + GParamSpec* _tmp17_; + const gchar* _tmp18_ = NULL; + GValue _tmp19_; + gchar* _tmp20_ = NULL; + GParamSpec* _tmp21_; + const gchar* _tmp22_ = NULL; + const gchar* _tmp23_; _tmp8_ = pspec; _tmp9_ = _tmp8_->value_type; g_value_init (&_tmp10_, _tmp9_); G_IS_VALUE (&prop_value) ? (g_value_unset (&prop_value), NULL) : NULL; prop_value = _tmp10_; - _tmp11_ = persona; - _tmp12_ = pspec; - _tmp13_ = g_param_spec_get_name (_tmp12_); - g_object_get_property ((GObject*) _tmp11_, _tmp13_, &prop_value); - _tmp14_ = persona; - _tmp15_ = G_TYPE_FROM_INSTANCE ((GObject*) _tmp14_); - _tmp16_ = pspec; - _tmp17_ = g_param_spec_get_name (_tmp16_); - _tmp18_ = prop_value; - _tmp19_ = folks_inspect_utils_property_to_string (_tmp15_, _tmp17_, &_tmp18_); + _tmp11_ = prop_value; + _tmp12_ = persona; + _tmp13_ = pspec; + _tmp14_ = g_param_spec_get_name (_tmp13_); + g_object_get_property ((GObject*) _tmp12_, _tmp14_, &prop_value); + _tmp15_ = persona; + _tmp16_ = G_TYPE_FROM_INSTANCE ((GObject*) _tmp15_); + _tmp17_ = pspec; + _tmp18_ = g_param_spec_get_name (_tmp17_); + _tmp19_ = prop_value; + _tmp20_ = folks_inspect_utils_property_to_string (_tmp16_, _tmp18_, &_tmp19_); _g_free0 (output_string); - output_string = _tmp19_; - _tmp20_ = pspec; - _tmp21_ = g_param_spec_get_nick (_tmp20_); - _tmp22_ = output_string; - folks_inspect_utils_print_line ("%-20s %s", _tmp21_, _tmp22_); + output_string = _tmp20_; + _tmp21_ = pspec; + _tmp22_ = g_param_spec_get_nick (_tmp21_); + _tmp23_ = output_string; + folks_inspect_utils_print_line ("%-20s %s", _tmp22_, _tmp23_); _g_free0 (output_string); G_IS_VALUE (&prop_value) ? (g_value_unset (&prop_value), NULL) : NULL; } @@ -647,7 +651,7 @@ gint _properties_size_; GParamSpec** _tmp18_; gint _tmp18__length1; - gboolean _tmp39_; + gboolean _tmp40_; g_return_if_fail (store != NULL); _tmp0_ = store; _tmp1_ = folks_persona_store_get_is_prepared (_tmp0_); @@ -702,18 +706,19 @@ GParamSpec* _tmp24_; GType _tmp25_; GValue _tmp26_ = {0}; - FolksPersonaStore* _tmp27_; - GParamSpec* _tmp28_; - const gchar* _tmp29_ = NULL; - FolksPersonaStore* _tmp30_; - GType _tmp31_ = 0UL; - GParamSpec* _tmp32_; - const gchar* _tmp33_ = NULL; - GValue _tmp34_; - gchar* _tmp35_ = NULL; - GParamSpec* _tmp36_; - const gchar* _tmp37_ = NULL; - const gchar* _tmp38_; + GValue _tmp27_; + FolksPersonaStore* _tmp28_; + GParamSpec* _tmp29_; + const gchar* _tmp30_ = NULL; + FolksPersonaStore* _tmp31_; + GType _tmp32_ = 0UL; + GParamSpec* _tmp33_; + const gchar* _tmp34_ = NULL; + GValue _tmp35_; + gchar* _tmp36_ = NULL; + GParamSpec* _tmp37_; + const gchar* _tmp38_ = NULL; + const gchar* _tmp39_; _tmp20_ = show_personas; if (_tmp20_ == TRUE) { GParamSpec* _tmp21_; @@ -735,69 +740,70 @@ g_value_init (&_tmp26_, _tmp25_); G_IS_VALUE (&prop_value) ? (g_value_unset (&prop_value), NULL) : NULL; prop_value = _tmp26_; - _tmp27_ = store; - _tmp28_ = pspec; - _tmp29_ = g_param_spec_get_name (_tmp28_); - g_object_get_property ((GObject*) _tmp27_, _tmp29_, &prop_value); - _tmp30_ = store; - _tmp31_ = G_TYPE_FROM_INSTANCE ((GObject*) _tmp30_); - _tmp32_ = pspec; - _tmp33_ = g_param_spec_get_name (_tmp32_); - _tmp34_ = prop_value; - _tmp35_ = folks_inspect_utils_property_to_string (_tmp31_, _tmp33_, &_tmp34_); + _tmp27_ = prop_value; + _tmp28_ = store; + _tmp29_ = pspec; + _tmp30_ = g_param_spec_get_name (_tmp29_); + g_object_get_property ((GObject*) _tmp28_, _tmp30_, &prop_value); + _tmp31_ = store; + _tmp32_ = G_TYPE_FROM_INSTANCE ((GObject*) _tmp31_); + _tmp33_ = pspec; + _tmp34_ = g_param_spec_get_name (_tmp33_); + _tmp35_ = prop_value; + _tmp36_ = folks_inspect_utils_property_to_string (_tmp32_, _tmp34_, &_tmp35_); _g_free0 (output_string); - output_string = _tmp35_; - _tmp36_ = pspec; - _tmp37_ = g_param_spec_get_nick (_tmp36_); - _tmp38_ = output_string; - folks_inspect_utils_print_line ("%-20s %s", _tmp37_, _tmp38_); + output_string = _tmp36_; + _tmp37_ = pspec; + _tmp38_ = g_param_spec_get_nick (_tmp37_); + _tmp39_ = output_string; + folks_inspect_utils_print_line ("%-20s %s", _tmp38_, _tmp39_); _g_free0 (output_string); G_IS_VALUE (&prop_value) ? (g_value_unset (&prop_value), NULL) : NULL; } } } - _tmp39_ = show_personas; - if (_tmp39_ == TRUE) { + _tmp40_ = show_personas; + if (_tmp40_ == TRUE) { folks_inspect_utils_print_line (""); folks_inspect_utils_print_line ("Personas:"); folks_inspect_utils_indent (); { - FolksPersonaStore* _tmp40_; - GeeMap* _tmp41_; + FolksPersonaStore* _tmp41_; GeeMap* _tmp42_; - GeeCollection* _tmp43_; + GeeMap* _tmp43_; GeeCollection* _tmp44_; GeeCollection* _tmp45_; - GeeIterator* _tmp46_ = NULL; - GeeIterator* _tmp47_; + GeeCollection* _tmp46_; + GeeIterator* _tmp47_ = NULL; + GeeIterator* _tmp48_; GeeIterator* _persona_it; - _tmp40_ = store; - _tmp41_ = folks_persona_store_get_personas (_tmp40_); - _tmp42_ = _tmp41_; - _tmp43_ = gee_map_get_values (_tmp42_); - _tmp44_ = _tmp43_; + _tmp41_ = store; + _tmp42_ = folks_persona_store_get_personas (_tmp41_); + _tmp43_ = _tmp42_; + _tmp44_ = gee_map_get_values (_tmp43_); _tmp45_ = _tmp44_; - _tmp46_ = gee_iterable_iterator ((GeeIterable*) _tmp45_); - _tmp47_ = _tmp46_; - _g_object_unref0 (_tmp45_); - _persona_it = _tmp47_; + _tmp46_ = _tmp45_; + _tmp47_ = gee_iterable_iterator ((GeeIterable*) _tmp46_); + _tmp48_ = _tmp47_; + _g_object_unref0 (_tmp46_); + _persona_it = _tmp48_; while (TRUE) { - GeeIterator* _tmp48_; - gboolean _tmp49_ = FALSE; - GeeIterator* _tmp50_; - gpointer _tmp51_ = NULL; + GeeIterator* _tmp49_; + gboolean _tmp50_ = FALSE; + GeeIterator* _tmp51_; + gpointer _tmp52_ = NULL; FolksPersona* persona; - FolksPersona* _tmp52_; - _tmp48_ = _persona_it; - _tmp49_ = gee_iterator_next (_tmp48_); - if (!_tmp49_) { + FolksPersona* _tmp53_; + _tmp49_ = _persona_it; + _tmp50_ = gee_iterator_next (_tmp49_); + if (!_tmp50_) { break; } - _tmp50_ = _persona_it; - _tmp51_ = gee_iterator_get (_tmp50_); - persona = (FolksPersona*) _tmp51_; - _tmp52_ = persona; - folks_inspect_utils_print_persona (_tmp52_); + _tmp51_ = _persona_it; + _tmp52_ = gee_iterator_get (_tmp51_); + persona = (FolksPersona*) _tmp52_; + _tmp53_ = persona; + folks_inspect_utils_print_persona (_tmp53_); _g_object_unref0 (persona); } _g_object_unref0 (_persona_it); @@ -825,8 +831,8 @@ GType _tmp1_; gboolean _tmp2_ = FALSE; gboolean _tmp4_; - GValue _tmp213_; - gchar* _tmp214_ = NULL; + GValue _tmp225_; + gchar* _tmp226_ = NULL; g_return_val_if_fail (prop_name != NULL, NULL); g_return_val_if_fail (prop_value != NULL, NULL); _tmp1_ = object_type; @@ -894,150 +900,160 @@ return result; } else { gboolean _tmp22_ = FALSE; - const gchar* _tmp23_; - gboolean _tmp25_; - _tmp23_ = prop_name; - if (g_strcmp0 (_tmp23_, "groups") == 0) { + gboolean _tmp23_ = FALSE; + const gchar* _tmp24_; + gboolean _tmp26_; + gboolean _tmp28_; + _tmp24_ = prop_name; + if (g_strcmp0 (_tmp24_, "groups") == 0) { + _tmp23_ = TRUE; + } else { + const gchar* _tmp25_; + _tmp25_ = prop_name; + _tmp23_ = g_strcmp0 (_tmp25_, "local-ids") == 0; + } + _tmp26_ = _tmp23_; + if (_tmp26_) { _tmp22_ = TRUE; } else { - const gchar* _tmp24_; - _tmp24_ = prop_name; - _tmp22_ = g_strcmp0 (_tmp24_, "local-ids") == 0; + const gchar* _tmp27_; + _tmp27_ = prop_name; + _tmp22_ = g_strcmp0 (_tmp27_, "supported-fields") == 0; } - _tmp25_ = _tmp22_; - if (_tmp25_) { - GObject* _tmp26_ = NULL; - GeeSet* _tmp27_; + _tmp28_ = _tmp22_; + if (_tmp28_) { + GObject* _tmp29_ = NULL; + GeeSet* _tmp30_; GeeSet* groups; - gchar* _tmp28_; + gchar* _tmp31_; gboolean first; - const gchar* _tmp43_; - gchar* _tmp44_; - _tmp26_ = g_value_get_object (prop_value); - _tmp27_ = _g_object_ref0 (GEE_SET (_tmp26_)); - groups = _tmp27_; - _tmp28_ = g_strdup ("{ "); + const gchar* _tmp46_; + gchar* _tmp47_; + _tmp29_ = g_value_get_object (prop_value); + _tmp30_ = _g_object_ref0 (GEE_SET (_tmp29_)); + groups = _tmp30_; + _tmp31_ = g_strdup ("{ "); _g_free0 (output_string); - output_string = _tmp28_; + output_string = _tmp31_; first = TRUE; { - GeeSet* _tmp29_; - GeeIterator* _tmp30_ = NULL; + GeeSet* _tmp32_; + GeeIterator* _tmp33_ = NULL; GeeIterator* _group_it; - _tmp29_ = groups; - _tmp30_ = gee_iterable_iterator ((GeeIterable*) _tmp29_); - _group_it = _tmp30_; + _tmp32_ = groups; + _tmp33_ = gee_iterable_iterator ((GeeIterable*) _tmp32_); + _group_it = _tmp33_; while (TRUE) { - GeeIterator* _tmp31_; - gboolean _tmp32_ = FALSE; - GeeIterator* _tmp33_; - gpointer _tmp34_ = NULL; + GeeIterator* _tmp34_; + gboolean _tmp35_ = FALSE; + GeeIterator* _tmp36_; + gpointer _tmp37_ = NULL; gchar* group; - gboolean _tmp35_; - const gchar* _tmp38_; - const gchar* _tmp39_; - gchar* _tmp40_ = NULL; - gchar* _tmp41_; - gchar* _tmp42_; - _tmp31_ = _group_it; - _tmp32_ = gee_iterator_next (_tmp31_); - if (!_tmp32_) { + gboolean _tmp38_; + const gchar* _tmp41_; + const gchar* _tmp42_; + gchar* _tmp43_ = NULL; + gchar* _tmp44_; + gchar* _tmp45_; + _tmp34_ = _group_it; + _tmp35_ = gee_iterator_next (_tmp34_); + if (!_tmp35_) { break; } - _tmp33_ = _group_it; - _tmp34_ = gee_iterator_get (_tmp33_); - group = (gchar*) _tmp34_; - _tmp35_ = first; - if (_tmp35_ == FALSE) { - const gchar* _tmp36_; - gchar* _tmp37_; - _tmp36_ = output_string; - _tmp37_ = g_strconcat (_tmp36_, ", ", NULL); + _tmp36_ = _group_it; + _tmp37_ = gee_iterator_get (_tmp36_); + group = (gchar*) _tmp37_; + _tmp38_ = first; + if (_tmp38_ == FALSE) { + const gchar* _tmp39_; + gchar* _tmp40_; + _tmp39_ = output_string; + _tmp40_ = g_strconcat (_tmp39_, ", ", NULL); _g_free0 (output_string); - output_string = _tmp37_; + output_string = _tmp40_; } - _tmp38_ = output_string; - _tmp39_ = group; - _tmp40_ = g_strdup_printf ("'%s'", _tmp39_); - _tmp41_ = _tmp40_; - _tmp42_ = g_strconcat (_tmp38_, _tmp41_, NULL); + _tmp41_ = output_string; + _tmp42_ = group; + _tmp43_ = g_strdup_printf ("'%s'", _tmp42_); + _tmp44_ = _tmp43_; + _tmp45_ = g_strconcat (_tmp41_, _tmp44_, NULL); _g_free0 (output_string); - output_string = _tmp42_; - _g_free0 (_tmp41_); + output_string = _tmp45_; + _g_free0 (_tmp44_); first = FALSE; _g_free0 (group); } _g_object_unref0 (_group_it); } - _tmp43_ = output_string; - _tmp44_ = g_strconcat (_tmp43_, " }", NULL); + _tmp46_ = output_string; + _tmp47_ = g_strconcat (_tmp46_, " }", NULL); _g_free0 (output_string); - output_string = _tmp44_; + output_string = _tmp47_; result = output_string; _g_object_unref0 (groups); return result; } else { - const gchar* _tmp45_; - _tmp45_ = prop_name; - if (g_strcmp0 (_tmp45_, "avatar") == 0) { + const gchar* _tmp48_; + _tmp48_ = prop_name; + if (g_strcmp0 (_tmp48_, "avatar") == 0) { gchar* ret; - GObject* _tmp46_ = NULL; - GLoadableIcon* _tmp47_; - GLoadableIcon* avatar; - gboolean _tmp48_ = FALSE; - gboolean _tmp49_ = FALSE; + GObject* _tmp49_ = NULL; GLoadableIcon* _tmp50_; - gboolean _tmp52_; + GLoadableIcon* avatar; + gboolean _tmp51_ = FALSE; + gboolean _tmp52_ = FALSE; + GLoadableIcon* _tmp53_; gboolean _tmp55_; + gboolean _tmp58_; ret = NULL; - _tmp46_ = g_value_get_object (prop_value); - _tmp47_ = _g_object_ref0 (G_LOADABLE_ICON (_tmp46_)); - avatar = _tmp47_; - _tmp50_ = avatar; - if (_tmp50_ != NULL) { - GLoadableIcon* _tmp51_; - _tmp51_ = avatar; - _tmp49_ = G_IS_FILE_ICON (_tmp51_); - } else { - _tmp49_ = FALSE; - } - _tmp52_ = _tmp49_; - if (_tmp52_) { - GLoadableIcon* _tmp53_; - GFile* _tmp54_ = NULL; - _tmp53_ = avatar; - _tmp54_ = g_file_icon_get_file (G_FILE_ICON (_tmp53_)); - _tmp48_ = _tmp54_ != NULL; + _tmp49_ = g_value_get_object (prop_value); + _tmp50_ = _g_object_ref0 (G_LOADABLE_ICON (_tmp49_)); + avatar = _tmp50_; + _tmp53_ = avatar; + if (_tmp53_ != NULL) { + GLoadableIcon* _tmp54_; + _tmp54_ = avatar; + _tmp52_ = G_IS_FILE_ICON (_tmp54_); } else { - _tmp48_ = FALSE; + _tmp52_ = FALSE; } - _tmp55_ = _tmp48_; + _tmp55_ = _tmp52_; if (_tmp55_) { GLoadableIcon* _tmp56_; - GLoadableIcon* _tmp57_; - GFile* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; - gchar* _tmp60_; - gchar* _tmp61_ = NULL; + GFile* _tmp57_ = NULL; _tmp56_ = avatar; - _tmp57_ = avatar; - _tmp58_ = g_file_icon_get_file (G_FILE_ICON (_tmp57_)); - _tmp59_ = g_file_get_uri (_tmp58_); - _tmp60_ = _tmp59_; - _tmp61_ = g_strdup_printf ("%p (file: %s)", _tmp56_, _tmp60_); + _tmp57_ = g_file_icon_get_file (G_FILE_ICON (_tmp56_)); + _tmp51_ = _tmp57_ != NULL; + } else { + _tmp51_ = FALSE; + } + _tmp58_ = _tmp51_; + if (_tmp58_) { + GLoadableIcon* _tmp59_; + GLoadableIcon* _tmp60_; + GFile* _tmp61_ = NULL; + gchar* _tmp62_ = NULL; + gchar* _tmp63_; + gchar* _tmp64_ = NULL; + _tmp59_ = avatar; + _tmp60_ = avatar; + _tmp61_ = g_file_icon_get_file (G_FILE_ICON (_tmp60_)); + _tmp62_ = g_file_get_uri (_tmp61_); + _tmp63_ = _tmp62_; + _tmp64_ = g_strdup_printf ("%p (file: %s)", _tmp59_, _tmp63_); _g_free0 (ret); - ret = _tmp61_; - _g_free0 (_tmp60_); + ret = _tmp64_; + _g_free0 (_tmp63_); } else { - GLoadableIcon* _tmp62_; - _tmp62_ = avatar; - if (_tmp62_ != NULL) { - GLoadableIcon* _tmp63_; - gchar* _tmp64_ = NULL; - _tmp63_ = avatar; - _tmp64_ = g_strdup_printf ("%p", _tmp63_); + GLoadableIcon* _tmp65_; + _tmp65_ = avatar; + if (_tmp65_ != NULL) { + GLoadableIcon* _tmp66_; + gchar* _tmp67_ = NULL; + _tmp66_ = avatar; + _tmp67_ = g_strdup_printf ("%p", _tmp66_); _g_free0 (ret); - ret = _tmp64_; + ret = _tmp67_; } } result = ret; @@ -1045,536 +1061,570 @@ _g_free0 (output_string); return result; } else { - gboolean _tmp65_ = FALSE; - const gchar* _tmp66_; - gboolean _tmp68_; - _tmp66_ = prop_name; - if (g_strcmp0 (_tmp66_, "im-addresses") == 0) { - _tmp65_ = TRUE; - } else { - const gchar* _tmp67_; - _tmp67_ = prop_name; - _tmp65_ = g_strcmp0 (_tmp67_, "web-service-addresses") == 0; - } - _tmp68_ = _tmp65_; - if (_tmp68_) { + const gchar* _tmp68_; + _tmp68_ = prop_name; + if (g_strcmp0 (_tmp68_, "file") == 0) { + gchar* ret; GObject* _tmp69_ = NULL; - GeeMultiMap* _tmp70_; - GeeMultiMap* prop_list; - gchar* _tmp71_; - gboolean first; - const gchar* _tmp110_; - gchar* _tmp111_; + GFile* _tmp70_; + GFile* file; + GFile* _tmp71_; + ret = NULL; _tmp69_ = g_value_get_object (prop_value); - _tmp70_ = _g_object_ref0 (GEE_MULTI_MAP (_tmp69_)); - prop_list = _tmp70_; - _tmp71_ = g_strdup ("{ "); - _g_free0 (output_string); - output_string = _tmp71_; - first = TRUE; - { - GeeMultiMap* _tmp72_; - GeeSet* _tmp73_ = NULL; - GeeSet* _tmp74_; - GeeIterator* _tmp75_ = NULL; - GeeIterator* _tmp76_; - GeeIterator* _k_it; - _tmp72_ = prop_list; - _tmp73_ = gee_multi_map_get_keys (_tmp72_); - _tmp74_ = _tmp73_; - _tmp75_ = gee_iterable_iterator ((GeeIterable*) _tmp74_); - _tmp76_ = _tmp75_; - _g_object_unref0 (_tmp74_); - _k_it = _tmp76_; - while (TRUE) { - GeeIterator* _tmp77_; - gboolean _tmp78_ = FALSE; - GeeIterator* _tmp79_; - gpointer _tmp80_ = NULL; - gchar* k; - gboolean _tmp81_; - const gchar* _tmp84_; - const gchar* _tmp85_; - gchar* _tmp86_ = NULL; - gchar* _tmp87_; - gchar* _tmp88_; - GeeMultiMap* _tmp89_; - const gchar* _tmp90_; - GeeCollection* _tmp91_ = NULL; - GeeCollection* v; - gboolean _first; - const gchar* _tmp108_; - gchar* _tmp109_; - _tmp77_ = _k_it; - _tmp78_ = gee_iterator_next (_tmp77_); - if (!_tmp78_) { - break; - } - _tmp79_ = _k_it; - _tmp80_ = gee_iterator_get (_tmp79_); - k = (gchar*) _tmp80_; - _tmp81_ = first; - if (_tmp81_ == FALSE) { - const gchar* _tmp82_; - gchar* _tmp83_; - _tmp82_ = output_string; - _tmp83_ = g_strconcat (_tmp82_, ", ", NULL); - _g_free0 (output_string); - output_string = _tmp83_; - } - _tmp84_ = output_string; - _tmp85_ = k; - _tmp86_ = g_strdup_printf ("'%s' : { ", _tmp85_); - _tmp87_ = _tmp86_; - _tmp88_ = g_strconcat (_tmp84_, _tmp87_, NULL); - _g_free0 (output_string); - output_string = _tmp88_; - _g_free0 (_tmp87_); - first = FALSE; - _tmp89_ = prop_list; - _tmp90_ = k; - _tmp91_ = gee_multi_map_get (_tmp89_, _tmp90_); - v = _tmp91_; - _first = TRUE; - { - GeeCollection* _tmp92_; - GeeIterator* _tmp93_ = NULL; - GeeIterator* _a_it; - _tmp92_ = v; - _tmp93_ = gee_iterable_iterator ((GeeIterable*) _tmp92_); - _a_it = _tmp93_; - while (TRUE) { - GeeIterator* _tmp94_; - gboolean _tmp95_ = FALSE; - GeeIterator* _tmp96_; - gpointer _tmp97_ = NULL; - FolksAbstractFieldDetails* a; - gboolean _tmp98_; - const gchar* _tmp101_; - FolksAbstractFieldDetails* _tmp102_; - gconstpointer _tmp103_; - const gchar* _tmp104_; - gchar* _tmp105_ = NULL; - gchar* _tmp106_; - gchar* _tmp107_; - _tmp94_ = _a_it; - _tmp95_ = gee_iterator_next (_tmp94_); - if (!_tmp95_) { - break; - } - _tmp96_ = _a_it; - _tmp97_ = gee_iterator_get (_tmp96_); - a = (FolksAbstractFieldDetails*) _tmp97_; - _tmp98_ = _first; - if (_tmp98_ == FALSE) { - const gchar* _tmp99_; - gchar* _tmp100_; - _tmp99_ = output_string; - _tmp100_ = g_strconcat (_tmp99_, ", ", NULL); - _g_free0 (output_string); - output_string = _tmp100_; - } - _tmp101_ = output_string; - _tmp102_ = a; - _tmp103_ = folks_abstract_field_details_get_value (_tmp102_); - _tmp104_ = _tmp103_; - _tmp105_ = g_strdup_printf ("'%s'", (const gchar*) _tmp104_); - _tmp106_ = _tmp105_; - _tmp107_ = g_strconcat (_tmp101_, _tmp106_, NULL); - _g_free0 (output_string); - output_string = _tmp107_; - _g_free0 (_tmp106_); - _first = FALSE; - _g_object_unref0 (a); - } - _g_object_unref0 (_a_it); - } - _tmp108_ = output_string; - _tmp109_ = g_strconcat (_tmp108_, " }", NULL); - _g_free0 (output_string); - output_string = _tmp109_; - _g_object_unref0 (v); - _g_free0 (k); - } - _g_object_unref0 (_k_it); + _tmp70_ = _g_object_ref0 (G_FILE (_tmp69_)); + file = _tmp70_; + _tmp71_ = file; + if (_tmp71_ != NULL) { + GFile* _tmp72_; + GFile* _tmp73_; + gchar* _tmp74_ = NULL; + gchar* _tmp75_; + gchar* _tmp76_ = NULL; + _tmp72_ = file; + _tmp73_ = file; + _tmp74_ = g_file_get_uri (_tmp73_); + _tmp75_ = _tmp74_; + _tmp76_ = g_strdup_printf ("%p (file: %s)", _tmp72_, _tmp75_); + _g_free0 (ret); + ret = _tmp76_; + _g_free0 (_tmp75_); } - _tmp110_ = output_string; - _tmp111_ = g_strconcat (_tmp110_, " }", NULL); + result = ret; + _g_object_unref0 (file); _g_free0 (output_string); - output_string = _tmp111_; - result = output_string; - _g_object_unref0 (prop_list); return result; } else { - gboolean _tmp112_ = FALSE; - gboolean _tmp113_ = FALSE; - const gchar* _tmp114_; - gboolean _tmp116_; - gboolean _tmp118_; - _tmp114_ = prop_name; - if (g_strcmp0 (_tmp114_, "email-addresses") == 0) { - _tmp113_ = TRUE; - } else { - const gchar* _tmp115_; - _tmp115_ = prop_name; - _tmp113_ = g_strcmp0 (_tmp115_, "phone-numbers") == 0; - } - _tmp116_ = _tmp113_; - if (_tmp116_) { - _tmp112_ = TRUE; + gboolean _tmp77_ = FALSE; + const gchar* _tmp78_; + gboolean _tmp80_; + _tmp78_ = prop_name; + if (g_strcmp0 (_tmp78_, "im-addresses") == 0) { + _tmp77_ = TRUE; } else { - const gchar* _tmp117_; - _tmp117_ = prop_name; - _tmp112_ = g_strcmp0 (_tmp117_, "urls") == 0; + const gchar* _tmp79_; + _tmp79_ = prop_name; + _tmp77_ = g_strcmp0 (_tmp79_, "web-service-addresses") == 0; } - _tmp118_ = _tmp112_; - if (_tmp118_) { - gchar* _tmp119_; + _tmp80_ = _tmp77_; + if (_tmp80_) { + GObject* _tmp81_ = NULL; + GeeMultiMap* _tmp82_; + GeeMultiMap* prop_list; + gchar* _tmp83_; gboolean first; - GObject* _tmp120_ = NULL; - GeeSet* _tmp121_; - GeeSet* prop_list; - const gchar* _tmp136_; - gchar* _tmp137_; - _tmp119_ = g_strdup ("{ "); + const gchar* _tmp122_; + gchar* _tmp123_; + _tmp81_ = g_value_get_object (prop_value); + _tmp82_ = _g_object_ref0 (GEE_MULTI_MAP (_tmp81_)); + prop_list = _tmp82_; + _tmp83_ = g_strdup ("{ "); _g_free0 (output_string); - output_string = _tmp119_; + output_string = _tmp83_; first = TRUE; - _tmp120_ = g_value_get_object (prop_value); - _tmp121_ = _g_object_ref0 (GEE_SET (_tmp120_)); - prop_list = _tmp121_; { - GeeSet* _tmp122_; - GeeIterator* _tmp123_ = NULL; - GeeIterator* _p_it; - _tmp122_ = prop_list; - _tmp123_ = gee_iterable_iterator ((GeeIterable*) _tmp122_); - _p_it = _tmp123_; + GeeMultiMap* _tmp84_; + GeeSet* _tmp85_ = NULL; + GeeSet* _tmp86_; + GeeIterator* _tmp87_ = NULL; + GeeIterator* _tmp88_; + GeeIterator* _k_it; + _tmp84_ = prop_list; + _tmp85_ = gee_multi_map_get_keys (_tmp84_); + _tmp86_ = _tmp85_; + _tmp87_ = gee_iterable_iterator ((GeeIterable*) _tmp86_); + _tmp88_ = _tmp87_; + _g_object_unref0 (_tmp86_); + _k_it = _tmp88_; while (TRUE) { - GeeIterator* _tmp124_; - gboolean _tmp125_ = FALSE; - GeeIterator* _tmp126_; - gpointer _tmp127_ = NULL; - FolksAbstractFieldDetails* p; - gboolean _tmp128_; - const gchar* _tmp131_; - FolksAbstractFieldDetails* _tmp132_; - gconstpointer _tmp133_; - const gchar* _tmp134_; - gchar* _tmp135_; - _tmp124_ = _p_it; - _tmp125_ = gee_iterator_next (_tmp124_); - if (!_tmp125_) { + GeeIterator* _tmp89_; + gboolean _tmp90_ = FALSE; + GeeIterator* _tmp91_; + gpointer _tmp92_ = NULL; + gchar* k; + gboolean _tmp93_; + const gchar* _tmp96_; + const gchar* _tmp97_; + gchar* _tmp98_ = NULL; + gchar* _tmp99_; + gchar* _tmp100_; + GeeMultiMap* _tmp101_; + const gchar* _tmp102_; + GeeCollection* _tmp103_ = NULL; + GeeCollection* v; + gboolean _first; + const gchar* _tmp120_; + gchar* _tmp121_; + _tmp89_ = _k_it; + _tmp90_ = gee_iterator_next (_tmp89_); + if (!_tmp90_) { break; } - _tmp126_ = _p_it; - _tmp127_ = gee_iterator_get (_tmp126_); - p = (FolksAbstractFieldDetails*) _tmp127_; - _tmp128_ = first; - if (!_tmp128_) { - const gchar* _tmp129_; - gchar* _tmp130_; - _tmp129_ = output_string; - _tmp130_ = g_strconcat (_tmp129_, ", ", NULL); + _tmp91_ = _k_it; + _tmp92_ = gee_iterator_get (_tmp91_); + k = (gchar*) _tmp92_; + _tmp93_ = first; + if (_tmp93_ == FALSE) { + const gchar* _tmp94_; + gchar* _tmp95_; + _tmp94_ = output_string; + _tmp95_ = g_strconcat (_tmp94_, ", ", NULL); _g_free0 (output_string); - output_string = _tmp130_; + output_string = _tmp95_; } - _tmp131_ = output_string; - _tmp132_ = p; - _tmp133_ = folks_abstract_field_details_get_value (_tmp132_); - _tmp134_ = _tmp133_; - _tmp135_ = g_strconcat (_tmp131_, (const gchar*) _tmp134_, NULL); + _tmp96_ = output_string; + _tmp97_ = k; + _tmp98_ = g_strdup_printf ("'%s' : { ", _tmp97_); + _tmp99_ = _tmp98_; + _tmp100_ = g_strconcat (_tmp96_, _tmp99_, NULL); _g_free0 (output_string); - output_string = _tmp135_; + output_string = _tmp100_; + _g_free0 (_tmp99_); first = FALSE; - _g_object_unref0 (p); + _tmp101_ = prop_list; + _tmp102_ = k; + _tmp103_ = gee_multi_map_get (_tmp101_, _tmp102_); + v = _tmp103_; + _first = TRUE; + { + GeeCollection* _tmp104_; + GeeIterator* _tmp105_ = NULL; + GeeIterator* _a_it; + _tmp104_ = v; + _tmp105_ = gee_iterable_iterator ((GeeIterable*) _tmp104_); + _a_it = _tmp105_; + while (TRUE) { + GeeIterator* _tmp106_; + gboolean _tmp107_ = FALSE; + GeeIterator* _tmp108_; + gpointer _tmp109_ = NULL; + FolksAbstractFieldDetails* a; + gboolean _tmp110_; + const gchar* _tmp113_; + FolksAbstractFieldDetails* _tmp114_; + gconstpointer _tmp115_; + const gchar* _tmp116_; + gchar* _tmp117_ = NULL; + gchar* _tmp118_; + gchar* _tmp119_; + _tmp106_ = _a_it; + _tmp107_ = gee_iterator_next (_tmp106_); + if (!_tmp107_) { + break; + } + _tmp108_ = _a_it; + _tmp109_ = gee_iterator_get (_tmp108_); + a = (FolksAbstractFieldDetails*) _tmp109_; + _tmp110_ = _first; + if (_tmp110_ == FALSE) { + const gchar* _tmp111_; + gchar* _tmp112_; + _tmp111_ = output_string; + _tmp112_ = g_strconcat (_tmp111_, ", ", NULL); + _g_free0 (output_string); + output_string = _tmp112_; + } + _tmp113_ = output_string; + _tmp114_ = a; + _tmp115_ = folks_abstract_field_details_get_value (_tmp114_); + _tmp116_ = _tmp115_; + _tmp117_ = g_strdup_printf ("'%s'", (const gchar*) _tmp116_); + _tmp118_ = _tmp117_; + _tmp119_ = g_strconcat (_tmp113_, _tmp118_, NULL); + _g_free0 (output_string); + output_string = _tmp119_; + _g_free0 (_tmp118_); + _first = FALSE; + _g_object_unref0 (a); + } + _g_object_unref0 (_a_it); + } + _tmp120_ = output_string; + _tmp121_ = g_strconcat (_tmp120_, " }", NULL); + _g_free0 (output_string); + output_string = _tmp121_; + _g_object_unref0 (v); + _g_free0 (k); } - _g_object_unref0 (_p_it); + _g_object_unref0 (_k_it); } - _tmp136_ = output_string; - _tmp137_ = g_strconcat (_tmp136_, " }", NULL); + _tmp122_ = output_string; + _tmp123_ = g_strconcat (_tmp122_, " }", NULL); _g_free0 (output_string); - output_string = _tmp137_; + output_string = _tmp123_; result = output_string; _g_object_unref0 (prop_list); return result; } else { - const gchar* _tmp138_; - _tmp138_ = prop_name; - if (g_strcmp0 (_tmp138_, "birthday") == 0) { - void* _tmp139_ = NULL; - GDateTime* dobj; - GDateTime* _tmp140_; - _tmp139_ = g_value_get_boxed (prop_value); - dobj = (GDateTime*) _tmp139_; - _tmp140_ = dobj; - if (_tmp140_ != NULL) { - GDateTime* _tmp141_; - gchar* _tmp142_ = NULL; - _tmp141_ = dobj; - _tmp142_ = g_date_time_to_string (_tmp141_); - result = _tmp142_; - _g_free0 (output_string); - return result; - } else { - gchar* _tmp143_; - _tmp143_ = g_strdup (""); - result = _tmp143_; - _g_free0 (output_string); - return result; - } + gboolean _tmp124_ = FALSE; + gboolean _tmp125_ = FALSE; + const gchar* _tmp126_; + gboolean _tmp128_; + gboolean _tmp130_; + _tmp126_ = prop_name; + if (g_strcmp0 (_tmp126_, "email-addresses") == 0) { + _tmp125_ = TRUE; } else { - const gchar* _tmp144_; - _tmp144_ = prop_name; - if (g_strcmp0 (_tmp144_, "postal-addresses") == 0) { - gchar* _tmp145_; - gboolean first; - GObject* _tmp146_ = NULL; - GeeSet* _tmp147_; - GeeSet* prop_list; - const gchar* _tmp164_; - gchar* _tmp165_; - _tmp145_ = g_strdup ("{ "); - _g_free0 (output_string); - output_string = _tmp145_; - first = TRUE; - _tmp146_ = g_value_get_object (prop_value); - _tmp147_ = _g_object_ref0 (GEE_SET (_tmp146_)); - prop_list = _tmp147_; - { - GeeSet* _tmp148_; - GeeIterator* _tmp149_ = NULL; - GeeIterator* _p_it; - _tmp148_ = prop_list; - _tmp149_ = gee_iterable_iterator ((GeeIterable*) _tmp148_); - _p_it = _tmp149_; - while (TRUE) { - GeeIterator* _tmp150_; - gboolean _tmp151_ = FALSE; - GeeIterator* _tmp152_; - gpointer _tmp153_ = NULL; - FolksPostalAddressFieldDetails* p; - gboolean _tmp154_; - const gchar* _tmp157_; - FolksPostalAddressFieldDetails* _tmp158_; - gconstpointer _tmp159_; - FolksPostalAddress* _tmp160_; - gchar* _tmp161_ = NULL; - gchar* _tmp162_; - gchar* _tmp163_; - _tmp150_ = _p_it; - _tmp151_ = gee_iterator_next (_tmp150_); - if (!_tmp151_) { - break; - } - _tmp152_ = _p_it; - _tmp153_ = gee_iterator_get (_tmp152_); - p = (FolksPostalAddressFieldDetails*) _tmp153_; - _tmp154_ = first; - if (!_tmp154_) { - const gchar* _tmp155_; - gchar* _tmp156_; - _tmp155_ = output_string; - _tmp156_ = g_strconcat (_tmp155_, ". ", NULL); - _g_free0 (output_string); - output_string = _tmp156_; - } - _tmp157_ = output_string; - _tmp158_ = p; - _tmp159_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp158_); - _tmp160_ = _tmp159_; - _tmp161_ = folks_postal_address_to_string ((FolksPostalAddress*) _tmp160_); - _tmp162_ = _tmp161_; - _tmp163_ = g_strconcat (_tmp157_, _tmp162_, NULL); + const gchar* _tmp127_; + _tmp127_ = prop_name; + _tmp125_ = g_strcmp0 (_tmp127_, "phone-numbers") == 0; + } + _tmp128_ = _tmp125_; + if (_tmp128_) { + _tmp124_ = TRUE; + } else { + const gchar* _tmp129_; + _tmp129_ = prop_name; + _tmp124_ = g_strcmp0 (_tmp129_, "urls") == 0; + } + _tmp130_ = _tmp124_; + if (_tmp130_) { + gchar* _tmp131_; + gboolean first; + GObject* _tmp132_ = NULL; + GeeSet* _tmp133_; + GeeSet* prop_list; + const gchar* _tmp148_; + gchar* _tmp149_; + _tmp131_ = g_strdup ("{ "); + _g_free0 (output_string); + output_string = _tmp131_; + first = TRUE; + _tmp132_ = g_value_get_object (prop_value); + _tmp133_ = _g_object_ref0 (GEE_SET (_tmp132_)); + prop_list = _tmp133_; + { + GeeSet* _tmp134_; + GeeIterator* _tmp135_ = NULL; + GeeIterator* _p_it; + _tmp134_ = prop_list; + _tmp135_ = gee_iterable_iterator ((GeeIterable*) _tmp134_); + _p_it = _tmp135_; + while (TRUE) { + GeeIterator* _tmp136_; + gboolean _tmp137_ = FALSE; + GeeIterator* _tmp138_; + gpointer _tmp139_ = NULL; + FolksAbstractFieldDetails* p; + gboolean _tmp140_; + const gchar* _tmp143_; + FolksAbstractFieldDetails* _tmp144_; + gconstpointer _tmp145_; + const gchar* _tmp146_; + gchar* _tmp147_; + _tmp136_ = _p_it; + _tmp137_ = gee_iterator_next (_tmp136_); + if (!_tmp137_) { + break; + } + _tmp138_ = _p_it; + _tmp139_ = gee_iterator_get (_tmp138_); + p = (FolksAbstractFieldDetails*) _tmp139_; + _tmp140_ = first; + if (!_tmp140_) { + const gchar* _tmp141_; + gchar* _tmp142_; + _tmp141_ = output_string; + _tmp142_ = g_strconcat (_tmp141_, ", ", NULL); _g_free0 (output_string); - output_string = _tmp163_; - _g_free0 (_tmp162_); - first = FALSE; - _g_object_unref0 (p); + output_string = _tmp142_; } - _g_object_unref0 (_p_it); + _tmp143_ = output_string; + _tmp144_ = p; + _tmp145_ = folks_abstract_field_details_get_value (_tmp144_); + _tmp146_ = _tmp145_; + _tmp147_ = g_strconcat (_tmp143_, (const gchar*) _tmp146_, NULL); + _g_free0 (output_string); + output_string = _tmp147_; + first = FALSE; + _g_object_unref0 (p); + } + _g_object_unref0 (_p_it); + } + _tmp148_ = output_string; + _tmp149_ = g_strconcat (_tmp148_, " }", NULL); + _g_free0 (output_string); + output_string = _tmp149_; + result = output_string; + _g_object_unref0 (prop_list); + return result; + } else { + const gchar* _tmp150_; + _tmp150_ = prop_name; + if (g_strcmp0 (_tmp150_, "birthday") == 0) { + void* _tmp151_ = NULL; + GDateTime* dobj; + GDateTime* _tmp152_; + _tmp151_ = g_value_get_boxed (prop_value); + dobj = (GDateTime*) _tmp151_; + _tmp152_ = dobj; + if (_tmp152_ != NULL) { + GDateTime* _tmp153_; + gchar* _tmp154_ = NULL; + _tmp153_ = dobj; + _tmp154_ = g_date_time_to_string (_tmp153_); + result = _tmp154_; + _g_free0 (output_string); + return result; + } else { + gchar* _tmp155_; + _tmp155_ = g_strdup (""); + result = _tmp155_; + _g_free0 (output_string); + return result; } - _tmp164_ = output_string; - _tmp165_ = g_strconcat (_tmp164_, " }", NULL); - _g_free0 (output_string); - output_string = _tmp165_; - result = output_string; - _g_object_unref0 (prop_list); - return result; } else { - const gchar* _tmp166_; - _tmp166_ = prop_name; - if (g_strcmp0 (_tmp166_, "notes") == 0) { - GObject* _tmp167_ = NULL; - GeeSet* _tmp168_; - GeeSet* notes; - gchar* _tmp169_; + const gchar* _tmp156_; + _tmp156_ = prop_name; + if (g_strcmp0 (_tmp156_, "postal-addresses") == 0) { + gchar* _tmp157_; gboolean first; - const gchar* _tmp184_; - gchar* _tmp185_; - _tmp167_ = g_value_get_object (prop_value); - _tmp168_ = _g_object_ref0 (GEE_IS_SET (_tmp167_) ? ((GeeSet*) _tmp167_) : NULL); - notes = _tmp168_; - _tmp169_ = g_strdup ("{ "); + GObject* _tmp158_ = NULL; + GeeSet* _tmp159_; + GeeSet* prop_list; + const gchar* _tmp176_; + gchar* _tmp177_; + _tmp157_ = g_strdup ("{ "); _g_free0 (output_string); - output_string = _tmp169_; + output_string = _tmp157_; first = TRUE; + _tmp158_ = g_value_get_object (prop_value); + _tmp159_ = _g_object_ref0 (GEE_SET (_tmp158_)); + prop_list = _tmp159_; { - GeeSet* _tmp170_; - GeeIterator* _tmp171_ = NULL; - GeeIterator* _note_it; - _tmp170_ = notes; - _tmp171_ = gee_iterable_iterator ((GeeIterable*) _tmp170_); - _note_it = _tmp171_; + GeeSet* _tmp160_; + GeeIterator* _tmp161_ = NULL; + GeeIterator* _p_it; + _tmp160_ = prop_list; + _tmp161_ = gee_iterable_iterator ((GeeIterable*) _tmp160_); + _p_it = _tmp161_; while (TRUE) { - GeeIterator* _tmp172_; - gboolean _tmp173_ = FALSE; - GeeIterator* _tmp174_; - gpointer _tmp175_ = NULL; - FolksNoteFieldDetails* note; - gboolean _tmp176_; - const gchar* _tmp179_; - FolksNoteFieldDetails* _tmp180_; - const gchar* _tmp181_; - const gchar* _tmp182_; - gchar* _tmp183_; - _tmp172_ = _note_it; - _tmp173_ = gee_iterator_next (_tmp172_); - if (!_tmp173_) { + GeeIterator* _tmp162_; + gboolean _tmp163_ = FALSE; + GeeIterator* _tmp164_; + gpointer _tmp165_ = NULL; + FolksPostalAddressFieldDetails* p; + gboolean _tmp166_; + const gchar* _tmp169_; + FolksPostalAddressFieldDetails* _tmp170_; + gconstpointer _tmp171_; + FolksPostalAddress* _tmp172_; + gchar* _tmp173_ = NULL; + gchar* _tmp174_; + gchar* _tmp175_; + _tmp162_ = _p_it; + _tmp163_ = gee_iterator_next (_tmp162_); + if (!_tmp163_) { break; } - _tmp174_ = _note_it; - _tmp175_ = gee_iterator_get (_tmp174_); - note = (FolksNoteFieldDetails*) _tmp175_; - _tmp176_ = first; - if (!_tmp176_) { - const gchar* _tmp177_; - gchar* _tmp178_; - _tmp177_ = output_string; - _tmp178_ = g_strconcat (_tmp177_, ", ", NULL); + _tmp164_ = _p_it; + _tmp165_ = gee_iterator_get (_tmp164_); + p = (FolksPostalAddressFieldDetails*) _tmp165_; + _tmp166_ = first; + if (!_tmp166_) { + const gchar* _tmp167_; + gchar* _tmp168_; + _tmp167_ = output_string; + _tmp168_ = g_strconcat (_tmp167_, ". ", NULL); _g_free0 (output_string); - output_string = _tmp178_; + output_string = _tmp168_; } - _tmp179_ = output_string; - _tmp180_ = note; - _tmp181_ = folks_note_field_details_get_uid (_tmp180_); - _tmp182_ = _tmp181_; - _tmp183_ = g_strconcat (_tmp179_, _tmp182_, NULL); + _tmp169_ = output_string; + _tmp170_ = p; + _tmp171_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp170_); + _tmp172_ = _tmp171_; + _tmp173_ = folks_postal_address_to_string ((FolksPostalAddress*) _tmp172_); + _tmp174_ = _tmp173_; + _tmp175_ = g_strconcat (_tmp169_, _tmp174_, NULL); _g_free0 (output_string); - output_string = _tmp183_; + output_string = _tmp175_; + _g_free0 (_tmp174_); first = FALSE; - _g_object_unref0 (note); + _g_object_unref0 (p); } - _g_object_unref0 (_note_it); + _g_object_unref0 (_p_it); } - _tmp184_ = output_string; - _tmp185_ = g_strconcat (_tmp184_, " }", NULL); + _tmp176_ = output_string; + _tmp177_ = g_strconcat (_tmp176_, " }", NULL); _g_free0 (output_string); - output_string = _tmp185_; + output_string = _tmp177_; result = output_string; - _g_object_unref0 (notes); + _g_object_unref0 (prop_list); return result; } else { - const gchar* _tmp186_; - _tmp186_ = prop_name; - if (g_strcmp0 (_tmp186_, "roles") == 0) { - GObject* _tmp187_ = NULL; - GeeSet* _tmp188_; - GeeSet* roles; - gchar* _tmp189_; + const gchar* _tmp178_; + _tmp178_ = prop_name; + if (g_strcmp0 (_tmp178_, "notes") == 0) { + GObject* _tmp179_ = NULL; + GeeSet* _tmp180_; + GeeSet* notes; + gchar* _tmp181_; gboolean first; - const gchar* _tmp206_; - gchar* _tmp207_; - _tmp187_ = g_value_get_object (prop_value); - _tmp188_ = _g_object_ref0 (GEE_SET (_tmp187_)); - roles = _tmp188_; - _tmp189_ = g_strdup ("{ "); + const gchar* _tmp196_; + gchar* _tmp197_; + _tmp179_ = g_value_get_object (prop_value); + _tmp180_ = _g_object_ref0 (GEE_IS_SET (_tmp179_) ? ((GeeSet*) _tmp179_) : NULL); + notes = _tmp180_; + _tmp181_ = g_strdup ("{ "); _g_free0 (output_string); - output_string = _tmp189_; + output_string = _tmp181_; first = TRUE; { - GeeSet* _tmp190_; - GeeIterator* _tmp191_ = NULL; - GeeIterator* _role_it; - _tmp190_ = roles; - _tmp191_ = gee_iterable_iterator ((GeeIterable*) _tmp190_); - _role_it = _tmp191_; + GeeSet* _tmp182_; + GeeIterator* _tmp183_ = NULL; + GeeIterator* _note_it; + _tmp182_ = notes; + _tmp183_ = gee_iterable_iterator ((GeeIterable*) _tmp182_); + _note_it = _tmp183_; while (TRUE) { - GeeIterator* _tmp192_; - gboolean _tmp193_ = FALSE; - GeeIterator* _tmp194_; - gpointer _tmp195_ = NULL; - FolksRoleFieldDetails* role; - gboolean _tmp196_; - const gchar* _tmp199_; - FolksRoleFieldDetails* _tmp200_; - gconstpointer _tmp201_; - FolksRole* _tmp202_; - gchar* _tmp203_ = NULL; - gchar* _tmp204_; - gchar* _tmp205_; - _tmp192_ = _role_it; - _tmp193_ = gee_iterator_next (_tmp192_); - if (!_tmp193_) { + GeeIterator* _tmp184_; + gboolean _tmp185_ = FALSE; + GeeIterator* _tmp186_; + gpointer _tmp187_ = NULL; + FolksNoteFieldDetails* note; + gboolean _tmp188_; + const gchar* _tmp191_; + FolksNoteFieldDetails* _tmp192_; + const gchar* _tmp193_; + const gchar* _tmp194_; + gchar* _tmp195_; + _tmp184_ = _note_it; + _tmp185_ = gee_iterator_next (_tmp184_); + if (!_tmp185_) { break; } - _tmp194_ = _role_it; - _tmp195_ = gee_iterator_get (_tmp194_); - role = (FolksRoleFieldDetails*) _tmp195_; - _tmp196_ = first; - if (!_tmp196_) { - const gchar* _tmp197_; - gchar* _tmp198_; - _tmp197_ = output_string; - _tmp198_ = g_strconcat (_tmp197_, ", ", NULL); + _tmp186_ = _note_it; + _tmp187_ = gee_iterator_get (_tmp186_); + note = (FolksNoteFieldDetails*) _tmp187_; + _tmp188_ = first; + if (!_tmp188_) { + const gchar* _tmp189_; + gchar* _tmp190_; + _tmp189_ = output_string; + _tmp190_ = g_strconcat (_tmp189_, ", ", NULL); _g_free0 (output_string); - output_string = _tmp198_; + output_string = _tmp190_; } - _tmp199_ = output_string; - _tmp200_ = role; - _tmp201_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp200_); - _tmp202_ = _tmp201_; - _tmp203_ = folks_role_to_string ((FolksRole*) _tmp202_); - _tmp204_ = _tmp203_; - _tmp205_ = g_strconcat (_tmp199_, _tmp204_, NULL); + _tmp191_ = output_string; + _tmp192_ = note; + _tmp193_ = folks_abstract_field_details_get_id ((FolksAbstractFieldDetails*) _tmp192_); + _tmp194_ = _tmp193_; + _tmp195_ = g_strconcat (_tmp191_, _tmp194_, NULL); _g_free0 (output_string); - output_string = _tmp205_; - _g_free0 (_tmp204_); + output_string = _tmp195_; first = FALSE; - _g_object_unref0 (role); + _g_object_unref0 (note); } - _g_object_unref0 (_role_it); + _g_object_unref0 (_note_it); } - _tmp206_ = output_string; - _tmp207_ = g_strconcat (_tmp206_, " }", NULL); + _tmp196_ = output_string; + _tmp197_ = g_strconcat (_tmp196_, " }", NULL); _g_free0 (output_string); - output_string = _tmp207_; + output_string = _tmp197_; result = output_string; - _g_object_unref0 (roles); + _g_object_unref0 (notes); return result; } else { - const gchar* _tmp208_; - _tmp208_ = prop_name; - if (g_strcmp0 (_tmp208_, "structured-name") == 0) { - GObject* _tmp209_ = NULL; - FolksStructuredName* sn; - gchar* ret; - FolksStructuredName* _tmp210_; - _tmp209_ = g_value_get_object (prop_value); - sn = FOLKS_STRUCTURED_NAME (_tmp209_); - ret = NULL; - _tmp210_ = sn; - if (_tmp210_ != NULL) { - FolksStructuredName* _tmp211_; - gchar* _tmp212_ = NULL; - _tmp211_ = sn; - _tmp212_ = folks_structured_name_to_string (_tmp211_); - _g_free0 (ret); - ret = _tmp212_; + const gchar* _tmp198_; + _tmp198_ = prop_name; + if (g_strcmp0 (_tmp198_, "roles") == 0) { + GObject* _tmp199_ = NULL; + GeeSet* _tmp200_; + GeeSet* roles; + gchar* _tmp201_; + gboolean first; + const gchar* _tmp218_; + gchar* _tmp219_; + _tmp199_ = g_value_get_object (prop_value); + _tmp200_ = _g_object_ref0 (GEE_SET (_tmp199_)); + roles = _tmp200_; + _tmp201_ = g_strdup ("{ "); + _g_free0 (output_string); + output_string = _tmp201_; + first = TRUE; + { + GeeSet* _tmp202_; + GeeIterator* _tmp203_ = NULL; + GeeIterator* _role_it; + _tmp202_ = roles; + _tmp203_ = gee_iterable_iterator ((GeeIterable*) _tmp202_); + _role_it = _tmp203_; + while (TRUE) { + GeeIterator* _tmp204_; + gboolean _tmp205_ = FALSE; + GeeIterator* _tmp206_; + gpointer _tmp207_ = NULL; + FolksRoleFieldDetails* role; + gboolean _tmp208_; + const gchar* _tmp211_; + FolksRoleFieldDetails* _tmp212_; + gconstpointer _tmp213_; + FolksRole* _tmp214_; + gchar* _tmp215_ = NULL; + gchar* _tmp216_; + gchar* _tmp217_; + _tmp204_ = _role_it; + _tmp205_ = gee_iterator_next (_tmp204_); + if (!_tmp205_) { + break; + } + _tmp206_ = _role_it; + _tmp207_ = gee_iterator_get (_tmp206_); + role = (FolksRoleFieldDetails*) _tmp207_; + _tmp208_ = first; + if (!_tmp208_) { + const gchar* _tmp209_; + gchar* _tmp210_; + _tmp209_ = output_string; + _tmp210_ = g_strconcat (_tmp209_, ", ", NULL); + _g_free0 (output_string); + output_string = _tmp210_; + } + _tmp211_ = output_string; + _tmp212_ = role; + _tmp213_ = folks_abstract_field_details_get_value ((FolksAbstractFieldDetails*) _tmp212_); + _tmp214_ = _tmp213_; + _tmp215_ = folks_role_to_string ((FolksRole*) _tmp214_); + _tmp216_ = _tmp215_; + _tmp217_ = g_strconcat (_tmp211_, _tmp216_, NULL); + _g_free0 (output_string); + output_string = _tmp217_; + _g_free0 (_tmp216_); + first = FALSE; + _g_object_unref0 (role); + } + _g_object_unref0 (_role_it); } - result = ret; + _tmp218_ = output_string; + _tmp219_ = g_strconcat (_tmp218_, " }", NULL); _g_free0 (output_string); + output_string = _tmp219_; + result = output_string; + _g_object_unref0 (roles); return result; + } else { + const gchar* _tmp220_; + _tmp220_ = prop_name; + if (g_strcmp0 (_tmp220_, "structured-name") == 0) { + GObject* _tmp221_ = NULL; + FolksStructuredName* sn; + gchar* ret; + FolksStructuredName* _tmp222_; + _tmp221_ = g_value_get_object (prop_value); + sn = FOLKS_STRUCTURED_NAME (_tmp221_); + ret = NULL; + _tmp222_ = sn; + if (_tmp222_ != NULL) { + FolksStructuredName* _tmp223_; + gchar* _tmp224_ = NULL; + _tmp223_ = sn; + _tmp224_ = folks_structured_name_to_string (_tmp223_); + _g_free0 (ret); + ret = _tmp224_; + } + result = ret; + _g_free0 (output_string); + return result; + } } } } @@ -1586,9 +1636,9 @@ } } } - _tmp213_ = *prop_value; - _tmp214_ = folks_inspect_utils_transform_value_to_string (&_tmp213_); - result = _tmp214_; + _tmp225_ = *prop_value; + _tmp226_ = folks_inspect_utils_transform_value_to_string (&_tmp225_); + result = _tmp226_; _g_free0 (output_string); return result; } diff -Nru folks-0.6.6/tools/inspect/utils.vala folks-0.6.7/tools/inspect/utils.vala --- folks-0.6.6/tools/inspect/utils.vala 2011-11-02 16:00:02.000000000 +0000 +++ folks-0.6.7/tools/inspect/utils.vala 2011-12-22 18:18:11.000000000 +0000 @@ -237,7 +237,8 @@ return "Set of %u personas".printf (personas.size); } else if (prop_name == "groups" || - prop_name == "local-ids") + prop_name == "local-ids" || + prop_name == "supported-fields") { Set groups = (Set) prop_value.get_object (); output_string = "{ "; @@ -272,6 +273,18 @@ return ret; } + else if (prop_name == "file") + { + string ret = null; + File? file = (File) prop_value.get_object (); + + if (file != null) + { + ret = "%p (file: %s)".printf (file, file.get_uri ()); + } + + return ret; + } else if (prop_name == "im-addresses" || prop_name == "web-service-addresses") { @@ -368,7 +381,7 @@ { output_string += ", "; } - output_string += note.uid; + output_string += note.id; first = false; } output_string += " }"; diff -Nru folks-0.6.6/tools/Makefile.am folks-0.6.7/tools/Makefile.am --- folks-0.6.6/tools/Makefile.am 2011-09-27 20:43:44.000000000 +0000 +++ folks-0.6.7/tools/Makefile.am 2012-01-12 17:25:24.000000000 +0000 @@ -10,12 +10,8 @@ bin_PROGRAMS = folks-import endif -AM_CPPFLAGS = \ - -include $(CONFIG_HEADER) \ - -DLOCALE_DIR=\"$(pkgdatadir)/locale\" \ - $(NULL) - VALAFLAGS = \ + $(AM_VALAFLAGS) \ --vapidir=$(top_builddir)/folks \ --pkg=gee-1.0 \ --pkg=libxml-2.0 \ @@ -27,14 +23,21 @@ import.vala \ import-pidgin.vala \ $(NULL) +folks_import_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -include $(CONFIG_HEADER) \ + -DLOCALE_DIR=\"$(pkgdatadir)/locale\" \ + -I$(top_srcdir)/folks \ + $(NULL) folks_import_CFLAGS = \ + $(AM_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(LIBXML_CFLAGS) \ - -I$(top_srcdir)/folks \ $(NULL) folks_import_LDADD = \ + $(AM_LDADD) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ diff -Nru folks-0.6.6/tools/Makefile.in folks-0.6.7/tools/Makefile.in --- folks-0.6.6/tools/Makefile.in 2011-12-13 23:38:45.000000000 +0000 +++ folks-0.6.7/tools/Makefile.in 2012-02-23 00:04:14.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.2 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -40,10 +40,11 @@ folks_import_vala.stamp import-pidgin.c import.c ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \ - $(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/vala.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vala.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -160,6 +161,8 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -270,6 +273,7 @@ VALADOC_CFLAGS = @VALADOC_CFLAGS@ VALADOC_LIBS = @VALADOC_LIBS@ VALAFLAGS = \ + $(AM_VALAFLAGS) \ --vapidir=$(top_builddir)/folks \ --pkg=gee-1.0 \ --pkg=libxml-2.0 \ @@ -338,25 +342,28 @@ # Inspector DIST_SUBDIRS = inspect @ENABLE_INSPECT_TOOL_TRUE@SUBDIRS = inspect -AM_CPPFLAGS = \ - -include $(CONFIG_HEADER) \ - -DLOCALE_DIR=\"$(pkgdatadir)/locale\" \ - $(NULL) - folks_import_SOURCES = \ import.vala \ import-pidgin.vala \ $(NULL) +folks_import_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -include $(CONFIG_HEADER) \ + -DLOCALE_DIR=\"$(pkgdatadir)/locale\" \ + -I$(top_srcdir)/folks \ + $(NULL) + folks_import_CFLAGS = \ + $(AM_CFLAGS) \ $(GIO_CFLAGS) \ $(GLIB_CFLAGS) \ $(GEE_CFLAGS) \ $(LIBXML_CFLAGS) \ - -I$(top_srcdir)/folks \ $(NULL) folks_import_LDADD = \ + $(AM_LDADD) \ $(GIO_LIBS) \ $(GLIB_LIBS) \ $(GEE_LIBS) \ @@ -462,66 +469,59 @@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< folks_import-import.o: import.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_import_CFLAGS) $(CFLAGS) -MT folks_import-import.o -MD -MP -MF $(DEPDIR)/folks_import-import.Tpo -c -o folks_import-import.o `test -f 'import.c' || echo '$(srcdir)/'`import.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_import_CPPFLAGS) $(CPPFLAGS) $(folks_import_CFLAGS) $(CFLAGS) -MT folks_import-import.o -MD -MP -MF $(DEPDIR)/folks_import-import.Tpo -c -o folks_import-import.o `test -f 'import.c' || echo '$(srcdir)/'`import.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_import-import.Tpo $(DEPDIR)/folks_import-import.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='import.c' object='folks_import-import.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='import.c' object='folks_import-import.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_import_CFLAGS) $(CFLAGS) -c -o folks_import-import.o `test -f 'import.c' || echo '$(srcdir)/'`import.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_import_CPPFLAGS) $(CPPFLAGS) $(folks_import_CFLAGS) $(CFLAGS) -c -o folks_import-import.o `test -f 'import.c' || echo '$(srcdir)/'`import.c folks_import-import.obj: import.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_import_CFLAGS) $(CFLAGS) -MT folks_import-import.obj -MD -MP -MF $(DEPDIR)/folks_import-import.Tpo -c -o folks_import-import.obj `if test -f 'import.c'; then $(CYGPATH_W) 'import.c'; else $(CYGPATH_W) '$(srcdir)/import.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_import_CPPFLAGS) $(CPPFLAGS) $(folks_import_CFLAGS) $(CFLAGS) -MT folks_import-import.obj -MD -MP -MF $(DEPDIR)/folks_import-import.Tpo -c -o folks_import-import.obj `if test -f 'import.c'; then $(CYGPATH_W) 'import.c'; else $(CYGPATH_W) '$(srcdir)/import.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_import-import.Tpo $(DEPDIR)/folks_import-import.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='import.c' object='folks_import-import.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='import.c' object='folks_import-import.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_import_CFLAGS) $(CFLAGS) -c -o folks_import-import.obj `if test -f 'import.c'; then $(CYGPATH_W) 'import.c'; else $(CYGPATH_W) '$(srcdir)/import.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_import_CPPFLAGS) $(CPPFLAGS) $(folks_import_CFLAGS) $(CFLAGS) -c -o folks_import-import.obj `if test -f 'import.c'; then $(CYGPATH_W) 'import.c'; else $(CYGPATH_W) '$(srcdir)/import.c'; fi` folks_import-import-pidgin.o: import-pidgin.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_import_CFLAGS) $(CFLAGS) -MT folks_import-import-pidgin.o -MD -MP -MF $(DEPDIR)/folks_import-import-pidgin.Tpo -c -o folks_import-import-pidgin.o `test -f 'import-pidgin.c' || echo '$(srcdir)/'`import-pidgin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_import_CPPFLAGS) $(CPPFLAGS) $(folks_import_CFLAGS) $(CFLAGS) -MT folks_import-import-pidgin.o -MD -MP -MF $(DEPDIR)/folks_import-import-pidgin.Tpo -c -o folks_import-import-pidgin.o `test -f 'import-pidgin.c' || echo '$(srcdir)/'`import-pidgin.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_import-import-pidgin.Tpo $(DEPDIR)/folks_import-import-pidgin.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='import-pidgin.c' object='folks_import-import-pidgin.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='import-pidgin.c' object='folks_import-import-pidgin.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_import_CFLAGS) $(CFLAGS) -c -o folks_import-import-pidgin.o `test -f 'import-pidgin.c' || echo '$(srcdir)/'`import-pidgin.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_import_CPPFLAGS) $(CPPFLAGS) $(folks_import_CFLAGS) $(CFLAGS) -c -o folks_import-import-pidgin.o `test -f 'import-pidgin.c' || echo '$(srcdir)/'`import-pidgin.c folks_import-import-pidgin.obj: import-pidgin.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_import_CFLAGS) $(CFLAGS) -MT folks_import-import-pidgin.obj -MD -MP -MF $(DEPDIR)/folks_import-import-pidgin.Tpo -c -o folks_import-import-pidgin.obj `if test -f 'import-pidgin.c'; then $(CYGPATH_W) 'import-pidgin.c'; else $(CYGPATH_W) '$(srcdir)/import-pidgin.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_import_CPPFLAGS) $(CPPFLAGS) $(folks_import_CFLAGS) $(CFLAGS) -MT folks_import-import-pidgin.obj -MD -MP -MF $(DEPDIR)/folks_import-import-pidgin.Tpo -c -o folks_import-import-pidgin.obj `if test -f 'import-pidgin.c'; then $(CYGPATH_W) 'import-pidgin.c'; else $(CYGPATH_W) '$(srcdir)/import-pidgin.c'; fi` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/folks_import-import-pidgin.Tpo $(DEPDIR)/folks_import-import-pidgin.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='import-pidgin.c' object='folks_import-import-pidgin.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='import-pidgin.c' object='folks_import-import-pidgin.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(folks_import_CFLAGS) $(CFLAGS) -c -o folks_import-import-pidgin.obj `if test -f 'import-pidgin.c'; then $(CYGPATH_W) 'import-pidgin.c'; else $(CYGPATH_W) '$(srcdir)/import-pidgin.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(folks_import_CPPFLAGS) $(CPPFLAGS) $(folks_import_CFLAGS) $(CFLAGS) -c -o folks_import-import-pidgin.obj `if test -f 'import-pidgin.c'; then $(CYGPATH_W) 'import-pidgin.c'; else $(CYGPATH_W) '$(srcdir)/import-pidgin.c'; fi` $(srcdir)/import.c: $(srcdir)/folks_import_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/folks_import_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/folks_import_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) folks_import_vala.stamp; \ fi $(srcdir)/import-pidgin.c: $(srcdir)/folks_import_vala.stamp + @if test -f $@; then :; else rm -f $(srcdir)/folks_import_vala.stamp; fi @if test -f $@; then :; else \ - rm -f $(srcdir)/folks_import_vala.stamp; \ $(am__cd) $(srcdir) && $(MAKE) $(AM_MAKEFLAGS) folks_import_vala.stamp; \ fi folks_import_vala.stamp: $(folks_import_SOURCES) @@ -745,10 +745,15 @@ installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: