diff -Nru seahorse-3.10.1/ChangeLog seahorse-3.10.2/ChangeLog --- seahorse-3.10.1/ChangeLog 2013-10-17 06:26:37.000000000 +0000 +++ seahorse-3.10.2/ChangeLog 2014-01-08 15:14:08.000000000 +0000 @@ -1,5 +1,161 @@ # Generated automatically. Do not edit. +commit b2e4934acd6021f4b5299c093dbdef1cf07af265 +Author: Stef Walter +Date: 2014-01-08 + + Release version 3.10.2 + + NEWS | 9 +++++++++ + configure.ac | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +commit a8ab0f066d1b145fa383501ec857cdfdeaac93f5 +Author: Colin Walters +Date: 2013-11-17 + + common: Work around vala srcdir != builddir from git issues + + gnome-continuous uses srcdir != builddir *from git*. This differs + from tarballs where generated source lives in $(srcdir). + + Anyways, vala's AM_PROG_VALAC generates some makefile rules that do + "cd $(srcdir) && valac ...". + + See https://bugzilla.gnome.org/show_bug.cgi?id=694153 + + The problem is this actively breaks the $(srcdir) and $(builddir) + automake macros when doing srcdir != builddir from git. + + We can work around it this way. + + https://bugzilla.gnome.org/show_bug.cgi?id=712538 + + common/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +commit 992343ad6dbf1a036dcccef2660ba494faec5c9c +Author: Fábio Nogueira +Date: 2014-01-03 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 106 ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 53 insertions(+), 53 deletions(-) + +commit 546b63f13f75be9394317674e77742b6374e2151 +Author: Rafael Ferreira +Date: 2014-01-03 + + Revert "Updated Brazilian Portuguese translation" + + This reverts commit 34103e19b52e2ec08d127bf0fb37357afbb08366. + + Wrong author + + po/pt_BR.po | 106 ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 53 insertions(+), 53 deletions(-) + +commit 34103e19b52e2ec08d127bf0fb37357afbb08366 +Author: Rafael Ferreira +Date: 2014-01-03 + + Updated Brazilian Portuguese translation + + po/pt_BR.po | 106 ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 53 insertions(+), 53 deletions(-) + +commit 9de25400d862b236f6c79db9a0841570988dec7d +Author: Tong Hui +Date: 2013-12-28 + + Update Chinese simplified translation + + po/zh_CN.po | 919 ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 463 insertions(+), 456 deletions(-) + +commit 370857dc7a40172a9c7d7e39d6d22381e7e36cde +Author: William Jon McCann +Date: 2013-12-18 + + Update homepage URL + + seahorse.doap | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit f3452d1fb77429eebf13e1cbc21eecf79b56d089 +Author: Michael Catanzaro +Date: 2013-11-22 + + Fix SSH key generation + + Here, i used to be a guint, but was recently changed into a gint to + silence a compiler warning. This caused the for loop to terminate + without ever iterating. + + https://bugzilla.gnome.org/show_bug.cgi?id=715051 + + ssh/seahorse-ssh-source.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 6a70791e8033fbc37f95beb1673d31a70eaf9a4a +Author: Colin Walters +Date: 2013-11-17 + + build: Update includes to work with srcdir != builddir from git + + seahorse-common.h is in $(builddir) when doing srcdir != builddir from + git. + + https://bugzilla.gnome.org/show_bug.cgi?id=712538 + + gkr/Makefile.am | 1 + + libseahorse/Makefile.am | 2 ++ + pkcs11/Makefile.am | 1 + + src/Makefile.am | 1 + + ssh/Makefile.am | 1 + + 5 files changed, 6 insertions(+) + +commit b8efbb1b8f253d39449184e42904c97372c11066 +Author: Sebastian Keller +Date: 2013-11-07 + + ui: fix pgp/ssh key export + + The vala code is expecting the directory parameter to be a reference + so when checking "directory != null" it dereferences directory first. + + https://bugzilla.gnome.org/show_bug.cgi?id=707014 + + pgp/seahorse-pgp-key-properties.c | 4 +++- + ssh/seahorse-ssh-key-properties.c | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) + +commit 68154a136aad48cc00675f0f7f4986230dd5a69e +Author: Efstathios Iosifidis +Date: 2013-11-05 + + Updated Greek translation + + po/el.po | 984 ++++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 493 insertions(+), 491 deletions(-) + +commit 3d2c3708224da1f103e7796696beb8ec49b274d1 +Author: Stef Walter +Date: 2013-10-19 + + Fix up automake and compiler warnings + + common/Makefile.am | 2 +- + gkr/Makefile.am | 2 +- + libegg/Makefile.am | 10 ++++------ + libseahorse/Makefile.am | 2 +- + pgp/Makefile.am | 2 +- + pkcs11/Makefile.am | 2 +- + src/Makefile.am | 2 +- + ssh/Makefile.am | 2 +- + 8 files changed, 11 insertions(+), 13 deletions(-) + commit 3e02f3a6836559f6c8ab772184070e02003c9df4 Author: Stef Walter Date: 2013-10-17 diff -Nru seahorse-3.10.1/NEWS seahorse-3.10.2/NEWS --- seahorse-3.10.1/NEWS 2013-10-17 06:25:12.000000000 +0000 +++ seahorse-3.10.2/NEWS 2014-01-08 15:09:14.000000000 +0000 @@ -1,3 +1,12 @@ +seahorse 3.10.2 +--------------- + + * Fix pgp/ssh key export [#707014] + * Fix SSH key generation [#715051] + * Update homepage URL + * Build fixes [#712538] + * Updated translations + seahorse 3.10.1 --------------- diff -Nru seahorse-3.10.1/aclocal.m4 seahorse-3.10.2/aclocal.m4 --- seahorse-3.10.1/aclocal.m4 2013-10-17 06:25:31.000000000 +0000 +++ seahorse-3.10.2/aclocal.m4 2014-01-08 15:09:36.000000000 +0000 @@ -337,7 +337,6 @@ dnl glib_DEFUN([GLIB_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl GLIB_LC_MESSAGES GLIB_WITH_NLS @@ -503,7 +502,7 @@ ]) # List of supported lcov versions. - lcov_version_list="1.6 1.7 1.8 1.9" + lcov_version_list="1.6 1.7 1.8 1.9 1.10" AC_CHECK_PROG([LCOV], [lcov], [lcov]) AC_CHECK_PROG([GENHTML], [genhtml], [genhtml]) @@ -579,7 +578,7 @@ # Use recursive makes in order to ignore errors during check check-code-coverage: -ifdef CODE_COVERAGE_ENABLED +ifeq ($(CODE_COVERAGE_ENABLED),yes) -$(MAKE) $(AM_MAKEFLAGS) -k check $(MAKE) $(AM_MAKEFLAGS) code-coverage-capture else @@ -588,7 +587,7 @@ # Capture code coverage data code-coverage-capture: code-coverage-capture-hook -ifdef CODE_COVERAGE_ENABLED +ifeq ($(CODE_COVERAGE_ENABLED),yes) $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS) $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp @@ -601,11 +600,13 @@ # Hook rule executed before code-coverage-capture, overridable by the user code-coverage-capture-hook: +ifeq ($(CODE_COVERAGE_ENABLED),yes) clean: code-coverage-clean code-coverage-clean: -$(LCOV) --directory $(top_builddir) -z -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY) -find . -name "*.gcda" -o -name "*.gcov" -delete +endif GITIGNOREFILES ?= GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) @@ -937,6 +938,21 @@ m4_popdef([pkg_description]) ]) dnl PKG_NOARCH_INSTALLDIR + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + AC_DEFUN([YELP_HELP_INIT], [ AC_REQUIRE([AC_PROG_LN_S]) @@ -991,7 +1007,8 @@ .PHONY: pot pot: $(_HELP_POTFILE) $(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) - $(AM_V_GEN)$(ITSTOOL) -o "[$]@" $(_HELP_C_FILES) + $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \ + $(ITSTOOL) -o "[$]@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)") .PHONY: repo repo: $(_HELP_POTFILE) diff -Nru seahorse-3.10.1/build/aux/config.guess seahorse-3.10.2/build/aux/config.guess --- seahorse-3.10.1/build/aux/config.guess 2013-10-15 16:14:59.000000000 +0000 +++ seahorse-3.10.2/build/aux/config.guess 2013-11-12 19:34:07.000000000 +0000 @@ -1,8 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012, 2013 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2012-12-29' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -24,7 +26,7 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD @@ -50,7 +52,9 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +2012, 2013 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." @@ -132,27 +136,6 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in -Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu - - eval $set_cc_for_build - cat <<-EOF > $dummy.c - #include - #if defined(__UCLIBC__) - LIBC=uclibc - #elif defined(__dietlibc__) - LIBC=dietlibc - #else - LIBC=gnu - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - ;; -esac - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -874,21 +857,21 @@ exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -901,54 +884,59 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo ${UNAME_MACHINE}-unknown-linux-gnueabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -967,63 +955,54 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-gnu exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-gnu exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} - exit ;; - ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} - exit ;; - ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1256,21 +1235,19 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc - fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - fi + case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) diff -Nru seahorse-3.10.1/build/aux/config.sub seahorse-3.10.2/build/aux/config.sub --- seahorse-3.10.1/build/aux/config.sub 2013-10-15 16:14:59.000000000 +0000 +++ seahorse-3.10.2/build/aux/config.sub 2013-11-12 19:34:07.000000000 +0000 @@ -1,8 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012, 2013 Free Software Foundation, Inc. -timestamp='2013-04-24' +timestamp='2012-12-29' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -68,7 +70,9 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +2012, 2013 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." @@ -252,7 +256,7 @@ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arceb \ + | arc \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ | be32 | be64 \ @@ -286,17 +290,16 @@ | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ + | nios | nios2 \ | ns16k | ns32k \ | open8 \ - | or1k | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -366,7 +369,7 @@ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ @@ -404,13 +407,12 @@ | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | orion-* \ @@ -1352,7 +1354,7 @@ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* | -plan9* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ @@ -1498,6 +1500,9 @@ -aros*) os=-aros ;; + -kaos*) + os=-kaos + ;; -zvmoe) os=-zvmoe ;; @@ -1589,9 +1594,6 @@ mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff -Nru seahorse-3.10.1/build/m4/libtool.m4 seahorse-3.10.2/build/m4/libtool.m4 --- seahorse-3.10.1/build/m4/libtool.m4 2013-10-15 16:14:53.000000000 +0000 +++ seahorse-3.10.2/build/m4/libtool.m4 2013-11-12 19:34:02.000000000 +0000 @@ -1312,7 +1312,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1326,7 +1326,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -1345,7 +1348,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) diff -Nru seahorse-3.10.1/common/Makefile.am seahorse-3.10.2/common/Makefile.am --- seahorse-3.10.1/common/Makefile.am 2013-06-26 10:09:22.000000000 +0000 +++ seahorse-3.10.2/common/Makefile.am 2014-01-08 15:06:15.000000000 +0000 @@ -2,7 +2,7 @@ uidir = $(datadir)/seahorse/ui/ -INCLUDES = -I$(top_builddir) \ +AM_CPPFLAGS = -I$(top_builddir) \ -I$(top_srcdir) \ -DPKGDATADIR=\""$(pkgdatadir)/"\" \ -DUIDIR=\""$(uidir)"\" \ @@ -31,11 +31,11 @@ AM_VALAFLAGS = \ $(VALA_FLAGS) \ --use-header \ - --header=seahorse-internal.h \ + --header=$(abs_builddir)/seahorse-internal.h \ + --vapidir=$(abs_srcdir) \ --pkg gtk+-3.0 \ --pkg gcr-3 \ --pkg config \ - --vapidir=$(srcdir) \ --vapi=common.vapi \ $(NULL) diff -Nru seahorse-3.10.1/common/Makefile.in seahorse-3.10.2/common/Makefile.in --- seahorse-3.10.1/common/Makefile.in 2013-10-17 06:25:32.000000000 +0000 +++ seahorse-3.10.2/common/Makefile.in 2014-01-08 15:09:37.000000000 +0000 @@ -371,7 +371,7 @@ top_srcdir = @top_srcdir@ NULL = uidir = $(datadir)/seahorse/ui/ -INCLUDES = -I$(top_builddir) \ +AM_CPPFLAGS = -I$(top_builddir) \ -I$(top_srcdir) \ -DPKGDATADIR=\""$(pkgdatadir)/"\" \ -DUIDIR=\""$(uidir)"\" \ @@ -399,11 +399,11 @@ AM_VALAFLAGS = \ $(VALA_FLAGS) \ --use-header \ - --header=seahorse-internal.h \ + --header=$(abs_builddir)/seahorse-internal.h \ + --vapidir=$(abs_srcdir) \ --pkg gtk+-3.0 \ --pkg gcr-3 \ --pkg config \ - --vapidir=$(srcdir) \ --vapi=common.vapi \ $(NULL) diff -Nru seahorse-3.10.1/common/actions.c seahorse-3.10.2/common/actions.c --- seahorse-3.10.1/common/actions.c 2013-07-24 15:11:10.000000000 +0000 +++ seahorse-3.10.2/common/actions.c 2014-01-08 15:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -/* actions.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* actions.c generated by valac 0.22.1, the Vala compiler * generated from actions.vala, do not modify */ /* @@ -65,7 +65,7 @@ static gpointer _g_object_ref0 (gpointer self) { -#line 29 "/data/projects/seahorse/common/actions.vala" +#line 29 "/data/src/seahorse/common/actions.vala" return self ? g_object_ref (self) : NULL; #line 71 "actions.c" } @@ -78,23 +78,23 @@ GtkAction* _tmp3_ = NULL; SeahorseCatalog* _tmp4_ = NULL; SeahorseCatalog* _tmp5_ = NULL; -#line 26 "/data/projects/seahorse/common/actions.vala" +#line 26 "/data/src/seahorse/common/actions.vala" g_return_if_fail (action != NULL); -#line 29 "/data/projects/seahorse/common/actions.vala" +#line 29 "/data/src/seahorse/common/actions.vala" _tmp0_ = action; -#line 29 "/data/projects/seahorse/common/actions.vala" +#line 29 "/data/src/seahorse/common/actions.vala" _tmp1_ = window; -#line 29 "/data/projects/seahorse/common/actions.vala" +#line 29 "/data/src/seahorse/common/actions.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 29 "/data/projects/seahorse/common/actions.vala" +#line 29 "/data/src/seahorse/common/actions.vala" g_object_set_data_full ((GObject*) _tmp0_, "seahorse-action-window", _tmp2_, g_object_unref); -#line 30 "/data/projects/seahorse/common/actions.vala" +#line 30 "/data/src/seahorse/common/actions.vala" _tmp3_ = action; -#line 30 "/data/projects/seahorse/common/actions.vala" +#line 30 "/data/src/seahorse/common/actions.vala" _tmp4_ = catalog; -#line 30 "/data/projects/seahorse/common/actions.vala" +#line 30 "/data/src/seahorse/common/actions.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 30 "/data/projects/seahorse/common/actions.vala" +#line 30 "/data/src/seahorse/common/actions.vala" g_object_set_data_full ((GObject*) _tmp3_, "seahorse-action-catalog", _tmp5_, g_object_unref); #line 100 "actions.c" } @@ -106,23 +106,23 @@ GtkWindow* _tmp2_ = NULL; GtkAction* _tmp3_ = NULL; GtkAction* _tmp4_ = NULL; -#line 33 "/data/projects/seahorse/common/actions.vala" +#line 33 "/data/src/seahorse/common/actions.vala" g_return_if_fail (action != NULL); -#line 36 "/data/projects/seahorse/common/actions.vala" +#line 36 "/data/src/seahorse/common/actions.vala" _tmp0_ = action; -#line 36 "/data/projects/seahorse/common/actions.vala" +#line 36 "/data/src/seahorse/common/actions.vala" _tmp1_ = catalog; -#line 36 "/data/projects/seahorse/common/actions.vala" +#line 36 "/data/src/seahorse/common/actions.vala" _tmp2_ = window; -#line 36 "/data/projects/seahorse/common/actions.vala" +#line 36 "/data/src/seahorse/common/actions.vala" seahorse_action_pre_activate (_tmp0_, _tmp1_, _tmp2_); -#line 37 "/data/projects/seahorse/common/actions.vala" +#line 37 "/data/src/seahorse/common/actions.vala" _tmp3_ = action; -#line 37 "/data/projects/seahorse/common/actions.vala" +#line 37 "/data/src/seahorse/common/actions.vala" gtk_action_activate (_tmp3_); -#line 38 "/data/projects/seahorse/common/actions.vala" +#line 38 "/data/src/seahorse/common/actions.vala" _tmp4_ = action; -#line 38 "/data/projects/seahorse/common/actions.vala" +#line 38 "/data/src/seahorse/common/actions.vala" seahorse_action_post_activate (_tmp4_); #line 128 "actions.c" } @@ -131,15 +131,15 @@ void seahorse_action_post_activate (GtkAction* action) { GtkAction* _tmp0_ = NULL; GtkAction* _tmp1_ = NULL; -#line 41 "/data/projects/seahorse/common/actions.vala" +#line 41 "/data/src/seahorse/common/actions.vala" g_return_if_fail (action != NULL); -#line 42 "/data/projects/seahorse/common/actions.vala" +#line 42 "/data/src/seahorse/common/actions.vala" _tmp0_ = action; -#line 42 "/data/projects/seahorse/common/actions.vala" +#line 42 "/data/src/seahorse/common/actions.vala" g_object_set_data_full ((GObject*) _tmp0_, "seahorse-action-window", NULL, NULL); -#line 43 "/data/projects/seahorse/common/actions.vala" +#line 43 "/data/src/seahorse/common/actions.vala" _tmp1_ = action; -#line 43 "/data/projects/seahorse/common/actions.vala" +#line 43 "/data/src/seahorse/common/actions.vala" g_object_set_data_full ((GObject*) _tmp1_, "seahorse-action-catalog", NULL, NULL); #line 145 "actions.c" } @@ -151,19 +151,19 @@ GtkAction* _tmp0_ = NULL; gconstpointer _tmp1_ = NULL; GtkWindow* _tmp2_ = NULL; -#line 46 "/data/projects/seahorse/common/actions.vala" +#line 46 "/data/src/seahorse/common/actions.vala" g_return_val_if_fail (action != NULL, NULL); -#line 47 "/data/projects/seahorse/common/actions.vala" +#line 47 "/data/src/seahorse/common/actions.vala" _tmp0_ = action; -#line 47 "/data/projects/seahorse/common/actions.vala" +#line 47 "/data/src/seahorse/common/actions.vala" _tmp1_ = g_object_get_data ((GObject*) _tmp0_, "seahorse-action-window"); -#line 47 "/data/projects/seahorse/common/actions.vala" +#line 47 "/data/src/seahorse/common/actions.vala" _tmp2_ = _g_object_ref0 ((GtkWindow*) _tmp1_); -#line 47 "/data/projects/seahorse/common/actions.vala" +#line 47 "/data/src/seahorse/common/actions.vala" window = _tmp2_; -#line 48 "/data/projects/seahorse/common/actions.vala" +#line 48 "/data/src/seahorse/common/actions.vala" result = window; -#line 48 "/data/projects/seahorse/common/actions.vala" +#line 48 "/data/src/seahorse/common/actions.vala" return result; #line 169 "actions.c" } @@ -175,19 +175,19 @@ GtkAction* _tmp0_ = NULL; gconstpointer _tmp1_ = NULL; SeahorseCatalog* _tmp2_ = NULL; -#line 51 "/data/projects/seahorse/common/actions.vala" +#line 51 "/data/src/seahorse/common/actions.vala" g_return_val_if_fail (action != NULL, NULL); -#line 52 "/data/projects/seahorse/common/actions.vala" +#line 52 "/data/src/seahorse/common/actions.vala" _tmp0_ = action; -#line 52 "/data/projects/seahorse/common/actions.vala" +#line 52 "/data/src/seahorse/common/actions.vala" _tmp1_ = g_object_get_data ((GObject*) _tmp0_, "seahorse-action-catalog"); -#line 52 "/data/projects/seahorse/common/actions.vala" +#line 52 "/data/src/seahorse/common/actions.vala" _tmp2_ = _g_object_ref0 ((SeahorseCatalog*) _tmp1_); -#line 52 "/data/projects/seahorse/common/actions.vala" +#line 52 "/data/src/seahorse/common/actions.vala" catalog = _tmp2_; -#line 53 "/data/projects/seahorse/common/actions.vala" +#line 53 "/data/src/seahorse/common/actions.vala" result = catalog; -#line 53 "/data/projects/seahorse/common/actions.vala" +#line 53 "/data/src/seahorse/common/actions.vala" return result; #line 193 "actions.c" } @@ -195,32 +195,32 @@ SeahorseAction* seahorse_action_construct (GType object_type) { SeahorseAction* self = NULL; -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" self = (SeahorseAction*) g_type_create_instance (object_type); -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" return self; #line 203 "actions.c" } SeahorseAction* seahorse_action_new (void) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" return seahorse_action_construct (SEAHORSE_TYPE_ACTION); #line 210 "actions.c" } static void seahorse_value_action_init (GValue* value) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" value->data[0].v_pointer = NULL; #line 217 "actions.c" } static void seahorse_value_action_free_value (GValue* value) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" if (value->data[0].v_pointer) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" seahorse_action_unref (value->data[0].v_pointer); #line 226 "actions.c" } @@ -228,13 +228,13 @@ static void seahorse_value_action_copy_value (const GValue* src_value, GValue* dest_value) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" if (src_value->data[0].v_pointer) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" dest_value->data[0].v_pointer = seahorse_action_ref (src_value->data[0].v_pointer); #line 236 "actions.c" } else { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" dest_value->data[0].v_pointer = NULL; #line 240 "actions.c" } @@ -242,37 +242,37 @@ static gpointer seahorse_value_action_peek_pointer (const GValue* value) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" return value->data[0].v_pointer; #line 248 "actions.c" } static gchar* seahorse_value_action_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" if (collect_values[0].v_pointer) { #line 255 "actions.c" SeahorseAction* object; object = collect_values[0].v_pointer; -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" if (object->parent_instance.g_class == NULL) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); #line 262 "actions.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.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 266 "actions.c" } -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" value->data[0].v_pointer = seahorse_action_ref (object); #line 270 "actions.c" } else { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" value->data[0].v_pointer = NULL; #line 274 "actions.c" } -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" return NULL; #line 278 "actions.c" } @@ -281,27 +281,27 @@ static gchar* seahorse_value_action_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { SeahorseAction** object_p; object_p = collect_values[0].v_pointer; -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" if (!object_p) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); #line 289 "actions.c" } -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" if (!value->data[0].v_pointer) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" *object_p = NULL; #line 295 "actions.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" *object_p = value->data[0].v_pointer; #line 299 "actions.c" } else { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" *object_p = seahorse_action_ref (value->data[0].v_pointer); #line 303 "actions.c" } -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" return NULL; #line 307 "actions.c" } @@ -309,22 +309,22 @@ GParamSpec* seahorse_param_spec_action (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { SeahorseParamSpecAction* spec; -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" g_return_val_if_fail (g_type_is_a (object_type, SEAHORSE_TYPE_ACTION), NULL); -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" return G_PARAM_SPEC (spec); #line 321 "actions.c" } gpointer seahorse_value_get_action (const GValue* value) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SEAHORSE_TYPE_ACTION), NULL); -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" return value->data[0].v_pointer; #line 330 "actions.c" } @@ -332,29 +332,29 @@ void seahorse_value_set_action (GValue* value, gpointer v_object) { SeahorseAction* old; -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SEAHORSE_TYPE_ACTION)); -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" old = value->data[0].v_pointer; -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" if (v_object) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SEAHORSE_TYPE_ACTION)); -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" value->data[0].v_pointer = v_object; -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" seahorse_action_ref (value->data[0].v_pointer); #line 350 "actions.c" } else { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" value->data[0].v_pointer = NULL; #line 354 "actions.c" } -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" if (old) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" seahorse_action_unref (old); #line 360 "actions.c" } @@ -363,27 +363,27 @@ void seahorse_value_take_action (GValue* value, gpointer v_object) { SeahorseAction* old; -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SEAHORSE_TYPE_ACTION)); -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" old = value->data[0].v_pointer; -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" if (v_object) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SEAHORSE_TYPE_ACTION)); -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" value->data[0].v_pointer = v_object; #line 379 "actions.c" } else { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" value->data[0].v_pointer = NULL; #line 383 "actions.c" } -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" if (old) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" seahorse_action_unref (old); #line 389 "actions.c" } @@ -391,16 +391,16 @@ static void seahorse_action_class_init (SeahorseActionClass * klass) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" seahorse_action_parent_class = g_type_class_peek_parent (klass); -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" SEAHORSE_ACTION_CLASS (klass)->finalize = seahorse_action_finalize; #line 399 "actions.c" } static void seahorse_action_instance_init (SeahorseAction * self) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" self->ref_count = 1; #line 406 "actions.c" } @@ -408,7 +408,7 @@ static void seahorse_action_finalize (SeahorseAction* obj) { SeahorseAction * self; -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_TYPE_ACTION, SeahorseAction); #line 414 "actions.c" } @@ -431,9 +431,9 @@ gpointer seahorse_action_ref (gpointer instance) { SeahorseAction* self; self = instance; -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" g_atomic_int_inc (&self->ref_count); -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" return instance; #line 439 "actions.c" } @@ -442,11 +442,11 @@ void seahorse_action_unref (gpointer instance) { SeahorseAction* self; self = instance; -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" SEAHORSE_ACTION_GET_CLASS (self)->finalize (self); -#line 25 "/data/projects/seahorse/common/actions.vala" +#line 25 "/data/src/seahorse/common/actions.vala" g_type_free_instance ((GTypeInstance *) self); #line 452 "actions.c" } @@ -456,20 +456,20 @@ static SeahorseActions* seahorse_actions_construct (GType object_type, const gchar* name) { SeahorseActions * self = NULL; const gchar* _tmp0_ = NULL; -#line 70 "/data/projects/seahorse/common/actions.vala" +#line 70 "/data/src/seahorse/common/actions.vala" g_return_val_if_fail (name != NULL, NULL); -#line 71 "/data/projects/seahorse/common/actions.vala" +#line 71 "/data/src/seahorse/common/actions.vala" _tmp0_ = name; -#line 71 "/data/projects/seahorse/common/actions.vala" +#line 71 "/data/src/seahorse/common/actions.vala" self = (SeahorseActions*) g_object_new (object_type, "name", _tmp0_, NULL); -#line 70 "/data/projects/seahorse/common/actions.vala" +#line 70 "/data/src/seahorse/common/actions.vala" return self; #line 468 "actions.c" } static SeahorseActions* seahorse_actions_new (const gchar* name) { -#line 70 "/data/projects/seahorse/common/actions.vala" +#line 70 "/data/src/seahorse/common/actions.vala" return seahorse_actions_construct (SEAHORSE_TYPE_ACTIONS, name); #line 475 "actions.c" } @@ -477,13 +477,13 @@ void seahorse_actions_register_definition (SeahorseActions* self, const gchar* definition) { const gchar* _tmp0_ = NULL; -#line 76 "/data/projects/seahorse/common/actions.vala" +#line 76 "/data/src/seahorse/common/actions.vala" g_return_if_fail (self != NULL); -#line 76 "/data/projects/seahorse/common/actions.vala" +#line 76 "/data/src/seahorse/common/actions.vala" g_return_if_fail (definition != NULL); -#line 77 "/data/projects/seahorse/common/actions.vala" +#line 77 "/data/src/seahorse/common/actions.vala" _tmp0_ = definition; -#line 77 "/data/projects/seahorse/common/actions.vala" +#line 77 "/data/src/seahorse/common/actions.vala" self->priv->_definition = _tmp0_; #line 489 "actions.c" } @@ -492,13 +492,13 @@ SeahorseCatalog* seahorse_actions_get_catalog (SeahorseActions* self) { SeahorseCatalog* result; GObject* _tmp0_ = NULL; -#line 59 "/data/projects/seahorse/common/actions.vala" +#line 59 "/data/src/seahorse/common/actions.vala" g_return_val_if_fail (self != NULL, NULL); -#line 59 "/data/projects/seahorse/common/actions.vala" +#line 59 "/data/src/seahorse/common/actions.vala" _tmp0_ = g_weak_ref_get (&self->priv->_catalog); -#line 59 "/data/projects/seahorse/common/actions.vala" +#line 59 "/data/src/seahorse/common/actions.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SEAHORSE_TYPE_CATALOG, SeahorseCatalog); -#line 59 "/data/projects/seahorse/common/actions.vala" +#line 59 "/data/src/seahorse/common/actions.vala" return result; #line 504 "actions.c" } @@ -506,13 +506,13 @@ void seahorse_actions_set_catalog (SeahorseActions* self, SeahorseCatalog* value) { SeahorseCatalog* _tmp0_ = NULL; -#line 60 "/data/projects/seahorse/common/actions.vala" +#line 60 "/data/src/seahorse/common/actions.vala" g_return_if_fail (self != NULL); -#line 60 "/data/projects/seahorse/common/actions.vala" +#line 60 "/data/src/seahorse/common/actions.vala" _tmp0_ = value; -#line 60 "/data/projects/seahorse/common/actions.vala" +#line 60 "/data/src/seahorse/common/actions.vala" g_weak_ref_set (&self->priv->_catalog, (GObject*) _tmp0_); -#line 60 "/data/projects/seahorse/common/actions.vala" +#line 60 "/data/src/seahorse/common/actions.vala" g_object_notify ((GObject *) self, "catalog"); #line 518 "actions.c" } @@ -521,39 +521,39 @@ const gchar* seahorse_actions_get_definition (SeahorseActions* self) { const gchar* result; const gchar* _tmp0_ = NULL; -#line 64 "/data/projects/seahorse/common/actions.vala" +#line 64 "/data/src/seahorse/common/actions.vala" g_return_val_if_fail (self != NULL, NULL); -#line 64 "/data/projects/seahorse/common/actions.vala" +#line 64 "/data/src/seahorse/common/actions.vala" _tmp0_ = self->priv->_definition; -#line 64 "/data/projects/seahorse/common/actions.vala" +#line 64 "/data/src/seahorse/common/actions.vala" result = _tmp0_; -#line 64 "/data/projects/seahorse/common/actions.vala" +#line 64 "/data/src/seahorse/common/actions.vala" return result; #line 533 "actions.c" } static void seahorse_actions_class_init (SeahorseActionsClass * klass) { -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" seahorse_actions_parent_class = g_type_class_peek_parent (klass); -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" g_type_class_add_private (klass, sizeof (SeahorseActionsPrivate)); -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" G_OBJECT_CLASS (klass)->get_property = _vala_seahorse_actions_get_property; -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" G_OBJECT_CLASS (klass)->set_property = _vala_seahorse_actions_set_property; -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" G_OBJECT_CLASS (klass)->finalize = seahorse_actions_finalize; -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_ACTIONS_CATALOG, g_param_spec_object ("catalog", "catalog", "catalog", SEAHORSE_TYPE_CATALOG, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_ACTIONS_DEFINITION, g_param_spec_string ("definition", "definition", "definition", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 552 "actions.c" } static void seahorse_actions_instance_init (SeahorseActions * self) { -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" self->priv = SEAHORSE_ACTIONS_GET_PRIVATE (self); #line 559 "actions.c" } @@ -561,11 +561,11 @@ static void seahorse_actions_finalize (GObject* obj) { SeahorseActions * self; -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_TYPE_ACTIONS, SeahorseActions); -#line 68 "/data/projects/seahorse/common/actions.vala" +#line 68 "/data/src/seahorse/common/actions.vala" g_weak_ref_clear (&self->priv->_catalog); -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" G_OBJECT_CLASS (seahorse_actions_parent_class)->finalize (obj); #line 571 "actions.c" } @@ -586,25 +586,25 @@ static void _vala_seahorse_actions_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { SeahorseActions * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEAHORSE_TYPE_ACTIONS, SeahorseActions); -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" switch (property_id) { -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" case SEAHORSE_ACTIONS_CATALOG: -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" g_value_take_object (value, seahorse_actions_get_catalog (self)); -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" break; -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" case SEAHORSE_ACTIONS_DEFINITION: -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" g_value_set_string (value, seahorse_actions_get_definition (self)); -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" break; #line 604 "actions.c" default: -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" break; #line 610 "actions.c" } @@ -614,19 +614,19 @@ static void _vala_seahorse_actions_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { SeahorseActions * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEAHORSE_TYPE_ACTIONS, SeahorseActions); -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" switch (property_id) { -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" case SEAHORSE_ACTIONS_CATALOG: -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" seahorse_actions_set_catalog (self, g_value_get_object (value)); -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" break; #line 626 "actions.c" default: -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 57 "/data/projects/seahorse/common/actions.vala" +#line 57 "/data/src/seahorse/common/actions.vala" break; #line 632 "actions.c" } diff -Nru seahorse-3.10.1/common/backend.c seahorse-3.10.2/common/backend.c --- seahorse-3.10.1/common/backend.c 2013-07-24 15:51:30.000000000 +0000 +++ seahorse-3.10.2/common/backend.c 2014-01-08 15:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -/* backend.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* backend.c generated by valac 0.22.1, the Vala compiler * generated from backend.vala, do not modify */ /* @@ -34,16 +34,16 @@ SeahorsePlace* seahorse_backend_lookup_place (SeahorseBackend* self, const gchar* uri) { -#line 30 "/data/projects/seahorse/common/backend.vala" +#line 30 "/data/src/seahorse/common/backend.vala" g_return_val_if_fail (self != NULL, NULL); -#line 30 "/data/projects/seahorse/common/backend.vala" +#line 30 "/data/src/seahorse/common/backend.vala" return SEAHORSE_BACKEND_GET_INTERFACE (self)->lookup_place (self, uri); #line 42 "backend.c" } void seahorse_backend_register (SeahorseBackend* self) { -#line 33 "/data/projects/seahorse/common/backend.vala" +#line 33 "/data/src/seahorse/common/backend.vala" seahorse_registry_register_object ((GObject*) self, "backend"); #line 49 "backend.c" } @@ -52,66 +52,66 @@ GList* seahorse_backend_get_registered (void) { GList* result = NULL; GList* _tmp0_ = NULL; -#line 37 "/data/projects/seahorse/common/backend.vala" +#line 37 "/data/src/seahorse/common/backend.vala" _tmp0_ = seahorse_registry_object_instances ("backend"); -#line 37 "/data/projects/seahorse/common/backend.vala" +#line 37 "/data/src/seahorse/common/backend.vala" result = (GList*) _tmp0_; -#line 37 "/data/projects/seahorse/common/backend.vala" +#line 37 "/data/src/seahorse/common/backend.vala" return result; #line 62 "backend.c" } const gchar* seahorse_backend_get_name (SeahorseBackend* self) { -#line 25 "/data/projects/seahorse/common/backend.vala" +#line 25 "/data/src/seahorse/common/backend.vala" g_return_val_if_fail (self != NULL, NULL); -#line 25 "/data/projects/seahorse/common/backend.vala" +#line 25 "/data/src/seahorse/common/backend.vala" return SEAHORSE_BACKEND_GET_INTERFACE (self)->get_name (self); #line 71 "backend.c" } const gchar* seahorse_backend_get_label (SeahorseBackend* self) { -#line 26 "/data/projects/seahorse/common/backend.vala" +#line 26 "/data/src/seahorse/common/backend.vala" g_return_val_if_fail (self != NULL, NULL); -#line 26 "/data/projects/seahorse/common/backend.vala" +#line 26 "/data/src/seahorse/common/backend.vala" return SEAHORSE_BACKEND_GET_INTERFACE (self)->get_label (self); #line 80 "backend.c" } const gchar* seahorse_backend_get_description (SeahorseBackend* self) { -#line 27 "/data/projects/seahorse/common/backend.vala" +#line 27 "/data/src/seahorse/common/backend.vala" g_return_val_if_fail (self != NULL, NULL); -#line 27 "/data/projects/seahorse/common/backend.vala" +#line 27 "/data/src/seahorse/common/backend.vala" return SEAHORSE_BACKEND_GET_INTERFACE (self)->get_description (self); #line 89 "backend.c" } GtkActionGroup* seahorse_backend_get_actions (SeahorseBackend* self) { -#line 28 "/data/projects/seahorse/common/backend.vala" +#line 28 "/data/src/seahorse/common/backend.vala" g_return_val_if_fail (self != NULL, NULL); -#line 28 "/data/projects/seahorse/common/backend.vala" +#line 28 "/data/src/seahorse/common/backend.vala" return SEAHORSE_BACKEND_GET_INTERFACE (self)->get_actions (self); #line 98 "backend.c" } static void seahorse_backend_base_init (SeahorseBackendIface * iface) { -#line 24 "/data/projects/seahorse/common/backend.vala" +#line 24 "/data/src/seahorse/common/backend.vala" static gboolean initialized = FALSE; -#line 24 "/data/projects/seahorse/common/backend.vala" +#line 24 "/data/src/seahorse/common/backend.vala" if (!initialized) { -#line 24 "/data/projects/seahorse/common/backend.vala" +#line 24 "/data/src/seahorse/common/backend.vala" initialized = TRUE; -#line 24 "/data/projects/seahorse/common/backend.vala" +#line 24 "/data/src/seahorse/common/backend.vala" g_object_interface_install_property (iface, g_param_spec_string ("name", "name", "name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 24 "/data/projects/seahorse/common/backend.vala" +#line 24 "/data/src/seahorse/common/backend.vala" g_object_interface_install_property (iface, g_param_spec_string ("label", "label", "label", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 24 "/data/projects/seahorse/common/backend.vala" +#line 24 "/data/src/seahorse/common/backend.vala" g_object_interface_install_property (iface, g_param_spec_string ("description", "description", "description", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 24 "/data/projects/seahorse/common/backend.vala" +#line 24 "/data/src/seahorse/common/backend.vala" g_object_interface_install_property (iface, g_param_spec_object ("actions", "actions", "actions", GTK_TYPE_ACTION_GROUP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 117 "backend.c" } diff -Nru seahorse-3.10.1/common/catalog.c seahorse-3.10.2/common/catalog.c --- seahorse-3.10.1/common/catalog.c 2013-07-24 15:11:10.000000000 +0000 +++ seahorse-3.10.2/common/catalog.c 2014-01-08 15:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -/* catalog.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* catalog.c generated by valac 0.22.1, the Vala compiler * generated from catalog.vala, do not modify */ /* @@ -116,133 +116,133 @@ static const GtkActionEntry SEAHORSE_CATALOG_UI_ENTRIES[12] = {{"file-menu", NULL, "_File"}, {"file-export", GTK_STOCK_SAVE_AS, "E_xport...", NULL, "Export to a file", (GCallback) _seahorse_catalog_on_key_export_file_gtk_action_callback}, {"edit-menu", NULL, "_Edit"}, {"edit-export-clipboard", GTK_STOCK_COPY, NULL, "C", "Copy to the clipboard", (GCallback) _seahorse_catalog_on_key_export_clipboard_gtk_action_callback}, {"edit-delete", GTK_STOCK_DELETE, "_Delete", NULL, "Delete selected items", (GCallback) _seahorse_catalog_on_object_delete_gtk_action_callback}, {"properties-object", GTK_STOCK_PROPERTIES, NULL, NULL, "Show the properties of this item", (GCallback) _seahorse_catalog_on_properties_object_gtk_action_callback}, {"properties-keyring", GTK_STOCK_PROPERTIES, NULL, NULL, "Show the properties of this keyring", (GCallback) _seahorse_catalog_on_properties_place_gtk_action_callback}, {"app-preferences", GTK_STOCK_PREFERENCES, "Prefere_nces", NULL, "Change preferences for this program", (GCallback) _seahorse_catalog_on_app_preferences_gtk_action_callback}, {"view-menu", NULL, "_View"}, {"help-menu", NULL, "_Help"}, {"app-about", GTK_STOCK_ABOUT, NULL, NULL, "About this program", (GCallback) _seahorse_catalog_on_app_about_gtk_action_callback}, {"help-show", GTK_STOCK_HELP, "_Contents", "F1", "Show Seahorse help", (GCallback) _seahorse_catalog_on_help_show_gtk_action_callback}}; static void _g_object_unref0_ (gpointer var) { -#line 43 "/data/projects/seahorse/common/catalog.vala" +#line 43 "/data/src/seahorse/common/catalog.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); #line 122 "catalog.c" } static void _g_list_free__g_object_unref0_ (GList* self) { -#line 43 "/data/projects/seahorse/common/catalog.vala" +#line 43 "/data/src/seahorse/common/catalog.vala" g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); -#line 43 "/data/projects/seahorse/common/catalog.vala" +#line 43 "/data/src/seahorse/common/catalog.vala" g_list_free (self); #line 131 "catalog.c" } static void _seahorse_catalog_on_key_export_file_gtk_action_callback (GtkAction* action, gpointer self) { -#line 364 "/data/projects/seahorse/common/catalog.vala" +#line 364 "/data/src/seahorse/common/catalog.vala" seahorse_catalog_on_key_export_file (action, self); #line 138 "catalog.c" } static void _seahorse_catalog_on_key_export_clipboard_gtk_action_callback (GtkAction* action, gpointer self) { -#line 364 "/data/projects/seahorse/common/catalog.vala" +#line 364 "/data/src/seahorse/common/catalog.vala" seahorse_catalog_on_key_export_clipboard (action, self); #line 145 "catalog.c" } static void _seahorse_catalog_on_object_delete_gtk_action_callback (GtkAction* action, gpointer self) { -#line 364 "/data/projects/seahorse/common/catalog.vala" +#line 364 "/data/src/seahorse/common/catalog.vala" seahorse_catalog_on_object_delete (action, self); #line 152 "catalog.c" } static void _seahorse_catalog_on_properties_object_gtk_action_callback (GtkAction* action, gpointer self) { -#line 364 "/data/projects/seahorse/common/catalog.vala" +#line 364 "/data/src/seahorse/common/catalog.vala" seahorse_catalog_on_properties_object (action, self); #line 159 "catalog.c" } static void _seahorse_catalog_on_properties_place_gtk_action_callback (GtkAction* action, gpointer self) { -#line 364 "/data/projects/seahorse/common/catalog.vala" +#line 364 "/data/src/seahorse/common/catalog.vala" seahorse_catalog_on_properties_place (action, self); #line 166 "catalog.c" } static void _seahorse_catalog_on_app_preferences_gtk_action_callback (GtkAction* action, gpointer self) { -#line 364 "/data/projects/seahorse/common/catalog.vala" +#line 364 "/data/src/seahorse/common/catalog.vala" seahorse_catalog_on_app_preferences (action, self); #line 173 "catalog.c" } static void _seahorse_catalog_on_app_about_gtk_action_callback (GtkAction* action, gpointer self) { -#line 364 "/data/projects/seahorse/common/catalog.vala" +#line 364 "/data/src/seahorse/common/catalog.vala" seahorse_catalog_on_app_about (action, self); #line 180 "catalog.c" } static void _seahorse_catalog_on_help_show_gtk_action_callback (GtkAction* action, gpointer self) { -#line 364 "/data/projects/seahorse/common/catalog.vala" +#line 364 "/data/src/seahorse/common/catalog.vala" seahorse_catalog_on_help_show (action, self); #line 187 "catalog.c" } static GList* seahorse_catalog_real_get_backends (SeahorseCatalog* self) { -#line 47 "/data/projects/seahorse/common/catalog.vala" +#line 47 "/data/src/seahorse/common/catalog.vala" g_critical ("Type `%s' does not implement abstract method `seahorse_catalog_get_backends'", g_type_name (G_TYPE_FROM_INSTANCE (self))); -#line 47 "/data/projects/seahorse/common/catalog.vala" +#line 47 "/data/src/seahorse/common/catalog.vala" return NULL; #line 196 "catalog.c" } GList* seahorse_catalog_get_backends (SeahorseCatalog* self) { -#line 47 "/data/projects/seahorse/common/catalog.vala" +#line 47 "/data/src/seahorse/common/catalog.vala" g_return_val_if_fail (self != NULL, NULL); -#line 47 "/data/projects/seahorse/common/catalog.vala" +#line 47 "/data/src/seahorse/common/catalog.vala" return SEAHORSE_CATALOG_GET_CLASS (self)->get_backends (self); #line 205 "catalog.c" } static SeahorsePlace* seahorse_catalog_real_get_focused_place (SeahorseCatalog* self) { -#line 48 "/data/projects/seahorse/common/catalog.vala" +#line 48 "/data/src/seahorse/common/catalog.vala" g_critical ("Type `%s' does not implement abstract method `seahorse_catalog_get_focused_place'", g_type_name (G_TYPE_FROM_INSTANCE (self))); -#line 48 "/data/projects/seahorse/common/catalog.vala" +#line 48 "/data/src/seahorse/common/catalog.vala" return NULL; #line 214 "catalog.c" } SeahorsePlace* seahorse_catalog_get_focused_place (SeahorseCatalog* self) { -#line 48 "/data/projects/seahorse/common/catalog.vala" +#line 48 "/data/src/seahorse/common/catalog.vala" g_return_val_if_fail (self != NULL, NULL); -#line 48 "/data/projects/seahorse/common/catalog.vala" +#line 48 "/data/src/seahorse/common/catalog.vala" return SEAHORSE_CATALOG_GET_CLASS (self)->get_focused_place (self); #line 223 "catalog.c" } static GList* seahorse_catalog_real_get_selected_objects (SeahorseCatalog* self) { -#line 49 "/data/projects/seahorse/common/catalog.vala" +#line 49 "/data/src/seahorse/common/catalog.vala" g_critical ("Type `%s' does not implement abstract method `seahorse_catalog_get_selected_objects'", g_type_name (G_TYPE_FROM_INSTANCE (self))); -#line 49 "/data/projects/seahorse/common/catalog.vala" +#line 49 "/data/src/seahorse/common/catalog.vala" return NULL; #line 232 "catalog.c" } GList* seahorse_catalog_get_selected_objects (SeahorseCatalog* self) { -#line 49 "/data/projects/seahorse/common/catalog.vala" +#line 49 "/data/src/seahorse/common/catalog.vala" g_return_val_if_fail (self != NULL, NULL); -#line 49 "/data/projects/seahorse/common/catalog.vala" +#line 49 "/data/src/seahorse/common/catalog.vala" return SEAHORSE_CATALOG_GET_CLASS (self)->get_selected_objects (self); #line 241 "catalog.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 122 "/data/projects/seahorse/common/catalog.vala" +#line 122 "/data/src/seahorse/common/catalog.vala" return self ? g_object_ref (self) : NULL; #line 248 "catalog.c" } @@ -253,72 +253,72 @@ GList* _tmp0_ = NULL; GHashTable* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; -#line 116 "/data/projects/seahorse/common/catalog.vala" +#line 116 "/data/src/seahorse/common/catalog.vala" self = (SeahorseCatalog*) base; -#line 117 "/data/projects/seahorse/common/catalog.vala" +#line 117 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_edit_copy); -#line 117 "/data/projects/seahorse/common/catalog.vala" +#line 117 "/data/src/seahorse/common/catalog.vala" self->priv->_edit_copy = NULL; -#line 118 "/data/projects/seahorse/common/catalog.vala" +#line 118 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_edit_delete); -#line 118 "/data/projects/seahorse/common/catalog.vala" +#line 118 "/data/src/seahorse/common/catalog.vala" self->priv->_edit_delete = NULL; -#line 119 "/data/projects/seahorse/common/catalog.vala" +#line 119 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_file_export); -#line 119 "/data/projects/seahorse/common/catalog.vala" +#line 119 "/data/src/seahorse/common/catalog.vala" self->priv->_file_export = NULL; -#line 120 "/data/projects/seahorse/common/catalog.vala" +#line 120 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_properties_object); -#line 120 "/data/projects/seahorse/common/catalog.vala" +#line 120 "/data/src/seahorse/common/catalog.vala" self->priv->_properties_object = NULL; -#line 122 "/data/projects/seahorse/common/catalog.vala" +#line 122 "/data/src/seahorse/common/catalog.vala" _tmp0_ = self->priv->_selection_actions; #line 277 "catalog.c" { GList* group_collection = NULL; GList* group_it = NULL; -#line 122 "/data/projects/seahorse/common/catalog.vala" +#line 122 "/data/src/seahorse/common/catalog.vala" group_collection = _tmp0_; -#line 122 "/data/projects/seahorse/common/catalog.vala" +#line 122 "/data/src/seahorse/common/catalog.vala" for (group_it = group_collection; group_it != NULL; group_it = group_it->next) { #line 285 "catalog.c" GtkActionGroup* _tmp1_ = NULL; GtkActionGroup* group = NULL; -#line 122 "/data/projects/seahorse/common/catalog.vala" +#line 122 "/data/src/seahorse/common/catalog.vala" _tmp1_ = _g_object_ref0 ((GtkActionGroup*) group_it->data); -#line 122 "/data/projects/seahorse/common/catalog.vala" +#line 122 "/data/src/seahorse/common/catalog.vala" group = _tmp1_; #line 292 "catalog.c" { GtkUIManager* _tmp2_ = NULL; GtkActionGroup* _tmp3_ = NULL; -#line 123 "/data/projects/seahorse/common/catalog.vala" +#line 123 "/data/src/seahorse/common/catalog.vala" _tmp2_ = self->priv->_ui_manager; -#line 123 "/data/projects/seahorse/common/catalog.vala" +#line 123 "/data/src/seahorse/common/catalog.vala" _tmp3_ = group; -#line 123 "/data/projects/seahorse/common/catalog.vala" +#line 123 "/data/src/seahorse/common/catalog.vala" gtk_ui_manager_remove_action_group (_tmp2_, _tmp3_); -#line 122 "/data/projects/seahorse/common/catalog.vala" +#line 122 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (group); #line 304 "catalog.c" } } } -#line 124 "/data/projects/seahorse/common/catalog.vala" +#line 124 "/data/src/seahorse/common/catalog.vala" __g_list_free__g_object_unref0_0 (self->priv->_selection_actions); -#line 124 "/data/projects/seahorse/common/catalog.vala" +#line 124 "/data/src/seahorse/common/catalog.vala" self->priv->_selection_actions = NULL; -#line 126 "/data/projects/seahorse/common/catalog.vala" +#line 126 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_ui_manager); -#line 126 "/data/projects/seahorse/common/catalog.vala" +#line 126 "/data/src/seahorse/common/catalog.vala" self->priv->_ui_manager = NULL; -#line 127 "/data/projects/seahorse/common/catalog.vala" +#line 127 "/data/src/seahorse/common/catalog.vala" _tmp4_ = self->priv->_actions; -#line 127 "/data/projects/seahorse/common/catalog.vala" +#line 127 "/data/src/seahorse/common/catalog.vala" g_hash_table_remove_all (_tmp4_); -#line 129 "/data/projects/seahorse/common/catalog.vala" +#line 129 "/data/src/seahorse/common/catalog.vala" _tmp5_ = self->priv->_disposed; -#line 129 "/data/projects/seahorse/common/catalog.vala" +#line 129 "/data/src/seahorse/common/catalog.vala" if (!_tmp5_) { #line 324 "catalog.c" gint width = 0; @@ -330,33 +330,33 @@ GSettings* _tmp10_ = NULL; gint _tmp11_ = 0; GtkApplication* _tmp12_ = NULL; -#line 130 "/data/projects/seahorse/common/catalog.vala" +#line 130 "/data/src/seahorse/common/catalog.vala" self->priv->_disposed = TRUE; -#line 133 "/data/projects/seahorse/common/catalog.vala" +#line 133 "/data/src/seahorse/common/catalog.vala" gtk_window_get_size ((GtkWindow*) self, &_tmp6_, &_tmp7_); -#line 133 "/data/projects/seahorse/common/catalog.vala" +#line 133 "/data/src/seahorse/common/catalog.vala" width = _tmp6_; -#line 133 "/data/projects/seahorse/common/catalog.vala" +#line 133 "/data/src/seahorse/common/catalog.vala" height = _tmp7_; -#line 134 "/data/projects/seahorse/common/catalog.vala" +#line 134 "/data/src/seahorse/common/catalog.vala" _tmp8_ = self->priv->_settings; -#line 134 "/data/projects/seahorse/common/catalog.vala" +#line 134 "/data/src/seahorse/common/catalog.vala" _tmp9_ = width; -#line 134 "/data/projects/seahorse/common/catalog.vala" +#line 134 "/data/src/seahorse/common/catalog.vala" g_settings_set_int (_tmp8_, "width", _tmp9_); -#line 135 "/data/projects/seahorse/common/catalog.vala" +#line 135 "/data/src/seahorse/common/catalog.vala" _tmp10_ = self->priv->_settings; -#line 135 "/data/projects/seahorse/common/catalog.vala" +#line 135 "/data/src/seahorse/common/catalog.vala" _tmp11_ = height; -#line 135 "/data/projects/seahorse/common/catalog.vala" +#line 135 "/data/src/seahorse/common/catalog.vala" g_settings_set_int (_tmp10_, "height", _tmp11_); -#line 136 "/data/projects/seahorse/common/catalog.vala" +#line 136 "/data/src/seahorse/common/catalog.vala" _tmp12_ = seahorse_application_get (); -#line 136 "/data/projects/seahorse/common/catalog.vala" +#line 136 "/data/src/seahorse/common/catalog.vala" gtk_application_remove_window (_tmp12_, (GtkWindow*) self); #line 358 "catalog.c" } -#line 139 "/data/projects/seahorse/common/catalog.vala" +#line 139 "/data/src/seahorse/common/catalog.vala" G_OBJECT_CLASS (seahorse_catalog_parent_class)->dispose ((GObject*) G_TYPE_CHECK_INSTANCE_CAST (self, GTK_TYPE_WINDOW, GtkWindow)); #line 362 "catalog.c" } @@ -365,13 +365,13 @@ GtkBuilder* seahorse_catalog_get_builder (SeahorseCatalog* self) { GtkBuilder* result = NULL; GtkBuilder* _tmp0_ = NULL; -#line 171 "/data/projects/seahorse/common/catalog.vala" +#line 171 "/data/src/seahorse/common/catalog.vala" g_return_val_if_fail (self != NULL, NULL); -#line 172 "/data/projects/seahorse/common/catalog.vala" +#line 172 "/data/src/seahorse/common/catalog.vala" _tmp0_ = self->priv->_builder; -#line 172 "/data/projects/seahorse/common/catalog.vala" +#line 172 "/data/src/seahorse/common/catalog.vala" result = _tmp0_; -#line 172 "/data/projects/seahorse/common/catalog.vala" +#line 172 "/data/src/seahorse/common/catalog.vala" return result; #line 377 "catalog.c" } @@ -382,19 +382,19 @@ GtkBuilder* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; GObject* _tmp2_ = NULL; -#line 175 "/data/projects/seahorse/common/catalog.vala" +#line 175 "/data/src/seahorse/common/catalog.vala" g_return_val_if_fail (self != NULL, NULL); -#line 175 "/data/projects/seahorse/common/catalog.vala" +#line 175 "/data/src/seahorse/common/catalog.vala" g_return_val_if_fail (name != NULL, NULL); -#line 176 "/data/projects/seahorse/common/catalog.vala" +#line 176 "/data/src/seahorse/common/catalog.vala" _tmp0_ = self->priv->_builder; -#line 176 "/data/projects/seahorse/common/catalog.vala" +#line 176 "/data/src/seahorse/common/catalog.vala" _tmp1_ = name; -#line 176 "/data/projects/seahorse/common/catalog.vala" +#line 176 "/data/src/seahorse/common/catalog.vala" _tmp2_ = gtk_builder_get_object (_tmp0_, _tmp1_); -#line 176 "/data/projects/seahorse/common/catalog.vala" +#line 176 "/data/src/seahorse/common/catalog.vala" result = (gconstpointer) _tmp2_; -#line 176 "/data/projects/seahorse/common/catalog.vala" +#line 176 "/data/src/seahorse/common/catalog.vala" return result; #line 400 "catalog.c" } @@ -402,11 +402,11 @@ void seahorse_catalog_ensure_updated (SeahorseCatalog* self) { GtkUIManager* _tmp0_ = NULL; -#line 179 "/data/projects/seahorse/common/catalog.vala" +#line 179 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (self != NULL); -#line 180 "/data/projects/seahorse/common/catalog.vala" +#line 180 "/data/src/seahorse/common/catalog.vala" _tmp0_ = self->priv->_ui_manager; -#line 180 "/data/projects/seahorse/common/catalog.vala" +#line 180 "/data/src/seahorse/common/catalog.vala" gtk_ui_manager_ensure_update (_tmp0_); #line 412 "catalog.c" } @@ -420,19 +420,19 @@ GtkActionGroup* _tmp18_ = NULL; GtkActionGroup* _tmp19_ = NULL; GError * _inner_error_ = NULL; -#line 183 "/data/projects/seahorse/common/catalog.vala" +#line 183 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (self != NULL); -#line 183 "/data/projects/seahorse/common/catalog.vala" +#line 183 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (group != NULL); -#line 184 "/data/projects/seahorse/common/catalog.vala" +#line 184 "/data/src/seahorse/common/catalog.vala" _tmp0_ = self->priv->_ui_manager; -#line 184 "/data/projects/seahorse/common/catalog.vala" +#line 184 "/data/src/seahorse/common/catalog.vala" _tmp1_ = group; -#line 184 "/data/projects/seahorse/common/catalog.vala" +#line 184 "/data/src/seahorse/common/catalog.vala" gtk_ui_manager_insert_action_group (_tmp0_, _tmp1_, 10); -#line 186 "/data/projects/seahorse/common/catalog.vala" +#line 186 "/data/src/seahorse/common/catalog.vala" _tmp2_ = group; -#line 186 "/data/projects/seahorse/common/catalog.vala" +#line 186 "/data/src/seahorse/common/catalog.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, SEAHORSE_TYPE_ACTIONS)) { #line 438 "catalog.c" SeahorseActions* actions = NULL; @@ -445,41 +445,41 @@ const gchar* _tmp8_ = NULL; gchar* _tmp9_ = NULL; const gchar* _tmp10_ = NULL; -#line 187 "/data/projects/seahorse/common/catalog.vala" +#line 187 "/data/src/seahorse/common/catalog.vala" _tmp3_ = group; -#line 187 "/data/projects/seahorse/common/catalog.vala" +#line 187 "/data/src/seahorse/common/catalog.vala" _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SEAHORSE_TYPE_ACTIONS, SeahorseActions)); -#line 187 "/data/projects/seahorse/common/catalog.vala" +#line 187 "/data/src/seahorse/common/catalog.vala" actions = _tmp4_; -#line 188 "/data/projects/seahorse/common/catalog.vala" +#line 188 "/data/src/seahorse/common/catalog.vala" _tmp5_ = actions; -#line 188 "/data/projects/seahorse/common/catalog.vala" +#line 188 "/data/src/seahorse/common/catalog.vala" seahorse_actions_set_catalog (_tmp5_, self); -#line 190 "/data/projects/seahorse/common/catalog.vala" +#line 190 "/data/src/seahorse/common/catalog.vala" _tmp6_ = actions; -#line 190 "/data/projects/seahorse/common/catalog.vala" +#line 190 "/data/src/seahorse/common/catalog.vala" _tmp7_ = seahorse_actions_get_definition (_tmp6_); -#line 190 "/data/projects/seahorse/common/catalog.vala" +#line 190 "/data/src/seahorse/common/catalog.vala" _tmp8_ = _tmp7_; -#line 190 "/data/projects/seahorse/common/catalog.vala" +#line 190 "/data/src/seahorse/common/catalog.vala" _tmp9_ = g_strdup (_tmp8_); -#line 190 "/data/projects/seahorse/common/catalog.vala" +#line 190 "/data/src/seahorse/common/catalog.vala" definition = _tmp9_; -#line 191 "/data/projects/seahorse/common/catalog.vala" +#line 191 "/data/src/seahorse/common/catalog.vala" _tmp10_ = definition; -#line 191 "/data/projects/seahorse/common/catalog.vala" +#line 191 "/data/src/seahorse/common/catalog.vala" if (_tmp10_ != NULL) { #line 473 "catalog.c" { GtkUIManager* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; -#line 193 "/data/projects/seahorse/common/catalog.vala" +#line 193 "/data/src/seahorse/common/catalog.vala" _tmp11_ = self->priv->_ui_manager; -#line 193 "/data/projects/seahorse/common/catalog.vala" +#line 193 "/data/src/seahorse/common/catalog.vala" _tmp12_ = definition; -#line 193 "/data/projects/seahorse/common/catalog.vala" +#line 193 "/data/src/seahorse/common/catalog.vala" gtk_ui_manager_add_ui_from_string (_tmp11_, _tmp12_, (gssize) (-1), &_inner_error_); -#line 193 "/data/projects/seahorse/common/catalog.vala" +#line 193 "/data/src/seahorse/common/catalog.vala" if (_inner_error_ != NULL) { #line 485 "catalog.c" goto __catch0_g_error; @@ -493,53 +493,53 @@ const gchar* _tmp14_ = NULL; const gchar* _tmp15_ = NULL; const gchar* _tmp16_ = NULL; -#line 192 "/data/projects/seahorse/common/catalog.vala" +#line 192 "/data/src/seahorse/common/catalog.vala" err = _inner_error_; -#line 192 "/data/projects/seahorse/common/catalog.vala" +#line 192 "/data/src/seahorse/common/catalog.vala" _inner_error_ = NULL; -#line 195 "/data/projects/seahorse/common/catalog.vala" +#line 195 "/data/src/seahorse/common/catalog.vala" _tmp13_ = actions; -#line 195 "/data/projects/seahorse/common/catalog.vala" +#line 195 "/data/src/seahorse/common/catalog.vala" _tmp14_ = gtk_action_group_get_name ((GtkActionGroup*) _tmp13_); -#line 195 "/data/projects/seahorse/common/catalog.vala" +#line 195 "/data/src/seahorse/common/catalog.vala" _tmp15_ = _tmp14_; -#line 195 "/data/projects/seahorse/common/catalog.vala" +#line 195 "/data/src/seahorse/common/catalog.vala" _tmp16_ = definition; -#line 195 "/data/projects/seahorse/common/catalog.vala" +#line 195 "/data/src/seahorse/common/catalog.vala" g_warning ("catalog.vala:195: couldn't add ui defintion for action group: %s: %s", _tmp15_, _tmp16_); -#line 192 "/data/projects/seahorse/common/catalog.vala" +#line 192 "/data/src/seahorse/common/catalog.vala" _g_error_free0 (err); #line 513 "catalog.c" } __finally0: -#line 192 "/data/projects/seahorse/common/catalog.vala" +#line 192 "/data/src/seahorse/common/catalog.vala" if (_inner_error_ != NULL) { -#line 192 "/data/projects/seahorse/common/catalog.vala" +#line 192 "/data/src/seahorse/common/catalog.vala" _g_free0 (definition); -#line 192 "/data/projects/seahorse/common/catalog.vala" +#line 192 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (actions); -#line 192 "/data/projects/seahorse/common/catalog.vala" +#line 192 "/data/src/seahorse/common/catalog.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 192 "/data/projects/seahorse/common/catalog.vala" +#line 192 "/data/src/seahorse/common/catalog.vala" g_clear_error (&_inner_error_); -#line 192 "/data/projects/seahorse/common/catalog.vala" +#line 192 "/data/src/seahorse/common/catalog.vala" return; #line 528 "catalog.c" } } -#line 186 "/data/projects/seahorse/common/catalog.vala" +#line 186 "/data/src/seahorse/common/catalog.vala" _g_free0 (definition); -#line 186 "/data/projects/seahorse/common/catalog.vala" +#line 186 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (actions); #line 535 "catalog.c" } -#line 201 "/data/projects/seahorse/common/catalog.vala" +#line 201 "/data/src/seahorse/common/catalog.vala" _tmp17_ = self->priv->_actions; -#line 201 "/data/projects/seahorse/common/catalog.vala" +#line 201 "/data/src/seahorse/common/catalog.vala" _tmp18_ = group; -#line 201 "/data/projects/seahorse/common/catalog.vala" +#line 201 "/data/src/seahorse/common/catalog.vala" _tmp19_ = _g_object_ref0 (_tmp18_); -#line 201 "/data/projects/seahorse/common/catalog.vala" +#line 201 "/data/src/seahorse/common/catalog.vala" g_hash_table_add (_tmp17_, _tmp19_); #line 545 "catalog.c" } @@ -547,13 +547,13 @@ void seahorse_catalog_show_properties (SeahorseCatalog* self, GObject* obj) { GObject* _tmp0_ = NULL; -#line 204 "/data/projects/seahorse/common/catalog.vala" +#line 204 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (self != NULL); -#line 204 "/data/projects/seahorse/common/catalog.vala" +#line 204 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (obj != NULL); -#line 205 "/data/projects/seahorse/common/catalog.vala" +#line 205 "/data/src/seahorse/common/catalog.vala" _tmp0_ = obj; -#line 205 "/data/projects/seahorse/common/catalog.vala" +#line 205 "/data/src/seahorse/common/catalog.vala" seahorse_viewable_view (_tmp0_, (GtkWindow*) self); #line 559 "catalog.c" } @@ -570,71 +570,71 @@ GtkWidget* _tmp5_ = NULL; GtkWidget* _tmp6_ = NULL; GtkWidget* _tmp7_ = NULL; -#line 208 "/data/projects/seahorse/common/catalog.vala" +#line 208 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (self != NULL); -#line 208 "/data/projects/seahorse/common/catalog.vala" +#line 208 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (name != NULL); -#line 212 "/data/projects/seahorse/common/catalog.vala" +#line 212 "/data/src/seahorse/common/catalog.vala" _tmp0_ = name; -#line 212 "/data/projects/seahorse/common/catalog.vala" +#line 212 "/data/src/seahorse/common/catalog.vala" _tmp1_ = g_strdup_printf ("/%s", _tmp0_); -#line 212 "/data/projects/seahorse/common/catalog.vala" +#line 212 "/data/src/seahorse/common/catalog.vala" path = _tmp1_; -#line 213 "/data/projects/seahorse/common/catalog.vala" +#line 213 "/data/src/seahorse/common/catalog.vala" _tmp2_ = self->priv->_ui_manager; -#line 213 "/data/projects/seahorse/common/catalog.vala" +#line 213 "/data/src/seahorse/common/catalog.vala" _tmp3_ = path; -#line 213 "/data/projects/seahorse/common/catalog.vala" +#line 213 "/data/src/seahorse/common/catalog.vala" _tmp4_ = gtk_ui_manager_get_widget (_tmp2_, _tmp3_); -#line 213 "/data/projects/seahorse/common/catalog.vala" +#line 213 "/data/src/seahorse/common/catalog.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 213 "/data/projects/seahorse/common/catalog.vala" +#line 213 "/data/src/seahorse/common/catalog.vala" menu = _tmp5_; -#line 215 "/data/projects/seahorse/common/catalog.vala" +#line 215 "/data/src/seahorse/common/catalog.vala" _tmp6_ = menu; -#line 215 "/data/projects/seahorse/common/catalog.vala" +#line 215 "/data/src/seahorse/common/catalog.vala" if (_tmp6_ == NULL) { -#line 216 "/data/projects/seahorse/common/catalog.vala" +#line 216 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (menu); -#line 216 "/data/projects/seahorse/common/catalog.vala" +#line 216 "/data/src/seahorse/common/catalog.vala" _g_free0 (path); -#line 216 "/data/projects/seahorse/common/catalog.vala" +#line 216 "/data/src/seahorse/common/catalog.vala" return; #line 604 "catalog.c" } -#line 217 "/data/projects/seahorse/common/catalog.vala" +#line 217 "/data/src/seahorse/common/catalog.vala" _tmp7_ = menu; -#line 217 "/data/projects/seahorse/common/catalog.vala" +#line 217 "/data/src/seahorse/common/catalog.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, GTK_TYPE_MENU)) { #line 610 "catalog.c" GtkWidget* _tmp8_ = NULL; guint _tmp9_ = 0U; guint _tmp10_ = 0U; GtkWidget* _tmp11_ = NULL; -#line 218 "/data/projects/seahorse/common/catalog.vala" +#line 218 "/data/src/seahorse/common/catalog.vala" _tmp8_ = menu; -#line 218 "/data/projects/seahorse/common/catalog.vala" +#line 218 "/data/src/seahorse/common/catalog.vala" _tmp9_ = button; -#line 218 "/data/projects/seahorse/common/catalog.vala" +#line 218 "/data/src/seahorse/common/catalog.vala" _tmp10_ = time; -#line 218 "/data/projects/seahorse/common/catalog.vala" +#line 218 "/data/src/seahorse/common/catalog.vala" gtk_menu_popup (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_MENU, GtkMenu), NULL, NULL, NULL, NULL, _tmp9_, (guint32) _tmp10_); -#line 219 "/data/projects/seahorse/common/catalog.vala" +#line 219 "/data/src/seahorse/common/catalog.vala" _tmp11_ = menu; -#line 219 "/data/projects/seahorse/common/catalog.vala" +#line 219 "/data/src/seahorse/common/catalog.vala" gtk_widget_show (_tmp11_); #line 627 "catalog.c" } else { const gchar* _tmp12_ = NULL; -#line 221 "/data/projects/seahorse/common/catalog.vala" +#line 221 "/data/src/seahorse/common/catalog.vala" _tmp12_ = name; -#line 221 "/data/projects/seahorse/common/catalog.vala" +#line 221 "/data/src/seahorse/common/catalog.vala" g_warning ("catalog.vala:221: the object /%s isn't a menu", _tmp12_); #line 634 "catalog.c" } -#line 208 "/data/projects/seahorse/common/catalog.vala" +#line 208 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (menu); -#line 208 "/data/projects/seahorse/common/catalog.vala" +#line 208 "/data/src/seahorse/common/catalog.vala" _g_free0 (path); #line 640 "catalog.c" } @@ -651,32 +651,32 @@ GHashTable* _tmp14_ = NULL; GList* results = NULL; GtkActionGroup* group = NULL; -#line 225 "/data/projects/seahorse/common/catalog.vala" +#line 225 "/data/src/seahorse/common/catalog.vala" g_return_val_if_fail (self != NULL, NULL); -#line 226 "/data/projects/seahorse/common/catalog.vala" +#line 226 "/data/src/seahorse/common/catalog.vala" _tmp0_ = g_direct_hash; -#line 226 "/data/projects/seahorse/common/catalog.vala" +#line 226 "/data/src/seahorse/common/catalog.vala" _tmp1_ = g_direct_equal; -#line 226 "/data/projects/seahorse/common/catalog.vala" +#line 226 "/data/src/seahorse/common/catalog.vala" _tmp2_ = g_hash_table_new_full (_tmp0_, _tmp1_, _g_object_unref0_, NULL); -#line 226 "/data/projects/seahorse/common/catalog.vala" +#line 226 "/data/src/seahorse/common/catalog.vala" table = _tmp2_; -#line 227 "/data/projects/seahorse/common/catalog.vala" +#line 227 "/data/src/seahorse/common/catalog.vala" _tmp3_ = objects; #line 667 "catalog.c" { GList* object_collection = NULL; GList* object_it = NULL; -#line 227 "/data/projects/seahorse/common/catalog.vala" +#line 227 "/data/src/seahorse/common/catalog.vala" object_collection = _tmp3_; -#line 227 "/data/projects/seahorse/common/catalog.vala" +#line 227 "/data/src/seahorse/common/catalog.vala" for (object_it = object_collection; object_it != NULL; object_it = object_it->next) { #line 675 "catalog.c" GObject* _tmp4_ = NULL; GObject* object = NULL; -#line 227 "/data/projects/seahorse/common/catalog.vala" +#line 227 "/data/src/seahorse/common/catalog.vala" _tmp4_ = _g_object_ref0 ((GObject*) object_it->data); -#line 227 "/data/projects/seahorse/common/catalog.vala" +#line 227 "/data/src/seahorse/common/catalog.vala" object = _tmp4_; #line 682 "catalog.c" { @@ -689,63 +689,63 @@ GHashTable* _tmp11_ = NULL; GtkActionGroup* _tmp12_ = NULL; GtkActionGroup* _tmp13_ = NULL; -#line 228 "/data/projects/seahorse/common/catalog.vala" +#line 228 "/data/src/seahorse/common/catalog.vala" actions = NULL; -#line 229 "/data/projects/seahorse/common/catalog.vala" +#line 229 "/data/src/seahorse/common/catalog.vala" _tmp5_ = object; -#line 229 "/data/projects/seahorse/common/catalog.vala" +#line 229 "/data/src/seahorse/common/catalog.vala" g_object_get (_tmp5_, "actions", &actions, NULL, NULL); -#line 230 "/data/projects/seahorse/common/catalog.vala" +#line 230 "/data/src/seahorse/common/catalog.vala" _tmp6_ = actions; -#line 230 "/data/projects/seahorse/common/catalog.vala" +#line 230 "/data/src/seahorse/common/catalog.vala" if (_tmp6_ == NULL) { -#line 231 "/data/projects/seahorse/common/catalog.vala" +#line 231 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (actions); -#line 231 "/data/projects/seahorse/common/catalog.vala" +#line 231 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (object); -#line 231 "/data/projects/seahorse/common/catalog.vala" +#line 231 "/data/src/seahorse/common/catalog.vala" continue; #line 709 "catalog.c" } -#line 232 "/data/projects/seahorse/common/catalog.vala" +#line 232 "/data/src/seahorse/common/catalog.vala" _tmp7_ = self->priv->_actions; -#line 232 "/data/projects/seahorse/common/catalog.vala" +#line 232 "/data/src/seahorse/common/catalog.vala" _tmp8_ = actions; -#line 232 "/data/projects/seahorse/common/catalog.vala" +#line 232 "/data/src/seahorse/common/catalog.vala" _tmp9_ = g_hash_table_lookup (_tmp7_, _tmp8_); -#line 232 "/data/projects/seahorse/common/catalog.vala" +#line 232 "/data/src/seahorse/common/catalog.vala" if (((GtkActionGroup*) _tmp9_) == NULL) { #line 719 "catalog.c" GtkActionGroup* _tmp10_ = NULL; -#line 233 "/data/projects/seahorse/common/catalog.vala" +#line 233 "/data/src/seahorse/common/catalog.vala" _tmp10_ = actions; -#line 233 "/data/projects/seahorse/common/catalog.vala" +#line 233 "/data/src/seahorse/common/catalog.vala" seahorse_catalog_include_actions (self, _tmp10_); #line 725 "catalog.c" } -#line 234 "/data/projects/seahorse/common/catalog.vala" +#line 234 "/data/src/seahorse/common/catalog.vala" _tmp11_ = self->priv->_actions; -#line 234 "/data/projects/seahorse/common/catalog.vala" +#line 234 "/data/src/seahorse/common/catalog.vala" _tmp12_ = actions; -#line 234 "/data/projects/seahorse/common/catalog.vala" +#line 234 "/data/src/seahorse/common/catalog.vala" _tmp13_ = _g_object_ref0 (_tmp12_); -#line 234 "/data/projects/seahorse/common/catalog.vala" +#line 234 "/data/src/seahorse/common/catalog.vala" g_hash_table_add (_tmp11_, _tmp13_); -#line 227 "/data/projects/seahorse/common/catalog.vala" +#line 227 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (actions); -#line 227 "/data/projects/seahorse/common/catalog.vala" +#line 227 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (object); #line 739 "catalog.c" } } } -#line 237 "/data/projects/seahorse/common/catalog.vala" +#line 237 "/data/src/seahorse/common/catalog.vala" _tmp14_ = table; -#line 237 "/data/projects/seahorse/common/catalog.vala" +#line 237 "/data/src/seahorse/common/catalog.vala" g_hash_table_iter_init (&iter, _tmp14_); -#line 238 "/data/projects/seahorse/common/catalog.vala" +#line 238 "/data/src/seahorse/common/catalog.vala" results = NULL; -#line 240 "/data/projects/seahorse/common/catalog.vala" +#line 240 "/data/src/seahorse/common/catalog.vala" while (TRUE) { #line 751 "catalog.c" gconstpointer _tmp15_ = NULL; @@ -753,55 +753,55 @@ GtkActionGroup* _tmp17_ = NULL; GtkActionGroup* _tmp18_ = NULL; GtkActionGroup* _tmp19_ = NULL; -#line 240 "/data/projects/seahorse/common/catalog.vala" - _tmp16_ = g_hash_table_iter_next (&iter, &_tmp15_, NULL); -#line 240 "/data/projects/seahorse/common/catalog.vala" +#line 240 "/data/src/seahorse/common/catalog.vala" + _tmp16_ = g_hash_table_iter_next (&iter, (gpointer*) (&_tmp15_), (gpointer*) NULL); +#line 240 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (group); -#line 240 "/data/projects/seahorse/common/catalog.vala" +#line 240 "/data/src/seahorse/common/catalog.vala" _tmp17_ = _g_object_ref0 (_tmp15_); -#line 240 "/data/projects/seahorse/common/catalog.vala" +#line 240 "/data/src/seahorse/common/catalog.vala" group = _tmp17_; -#line 240 "/data/projects/seahorse/common/catalog.vala" +#line 240 "/data/src/seahorse/common/catalog.vala" if (!_tmp16_) { -#line 240 "/data/projects/seahorse/common/catalog.vala" +#line 240 "/data/src/seahorse/common/catalog.vala" break; #line 769 "catalog.c" } -#line 241 "/data/projects/seahorse/common/catalog.vala" +#line 241 "/data/src/seahorse/common/catalog.vala" _tmp18_ = group; -#line 241 "/data/projects/seahorse/common/catalog.vala" +#line 241 "/data/src/seahorse/common/catalog.vala" _tmp19_ = _g_object_ref0 (_tmp18_); -#line 241 "/data/projects/seahorse/common/catalog.vala" +#line 241 "/data/src/seahorse/common/catalog.vala" results = g_list_prepend (results, _tmp19_); #line 777 "catalog.c" } -#line 243 "/data/projects/seahorse/common/catalog.vala" +#line 243 "/data/src/seahorse/common/catalog.vala" result = results; -#line 243 "/data/projects/seahorse/common/catalog.vala" +#line 243 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (group); -#line 243 "/data/projects/seahorse/common/catalog.vala" +#line 243 "/data/src/seahorse/common/catalog.vala" _g_hash_table_unref0 (table); -#line 243 "/data/projects/seahorse/common/catalog.vala" +#line 243 "/data/src/seahorse/common/catalog.vala" return result; #line 787 "catalog.c" } static void seahorse_catalog_on_app_preferences (GtkAction* action, SeahorseCatalog* self) { -#line 247 "/data/projects/seahorse/common/catalog.vala" +#line 247 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (self != NULL); -#line 247 "/data/projects/seahorse/common/catalog.vala" +#line 247 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (action != NULL); -#line 249 "/data/projects/seahorse/common/catalog.vala" +#line 249 "/data/src/seahorse/common/catalog.vala" seahorse_prefs_show ((GtkWindow*) self, NULL); #line 798 "catalog.c" } static Block1Data* block1_data_ref (Block1Data* _data1_) { -#line 279 "/data/projects/seahorse/common/catalog.vala" +#line 279 "/data/src/seahorse/common/catalog.vala" g_atomic_int_inc (&_data1_->_ref_count_); -#line 279 "/data/projects/seahorse/common/catalog.vala" +#line 279 "/data/src/seahorse/common/catalog.vala" return _data1_; #line 807 "catalog.c" } @@ -810,17 +810,17 @@ static void block1_data_unref (void * _userdata_) { Block1Data* _data1_; _data1_ = (Block1Data*) _userdata_; -#line 279 "/data/projects/seahorse/common/catalog.vala" +#line 279 "/data/src/seahorse/common/catalog.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { #line 816 "catalog.c" SeahorseCatalog * self; -#line 279 "/data/projects/seahorse/common/catalog.vala" +#line 279 "/data/src/seahorse/common/catalog.vala" self = _data1_->self; -#line 279 "/data/projects/seahorse/common/catalog.vala" +#line 279 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (_data1_->about); -#line 279 "/data/projects/seahorse/common/catalog.vala" +#line 279 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self); -#line 279 "/data/projects/seahorse/common/catalog.vala" +#line 279 "/data/src/seahorse/common/catalog.vala" g_slice_free (Block1Data, _data1_); #line 826 "catalog.c" } @@ -829,16 +829,16 @@ static void __lambda8_ (Block1Data* _data1_, gint response) { SeahorseCatalog * self; -#line 294 "/data/projects/seahorse/common/catalog.vala" +#line 294 "/data/src/seahorse/common/catalog.vala" self = _data1_->self; -#line 295 "/data/projects/seahorse/common/catalog.vala" +#line 295 "/data/src/seahorse/common/catalog.vala" gtk_widget_hide ((GtkWidget*) _data1_->about); #line 837 "catalog.c" } static void ___lambda8__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { -#line 294 "/data/projects/seahorse/common/catalog.vala" +#line 294 "/data/src/seahorse/common/catalog.vala" __lambda8_ (self, response_id); #line 844 "catalog.c" } @@ -850,59 +850,59 @@ const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; -#line 279 "/data/projects/seahorse/common/catalog.vala" +#line 279 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (self != NULL); -#line 279 "/data/projects/seahorse/common/catalog.vala" +#line 279 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (action != NULL); -#line 279 "/data/projects/seahorse/common/catalog.vala" +#line 279 "/data/src/seahorse/common/catalog.vala" _data1_ = g_slice_new0 (Block1Data); -#line 279 "/data/projects/seahorse/common/catalog.vala" +#line 279 "/data/src/seahorse/common/catalog.vala" _data1_->_ref_count_ = 1; -#line 279 "/data/projects/seahorse/common/catalog.vala" +#line 279 "/data/src/seahorse/common/catalog.vala" _data1_->self = g_object_ref (self); -#line 282 "/data/projects/seahorse/common/catalog.vala" +#line 282 "/data/src/seahorse/common/catalog.vala" _tmp0_ = (GtkAboutDialog*) gtk_about_dialog_new (); -#line 282 "/data/projects/seahorse/common/catalog.vala" +#line 282 "/data/src/seahorse/common/catalog.vala" g_object_ref_sink (_tmp0_); -#line 282 "/data/projects/seahorse/common/catalog.vala" +#line 282 "/data/src/seahorse/common/catalog.vala" _data1_->about = _tmp0_; -#line 283 "/data/projects/seahorse/common/catalog.vala" +#line 283 "/data/src/seahorse/common/catalog.vala" gtk_about_dialog_set_artists (_data1_->about, SEAHORSE_CATALOG_ARTISTS); -#line 284 "/data/projects/seahorse/common/catalog.vala" +#line 284 "/data/src/seahorse/common/catalog.vala" gtk_about_dialog_set_authors (_data1_->about, SEAHORSE_CATALOG_AUTHORS); -#line 285 "/data/projects/seahorse/common/catalog.vala" +#line 285 "/data/src/seahorse/common/catalog.vala" gtk_about_dialog_set_documenters (_data1_->about, SEAHORSE_CATALOG_DOCUMENTERS); -#line 286 "/data/projects/seahorse/common/catalog.vala" +#line 286 "/data/src/seahorse/common/catalog.vala" gtk_about_dialog_set_version (_data1_->about, VERSION); -#line 287 "/data/projects/seahorse/common/catalog.vala" +#line 287 "/data/src/seahorse/common/catalog.vala" _tmp1_ = _ ("Passwords and Keys"); -#line 287 "/data/projects/seahorse/common/catalog.vala" +#line 287 "/data/src/seahorse/common/catalog.vala" gtk_about_dialog_set_comments (_data1_->about, _tmp1_); -#line 288 "/data/projects/seahorse/common/catalog.vala" +#line 288 "/data/src/seahorse/common/catalog.vala" gtk_about_dialog_set_copyright (_data1_->about, "Copyright \xc2\xa9 2002 - 2010 Seahorse Project"); -#line 289 "/data/projects/seahorse/common/catalog.vala" +#line 289 "/data/src/seahorse/common/catalog.vala" _tmp2_ = _ ("translator-credits"); -#line 289 "/data/projects/seahorse/common/catalog.vala" +#line 289 "/data/src/seahorse/common/catalog.vala" gtk_about_dialog_set_translator_credits (_data1_->about, _tmp2_); -#line 290 "/data/projects/seahorse/common/catalog.vala" +#line 290 "/data/src/seahorse/common/catalog.vala" gtk_about_dialog_set_logo_icon_name (_data1_->about, "seahorse"); -#line 291 "/data/projects/seahorse/common/catalog.vala" +#line 291 "/data/src/seahorse/common/catalog.vala" gtk_about_dialog_set_website (_data1_->about, "http://www.gnome.org/projects/seahorse"); -#line 292 "/data/projects/seahorse/common/catalog.vala" +#line 292 "/data/src/seahorse/common/catalog.vala" _tmp3_ = _ ("Seahorse Project Homepage"); -#line 292 "/data/projects/seahorse/common/catalog.vala" +#line 292 "/data/src/seahorse/common/catalog.vala" gtk_about_dialog_set_website_label (_data1_->about, _tmp3_); -#line 294 "/data/projects/seahorse/common/catalog.vala" +#line 294 "/data/src/seahorse/common/catalog.vala" g_signal_connect_data ((GtkDialog*) _data1_->about, "response", (GCallback) ___lambda8__gtk_dialog_response, block1_data_ref (_data1_), (GClosureNotify) block1_data_unref, 0); -#line 298 "/data/projects/seahorse/common/catalog.vala" +#line 298 "/data/src/seahorse/common/catalog.vala" gtk_window_set_transient_for ((GtkWindow*) _data1_->about, (GtkWindow*) self); -#line 299 "/data/projects/seahorse/common/catalog.vala" +#line 299 "/data/src/seahorse/common/catalog.vala" gtk_dialog_run ((GtkDialog*) _data1_->about); -#line 300 "/data/projects/seahorse/common/catalog.vala" +#line 300 "/data/src/seahorse/common/catalog.vala" gtk_widget_destroy ((GtkWidget*) _data1_->about); -#line 279 "/data/projects/seahorse/common/catalog.vala" +#line 279 "/data/src/seahorse/common/catalog.vala" block1_data_unref (_data1_); -#line 279 "/data/projects/seahorse/common/catalog.vala" +#line 279 "/data/src/seahorse/common/catalog.vala" _data1_ = NULL; #line 908 "catalog.c" } @@ -910,28 +910,28 @@ static void seahorse_catalog_on_object_delete (GtkAction* action, SeahorseCatalog* self) { GError * _inner_error_ = NULL; -#line 304 "/data/projects/seahorse/common/catalog.vala" +#line 304 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (self != NULL); -#line 304 "/data/projects/seahorse/common/catalog.vala" +#line 304 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (action != NULL); #line 918 "catalog.c" { GList* objects = NULL; GList* _tmp0_ = NULL; -#line 307 "/data/projects/seahorse/common/catalog.vala" +#line 307 "/data/src/seahorse/common/catalog.vala" _tmp0_ = seahorse_catalog_get_selected_objects (self); -#line 307 "/data/projects/seahorse/common/catalog.vala" +#line 307 "/data/src/seahorse/common/catalog.vala" objects = _tmp0_; -#line 308 "/data/projects/seahorse/common/catalog.vala" +#line 308 "/data/src/seahorse/common/catalog.vala" seahorse_deletable_delete_with_prompt_wait (objects, (GtkWindow*) self, &_inner_error_); -#line 308 "/data/projects/seahorse/common/catalog.vala" +#line 308 "/data/src/seahorse/common/catalog.vala" if (_inner_error_ != NULL) { -#line 308 "/data/projects/seahorse/common/catalog.vala" +#line 308 "/data/src/seahorse/common/catalog.vala" _g_list_free0 (objects); #line 932 "catalog.c" goto __catch1_g_error; } -#line 306 "/data/projects/seahorse/common/catalog.vala" +#line 306 "/data/src/seahorse/common/catalog.vala" _g_list_free0 (objects); #line 937 "catalog.c" } @@ -944,34 +944,34 @@ const gchar* _tmp3_ = NULL; GError* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; -#line 306 "/data/projects/seahorse/common/catalog.vala" +#line 306 "/data/src/seahorse/common/catalog.vala" err = _inner_error_; -#line 306 "/data/projects/seahorse/common/catalog.vala" +#line 306 "/data/src/seahorse/common/catalog.vala" _inner_error_ = NULL; -#line 310 "/data/projects/seahorse/common/catalog.vala" +#line 310 "/data/src/seahorse/common/catalog.vala" _tmp1_ = seahorse_catalog_get_window (self); -#line 310 "/data/projects/seahorse/common/catalog.vala" +#line 310 "/data/src/seahorse/common/catalog.vala" _tmp2_ = _tmp1_; -#line 310 "/data/projects/seahorse/common/catalog.vala" +#line 310 "/data/src/seahorse/common/catalog.vala" _tmp3_ = _ ("Cannot delete"); -#line 310 "/data/projects/seahorse/common/catalog.vala" +#line 310 "/data/src/seahorse/common/catalog.vala" _tmp4_ = err; -#line 310 "/data/projects/seahorse/common/catalog.vala" +#line 310 "/data/src/seahorse/common/catalog.vala" _tmp5_ = _tmp4_->message; -#line 310 "/data/projects/seahorse/common/catalog.vala" +#line 310 "/data/src/seahorse/common/catalog.vala" seahorse_util_show_error ((GtkWidget*) _tmp2_, _tmp3_, _tmp5_); -#line 306 "/data/projects/seahorse/common/catalog.vala" +#line 306 "/data/src/seahorse/common/catalog.vala" _g_error_free0 (err); #line 966 "catalog.c" } __finally1: -#line 306 "/data/projects/seahorse/common/catalog.vala" +#line 306 "/data/src/seahorse/common/catalog.vala" if (_inner_error_ != NULL) { -#line 306 "/data/projects/seahorse/common/catalog.vala" +#line 306 "/data/src/seahorse/common/catalog.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 306 "/data/projects/seahorse/common/catalog.vala" +#line 306 "/data/src/seahorse/common/catalog.vala" g_clear_error (&_inner_error_); -#line 306 "/data/projects/seahorse/common/catalog.vala" +#line 306 "/data/src/seahorse/common/catalog.vala" return; #line 977 "catalog.c" } @@ -983,32 +983,32 @@ GList* _tmp0_ = NULL; GList* _tmp1_ = NULL; guint _tmp2_ = 0U; -#line 315 "/data/projects/seahorse/common/catalog.vala" +#line 315 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (self != NULL); -#line 315 "/data/projects/seahorse/common/catalog.vala" +#line 315 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (action != NULL); -#line 316 "/data/projects/seahorse/common/catalog.vala" +#line 316 "/data/src/seahorse/common/catalog.vala" _tmp0_ = seahorse_catalog_get_selected_objects (self); -#line 316 "/data/projects/seahorse/common/catalog.vala" +#line 316 "/data/src/seahorse/common/catalog.vala" objects = _tmp0_; -#line 317 "/data/projects/seahorse/common/catalog.vala" +#line 317 "/data/src/seahorse/common/catalog.vala" _tmp1_ = objects; -#line 317 "/data/projects/seahorse/common/catalog.vala" +#line 317 "/data/src/seahorse/common/catalog.vala" _tmp2_ = g_list_length (_tmp1_); -#line 317 "/data/projects/seahorse/common/catalog.vala" +#line 317 "/data/src/seahorse/common/catalog.vala" if (_tmp2_ > ((guint) 0)) { #line 1001 "catalog.c" GList* _tmp3_ = NULL; gconstpointer _tmp4_ = NULL; -#line 318 "/data/projects/seahorse/common/catalog.vala" +#line 318 "/data/src/seahorse/common/catalog.vala" _tmp3_ = objects; -#line 318 "/data/projects/seahorse/common/catalog.vala" +#line 318 "/data/src/seahorse/common/catalog.vala" _tmp4_ = _tmp3_->data; -#line 318 "/data/projects/seahorse/common/catalog.vala" +#line 318 "/data/src/seahorse/common/catalog.vala" seahorse_catalog_show_properties (self, (GObject*) _tmp4_); #line 1010 "catalog.c" } -#line 315 "/data/projects/seahorse/common/catalog.vala" +#line 315 "/data/src/seahorse/common/catalog.vala" _g_list_free0 (objects); #line 1014 "catalog.c" } @@ -1018,27 +1018,27 @@ SeahorsePlace* place = NULL; SeahorsePlace* _tmp0_ = NULL; SeahorsePlace* _tmp1_ = NULL; -#line 322 "/data/projects/seahorse/common/catalog.vala" +#line 322 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (self != NULL); -#line 322 "/data/projects/seahorse/common/catalog.vala" +#line 322 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (action != NULL); -#line 323 "/data/projects/seahorse/common/catalog.vala" +#line 323 "/data/src/seahorse/common/catalog.vala" _tmp0_ = seahorse_catalog_get_focused_place (self); -#line 323 "/data/projects/seahorse/common/catalog.vala" +#line 323 "/data/src/seahorse/common/catalog.vala" place = _tmp0_; -#line 324 "/data/projects/seahorse/common/catalog.vala" +#line 324 "/data/src/seahorse/common/catalog.vala" _tmp1_ = place; -#line 324 "/data/projects/seahorse/common/catalog.vala" +#line 324 "/data/src/seahorse/common/catalog.vala" if (_tmp1_ != NULL) { #line 1034 "catalog.c" SeahorsePlace* _tmp2_ = NULL; -#line 325 "/data/projects/seahorse/common/catalog.vala" +#line 325 "/data/src/seahorse/common/catalog.vala" _tmp2_ = place; -#line 325 "/data/projects/seahorse/common/catalog.vala" +#line 325 "/data/src/seahorse/common/catalog.vala" seahorse_catalog_show_properties (self, (GObject*) _tmp2_); #line 1040 "catalog.c" } -#line 322 "/data/projects/seahorse/common/catalog.vala" +#line 322 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (place); #line 1044 "catalog.c" } @@ -1046,23 +1046,23 @@ static void seahorse_catalog_on_key_export_file (GtkAction* action, SeahorseCatalog* self) { GError * _inner_error_ = NULL; -#line 329 "/data/projects/seahorse/common/catalog.vala" +#line 329 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (self != NULL); -#line 329 "/data/projects/seahorse/common/catalog.vala" +#line 329 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (action != NULL); #line 1054 "catalog.c" { GList* _tmp0_ = NULL; GList* _tmp1_ = NULL; -#line 331 "/data/projects/seahorse/common/catalog.vala" +#line 331 "/data/src/seahorse/common/catalog.vala" _tmp0_ = seahorse_catalog_get_selected_objects (self); -#line 331 "/data/projects/seahorse/common/catalog.vala" +#line 331 "/data/src/seahorse/common/catalog.vala" _tmp1_ = _tmp0_; -#line 331 "/data/projects/seahorse/common/catalog.vala" +#line 331 "/data/src/seahorse/common/catalog.vala" seahorse_exportable_export_to_prompt_wait (_tmp1_, (GtkWindow*) self, &_inner_error_); -#line 331 "/data/projects/seahorse/common/catalog.vala" +#line 331 "/data/src/seahorse/common/catalog.vala" _g_list_free0 (_tmp1_); -#line 331 "/data/projects/seahorse/common/catalog.vala" +#line 331 "/data/src/seahorse/common/catalog.vala" if (_inner_error_ != NULL) { #line 1068 "catalog.c" goto __catch2_g_error; @@ -1077,34 +1077,34 @@ const gchar* _tmp4_ = NULL; GError* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; -#line 330 "/data/projects/seahorse/common/catalog.vala" +#line 330 "/data/src/seahorse/common/catalog.vala" err = _inner_error_; -#line 330 "/data/projects/seahorse/common/catalog.vala" +#line 330 "/data/src/seahorse/common/catalog.vala" _inner_error_ = NULL; -#line 333 "/data/projects/seahorse/common/catalog.vala" +#line 333 "/data/src/seahorse/common/catalog.vala" _tmp2_ = seahorse_catalog_get_window (self); -#line 333 "/data/projects/seahorse/common/catalog.vala" +#line 333 "/data/src/seahorse/common/catalog.vala" _tmp3_ = _tmp2_; -#line 333 "/data/projects/seahorse/common/catalog.vala" +#line 333 "/data/src/seahorse/common/catalog.vala" _tmp4_ = _ ("Couldn't export keys"); -#line 333 "/data/projects/seahorse/common/catalog.vala" +#line 333 "/data/src/seahorse/common/catalog.vala" _tmp5_ = err; -#line 333 "/data/projects/seahorse/common/catalog.vala" +#line 333 "/data/src/seahorse/common/catalog.vala" _tmp6_ = _tmp5_->message; -#line 333 "/data/projects/seahorse/common/catalog.vala" +#line 333 "/data/src/seahorse/common/catalog.vala" seahorse_util_show_error ((GtkWidget*) _tmp3_, _tmp4_, _tmp6_); -#line 330 "/data/projects/seahorse/common/catalog.vala" +#line 330 "/data/src/seahorse/common/catalog.vala" _g_error_free0 (err); #line 1099 "catalog.c" } __finally2: -#line 330 "/data/projects/seahorse/common/catalog.vala" +#line 330 "/data/src/seahorse/common/catalog.vala" if (_inner_error_ != NULL) { -#line 330 "/data/projects/seahorse/common/catalog.vala" +#line 330 "/data/src/seahorse/common/catalog.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 330 "/data/projects/seahorse/common/catalog.vala" +#line 330 "/data/src/seahorse/common/catalog.vala" g_clear_error (&_inner_error_); -#line 330 "/data/projects/seahorse/common/catalog.vala" +#line 330 "/data/src/seahorse/common/catalog.vala" return; #line 1110 "catalog.c" } @@ -1124,9 +1124,9 @@ guint8* _tmp11_ = NULL; gint _tmp11__length1 = 0; GError * _inner_error_ = NULL; -#line 338 "/data/projects/seahorse/common/catalog.vala" +#line 338 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (self != NULL); -#line 338 "/data/projects/seahorse/common/catalog.vala" +#line 338 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (action != NULL); #line 1132 "catalog.c" { @@ -1135,30 +1135,30 @@ GList* _tmp1_ = NULL; guint8* _tmp2_ = NULL; size_t _tmp3_; -#line 341 "/data/projects/seahorse/common/catalog.vala" +#line 341 "/data/src/seahorse/common/catalog.vala" _tmp0_ = seahorse_catalog_get_selected_objects (self); -#line 341 "/data/projects/seahorse/common/catalog.vala" +#line 341 "/data/src/seahorse/common/catalog.vala" objects = _tmp0_; -#line 342 "/data/projects/seahorse/common/catalog.vala" +#line 342 "/data/src/seahorse/common/catalog.vala" _tmp1_ = objects; -#line 342 "/data/projects/seahorse/common/catalog.vala" +#line 342 "/data/src/seahorse/common/catalog.vala" seahorse_exportable_export_to_text_wait (_tmp1_, &_tmp2_, &_tmp3_, &_inner_error_); -#line 342 "/data/projects/seahorse/common/catalog.vala" +#line 342 "/data/src/seahorse/common/catalog.vala" output = (g_free (output), NULL); -#line 342 "/data/projects/seahorse/common/catalog.vala" +#line 342 "/data/src/seahorse/common/catalog.vala" output = _tmp2_; -#line 342 "/data/projects/seahorse/common/catalog.vala" +#line 342 "/data/src/seahorse/common/catalog.vala" output_length1 = _tmp3_; -#line 342 "/data/projects/seahorse/common/catalog.vala" +#line 342 "/data/src/seahorse/common/catalog.vala" _output_size_ = output_length1; -#line 342 "/data/projects/seahorse/common/catalog.vala" +#line 342 "/data/src/seahorse/common/catalog.vala" if (_inner_error_ != NULL) { -#line 342 "/data/projects/seahorse/common/catalog.vala" +#line 342 "/data/src/seahorse/common/catalog.vala" _g_list_free0 (objects); #line 1159 "catalog.c" goto __catch3_g_error; } -#line 340 "/data/projects/seahorse/common/catalog.vala" +#line 340 "/data/src/seahorse/common/catalog.vala" _g_list_free0 (objects); #line 1164 "catalog.c" } @@ -1169,60 +1169,60 @@ const gchar* _tmp4_ = NULL; GError* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; -#line 340 "/data/projects/seahorse/common/catalog.vala" +#line 340 "/data/src/seahorse/common/catalog.vala" err = _inner_error_; -#line 340 "/data/projects/seahorse/common/catalog.vala" +#line 340 "/data/src/seahorse/common/catalog.vala" _inner_error_ = NULL; -#line 344 "/data/projects/seahorse/common/catalog.vala" +#line 344 "/data/src/seahorse/common/catalog.vala" _tmp4_ = _ ("Couldn't export data"); -#line 344 "/data/projects/seahorse/common/catalog.vala" +#line 344 "/data/src/seahorse/common/catalog.vala" _tmp5_ = err; -#line 344 "/data/projects/seahorse/common/catalog.vala" +#line 344 "/data/src/seahorse/common/catalog.vala" _tmp6_ = _tmp5_->message; -#line 344 "/data/projects/seahorse/common/catalog.vala" +#line 344 "/data/src/seahorse/common/catalog.vala" seahorse_util_show_error ((GtkWidget*) self, _tmp4_, _tmp6_); -#line 345 "/data/projects/seahorse/common/catalog.vala" +#line 345 "/data/src/seahorse/common/catalog.vala" _g_error_free0 (err); -#line 345 "/data/projects/seahorse/common/catalog.vala" +#line 345 "/data/src/seahorse/common/catalog.vala" output = (g_free (output), NULL); -#line 345 "/data/projects/seahorse/common/catalog.vala" +#line 345 "/data/src/seahorse/common/catalog.vala" return; #line 1191 "catalog.c" } __finally3: -#line 340 "/data/projects/seahorse/common/catalog.vala" +#line 340 "/data/src/seahorse/common/catalog.vala" if (_inner_error_ != NULL) { -#line 340 "/data/projects/seahorse/common/catalog.vala" +#line 340 "/data/src/seahorse/common/catalog.vala" output = (g_free (output), NULL); -#line 340 "/data/projects/seahorse/common/catalog.vala" +#line 340 "/data/src/seahorse/common/catalog.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 340 "/data/projects/seahorse/common/catalog.vala" +#line 340 "/data/src/seahorse/common/catalog.vala" g_clear_error (&_inner_error_); -#line 340 "/data/projects/seahorse/common/catalog.vala" +#line 340 "/data/src/seahorse/common/catalog.vala" return; #line 1204 "catalog.c" } -#line 350 "/data/projects/seahorse/common/catalog.vala" +#line 350 "/data/src/seahorse/common/catalog.vala" _tmp7_ = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD); -#line 350 "/data/projects/seahorse/common/catalog.vala" +#line 350 "/data/src/seahorse/common/catalog.vala" _tmp8_ = _g_object_ref0 (_tmp7_); -#line 350 "/data/projects/seahorse/common/catalog.vala" +#line 350 "/data/src/seahorse/common/catalog.vala" board = _tmp8_; -#line 351 "/data/projects/seahorse/common/catalog.vala" +#line 351 "/data/src/seahorse/common/catalog.vala" _tmp9_ = board; -#line 351 "/data/projects/seahorse/common/catalog.vala" +#line 351 "/data/src/seahorse/common/catalog.vala" _tmp10_ = output; -#line 351 "/data/projects/seahorse/common/catalog.vala" +#line 351 "/data/src/seahorse/common/catalog.vala" _tmp10__length1 = output_length1; -#line 351 "/data/projects/seahorse/common/catalog.vala" +#line 351 "/data/src/seahorse/common/catalog.vala" _tmp11_ = output; -#line 351 "/data/projects/seahorse/common/catalog.vala" +#line 351 "/data/src/seahorse/common/catalog.vala" _tmp11__length1 = output_length1; -#line 351 "/data/projects/seahorse/common/catalog.vala" +#line 351 "/data/src/seahorse/common/catalog.vala" gtk_clipboard_set_text (_tmp9_, (const gchar*) _tmp10_, _tmp11__length1); -#line 338 "/data/projects/seahorse/common/catalog.vala" +#line 338 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (board); -#line 338 "/data/projects/seahorse/common/catalog.vala" +#line 338 "/data/src/seahorse/common/catalog.vala" output = (g_free (output), NULL); #line 1228 "catalog.c" } @@ -1230,28 +1230,28 @@ static void seahorse_catalog_on_help_show (GtkAction* action, SeahorseCatalog* self) { GError * _inner_error_ = NULL; -#line 355 "/data/projects/seahorse/common/catalog.vala" +#line 355 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (self != NULL); -#line 355 "/data/projects/seahorse/common/catalog.vala" +#line 355 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (action != NULL); #line 1238 "catalog.c" { gchar* document = NULL; gchar* _tmp0_ = NULL; -#line 357 "/data/projects/seahorse/common/catalog.vala" +#line 357 "/data/src/seahorse/common/catalog.vala" _tmp0_ = g_strdup_printf ("help:%s/introduction", PACKAGE); -#line 357 "/data/projects/seahorse/common/catalog.vala" +#line 357 "/data/src/seahorse/common/catalog.vala" document = _tmp0_; -#line 358 "/data/projects/seahorse/common/catalog.vala" +#line 358 "/data/src/seahorse/common/catalog.vala" g_app_info_launch_default_for_uri (document, NULL, &_inner_error_); -#line 358 "/data/projects/seahorse/common/catalog.vala" +#line 358 "/data/src/seahorse/common/catalog.vala" if (_inner_error_ != NULL) { -#line 358 "/data/projects/seahorse/common/catalog.vala" +#line 358 "/data/src/seahorse/common/catalog.vala" _g_free0 (document); #line 1252 "catalog.c" goto __catch4_g_error; } -#line 356 "/data/projects/seahorse/common/catalog.vala" +#line 356 "/data/src/seahorse/common/catalog.vala" _g_free0 (document); #line 1257 "catalog.c" } @@ -1262,30 +1262,30 @@ const gchar* _tmp1_ = NULL; GError* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; -#line 356 "/data/projects/seahorse/common/catalog.vala" +#line 356 "/data/src/seahorse/common/catalog.vala" err = _inner_error_; -#line 356 "/data/projects/seahorse/common/catalog.vala" +#line 356 "/data/src/seahorse/common/catalog.vala" _inner_error_ = NULL; -#line 360 "/data/projects/seahorse/common/catalog.vala" +#line 360 "/data/src/seahorse/common/catalog.vala" _tmp1_ = _ ("Could not display help: %s"); -#line 360 "/data/projects/seahorse/common/catalog.vala" +#line 360 "/data/src/seahorse/common/catalog.vala" _tmp2_ = err; -#line 360 "/data/projects/seahorse/common/catalog.vala" +#line 360 "/data/src/seahorse/common/catalog.vala" _tmp3_ = _tmp2_->message; -#line 360 "/data/projects/seahorse/common/catalog.vala" +#line 360 "/data/src/seahorse/common/catalog.vala" seahorse_util_show_error ((GtkWidget*) self, _tmp1_, _tmp3_); -#line 356 "/data/projects/seahorse/common/catalog.vala" +#line 356 "/data/src/seahorse/common/catalog.vala" _g_error_free0 (err); #line 1280 "catalog.c" } __finally4: -#line 356 "/data/projects/seahorse/common/catalog.vala" +#line 356 "/data/src/seahorse/common/catalog.vala" if (_inner_error_ != NULL) { -#line 356 "/data/projects/seahorse/common/catalog.vala" +#line 356 "/data/src/seahorse/common/catalog.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 356 "/data/projects/seahorse/common/catalog.vala" +#line 356 "/data/src/seahorse/common/catalog.vala" g_clear_error (&_inner_error_); -#line 356 "/data/projects/seahorse/common/catalog.vala" +#line 356 "/data/src/seahorse/common/catalog.vala" return; #line 1291 "catalog.c" } @@ -1294,9 +1294,9 @@ SeahorseCatalog* seahorse_catalog_construct (GType object_type) { SeahorseCatalog * self = NULL; -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" self = (SeahorseCatalog*) g_object_new (object_type, NULL); -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" return self; #line 1302 "catalog.c" } @@ -1304,11 +1304,11 @@ GtkWindow* seahorse_catalog_get_window (SeahorseCatalog* self) { GtkWindow* result; -#line 30 "/data/projects/seahorse/common/catalog.vala" +#line 30 "/data/src/seahorse/common/catalog.vala" g_return_val_if_fail (self != NULL, NULL); -#line 30 "/data/projects/seahorse/common/catalog.vala" +#line 30 "/data/src/seahorse/common/catalog.vala" result = (GtkWindow*) self; -#line 30 "/data/projects/seahorse/common/catalog.vala" +#line 30 "/data/src/seahorse/common/catalog.vala" return result; #line 1314 "catalog.c" } @@ -1317,13 +1317,13 @@ const gchar* seahorse_catalog_get_ui_name (SeahorseCatalog* self) { const gchar* result; const gchar* _tmp0_ = NULL; -#line 34 "/data/projects/seahorse/common/catalog.vala" +#line 34 "/data/src/seahorse/common/catalog.vala" g_return_val_if_fail (self != NULL, NULL); -#line 34 "/data/projects/seahorse/common/catalog.vala" +#line 34 "/data/src/seahorse/common/catalog.vala" _tmp0_ = self->priv->_ui_name; -#line 34 "/data/projects/seahorse/common/catalog.vala" +#line 34 "/data/src/seahorse/common/catalog.vala" result = _tmp0_; -#line 34 "/data/projects/seahorse/common/catalog.vala" +#line 34 "/data/src/seahorse/common/catalog.vala" return result; #line 1329 "catalog.c" } @@ -1332,17 +1332,17 @@ static void seahorse_catalog_set_ui_name (SeahorseCatalog* self, const gchar* value) { const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; -#line 34 "/data/projects/seahorse/common/catalog.vala" +#line 34 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (self != NULL); -#line 34 "/data/projects/seahorse/common/catalog.vala" +#line 34 "/data/src/seahorse/common/catalog.vala" _tmp0_ = value; -#line 34 "/data/projects/seahorse/common/catalog.vala" +#line 34 "/data/src/seahorse/common/catalog.vala" _tmp1_ = g_strdup (_tmp0_); -#line 34 "/data/projects/seahorse/common/catalog.vala" +#line 34 "/data/src/seahorse/common/catalog.vala" _g_free0 (self->priv->_ui_name); -#line 34 "/data/projects/seahorse/common/catalog.vala" +#line 34 "/data/src/seahorse/common/catalog.vala" self->priv->_ui_name = _tmp1_; -#line 34 "/data/projects/seahorse/common/catalog.vala" +#line 34 "/data/src/seahorse/common/catalog.vala" g_object_notify ((GObject *) self, "ui-name"); #line 1348 "catalog.c" } @@ -1367,29 +1367,29 @@ GList* _tmp26_ = NULL; GList* _tmp27_ = NULL; GList* _tmp28_ = NULL; -#line 143 "/data/projects/seahorse/common/catalog.vala" +#line 143 "/data/src/seahorse/common/catalog.vala" can_properties = FALSE; -#line 144 "/data/projects/seahorse/common/catalog.vala" +#line 144 "/data/src/seahorse/common/catalog.vala" can_delete = FALSE; -#line 145 "/data/projects/seahorse/common/catalog.vala" +#line 145 "/data/src/seahorse/common/catalog.vala" can_export = FALSE; -#line 147 "/data/projects/seahorse/common/catalog.vala" +#line 147 "/data/src/seahorse/common/catalog.vala" _tmp0_ = seahorse_catalog_get_selected_objects (self); -#line 147 "/data/projects/seahorse/common/catalog.vala" +#line 147 "/data/src/seahorse/common/catalog.vala" objects = _tmp0_; -#line 148 "/data/projects/seahorse/common/catalog.vala" +#line 148 "/data/src/seahorse/common/catalog.vala" _tmp1_ = objects; #line 1383 "catalog.c" { GList* object_collection = NULL; GList* object_it = NULL; -#line 148 "/data/projects/seahorse/common/catalog.vala" +#line 148 "/data/src/seahorse/common/catalog.vala" object_collection = _tmp1_; -#line 148 "/data/projects/seahorse/common/catalog.vala" +#line 148 "/data/src/seahorse/common/catalog.vala" for (object_it = object_collection; object_it != NULL; object_it = object_it->next) { #line 1391 "catalog.c" GObject* object = NULL; -#line 148 "/data/projects/seahorse/common/catalog.vala" +#line 148 "/data/src/seahorse/common/catalog.vala" object = (GObject*) object_it->data; #line 1395 "catalog.c" { @@ -1404,172 +1404,172 @@ gboolean _tmp10_ = FALSE; gboolean _tmp12_ = FALSE; gboolean _tmp14_ = FALSE; -#line 149 "/data/projects/seahorse/common/catalog.vala" +#line 149 "/data/src/seahorse/common/catalog.vala" _tmp2_ = object; -#line 149 "/data/projects/seahorse/common/catalog.vala" +#line 149 "/data/src/seahorse/common/catalog.vala" _tmp3_ = seahorse_exportable_can_export (_tmp2_); -#line 149 "/data/projects/seahorse/common/catalog.vala" +#line 149 "/data/src/seahorse/common/catalog.vala" if (_tmp3_) { -#line 150 "/data/projects/seahorse/common/catalog.vala" +#line 150 "/data/src/seahorse/common/catalog.vala" can_export = TRUE; #line 1416 "catalog.c" } -#line 151 "/data/projects/seahorse/common/catalog.vala" +#line 151 "/data/src/seahorse/common/catalog.vala" _tmp4_ = object; -#line 151 "/data/projects/seahorse/common/catalog.vala" +#line 151 "/data/src/seahorse/common/catalog.vala" _tmp5_ = seahorse_deletable_can_delete (_tmp4_); -#line 151 "/data/projects/seahorse/common/catalog.vala" +#line 151 "/data/src/seahorse/common/catalog.vala" if (_tmp5_) { -#line 152 "/data/projects/seahorse/common/catalog.vala" +#line 152 "/data/src/seahorse/common/catalog.vala" can_delete = TRUE; #line 1426 "catalog.c" } -#line 153 "/data/projects/seahorse/common/catalog.vala" +#line 153 "/data/src/seahorse/common/catalog.vala" _tmp6_ = object; -#line 153 "/data/projects/seahorse/common/catalog.vala" +#line 153 "/data/src/seahorse/common/catalog.vala" _tmp7_ = seahorse_viewable_can_view (_tmp6_); -#line 153 "/data/projects/seahorse/common/catalog.vala" +#line 153 "/data/src/seahorse/common/catalog.vala" if (_tmp7_) { -#line 154 "/data/projects/seahorse/common/catalog.vala" +#line 154 "/data/src/seahorse/common/catalog.vala" can_properties = TRUE; #line 1436 "catalog.c" } -#line 155 "/data/projects/seahorse/common/catalog.vala" +#line 155 "/data/src/seahorse/common/catalog.vala" _tmp10_ = can_export; -#line 155 "/data/projects/seahorse/common/catalog.vala" +#line 155 "/data/src/seahorse/common/catalog.vala" if (_tmp10_) { #line 1442 "catalog.c" gboolean _tmp11_ = FALSE; -#line 155 "/data/projects/seahorse/common/catalog.vala" +#line 155 "/data/src/seahorse/common/catalog.vala" _tmp11_ = can_delete; -#line 155 "/data/projects/seahorse/common/catalog.vala" +#line 155 "/data/src/seahorse/common/catalog.vala" _tmp9_ = _tmp11_; #line 1448 "catalog.c" } else { -#line 155 "/data/projects/seahorse/common/catalog.vala" +#line 155 "/data/src/seahorse/common/catalog.vala" _tmp9_ = FALSE; #line 1452 "catalog.c" } -#line 155 "/data/projects/seahorse/common/catalog.vala" +#line 155 "/data/src/seahorse/common/catalog.vala" _tmp12_ = _tmp9_; -#line 155 "/data/projects/seahorse/common/catalog.vala" +#line 155 "/data/src/seahorse/common/catalog.vala" if (_tmp12_) { #line 1458 "catalog.c" gboolean _tmp13_ = FALSE; -#line 155 "/data/projects/seahorse/common/catalog.vala" +#line 155 "/data/src/seahorse/common/catalog.vala" _tmp13_ = can_properties; -#line 155 "/data/projects/seahorse/common/catalog.vala" +#line 155 "/data/src/seahorse/common/catalog.vala" _tmp8_ = _tmp13_; #line 1464 "catalog.c" } else { -#line 155 "/data/projects/seahorse/common/catalog.vala" +#line 155 "/data/src/seahorse/common/catalog.vala" _tmp8_ = FALSE; #line 1468 "catalog.c" } -#line 155 "/data/projects/seahorse/common/catalog.vala" +#line 155 "/data/src/seahorse/common/catalog.vala" _tmp14_ = _tmp8_; -#line 155 "/data/projects/seahorse/common/catalog.vala" +#line 155 "/data/src/seahorse/common/catalog.vala" if (_tmp14_) { -#line 156 "/data/projects/seahorse/common/catalog.vala" +#line 156 "/data/src/seahorse/common/catalog.vala" break; #line 1476 "catalog.c" } } } } -#line 159 "/data/projects/seahorse/common/catalog.vala" +#line 159 "/data/src/seahorse/common/catalog.vala" _tmp15_ = self->priv->_properties_object; -#line 159 "/data/projects/seahorse/common/catalog.vala" +#line 159 "/data/src/seahorse/common/catalog.vala" _tmp16_ = can_properties; -#line 159 "/data/projects/seahorse/common/catalog.vala" +#line 159 "/data/src/seahorse/common/catalog.vala" gtk_action_set_sensitive (_tmp15_, _tmp16_); -#line 160 "/data/projects/seahorse/common/catalog.vala" +#line 160 "/data/src/seahorse/common/catalog.vala" _tmp17_ = self->priv->_edit_delete; -#line 160 "/data/projects/seahorse/common/catalog.vala" +#line 160 "/data/src/seahorse/common/catalog.vala" _tmp18_ = can_delete; -#line 160 "/data/projects/seahorse/common/catalog.vala" +#line 160 "/data/src/seahorse/common/catalog.vala" gtk_action_set_sensitive (_tmp17_, _tmp18_); -#line 161 "/data/projects/seahorse/common/catalog.vala" +#line 161 "/data/src/seahorse/common/catalog.vala" _tmp19_ = self->priv->_edit_copy; -#line 161 "/data/projects/seahorse/common/catalog.vala" +#line 161 "/data/src/seahorse/common/catalog.vala" _tmp20_ = can_export; -#line 161 "/data/projects/seahorse/common/catalog.vala" +#line 161 "/data/src/seahorse/common/catalog.vala" gtk_action_set_sensitive (_tmp19_, _tmp20_); -#line 162 "/data/projects/seahorse/common/catalog.vala" +#line 162 "/data/src/seahorse/common/catalog.vala" _tmp21_ = self->priv->_file_export; -#line 162 "/data/projects/seahorse/common/catalog.vala" +#line 162 "/data/src/seahorse/common/catalog.vala" _tmp22_ = can_export; -#line 162 "/data/projects/seahorse/common/catalog.vala" +#line 162 "/data/src/seahorse/common/catalog.vala" gtk_action_set_sensitive (_tmp21_, _tmp22_); -#line 164 "/data/projects/seahorse/common/catalog.vala" +#line 164 "/data/src/seahorse/common/catalog.vala" _tmp23_ = self->priv->_selection_actions; #line 1507 "catalog.c" { GList* group_collection = NULL; GList* group_it = NULL; -#line 164 "/data/projects/seahorse/common/catalog.vala" +#line 164 "/data/src/seahorse/common/catalog.vala" group_collection = _tmp23_; -#line 164 "/data/projects/seahorse/common/catalog.vala" +#line 164 "/data/src/seahorse/common/catalog.vala" for (group_it = group_collection; group_it != NULL; group_it = group_it->next) { #line 1515 "catalog.c" GtkActionGroup* _tmp24_ = NULL; GtkActionGroup* group = NULL; -#line 164 "/data/projects/seahorse/common/catalog.vala" +#line 164 "/data/src/seahorse/common/catalog.vala" _tmp24_ = _g_object_ref0 ((GtkActionGroup*) group_it->data); -#line 164 "/data/projects/seahorse/common/catalog.vala" +#line 164 "/data/src/seahorse/common/catalog.vala" group = _tmp24_; #line 1522 "catalog.c" { GtkActionGroup* _tmp25_ = NULL; -#line 165 "/data/projects/seahorse/common/catalog.vala" +#line 165 "/data/src/seahorse/common/catalog.vala" _tmp25_ = group; -#line 165 "/data/projects/seahorse/common/catalog.vala" +#line 165 "/data/src/seahorse/common/catalog.vala" gtk_action_group_set_visible (_tmp25_, FALSE); -#line 164 "/data/projects/seahorse/common/catalog.vala" +#line 164 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (group); #line 1531 "catalog.c" } } } -#line 166 "/data/projects/seahorse/common/catalog.vala" +#line 166 "/data/src/seahorse/common/catalog.vala" _tmp26_ = objects; -#line 166 "/data/projects/seahorse/common/catalog.vala" +#line 166 "/data/src/seahorse/common/catalog.vala" _tmp27_ = seahorse_catalog_lookup_actions_for_objects (self, _tmp26_); -#line 166 "/data/projects/seahorse/common/catalog.vala" +#line 166 "/data/src/seahorse/common/catalog.vala" __g_list_free__g_object_unref0_0 (self->priv->_selection_actions); -#line 166 "/data/projects/seahorse/common/catalog.vala" +#line 166 "/data/src/seahorse/common/catalog.vala" self->priv->_selection_actions = _tmp27_; -#line 167 "/data/projects/seahorse/common/catalog.vala" +#line 167 "/data/src/seahorse/common/catalog.vala" _tmp28_ = self->priv->_selection_actions; #line 1545 "catalog.c" { GList* group_collection = NULL; GList* group_it = NULL; -#line 167 "/data/projects/seahorse/common/catalog.vala" +#line 167 "/data/src/seahorse/common/catalog.vala" group_collection = _tmp28_; -#line 167 "/data/projects/seahorse/common/catalog.vala" +#line 167 "/data/src/seahorse/common/catalog.vala" for (group_it = group_collection; group_it != NULL; group_it = group_it->next) { #line 1553 "catalog.c" GtkActionGroup* _tmp29_ = NULL; GtkActionGroup* group = NULL; -#line 167 "/data/projects/seahorse/common/catalog.vala" +#line 167 "/data/src/seahorse/common/catalog.vala" _tmp29_ = _g_object_ref0 ((GtkActionGroup*) group_it->data); -#line 167 "/data/projects/seahorse/common/catalog.vala" +#line 167 "/data/src/seahorse/common/catalog.vala" group = _tmp29_; #line 1560 "catalog.c" { GtkActionGroup* _tmp30_ = NULL; -#line 168 "/data/projects/seahorse/common/catalog.vala" +#line 168 "/data/src/seahorse/common/catalog.vala" _tmp30_ = group; -#line 168 "/data/projects/seahorse/common/catalog.vala" +#line 168 "/data/src/seahorse/common/catalog.vala" gtk_action_group_set_visible (_tmp30_, TRUE); -#line 167 "/data/projects/seahorse/common/catalog.vala" +#line 167 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (group); #line 1569 "catalog.c" } } } -#line 142 "/data/projects/seahorse/common/catalog.vala" +#line 142 "/data/src/seahorse/common/catalog.vala" _g_list_free0 (objects); #line 1575 "catalog.c" } @@ -1584,75 +1584,75 @@ GObject* _tmp4_ = NULL; GObject* _tmp5_ = NULL; GObject* _tmp6_ = NULL; -#line 57 "/data/projects/seahorse/common/catalog.vala" +#line 57 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (widget != NULL); -#line 59 "/data/projects/seahorse/common/catalog.vala" +#line 59 "/data/src/seahorse/common/catalog.vala" _tmp0_ = widget; -#line 59 "/data/projects/seahorse/common/catalog.vala" +#line 59 "/data/src/seahorse/common/catalog.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, GTK_TYPE_MENU_BAR)) { -#line 60 "/data/projects/seahorse/common/catalog.vala" +#line 60 "/data/src/seahorse/common/catalog.vala" name = "menu-placeholder"; #line 1596 "catalog.c" } else { GtkWidget* _tmp1_ = NULL; -#line 61 "/data/projects/seahorse/common/catalog.vala" +#line 61 "/data/src/seahorse/common/catalog.vala" _tmp1_ = widget; -#line 61 "/data/projects/seahorse/common/catalog.vala" +#line 61 "/data/src/seahorse/common/catalog.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, GTK_TYPE_TOOLBAR)) { -#line 62 "/data/projects/seahorse/common/catalog.vala" +#line 62 "/data/src/seahorse/common/catalog.vala" name = "toolbar-placeholder"; #line 1605 "catalog.c" } else { -#line 64 "/data/projects/seahorse/common/catalog.vala" +#line 64 "/data/src/seahorse/common/catalog.vala" name = NULL; #line 1609 "catalog.c" } } -#line 65 "/data/projects/seahorse/common/catalog.vala" +#line 65 "/data/src/seahorse/common/catalog.vala" _tmp2_ = self->priv->_builder; -#line 65 "/data/projects/seahorse/common/catalog.vala" +#line 65 "/data/src/seahorse/common/catalog.vala" _tmp3_ = name; -#line 65 "/data/projects/seahorse/common/catalog.vala" +#line 65 "/data/src/seahorse/common/catalog.vala" _tmp4_ = gtk_builder_get_object (_tmp2_, _tmp3_); -#line 65 "/data/projects/seahorse/common/catalog.vala" +#line 65 "/data/src/seahorse/common/catalog.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 65 "/data/projects/seahorse/common/catalog.vala" +#line 65 "/data/src/seahorse/common/catalog.vala" holder = _tmp5_; -#line 66 "/data/projects/seahorse/common/catalog.vala" +#line 66 "/data/src/seahorse/common/catalog.vala" _tmp6_ = holder; -#line 66 "/data/projects/seahorse/common/catalog.vala" +#line 66 "/data/src/seahorse/common/catalog.vala" if (_tmp6_ != NULL) { #line 1626 "catalog.c" GObject* _tmp7_ = NULL; GtkWidget* _tmp8_ = NULL; GtkWidget* _tmp9_ = NULL; -#line 67 "/data/projects/seahorse/common/catalog.vala" +#line 67 "/data/src/seahorse/common/catalog.vala" _tmp7_ = holder; -#line 67 "/data/projects/seahorse/common/catalog.vala" +#line 67 "/data/src/seahorse/common/catalog.vala" _tmp8_ = widget; -#line 67 "/data/projects/seahorse/common/catalog.vala" +#line 67 "/data/src/seahorse/common/catalog.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_CONTAINER, GtkContainer), _tmp8_); -#line 68 "/data/projects/seahorse/common/catalog.vala" +#line 68 "/data/src/seahorse/common/catalog.vala" _tmp9_ = widget; -#line 68 "/data/projects/seahorse/common/catalog.vala" +#line 68 "/data/src/seahorse/common/catalog.vala" gtk_widget_show (_tmp9_); #line 1640 "catalog.c" } else { const gchar* _tmp10_ = NULL; -#line 70 "/data/projects/seahorse/common/catalog.vala" +#line 70 "/data/src/seahorse/common/catalog.vala" _tmp10_ = name; -#line 70 "/data/projects/seahorse/common/catalog.vala" +#line 70 "/data/src/seahorse/common/catalog.vala" g_warning ("catalog.vala:70: no place holder found for: %s", _tmp10_); #line 1647 "catalog.c" } -#line 57 "/data/projects/seahorse/common/catalog.vala" +#line 57 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (holder); #line 1651 "catalog.c" } static void __seahorse_catalog___lambda9__gtk_ui_manager_add_widget (GtkUIManager* _sender, GtkWidget* widget, gpointer self) { -#line 57 "/data/projects/seahorse/common/catalog.vala" +#line 57 "/data/src/seahorse/common/catalog.vala" _seahorse_catalog___lambda9_ (self, widget); #line 1658 "catalog.c" } @@ -1660,18 +1660,18 @@ static void _seahorse_catalog___lambda10_ (SeahorseCatalog* self, GtkAction* action) { GtkAction* _tmp0_ = NULL; -#line 74 "/data/projects/seahorse/common/catalog.vala" +#line 74 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (action != NULL); -#line 75 "/data/projects/seahorse/common/catalog.vala" +#line 75 "/data/src/seahorse/common/catalog.vala" _tmp0_ = action; -#line 75 "/data/projects/seahorse/common/catalog.vala" +#line 75 "/data/src/seahorse/common/catalog.vala" seahorse_action_pre_activate (_tmp0_, self, (GtkWindow*) self); #line 1670 "catalog.c" } static void __seahorse_catalog___lambda10__gtk_ui_manager_pre_activate (GtkUIManager* _sender, GtkAction* action, gpointer self) { -#line 74 "/data/projects/seahorse/common/catalog.vala" +#line 74 "/data/src/seahorse/common/catalog.vala" _seahorse_catalog___lambda10_ (self, action); #line 1677 "catalog.c" } @@ -1679,18 +1679,18 @@ static void _seahorse_catalog___lambda11_ (SeahorseCatalog* self, GtkAction* action) { GtkAction* _tmp0_ = NULL; -#line 78 "/data/projects/seahorse/common/catalog.vala" +#line 78 "/data/src/seahorse/common/catalog.vala" g_return_if_fail (action != NULL); -#line 79 "/data/projects/seahorse/common/catalog.vala" +#line 79 "/data/src/seahorse/common/catalog.vala" _tmp0_ = action; -#line 79 "/data/projects/seahorse/common/catalog.vala" +#line 79 "/data/src/seahorse/common/catalog.vala" seahorse_action_post_activate (_tmp0_); #line 1689 "catalog.c" } static void __seahorse_catalog___lambda11__gtk_ui_manager_post_activate (GtkUIManager* _sender, GtkAction* action, gpointer self) { -#line 78 "/data/projects/seahorse/common/catalog.vala" +#line 78 "/data/src/seahorse/common/catalog.vala" _seahorse_catalog___lambda11_ (self, action); #line 1696 "catalog.c" } @@ -1751,102 +1751,102 @@ GtkActionGroup* _tmp56_ = NULL; GtkApplication* _tmp57_ = NULL; GError * _inner_error_ = NULL; -#line 51 "/data/projects/seahorse/common/catalog.vala" +#line 51 "/data/src/seahorse/common/catalog.vala" parent_class = G_OBJECT_CLASS (seahorse_catalog_parent_class); -#line 51 "/data/projects/seahorse/common/catalog.vala" +#line 51 "/data/src/seahorse/common/catalog.vala" obj = parent_class->constructor (type, n_construct_properties, construct_properties); -#line 51 "/data/projects/seahorse/common/catalog.vala" +#line 51 "/data/src/seahorse/common/catalog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_TYPE_CATALOG, SeahorseCatalog); -#line 52 "/data/projects/seahorse/common/catalog.vala" +#line 52 "/data/src/seahorse/common/catalog.vala" _tmp0_ = self->priv->_ui_name; -#line 52 "/data/projects/seahorse/common/catalog.vala" +#line 52 "/data/src/seahorse/common/catalog.vala" _tmp1_ = seahorse_util_load_built_contents ((GtkContainer*) self, _tmp0_); -#line 52 "/data/projects/seahorse/common/catalog.vala" +#line 52 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_builder); -#line 52 "/data/projects/seahorse/common/catalog.vala" +#line 52 "/data/src/seahorse/common/catalog.vala" self->priv->_builder = _tmp1_; -#line 54 "/data/projects/seahorse/common/catalog.vala" +#line 54 "/data/src/seahorse/common/catalog.vala" _tmp2_ = g_direct_hash; -#line 54 "/data/projects/seahorse/common/catalog.vala" +#line 54 "/data/src/seahorse/common/catalog.vala" _tmp3_ = g_direct_equal; -#line 54 "/data/projects/seahorse/common/catalog.vala" +#line 54 "/data/src/seahorse/common/catalog.vala" _tmp4_ = g_hash_table_new_full (_tmp2_, _tmp3_, _g_object_unref0_, NULL); -#line 54 "/data/projects/seahorse/common/catalog.vala" +#line 54 "/data/src/seahorse/common/catalog.vala" _g_hash_table_unref0 (self->priv->_actions); -#line 54 "/data/projects/seahorse/common/catalog.vala" +#line 54 "/data/src/seahorse/common/catalog.vala" self->priv->_actions = _tmp4_; -#line 55 "/data/projects/seahorse/common/catalog.vala" +#line 55 "/data/src/seahorse/common/catalog.vala" _tmp5_ = gtk_ui_manager_new (); -#line 55 "/data/projects/seahorse/common/catalog.vala" +#line 55 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_ui_manager); -#line 55 "/data/projects/seahorse/common/catalog.vala" +#line 55 "/data/src/seahorse/common/catalog.vala" self->priv->_ui_manager = _tmp5_; -#line 57 "/data/projects/seahorse/common/catalog.vala" +#line 57 "/data/src/seahorse/common/catalog.vala" _tmp6_ = self->priv->_ui_manager; -#line 57 "/data/projects/seahorse/common/catalog.vala" +#line 57 "/data/src/seahorse/common/catalog.vala" g_signal_connect_object (_tmp6_, "add-widget", (GCallback) __seahorse_catalog___lambda9__gtk_ui_manager_add_widget, self, 0); -#line 74 "/data/projects/seahorse/common/catalog.vala" +#line 74 "/data/src/seahorse/common/catalog.vala" _tmp7_ = self->priv->_ui_manager; -#line 74 "/data/projects/seahorse/common/catalog.vala" +#line 74 "/data/src/seahorse/common/catalog.vala" g_signal_connect_object (_tmp7_, "pre-activate", (GCallback) __seahorse_catalog___lambda10__gtk_ui_manager_pre_activate, self, 0); -#line 78 "/data/projects/seahorse/common/catalog.vala" +#line 78 "/data/src/seahorse/common/catalog.vala" _tmp8_ = self->priv->_ui_manager; -#line 78 "/data/projects/seahorse/common/catalog.vala" +#line 78 "/data/src/seahorse/common/catalog.vala" g_signal_connect_object (_tmp8_, "post-activate", (GCallback) __seahorse_catalog___lambda11__gtk_ui_manager_post_activate, self, 0); -#line 83 "/data/projects/seahorse/common/catalog.vala" +#line 83 "/data/src/seahorse/common/catalog.vala" _tmp9_ = self->priv->_ui_name; -#line 83 "/data/projects/seahorse/common/catalog.vala" +#line 83 "/data/src/seahorse/common/catalog.vala" _tmp10_ = g_strdup_printf ("/apps/seahorse/windows/%s/", _tmp9_); -#line 83 "/data/projects/seahorse/common/catalog.vala" +#line 83 "/data/src/seahorse/common/catalog.vala" key = _tmp10_; -#line 84 "/data/projects/seahorse/common/catalog.vala" +#line 84 "/data/src/seahorse/common/catalog.vala" _tmp11_ = key; -#line 84 "/data/projects/seahorse/common/catalog.vala" +#line 84 "/data/src/seahorse/common/catalog.vala" _tmp12_ = g_settings_new_with_path ("org.gnome.seahorse.window", _tmp11_); -#line 84 "/data/projects/seahorse/common/catalog.vala" +#line 84 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_settings); -#line 84 "/data/projects/seahorse/common/catalog.vala" +#line 84 "/data/src/seahorse/common/catalog.vala" self->priv->_settings = _tmp12_; -#line 85 "/data/projects/seahorse/common/catalog.vala" +#line 85 "/data/src/seahorse/common/catalog.vala" _tmp13_ = self->priv->_settings; -#line 85 "/data/projects/seahorse/common/catalog.vala" +#line 85 "/data/src/seahorse/common/catalog.vala" _tmp14_ = g_settings_get_int (_tmp13_, "width"); -#line 85 "/data/projects/seahorse/common/catalog.vala" +#line 85 "/data/src/seahorse/common/catalog.vala" width = _tmp14_; -#line 86 "/data/projects/seahorse/common/catalog.vala" +#line 86 "/data/src/seahorse/common/catalog.vala" _tmp15_ = self->priv->_settings; -#line 86 "/data/projects/seahorse/common/catalog.vala" +#line 86 "/data/src/seahorse/common/catalog.vala" _tmp16_ = g_settings_get_int (_tmp15_, "height"); -#line 86 "/data/projects/seahorse/common/catalog.vala" +#line 86 "/data/src/seahorse/common/catalog.vala" height = _tmp16_; -#line 87 "/data/projects/seahorse/common/catalog.vala" +#line 87 "/data/src/seahorse/common/catalog.vala" _tmp18_ = width; -#line 87 "/data/projects/seahorse/common/catalog.vala" +#line 87 "/data/src/seahorse/common/catalog.vala" if (_tmp18_ > 0) { #line 1827 "catalog.c" gint _tmp19_ = 0; -#line 87 "/data/projects/seahorse/common/catalog.vala" +#line 87 "/data/src/seahorse/common/catalog.vala" _tmp19_ = height; -#line 87 "/data/projects/seahorse/common/catalog.vala" +#line 87 "/data/src/seahorse/common/catalog.vala" _tmp17_ = _tmp19_ > 0; #line 1833 "catalog.c" } else { -#line 87 "/data/projects/seahorse/common/catalog.vala" +#line 87 "/data/src/seahorse/common/catalog.vala" _tmp17_ = FALSE; #line 1837 "catalog.c" } -#line 87 "/data/projects/seahorse/common/catalog.vala" +#line 87 "/data/src/seahorse/common/catalog.vala" _tmp20_ = _tmp17_; -#line 87 "/data/projects/seahorse/common/catalog.vala" +#line 87 "/data/src/seahorse/common/catalog.vala" if (_tmp20_) { #line 1843 "catalog.c" gint _tmp21_ = 0; gint _tmp22_ = 0; -#line 88 "/data/projects/seahorse/common/catalog.vala" +#line 88 "/data/src/seahorse/common/catalog.vala" _tmp21_ = width; -#line 88 "/data/projects/seahorse/common/catalog.vala" +#line 88 "/data/src/seahorse/common/catalog.vala" _tmp22_ = height; -#line 88 "/data/projects/seahorse/common/catalog.vala" +#line 88 "/data/src/seahorse/common/catalog.vala" gtk_window_resize ((GtkWindow*) self, _tmp21_, _tmp22_); #line 1852 "catalog.c" } @@ -1859,34 +1859,34 @@ gchar* _tmp27_ = NULL; GtkUIManager* _tmp28_ = NULL; const gchar* _tmp29_ = NULL; -#line 92 "/data/projects/seahorse/common/catalog.vala" +#line 92 "/data/src/seahorse/common/catalog.vala" _tmp23_ = self->priv->_ui_name; -#line 92 "/data/projects/seahorse/common/catalog.vala" +#line 92 "/data/src/seahorse/common/catalog.vala" _tmp24_ = g_strdup_printf ("seahorse-%s.ui", _tmp23_); -#line 92 "/data/projects/seahorse/common/catalog.vala" +#line 92 "/data/src/seahorse/common/catalog.vala" _tmp25_ = _tmp24_; -#line 92 "/data/projects/seahorse/common/catalog.vala" +#line 92 "/data/src/seahorse/common/catalog.vala" _tmp26_ = g_build_filename (UIDIR, _tmp25_, NULL); -#line 92 "/data/projects/seahorse/common/catalog.vala" +#line 92 "/data/src/seahorse/common/catalog.vala" _tmp27_ = _tmp26_; -#line 92 "/data/projects/seahorse/common/catalog.vala" +#line 92 "/data/src/seahorse/common/catalog.vala" _g_free0 (_tmp25_); -#line 92 "/data/projects/seahorse/common/catalog.vala" +#line 92 "/data/src/seahorse/common/catalog.vala" path = _tmp27_; -#line 93 "/data/projects/seahorse/common/catalog.vala" +#line 93 "/data/src/seahorse/common/catalog.vala" _tmp28_ = self->priv->_ui_manager; -#line 93 "/data/projects/seahorse/common/catalog.vala" +#line 93 "/data/src/seahorse/common/catalog.vala" _tmp29_ = path; -#line 93 "/data/projects/seahorse/common/catalog.vala" +#line 93 "/data/src/seahorse/common/catalog.vala" gtk_ui_manager_add_ui_from_file (_tmp28_, _tmp29_, &_inner_error_); -#line 93 "/data/projects/seahorse/common/catalog.vala" +#line 93 "/data/src/seahorse/common/catalog.vala" if (_inner_error_ != NULL) { -#line 93 "/data/projects/seahorse/common/catalog.vala" +#line 93 "/data/src/seahorse/common/catalog.vala" _g_free0 (path); #line 1887 "catalog.c" goto __catch5_g_error; } -#line 91 "/data/projects/seahorse/common/catalog.vala" +#line 91 "/data/src/seahorse/common/catalog.vala" _g_free0 (path); #line 1892 "catalog.c" } @@ -1897,162 +1897,162 @@ const gchar* _tmp30_ = NULL; GError* _tmp31_ = NULL; const gchar* _tmp32_ = NULL; -#line 91 "/data/projects/seahorse/common/catalog.vala" +#line 91 "/data/src/seahorse/common/catalog.vala" err = _inner_error_; -#line 91 "/data/projects/seahorse/common/catalog.vala" +#line 91 "/data/src/seahorse/common/catalog.vala" _inner_error_ = NULL; -#line 95 "/data/projects/seahorse/common/catalog.vala" +#line 95 "/data/src/seahorse/common/catalog.vala" _tmp30_ = self->priv->_ui_name; -#line 95 "/data/projects/seahorse/common/catalog.vala" +#line 95 "/data/src/seahorse/common/catalog.vala" _tmp31_ = err; -#line 95 "/data/projects/seahorse/common/catalog.vala" +#line 95 "/data/src/seahorse/common/catalog.vala" _tmp32_ = _tmp31_->message; -#line 95 "/data/projects/seahorse/common/catalog.vala" +#line 95 "/data/src/seahorse/common/catalog.vala" g_warning ("catalog.vala:95: couldn't load ui description for '%s': %s", _tmp30_, _tmp32_); -#line 91 "/data/projects/seahorse/common/catalog.vala" +#line 91 "/data/src/seahorse/common/catalog.vala" _g_error_free0 (err); #line 1915 "catalog.c" } __finally5: -#line 91 "/data/projects/seahorse/common/catalog.vala" +#line 91 "/data/src/seahorse/common/catalog.vala" if (_inner_error_ != NULL) { -#line 91 "/data/projects/seahorse/common/catalog.vala" +#line 91 "/data/src/seahorse/common/catalog.vala" _g_free0 (key); -#line 91 "/data/projects/seahorse/common/catalog.vala" +#line 91 "/data/src/seahorse/common/catalog.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 91 "/data/projects/seahorse/common/catalog.vala" +#line 91 "/data/src/seahorse/common/catalog.vala" g_clear_error (&_inner_error_); #line 1926 "catalog.c" } -#line 99 "/data/projects/seahorse/common/catalog.vala" +#line 99 "/data/src/seahorse/common/catalog.vala" _tmp33_ = self->priv->_ui_manager; -#line 99 "/data/projects/seahorse/common/catalog.vala" +#line 99 "/data/src/seahorse/common/catalog.vala" _tmp34_ = gtk_ui_manager_get_accel_group (_tmp33_); -#line 99 "/data/projects/seahorse/common/catalog.vala" +#line 99 "/data/src/seahorse/common/catalog.vala" gtk_window_add_accel_group ((GtkWindow*) self, _tmp34_); -#line 101 "/data/projects/seahorse/common/catalog.vala" +#line 101 "/data/src/seahorse/common/catalog.vala" _tmp35_ = gtk_action_group_new ("main"); -#line 101 "/data/projects/seahorse/common/catalog.vala" +#line 101 "/data/src/seahorse/common/catalog.vala" actions = _tmp35_; -#line 102 "/data/projects/seahorse/common/catalog.vala" +#line 102 "/data/src/seahorse/common/catalog.vala" _tmp36_ = actions; -#line 102 "/data/projects/seahorse/common/catalog.vala" +#line 102 "/data/src/seahorse/common/catalog.vala" gtk_action_group_set_translation_domain (_tmp36_, GETTEXT_PACKAGE); -#line 103 "/data/projects/seahorse/common/catalog.vala" +#line 103 "/data/src/seahorse/common/catalog.vala" _tmp37_ = actions; -#line 103 "/data/projects/seahorse/common/catalog.vala" +#line 103 "/data/src/seahorse/common/catalog.vala" gtk_action_group_add_actions (_tmp37_, SEAHORSE_CATALOG_UI_ENTRIES, G_N_ELEMENTS (SEAHORSE_CATALOG_UI_ENTRIES), self); -#line 105 "/data/projects/seahorse/common/catalog.vala" +#line 105 "/data/src/seahorse/common/catalog.vala" _tmp38_ = actions; -#line 105 "/data/projects/seahorse/common/catalog.vala" +#line 105 "/data/src/seahorse/common/catalog.vala" _tmp39_ = gtk_action_group_get_action (_tmp38_, "app-preferences"); -#line 105 "/data/projects/seahorse/common/catalog.vala" +#line 105 "/data/src/seahorse/common/catalog.vala" _tmp40_ = _g_object_ref0 (_tmp39_); -#line 105 "/data/projects/seahorse/common/catalog.vala" +#line 105 "/data/src/seahorse/common/catalog.vala" action = _tmp40_; -#line 106 "/data/projects/seahorse/common/catalog.vala" +#line 106 "/data/src/seahorse/common/catalog.vala" _tmp41_ = action; -#line 106 "/data/projects/seahorse/common/catalog.vala" +#line 106 "/data/src/seahorse/common/catalog.vala" _tmp42_ = seahorse_prefs_available (); -#line 106 "/data/projects/seahorse/common/catalog.vala" +#line 106 "/data/src/seahorse/common/catalog.vala" gtk_action_set_visible (_tmp41_, _tmp42_); -#line 107 "/data/projects/seahorse/common/catalog.vala" +#line 107 "/data/src/seahorse/common/catalog.vala" _tmp43_ = actions; -#line 107 "/data/projects/seahorse/common/catalog.vala" +#line 107 "/data/src/seahorse/common/catalog.vala" _tmp44_ = gtk_action_group_get_action (_tmp43_, "edit-delete"); -#line 107 "/data/projects/seahorse/common/catalog.vala" +#line 107 "/data/src/seahorse/common/catalog.vala" _tmp45_ = _g_object_ref0 (_tmp44_); -#line 107 "/data/projects/seahorse/common/catalog.vala" +#line 107 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_edit_delete); -#line 107 "/data/projects/seahorse/common/catalog.vala" +#line 107 "/data/src/seahorse/common/catalog.vala" self->priv->_edit_delete = _tmp45_; -#line 108 "/data/projects/seahorse/common/catalog.vala" +#line 108 "/data/src/seahorse/common/catalog.vala" _tmp46_ = actions; -#line 108 "/data/projects/seahorse/common/catalog.vala" +#line 108 "/data/src/seahorse/common/catalog.vala" _tmp47_ = gtk_action_group_get_action (_tmp46_, "properties-object"); -#line 108 "/data/projects/seahorse/common/catalog.vala" +#line 108 "/data/src/seahorse/common/catalog.vala" _tmp48_ = _g_object_ref0 (_tmp47_); -#line 108 "/data/projects/seahorse/common/catalog.vala" +#line 108 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_properties_object); -#line 108 "/data/projects/seahorse/common/catalog.vala" +#line 108 "/data/src/seahorse/common/catalog.vala" self->priv->_properties_object = _tmp48_; -#line 109 "/data/projects/seahorse/common/catalog.vala" +#line 109 "/data/src/seahorse/common/catalog.vala" _tmp49_ = actions; -#line 109 "/data/projects/seahorse/common/catalog.vala" +#line 109 "/data/src/seahorse/common/catalog.vala" _tmp50_ = gtk_action_group_get_action (_tmp49_, "edit-export-clipboard"); -#line 109 "/data/projects/seahorse/common/catalog.vala" +#line 109 "/data/src/seahorse/common/catalog.vala" _tmp51_ = _g_object_ref0 (_tmp50_); -#line 109 "/data/projects/seahorse/common/catalog.vala" +#line 109 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_edit_copy); -#line 109 "/data/projects/seahorse/common/catalog.vala" +#line 109 "/data/src/seahorse/common/catalog.vala" self->priv->_edit_copy = _tmp51_; -#line 110 "/data/projects/seahorse/common/catalog.vala" +#line 110 "/data/src/seahorse/common/catalog.vala" _tmp52_ = actions; -#line 110 "/data/projects/seahorse/common/catalog.vala" +#line 110 "/data/src/seahorse/common/catalog.vala" _tmp53_ = gtk_action_group_get_action (_tmp52_, "file-export"); -#line 110 "/data/projects/seahorse/common/catalog.vala" +#line 110 "/data/src/seahorse/common/catalog.vala" _tmp54_ = _g_object_ref0 (_tmp53_); -#line 110 "/data/projects/seahorse/common/catalog.vala" +#line 110 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_file_export); -#line 110 "/data/projects/seahorse/common/catalog.vala" +#line 110 "/data/src/seahorse/common/catalog.vala" self->priv->_file_export = _tmp54_; -#line 111 "/data/projects/seahorse/common/catalog.vala" +#line 111 "/data/src/seahorse/common/catalog.vala" _tmp55_ = self->priv->_ui_manager; -#line 111 "/data/projects/seahorse/common/catalog.vala" +#line 111 "/data/src/seahorse/common/catalog.vala" _tmp56_ = actions; -#line 111 "/data/projects/seahorse/common/catalog.vala" +#line 111 "/data/src/seahorse/common/catalog.vala" gtk_ui_manager_insert_action_group (_tmp55_, _tmp56_, 0); -#line 113 "/data/projects/seahorse/common/catalog.vala" +#line 113 "/data/src/seahorse/common/catalog.vala" _tmp57_ = seahorse_application_get (); -#line 113 "/data/projects/seahorse/common/catalog.vala" +#line 113 "/data/src/seahorse/common/catalog.vala" gtk_application_add_window (_tmp57_, (GtkWindow*) self); -#line 51 "/data/projects/seahorse/common/catalog.vala" +#line 51 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (action); -#line 51 "/data/projects/seahorse/common/catalog.vala" +#line 51 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (actions); -#line 51 "/data/projects/seahorse/common/catalog.vala" +#line 51 "/data/src/seahorse/common/catalog.vala" _g_free0 (key); -#line 51 "/data/projects/seahorse/common/catalog.vala" +#line 51 "/data/src/seahorse/common/catalog.vala" return obj; #line 2018 "catalog.c" } static void seahorse_catalog_class_init (SeahorseCatalogClass * klass) { -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" seahorse_catalog_parent_class = g_type_class_peek_parent (klass); -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" g_type_class_add_private (klass, sizeof (SeahorseCatalogPrivate)); -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" SEAHORSE_CATALOG_CLASS (klass)->get_backends = seahorse_catalog_real_get_backends; -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" SEAHORSE_CATALOG_CLASS (klass)->get_focused_place = seahorse_catalog_real_get_focused_place; -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" SEAHORSE_CATALOG_CLASS (klass)->get_selected_objects = seahorse_catalog_real_get_selected_objects; -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" G_OBJECT_CLASS (klass)->dispose = seahorse_catalog_real_dispose; -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" SEAHORSE_CATALOG_CLASS (klass)->selection_changed = seahorse_catalog_real_selection_changed; -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" G_OBJECT_CLASS (klass)->get_property = _vala_seahorse_catalog_get_property; -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" G_OBJECT_CLASS (klass)->set_property = _vala_seahorse_catalog_set_property; -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" G_OBJECT_CLASS (klass)->constructor = seahorse_catalog_constructor; -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" G_OBJECT_CLASS (klass)->finalize = seahorse_catalog_finalize; -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_CATALOG_WINDOW, g_param_spec_object ("window", "window", "window", GTK_TYPE_WINDOW, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_CATALOG_UI_NAME, g_param_spec_string ("ui-name", "ui-name", "ui-name", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" g_signal_new ("selection_changed", SEAHORSE_TYPE_CATALOG, G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (SeahorseCatalogClass, selection_changed), NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); #line 2051 "catalog.c" } static void seahorse_catalog_instance_init (SeahorseCatalog * self) { -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" self->priv = SEAHORSE_CATALOG_GET_PRIVATE (self); #line 2058 "catalog.c" } @@ -2060,29 +2060,29 @@ static void seahorse_catalog_finalize (GObject* obj) { SeahorseCatalog * self; -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_TYPE_CATALOG, SeahorseCatalog); -#line 34 "/data/projects/seahorse/common/catalog.vala" +#line 34 "/data/src/seahorse/common/catalog.vala" _g_free0 (self->priv->_ui_name); -#line 36 "/data/projects/seahorse/common/catalog.vala" +#line 36 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_builder); -#line 37 "/data/projects/seahorse/common/catalog.vala" +#line 37 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_ui_manager); -#line 38 "/data/projects/seahorse/common/catalog.vala" +#line 38 "/data/src/seahorse/common/catalog.vala" _g_hash_table_unref0 (self->priv->_actions); -#line 39 "/data/projects/seahorse/common/catalog.vala" +#line 39 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_edit_delete); -#line 40 "/data/projects/seahorse/common/catalog.vala" +#line 40 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_properties_object); -#line 41 "/data/projects/seahorse/common/catalog.vala" +#line 41 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_file_export); -#line 42 "/data/projects/seahorse/common/catalog.vala" +#line 42 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_edit_copy); -#line 43 "/data/projects/seahorse/common/catalog.vala" +#line 43 "/data/src/seahorse/common/catalog.vala" __g_list_free__g_object_unref0_0 (self->priv->_selection_actions); -#line 45 "/data/projects/seahorse/common/catalog.vala" +#line 45 "/data/src/seahorse/common/catalog.vala" _g_object_unref0 (self->priv->_settings); -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" G_OBJECT_CLASS (seahorse_catalog_parent_class)->finalize (obj); #line 2088 "catalog.c" } @@ -2103,25 +2103,25 @@ static void _vala_seahorse_catalog_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { SeahorseCatalog * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEAHORSE_TYPE_CATALOG, SeahorseCatalog); -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" switch (property_id) { -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" case SEAHORSE_CATALOG_WINDOW: -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" g_value_set_object (value, seahorse_catalog_get_window (self)); -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" break; -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" case SEAHORSE_CATALOG_UI_NAME: -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" g_value_set_string (value, seahorse_catalog_get_ui_name (self)); -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" break; #line 2121 "catalog.c" default: -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" break; #line 2127 "catalog.c" } @@ -2131,19 +2131,19 @@ static void _vala_seahorse_catalog_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { SeahorseCatalog * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEAHORSE_TYPE_CATALOG, SeahorseCatalog); -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" switch (property_id) { -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" case SEAHORSE_CATALOG_UI_NAME: -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" seahorse_catalog_set_ui_name (self, g_value_get_string (value)); -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" break; #line 2143 "catalog.c" default: -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 25 "/data/projects/seahorse/common/catalog.vala" +#line 25 "/data/src/seahorse/common/catalog.vala" break; #line 2149 "catalog.c" } diff -Nru seahorse-3.10.1/common/common.vapi seahorse-3.10.2/common/common.vapi --- seahorse-3.10.1/common/common.vapi 2013-07-24 15:51:30.000000000 +0000 +++ seahorse-3.10.2/common/common.vapi 2014-01-08 15:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -/* common.vapi generated by valac 0.20.1.64-fa28c, do not modify. */ +/* common.vapi generated by valac 0.22.1, do not modify. */ namespace Seahorse { namespace Util { diff -Nru seahorse-3.10.1/common/deletable.c seahorse-3.10.2/common/deletable.c --- seahorse-3.10.1/common/deletable.c 2013-07-24 15:11:10.000000000 +0000 +++ seahorse-3.10.2/common/deletable.c 2014-01-08 15:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -/* deletable.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* deletable.c generated by valac 0.22.1, the Vala compiler * generated from deletable.vala, do not modify */ /* @@ -50,9 +50,9 @@ SeahorseDeleter* seahorse_deletable_create_deleter (SeahorseDeletable* self) { -#line 27 "/data/projects/seahorse/common/deletable.vala" +#line 27 "/data/src/seahorse/common/deletable.vala" g_return_val_if_fail (self != NULL, NULL); -#line 27 "/data/projects/seahorse/common/deletable.vala" +#line 27 "/data/src/seahorse/common/deletable.vala" return SEAHORSE_DELETABLE_GET_INTERFACE (self)->create_deleter (self); #line 58 "deletable.c" } @@ -61,40 +61,40 @@ gboolean seahorse_deletable_can_delete (GObject* obj) { gboolean result = FALSE; GObject* _tmp0_ = NULL; -#line 30 "/data/projects/seahorse/common/deletable.vala" +#line 30 "/data/src/seahorse/common/deletable.vala" g_return_val_if_fail (obj != NULL, FALSE); -#line 31 "/data/projects/seahorse/common/deletable.vala" +#line 31 "/data/src/seahorse/common/deletable.vala" _tmp0_ = obj; -#line 31 "/data/projects/seahorse/common/deletable.vala" +#line 31 "/data/src/seahorse/common/deletable.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SEAHORSE_TYPE_DELETABLE)) { #line 71 "deletable.c" GObject* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 32 "/data/projects/seahorse/common/deletable.vala" +#line 32 "/data/src/seahorse/common/deletable.vala" _tmp1_ = obj; -#line 32 "/data/projects/seahorse/common/deletable.vala" +#line 32 "/data/src/seahorse/common/deletable.vala" _tmp2_ = seahorse_deletable_get_deletable (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SEAHORSE_TYPE_DELETABLE, SeahorseDeletable)); -#line 32 "/data/projects/seahorse/common/deletable.vala" +#line 32 "/data/src/seahorse/common/deletable.vala" _tmp3_ = _tmp2_; -#line 32 "/data/projects/seahorse/common/deletable.vala" +#line 32 "/data/src/seahorse/common/deletable.vala" result = _tmp3_; -#line 32 "/data/projects/seahorse/common/deletable.vala" +#line 32 "/data/src/seahorse/common/deletable.vala" return result; #line 85 "deletable.c" } -#line 33 "/data/projects/seahorse/common/deletable.vala" +#line 33 "/data/src/seahorse/common/deletable.vala" result = FALSE; -#line 33 "/data/projects/seahorse/common/deletable.vala" +#line 33 "/data/src/seahorse/common/deletable.vala" return result; #line 91 "deletable.c" } static Block2Data* block2_data_ref (Block2Data* _data2_) { -#line 36 "/data/projects/seahorse/common/deletable.vala" +#line 36 "/data/src/seahorse/common/deletable.vala" g_atomic_int_inc (&_data2_->_ref_count_); -#line 36 "/data/projects/seahorse/common/deletable.vala" +#line 36 "/data/src/seahorse/common/deletable.vala" return _data2_; #line 100 "deletable.c" } @@ -103,13 +103,13 @@ static void block2_data_unref (void * _userdata_) { Block2Data* _data2_; _data2_ = (Block2Data*) _userdata_; -#line 36 "/data/projects/seahorse/common/deletable.vala" +#line 36 "/data/src/seahorse/common/deletable.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { -#line 36 "/data/projects/seahorse/common/deletable.vala" +#line 36 "/data/src/seahorse/common/deletable.vala" _g_object_unref0 (_data2_->_result_); -#line 36 "/data/projects/seahorse/common/deletable.vala" +#line 36 "/data/src/seahorse/common/deletable.vala" _g_main_loop_unref0 (_data2_->loop); -#line 36 "/data/projects/seahorse/common/deletable.vala" +#line 36 "/data/src/seahorse/common/deletable.vala" g_slice_free (Block2Data, _data2_); #line 115 "deletable.c" } @@ -117,7 +117,7 @@ static gpointer _g_object_ref0 (gpointer self) { -#line 45 "/data/projects/seahorse/common/deletable.vala" +#line 45 "/data/src/seahorse/common/deletable.vala" return self ? g_object_ref (self) : NULL; #line 123 "deletable.c" } @@ -127,28 +127,28 @@ GAsyncResult* _tmp0_ = NULL; GAsyncResult* _tmp1_ = NULL; GMainLoop* _tmp2_ = NULL; -#line 72 "/data/projects/seahorse/common/deletable.vala" +#line 72 "/data/src/seahorse/common/deletable.vala" g_return_if_fail (res != NULL); -#line 73 "/data/projects/seahorse/common/deletable.vala" +#line 73 "/data/src/seahorse/common/deletable.vala" _tmp0_ = res; -#line 73 "/data/projects/seahorse/common/deletable.vala" +#line 73 "/data/src/seahorse/common/deletable.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 73 "/data/projects/seahorse/common/deletable.vala" +#line 73 "/data/src/seahorse/common/deletable.vala" _g_object_unref0 (_data2_->_result_); -#line 73 "/data/projects/seahorse/common/deletable.vala" +#line 73 "/data/src/seahorse/common/deletable.vala" _data2_->_result_ = _tmp1_; -#line 74 "/data/projects/seahorse/common/deletable.vala" +#line 74 "/data/src/seahorse/common/deletable.vala" _tmp2_ = _data2_->loop; -#line 74 "/data/projects/seahorse/common/deletable.vala" +#line 74 "/data/src/seahorse/common/deletable.vala" g_main_loop_quit (_tmp2_); #line 145 "deletable.c" } static void _____lambda6__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 72 "/data/projects/seahorse/common/deletable.vala" +#line 72 "/data/src/seahorse/common/deletable.vala" ____lambda6_ (self, source_object, res); -#line 72 "/data/projects/seahorse/common/deletable.vala" +#line 72 "/data/src/seahorse/common/deletable.vala" block2_data_unref (self); #line 154 "deletable.c" } @@ -166,75 +166,75 @@ GList* _tmp4_ = NULL; GList* _tmp8_ = NULL; GError * _inner_error_ = NULL; -#line 36 "/data/projects/seahorse/common/deletable.vala" +#line 36 "/data/src/seahorse/common/deletable.vala" _data2_ = g_slice_new0 (Block2Data); -#line 36 "/data/projects/seahorse/common/deletable.vala" +#line 36 "/data/src/seahorse/common/deletable.vala" _data2_->_ref_count_ = 1; -#line 39 "/data/projects/seahorse/common/deletable.vala" +#line 39 "/data/src/seahorse/common/deletable.vala" _tmp0_ = g_main_loop_new (NULL, FALSE); -#line 39 "/data/projects/seahorse/common/deletable.vala" +#line 39 "/data/src/seahorse/common/deletable.vala" _data2_->loop = _tmp0_; -#line 40 "/data/projects/seahorse/common/deletable.vala" +#line 40 "/data/src/seahorse/common/deletable.vala" _data2_->_result_ = NULL; -#line 41 "/data/projects/seahorse/common/deletable.vala" +#line 41 "/data/src/seahorse/common/deletable.vala" count = 0; -#line 44 "/data/projects/seahorse/common/deletable.vala" +#line 44 "/data/src/seahorse/common/deletable.vala" _tmp1_ = g_direct_hash; -#line 44 "/data/projects/seahorse/common/deletable.vala" +#line 44 "/data/src/seahorse/common/deletable.vala" _tmp2_ = g_direct_equal; -#line 44 "/data/projects/seahorse/common/deletable.vala" +#line 44 "/data/src/seahorse/common/deletable.vala" _tmp3_ = g_hash_table_new_full (_tmp1_, _tmp2_, NULL, NULL); -#line 44 "/data/projects/seahorse/common/deletable.vala" +#line 44 "/data/src/seahorse/common/deletable.vala" pending = _tmp3_; -#line 45 "/data/projects/seahorse/common/deletable.vala" +#line 45 "/data/src/seahorse/common/deletable.vala" _tmp4_ = objects; #line 192 "deletable.c" { GList* obj_collection = NULL; GList* obj_it = NULL; -#line 45 "/data/projects/seahorse/common/deletable.vala" +#line 45 "/data/src/seahorse/common/deletable.vala" obj_collection = _tmp4_; -#line 45 "/data/projects/seahorse/common/deletable.vala" +#line 45 "/data/src/seahorse/common/deletable.vala" for (obj_it = obj_collection; obj_it != NULL; obj_it = obj_it->next) { #line 200 "deletable.c" GObject* _tmp5_ = NULL; GObject* obj = NULL; -#line 45 "/data/projects/seahorse/common/deletable.vala" +#line 45 "/data/src/seahorse/common/deletable.vala" _tmp5_ = _g_object_ref0 ((GObject*) obj_it->data); -#line 45 "/data/projects/seahorse/common/deletable.vala" +#line 45 "/data/src/seahorse/common/deletable.vala" obj = _tmp5_; #line 207 "deletable.c" { GHashTable* _tmp6_ = NULL; GObject* _tmp7_ = NULL; -#line 46 "/data/projects/seahorse/common/deletable.vala" +#line 46 "/data/src/seahorse/common/deletable.vala" _tmp6_ = pending; -#line 46 "/data/projects/seahorse/common/deletable.vala" +#line 46 "/data/src/seahorse/common/deletable.vala" _tmp7_ = obj; -#line 46 "/data/projects/seahorse/common/deletable.vala" +#line 46 "/data/src/seahorse/common/deletable.vala" g_hash_table_add (_tmp6_, _tmp7_); -#line 45 "/data/projects/seahorse/common/deletable.vala" +#line 45 "/data/src/seahorse/common/deletable.vala" _g_object_unref0 (obj); #line 219 "deletable.c" } } } -#line 48 "/data/projects/seahorse/common/deletable.vala" +#line 48 "/data/src/seahorse/common/deletable.vala" _tmp8_ = objects; #line 225 "deletable.c" { GList* obj_collection = NULL; GList* obj_it = NULL; -#line 48 "/data/projects/seahorse/common/deletable.vala" +#line 48 "/data/src/seahorse/common/deletable.vala" obj_collection = _tmp8_; -#line 48 "/data/projects/seahorse/common/deletable.vala" +#line 48 "/data/src/seahorse/common/deletable.vala" for (obj_it = obj_collection; obj_it != NULL; obj_it = obj_it->next) { #line 233 "deletable.c" GObject* _tmp9_ = NULL; GObject* obj = NULL; -#line 48 "/data/projects/seahorse/common/deletable.vala" +#line 48 "/data/src/seahorse/common/deletable.vala" _tmp9_ = _g_object_ref0 ((GObject*) obj_it->data); -#line 48 "/data/projects/seahorse/common/deletable.vala" +#line 48 "/data/src/seahorse/common/deletable.vala" obj = _tmp9_; #line 240 "deletable.c" { @@ -258,63 +258,63 @@ SeahorseDeleter* _tmp35_ = NULL; GAsyncResult* _tmp36_ = NULL; gboolean _tmp37_ = FALSE; -#line 49 "/data/projects/seahorse/common/deletable.vala" +#line 49 "/data/src/seahorse/common/deletable.vala" _tmp10_ = pending; -#line 49 "/data/projects/seahorse/common/deletable.vala" +#line 49 "/data/src/seahorse/common/deletable.vala" _tmp11_ = obj; -#line 49 "/data/projects/seahorse/common/deletable.vala" +#line 49 "/data/src/seahorse/common/deletable.vala" _tmp12_ = g_hash_table_lookup (_tmp10_, _tmp11_); -#line 49 "/data/projects/seahorse/common/deletable.vala" +#line 49 "/data/src/seahorse/common/deletable.vala" if (((GObject*) _tmp12_) == NULL) { -#line 50 "/data/projects/seahorse/common/deletable.vala" +#line 50 "/data/src/seahorse/common/deletable.vala" _g_object_unref0 (obj); -#line 50 "/data/projects/seahorse/common/deletable.vala" +#line 50 "/data/src/seahorse/common/deletable.vala" continue; #line 274 "deletable.c" } -#line 52 "/data/projects/seahorse/common/deletable.vala" +#line 52 "/data/src/seahorse/common/deletable.vala" _tmp13_ = obj; -#line 52 "/data/projects/seahorse/common/deletable.vala" +#line 52 "/data/src/seahorse/common/deletable.vala" _tmp14_ = seahorse_deletable_can_delete (_tmp13_); -#line 52 "/data/projects/seahorse/common/deletable.vala" +#line 52 "/data/src/seahorse/common/deletable.vala" if (!_tmp14_) { #line 282 "deletable.c" GHashTable* _tmp15_ = NULL; GObject* _tmp16_ = NULL; -#line 53 "/data/projects/seahorse/common/deletable.vala" +#line 53 "/data/src/seahorse/common/deletable.vala" _tmp15_ = pending; -#line 53 "/data/projects/seahorse/common/deletable.vala" +#line 53 "/data/src/seahorse/common/deletable.vala" _tmp16_ = obj; -#line 53 "/data/projects/seahorse/common/deletable.vala" +#line 53 "/data/src/seahorse/common/deletable.vala" g_hash_table_remove (_tmp15_, _tmp16_); -#line 54 "/data/projects/seahorse/common/deletable.vala" +#line 54 "/data/src/seahorse/common/deletable.vala" _g_object_unref0 (obj); -#line 54 "/data/projects/seahorse/common/deletable.vala" +#line 54 "/data/src/seahorse/common/deletable.vala" continue; #line 295 "deletable.c" } -#line 57 "/data/projects/seahorse/common/deletable.vala" +#line 57 "/data/src/seahorse/common/deletable.vala" _tmp17_ = obj; -#line 57 "/data/projects/seahorse/common/deletable.vala" +#line 57 "/data/src/seahorse/common/deletable.vala" _tmp18_ = seahorse_deletable_create_deleter (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, SEAHORSE_TYPE_DELETABLE, SeahorseDeletable)); -#line 57 "/data/projects/seahorse/common/deletable.vala" +#line 57 "/data/src/seahorse/common/deletable.vala" deleter = _tmp18_; -#line 60 "/data/projects/seahorse/common/deletable.vala" +#line 60 "/data/src/seahorse/common/deletable.vala" _tmp19_ = objects; #line 305 "deletable.c" { GList* x_collection = NULL; GList* x_it = NULL; -#line 60 "/data/projects/seahorse/common/deletable.vala" +#line 60 "/data/src/seahorse/common/deletable.vala" x_collection = _tmp19_; -#line 60 "/data/projects/seahorse/common/deletable.vala" +#line 60 "/data/src/seahorse/common/deletable.vala" for (x_it = x_collection; x_it != NULL; x_it = x_it->next) { #line 313 "deletable.c" GObject* _tmp20_ = NULL; GObject* x = NULL; -#line 60 "/data/projects/seahorse/common/deletable.vala" +#line 60 "/data/src/seahorse/common/deletable.vala" _tmp20_ = _g_object_ref0 ((GObject*) x_it->data); -#line 60 "/data/projects/seahorse/common/deletable.vala" +#line 60 "/data/src/seahorse/common/deletable.vala" x = _tmp20_; #line 320 "deletable.c" { @@ -323,185 +323,185 @@ GHashTable* _tmp23_ = NULL; GObject* _tmp24_ = NULL; gconstpointer _tmp25_ = NULL; -#line 61 "/data/projects/seahorse/common/deletable.vala" +#line 61 "/data/src/seahorse/common/deletable.vala" _tmp21_ = x; -#line 61 "/data/projects/seahorse/common/deletable.vala" +#line 61 "/data/src/seahorse/common/deletable.vala" _tmp22_ = obj; -#line 61 "/data/projects/seahorse/common/deletable.vala" +#line 61 "/data/src/seahorse/common/deletable.vala" if (_tmp21_ == _tmp22_) { -#line 62 "/data/projects/seahorse/common/deletable.vala" +#line 62 "/data/src/seahorse/common/deletable.vala" _g_object_unref0 (x); -#line 62 "/data/projects/seahorse/common/deletable.vala" +#line 62 "/data/src/seahorse/common/deletable.vala" continue; #line 337 "deletable.c" } -#line 63 "/data/projects/seahorse/common/deletable.vala" +#line 63 "/data/src/seahorse/common/deletable.vala" _tmp23_ = pending; -#line 63 "/data/projects/seahorse/common/deletable.vala" +#line 63 "/data/src/seahorse/common/deletable.vala" _tmp24_ = x; -#line 63 "/data/projects/seahorse/common/deletable.vala" +#line 63 "/data/src/seahorse/common/deletable.vala" _tmp25_ = g_hash_table_lookup (_tmp23_, _tmp24_); -#line 63 "/data/projects/seahorse/common/deletable.vala" +#line 63 "/data/src/seahorse/common/deletable.vala" if (((GObject*) _tmp25_) != NULL) { #line 347 "deletable.c" SeahorseDeleter* _tmp26_ = NULL; GObject* _tmp27_ = NULL; -#line 64 "/data/projects/seahorse/common/deletable.vala" +#line 64 "/data/src/seahorse/common/deletable.vala" _tmp26_ = deleter; -#line 64 "/data/projects/seahorse/common/deletable.vala" +#line 64 "/data/src/seahorse/common/deletable.vala" _tmp27_ = x; -#line 64 "/data/projects/seahorse/common/deletable.vala" +#line 64 "/data/src/seahorse/common/deletable.vala" seahorse_deleter_add_object (_tmp26_, _tmp27_); #line 356 "deletable.c" } -#line 60 "/data/projects/seahorse/common/deletable.vala" +#line 60 "/data/src/seahorse/common/deletable.vala" _g_object_unref0 (x); #line 360 "deletable.c" } } } -#line 68 "/data/projects/seahorse/common/deletable.vala" +#line 68 "/data/src/seahorse/common/deletable.vala" _tmp28_ = deleter; -#line 68 "/data/projects/seahorse/common/deletable.vala" +#line 68 "/data/src/seahorse/common/deletable.vala" _tmp29_ = parent; -#line 68 "/data/projects/seahorse/common/deletable.vala" +#line 68 "/data/src/seahorse/common/deletable.vala" _tmp30_ = seahorse_deleter_prompt (_tmp28_, _tmp29_); -#line 68 "/data/projects/seahorse/common/deletable.vala" +#line 68 "/data/src/seahorse/common/deletable.vala" ret = _tmp30_; -#line 69 "/data/projects/seahorse/common/deletable.vala" +#line 69 "/data/src/seahorse/common/deletable.vala" _tmp31_ = ret; -#line 69 "/data/projects/seahorse/common/deletable.vala" +#line 69 "/data/src/seahorse/common/deletable.vala" if (!_tmp31_) { -#line 70 "/data/projects/seahorse/common/deletable.vala" +#line 70 "/data/src/seahorse/common/deletable.vala" _g_object_unref0 (deleter); -#line 70 "/data/projects/seahorse/common/deletable.vala" +#line 70 "/data/src/seahorse/common/deletable.vala" _g_object_unref0 (obj); -#line 70 "/data/projects/seahorse/common/deletable.vala" +#line 70 "/data/src/seahorse/common/deletable.vala" break; #line 382 "deletable.c" } -#line 72 "/data/projects/seahorse/common/deletable.vala" +#line 72 "/data/src/seahorse/common/deletable.vala" _tmp32_ = deleter; -#line 72 "/data/projects/seahorse/common/deletable.vala" +#line 72 "/data/src/seahorse/common/deletable.vala" seahorse_deleter_delete (_tmp32_, NULL, _____lambda6__gasync_ready_callback, block2_data_ref (_data2_)); -#line 77 "/data/projects/seahorse/common/deletable.vala" +#line 77 "/data/src/seahorse/common/deletable.vala" _tmp33_ = _data2_->loop; -#line 77 "/data/projects/seahorse/common/deletable.vala" +#line 77 "/data/src/seahorse/common/deletable.vala" g_main_loop_run (_tmp33_); -#line 79 "/data/projects/seahorse/common/deletable.vala" +#line 79 "/data/src/seahorse/common/deletable.vala" _tmp35_ = deleter; -#line 79 "/data/projects/seahorse/common/deletable.vala" +#line 79 "/data/src/seahorse/common/deletable.vala" _tmp36_ = _data2_->_result_; -#line 79 "/data/projects/seahorse/common/deletable.vala" +#line 79 "/data/src/seahorse/common/deletable.vala" _tmp37_ = seahorse_deleter_delete_finish (_tmp35_, _tmp36_, &_inner_error_); -#line 79 "/data/projects/seahorse/common/deletable.vala" +#line 79 "/data/src/seahorse/common/deletable.vala" _tmp34_ = _tmp37_; -#line 79 "/data/projects/seahorse/common/deletable.vala" +#line 79 "/data/src/seahorse/common/deletable.vala" if (_inner_error_ != NULL) { -#line 79 "/data/projects/seahorse/common/deletable.vala" +#line 79 "/data/src/seahorse/common/deletable.vala" g_propagate_error (error, _inner_error_); -#line 79 "/data/projects/seahorse/common/deletable.vala" +#line 79 "/data/src/seahorse/common/deletable.vala" _g_object_unref0 (deleter); -#line 79 "/data/projects/seahorse/common/deletable.vala" +#line 79 "/data/src/seahorse/common/deletable.vala" _g_object_unref0 (obj); -#line 79 "/data/projects/seahorse/common/deletable.vala" +#line 79 "/data/src/seahorse/common/deletable.vala" _g_hash_table_unref0 (pending); -#line 79 "/data/projects/seahorse/common/deletable.vala" +#line 79 "/data/src/seahorse/common/deletable.vala" block2_data_unref (_data2_); -#line 79 "/data/projects/seahorse/common/deletable.vala" +#line 79 "/data/src/seahorse/common/deletable.vala" _data2_ = NULL; -#line 79 "/data/projects/seahorse/common/deletable.vala" +#line 79 "/data/src/seahorse/common/deletable.vala" return 0; #line 416 "deletable.c" } -#line 79 "/data/projects/seahorse/common/deletable.vala" +#line 79 "/data/src/seahorse/common/deletable.vala" if (_tmp34_) { #line 420 "deletable.c" SeahorseDeleter* _tmp38_ = NULL; GList* _tmp39_ = NULL; -#line 80 "/data/projects/seahorse/common/deletable.vala" +#line 80 "/data/src/seahorse/common/deletable.vala" _tmp38_ = deleter; -#line 80 "/data/projects/seahorse/common/deletable.vala" +#line 80 "/data/src/seahorse/common/deletable.vala" _tmp39_ = seahorse_deleter_get_objects (_tmp38_); #line 427 "deletable.c" { GList* x_collection = NULL; GList* x_it = NULL; -#line 80 "/data/projects/seahorse/common/deletable.vala" +#line 80 "/data/src/seahorse/common/deletable.vala" x_collection = _tmp39_; -#line 80 "/data/projects/seahorse/common/deletable.vala" +#line 80 "/data/src/seahorse/common/deletable.vala" for (x_it = x_collection; x_it != NULL; x_it = x_it->next) { #line 435 "deletable.c" GObject* x = NULL; -#line 80 "/data/projects/seahorse/common/deletable.vala" +#line 80 "/data/src/seahorse/common/deletable.vala" x = (GObject*) x_it->data; #line 439 "deletable.c" { GHashTable* _tmp40_ = NULL; GObject* _tmp41_ = NULL; gint _tmp42_ = 0; -#line 81 "/data/projects/seahorse/common/deletable.vala" +#line 81 "/data/src/seahorse/common/deletable.vala" _tmp40_ = pending; -#line 81 "/data/projects/seahorse/common/deletable.vala" +#line 81 "/data/src/seahorse/common/deletable.vala" _tmp41_ = x; -#line 81 "/data/projects/seahorse/common/deletable.vala" +#line 81 "/data/src/seahorse/common/deletable.vala" g_hash_table_remove (_tmp40_, _tmp41_); -#line 82 "/data/projects/seahorse/common/deletable.vala" +#line 82 "/data/src/seahorse/common/deletable.vala" _tmp42_ = count; -#line 82 "/data/projects/seahorse/common/deletable.vala" +#line 82 "/data/src/seahorse/common/deletable.vala" count = _tmp42_ + 1; #line 454 "deletable.c" } } } } else { -#line 85 "/data/projects/seahorse/common/deletable.vala" +#line 85 "/data/src/seahorse/common/deletable.vala" _g_object_unref0 (deleter); -#line 85 "/data/projects/seahorse/common/deletable.vala" +#line 85 "/data/src/seahorse/common/deletable.vala" _g_object_unref0 (obj); -#line 85 "/data/projects/seahorse/common/deletable.vala" +#line 85 "/data/src/seahorse/common/deletable.vala" break; #line 465 "deletable.c" } -#line 48 "/data/projects/seahorse/common/deletable.vala" +#line 48 "/data/src/seahorse/common/deletable.vala" _g_object_unref0 (deleter); -#line 48 "/data/projects/seahorse/common/deletable.vala" +#line 48 "/data/src/seahorse/common/deletable.vala" _g_object_unref0 (obj); #line 471 "deletable.c" } } } -#line 89 "/data/projects/seahorse/common/deletable.vala" +#line 89 "/data/src/seahorse/common/deletable.vala" result = count; -#line 89 "/data/projects/seahorse/common/deletable.vala" +#line 89 "/data/src/seahorse/common/deletable.vala" _g_hash_table_unref0 (pending); -#line 89 "/data/projects/seahorse/common/deletable.vala" +#line 89 "/data/src/seahorse/common/deletable.vala" block2_data_unref (_data2_); -#line 89 "/data/projects/seahorse/common/deletable.vala" +#line 89 "/data/src/seahorse/common/deletable.vala" _data2_ = NULL; -#line 89 "/data/projects/seahorse/common/deletable.vala" +#line 89 "/data/src/seahorse/common/deletable.vala" return result; #line 485 "deletable.c" } gboolean seahorse_deletable_get_deletable (SeahorseDeletable* self) { -#line 28 "/data/projects/seahorse/common/deletable.vala" +#line 28 "/data/src/seahorse/common/deletable.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 28 "/data/projects/seahorse/common/deletable.vala" +#line 28 "/data/src/seahorse/common/deletable.vala" return SEAHORSE_DELETABLE_GET_INTERFACE (self)->get_deletable (self); #line 494 "deletable.c" } static void seahorse_deletable_base_init (SeahorseDeletableIface * iface) { -#line 26 "/data/projects/seahorse/common/deletable.vala" +#line 26 "/data/src/seahorse/common/deletable.vala" static gboolean initialized = FALSE; -#line 26 "/data/projects/seahorse/common/deletable.vala" +#line 26 "/data/src/seahorse/common/deletable.vala" if (!initialized) { -#line 26 "/data/projects/seahorse/common/deletable.vala" +#line 26 "/data/src/seahorse/common/deletable.vala" initialized = TRUE; -#line 26 "/data/projects/seahorse/common/deletable.vala" +#line 26 "/data/src/seahorse/common/deletable.vala" g_object_interface_install_property (iface, g_param_spec_boolean ("deletable", "deletable", "deletable", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 507 "deletable.c" } diff -Nru seahorse-3.10.1/common/delete-dialog.c seahorse-3.10.2/common/delete-dialog.c --- seahorse-3.10.1/common/delete-dialog.c 2013-07-24 15:11:10.000000000 +0000 +++ seahorse-3.10.2/common/delete-dialog.c 2014-01-08 15:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -/* delete-dialog.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* delete-dialog.c generated by valac 0.22.1, the Vala compiler * generated from delete-dialog.vala, do not modify */ /* @@ -59,32 +59,32 @@ static void _vala_seahorse_delete_dialog_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec); -static GtkDialog* seahorse_delete_dialog_constructv (GType object_type, GtkWindow* parent, const gchar* format, va_list _vala_va_list) { +GtkDialog* seahorse_delete_dialog_constructv (GType object_type, GtkWindow* parent, const gchar* format, va_list _vala_va_list) { SeahorseDeleteDialog * self = NULL; GtkWindow* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; va_list _tmp2_ = {0}; gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; -#line 72 "/data/projects/seahorse/common/delete-dialog.vala" +#line 72 "/data/src/seahorse/common/delete-dialog.vala" g_return_val_if_fail (format != NULL, NULL); -#line 75 "/data/projects/seahorse/common/delete-dialog.vala" +#line 75 "/data/src/seahorse/common/delete-dialog.vala" _tmp0_ = parent; -#line 75 "/data/projects/seahorse/common/delete-dialog.vala" +#line 75 "/data/src/seahorse/common/delete-dialog.vala" _tmp1_ = format; -#line 75 "/data/projects/seahorse/common/delete-dialog.vala" +#line 75 "/data/src/seahorse/common/delete-dialog.vala" va_copy (_tmp2_, _vala_va_list); -#line 75 "/data/projects/seahorse/common/delete-dialog.vala" +#line 75 "/data/src/seahorse/common/delete-dialog.vala" _tmp3_ = g_strdup_vprintf (_tmp1_, _tmp2_); -#line 75 "/data/projects/seahorse/common/delete-dialog.vala" +#line 75 "/data/src/seahorse/common/delete-dialog.vala" _tmp4_ = _tmp3_; -#line 75 "/data/projects/seahorse/common/delete-dialog.vala" +#line 75 "/data/src/seahorse/common/delete-dialog.vala" self = (SeahorseDeleteDialog*) g_object_new (object_type, "message-type", GTK_MESSAGE_QUESTION, "transient-for", _tmp0_, "text", _tmp4_, NULL); -#line 75 "/data/projects/seahorse/common/delete-dialog.vala" +#line 75 "/data/src/seahorse/common/delete-dialog.vala" _g_free0 (_tmp4_); -#line 75 "/data/projects/seahorse/common/delete-dialog.vala" +#line 75 "/data/src/seahorse/common/delete-dialog.vala" va_end (_tmp2_); -#line 72 "/data/projects/seahorse/common/delete-dialog.vala" +#line 72 "/data/src/seahorse/common/delete-dialog.vala" return (GtkDialog*) self; #line 90 "delete-dialog.c" } @@ -92,9 +92,9 @@ GtkDialog* seahorse_delete_dialog_new (GtkWindow* parent, const gchar* format, ...) { va_list _vala_va_list_obj; -#line 72 "/data/projects/seahorse/common/delete-dialog.vala" +#line 72 "/data/src/seahorse/common/delete-dialog.vala" va_start (_vala_va_list_obj, format); -#line 72 "/data/projects/seahorse/common/delete-dialog.vala" +#line 72 "/data/src/seahorse/common/delete-dialog.vala" return seahorse_delete_dialog_constructv (SEAHORSE_TYPE_DELETE_DIALOG, parent, format, _vala_va_list_obj); #line 100 "delete-dialog.c" } @@ -102,9 +102,9 @@ GtkDialog* seahorse_delete_dialog_construct (GType object_type, GtkWindow* parent, const gchar* format, ...) { va_list _vala_va_list_obj; -#line 72 "/data/projects/seahorse/common/delete-dialog.vala" +#line 72 "/data/src/seahorse/common/delete-dialog.vala" va_start (_vala_va_list_obj, format); -#line 72 "/data/projects/seahorse/common/delete-dialog.vala" +#line 72 "/data/src/seahorse/common/delete-dialog.vala" return seahorse_delete_dialog_constructv (object_type, parent, format, _vala_va_list_obj); #line 110 "delete-dialog.c" } @@ -114,29 +114,29 @@ gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; gboolean _tmp4_ = FALSE; -#line 101 "/data/projects/seahorse/common/delete-dialog.vala" +#line 101 "/data/src/seahorse/common/delete-dialog.vala" g_return_if_fail (self != NULL); -#line 103 "/data/projects/seahorse/common/delete-dialog.vala" +#line 103 "/data/src/seahorse/common/delete-dialog.vala" _tmp1_ = self->priv->_check_require; -#line 103 "/data/projects/seahorse/common/delete-dialog.vala" +#line 103 "/data/src/seahorse/common/delete-dialog.vala" if (!_tmp1_) { -#line 103 "/data/projects/seahorse/common/delete-dialog.vala" +#line 103 "/data/src/seahorse/common/delete-dialog.vala" _tmp0_ = TRUE; #line 126 "delete-dialog.c" } else { GtkToggleButton* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 103 "/data/projects/seahorse/common/delete-dialog.vala" +#line 103 "/data/src/seahorse/common/delete-dialog.vala" _tmp2_ = self->priv->_check; -#line 103 "/data/projects/seahorse/common/delete-dialog.vala" +#line 103 "/data/src/seahorse/common/delete-dialog.vala" _tmp3_ = gtk_toggle_button_get_active (_tmp2_); -#line 103 "/data/projects/seahorse/common/delete-dialog.vala" +#line 103 "/data/src/seahorse/common/delete-dialog.vala" _tmp0_ = _tmp3_; #line 136 "delete-dialog.c" } -#line 102 "/data/projects/seahorse/common/delete-dialog.vala" +#line 102 "/data/src/seahorse/common/delete-dialog.vala" _tmp4_ = _tmp0_; -#line 102 "/data/projects/seahorse/common/delete-dialog.vala" +#line 102 "/data/src/seahorse/common/delete-dialog.vala" gtk_dialog_set_response_sensitive ((GtkDialog*) self, (gint) GTK_RESPONSE_OK, _tmp4_); #line 142 "delete-dialog.c" } @@ -150,29 +150,29 @@ SeahorseDeleteDialog* _tmp2_ = NULL; gint response = 0; gint _tmp3_ = 0; -#line 106 "/data/projects/seahorse/common/delete-dialog.vala" +#line 106 "/data/src/seahorse/common/delete-dialog.vala" g_return_val_if_fail (text != NULL, FALSE); -#line 107 "/data/projects/seahorse/common/delete-dialog.vala" +#line 107 "/data/src/seahorse/common/delete-dialog.vala" _tmp0_ = parent; -#line 107 "/data/projects/seahorse/common/delete-dialog.vala" +#line 107 "/data/src/seahorse/common/delete-dialog.vala" _tmp1_ = text; -#line 107 "/data/projects/seahorse/common/delete-dialog.vala" +#line 107 "/data/src/seahorse/common/delete-dialog.vala" _tmp2_ = (SeahorseDeleteDialog*) seahorse_delete_dialog_new (_tmp0_, "%s", _tmp1_, NULL); -#line 107 "/data/projects/seahorse/common/delete-dialog.vala" +#line 107 "/data/src/seahorse/common/delete-dialog.vala" g_object_ref_sink (_tmp2_); -#line 107 "/data/projects/seahorse/common/delete-dialog.vala" +#line 107 "/data/src/seahorse/common/delete-dialog.vala" dialog = (GtkDialog*) _tmp2_; -#line 108 "/data/projects/seahorse/common/delete-dialog.vala" +#line 108 "/data/src/seahorse/common/delete-dialog.vala" _tmp3_ = gtk_dialog_run (dialog); -#line 108 "/data/projects/seahorse/common/delete-dialog.vala" +#line 108 "/data/src/seahorse/common/delete-dialog.vala" response = _tmp3_; -#line 109 "/data/projects/seahorse/common/delete-dialog.vala" +#line 109 "/data/src/seahorse/common/delete-dialog.vala" gtk_widget_destroy ((GtkWidget*) dialog); -#line 110 "/data/projects/seahorse/common/delete-dialog.vala" +#line 110 "/data/src/seahorse/common/delete-dialog.vala" result = response == ((gint) GTK_RESPONSE_OK); -#line 110 "/data/projects/seahorse/common/delete-dialog.vala" +#line 110 "/data/src/seahorse/common/delete-dialog.vala" _g_object_unref0 (dialog); -#line 110 "/data/projects/seahorse/common/delete-dialog.vala" +#line 110 "/data/src/seahorse/common/delete-dialog.vala" return result; #line 178 "delete-dialog.c" } @@ -182,30 +182,30 @@ const gchar* result; GtkToggleButton* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 32 "/data/projects/seahorse/common/delete-dialog.vala" +#line 32 "/data/src/seahorse/common/delete-dialog.vala" g_return_val_if_fail (self != NULL, NULL); -#line 33 "/data/projects/seahorse/common/delete-dialog.vala" +#line 33 "/data/src/seahorse/common/delete-dialog.vala" _tmp0_ = self->priv->_check; -#line 33 "/data/projects/seahorse/common/delete-dialog.vala" +#line 33 "/data/src/seahorse/common/delete-dialog.vala" _tmp1_ = gtk_widget_get_visible ((GtkWidget*) _tmp0_); -#line 33 "/data/projects/seahorse/common/delete-dialog.vala" +#line 33 "/data/src/seahorse/common/delete-dialog.vala" if (_tmp1_) { #line 194 "delete-dialog.c" GtkToggleButton* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; -#line 34 "/data/projects/seahorse/common/delete-dialog.vala" +#line 34 "/data/src/seahorse/common/delete-dialog.vala" _tmp2_ = self->priv->_check; -#line 34 "/data/projects/seahorse/common/delete-dialog.vala" +#line 34 "/data/src/seahorse/common/delete-dialog.vala" _tmp3_ = gtk_button_get_label ((GtkButton*) _tmp2_); -#line 34 "/data/projects/seahorse/common/delete-dialog.vala" +#line 34 "/data/src/seahorse/common/delete-dialog.vala" result = _tmp3_; -#line 34 "/data/projects/seahorse/common/delete-dialog.vala" +#line 34 "/data/src/seahorse/common/delete-dialog.vala" return result; #line 205 "delete-dialog.c" } -#line 35 "/data/projects/seahorse/common/delete-dialog.vala" +#line 35 "/data/src/seahorse/common/delete-dialog.vala" result = NULL; -#line 35 "/data/projects/seahorse/common/delete-dialog.vala" +#line 35 "/data/src/seahorse/common/delete-dialog.vala" return result; #line 211 "delete-dialog.c" } @@ -215,36 +215,36 @@ const gchar* _tmp0_ = NULL; GtkToggleButton* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; -#line 37 "/data/projects/seahorse/common/delete-dialog.vala" +#line 37 "/data/src/seahorse/common/delete-dialog.vala" g_return_if_fail (self != NULL); -#line 38 "/data/projects/seahorse/common/delete-dialog.vala" +#line 38 "/data/src/seahorse/common/delete-dialog.vala" _tmp0_ = value; -#line 38 "/data/projects/seahorse/common/delete-dialog.vala" +#line 38 "/data/src/seahorse/common/delete-dialog.vala" if (_tmp0_ == NULL) { #line 225 "delete-dialog.c" GtkToggleButton* _tmp1_ = NULL; -#line 39 "/data/projects/seahorse/common/delete-dialog.vala" +#line 39 "/data/src/seahorse/common/delete-dialog.vala" _tmp1_ = self->priv->_check; -#line 39 "/data/projects/seahorse/common/delete-dialog.vala" +#line 39 "/data/src/seahorse/common/delete-dialog.vala" gtk_widget_hide ((GtkWidget*) _tmp1_); -#line 40 "/data/projects/seahorse/common/delete-dialog.vala" +#line 40 "/data/src/seahorse/common/delete-dialog.vala" value = ""; #line 233 "delete-dialog.c" } else { GtkToggleButton* _tmp2_ = NULL; -#line 42 "/data/projects/seahorse/common/delete-dialog.vala" +#line 42 "/data/src/seahorse/common/delete-dialog.vala" _tmp2_ = self->priv->_check; -#line 42 "/data/projects/seahorse/common/delete-dialog.vala" +#line 42 "/data/src/seahorse/common/delete-dialog.vala" gtk_widget_show ((GtkWidget*) _tmp2_); #line 240 "delete-dialog.c" } -#line 44 "/data/projects/seahorse/common/delete-dialog.vala" +#line 44 "/data/src/seahorse/common/delete-dialog.vala" _tmp3_ = self->priv->_check; -#line 44 "/data/projects/seahorse/common/delete-dialog.vala" +#line 44 "/data/src/seahorse/common/delete-dialog.vala" _tmp4_ = value; -#line 44 "/data/projects/seahorse/common/delete-dialog.vala" +#line 44 "/data/src/seahorse/common/delete-dialog.vala" gtk_button_set_label ((GtkButton*) _tmp3_, _tmp4_); -#line 37 "/data/projects/seahorse/common/delete-dialog.vala" +#line 37 "/data/src/seahorse/common/delete-dialog.vala" g_object_notify ((GObject *) self, "check-label"); #line 250 "delete-dialog.c" } @@ -254,30 +254,30 @@ gboolean result; GtkToggleButton* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 50 "/data/projects/seahorse/common/delete-dialog.vala" +#line 50 "/data/src/seahorse/common/delete-dialog.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 51 "/data/projects/seahorse/common/delete-dialog.vala" +#line 51 "/data/src/seahorse/common/delete-dialog.vala" _tmp0_ = self->priv->_check; -#line 51 "/data/projects/seahorse/common/delete-dialog.vala" +#line 51 "/data/src/seahorse/common/delete-dialog.vala" _tmp1_ = gtk_widget_get_visible ((GtkWidget*) _tmp0_); -#line 51 "/data/projects/seahorse/common/delete-dialog.vala" +#line 51 "/data/src/seahorse/common/delete-dialog.vala" if (_tmp1_) { #line 266 "delete-dialog.c" GtkToggleButton* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; -#line 52 "/data/projects/seahorse/common/delete-dialog.vala" +#line 52 "/data/src/seahorse/common/delete-dialog.vala" _tmp2_ = self->priv->_check; -#line 52 "/data/projects/seahorse/common/delete-dialog.vala" +#line 52 "/data/src/seahorse/common/delete-dialog.vala" _tmp3_ = gtk_toggle_button_get_active (_tmp2_); -#line 52 "/data/projects/seahorse/common/delete-dialog.vala" +#line 52 "/data/src/seahorse/common/delete-dialog.vala" result = _tmp3_; -#line 52 "/data/projects/seahorse/common/delete-dialog.vala" +#line 52 "/data/src/seahorse/common/delete-dialog.vala" return result; #line 277 "delete-dialog.c" } -#line 53 "/data/projects/seahorse/common/delete-dialog.vala" +#line 53 "/data/src/seahorse/common/delete-dialog.vala" result = FALSE; -#line 53 "/data/projects/seahorse/common/delete-dialog.vala" +#line 53 "/data/src/seahorse/common/delete-dialog.vala" return result; #line 283 "delete-dialog.c" } @@ -286,15 +286,15 @@ void seahorse_delete_dialog_set_check_value (SeahorseDeleteDialog* self, gboolean value) { GtkToggleButton* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 55 "/data/projects/seahorse/common/delete-dialog.vala" +#line 55 "/data/src/seahorse/common/delete-dialog.vala" g_return_if_fail (self != NULL); -#line 56 "/data/projects/seahorse/common/delete-dialog.vala" +#line 56 "/data/src/seahorse/common/delete-dialog.vala" _tmp0_ = self->priv->_check; -#line 56 "/data/projects/seahorse/common/delete-dialog.vala" +#line 56 "/data/src/seahorse/common/delete-dialog.vala" _tmp1_ = value; -#line 56 "/data/projects/seahorse/common/delete-dialog.vala" +#line 56 "/data/src/seahorse/common/delete-dialog.vala" gtk_toggle_button_set_active (_tmp0_, _tmp1_); -#line 55 "/data/projects/seahorse/common/delete-dialog.vala" +#line 55 "/data/src/seahorse/common/delete-dialog.vala" g_object_notify ((GObject *) self, "check-value"); #line 300 "delete-dialog.c" } @@ -303,13 +303,13 @@ gboolean seahorse_delete_dialog_get_check_require (SeahorseDeleteDialog* self) { gboolean result; gboolean _tmp0_ = FALSE; -#line 62 "/data/projects/seahorse/common/delete-dialog.vala" +#line 62 "/data/src/seahorse/common/delete-dialog.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 63 "/data/projects/seahorse/common/delete-dialog.vala" +#line 63 "/data/src/seahorse/common/delete-dialog.vala" _tmp0_ = self->priv->_check_require; -#line 63 "/data/projects/seahorse/common/delete-dialog.vala" +#line 63 "/data/src/seahorse/common/delete-dialog.vala" result = _tmp0_; -#line 63 "/data/projects/seahorse/common/delete-dialog.vala" +#line 63 "/data/src/seahorse/common/delete-dialog.vala" return result; #line 315 "delete-dialog.c" } @@ -317,31 +317,31 @@ void seahorse_delete_dialog_set_check_require (SeahorseDeleteDialog* self, gboolean value) { gboolean _tmp0_ = FALSE; -#line 65 "/data/projects/seahorse/common/delete-dialog.vala" +#line 65 "/data/src/seahorse/common/delete-dialog.vala" g_return_if_fail (self != NULL); -#line 66 "/data/projects/seahorse/common/delete-dialog.vala" +#line 66 "/data/src/seahorse/common/delete-dialog.vala" _tmp0_ = value; -#line 66 "/data/projects/seahorse/common/delete-dialog.vala" +#line 66 "/data/src/seahorse/common/delete-dialog.vala" self->priv->_check_require = _tmp0_; -#line 67 "/data/projects/seahorse/common/delete-dialog.vala" +#line 67 "/data/src/seahorse/common/delete-dialog.vala" seahorse_delete_dialog_update_response_buttons (self); -#line 65 "/data/projects/seahorse/common/delete-dialog.vala" +#line 65 "/data/src/seahorse/common/delete-dialog.vala" g_object_notify ((GObject *) self, "check-require"); #line 331 "delete-dialog.c" } static void _seahorse_delete_dialog___lambda12_ (SeahorseDeleteDialog* self, GtkToggleButton* toggle) { -#line 88 "/data/projects/seahorse/common/delete-dialog.vala" +#line 88 "/data/src/seahorse/common/delete-dialog.vala" g_return_if_fail (toggle != NULL); -#line 89 "/data/projects/seahorse/common/delete-dialog.vala" +#line 89 "/data/src/seahorse/common/delete-dialog.vala" seahorse_delete_dialog_update_response_buttons (self); #line 340 "delete-dialog.c" } static void __seahorse_delete_dialog___lambda12__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) { -#line 88 "/data/projects/seahorse/common/delete-dialog.vala" +#line 88 "/data/src/seahorse/common/delete-dialog.vala" _seahorse_delete_dialog___lambda12_ (self, _sender); #line 347 "delete-dialog.c" } @@ -363,97 +363,97 @@ GtkButton* _tmp7_ = NULL; GtkButton* _tmp8_ = NULL; GtkButton* _tmp9_ = NULL; -#line 82 "/data/projects/seahorse/common/delete-dialog.vala" +#line 82 "/data/src/seahorse/common/delete-dialog.vala" parent_class = G_OBJECT_CLASS (seahorse_delete_dialog_parent_class); -#line 82 "/data/projects/seahorse/common/delete-dialog.vala" +#line 82 "/data/src/seahorse/common/delete-dialog.vala" obj = parent_class->constructor (type, n_construct_properties, construct_properties); -#line 82 "/data/projects/seahorse/common/delete-dialog.vala" +#line 82 "/data/src/seahorse/common/delete-dialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_TYPE_DELETE_DIALOG, SeahorseDeleteDialog); -#line 83 "/data/projects/seahorse/common/delete-dialog.vala" +#line 83 "/data/src/seahorse/common/delete-dialog.vala" gtk_window_set_modal ((GtkWindow*) self, TRUE); -#line 84 "/data/projects/seahorse/common/delete-dialog.vala" +#line 84 "/data/src/seahorse/common/delete-dialog.vala" gtk_window_set_destroy_with_parent ((GtkWindow*) self, TRUE); -#line 86 "/data/projects/seahorse/common/delete-dialog.vala" +#line 86 "/data/src/seahorse/common/delete-dialog.vala" _tmp0_ = (GtkCheckButton*) gtk_check_button_new (); -#line 86 "/data/projects/seahorse/common/delete-dialog.vala" +#line 86 "/data/src/seahorse/common/delete-dialog.vala" g_object_ref_sink (_tmp0_); -#line 86 "/data/projects/seahorse/common/delete-dialog.vala" +#line 86 "/data/src/seahorse/common/delete-dialog.vala" _g_object_unref0 (self->priv->_check); -#line 86 "/data/projects/seahorse/common/delete-dialog.vala" +#line 86 "/data/src/seahorse/common/delete-dialog.vala" self->priv->_check = (GtkToggleButton*) _tmp0_; -#line 87 "/data/projects/seahorse/common/delete-dialog.vala" +#line 87 "/data/src/seahorse/common/delete-dialog.vala" _tmp1_ = gtk_message_dialog_get_message_area ((GtkMessageDialog*) self); -#line 87 "/data/projects/seahorse/common/delete-dialog.vala" +#line 87 "/data/src/seahorse/common/delete-dialog.vala" _tmp2_ = self->priv->_check; -#line 87 "/data/projects/seahorse/common/delete-dialog.vala" +#line 87 "/data/src/seahorse/common/delete-dialog.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_CONTAINER, GtkContainer), (GtkWidget*) _tmp2_); -#line 88 "/data/projects/seahorse/common/delete-dialog.vala" +#line 88 "/data/src/seahorse/common/delete-dialog.vala" _tmp3_ = self->priv->_check; -#line 88 "/data/projects/seahorse/common/delete-dialog.vala" +#line 88 "/data/src/seahorse/common/delete-dialog.vala" g_signal_connect_object (_tmp3_, "toggled", (GCallback) __seahorse_delete_dialog___lambda12__gtk_toggle_button_toggled, self, 0); -#line 92 "/data/projects/seahorse/common/delete-dialog.vala" +#line 92 "/data/src/seahorse/common/delete-dialog.vala" _tmp4_ = (GtkButton*) gtk_button_new_from_stock (GTK_STOCK_CANCEL); -#line 92 "/data/projects/seahorse/common/delete-dialog.vala" +#line 92 "/data/src/seahorse/common/delete-dialog.vala" g_object_ref_sink (_tmp4_); -#line 92 "/data/projects/seahorse/common/delete-dialog.vala" +#line 92 "/data/src/seahorse/common/delete-dialog.vala" cancel = _tmp4_; -#line 93 "/data/projects/seahorse/common/delete-dialog.vala" +#line 93 "/data/src/seahorse/common/delete-dialog.vala" _tmp5_ = cancel; -#line 93 "/data/projects/seahorse/common/delete-dialog.vala" +#line 93 "/data/src/seahorse/common/delete-dialog.vala" gtk_dialog_add_action_widget ((GtkDialog*) self, (GtkWidget*) _tmp5_, (gint) GTK_RESPONSE_CANCEL); -#line 94 "/data/projects/seahorse/common/delete-dialog.vala" +#line 94 "/data/src/seahorse/common/delete-dialog.vala" _tmp6_ = cancel; -#line 94 "/data/projects/seahorse/common/delete-dialog.vala" +#line 94 "/data/src/seahorse/common/delete-dialog.vala" gtk_widget_show ((GtkWidget*) _tmp6_); -#line 96 "/data/projects/seahorse/common/delete-dialog.vala" +#line 96 "/data/src/seahorse/common/delete-dialog.vala" _tmp7_ = (GtkButton*) gtk_button_new_from_stock (GTK_STOCK_DELETE); -#line 96 "/data/projects/seahorse/common/delete-dialog.vala" +#line 96 "/data/src/seahorse/common/delete-dialog.vala" g_object_ref_sink (_tmp7_); -#line 96 "/data/projects/seahorse/common/delete-dialog.vala" +#line 96 "/data/src/seahorse/common/delete-dialog.vala" delet = _tmp7_; -#line 97 "/data/projects/seahorse/common/delete-dialog.vala" +#line 97 "/data/src/seahorse/common/delete-dialog.vala" _tmp8_ = delet; -#line 97 "/data/projects/seahorse/common/delete-dialog.vala" +#line 97 "/data/src/seahorse/common/delete-dialog.vala" gtk_dialog_add_action_widget ((GtkDialog*) self, (GtkWidget*) _tmp8_, (gint) GTK_RESPONSE_OK); -#line 98 "/data/projects/seahorse/common/delete-dialog.vala" +#line 98 "/data/src/seahorse/common/delete-dialog.vala" _tmp9_ = delet; -#line 98 "/data/projects/seahorse/common/delete-dialog.vala" +#line 98 "/data/src/seahorse/common/delete-dialog.vala" gtk_widget_show ((GtkWidget*) _tmp9_); -#line 82 "/data/projects/seahorse/common/delete-dialog.vala" +#line 82 "/data/src/seahorse/common/delete-dialog.vala" _g_object_unref0 (delet); -#line 82 "/data/projects/seahorse/common/delete-dialog.vala" +#line 82 "/data/src/seahorse/common/delete-dialog.vala" _g_object_unref0 (cancel); -#line 82 "/data/projects/seahorse/common/delete-dialog.vala" +#line 82 "/data/src/seahorse/common/delete-dialog.vala" return obj; #line 429 "delete-dialog.c" } static void seahorse_delete_dialog_class_init (SeahorseDeleteDialogClass * klass) { -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" seahorse_delete_dialog_parent_class = g_type_class_peek_parent (klass); -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" g_type_class_add_private (klass, sizeof (SeahorseDeleteDialogPrivate)); -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" G_OBJECT_CLASS (klass)->get_property = _vala_seahorse_delete_dialog_get_property; -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" G_OBJECT_CLASS (klass)->set_property = _vala_seahorse_delete_dialog_set_property; -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" G_OBJECT_CLASS (klass)->constructor = seahorse_delete_dialog_constructor; -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" G_OBJECT_CLASS (klass)->finalize = seahorse_delete_dialog_finalize; -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_DELETE_DIALOG_CHECK_LABEL, g_param_spec_string ("check-label", "check-label", "check-label", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_DELETE_DIALOG_CHECK_VALUE, g_param_spec_boolean ("check-value", "check-value", "check-value", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_DELETE_DIALOG_CHECK_REQUIRE, g_param_spec_boolean ("check-require", "check-require", "check-require", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); #line 452 "delete-dialog.c" } static void seahorse_delete_dialog_instance_init (SeahorseDeleteDialog * self) { -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" self->priv = SEAHORSE_DELETE_DIALOG_GET_PRIVATE (self); #line 459 "delete-dialog.c" } @@ -461,11 +461,11 @@ static void seahorse_delete_dialog_finalize (GObject* obj) { SeahorseDeleteDialog * self; -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_TYPE_DELETE_DIALOG, SeahorseDeleteDialog); -#line 27 "/data/projects/seahorse/common/delete-dialog.vala" +#line 27 "/data/src/seahorse/common/delete-dialog.vala" _g_object_unref0 (self->priv->_check); -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" G_OBJECT_CLASS (seahorse_delete_dialog_parent_class)->finalize (obj); #line 471 "delete-dialog.c" } @@ -486,31 +486,31 @@ static void _vala_seahorse_delete_dialog_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { SeahorseDeleteDialog * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEAHORSE_TYPE_DELETE_DIALOG, SeahorseDeleteDialog); -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" switch (property_id) { -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" case SEAHORSE_DELETE_DIALOG_CHECK_LABEL: -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" g_value_set_string (value, seahorse_delete_dialog_get_check_label (self)); -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" break; -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" case SEAHORSE_DELETE_DIALOG_CHECK_VALUE: -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" g_value_set_boolean (value, seahorse_delete_dialog_get_check_value (self)); -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" break; -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" case SEAHORSE_DELETE_DIALOG_CHECK_REQUIRE: -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" g_value_set_boolean (value, seahorse_delete_dialog_get_check_require (self)); -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" break; #line 510 "delete-dialog.c" default: -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" break; #line 516 "delete-dialog.c" } @@ -520,31 +520,31 @@ static void _vala_seahorse_delete_dialog_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { SeahorseDeleteDialog * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEAHORSE_TYPE_DELETE_DIALOG, SeahorseDeleteDialog); -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" switch (property_id) { -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" case SEAHORSE_DELETE_DIALOG_CHECK_LABEL: -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" seahorse_delete_dialog_set_check_label (self, g_value_get_string (value)); -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" break; -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" case SEAHORSE_DELETE_DIALOG_CHECK_VALUE: -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" seahorse_delete_dialog_set_check_value (self, g_value_get_boolean (value)); -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" break; -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" case SEAHORSE_DELETE_DIALOG_CHECK_REQUIRE: -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" seahorse_delete_dialog_set_check_require (self, g_value_get_boolean (value)); -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" break; #line 544 "delete-dialog.c" default: -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 26 "/data/projects/seahorse/common/delete-dialog.vala" +#line 26 "/data/src/seahorse/common/delete-dialog.vala" break; #line 550 "delete-dialog.c" } diff -Nru seahorse-3.10.1/common/deleter.c seahorse-3.10.2/common/deleter.c --- seahorse-3.10.1/common/deleter.c 2013-07-24 15:11:10.000000000 +0000 +++ seahorse-3.10.2/common/deleter.c 2014-01-08 15:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -/* deleter.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* deleter.c generated by valac 0.22.1, the Vala compiler * generated from deleter.vala, do not modify */ /* @@ -45,68 +45,68 @@ static GtkDialog* seahorse_deleter_real_create_confirm (SeahorseDeleter* self, GtkWindow* parent) { -#line 28 "/data/projects/seahorse/common/deleter.vala" +#line 28 "/data/src/seahorse/common/deleter.vala" g_critical ("Type `%s' does not implement abstract method `seahorse_deleter_create_confirm'", g_type_name (G_TYPE_FROM_INSTANCE (self))); -#line 28 "/data/projects/seahorse/common/deleter.vala" +#line 28 "/data/src/seahorse/common/deleter.vala" return NULL; #line 53 "deleter.c" } GtkDialog* seahorse_deleter_create_confirm (SeahorseDeleter* self, GtkWindow* parent) { -#line 28 "/data/projects/seahorse/common/deleter.vala" +#line 28 "/data/src/seahorse/common/deleter.vala" g_return_val_if_fail (self != NULL, NULL); -#line 28 "/data/projects/seahorse/common/deleter.vala" +#line 28 "/data/src/seahorse/common/deleter.vala" return SEAHORSE_DELETER_GET_CLASS (self)->create_confirm (self, parent); #line 62 "deleter.c" } static GList* seahorse_deleter_real_get_objects (SeahorseDeleter* self) { -#line 30 "/data/projects/seahorse/common/deleter.vala" +#line 30 "/data/src/seahorse/common/deleter.vala" g_critical ("Type `%s' does not implement abstract method `seahorse_deleter_get_objects'", g_type_name (G_TYPE_FROM_INSTANCE (self))); -#line 30 "/data/projects/seahorse/common/deleter.vala" +#line 30 "/data/src/seahorse/common/deleter.vala" return NULL; #line 71 "deleter.c" } GList* seahorse_deleter_get_objects (SeahorseDeleter* self) { -#line 30 "/data/projects/seahorse/common/deleter.vala" +#line 30 "/data/src/seahorse/common/deleter.vala" g_return_val_if_fail (self != NULL, NULL); -#line 30 "/data/projects/seahorse/common/deleter.vala" +#line 30 "/data/src/seahorse/common/deleter.vala" return SEAHORSE_DELETER_GET_CLASS (self)->get_objects (self); #line 80 "deleter.c" } static gboolean seahorse_deleter_real_add_object (SeahorseDeleter* self, GObject* obj) { -#line 32 "/data/projects/seahorse/common/deleter.vala" +#line 32 "/data/src/seahorse/common/deleter.vala" g_critical ("Type `%s' does not implement abstract method `seahorse_deleter_add_object'", g_type_name (G_TYPE_FROM_INSTANCE (self))); -#line 32 "/data/projects/seahorse/common/deleter.vala" +#line 32 "/data/src/seahorse/common/deleter.vala" return FALSE; #line 89 "deleter.c" } gboolean seahorse_deleter_add_object (SeahorseDeleter* self, GObject* obj) { -#line 32 "/data/projects/seahorse/common/deleter.vala" +#line 32 "/data/src/seahorse/common/deleter.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 32 "/data/projects/seahorse/common/deleter.vala" +#line 32 "/data/src/seahorse/common/deleter.vala" return SEAHORSE_DELETER_GET_CLASS (self)->add_object (self, obj); #line 98 "deleter.c" } void seahorse_deleter_delete (SeahorseDeleter* self, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_) { -#line 27 "/data/projects/seahorse/common/deleter.vala" +#line 27 "/data/src/seahorse/common/deleter.vala" SEAHORSE_DELETER_GET_CLASS (self)->delete (self, cancellable, _callback_, _user_data_); #line 105 "deleter.c" } gboolean seahorse_deleter_delete_finish (SeahorseDeleter* self, GAsyncResult* _res_, GError** error) { -#line 27 "/data/projects/seahorse/common/deleter.vala" +#line 27 "/data/src/seahorse/common/deleter.vala" return SEAHORSE_DELETER_GET_CLASS (self)->delete_finish (self, _res_, error); #line 112 "deleter.c" } @@ -124,46 +124,46 @@ gboolean _tmp5_ = FALSE; gint _tmp6_ = 0; gboolean _tmp8_ = FALSE; -#line 36 "/data/projects/seahorse/common/deleter.vala" +#line 36 "/data/src/seahorse/common/deleter.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 37 "/data/projects/seahorse/common/deleter.vala" +#line 37 "/data/src/seahorse/common/deleter.vala" _tmp0_ = parent; -#line 37 "/data/projects/seahorse/common/deleter.vala" +#line 37 "/data/src/seahorse/common/deleter.vala" _tmp1_ = seahorse_deleter_create_confirm (self, _tmp0_); -#line 37 "/data/projects/seahorse/common/deleter.vala" +#line 37 "/data/src/seahorse/common/deleter.vala" prompt = _tmp1_; -#line 38 "/data/projects/seahorse/common/deleter.vala" +#line 38 "/data/src/seahorse/common/deleter.vala" _tmp2_ = prompt; -#line 38 "/data/projects/seahorse/common/deleter.vala" +#line 38 "/data/src/seahorse/common/deleter.vala" _tmp3_ = gtk_dialog_run (_tmp2_); -#line 38 "/data/projects/seahorse/common/deleter.vala" +#line 38 "/data/src/seahorse/common/deleter.vala" res = _tmp3_; -#line 39 "/data/projects/seahorse/common/deleter.vala" +#line 39 "/data/src/seahorse/common/deleter.vala" _tmp4_ = prompt; -#line 39 "/data/projects/seahorse/common/deleter.vala" +#line 39 "/data/src/seahorse/common/deleter.vala" gtk_widget_destroy ((GtkWidget*) _tmp4_); -#line 40 "/data/projects/seahorse/common/deleter.vala" +#line 40 "/data/src/seahorse/common/deleter.vala" _tmp6_ = res; -#line 40 "/data/projects/seahorse/common/deleter.vala" +#line 40 "/data/src/seahorse/common/deleter.vala" if (_tmp6_ == ((gint) GTK_RESPONSE_OK)) { -#line 40 "/data/projects/seahorse/common/deleter.vala" +#line 40 "/data/src/seahorse/common/deleter.vala" _tmp5_ = TRUE; #line 152 "deleter.c" } else { gint _tmp7_ = 0; -#line 40 "/data/projects/seahorse/common/deleter.vala" +#line 40 "/data/src/seahorse/common/deleter.vala" _tmp7_ = res; -#line 40 "/data/projects/seahorse/common/deleter.vala" +#line 40 "/data/src/seahorse/common/deleter.vala" _tmp5_ = _tmp7_ == ((gint) GTK_RESPONSE_ACCEPT); #line 159 "deleter.c" } -#line 40 "/data/projects/seahorse/common/deleter.vala" +#line 40 "/data/src/seahorse/common/deleter.vala" _tmp8_ = _tmp5_; -#line 40 "/data/projects/seahorse/common/deleter.vala" +#line 40 "/data/src/seahorse/common/deleter.vala" result = _tmp8_; -#line 40 "/data/projects/seahorse/common/deleter.vala" +#line 40 "/data/src/seahorse/common/deleter.vala" _g_object_unref0 (prompt); -#line 40 "/data/projects/seahorse/common/deleter.vala" +#line 40 "/data/src/seahorse/common/deleter.vala" return result; #line 169 "deleter.c" } @@ -171,22 +171,22 @@ SeahorseDeleter* seahorse_deleter_construct (GType object_type) { SeahorseDeleter * self = NULL; -#line 27 "/data/projects/seahorse/common/deleter.vala" +#line 27 "/data/src/seahorse/common/deleter.vala" self = (SeahorseDeleter*) g_object_new (object_type, NULL); -#line 27 "/data/projects/seahorse/common/deleter.vala" +#line 27 "/data/src/seahorse/common/deleter.vala" return self; #line 179 "deleter.c" } static void seahorse_deleter_class_init (SeahorseDeleterClass * klass) { -#line 27 "/data/projects/seahorse/common/deleter.vala" +#line 27 "/data/src/seahorse/common/deleter.vala" seahorse_deleter_parent_class = g_type_class_peek_parent (klass); -#line 27 "/data/projects/seahorse/common/deleter.vala" +#line 27 "/data/src/seahorse/common/deleter.vala" SEAHORSE_DELETER_CLASS (klass)->create_confirm = seahorse_deleter_real_create_confirm; -#line 27 "/data/projects/seahorse/common/deleter.vala" +#line 27 "/data/src/seahorse/common/deleter.vala" SEAHORSE_DELETER_CLASS (klass)->get_objects = seahorse_deleter_real_get_objects; -#line 27 "/data/projects/seahorse/common/deleter.vala" +#line 27 "/data/src/seahorse/common/deleter.vala" SEAHORSE_DELETER_CLASS (klass)->add_object = seahorse_deleter_real_add_object; #line 192 "deleter.c" } diff -Nru seahorse-3.10.1/common/exportable.c seahorse-3.10.2/common/exportable.c --- seahorse-3.10.1/common/exportable.c 2013-07-24 15:11:10.000000000 +0000 +++ seahorse-3.10.2/common/exportable.c 2014-01-08 15:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -/* exportable.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* exportable.c generated by valac 0.22.1, the Vala compiler * generated from exportable.vala, do not modify */ /* @@ -91,9 +91,9 @@ GList* seahorse_exportable_create_exporters (SeahorseExportable* self, SeahorseExporterType type) { -#line 29 "/data/projects/seahorse/common/exportable.vala" +#line 29 "/data/src/seahorse/common/exportable.vala" g_return_val_if_fail (self != NULL, NULL); -#line 29 "/data/projects/seahorse/common/exportable.vala" +#line 29 "/data/src/seahorse/common/exportable.vala" return SEAHORSE_EXPORTABLE_GET_INTERFACE (self)->create_exporters (self, type); #line 99 "exportable.c" } @@ -102,40 +102,40 @@ gboolean seahorse_exportable_can_export (GObject* object) { gboolean result = FALSE; GObject* _tmp0_ = NULL; -#line 31 "/data/projects/seahorse/common/exportable.vala" +#line 31 "/data/src/seahorse/common/exportable.vala" g_return_val_if_fail (object != NULL, FALSE); -#line 32 "/data/projects/seahorse/common/exportable.vala" +#line 32 "/data/src/seahorse/common/exportable.vala" _tmp0_ = object; -#line 32 "/data/projects/seahorse/common/exportable.vala" +#line 32 "/data/src/seahorse/common/exportable.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SEAHORSE_TYPE_EXPORTABLE)) { #line 112 "exportable.c" GObject* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 33 "/data/projects/seahorse/common/exportable.vala" +#line 33 "/data/src/seahorse/common/exportable.vala" _tmp1_ = object; -#line 33 "/data/projects/seahorse/common/exportable.vala" +#line 33 "/data/src/seahorse/common/exportable.vala" _tmp2_ = seahorse_exportable_get_exportable (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SEAHORSE_TYPE_EXPORTABLE, SeahorseExportable)); -#line 33 "/data/projects/seahorse/common/exportable.vala" +#line 33 "/data/src/seahorse/common/exportable.vala" _tmp3_ = _tmp2_; -#line 33 "/data/projects/seahorse/common/exportable.vala" +#line 33 "/data/src/seahorse/common/exportable.vala" result = _tmp3_; -#line 33 "/data/projects/seahorse/common/exportable.vala" +#line 33 "/data/src/seahorse/common/exportable.vala" return result; #line 126 "exportable.c" } -#line 34 "/data/projects/seahorse/common/exportable.vala" +#line 34 "/data/src/seahorse/common/exportable.vala" result = FALSE; -#line 34 "/data/projects/seahorse/common/exportable.vala" +#line 34 "/data/src/seahorse/common/exportable.vala" return result; #line 132 "exportable.c" } static Block3Data* block3_data_ref (Block3Data* _data3_) { -#line 37 "/data/projects/seahorse/common/exportable.vala" +#line 37 "/data/src/seahorse/common/exportable.vala" g_atomic_int_inc (&_data3_->_ref_count_); -#line 37 "/data/projects/seahorse/common/exportable.vala" +#line 37 "/data/src/seahorse/common/exportable.vala" return _data3_; #line 141 "exportable.c" } @@ -144,13 +144,13 @@ static void block3_data_unref (void * _userdata_) { Block3Data* _data3_; _data3_ = (Block3Data*) _userdata_; -#line 37 "/data/projects/seahorse/common/exportable.vala" +#line 37 "/data/src/seahorse/common/exportable.vala" if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { -#line 37 "/data/projects/seahorse/common/exportable.vala" +#line 37 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (_data3_->_result_); -#line 37 "/data/projects/seahorse/common/exportable.vala" +#line 37 "/data/src/seahorse/common/exportable.vala" _g_main_loop_unref0 (_data3_->loop); -#line 37 "/data/projects/seahorse/common/exportable.vala" +#line 37 "/data/src/seahorse/common/exportable.vala" g_slice_free (Block3Data, _data3_); #line 156 "exportable.c" } @@ -158,23 +158,23 @@ static gpointer _g_object_ref0 (gpointer self) { -#line 43 "/data/projects/seahorse/common/exportable.vala" +#line 43 "/data/src/seahorse/common/exportable.vala" return self ? g_object_ref (self) : NULL; #line 164 "exportable.c" } static void _g_object_unref0_ (gpointer var) { -#line 49 "/data/projects/seahorse/common/exportable.vala" +#line 49 "/data/src/seahorse/common/exportable.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); #line 171 "exportable.c" } static void _g_list_free__g_object_unref0_ (GList* self) { -#line 49 "/data/projects/seahorse/common/exportable.vala" +#line 49 "/data/src/seahorse/common/exportable.vala" g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); -#line 49 "/data/projects/seahorse/common/exportable.vala" +#line 49 "/data/src/seahorse/common/exportable.vala" g_list_free (self); #line 180 "exportable.c" } @@ -184,28 +184,28 @@ GAsyncResult* _tmp0_ = NULL; GAsyncResult* _tmp1_ = NULL; GMainLoop* _tmp2_ = NULL; -#line 55 "/data/projects/seahorse/common/exportable.vala" +#line 55 "/data/src/seahorse/common/exportable.vala" g_return_if_fail (res != NULL); -#line 56 "/data/projects/seahorse/common/exportable.vala" +#line 56 "/data/src/seahorse/common/exportable.vala" _tmp0_ = res; -#line 56 "/data/projects/seahorse/common/exportable.vala" +#line 56 "/data/src/seahorse/common/exportable.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 56 "/data/projects/seahorse/common/exportable.vala" +#line 56 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (_data3_->_result_); -#line 56 "/data/projects/seahorse/common/exportable.vala" +#line 56 "/data/src/seahorse/common/exportable.vala" _data3_->_result_ = _tmp1_; -#line 57 "/data/projects/seahorse/common/exportable.vala" +#line 57 "/data/src/seahorse/common/exportable.vala" _tmp2_ = _data3_->loop; -#line 57 "/data/projects/seahorse/common/exportable.vala" +#line 57 "/data/src/seahorse/common/exportable.vala" g_main_loop_quit (_tmp2_); #line 202 "exportable.c" } static void _____lambda2__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 55 "/data/projects/seahorse/common/exportable.vala" +#line 55 "/data/src/seahorse/common/exportable.vala" ____lambda2_ (self, source_object, res); -#line 55 "/data/projects/seahorse/common/exportable.vala" +#line 55 "/data/src/seahorse/common/exportable.vala" block3_data_unref (self); #line 211 "exportable.c" } @@ -218,36 +218,36 @@ gint count = 0; GList* _tmp1_ = NULL; GError * _inner_error_ = NULL; -#line 37 "/data/projects/seahorse/common/exportable.vala" +#line 37 "/data/src/seahorse/common/exportable.vala" g_return_val_if_fail (directory != NULL, 0); -#line 37 "/data/projects/seahorse/common/exportable.vala" +#line 37 "/data/src/seahorse/common/exportable.vala" _data3_ = g_slice_new0 (Block3Data); -#line 37 "/data/projects/seahorse/common/exportable.vala" +#line 37 "/data/src/seahorse/common/exportable.vala" _data3_->_ref_count_ = 1; -#line 39 "/data/projects/seahorse/common/exportable.vala" +#line 39 "/data/src/seahorse/common/exportable.vala" _tmp0_ = g_main_loop_new (NULL, FALSE); -#line 39 "/data/projects/seahorse/common/exportable.vala" +#line 39 "/data/src/seahorse/common/exportable.vala" _data3_->loop = _tmp0_; -#line 40 "/data/projects/seahorse/common/exportable.vala" +#line 40 "/data/src/seahorse/common/exportable.vala" _data3_->_result_ = NULL; -#line 41 "/data/projects/seahorse/common/exportable.vala" +#line 41 "/data/src/seahorse/common/exportable.vala" count = 0; -#line 43 "/data/projects/seahorse/common/exportable.vala" +#line 43 "/data/src/seahorse/common/exportable.vala" _tmp1_ = objects; #line 238 "exportable.c" { GList* object_collection = NULL; GList* object_it = NULL; -#line 43 "/data/projects/seahorse/common/exportable.vala" +#line 43 "/data/src/seahorse/common/exportable.vala" object_collection = _tmp1_; -#line 43 "/data/projects/seahorse/common/exportable.vala" +#line 43 "/data/src/seahorse/common/exportable.vala" for (object_it = object_collection; object_it != NULL; object_it = object_it->next) { #line 246 "exportable.c" GObject* _tmp2_ = NULL; GObject* object = NULL; -#line 43 "/data/projects/seahorse/common/exportable.vala" +#line 43 "/data/src/seahorse/common/exportable.vala" _tmp2_ = _g_object_ref0 ((GObject*) object_it->data); -#line 43 "/data/projects/seahorse/common/exportable.vala" +#line 43 "/data/src/seahorse/common/exportable.vala" object = _tmp2_; #line 253 "exportable.c" { @@ -278,140 +278,140 @@ SeahorseExporter* _tmp23_ = NULL; GAsyncResult* _tmp24_ = NULL; gint _tmp25_ = 0; -#line 44 "/data/projects/seahorse/common/exportable.vala" +#line 44 "/data/src/seahorse/common/exportable.vala" _tmp3_ = object; -#line 44 "/data/projects/seahorse/common/exportable.vala" +#line 44 "/data/src/seahorse/common/exportable.vala" _tmp4_ = seahorse_exportable_can_export (_tmp3_); -#line 44 "/data/projects/seahorse/common/exportable.vala" +#line 44 "/data/src/seahorse/common/exportable.vala" if (!_tmp4_) { -#line 45 "/data/projects/seahorse/common/exportable.vala" +#line 45 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (object); -#line 45 "/data/projects/seahorse/common/exportable.vala" +#line 45 "/data/src/seahorse/common/exportable.vala" continue; #line 292 "exportable.c" } -#line 47 "/data/projects/seahorse/common/exportable.vala" +#line 47 "/data/src/seahorse/common/exportable.vala" _tmp5_ = object; -#line 47 "/data/projects/seahorse/common/exportable.vala" +#line 47 "/data/src/seahorse/common/exportable.vala" _tmp6_ = seahorse_exportable_create_exporters (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SEAHORSE_TYPE_EXPORTABLE, SeahorseExportable), SEAHORSE_EXPORTER_TYPE_ANY); -#line 47 "/data/projects/seahorse/common/exportable.vala" +#line 47 "/data/src/seahorse/common/exportable.vala" exporters = _tmp6_; -#line 48 "/data/projects/seahorse/common/exportable.vala" +#line 48 "/data/src/seahorse/common/exportable.vala" _tmp7_ = exporters; -#line 48 "/data/projects/seahorse/common/exportable.vala" +#line 48 "/data/src/seahorse/common/exportable.vala" if (_tmp7_ == NULL) { -#line 49 "/data/projects/seahorse/common/exportable.vala" +#line 49 "/data/src/seahorse/common/exportable.vala" __g_list_free__g_object_unref0_0 (exporters); -#line 49 "/data/projects/seahorse/common/exportable.vala" +#line 49 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (object); -#line 49 "/data/projects/seahorse/common/exportable.vala" +#line 49 "/data/src/seahorse/common/exportable.vala" continue; #line 310 "exportable.c" } -#line 51 "/data/projects/seahorse/common/exportable.vala" +#line 51 "/data/src/seahorse/common/exportable.vala" _tmp8_ = exporters; -#line 51 "/data/projects/seahorse/common/exportable.vala" +#line 51 "/data/src/seahorse/common/exportable.vala" _tmp9_ = _tmp8_->data; -#line 51 "/data/projects/seahorse/common/exportable.vala" +#line 51 "/data/src/seahorse/common/exportable.vala" _tmp10_ = _g_object_ref0 ((SeahorseExporter*) _tmp9_); -#line 51 "/data/projects/seahorse/common/exportable.vala" +#line 51 "/data/src/seahorse/common/exportable.vala" exporter = _tmp10_; -#line 52 "/data/projects/seahorse/common/exportable.vala" +#line 52 "/data/src/seahorse/common/exportable.vala" _tmp11_ = directory; -#line 52 "/data/projects/seahorse/common/exportable.vala" +#line 52 "/data/src/seahorse/common/exportable.vala" _tmp12_ = exporter; -#line 52 "/data/projects/seahorse/common/exportable.vala" +#line 52 "/data/src/seahorse/common/exportable.vala" _tmp13_ = seahorse_exporter_get_filename (_tmp12_); -#line 52 "/data/projects/seahorse/common/exportable.vala" +#line 52 "/data/src/seahorse/common/exportable.vala" _tmp14_ = _tmp13_; -#line 52 "/data/projects/seahorse/common/exportable.vala" +#line 52 "/data/src/seahorse/common/exportable.vala" _tmp15_ = _tmp14_; -#line 52 "/data/projects/seahorse/common/exportable.vala" +#line 52 "/data/src/seahorse/common/exportable.vala" _tmp16_ = g_build_filename (_tmp11_, _tmp15_, NULL, NULL); -#line 52 "/data/projects/seahorse/common/exportable.vala" +#line 52 "/data/src/seahorse/common/exportable.vala" _tmp17_ = _tmp16_; -#line 52 "/data/projects/seahorse/common/exportable.vala" +#line 52 "/data/src/seahorse/common/exportable.vala" _g_free0 (_tmp15_); -#line 52 "/data/projects/seahorse/common/exportable.vala" +#line 52 "/data/src/seahorse/common/exportable.vala" filename = _tmp17_; -#line 53 "/data/projects/seahorse/common/exportable.vala" +#line 53 "/data/src/seahorse/common/exportable.vala" _tmp18_ = filename; -#line 53 "/data/projects/seahorse/common/exportable.vala" +#line 53 "/data/src/seahorse/common/exportable.vala" _tmp19_ = g_file_new_for_uri (_tmp18_); -#line 53 "/data/projects/seahorse/common/exportable.vala" +#line 53 "/data/src/seahorse/common/exportable.vala" file = _tmp19_; -#line 55 "/data/projects/seahorse/common/exportable.vala" +#line 55 "/data/src/seahorse/common/exportable.vala" _tmp20_ = exporter; -#line 55 "/data/projects/seahorse/common/exportable.vala" +#line 55 "/data/src/seahorse/common/exportable.vala" _tmp21_ = file; -#line 55 "/data/projects/seahorse/common/exportable.vala" +#line 55 "/data/src/seahorse/common/exportable.vala" seahorse_exporter_export_to_file (_tmp20_, _tmp21_, FALSE, NULL, _____lambda2__gasync_ready_callback, block3_data_ref (_data3_)); -#line 60 "/data/projects/seahorse/common/exportable.vala" +#line 60 "/data/src/seahorse/common/exportable.vala" _tmp22_ = _data3_->loop; -#line 60 "/data/projects/seahorse/common/exportable.vala" +#line 60 "/data/src/seahorse/common/exportable.vala" g_main_loop_run (_tmp22_); -#line 62 "/data/projects/seahorse/common/exportable.vala" +#line 62 "/data/src/seahorse/common/exportable.vala" _tmp23_ = exporter; -#line 62 "/data/projects/seahorse/common/exportable.vala" +#line 62 "/data/src/seahorse/common/exportable.vala" _tmp24_ = _data3_->_result_; -#line 62 "/data/projects/seahorse/common/exportable.vala" +#line 62 "/data/src/seahorse/common/exportable.vala" seahorse_exporter_export_to_file_finish (_tmp23_, _tmp24_, &_inner_error_); -#line 62 "/data/projects/seahorse/common/exportable.vala" +#line 62 "/data/src/seahorse/common/exportable.vala" if (_inner_error_ != NULL) { -#line 62 "/data/projects/seahorse/common/exportable.vala" +#line 62 "/data/src/seahorse/common/exportable.vala" g_propagate_error (error, _inner_error_); -#line 62 "/data/projects/seahorse/common/exportable.vala" +#line 62 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (file); -#line 62 "/data/projects/seahorse/common/exportable.vala" +#line 62 "/data/src/seahorse/common/exportable.vala" _g_free0 (filename); -#line 62 "/data/projects/seahorse/common/exportable.vala" +#line 62 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (exporter); -#line 62 "/data/projects/seahorse/common/exportable.vala" +#line 62 "/data/src/seahorse/common/exportable.vala" __g_list_free__g_object_unref0_0 (exporters); -#line 62 "/data/projects/seahorse/common/exportable.vala" +#line 62 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (object); -#line 62 "/data/projects/seahorse/common/exportable.vala" +#line 62 "/data/src/seahorse/common/exportable.vala" block3_data_unref (_data3_); -#line 62 "/data/projects/seahorse/common/exportable.vala" +#line 62 "/data/src/seahorse/common/exportable.vala" _data3_ = NULL; -#line 62 "/data/projects/seahorse/common/exportable.vala" +#line 62 "/data/src/seahorse/common/exportable.vala" return 0; #line 380 "exportable.c" } -#line 64 "/data/projects/seahorse/common/exportable.vala" +#line 64 "/data/src/seahorse/common/exportable.vala" _tmp25_ = count; -#line 64 "/data/projects/seahorse/common/exportable.vala" +#line 64 "/data/src/seahorse/common/exportable.vala" count = _tmp25_ + 1; -#line 43 "/data/projects/seahorse/common/exportable.vala" +#line 43 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (file); -#line 43 "/data/projects/seahorse/common/exportable.vala" +#line 43 "/data/src/seahorse/common/exportable.vala" _g_free0 (filename); -#line 43 "/data/projects/seahorse/common/exportable.vala" +#line 43 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (exporter); -#line 43 "/data/projects/seahorse/common/exportable.vala" +#line 43 "/data/src/seahorse/common/exportable.vala" __g_list_free__g_object_unref0_0 (exporters); -#line 43 "/data/projects/seahorse/common/exportable.vala" +#line 43 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (object); #line 396 "exportable.c" } } } -#line 67 "/data/projects/seahorse/common/exportable.vala" +#line 67 "/data/src/seahorse/common/exportable.vala" result = count; -#line 67 "/data/projects/seahorse/common/exportable.vala" +#line 67 "/data/src/seahorse/common/exportable.vala" block3_data_unref (_data3_); -#line 67 "/data/projects/seahorse/common/exportable.vala" +#line 67 "/data/src/seahorse/common/exportable.vala" _data3_ = NULL; -#line 67 "/data/projects/seahorse/common/exportable.vala" +#line 67 "/data/src/seahorse/common/exportable.vala" return result; #line 408 "exportable.c" } static Block4Data* block4_data_ref (Block4Data* _data4_) { -#line 100 "/data/projects/seahorse/common/exportable.vala" +#line 100 "/data/src/seahorse/common/exportable.vala" g_atomic_int_inc (&_data4_->_ref_count_); -#line 100 "/data/projects/seahorse/common/exportable.vala" +#line 100 "/data/src/seahorse/common/exportable.vala" return _data4_; #line 417 "exportable.c" } @@ -420,13 +420,13 @@ static void block4_data_unref (void * _userdata_) { Block4Data* _data4_; _data4_ = (Block4Data*) _userdata_; -#line 100 "/data/projects/seahorse/common/exportable.vala" +#line 100 "/data/src/seahorse/common/exportable.vala" if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) { -#line 100 "/data/projects/seahorse/common/exportable.vala" +#line 100 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (_data4_->_result_); -#line 100 "/data/projects/seahorse/common/exportable.vala" +#line 100 "/data/src/seahorse/common/exportable.vala" _g_main_loop_unref0 (_data4_->loop); -#line 100 "/data/projects/seahorse/common/exportable.vala" +#line 100 "/data/src/seahorse/common/exportable.vala" g_slice_free (Block4Data, _data4_); #line 432 "exportable.c" } @@ -437,28 +437,28 @@ GAsyncResult* _tmp0_ = NULL; GAsyncResult* _tmp1_ = NULL; GMainLoop* _tmp2_ = NULL; -#line 104 "/data/projects/seahorse/common/exportable.vala" +#line 104 "/data/src/seahorse/common/exportable.vala" g_return_if_fail (res != NULL); -#line 105 "/data/projects/seahorse/common/exportable.vala" +#line 105 "/data/src/seahorse/common/exportable.vala" _tmp0_ = res; -#line 105 "/data/projects/seahorse/common/exportable.vala" +#line 105 "/data/src/seahorse/common/exportable.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 105 "/data/projects/seahorse/common/exportable.vala" +#line 105 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (_data4_->_result_); -#line 105 "/data/projects/seahorse/common/exportable.vala" +#line 105 "/data/src/seahorse/common/exportable.vala" _data4_->_result_ = _tmp1_; -#line 106 "/data/projects/seahorse/common/exportable.vala" +#line 106 "/data/src/seahorse/common/exportable.vala" _tmp2_ = _data4_->loop; -#line 106 "/data/projects/seahorse/common/exportable.vala" +#line 106 "/data/src/seahorse/common/exportable.vala" g_main_loop_quit (_tmp2_); #line 455 "exportable.c" } static void ____lambda3__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 104 "/data/projects/seahorse/common/exportable.vala" +#line 104 "/data/src/seahorse/common/exportable.vala" ___lambda3_ (self, source_object, res); -#line 104 "/data/projects/seahorse/common/exportable.vala" +#line 104 "/data/src/seahorse/common/exportable.vala" block4_data_unref (self); #line 464 "exportable.c" } @@ -476,76 +476,76 @@ SeahorseExporter* _tmp21_ = NULL; guint8* _tmp30_ = NULL; GError * _inner_error_ = NULL; -#line 72 "/data/projects/seahorse/common/exportable.vala" +#line 72 "/data/src/seahorse/common/exportable.vala" exporters = NULL; -#line 74 "/data/projects/seahorse/common/exportable.vala" +#line 74 "/data/src/seahorse/common/exportable.vala" _tmp0_ = objects; #line 484 "exportable.c" { GList* object_collection = NULL; GList* object_it = NULL; -#line 74 "/data/projects/seahorse/common/exportable.vala" +#line 74 "/data/src/seahorse/common/exportable.vala" object_collection = _tmp0_; -#line 74 "/data/projects/seahorse/common/exportable.vala" +#line 74 "/data/src/seahorse/common/exportable.vala" for (object_it = object_collection; object_it != NULL; object_it = object_it->next) { #line 492 "exportable.c" GObject* _tmp1_ = NULL; GObject* object = NULL; -#line 74 "/data/projects/seahorse/common/exportable.vala" +#line 74 "/data/src/seahorse/common/exportable.vala" _tmp1_ = _g_object_ref0 ((GObject*) object_it->data); -#line 74 "/data/projects/seahorse/common/exportable.vala" +#line 74 "/data/src/seahorse/common/exportable.vala" object = _tmp1_; #line 499 "exportable.c" { GObject* _tmp2_ = NULL; gboolean _tmp3_ = FALSE; GList* _tmp4_ = NULL; -#line 75 "/data/projects/seahorse/common/exportable.vala" +#line 75 "/data/src/seahorse/common/exportable.vala" _tmp2_ = object; -#line 75 "/data/projects/seahorse/common/exportable.vala" +#line 75 "/data/src/seahorse/common/exportable.vala" _tmp3_ = seahorse_exportable_can_export (_tmp2_); -#line 75 "/data/projects/seahorse/common/exportable.vala" +#line 75 "/data/src/seahorse/common/exportable.vala" if (!_tmp3_) { -#line 76 "/data/projects/seahorse/common/exportable.vala" +#line 76 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (object); -#line 76 "/data/projects/seahorse/common/exportable.vala" +#line 76 "/data/src/seahorse/common/exportable.vala" continue; #line 514 "exportable.c" } -#line 79 "/data/projects/seahorse/common/exportable.vala" +#line 79 "/data/src/seahorse/common/exportable.vala" _tmp4_ = exporters; -#line 79 "/data/projects/seahorse/common/exportable.vala" +#line 79 "/data/src/seahorse/common/exportable.vala" if (_tmp4_ != NULL) { #line 520 "exportable.c" GList* _tmp5_ = NULL; -#line 80 "/data/projects/seahorse/common/exportable.vala" +#line 80 "/data/src/seahorse/common/exportable.vala" _tmp5_ = exporters; #line 524 "exportable.c" { GList* exporter_collection = NULL; GList* exporter_it = NULL; -#line 80 "/data/projects/seahorse/common/exportable.vala" +#line 80 "/data/src/seahorse/common/exportable.vala" exporter_collection = _tmp5_; -#line 80 "/data/projects/seahorse/common/exportable.vala" +#line 80 "/data/src/seahorse/common/exportable.vala" for (exporter_it = exporter_collection; exporter_it != NULL; exporter_it = exporter_it->next) { #line 532 "exportable.c" SeahorseExporter* _tmp6_ = NULL; SeahorseExporter* exporter = NULL; -#line 80 "/data/projects/seahorse/common/exportable.vala" +#line 80 "/data/src/seahorse/common/exportable.vala" _tmp6_ = _g_object_ref0 ((SeahorseExporter*) exporter_it->data); -#line 80 "/data/projects/seahorse/common/exportable.vala" +#line 80 "/data/src/seahorse/common/exportable.vala" exporter = _tmp6_; #line 539 "exportable.c" { SeahorseExporter* _tmp7_ = NULL; GObject* _tmp8_ = NULL; -#line 81 "/data/projects/seahorse/common/exportable.vala" +#line 81 "/data/src/seahorse/common/exportable.vala" _tmp7_ = exporter; -#line 81 "/data/projects/seahorse/common/exportable.vala" +#line 81 "/data/src/seahorse/common/exportable.vala" _tmp8_ = object; -#line 81 "/data/projects/seahorse/common/exportable.vala" +#line 81 "/data/src/seahorse/common/exportable.vala" seahorse_exporter_add_object (_tmp7_, _tmp8_); -#line 80 "/data/projects/seahorse/common/exportable.vala" +#line 80 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (exporter); #line 551 "exportable.c" } @@ -554,42 +554,42 @@ } else { GObject* _tmp9_ = NULL; GList* _tmp10_ = NULL; -#line 85 "/data/projects/seahorse/common/exportable.vala" +#line 85 "/data/src/seahorse/common/exportable.vala" _tmp9_ = object; -#line 85 "/data/projects/seahorse/common/exportable.vala" +#line 85 "/data/src/seahorse/common/exportable.vala" _tmp10_ = seahorse_exportable_create_exporters (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, SEAHORSE_TYPE_EXPORTABLE, SeahorseExportable), SEAHORSE_EXPORTER_TYPE_TEXTUAL); -#line 85 "/data/projects/seahorse/common/exportable.vala" +#line 85 "/data/src/seahorse/common/exportable.vala" __g_list_free__g_object_unref0_0 (exporters); -#line 85 "/data/projects/seahorse/common/exportable.vala" +#line 85 "/data/src/seahorse/common/exportable.vala" exporters = _tmp10_; #line 566 "exportable.c" } -#line 74 "/data/projects/seahorse/common/exportable.vala" +#line 74 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (object); #line 570 "exportable.c" } } } -#line 90 "/data/projects/seahorse/common/exportable.vala" +#line 90 "/data/src/seahorse/common/exportable.vala" chosen = NULL; -#line 91 "/data/projects/seahorse/common/exportable.vala" +#line 91 "/data/src/seahorse/common/exportable.vala" total = (guint) 0; -#line 92 "/data/projects/seahorse/common/exportable.vala" +#line 92 "/data/src/seahorse/common/exportable.vala" _tmp11_ = exporters; #line 580 "exportable.c" { GList* exporter_collection = NULL; GList* exporter_it = NULL; -#line 92 "/data/projects/seahorse/common/exportable.vala" +#line 92 "/data/src/seahorse/common/exportable.vala" exporter_collection = _tmp11_; -#line 92 "/data/projects/seahorse/common/exportable.vala" +#line 92 "/data/src/seahorse/common/exportable.vala" for (exporter_it = exporter_collection; exporter_it != NULL; exporter_it = exporter_it->next) { #line 588 "exportable.c" SeahorseExporter* _tmp12_ = NULL; SeahorseExporter* exporter = NULL; -#line 92 "/data/projects/seahorse/common/exportable.vala" +#line 92 "/data/src/seahorse/common/exportable.vala" _tmp12_ = _g_object_ref0 ((SeahorseExporter*) exporter_it->data); -#line 92 "/data/projects/seahorse/common/exportable.vala" +#line 92 "/data/src/seahorse/common/exportable.vala" exporter = _tmp12_; #line 595 "exportable.c" { @@ -599,47 +599,47 @@ guint _tmp15_ = 0U; guint _tmp16_ = 0U; guint _tmp17_ = 0U; -#line 93 "/data/projects/seahorse/common/exportable.vala" +#line 93 "/data/src/seahorse/common/exportable.vala" _tmp13_ = exporter; -#line 93 "/data/projects/seahorse/common/exportable.vala" +#line 93 "/data/src/seahorse/common/exportable.vala" _tmp14_ = seahorse_exporter_get_objects (_tmp13_); -#line 93 "/data/projects/seahorse/common/exportable.vala" +#line 93 "/data/src/seahorse/common/exportable.vala" _tmp15_ = g_list_length (_tmp14_); -#line 93 "/data/projects/seahorse/common/exportable.vala" +#line 93 "/data/src/seahorse/common/exportable.vala" count = _tmp15_; -#line 94 "/data/projects/seahorse/common/exportable.vala" +#line 94 "/data/src/seahorse/common/exportable.vala" _tmp16_ = count; -#line 94 "/data/projects/seahorse/common/exportable.vala" +#line 94 "/data/src/seahorse/common/exportable.vala" _tmp17_ = total; -#line 94 "/data/projects/seahorse/common/exportable.vala" +#line 94 "/data/src/seahorse/common/exportable.vala" if (_tmp16_ > _tmp17_) { #line 617 "exportable.c" guint _tmp18_ = 0U; SeahorseExporter* _tmp19_ = NULL; SeahorseExporter* _tmp20_ = NULL; -#line 95 "/data/projects/seahorse/common/exportable.vala" +#line 95 "/data/src/seahorse/common/exportable.vala" _tmp18_ = count; -#line 95 "/data/projects/seahorse/common/exportable.vala" +#line 95 "/data/src/seahorse/common/exportable.vala" total = _tmp18_; -#line 96 "/data/projects/seahorse/common/exportable.vala" +#line 96 "/data/src/seahorse/common/exportable.vala" _tmp19_ = exporter; -#line 96 "/data/projects/seahorse/common/exportable.vala" +#line 96 "/data/src/seahorse/common/exportable.vala" _tmp20_ = _g_object_ref0 (_tmp19_); -#line 96 "/data/projects/seahorse/common/exportable.vala" +#line 96 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (chosen); -#line 96 "/data/projects/seahorse/common/exportable.vala" +#line 96 "/data/src/seahorse/common/exportable.vala" chosen = _tmp20_; #line 633 "exportable.c" } -#line 92 "/data/projects/seahorse/common/exportable.vala" +#line 92 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (exporter); #line 637 "exportable.c" } } } -#line 100 "/data/projects/seahorse/common/exportable.vala" +#line 100 "/data/src/seahorse/common/exportable.vala" _tmp21_ = chosen; -#line 100 "/data/projects/seahorse/common/exportable.vala" +#line 100 "/data/src/seahorse/common/exportable.vala" if (_tmp21_ != NULL) { #line 645 "exportable.c" Block4Data* _data4_; @@ -653,128 +653,128 @@ guint8* _tmp29_ = NULL; gint _tmp25__length1 = 0; gint __tmp25__size_ = 0; -#line 100 "/data/projects/seahorse/common/exportable.vala" +#line 100 "/data/src/seahorse/common/exportable.vala" _data4_ = g_slice_new0 (Block4Data); -#line 100 "/data/projects/seahorse/common/exportable.vala" +#line 100 "/data/src/seahorse/common/exportable.vala" _data4_->_ref_count_ = 1; -#line 101 "/data/projects/seahorse/common/exportable.vala" +#line 101 "/data/src/seahorse/common/exportable.vala" _tmp22_ = g_main_loop_new (NULL, FALSE); -#line 101 "/data/projects/seahorse/common/exportable.vala" +#line 101 "/data/src/seahorse/common/exportable.vala" _data4_->loop = _tmp22_; -#line 102 "/data/projects/seahorse/common/exportable.vala" +#line 102 "/data/src/seahorse/common/exportable.vala" _data4_->_result_ = NULL; -#line 104 "/data/projects/seahorse/common/exportable.vala" +#line 104 "/data/src/seahorse/common/exportable.vala" _tmp23_ = chosen; -#line 104 "/data/projects/seahorse/common/exportable.vala" +#line 104 "/data/src/seahorse/common/exportable.vala" seahorse_exporter_export (_tmp23_, NULL, ____lambda3__gasync_ready_callback, block4_data_ref (_data4_)); -#line 109 "/data/projects/seahorse/common/exportable.vala" +#line 109 "/data/src/seahorse/common/exportable.vala" _tmp24_ = _data4_->loop; -#line 109 "/data/projects/seahorse/common/exportable.vala" +#line 109 "/data/src/seahorse/common/exportable.vala" g_main_loop_run (_tmp24_); -#line 111 "/data/projects/seahorse/common/exportable.vala" +#line 111 "/data/src/seahorse/common/exportable.vala" _tmp26_ = chosen; -#line 111 "/data/projects/seahorse/common/exportable.vala" +#line 111 "/data/src/seahorse/common/exportable.vala" _tmp27_ = _data4_->_result_; -#line 111 "/data/projects/seahorse/common/exportable.vala" +#line 111 "/data/src/seahorse/common/exportable.vala" _tmp29_ = seahorse_exporter_export_finish (_tmp26_, _tmp27_, &_tmp28_, &_inner_error_); -#line 111 "/data/projects/seahorse/common/exportable.vala" +#line 111 "/data/src/seahorse/common/exportable.vala" _tmp25_ = _tmp29_; -#line 111 "/data/projects/seahorse/common/exportable.vala" +#line 111 "/data/src/seahorse/common/exportable.vala" _tmp25__length1 = _tmp28_; -#line 111 "/data/projects/seahorse/common/exportable.vala" +#line 111 "/data/src/seahorse/common/exportable.vala" __tmp25__size_ = _tmp25__length1; -#line 111 "/data/projects/seahorse/common/exportable.vala" +#line 111 "/data/src/seahorse/common/exportable.vala" if (_inner_error_ != NULL) { -#line 111 "/data/projects/seahorse/common/exportable.vala" +#line 111 "/data/src/seahorse/common/exportable.vala" g_propagate_error (error, _inner_error_); -#line 111 "/data/projects/seahorse/common/exportable.vala" +#line 111 "/data/src/seahorse/common/exportable.vala" block4_data_unref (_data4_); -#line 111 "/data/projects/seahorse/common/exportable.vala" +#line 111 "/data/src/seahorse/common/exportable.vala" _data4_ = NULL; -#line 111 "/data/projects/seahorse/common/exportable.vala" +#line 111 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (chosen); -#line 111 "/data/projects/seahorse/common/exportable.vala" +#line 111 "/data/src/seahorse/common/exportable.vala" __g_list_free__g_object_unref0_0 (exporters); -#line 111 "/data/projects/seahorse/common/exportable.vala" +#line 111 "/data/src/seahorse/common/exportable.vala" return 0U; #line 701 "exportable.c" } -#line 111 "/data/projects/seahorse/common/exportable.vala" +#line 111 "/data/src/seahorse/common/exportable.vala" _vala_output = (g_free (_vala_output), NULL); -#line 111 "/data/projects/seahorse/common/exportable.vala" +#line 111 "/data/src/seahorse/common/exportable.vala" _vala_output = _tmp25_; -#line 111 "/data/projects/seahorse/common/exportable.vala" +#line 111 "/data/src/seahorse/common/exportable.vala" _vala_output_length1 = _tmp25__length1; -#line 112 "/data/projects/seahorse/common/exportable.vala" +#line 112 "/data/src/seahorse/common/exportable.vala" result = total; -#line 112 "/data/projects/seahorse/common/exportable.vala" +#line 112 "/data/src/seahorse/common/exportable.vala" block4_data_unref (_data4_); -#line 112 "/data/projects/seahorse/common/exportable.vala" +#line 112 "/data/src/seahorse/common/exportable.vala" _data4_ = NULL; -#line 112 "/data/projects/seahorse/common/exportable.vala" +#line 112 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (chosen); -#line 112 "/data/projects/seahorse/common/exportable.vala" +#line 112 "/data/src/seahorse/common/exportable.vala" __g_list_free__g_object_unref0_0 (exporters); -#line 112 "/data/projects/seahorse/common/exportable.vala" +#line 112 "/data/src/seahorse/common/exportable.vala" if (output) { -#line 112 "/data/projects/seahorse/common/exportable.vala" +#line 112 "/data/src/seahorse/common/exportable.vala" *output = _vala_output; #line 723 "exportable.c" } else { -#line 112 "/data/projects/seahorse/common/exportable.vala" +#line 112 "/data/src/seahorse/common/exportable.vala" _vala_output = (g_free (_vala_output), NULL); #line 727 "exportable.c" } -#line 112 "/data/projects/seahorse/common/exportable.vala" +#line 112 "/data/src/seahorse/common/exportable.vala" if (output_length1) { -#line 112 "/data/projects/seahorse/common/exportable.vala" +#line 112 "/data/src/seahorse/common/exportable.vala" *output_length1 = _vala_output_length1; #line 733 "exportable.c" } -#line 112 "/data/projects/seahorse/common/exportable.vala" +#line 112 "/data/src/seahorse/common/exportable.vala" return result; #line 737 "exportable.c" } -#line 115 "/data/projects/seahorse/common/exportable.vala" +#line 115 "/data/src/seahorse/common/exportable.vala" _tmp30_ = g_new0 (guint8, 0); -#line 115 "/data/projects/seahorse/common/exportable.vala" +#line 115 "/data/src/seahorse/common/exportable.vala" _vala_output = (g_free (_vala_output), NULL); -#line 115 "/data/projects/seahorse/common/exportable.vala" +#line 115 "/data/src/seahorse/common/exportable.vala" _vala_output = _tmp30_; -#line 115 "/data/projects/seahorse/common/exportable.vala" +#line 115 "/data/src/seahorse/common/exportable.vala" _vala_output_length1 = 0; -#line 116 "/data/projects/seahorse/common/exportable.vala" +#line 116 "/data/src/seahorse/common/exportable.vala" result = (guint) 0; -#line 116 "/data/projects/seahorse/common/exportable.vala" +#line 116 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (chosen); -#line 116 "/data/projects/seahorse/common/exportable.vala" +#line 116 "/data/src/seahorse/common/exportable.vala" __g_list_free__g_object_unref0_0 (exporters); -#line 116 "/data/projects/seahorse/common/exportable.vala" +#line 116 "/data/src/seahorse/common/exportable.vala" if (output) { -#line 116 "/data/projects/seahorse/common/exportable.vala" +#line 116 "/data/src/seahorse/common/exportable.vala" *output = _vala_output; #line 757 "exportable.c" } else { -#line 116 "/data/projects/seahorse/common/exportable.vala" +#line 116 "/data/src/seahorse/common/exportable.vala" _vala_output = (g_free (_vala_output), NULL); #line 761 "exportable.c" } -#line 116 "/data/projects/seahorse/common/exportable.vala" +#line 116 "/data/src/seahorse/common/exportable.vala" if (output_length1) { -#line 116 "/data/projects/seahorse/common/exportable.vala" +#line 116 "/data/src/seahorse/common/exportable.vala" *output_length1 = _vala_output_length1; #line 767 "exportable.c" } -#line 116 "/data/projects/seahorse/common/exportable.vala" +#line 116 "/data/src/seahorse/common/exportable.vala" return result; #line 771 "exportable.c" } static Block5Data* block5_data_ref (Block5Data* _data5_) { -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" g_atomic_int_inc (&_data5_->_ref_count_); -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" return _data5_; #line 780 "exportable.c" } @@ -783,13 +783,13 @@ static void block5_data_unref (void * _userdata_) { Block5Data* _data5_; _data5_ = (Block5Data*) _userdata_; -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) { -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (_data5_->_result_); -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" _g_main_loop_unref0 (_data5_->loop); -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" g_slice_free (Block5Data, _data5_); #line 795 "exportable.c" } @@ -800,28 +800,28 @@ GAsyncResult* _tmp0_ = NULL; GAsyncResult* _tmp1_ = NULL; GMainLoop* _tmp2_ = NULL; -#line 162 "/data/projects/seahorse/common/exportable.vala" +#line 162 "/data/src/seahorse/common/exportable.vala" g_return_if_fail (res != NULL); -#line 163 "/data/projects/seahorse/common/exportable.vala" +#line 163 "/data/src/seahorse/common/exportable.vala" _tmp0_ = res; -#line 163 "/data/projects/seahorse/common/exportable.vala" +#line 163 "/data/src/seahorse/common/exportable.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 163 "/data/projects/seahorse/common/exportable.vala" +#line 163 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (_data5_->_result_); -#line 163 "/data/projects/seahorse/common/exportable.vala" +#line 163 "/data/src/seahorse/common/exportable.vala" _data5_->_result_ = _tmp1_; -#line 164 "/data/projects/seahorse/common/exportable.vala" +#line 164 "/data/src/seahorse/common/exportable.vala" _tmp2_ = _data5_->loop; -#line 164 "/data/projects/seahorse/common/exportable.vala" +#line 164 "/data/src/seahorse/common/exportable.vala" g_main_loop_quit (_tmp2_); #line 818 "exportable.c" } static void _____lambda5__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 162 "/data/projects/seahorse/common/exportable.vala" +#line 162 "/data/src/seahorse/common/exportable.vala" ____lambda5_ (self, source_object, res); -#line 162 "/data/projects/seahorse/common/exportable.vala" +#line 162 "/data/src/seahorse/common/exportable.vala" block5_data_unref (self); #line 827 "exportable.c" } @@ -837,65 +837,65 @@ GList* _tmp3_ = NULL; GList* _tmp7_ = NULL; GError * _inner_error_ = NULL; -#line 121 "/data/projects/seahorse/common/exportable.vala" +#line 121 "/data/src/seahorse/common/exportable.vala" count = 0; -#line 123 "/data/projects/seahorse/common/exportable.vala" +#line 123 "/data/src/seahorse/common/exportable.vala" _tmp0_ = g_direct_hash; -#line 123 "/data/projects/seahorse/common/exportable.vala" +#line 123 "/data/src/seahorse/common/exportable.vala" _tmp1_ = g_direct_equal; -#line 123 "/data/projects/seahorse/common/exportable.vala" +#line 123 "/data/src/seahorse/common/exportable.vala" _tmp2_ = g_hash_table_new_full (_tmp0_, _tmp1_, NULL, NULL); -#line 123 "/data/projects/seahorse/common/exportable.vala" +#line 123 "/data/src/seahorse/common/exportable.vala" pending = _tmp2_; -#line 124 "/data/projects/seahorse/common/exportable.vala" +#line 124 "/data/src/seahorse/common/exportable.vala" _tmp3_ = objects; #line 853 "exportable.c" { GList* object_collection = NULL; GList* object_it = NULL; -#line 124 "/data/projects/seahorse/common/exportable.vala" +#line 124 "/data/src/seahorse/common/exportable.vala" object_collection = _tmp3_; -#line 124 "/data/projects/seahorse/common/exportable.vala" +#line 124 "/data/src/seahorse/common/exportable.vala" for (object_it = object_collection; object_it != NULL; object_it = object_it->next) { #line 861 "exportable.c" GObject* _tmp4_ = NULL; GObject* object = NULL; -#line 124 "/data/projects/seahorse/common/exportable.vala" +#line 124 "/data/src/seahorse/common/exportable.vala" _tmp4_ = _g_object_ref0 ((GObject*) object_it->data); -#line 124 "/data/projects/seahorse/common/exportable.vala" +#line 124 "/data/src/seahorse/common/exportable.vala" object = _tmp4_; #line 868 "exportable.c" { GHashTable* _tmp5_ = NULL; GObject* _tmp6_ = NULL; -#line 125 "/data/projects/seahorse/common/exportable.vala" +#line 125 "/data/src/seahorse/common/exportable.vala" _tmp5_ = pending; -#line 125 "/data/projects/seahorse/common/exportable.vala" +#line 125 "/data/src/seahorse/common/exportable.vala" _tmp6_ = object; -#line 125 "/data/projects/seahorse/common/exportable.vala" +#line 125 "/data/src/seahorse/common/exportable.vala" g_hash_table_add (_tmp5_, _tmp6_); -#line 124 "/data/projects/seahorse/common/exportable.vala" +#line 124 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (object); #line 880 "exportable.c" } } } -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" _tmp7_ = objects; #line 886 "exportable.c" { GList* object_collection = NULL; GList* object_it = NULL; -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" object_collection = _tmp7_; -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" for (object_it = object_collection; object_it != NULL; object_it = object_it->next) { #line 894 "exportable.c" GObject* _tmp8_ = NULL; GObject* object = NULL; -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" _tmp8_ = _g_object_ref0 ((GObject*) object_it->data); -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" object = _tmp8_; #line 901 "exportable.c" { @@ -928,91 +928,91 @@ GAsyncResult* _tmp41_ = NULL; SeahorseExporter* _tmp42_ = NULL; GList* _tmp43_ = NULL; -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" _data5_ = g_slice_new0 (Block5Data); -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" _data5_->_ref_count_ = 1; -#line 128 "/data/projects/seahorse/common/exportable.vala" +#line 128 "/data/src/seahorse/common/exportable.vala" _tmp9_ = pending; -#line 128 "/data/projects/seahorse/common/exportable.vala" +#line 128 "/data/src/seahorse/common/exportable.vala" _tmp10_ = object; -#line 128 "/data/projects/seahorse/common/exportable.vala" +#line 128 "/data/src/seahorse/common/exportable.vala" _tmp11_ = g_hash_table_lookup (_tmp9_, _tmp10_); -#line 128 "/data/projects/seahorse/common/exportable.vala" +#line 128 "/data/src/seahorse/common/exportable.vala" if (((GObject*) _tmp11_) == NULL) { -#line 129 "/data/projects/seahorse/common/exportable.vala" +#line 129 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (object); -#line 129 "/data/projects/seahorse/common/exportable.vala" +#line 129 "/data/src/seahorse/common/exportable.vala" block5_data_unref (_data5_); -#line 129 "/data/projects/seahorse/common/exportable.vala" +#line 129 "/data/src/seahorse/common/exportable.vala" _data5_ = NULL; -#line 129 "/data/projects/seahorse/common/exportable.vala" +#line 129 "/data/src/seahorse/common/exportable.vala" continue; #line 952 "exportable.c" } -#line 131 "/data/projects/seahorse/common/exportable.vala" +#line 131 "/data/src/seahorse/common/exportable.vala" _tmp12_ = object; -#line 131 "/data/projects/seahorse/common/exportable.vala" +#line 131 "/data/src/seahorse/common/exportable.vala" _tmp13_ = seahorse_exportable_can_export (_tmp12_); -#line 131 "/data/projects/seahorse/common/exportable.vala" +#line 131 "/data/src/seahorse/common/exportable.vala" if (!_tmp13_) { #line 960 "exportable.c" GHashTable* _tmp14_ = NULL; GObject* _tmp15_ = NULL; -#line 132 "/data/projects/seahorse/common/exportable.vala" +#line 132 "/data/src/seahorse/common/exportable.vala" _tmp14_ = pending; -#line 132 "/data/projects/seahorse/common/exportable.vala" +#line 132 "/data/src/seahorse/common/exportable.vala" _tmp15_ = object; -#line 132 "/data/projects/seahorse/common/exportable.vala" +#line 132 "/data/src/seahorse/common/exportable.vala" g_hash_table_remove (_tmp14_, _tmp15_); -#line 133 "/data/projects/seahorse/common/exportable.vala" +#line 133 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (object); -#line 133 "/data/projects/seahorse/common/exportable.vala" +#line 133 "/data/src/seahorse/common/exportable.vala" block5_data_unref (_data5_); -#line 133 "/data/projects/seahorse/common/exportable.vala" +#line 133 "/data/src/seahorse/common/exportable.vala" _data5_ = NULL; -#line 133 "/data/projects/seahorse/common/exportable.vala" +#line 133 "/data/src/seahorse/common/exportable.vala" continue; #line 977 "exportable.c" } -#line 136 "/data/projects/seahorse/common/exportable.vala" +#line 136 "/data/src/seahorse/common/exportable.vala" _tmp16_ = object; -#line 136 "/data/projects/seahorse/common/exportable.vala" +#line 136 "/data/src/seahorse/common/exportable.vala" _tmp17_ = seahorse_exportable_create_exporters (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SEAHORSE_TYPE_EXPORTABLE, SeahorseExportable), SEAHORSE_EXPORTER_TYPE_ANY); -#line 136 "/data/projects/seahorse/common/exportable.vala" +#line 136 "/data/src/seahorse/common/exportable.vala" exporters = _tmp17_; -#line 137 "/data/projects/seahorse/common/exportable.vala" +#line 137 "/data/src/seahorse/common/exportable.vala" _tmp18_ = exporters; -#line 137 "/data/projects/seahorse/common/exportable.vala" +#line 137 "/data/src/seahorse/common/exportable.vala" if (_tmp18_ == NULL) { -#line 138 "/data/projects/seahorse/common/exportable.vala" +#line 138 "/data/src/seahorse/common/exportable.vala" __g_list_free__g_object_unref0_0 (exporters); -#line 138 "/data/projects/seahorse/common/exportable.vala" +#line 138 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (object); -#line 138 "/data/projects/seahorse/common/exportable.vala" +#line 138 "/data/src/seahorse/common/exportable.vala" block5_data_unref (_data5_); -#line 138 "/data/projects/seahorse/common/exportable.vala" +#line 138 "/data/src/seahorse/common/exportable.vala" _data5_ = NULL; -#line 138 "/data/projects/seahorse/common/exportable.vala" +#line 138 "/data/src/seahorse/common/exportable.vala" continue; #line 999 "exportable.c" } -#line 140 "/data/projects/seahorse/common/exportable.vala" +#line 140 "/data/src/seahorse/common/exportable.vala" _tmp19_ = objects; #line 1003 "exportable.c" { GList* x_collection = NULL; GList* x_it = NULL; -#line 140 "/data/projects/seahorse/common/exportable.vala" +#line 140 "/data/src/seahorse/common/exportable.vala" x_collection = _tmp19_; -#line 140 "/data/projects/seahorse/common/exportable.vala" +#line 140 "/data/src/seahorse/common/exportable.vala" for (x_it = x_collection; x_it != NULL; x_it = x_it->next) { #line 1011 "exportable.c" GObject* _tmp20_ = NULL; GObject* x = NULL; -#line 140 "/data/projects/seahorse/common/exportable.vala" +#line 140 "/data/src/seahorse/common/exportable.vala" _tmp20_ = _g_object_ref0 ((GObject*) x_it->data); -#line 140 "/data/projects/seahorse/common/exportable.vala" +#line 140 "/data/src/seahorse/common/exportable.vala" x = _tmp20_; #line 1018 "exportable.c" { @@ -1021,212 +1021,212 @@ GHashTable* _tmp23_ = NULL; GObject* _tmp24_ = NULL; gconstpointer _tmp25_ = NULL; -#line 141 "/data/projects/seahorse/common/exportable.vala" +#line 141 "/data/src/seahorse/common/exportable.vala" _tmp21_ = x; -#line 141 "/data/projects/seahorse/common/exportable.vala" +#line 141 "/data/src/seahorse/common/exportable.vala" _tmp22_ = object; -#line 141 "/data/projects/seahorse/common/exportable.vala" +#line 141 "/data/src/seahorse/common/exportable.vala" if (_tmp21_ == _tmp22_) { -#line 142 "/data/projects/seahorse/common/exportable.vala" +#line 142 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (x); -#line 142 "/data/projects/seahorse/common/exportable.vala" +#line 142 "/data/src/seahorse/common/exportable.vala" continue; #line 1035 "exportable.c" } -#line 143 "/data/projects/seahorse/common/exportable.vala" +#line 143 "/data/src/seahorse/common/exportable.vala" _tmp23_ = pending; -#line 143 "/data/projects/seahorse/common/exportable.vala" +#line 143 "/data/src/seahorse/common/exportable.vala" _tmp24_ = x; -#line 143 "/data/projects/seahorse/common/exportable.vala" +#line 143 "/data/src/seahorse/common/exportable.vala" _tmp25_ = g_hash_table_lookup (_tmp23_, _tmp24_); -#line 143 "/data/projects/seahorse/common/exportable.vala" +#line 143 "/data/src/seahorse/common/exportable.vala" if (((GObject*) _tmp25_) != NULL) { #line 1045 "exportable.c" GList* _tmp26_ = NULL; -#line 144 "/data/projects/seahorse/common/exportable.vala" +#line 144 "/data/src/seahorse/common/exportable.vala" _tmp26_ = exporters; #line 1049 "exportable.c" { GList* exporter_collection = NULL; GList* exporter_it = NULL; -#line 144 "/data/projects/seahorse/common/exportable.vala" +#line 144 "/data/src/seahorse/common/exportable.vala" exporter_collection = _tmp26_; -#line 144 "/data/projects/seahorse/common/exportable.vala" +#line 144 "/data/src/seahorse/common/exportable.vala" for (exporter_it = exporter_collection; exporter_it != NULL; exporter_it = exporter_it->next) { #line 1057 "exportable.c" SeahorseExporter* _tmp27_ = NULL; SeahorseExporter* exporter = NULL; -#line 144 "/data/projects/seahorse/common/exportable.vala" +#line 144 "/data/src/seahorse/common/exportable.vala" _tmp27_ = _g_object_ref0 ((SeahorseExporter*) exporter_it->data); -#line 144 "/data/projects/seahorse/common/exportable.vala" +#line 144 "/data/src/seahorse/common/exportable.vala" exporter = _tmp27_; #line 1064 "exportable.c" { SeahorseExporter* _tmp28_ = NULL; GObject* _tmp29_ = NULL; -#line 145 "/data/projects/seahorse/common/exportable.vala" +#line 145 "/data/src/seahorse/common/exportable.vala" _tmp28_ = exporter; -#line 145 "/data/projects/seahorse/common/exportable.vala" +#line 145 "/data/src/seahorse/common/exportable.vala" _tmp29_ = x; -#line 145 "/data/projects/seahorse/common/exportable.vala" +#line 145 "/data/src/seahorse/common/exportable.vala" seahorse_exporter_add_object (_tmp28_, _tmp29_); -#line 144 "/data/projects/seahorse/common/exportable.vala" +#line 144 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (exporter); #line 1076 "exportable.c" } } } } -#line 140 "/data/projects/seahorse/common/exportable.vala" +#line 140 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (x); #line 1083 "exportable.c" } } } -#line 149 "/data/projects/seahorse/common/exportable.vala" +#line 149 "/data/src/seahorse/common/exportable.vala" directory = NULL; -#line 154 "/data/projects/seahorse/common/exportable.vala" +#line 154 "/data/src/seahorse/common/exportable.vala" _tmp30_ = exporters; -#line 154 "/data/projects/seahorse/common/exportable.vala" +#line 154 "/data/src/seahorse/common/exportable.vala" _tmp31_ = parent; -#line 154 "/data/projects/seahorse/common/exportable.vala" +#line 154 "/data/src/seahorse/common/exportable.vala" _tmp34_ = seahorse_exportable_prompt (_tmp30_, _tmp31_, &directory, &_tmp32_, &_tmp33_); -#line 154 "/data/projects/seahorse/common/exportable.vala" +#line 154 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (file); -#line 154 "/data/projects/seahorse/common/exportable.vala" +#line 154 "/data/src/seahorse/common/exportable.vala" file = _tmp32_; -#line 154 "/data/projects/seahorse/common/exportable.vala" +#line 154 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (exporter); -#line 154 "/data/projects/seahorse/common/exportable.vala" +#line 154 "/data/src/seahorse/common/exportable.vala" exporter = _tmp33_; -#line 154 "/data/projects/seahorse/common/exportable.vala" +#line 154 "/data/src/seahorse/common/exportable.vala" ret = _tmp34_; -#line 156 "/data/projects/seahorse/common/exportable.vala" +#line 156 "/data/src/seahorse/common/exportable.vala" _tmp35_ = ret; -#line 156 "/data/projects/seahorse/common/exportable.vala" +#line 156 "/data/src/seahorse/common/exportable.vala" if (!_tmp35_) { -#line 157 "/data/projects/seahorse/common/exportable.vala" +#line 157 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (exporter); -#line 157 "/data/projects/seahorse/common/exportable.vala" +#line 157 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (file); -#line 157 "/data/projects/seahorse/common/exportable.vala" +#line 157 "/data/src/seahorse/common/exportable.vala" _g_free0 (directory); -#line 157 "/data/projects/seahorse/common/exportable.vala" +#line 157 "/data/src/seahorse/common/exportable.vala" __g_list_free__g_object_unref0_0 (exporters); -#line 157 "/data/projects/seahorse/common/exportable.vala" +#line 157 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (object); -#line 157 "/data/projects/seahorse/common/exportable.vala" +#line 157 "/data/src/seahorse/common/exportable.vala" block5_data_unref (_data5_); -#line 157 "/data/projects/seahorse/common/exportable.vala" +#line 157 "/data/src/seahorse/common/exportable.vala" _data5_ = NULL; -#line 157 "/data/projects/seahorse/common/exportable.vala" +#line 157 "/data/src/seahorse/common/exportable.vala" break; #line 1125 "exportable.c" } -#line 159 "/data/projects/seahorse/common/exportable.vala" +#line 159 "/data/src/seahorse/common/exportable.vala" _tmp36_ = g_main_loop_new (NULL, FALSE); -#line 159 "/data/projects/seahorse/common/exportable.vala" +#line 159 "/data/src/seahorse/common/exportable.vala" _data5_->loop = _tmp36_; -#line 160 "/data/projects/seahorse/common/exportable.vala" +#line 160 "/data/src/seahorse/common/exportable.vala" _data5_->_result_ = NULL; -#line 162 "/data/projects/seahorse/common/exportable.vala" +#line 162 "/data/src/seahorse/common/exportable.vala" _tmp37_ = exporter; -#line 162 "/data/projects/seahorse/common/exportable.vala" +#line 162 "/data/src/seahorse/common/exportable.vala" _tmp38_ = file; -#line 162 "/data/projects/seahorse/common/exportable.vala" +#line 162 "/data/src/seahorse/common/exportable.vala" seahorse_exporter_export_to_file (_tmp37_, _tmp38_, TRUE, NULL, _____lambda5__gasync_ready_callback, block5_data_ref (_data5_)); -#line 167 "/data/projects/seahorse/common/exportable.vala" +#line 167 "/data/src/seahorse/common/exportable.vala" _tmp39_ = _data5_->loop; -#line 167 "/data/projects/seahorse/common/exportable.vala" +#line 167 "/data/src/seahorse/common/exportable.vala" g_main_loop_run (_tmp39_); -#line 169 "/data/projects/seahorse/common/exportable.vala" +#line 169 "/data/src/seahorse/common/exportable.vala" _tmp40_ = exporter; -#line 169 "/data/projects/seahorse/common/exportable.vala" +#line 169 "/data/src/seahorse/common/exportable.vala" _tmp41_ = _data5_->_result_; -#line 169 "/data/projects/seahorse/common/exportable.vala" +#line 169 "/data/src/seahorse/common/exportable.vala" seahorse_exporter_export_to_file_finish (_tmp40_, _tmp41_, &_inner_error_); -#line 169 "/data/projects/seahorse/common/exportable.vala" +#line 169 "/data/src/seahorse/common/exportable.vala" if (_inner_error_ != NULL) { -#line 169 "/data/projects/seahorse/common/exportable.vala" +#line 169 "/data/src/seahorse/common/exportable.vala" g_propagate_error (error, _inner_error_); -#line 169 "/data/projects/seahorse/common/exportable.vala" +#line 169 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (exporter); -#line 169 "/data/projects/seahorse/common/exportable.vala" +#line 169 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (file); -#line 169 "/data/projects/seahorse/common/exportable.vala" +#line 169 "/data/src/seahorse/common/exportable.vala" _g_free0 (directory); -#line 169 "/data/projects/seahorse/common/exportable.vala" +#line 169 "/data/src/seahorse/common/exportable.vala" __g_list_free__g_object_unref0_0 (exporters); -#line 169 "/data/projects/seahorse/common/exportable.vala" +#line 169 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (object); -#line 169 "/data/projects/seahorse/common/exportable.vala" +#line 169 "/data/src/seahorse/common/exportable.vala" block5_data_unref (_data5_); -#line 169 "/data/projects/seahorse/common/exportable.vala" +#line 169 "/data/src/seahorse/common/exportable.vala" _data5_ = NULL; -#line 169 "/data/projects/seahorse/common/exportable.vala" +#line 169 "/data/src/seahorse/common/exportable.vala" _g_hash_table_unref0 (pending); -#line 169 "/data/projects/seahorse/common/exportable.vala" +#line 169 "/data/src/seahorse/common/exportable.vala" return 0; #line 1171 "exportable.c" } -#line 170 "/data/projects/seahorse/common/exportable.vala" +#line 170 "/data/src/seahorse/common/exportable.vala" _tmp42_ = exporter; -#line 170 "/data/projects/seahorse/common/exportable.vala" +#line 170 "/data/src/seahorse/common/exportable.vala" _tmp43_ = seahorse_exporter_get_objects (_tmp42_); #line 1177 "exportable.c" { GList* e_collection = NULL; GList* e_it = NULL; -#line 170 "/data/projects/seahorse/common/exportable.vala" +#line 170 "/data/src/seahorse/common/exportable.vala" e_collection = _tmp43_; -#line 170 "/data/projects/seahorse/common/exportable.vala" +#line 170 "/data/src/seahorse/common/exportable.vala" for (e_it = e_collection; e_it != NULL; e_it = e_it->next) { #line 1185 "exportable.c" GObject* e = NULL; -#line 170 "/data/projects/seahorse/common/exportable.vala" +#line 170 "/data/src/seahorse/common/exportable.vala" e = (GObject*) e_it->data; #line 1189 "exportable.c" { GHashTable* _tmp44_ = NULL; GObject* _tmp45_ = NULL; gint _tmp46_ = 0; -#line 171 "/data/projects/seahorse/common/exportable.vala" +#line 171 "/data/src/seahorse/common/exportable.vala" _tmp44_ = pending; -#line 171 "/data/projects/seahorse/common/exportable.vala" +#line 171 "/data/src/seahorse/common/exportable.vala" _tmp45_ = e; -#line 171 "/data/projects/seahorse/common/exportable.vala" +#line 171 "/data/src/seahorse/common/exportable.vala" g_hash_table_remove (_tmp44_, _tmp45_); -#line 172 "/data/projects/seahorse/common/exportable.vala" +#line 172 "/data/src/seahorse/common/exportable.vala" _tmp46_ = count; -#line 172 "/data/projects/seahorse/common/exportable.vala" +#line 172 "/data/src/seahorse/common/exportable.vala" count = _tmp46_ + 1; #line 1204 "exportable.c" } } } -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (exporter); -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (file); -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" _g_free0 (directory); -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" __g_list_free__g_object_unref0_0 (exporters); -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (object); -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" block5_data_unref (_data5_); -#line 127 "/data/projects/seahorse/common/exportable.vala" +#line 127 "/data/src/seahorse/common/exportable.vala" _data5_ = NULL; #line 1222 "exportable.c" } } } -#line 176 "/data/projects/seahorse/common/exportable.vala" +#line 176 "/data/src/seahorse/common/exportable.vala" result = count; -#line 176 "/data/projects/seahorse/common/exportable.vala" +#line 176 "/data/src/seahorse/common/exportable.vala" _g_hash_table_unref0 (pending); -#line 176 "/data/projects/seahorse/common/exportable.vala" +#line 176 "/data/src/seahorse/common/exportable.vala" return result; #line 1232 "exportable.c" } @@ -1239,33 +1239,33 @@ gunichar _tmp1_ = 0U; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 928 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 928 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 929 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 929 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 929 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) (-1), _tmp1_); -#line 929 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 931 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 931 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 931 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 931 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 1257 "exportable.c" gchar* _tmp4_ = NULL; -#line 932 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 932 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 932 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return result; #line 1265 "exportable.c" } else { -#line 934 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 934 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" result = -1; -#line 934 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 934 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return result; #line 1271 "exportable.c" } @@ -1279,37 +1279,37 @@ glong _tmp1_ = 0L; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1157 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1157 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1157 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1157 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1158 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1157 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1158 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1157 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { #line 1295 "exportable.c" glong _tmp4_ = 0L; -#line 1159 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1159 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1159 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return result; #line 1303 "exportable.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 1161 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1161 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1161 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1161 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return result; #line 1315 "exportable.c" } @@ -1330,114 +1330,114 @@ glong _tmp21_ = 0L; glong _tmp22_ = 0L; gchar* _tmp23_ = NULL; -#line 1168 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1167 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1170 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1170 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { #line 1340 "exportable.c" glong _tmp2_ = 0L; -#line 1170 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1170 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); #line 1346 "exportable.c" } else { -#line 1170 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp0_ = FALSE; #line 1350 "exportable.c" } -#line 1170 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp3_ = _tmp0_; -#line 1170 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp3_) { #line 1356 "exportable.c" glong _tmp4_ = 0L; glong _tmp5_ = 0L; glong _tmp6_ = 0L; -#line 1172 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp4_ = offset; -#line 1172 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp5_ = len; -#line 1172 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp6_ = string_strnlen ((gchar*) self, _tmp4_ + _tmp5_); -#line 1172 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" string_length = _tmp6_; #line 1368 "exportable.c" } else { gint _tmp7_ = 0; gint _tmp8_ = 0; -#line 1174 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp7_ = strlen (self); -#line 1174 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_; -#line 1174 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" string_length = (glong) _tmp8_; #line 1378 "exportable.c" } -#line 1177 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1176 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp9_ = offset; -#line 1177 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1176 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp9_ < ((glong) 0)) { #line 1384 "exportable.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; glong _tmp12_ = 0L; -#line 1178 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp10_ = string_length; -#line 1178 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1178 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" offset = _tmp10_ + _tmp11_; -#line 1179 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1178 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1179 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1178 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ >= ((glong) 0), NULL); #line 1398 "exportable.c" } else { glong _tmp13_ = 0L; glong _tmp14_ = 0L; -#line 1181 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp13_ = offset; -#line 1181 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp14_ = string_length; -#line 1181 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp13_ <= _tmp14_, NULL); #line 1408 "exportable.c" } -#line 1183 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1182 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp15_ = len; -#line 1183 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1182 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp15_ < ((glong) 0)) { #line 1414 "exportable.c" glong _tmp16_ = 0L; glong _tmp17_ = 0L; -#line 1184 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp16_ = string_length; -#line 1184 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1184 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" len = _tmp16_ - _tmp17_; #line 1423 "exportable.c" } -#line 1186 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp18_ = offset; -#line 1186 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp19_ = len; -#line 1186 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp20_ = string_length; -#line 1186 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp18_ + _tmp19_) <= _tmp20_, NULL); -#line 1187 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp21_ = offset; -#line 1187 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp22_ = len; -#line 1187 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp23_ = g_strndup (((gchar*) self) + _tmp21_, (gsize) _tmp22_); -#line 1187 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" result = _tmp23_; -#line 1187 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return result; #line 1443 "exportable.c" } @@ -1455,62 +1455,62 @@ const gchar* _tmp8_ = NULL; const gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; -#line 179 "/data/projects/seahorse/common/exportable.vala" +#line 179 "/data/src/seahorse/common/exportable.vala" g_return_val_if_fail (file != NULL, NULL); -#line 179 "/data/projects/seahorse/common/exportable.vala" +#line 179 "/data/src/seahorse/common/exportable.vala" g_return_val_if_fail (extension != NULL, NULL); -#line 181 "/data/projects/seahorse/common/exportable.vala" +#line 181 "/data/src/seahorse/common/exportable.vala" _tmp0_ = file; -#line 181 "/data/projects/seahorse/common/exportable.vala" +#line 181 "/data/src/seahorse/common/exportable.vala" _tmp1_ = g_file_get_basename (_tmp0_); -#line 181 "/data/projects/seahorse/common/exportable.vala" +#line 181 "/data/src/seahorse/common/exportable.vala" basename = _tmp1_; -#line 182 "/data/projects/seahorse/common/exportable.vala" +#line 182 "/data/src/seahorse/common/exportable.vala" _tmp2_ = basename; -#line 182 "/data/projects/seahorse/common/exportable.vala" +#line 182 "/data/src/seahorse/common/exportable.vala" _tmp3_ = string_last_index_of_char (_tmp2_, (gunichar) '.', 0); -#line 182 "/data/projects/seahorse/common/exportable.vala" +#line 182 "/data/src/seahorse/common/exportable.vala" dot = _tmp3_; -#line 183 "/data/projects/seahorse/common/exportable.vala" +#line 183 "/data/src/seahorse/common/exportable.vala" _tmp4_ = dot; -#line 183 "/data/projects/seahorse/common/exportable.vala" +#line 183 "/data/src/seahorse/common/exportable.vala" if (_tmp4_ != (-1)) { #line 1479 "exportable.c" const gchar* _tmp5_ = NULL; gint _tmp6_ = 0; gchar* _tmp7_ = NULL; -#line 184 "/data/projects/seahorse/common/exportable.vala" +#line 184 "/data/src/seahorse/common/exportable.vala" _tmp5_ = basename; -#line 184 "/data/projects/seahorse/common/exportable.vala" +#line 184 "/data/src/seahorse/common/exportable.vala" _tmp6_ = dot; -#line 184 "/data/projects/seahorse/common/exportable.vala" +#line 184 "/data/src/seahorse/common/exportable.vala" _tmp7_ = string_substring (_tmp5_, (glong) 0, (glong) _tmp6_); -#line 184 "/data/projects/seahorse/common/exportable.vala" +#line 184 "/data/src/seahorse/common/exportable.vala" _g_free0 (basename); -#line 184 "/data/projects/seahorse/common/exportable.vala" +#line 184 "/data/src/seahorse/common/exportable.vala" basename = _tmp7_; #line 1493 "exportable.c" } -#line 185 "/data/projects/seahorse/common/exportable.vala" +#line 185 "/data/src/seahorse/common/exportable.vala" _tmp8_ = basename; -#line 185 "/data/projects/seahorse/common/exportable.vala" +#line 185 "/data/src/seahorse/common/exportable.vala" _tmp9_ = extension; -#line 185 "/data/projects/seahorse/common/exportable.vala" +#line 185 "/data/src/seahorse/common/exportable.vala" _tmp10_ = g_strdup_printf ("%s%s", _tmp8_, _tmp9_); -#line 185 "/data/projects/seahorse/common/exportable.vala" +#line 185 "/data/src/seahorse/common/exportable.vala" result = _tmp10_; -#line 185 "/data/projects/seahorse/common/exportable.vala" +#line 185 "/data/src/seahorse/common/exportable.vala" _g_free0 (basename); -#line 185 "/data/projects/seahorse/common/exportable.vala" +#line 185 "/data/src/seahorse/common/exportable.vala" return result; #line 1507 "exportable.c" } static Block6Data* block6_data_ref (Block6Data* _data6_) { -#line 188 "/data/projects/seahorse/common/exportable.vala" +#line 188 "/data/src/seahorse/common/exportable.vala" g_atomic_int_inc (&_data6_->_ref_count_); -#line 188 "/data/projects/seahorse/common/exportable.vala" +#line 188 "/data/src/seahorse/common/exportable.vala" return _data6_; #line 1516 "exportable.c" } @@ -1519,13 +1519,13 @@ static void block6_data_unref (void * _userdata_) { Block6Data* _data6_; _data6_ = (Block6Data*) _userdata_; -#line 188 "/data/projects/seahorse/common/exportable.vala" +#line 188 "/data/src/seahorse/common/exportable.vala" if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) { -#line 188 "/data/projects/seahorse/common/exportable.vala" +#line 188 "/data/src/seahorse/common/exportable.vala" _g_hash_table_unref0 (_data6_->filters); -#line 188 "/data/projects/seahorse/common/exportable.vala" +#line 188 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (_data6_->chooser); -#line 188 "/data/projects/seahorse/common/exportable.vala" +#line 188 "/data/src/seahorse/common/exportable.vala" g_slice_free (Block6Data, _data6_); #line 1531 "exportable.c" } @@ -1547,39 +1547,39 @@ const gchar* _tmp8_ = NULL; gint _tmp9_ = 0; gint _tmp10_ = 0; -#line 215 "/data/projects/seahorse/common/exportable.vala" +#line 215 "/data/src/seahorse/common/exportable.vala" g_return_if_fail (obj != NULL); -#line 215 "/data/projects/seahorse/common/exportable.vala" +#line 215 "/data/src/seahorse/common/exportable.vala" g_return_if_fail (prop != NULL); -#line 216 "/data/projects/seahorse/common/exportable.vala" +#line 216 "/data/src/seahorse/common/exportable.vala" _tmp0_ = _data6_->filters; -#line 216 "/data/projects/seahorse/common/exportable.vala" +#line 216 "/data/src/seahorse/common/exportable.vala" _tmp1_ = _data6_->chooser; -#line 216 "/data/projects/seahorse/common/exportable.vala" +#line 216 "/data/src/seahorse/common/exportable.vala" _tmp2_ = gtk_file_chooser_get_filter ((GtkFileChooser*) _tmp1_); -#line 216 "/data/projects/seahorse/common/exportable.vala" +#line 216 "/data/src/seahorse/common/exportable.vala" _tmp3_ = g_hash_table_lookup (_tmp0_, _tmp2_); -#line 216 "/data/projects/seahorse/common/exportable.vala" +#line 216 "/data/src/seahorse/common/exportable.vala" _tmp4_ = _g_object_ref0 ((SeahorseExporter*) _tmp3_); -#line 216 "/data/projects/seahorse/common/exportable.vala" +#line 216 "/data/src/seahorse/common/exportable.vala" exporter = _tmp4_; -#line 217 "/data/projects/seahorse/common/exportable.vala" +#line 217 "/data/src/seahorse/common/exportable.vala" _tmp5_ = exporter; -#line 217 "/data/projects/seahorse/common/exportable.vala" +#line 217 "/data/src/seahorse/common/exportable.vala" _tmp6_ = seahorse_exporter_get_filename (_tmp5_); -#line 217 "/data/projects/seahorse/common/exportable.vala" +#line 217 "/data/src/seahorse/common/exportable.vala" _tmp7_ = _tmp6_; -#line 217 "/data/projects/seahorse/common/exportable.vala" +#line 217 "/data/src/seahorse/common/exportable.vala" name = _tmp7_; -#line 218 "/data/projects/seahorse/common/exportable.vala" +#line 218 "/data/src/seahorse/common/exportable.vala" _tmp8_ = name; -#line 218 "/data/projects/seahorse/common/exportable.vala" +#line 218 "/data/src/seahorse/common/exportable.vala" _tmp9_ = string_last_index_of_char (_tmp8_, (gunichar) '.', 0); -#line 218 "/data/projects/seahorse/common/exportable.vala" +#line 218 "/data/src/seahorse/common/exportable.vala" dot = _tmp9_; -#line 219 "/data/projects/seahorse/common/exportable.vala" +#line 219 "/data/src/seahorse/common/exportable.vala" _tmp10_ = dot; -#line 219 "/data/projects/seahorse/common/exportable.vala" +#line 219 "/data/src/seahorse/common/exportable.vala" if (_tmp10_ != (-1)) { #line 1585 "exportable.c" GFile* file = NULL; @@ -1587,17 +1587,17 @@ GFile* _tmp12_ = NULL; GFile* _tmp13_ = NULL; GFile* _tmp14_ = NULL; -#line 220 "/data/projects/seahorse/common/exportable.vala" +#line 220 "/data/src/seahorse/common/exportable.vala" _tmp11_ = _data6_->chooser; -#line 220 "/data/projects/seahorse/common/exportable.vala" +#line 220 "/data/src/seahorse/common/exportable.vala" _tmp12_ = gtk_file_chooser_get_file ((GtkFileChooser*) _tmp11_); -#line 220 "/data/projects/seahorse/common/exportable.vala" +#line 220 "/data/src/seahorse/common/exportable.vala" _tmp13_ = _g_object_ref0 (_tmp12_); -#line 220 "/data/projects/seahorse/common/exportable.vala" +#line 220 "/data/src/seahorse/common/exportable.vala" file = _tmp13_; -#line 221 "/data/projects/seahorse/common/exportable.vala" +#line 221 "/data/src/seahorse/common/exportable.vala" _tmp14_ = file; -#line 221 "/data/projects/seahorse/common/exportable.vala" +#line 221 "/data/src/seahorse/common/exportable.vala" if (_tmp14_ != NULL) { #line 1603 "exportable.c" gchar* basename = NULL; @@ -1610,58 +1610,58 @@ gchar* _tmp21_ = NULL; GtkFileChooserDialog* _tmp22_ = NULL; const gchar* _tmp23_ = NULL; -#line 222 "/data/projects/seahorse/common/exportable.vala" +#line 222 "/data/src/seahorse/common/exportable.vala" _tmp15_ = file; -#line 222 "/data/projects/seahorse/common/exportable.vala" +#line 222 "/data/src/seahorse/common/exportable.vala" _tmp16_ = name; -#line 222 "/data/projects/seahorse/common/exportable.vala" +#line 222 "/data/src/seahorse/common/exportable.vala" _tmp17_ = dot; -#line 222 "/data/projects/seahorse/common/exportable.vala" +#line 222 "/data/src/seahorse/common/exportable.vala" _tmp18_ = string_substring (_tmp16_, (glong) _tmp17_, (glong) (-1)); -#line 222 "/data/projects/seahorse/common/exportable.vala" +#line 222 "/data/src/seahorse/common/exportable.vala" _tmp19_ = _tmp18_; -#line 222 "/data/projects/seahorse/common/exportable.vala" +#line 222 "/data/src/seahorse/common/exportable.vala" _tmp20_ = seahorse_exportable_calculate_basename (_tmp15_, _tmp19_); -#line 222 "/data/projects/seahorse/common/exportable.vala" +#line 222 "/data/src/seahorse/common/exportable.vala" _tmp21_ = _tmp20_; -#line 222 "/data/projects/seahorse/common/exportable.vala" +#line 222 "/data/src/seahorse/common/exportable.vala" _g_free0 (_tmp19_); -#line 222 "/data/projects/seahorse/common/exportable.vala" +#line 222 "/data/src/seahorse/common/exportable.vala" basename = _tmp21_; -#line 223 "/data/projects/seahorse/common/exportable.vala" +#line 223 "/data/src/seahorse/common/exportable.vala" _tmp22_ = _data6_->chooser; -#line 223 "/data/projects/seahorse/common/exportable.vala" +#line 223 "/data/src/seahorse/common/exportable.vala" _tmp23_ = basename; -#line 223 "/data/projects/seahorse/common/exportable.vala" +#line 223 "/data/src/seahorse/common/exportable.vala" gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp22_, _tmp23_); -#line 221 "/data/projects/seahorse/common/exportable.vala" +#line 221 "/data/src/seahorse/common/exportable.vala" _g_free0 (basename); #line 1640 "exportable.c" } else { GtkFileChooserDialog* _tmp24_ = NULL; const gchar* _tmp25_ = NULL; -#line 225 "/data/projects/seahorse/common/exportable.vala" +#line 225 "/data/src/seahorse/common/exportable.vala" _tmp24_ = _data6_->chooser; -#line 225 "/data/projects/seahorse/common/exportable.vala" +#line 225 "/data/src/seahorse/common/exportable.vala" _tmp25_ = name; -#line 225 "/data/projects/seahorse/common/exportable.vala" +#line 225 "/data/src/seahorse/common/exportable.vala" gtk_file_chooser_set_current_name ((GtkFileChooser*) _tmp24_, _tmp25_); #line 1650 "exportable.c" } -#line 219 "/data/projects/seahorse/common/exportable.vala" +#line 219 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (file); #line 1654 "exportable.c" } -#line 215 "/data/projects/seahorse/common/exportable.vala" +#line 215 "/data/src/seahorse/common/exportable.vala" _g_free0 (name); -#line 215 "/data/projects/seahorse/common/exportable.vala" +#line 215 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (exporter); #line 1660 "exportable.c" } static void ___lambda4__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { -#line 215 "/data/projects/seahorse/common/exportable.vala" +#line 215 "/data/src/seahorse/common/exportable.vala" __lambda4_ (self, _sender, pspec); #line 1667 "exportable.c" } @@ -1690,73 +1690,73 @@ GtkFileChooserDialog* _tmp31_ = NULL; gint _tmp32_ = 0; GtkFileChooserDialog* _tmp44_ = NULL; -#line 188 "/data/projects/seahorse/common/exportable.vala" +#line 188 "/data/src/seahorse/common/exportable.vala" _data6_ = g_slice_new0 (Block6Data); -#line 188 "/data/projects/seahorse/common/exportable.vala" +#line 188 "/data/src/seahorse/common/exportable.vala" _data6_->_ref_count_ = 1; -#line 193 "/data/projects/seahorse/common/exportable.vala" +#line 193 "/data/src/seahorse/common/exportable.vala" _tmp0_ = parent; -#line 193 "/data/projects/seahorse/common/exportable.vala" +#line 193 "/data/src/seahorse/common/exportable.vala" _tmp1_ = _ ("Export"); -#line 193 "/data/projects/seahorse/common/exportable.vala" +#line 193 "/data/src/seahorse/common/exportable.vala" _tmp2_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (NULL, _tmp0_, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _tmp1_, GTK_RESPONSE_ACCEPT, NULL, NULL); -#line 193 "/data/projects/seahorse/common/exportable.vala" +#line 193 "/data/src/seahorse/common/exportable.vala" g_object_ref_sink (_tmp2_); -#line 193 "/data/projects/seahorse/common/exportable.vala" +#line 193 "/data/src/seahorse/common/exportable.vala" _data6_->chooser = _tmp2_; -#line 198 "/data/projects/seahorse/common/exportable.vala" +#line 198 "/data/src/seahorse/common/exportable.vala" _tmp3_ = _data6_->chooser; -#line 198 "/data/projects/seahorse/common/exportable.vala" +#line 198 "/data/src/seahorse/common/exportable.vala" gtk_dialog_set_default_response ((GtkDialog*) _tmp3_, (gint) GTK_RESPONSE_ACCEPT); -#line 199 "/data/projects/seahorse/common/exportable.vala" +#line 199 "/data/src/seahorse/common/exportable.vala" _tmp4_ = _data6_->chooser; -#line 199 "/data/projects/seahorse/common/exportable.vala" +#line 199 "/data/src/seahorse/common/exportable.vala" gtk_file_chooser_set_local_only ((GtkFileChooser*) _tmp4_, FALSE); -#line 200 "/data/projects/seahorse/common/exportable.vala" +#line 200 "/data/src/seahorse/common/exportable.vala" _tmp5_ = _data6_->chooser; -#line 200 "/data/projects/seahorse/common/exportable.vala" +#line 200 "/data/src/seahorse/common/exportable.vala" gtk_file_chooser_set_do_overwrite_confirmation ((GtkFileChooser*) _tmp5_, TRUE); -#line 202 "/data/projects/seahorse/common/exportable.vala" +#line 202 "/data/src/seahorse/common/exportable.vala" _tmp6_ = *directory; -#line 202 "/data/projects/seahorse/common/exportable.vala" +#line 202 "/data/src/seahorse/common/exportable.vala" if (_tmp6_ != NULL) { #line 1724 "exportable.c" GtkFileChooserDialog* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; -#line 203 "/data/projects/seahorse/common/exportable.vala" +#line 203 "/data/src/seahorse/common/exportable.vala" _tmp7_ = _data6_->chooser; -#line 203 "/data/projects/seahorse/common/exportable.vala" +#line 203 "/data/src/seahorse/common/exportable.vala" _tmp8_ = *directory; -#line 203 "/data/projects/seahorse/common/exportable.vala" +#line 203 "/data/src/seahorse/common/exportable.vala" gtk_file_chooser_set_current_folder ((GtkFileChooser*) _tmp7_, _tmp8_); #line 1733 "exportable.c" } -#line 205 "/data/projects/seahorse/common/exportable.vala" +#line 205 "/data/src/seahorse/common/exportable.vala" first = NULL; -#line 206 "/data/projects/seahorse/common/exportable.vala" +#line 206 "/data/src/seahorse/common/exportable.vala" _tmp9_ = g_direct_hash; -#line 206 "/data/projects/seahorse/common/exportable.vala" +#line 206 "/data/src/seahorse/common/exportable.vala" _tmp10_ = g_direct_equal; -#line 206 "/data/projects/seahorse/common/exportable.vala" +#line 206 "/data/src/seahorse/common/exportable.vala" _tmp11_ = g_hash_table_new_full (_tmp9_, _tmp10_, _g_object_unref0_, _g_object_unref0_); -#line 206 "/data/projects/seahorse/common/exportable.vala" +#line 206 "/data/src/seahorse/common/exportable.vala" _data6_->filters = _tmp11_; -#line 207 "/data/projects/seahorse/common/exportable.vala" +#line 207 "/data/src/seahorse/common/exportable.vala" _tmp12_ = exporters; #line 1747 "exportable.c" { GList* exporter_collection = NULL; GList* exporter_it = NULL; -#line 207 "/data/projects/seahorse/common/exportable.vala" +#line 207 "/data/src/seahorse/common/exportable.vala" exporter_collection = _tmp12_; -#line 207 "/data/projects/seahorse/common/exportable.vala" +#line 207 "/data/src/seahorse/common/exportable.vala" for (exporter_it = exporter_collection; exporter_it != NULL; exporter_it = exporter_it->next) { #line 1755 "exportable.c" SeahorseExporter* _tmp13_ = NULL; SeahorseExporter* exporter = NULL; -#line 207 "/data/projects/seahorse/common/exportable.vala" +#line 207 "/data/src/seahorse/common/exportable.vala" _tmp13_ = _g_object_ref0 ((SeahorseExporter*) exporter_it->data); -#line 207 "/data/projects/seahorse/common/exportable.vala" +#line 207 "/data/src/seahorse/common/exportable.vala" exporter = _tmp13_; #line 1762 "exportable.c" { @@ -1773,74 +1773,74 @@ GtkFileFilter* _tmp23_ = NULL; GtkFileFilter* _tmp24_ = NULL; GtkFileFilter* _tmp25_ = NULL; -#line 208 "/data/projects/seahorse/common/exportable.vala" +#line 208 "/data/src/seahorse/common/exportable.vala" _tmp14_ = exporter; -#line 208 "/data/projects/seahorse/common/exportable.vala" +#line 208 "/data/src/seahorse/common/exportable.vala" _tmp15_ = seahorse_exporter_get_file_filter (_tmp14_); -#line 208 "/data/projects/seahorse/common/exportable.vala" +#line 208 "/data/src/seahorse/common/exportable.vala" _tmp16_ = _tmp15_; -#line 208 "/data/projects/seahorse/common/exportable.vala" +#line 208 "/data/src/seahorse/common/exportable.vala" filter = _tmp16_; -#line 209 "/data/projects/seahorse/common/exportable.vala" +#line 209 "/data/src/seahorse/common/exportable.vala" _tmp17_ = _data6_->filters; -#line 209 "/data/projects/seahorse/common/exportable.vala" +#line 209 "/data/src/seahorse/common/exportable.vala" _tmp18_ = filter; -#line 209 "/data/projects/seahorse/common/exportable.vala" +#line 209 "/data/src/seahorse/common/exportable.vala" _tmp19_ = _g_object_ref0 (_tmp18_); -#line 209 "/data/projects/seahorse/common/exportable.vala" +#line 209 "/data/src/seahorse/common/exportable.vala" _tmp20_ = exporter; -#line 209 "/data/projects/seahorse/common/exportable.vala" +#line 209 "/data/src/seahorse/common/exportable.vala" _tmp21_ = _g_object_ref0 (_tmp20_); -#line 209 "/data/projects/seahorse/common/exportable.vala" +#line 209 "/data/src/seahorse/common/exportable.vala" g_hash_table_replace (_tmp17_, _tmp19_, _tmp21_); -#line 210 "/data/projects/seahorse/common/exportable.vala" +#line 210 "/data/src/seahorse/common/exportable.vala" _tmp22_ = _data6_->chooser; -#line 210 "/data/projects/seahorse/common/exportable.vala" +#line 210 "/data/src/seahorse/common/exportable.vala" _tmp23_ = filter; -#line 210 "/data/projects/seahorse/common/exportable.vala" +#line 210 "/data/src/seahorse/common/exportable.vala" _tmp24_ = _g_object_ref0 (_tmp23_); -#line 210 "/data/projects/seahorse/common/exportable.vala" +#line 210 "/data/src/seahorse/common/exportable.vala" gtk_file_chooser_add_filter ((GtkFileChooser*) _tmp22_, _tmp24_); -#line 211 "/data/projects/seahorse/common/exportable.vala" +#line 211 "/data/src/seahorse/common/exportable.vala" _tmp25_ = first; -#line 211 "/data/projects/seahorse/common/exportable.vala" +#line 211 "/data/src/seahorse/common/exportable.vala" if (_tmp25_ == NULL) { #line 1809 "exportable.c" GtkFileFilter* _tmp26_ = NULL; GtkFileFilter* _tmp27_ = NULL; -#line 212 "/data/projects/seahorse/common/exportable.vala" +#line 212 "/data/src/seahorse/common/exportable.vala" _tmp26_ = filter; -#line 212 "/data/projects/seahorse/common/exportable.vala" +#line 212 "/data/src/seahorse/common/exportable.vala" _tmp27_ = _g_object_ref0 (_tmp26_); -#line 212 "/data/projects/seahorse/common/exportable.vala" +#line 212 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (first); -#line 212 "/data/projects/seahorse/common/exportable.vala" +#line 212 "/data/src/seahorse/common/exportable.vala" first = _tmp27_; #line 1820 "exportable.c" } -#line 207 "/data/projects/seahorse/common/exportable.vala" +#line 207 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (filter); -#line 207 "/data/projects/seahorse/common/exportable.vala" +#line 207 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (exporter); #line 1826 "exportable.c" } } } -#line 215 "/data/projects/seahorse/common/exportable.vala" +#line 215 "/data/src/seahorse/common/exportable.vala" _tmp28_ = _data6_->chooser; -#line 215 "/data/projects/seahorse/common/exportable.vala" +#line 215 "/data/src/seahorse/common/exportable.vala" g_signal_connect_data ((GObject*) _tmp28_, "notify", (GCallback) ___lambda4__g_object_notify, block6_data_ref (_data6_), (GClosureNotify) block6_data_unref, 0); -#line 230 "/data/projects/seahorse/common/exportable.vala" +#line 230 "/data/src/seahorse/common/exportable.vala" _tmp29_ = _data6_->chooser; -#line 230 "/data/projects/seahorse/common/exportable.vala" +#line 230 "/data/src/seahorse/common/exportable.vala" _tmp30_ = first; -#line 230 "/data/projects/seahorse/common/exportable.vala" +#line 230 "/data/src/seahorse/common/exportable.vala" gtk_file_chooser_set_filter ((GtkFileChooser*) _tmp29_, _tmp30_); -#line 232 "/data/projects/seahorse/common/exportable.vala" +#line 232 "/data/src/seahorse/common/exportable.vala" _tmp31_ = _data6_->chooser; -#line 232 "/data/projects/seahorse/common/exportable.vala" +#line 232 "/data/src/seahorse/common/exportable.vala" _tmp32_ = gtk_dialog_run ((GtkDialog*) _tmp31_); -#line 232 "/data/projects/seahorse/common/exportable.vala" +#line 232 "/data/src/seahorse/common/exportable.vala" if (_tmp32_ == ((gint) GTK_RESPONSE_ACCEPT)) { #line 1846 "exportable.c" GtkFileChooserDialog* _tmp33_ = NULL; @@ -1854,137 +1854,137 @@ GtkFileChooserDialog* _tmp41_ = NULL; gchar* _tmp42_ = NULL; GtkFileChooserDialog* _tmp43_ = NULL; -#line 233 "/data/projects/seahorse/common/exportable.vala" +#line 233 "/data/src/seahorse/common/exportable.vala" _tmp33_ = _data6_->chooser; -#line 233 "/data/projects/seahorse/common/exportable.vala" +#line 233 "/data/src/seahorse/common/exportable.vala" _tmp34_ = gtk_file_chooser_get_file ((GtkFileChooser*) _tmp33_); -#line 233 "/data/projects/seahorse/common/exportable.vala" +#line 233 "/data/src/seahorse/common/exportable.vala" _tmp35_ = _g_object_ref0 (_tmp34_); -#line 233 "/data/projects/seahorse/common/exportable.vala" +#line 233 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (_vala_chosen_file); -#line 233 "/data/projects/seahorse/common/exportable.vala" +#line 233 "/data/src/seahorse/common/exportable.vala" _vala_chosen_file = _tmp35_; -#line 234 "/data/projects/seahorse/common/exportable.vala" +#line 234 "/data/src/seahorse/common/exportable.vala" _tmp36_ = _data6_->filters; -#line 234 "/data/projects/seahorse/common/exportable.vala" +#line 234 "/data/src/seahorse/common/exportable.vala" _tmp37_ = _data6_->chooser; -#line 234 "/data/projects/seahorse/common/exportable.vala" +#line 234 "/data/src/seahorse/common/exportable.vala" _tmp38_ = gtk_file_chooser_get_filter ((GtkFileChooser*) _tmp37_); -#line 234 "/data/projects/seahorse/common/exportable.vala" +#line 234 "/data/src/seahorse/common/exportable.vala" _tmp39_ = g_hash_table_lookup (_tmp36_, _tmp38_); -#line 234 "/data/projects/seahorse/common/exportable.vala" +#line 234 "/data/src/seahorse/common/exportable.vala" _tmp40_ = _g_object_ref0 ((SeahorseExporter*) _tmp39_); -#line 234 "/data/projects/seahorse/common/exportable.vala" +#line 234 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (_vala_chosen_exporter); -#line 234 "/data/projects/seahorse/common/exportable.vala" +#line 234 "/data/src/seahorse/common/exportable.vala" _vala_chosen_exporter = _tmp40_; -#line 235 "/data/projects/seahorse/common/exportable.vala" +#line 235 "/data/src/seahorse/common/exportable.vala" _tmp41_ = _data6_->chooser; -#line 235 "/data/projects/seahorse/common/exportable.vala" +#line 235 "/data/src/seahorse/common/exportable.vala" _tmp42_ = gtk_file_chooser_get_current_folder ((GtkFileChooser*) _tmp41_); -#line 235 "/data/projects/seahorse/common/exportable.vala" +#line 235 "/data/src/seahorse/common/exportable.vala" _g_free0 (*directory); -#line 235 "/data/projects/seahorse/common/exportable.vala" +#line 235 "/data/src/seahorse/common/exportable.vala" *directory = _tmp42_; -#line 236 "/data/projects/seahorse/common/exportable.vala" +#line 236 "/data/src/seahorse/common/exportable.vala" _tmp43_ = _data6_->chooser; -#line 236 "/data/projects/seahorse/common/exportable.vala" +#line 236 "/data/src/seahorse/common/exportable.vala" gtk_widget_destroy ((GtkWidget*) _tmp43_); -#line 237 "/data/projects/seahorse/common/exportable.vala" +#line 237 "/data/src/seahorse/common/exportable.vala" result = TRUE; -#line 237 "/data/projects/seahorse/common/exportable.vala" +#line 237 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (first); -#line 237 "/data/projects/seahorse/common/exportable.vala" +#line 237 "/data/src/seahorse/common/exportable.vala" block6_data_unref (_data6_); -#line 237 "/data/projects/seahorse/common/exportable.vala" +#line 237 "/data/src/seahorse/common/exportable.vala" _data6_ = NULL; -#line 237 "/data/projects/seahorse/common/exportable.vala" +#line 237 "/data/src/seahorse/common/exportable.vala" if (chosen_file) { -#line 237 "/data/projects/seahorse/common/exportable.vala" +#line 237 "/data/src/seahorse/common/exportable.vala" *chosen_file = _vala_chosen_file; #line 1906 "exportable.c" } else { -#line 237 "/data/projects/seahorse/common/exportable.vala" +#line 237 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (_vala_chosen_file); #line 1910 "exportable.c" } -#line 237 "/data/projects/seahorse/common/exportable.vala" +#line 237 "/data/src/seahorse/common/exportable.vala" if (chosen_exporter) { -#line 237 "/data/projects/seahorse/common/exportable.vala" +#line 237 "/data/src/seahorse/common/exportable.vala" *chosen_exporter = _vala_chosen_exporter; #line 1916 "exportable.c" } else { -#line 237 "/data/projects/seahorse/common/exportable.vala" +#line 237 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (_vala_chosen_exporter); #line 1920 "exportable.c" } -#line 237 "/data/projects/seahorse/common/exportable.vala" +#line 237 "/data/src/seahorse/common/exportable.vala" return result; #line 1924 "exportable.c" } -#line 240 "/data/projects/seahorse/common/exportable.vala" +#line 240 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (_vala_chosen_file); -#line 240 "/data/projects/seahorse/common/exportable.vala" +#line 240 "/data/src/seahorse/common/exportable.vala" _vala_chosen_file = NULL; -#line 241 "/data/projects/seahorse/common/exportable.vala" +#line 241 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (_vala_chosen_exporter); -#line 241 "/data/projects/seahorse/common/exportable.vala" +#line 241 "/data/src/seahorse/common/exportable.vala" _vala_chosen_exporter = NULL; -#line 242 "/data/projects/seahorse/common/exportable.vala" +#line 242 "/data/src/seahorse/common/exportable.vala" _tmp44_ = _data6_->chooser; -#line 242 "/data/projects/seahorse/common/exportable.vala" +#line 242 "/data/src/seahorse/common/exportable.vala" gtk_widget_destroy ((GtkWidget*) _tmp44_); -#line 243 "/data/projects/seahorse/common/exportable.vala" +#line 243 "/data/src/seahorse/common/exportable.vala" result = FALSE; -#line 243 "/data/projects/seahorse/common/exportable.vala" +#line 243 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (first); -#line 243 "/data/projects/seahorse/common/exportable.vala" +#line 243 "/data/src/seahorse/common/exportable.vala" block6_data_unref (_data6_); -#line 243 "/data/projects/seahorse/common/exportable.vala" +#line 243 "/data/src/seahorse/common/exportable.vala" _data6_ = NULL; -#line 243 "/data/projects/seahorse/common/exportable.vala" +#line 243 "/data/src/seahorse/common/exportable.vala" if (chosen_file) { -#line 243 "/data/projects/seahorse/common/exportable.vala" +#line 243 "/data/src/seahorse/common/exportable.vala" *chosen_file = _vala_chosen_file; #line 1950 "exportable.c" } else { -#line 243 "/data/projects/seahorse/common/exportable.vala" +#line 243 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (_vala_chosen_file); #line 1954 "exportable.c" } -#line 243 "/data/projects/seahorse/common/exportable.vala" +#line 243 "/data/src/seahorse/common/exportable.vala" if (chosen_exporter) { -#line 243 "/data/projects/seahorse/common/exportable.vala" +#line 243 "/data/src/seahorse/common/exportable.vala" *chosen_exporter = _vala_chosen_exporter; #line 1960 "exportable.c" } else { -#line 243 "/data/projects/seahorse/common/exportable.vala" +#line 243 "/data/src/seahorse/common/exportable.vala" _g_object_unref0 (_vala_chosen_exporter); #line 1964 "exportable.c" } -#line 243 "/data/projects/seahorse/common/exportable.vala" +#line 243 "/data/src/seahorse/common/exportable.vala" return result; #line 1968 "exportable.c" } gboolean seahorse_exportable_get_exportable (SeahorseExportable* self) { -#line 27 "/data/projects/seahorse/common/exportable.vala" +#line 27 "/data/src/seahorse/common/exportable.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 27 "/data/projects/seahorse/common/exportable.vala" +#line 27 "/data/src/seahorse/common/exportable.vala" return SEAHORSE_EXPORTABLE_GET_INTERFACE (self)->get_exportable (self); #line 1977 "exportable.c" } static void seahorse_exportable_base_init (SeahorseExportableIface * iface) { -#line 26 "/data/projects/seahorse/common/exportable.vala" +#line 26 "/data/src/seahorse/common/exportable.vala" static gboolean initialized = FALSE; -#line 26 "/data/projects/seahorse/common/exportable.vala" +#line 26 "/data/src/seahorse/common/exportable.vala" if (!initialized) { -#line 26 "/data/projects/seahorse/common/exportable.vala" +#line 26 "/data/src/seahorse/common/exportable.vala" initialized = TRUE; -#line 26 "/data/projects/seahorse/common/exportable.vala" +#line 26 "/data/src/seahorse/common/exportable.vala" g_object_interface_install_property (iface, g_param_spec_boolean ("exportable", "exportable", "exportable", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 1990 "exportable.c" } diff -Nru seahorse-3.10.1/common/exporter.c seahorse-3.10.2/common/exporter.c --- seahorse-3.10.1/common/exporter.c 2013-07-24 15:11:10.000000000 +0000 +++ seahorse-3.10.2/common/exporter.c 2014-01-08 15:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -/* exporter.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* exporter.c generated by valac 0.22.1, the Vala compiler * generated from exporter.vala, do not modify */ /* @@ -97,32 +97,32 @@ GList* seahorse_exporter_get_objects (SeahorseExporter* self) { -#line 41 "/data/projects/seahorse/common/exporter.vala" +#line 41 "/data/src/seahorse/common/exporter.vala" g_return_val_if_fail (self != NULL, NULL); -#line 41 "/data/projects/seahorse/common/exporter.vala" +#line 41 "/data/src/seahorse/common/exporter.vala" return SEAHORSE_EXPORTER_GET_INTERFACE (self)->get_objects (self); #line 105 "exporter.c" } gboolean seahorse_exporter_add_object (SeahorseExporter* self, GObject* obj) { -#line 43 "/data/projects/seahorse/common/exporter.vala" +#line 43 "/data/src/seahorse/common/exporter.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 43 "/data/projects/seahorse/common/exporter.vala" +#line 43 "/data/src/seahorse/common/exporter.vala" return SEAHORSE_EXPORTER_GET_INTERFACE (self)->add_object (self, obj); #line 114 "exporter.c" } void seahorse_exporter_export (SeahorseExporter* self, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_) { -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" SEAHORSE_EXPORTER_GET_INTERFACE (self)->export (self, cancellable, _callback_, _user_data_); #line 121 "exporter.c" } guint8* seahorse_exporter_export_finish (SeahorseExporter* self, GAsyncResult* _res_, size_t* result_length1, GError** error) { -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" return SEAHORSE_EXPORTER_GET_INTERFACE (self)->export_finish (self, _res_, result_length1, error); #line 128 "exporter.c" } @@ -135,33 +135,33 @@ gunichar _tmp1_ = 0U; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 928 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 928 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 929 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 929 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 929 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) (-1), _tmp1_); -#line 929 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 929 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 931 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 931 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 931 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 931 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { #line 153 "exporter.c" gchar* _tmp4_ = NULL; -#line 932 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 932 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 932 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 932 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return result; #line 161 "exporter.c" } else { -#line 934 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 934 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" result = -1; -#line 934 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 934 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return result; #line 167 "exporter.c" } @@ -175,37 +175,37 @@ glong _tmp1_ = 0L; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 1157 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1157 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1157 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1157 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1156 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1158 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1157 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1158 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1157 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { #line 191 "exporter.c" glong _tmp4_ = 0L; -#line 1159 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1159 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1159 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1158 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return result; #line 199 "exporter.c" } else { gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 1161 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1161 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1161 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1161 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1160 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return result; #line 211 "exporter.c" } @@ -226,114 +226,114 @@ glong _tmp21_ = 0L; glong _tmp22_ = 0L; gchar* _tmp23_ = NULL; -#line 1168 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1167 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1170 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1170 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { #line 236 "exporter.c" glong _tmp2_ = 0L; -#line 1170 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1170 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); #line 242 "exporter.c" } else { -#line 1170 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp0_ = FALSE; #line 246 "exporter.c" } -#line 1170 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp3_ = _tmp0_; -#line 1170 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1169 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp3_) { #line 252 "exporter.c" glong _tmp4_ = 0L; glong _tmp5_ = 0L; glong _tmp6_ = 0L; -#line 1172 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp4_ = offset; -#line 1172 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp5_ = len; -#line 1172 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp6_ = string_strnlen ((gchar*) self, _tmp4_ + _tmp5_); -#line 1172 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1171 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" string_length = _tmp6_; #line 264 "exporter.c" } else { gint _tmp7_ = 0; gint _tmp8_ = 0; -#line 1174 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp7_ = strlen (self); -#line 1174 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp8_ = _tmp7_; -#line 1174 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1173 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" string_length = (glong) _tmp8_; #line 274 "exporter.c" } -#line 1177 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1176 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp9_ = offset; -#line 1177 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1176 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp9_ < ((glong) 0)) { #line 280 "exporter.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; glong _tmp12_ = 0L; -#line 1178 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp10_ = string_length; -#line 1178 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1178 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1177 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" offset = _tmp10_ + _tmp11_; -#line 1179 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1178 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1179 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1178 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ >= ((glong) 0), NULL); #line 294 "exporter.c" } else { glong _tmp13_ = 0L; glong _tmp14_ = 0L; -#line 1181 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp13_ = offset; -#line 1181 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp14_ = string_length; -#line 1181 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1180 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp13_ <= _tmp14_, NULL); #line 304 "exporter.c" } -#line 1183 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1182 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp15_ = len; -#line 1183 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1182 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp15_ < ((glong) 0)) { #line 310 "exporter.c" glong _tmp16_ = 0L; glong _tmp17_ = 0L; -#line 1184 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp16_ = string_length; -#line 1184 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1184 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1183 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" len = _tmp16_ - _tmp17_; #line 319 "exporter.c" } -#line 1186 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp18_ = offset; -#line 1186 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp19_ = len; -#line 1186 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp20_ = string_length; -#line 1186 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1185 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp18_ + _tmp19_) <= _tmp20_, NULL); -#line 1187 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp21_ = offset; -#line 1187 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp22_ = len; -#line 1187 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp23_ = g_strndup (((gchar*) self) + _tmp21_, (gsize) _tmp22_); -#line 1187 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" result = _tmp23_; -#line 1187 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1186 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return result; #line 339 "exporter.c" } @@ -363,57 +363,57 @@ gchar* _tmp23_ = NULL; GFile* _tmp24_ = NULL; GFile* _tmp25_ = NULL; -#line 48 "/data/projects/seahorse/common/exporter.vala" +#line 48 "/data/src/seahorse/common/exporter.vala" g_return_val_if_fail (file != NULL, NULL); -#line 51 "/data/projects/seahorse/common/exporter.vala" +#line 51 "/data/src/seahorse/common/exporter.vala" _tmp0_ = file; -#line 51 "/data/projects/seahorse/common/exporter.vala" +#line 51 "/data/src/seahorse/common/exporter.vala" _tmp1_ = g_file_get_uri (_tmp0_); -#line 51 "/data/projects/seahorse/common/exporter.vala" +#line 51 "/data/src/seahorse/common/exporter.vala" uri = _tmp1_; -#line 54 "/data/projects/seahorse/common/exporter.vala" +#line 54 "/data/src/seahorse/common/exporter.vala" _tmp2_ = uri; -#line 54 "/data/projects/seahorse/common/exporter.vala" +#line 54 "/data/src/seahorse/common/exporter.vala" _tmp3_ = string_last_index_of_char (_tmp2_, (gunichar) '/', 0); -#line 54 "/data/projects/seahorse/common/exporter.vala" +#line 54 "/data/src/seahorse/common/exporter.vala" last = _tmp3_; -#line 55 "/data/projects/seahorse/common/exporter.vala" +#line 55 "/data/src/seahorse/common/exporter.vala" _tmp4_ = last; -#line 55 "/data/projects/seahorse/common/exporter.vala" +#line 55 "/data/src/seahorse/common/exporter.vala" if (_tmp4_ == (-1)) { -#line 56 "/data/projects/seahorse/common/exporter.vala" +#line 56 "/data/src/seahorse/common/exporter.vala" last = 0; #line 387 "exporter.c" } -#line 62 "/data/projects/seahorse/common/exporter.vala" +#line 62 "/data/src/seahorse/common/exporter.vala" _tmp5_ = uri; -#line 62 "/data/projects/seahorse/common/exporter.vala" +#line 62 "/data/src/seahorse/common/exporter.vala" _tmp6_ = last; -#line 62 "/data/projects/seahorse/common/exporter.vala" +#line 62 "/data/src/seahorse/common/exporter.vala" _tmp7_ = string_last_index_of_char (_tmp5_, (gunichar) '.', _tmp6_); -#line 62 "/data/projects/seahorse/common/exporter.vala" +#line 62 "/data/src/seahorse/common/exporter.vala" index = _tmp7_; -#line 63 "/data/projects/seahorse/common/exporter.vala" +#line 63 "/data/src/seahorse/common/exporter.vala" _tmp8_ = index; -#line 63 "/data/projects/seahorse/common/exporter.vala" +#line 63 "/data/src/seahorse/common/exporter.vala" if (_tmp8_ == (-1)) { #line 401 "exporter.c" const gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; gchar* _tmp11_ = NULL; -#line 64 "/data/projects/seahorse/common/exporter.vala" +#line 64 "/data/src/seahorse/common/exporter.vala" _tmp9_ = uri; -#line 64 "/data/projects/seahorse/common/exporter.vala" +#line 64 "/data/src/seahorse/common/exporter.vala" _tmp10_ = g_strdup (_tmp9_); -#line 64 "/data/projects/seahorse/common/exporter.vala" +#line 64 "/data/src/seahorse/common/exporter.vala" _g_free0 (prefix); -#line 64 "/data/projects/seahorse/common/exporter.vala" +#line 64 "/data/src/seahorse/common/exporter.vala" prefix = _tmp10_; -#line 65 "/data/projects/seahorse/common/exporter.vala" +#line 65 "/data/src/seahorse/common/exporter.vala" _tmp11_ = g_strdup (""); -#line 65 "/data/projects/seahorse/common/exporter.vala" +#line 65 "/data/src/seahorse/common/exporter.vala" _g_free0 (suffix); -#line 65 "/data/projects/seahorse/common/exporter.vala" +#line 65 "/data/src/seahorse/common/exporter.vala" suffix = _tmp11_; #line 419 "exporter.c" } else { @@ -423,57 +423,57 @@ const gchar* _tmp15_ = NULL; gint _tmp16_ = 0; gchar* _tmp17_ = NULL; -#line 67 "/data/projects/seahorse/common/exporter.vala" +#line 67 "/data/src/seahorse/common/exporter.vala" _tmp12_ = uri; -#line 67 "/data/projects/seahorse/common/exporter.vala" +#line 67 "/data/src/seahorse/common/exporter.vala" _tmp13_ = index; -#line 67 "/data/projects/seahorse/common/exporter.vala" +#line 67 "/data/src/seahorse/common/exporter.vala" _tmp14_ = string_substring (_tmp12_, (glong) 0, (glong) _tmp13_); -#line 67 "/data/projects/seahorse/common/exporter.vala" +#line 67 "/data/src/seahorse/common/exporter.vala" _g_free0 (prefix); -#line 67 "/data/projects/seahorse/common/exporter.vala" +#line 67 "/data/src/seahorse/common/exporter.vala" prefix = _tmp14_; -#line 68 "/data/projects/seahorse/common/exporter.vala" +#line 68 "/data/src/seahorse/common/exporter.vala" _tmp15_ = uri; -#line 68 "/data/projects/seahorse/common/exporter.vala" +#line 68 "/data/src/seahorse/common/exporter.vala" _tmp16_ = index; -#line 68 "/data/projects/seahorse/common/exporter.vala" +#line 68 "/data/src/seahorse/common/exporter.vala" _tmp17_ = string_substring (_tmp15_, (glong) _tmp16_, (glong) (-1)); -#line 68 "/data/projects/seahorse/common/exporter.vala" +#line 68 "/data/src/seahorse/common/exporter.vala" _g_free0 (suffix); -#line 68 "/data/projects/seahorse/common/exporter.vala" +#line 68 "/data/src/seahorse/common/exporter.vala" suffix = _tmp17_; #line 447 "exporter.c" } -#line 71 "/data/projects/seahorse/common/exporter.vala" +#line 71 "/data/src/seahorse/common/exporter.vala" _tmp18_ = *state; -#line 71 "/data/projects/seahorse/common/exporter.vala" +#line 71 "/data/src/seahorse/common/exporter.vala" *state = _tmp18_ + 1; -#line 72 "/data/projects/seahorse/common/exporter.vala" +#line 72 "/data/src/seahorse/common/exporter.vala" _tmp19_ = prefix; -#line 72 "/data/projects/seahorse/common/exporter.vala" +#line 72 "/data/src/seahorse/common/exporter.vala" _tmp20_ = *state; -#line 72 "/data/projects/seahorse/common/exporter.vala" +#line 72 "/data/src/seahorse/common/exporter.vala" _tmp21_ = suffix; -#line 72 "/data/projects/seahorse/common/exporter.vala" +#line 72 "/data/src/seahorse/common/exporter.vala" _tmp22_ = g_strdup_printf ("%s-%u%s", _tmp19_, _tmp20_, _tmp21_); -#line 72 "/data/projects/seahorse/common/exporter.vala" +#line 72 "/data/src/seahorse/common/exporter.vala" _tmp23_ = _tmp22_; -#line 72 "/data/projects/seahorse/common/exporter.vala" +#line 72 "/data/src/seahorse/common/exporter.vala" _tmp24_ = g_file_new_for_uri (_tmp23_); -#line 72 "/data/projects/seahorse/common/exporter.vala" +#line 72 "/data/src/seahorse/common/exporter.vala" _tmp25_ = _tmp24_; -#line 72 "/data/projects/seahorse/common/exporter.vala" +#line 72 "/data/src/seahorse/common/exporter.vala" _g_free0 (_tmp23_); -#line 72 "/data/projects/seahorse/common/exporter.vala" +#line 72 "/data/src/seahorse/common/exporter.vala" result = _tmp25_; -#line 72 "/data/projects/seahorse/common/exporter.vala" +#line 72 "/data/src/seahorse/common/exporter.vala" _g_free0 (suffix); -#line 72 "/data/projects/seahorse/common/exporter.vala" +#line 72 "/data/src/seahorse/common/exporter.vala" _g_free0 (prefix); -#line 72 "/data/projects/seahorse/common/exporter.vala" +#line 72 "/data/src/seahorse/common/exporter.vala" _g_free0 (uri); -#line 72 "/data/projects/seahorse/common/exporter.vala" +#line 72 "/data/src/seahorse/common/exporter.vala" return result; #line 479 "exporter.c" } @@ -482,20 +482,20 @@ static void seahorse_exporter_export_to_file_data_free (gpointer _data) { SeahorseExporterExportToFileData* _data_; _data_ = _data; -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _g_object_unref0 (_data_->file); -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _g_object_unref0 (_data_->cancellable); -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _g_object_unref0 (_data_->self); -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" g_slice_free (SeahorseExporterExportToFileData, _data_); #line 494 "exporter.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" return self ? g_object_ref (self) : NULL; #line 501 "exporter.c" } @@ -509,37 +509,37 @@ gboolean _tmp3_ = FALSE; GCancellable* _tmp4_ = NULL; GCancellable* _tmp5_ = NULL; -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _data_ = g_slice_new0 (SeahorseExporterExportToFileData); -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, seahorse_exporter_export_to_file); -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, seahorse_exporter_export_to_file_data_free); -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _tmp0_ = _g_object_ref0 (self); -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _data_->self = _tmp0_; -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _tmp1_ = file; -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _g_object_unref0 (_data_->file); -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _data_->file = _tmp2_; -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _tmp3_ = overwrite; -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _data_->overwrite = _tmp3_; -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _tmp4_ = cancellable; -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _g_object_unref0 (_data_->cancellable); -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _data_->cancellable = _tmp5_; -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" seahorse_exporter_export_to_file_co (_data_); #line 545 "exporter.c" } @@ -548,17 +548,17 @@ gboolean seahorse_exporter_export_to_file_finish (SeahorseExporter* self, GAsyncResult* _res_, GError** error) { gboolean result; SeahorseExporterExportToFileData* _data_; -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" return FALSE; #line 556 "exporter.c" } -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" result = _data_->result; -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" return result; #line 564 "exporter.c" } @@ -566,335 +566,335 @@ static void seahorse_exporter_export_to_file_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { SeahorseExporterExportToFileData* _data_; -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_ = _user_data_; -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_->_source_object_ = source_object; -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_->_res_ = _res_; -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" seahorse_exporter_export_to_file_co (_data_); #line 578 "exporter.c" } static gpointer _g_error_copy0 (gpointer self) { -#line 103 "/data/projects/seahorse/common/exporter.vala" +#line 103 "/data/src/seahorse/common/exporter.vala" return self ? g_error_copy (self) : NULL; #line 585 "exporter.c" } static gboolean seahorse_exporter_export_to_file_co (SeahorseExporterExportToFileData* _data_) { -#line 75 "/data/projects/seahorse/common/exporter.vala" +#line 75 "/data/src/seahorse/common/exporter.vala" switch (_data_->_state_) { -#line 75 "/data/projects/seahorse/common/exporter.vala" +#line 75 "/data/src/seahorse/common/exporter.vala" case 0: #line 594 "exporter.c" goto _state_0; -#line 75 "/data/projects/seahorse/common/exporter.vala" +#line 75 "/data/src/seahorse/common/exporter.vala" case 1: #line 598 "exporter.c" goto _state_1; -#line 75 "/data/projects/seahorse/common/exporter.vala" +#line 75 "/data/src/seahorse/common/exporter.vala" case 2: #line 602 "exporter.c" goto _state_2; default: -#line 75 "/data/projects/seahorse/common/exporter.vala" +#line 75 "/data/src/seahorse/common/exporter.vala" g_assert_not_reached (); #line 607 "exporter.c" } _state_0: -#line 79 "/data/projects/seahorse/common/exporter.vala" +#line 79 "/data/src/seahorse/common/exporter.vala" _data_->bytes_length1 = 0; -#line 79 "/data/projects/seahorse/common/exporter.vala" +#line 79 "/data/src/seahorse/common/exporter.vala" _data_->_bytes_size_ = 0; -#line 80 "/data/projects/seahorse/common/exporter.vala" +#line 80 "/data/src/seahorse/common/exporter.vala" _data_->_tmp0_ = NULL; -#line 80 "/data/projects/seahorse/common/exporter.vala" +#line 80 "/data/src/seahorse/common/exporter.vala" _data_->_tmp0_ = _data_->file; -#line 80 "/data/projects/seahorse/common/exporter.vala" +#line 80 "/data/src/seahorse/common/exporter.vala" _data_->_tmp1_ = NULL; -#line 80 "/data/projects/seahorse/common/exporter.vala" +#line 80 "/data/src/seahorse/common/exporter.vala" _data_->_tmp1_ = _g_object_ref0 (_data_->_tmp0_); -#line 80 "/data/projects/seahorse/common/exporter.vala" +#line 80 "/data/src/seahorse/common/exporter.vala" _data_->outfile = _data_->_tmp1_; -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_->_tmp3_ = NULL; -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_->_tmp3_ = _data_->cancellable; -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" memset (&_data_->_tmp4_, 0, sizeof (size_t)); -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_->_state_ = 1; -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" seahorse_exporter_export (_data_->self, _data_->_tmp3_, seahorse_exporter_export_to_file_ready, _data_); -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" return FALSE; #line 636 "exporter.c" _state_1: -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_->_tmp5_ = NULL; -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_->_tmp5_ = seahorse_exporter_export_finish (_data_->self, _data_->_res_, &_data_->_tmp4_, &_data_->_inner_error_); -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_->_tmp2__length1 = 0; -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_->__tmp2__size_ = 0; -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_->_tmp2_ = _data_->_tmp5_; -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_->_tmp2__length1 = _data_->_tmp4_; -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_->__tmp2__size_ = _data_->_tmp2__length1; -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" if (_data_->_inner_error_ != NULL) { -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" g_error_free (_data_->_inner_error_); -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _g_object_unref0 (_data_->outfile); -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_->bytes = (g_free (_data_->bytes), NULL); -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" if (_data_->_state_ == 0) { -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); #line 666 "exporter.c" } else { -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" g_simple_async_result_complete (_data_->_async_result); #line 670 "exporter.c" } -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" g_object_unref (_data_->_async_result); -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" return FALSE; #line 676 "exporter.c" } -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_->bytes = (g_free (_data_->bytes), NULL); -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_->bytes = _data_->_tmp2_; -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_->bytes_length1 = _data_->_tmp2__length1; -#line 82 "/data/projects/seahorse/common/exporter.vala" +#line 82 "/data/src/seahorse/common/exporter.vala" _data_->_bytes_size_ = _data_->bytes_length1; -#line 90 "/data/projects/seahorse/common/exporter.vala" +#line 90 "/data/src/seahorse/common/exporter.vala" while (TRUE) { -#line 91 "/data/projects/seahorse/common/exporter.vala" +#line 91 "/data/src/seahorse/common/exporter.vala" _data_->unique = (guint) 0; #line 690 "exporter.c" { -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" _data_->_tmp7_ = FALSE; -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" _data_->_tmp7_ = _data_->overwrite; -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" if (_data_->_tmp7_) { -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" _data_->_tmp6_ = NULL; #line 700 "exporter.c" } else { -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" _data_->_tmp6_ = "invalid etag"; #line 704 "exporter.c" } -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" _data_->_tmp8_ = NULL; -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" _data_->_tmp8_ = _data_->outfile; -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" _data_->_tmp9_ = NULL; -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" _data_->_tmp9__length1 = 0; -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" _data_->_tmp9_ = _data_->bytes; -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" _data_->_tmp9__length1 = _data_->bytes_length1; -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" _data_->_tmp10_ = NULL; -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" _data_->_tmp10_ = _data_->_tmp6_; -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" _data_->_tmp11_ = NULL; -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" _data_->_tmp11_ = _data_->cancellable; -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" _data_->_state_ = 2; -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" g_file_replace_contents_async (_data_->_tmp8_, _data_->_tmp9_, (gsize) _data_->_tmp9__length1, _data_->_tmp10_, FALSE, G_FILE_CREATE_PRIVATE, _data_->_tmp11_, seahorse_exporter_export_to_file_ready, _data_); -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" return FALSE; #line 732 "exporter.c" _state_2: -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" g_file_replace_contents_finish (_data_->_tmp8_, _data_->_res_, NULL, &_data_->_inner_error_); -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" if (_data_->_inner_error_ != NULL) { -#line 93 "/data/projects/seahorse/common/exporter.vala" +#line 93 "/data/src/seahorse/common/exporter.vala" if (_data_->_inner_error_->domain == G_IO_ERROR) { #line 740 "exporter.c" goto __catch6_g_io_error; } goto __finally6; } -#line 96 "/data/projects/seahorse/common/exporter.vala" +#line 96 "/data/src/seahorse/common/exporter.vala" _data_->result = TRUE; -#line 96 "/data/projects/seahorse/common/exporter.vala" +#line 96 "/data/src/seahorse/common/exporter.vala" _g_object_unref0 (_data_->outfile); -#line 96 "/data/projects/seahorse/common/exporter.vala" +#line 96 "/data/src/seahorse/common/exporter.vala" _data_->bytes = (g_free (_data_->bytes), NULL); -#line 96 "/data/projects/seahorse/common/exporter.vala" +#line 96 "/data/src/seahorse/common/exporter.vala" if (_data_->_state_ == 0) { -#line 96 "/data/projects/seahorse/common/exporter.vala" +#line 96 "/data/src/seahorse/common/exporter.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); #line 755 "exporter.c" } else { -#line 96 "/data/projects/seahorse/common/exporter.vala" +#line 96 "/data/src/seahorse/common/exporter.vala" g_simple_async_result_complete (_data_->_async_result); #line 759 "exporter.c" } -#line 96 "/data/projects/seahorse/common/exporter.vala" +#line 96 "/data/src/seahorse/common/exporter.vala" g_object_unref (_data_->_async_result); -#line 96 "/data/projects/seahorse/common/exporter.vala" +#line 96 "/data/src/seahorse/common/exporter.vala" return FALSE; #line 765 "exporter.c" } goto __finally6; __catch6_g_io_error: { -#line 92 "/data/projects/seahorse/common/exporter.vala" +#line 92 "/data/src/seahorse/common/exporter.vala" _data_->err = _data_->_inner_error_; -#line 92 "/data/projects/seahorse/common/exporter.vala" +#line 92 "/data/src/seahorse/common/exporter.vala" _data_->_inner_error_ = NULL; -#line 99 "/data/projects/seahorse/common/exporter.vala" +#line 99 "/data/src/seahorse/common/exporter.vala" _data_->_tmp12_ = NULL; -#line 99 "/data/projects/seahorse/common/exporter.vala" +#line 99 "/data/src/seahorse/common/exporter.vala" _data_->_tmp12_ = _data_->err; -#line 99 "/data/projects/seahorse/common/exporter.vala" +#line 99 "/data/src/seahorse/common/exporter.vala" if (g_error_matches (_data_->_tmp12_, G_IO_ERROR, G_IO_ERROR_WRONG_ETAG)) { -#line 100 "/data/projects/seahorse/common/exporter.vala" +#line 100 "/data/src/seahorse/common/exporter.vala" _data_->_tmp13_ = NULL; -#line 100 "/data/projects/seahorse/common/exporter.vala" +#line 100 "/data/src/seahorse/common/exporter.vala" _data_->_tmp13_ = _data_->file; -#line 100 "/data/projects/seahorse/common/exporter.vala" +#line 100 "/data/src/seahorse/common/exporter.vala" _data_->_tmp14_ = NULL; -#line 100 "/data/projects/seahorse/common/exporter.vala" +#line 100 "/data/src/seahorse/common/exporter.vala" _data_->_tmp14_ = seahorse_exporter_file_increment_unique (_data_->_tmp13_, &_data_->unique); -#line 100 "/data/projects/seahorse/common/exporter.vala" +#line 100 "/data/src/seahorse/common/exporter.vala" _g_object_unref0 (_data_->outfile); -#line 100 "/data/projects/seahorse/common/exporter.vala" +#line 100 "/data/src/seahorse/common/exporter.vala" _data_->outfile = _data_->_tmp14_; -#line 101 "/data/projects/seahorse/common/exporter.vala" +#line 101 "/data/src/seahorse/common/exporter.vala" _g_error_free0 (_data_->err); -#line 101 "/data/projects/seahorse/common/exporter.vala" +#line 101 "/data/src/seahorse/common/exporter.vala" continue; #line 796 "exporter.c" } -#line 103 "/data/projects/seahorse/common/exporter.vala" +#line 103 "/data/src/seahorse/common/exporter.vala" _data_->_tmp15_ = NULL; -#line 103 "/data/projects/seahorse/common/exporter.vala" +#line 103 "/data/src/seahorse/common/exporter.vala" _data_->_tmp15_ = _data_->err; -#line 103 "/data/projects/seahorse/common/exporter.vala" +#line 103 "/data/src/seahorse/common/exporter.vala" _data_->_tmp16_ = NULL; -#line 103 "/data/projects/seahorse/common/exporter.vala" +#line 103 "/data/src/seahorse/common/exporter.vala" _data_->_tmp16_ = _g_error_copy0 (_data_->_tmp15_); -#line 103 "/data/projects/seahorse/common/exporter.vala" +#line 103 "/data/src/seahorse/common/exporter.vala" _data_->_inner_error_ = _data_->_tmp16_; -#line 103 "/data/projects/seahorse/common/exporter.vala" +#line 103 "/data/src/seahorse/common/exporter.vala" _g_error_free0 (_data_->err); #line 810 "exporter.c" goto __finally6; } __finally6: -#line 92 "/data/projects/seahorse/common/exporter.vala" +#line 92 "/data/src/seahorse/common/exporter.vala" g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); -#line 92 "/data/projects/seahorse/common/exporter.vala" +#line 92 "/data/src/seahorse/common/exporter.vala" g_error_free (_data_->_inner_error_); -#line 92 "/data/projects/seahorse/common/exporter.vala" +#line 92 "/data/src/seahorse/common/exporter.vala" _g_object_unref0 (_data_->outfile); -#line 92 "/data/projects/seahorse/common/exporter.vala" +#line 92 "/data/src/seahorse/common/exporter.vala" _data_->bytes = (g_free (_data_->bytes), NULL); -#line 92 "/data/projects/seahorse/common/exporter.vala" +#line 92 "/data/src/seahorse/common/exporter.vala" if (_data_->_state_ == 0) { -#line 92 "/data/projects/seahorse/common/exporter.vala" +#line 92 "/data/src/seahorse/common/exporter.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); #line 826 "exporter.c" } else { -#line 92 "/data/projects/seahorse/common/exporter.vala" +#line 92 "/data/src/seahorse/common/exporter.vala" g_simple_async_result_complete (_data_->_async_result); #line 830 "exporter.c" } -#line 92 "/data/projects/seahorse/common/exporter.vala" +#line 92 "/data/src/seahorse/common/exporter.vala" g_object_unref (_data_->_async_result); -#line 92 "/data/projects/seahorse/common/exporter.vala" +#line 92 "/data/src/seahorse/common/exporter.vala" return FALSE; #line 836 "exporter.c" } -#line 75 "/data/projects/seahorse/common/exporter.vala" +#line 75 "/data/src/seahorse/common/exporter.vala" _g_object_unref0 (_data_->outfile); -#line 75 "/data/projects/seahorse/common/exporter.vala" +#line 75 "/data/src/seahorse/common/exporter.vala" _data_->bytes = (g_free (_data_->bytes), NULL); -#line 75 "/data/projects/seahorse/common/exporter.vala" +#line 75 "/data/src/seahorse/common/exporter.vala" if (_data_->_state_ == 0) { -#line 75 "/data/projects/seahorse/common/exporter.vala" +#line 75 "/data/src/seahorse/common/exporter.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); #line 846 "exporter.c" } else { -#line 75 "/data/projects/seahorse/common/exporter.vala" +#line 75 "/data/src/seahorse/common/exporter.vala" g_simple_async_result_complete (_data_->_async_result); #line 850 "exporter.c" } -#line 75 "/data/projects/seahorse/common/exporter.vala" +#line 75 "/data/src/seahorse/common/exporter.vala" g_object_unref (_data_->_async_result); -#line 75 "/data/projects/seahorse/common/exporter.vala" +#line 75 "/data/src/seahorse/common/exporter.vala" return FALSE; #line 856 "exporter.c" } gchar* seahorse_exporter_get_filename (SeahorseExporter* self) { -#line 35 "/data/projects/seahorse/common/exporter.vala" +#line 35 "/data/src/seahorse/common/exporter.vala" g_return_val_if_fail (self != NULL, NULL); -#line 35 "/data/projects/seahorse/common/exporter.vala" +#line 35 "/data/src/seahorse/common/exporter.vala" return SEAHORSE_EXPORTER_GET_INTERFACE (self)->get_filename (self); #line 865 "exporter.c" } const gchar* seahorse_exporter_get_content_type (SeahorseExporter* self) { -#line 37 "/data/projects/seahorse/common/exporter.vala" +#line 37 "/data/src/seahorse/common/exporter.vala" g_return_val_if_fail (self != NULL, NULL); -#line 37 "/data/projects/seahorse/common/exporter.vala" +#line 37 "/data/src/seahorse/common/exporter.vala" return SEAHORSE_EXPORTER_GET_INTERFACE (self)->get_content_type (self); #line 874 "exporter.c" } GtkFileFilter* seahorse_exporter_get_file_filter (SeahorseExporter* self) { -#line 39 "/data/projects/seahorse/common/exporter.vala" +#line 39 "/data/src/seahorse/common/exporter.vala" g_return_val_if_fail (self != NULL, NULL); -#line 39 "/data/projects/seahorse/common/exporter.vala" +#line 39 "/data/src/seahorse/common/exporter.vala" return SEAHORSE_EXPORTER_GET_INTERFACE (self)->get_file_filter (self); #line 883 "exporter.c" } static void seahorse_exporter_base_init (SeahorseExporterIface * iface) { -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" static gboolean initialized = FALSE; -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" if (!initialized) { -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" initialized = TRUE; -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" g_object_interface_install_property (iface, g_param_spec_string ("filename", "filename", "filename", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" g_object_interface_install_property (iface, g_param_spec_string ("content-type", "content-type", "content-type", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 34 "/data/projects/seahorse/common/exporter.vala" +#line 34 "/data/src/seahorse/common/exporter.vala" g_object_interface_install_property (iface, g_param_spec_object ("file-filter", "file-filter", "file-filter", GTK_TYPE_FILE_FILTER, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 900 "exporter.c" } diff -Nru seahorse-3.10.1/common/icons.c seahorse-3.10.2/common/icons.c --- seahorse-3.10.1/common/icons.c 2013-07-24 15:11:10.000000000 +0000 +++ seahorse-3.10.2/common/icons.c 2014-01-08 15:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -/* icons.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* icons.c generated by valac 0.22.1, the Vala compiler * generated from icons.vala, do not modify */ /* @@ -45,29 +45,29 @@ gchar* _tmp1_ = NULL; GtkIconTheme* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; -#line 39 "/data/projects/seahorse/common/icons.vala" +#line 39 "/data/src/seahorse/common/icons.vala" _tmp0_ = seahorse__icons_inited; -#line 39 "/data/projects/seahorse/common/icons.vala" +#line 39 "/data/src/seahorse/common/icons.vala" if (_tmp0_) { -#line 40 "/data/projects/seahorse/common/icons.vala" +#line 40 "/data/src/seahorse/common/icons.vala" return; #line 55 "icons.c" } -#line 41 "/data/projects/seahorse/common/icons.vala" +#line 41 "/data/src/seahorse/common/icons.vala" seahorse__icons_inited = TRUE; -#line 43 "/data/projects/seahorse/common/icons.vala" +#line 43 "/data/src/seahorse/common/icons.vala" _tmp1_ = g_build_filename (PKGDATADIR, "icons", NULL); -#line 43 "/data/projects/seahorse/common/icons.vala" +#line 43 "/data/src/seahorse/common/icons.vala" path = _tmp1_; -#line 44 "/data/projects/seahorse/common/icons.vala" +#line 44 "/data/src/seahorse/common/icons.vala" _tmp2_ = gtk_icon_theme_get_default (); -#line 44 "/data/projects/seahorse/common/icons.vala" +#line 44 "/data/src/seahorse/common/icons.vala" _tmp3_ = path; -#line 44 "/data/projects/seahorse/common/icons.vala" +#line 44 "/data/src/seahorse/common/icons.vala" gtk_icon_theme_append_search_path (_tmp2_, _tmp3_); -#line 45 "/data/projects/seahorse/common/icons.vala" +#line 45 "/data/src/seahorse/common/icons.vala" gtk_window_set_default_icon_name ("seahorse"); -#line 38 "/data/projects/seahorse/common/icons.vala" +#line 38 "/data/src/seahorse/common/icons.vala" _g_free0 (path); #line 73 "icons.c" } diff -Nru seahorse-3.10.1/common/lockable.c seahorse-3.10.2/common/lockable.c --- seahorse-3.10.1/common/lockable.c 2013-07-24 15:11:10.000000000 +0000 +++ seahorse-3.10.2/common/lockable.c 2014-01-08 15:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -/* lockable.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* lockable.c generated by valac 0.22.1, the Vala compiler * generated from lockable.vala, do not modify */ /* @@ -34,28 +34,28 @@ void seahorse_lockable_lock (SeahorseLockable* self, GTlsInteraction* interaction, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_) { -#line 25 "/data/projects/seahorse/common/lockable.vala" +#line 25 "/data/src/seahorse/common/lockable.vala" SEAHORSE_LOCKABLE_GET_INTERFACE (self)->lock (self, interaction, cancellable, _callback_, _user_data_); #line 40 "lockable.c" } gboolean seahorse_lockable_lock_finish (SeahorseLockable* self, GAsyncResult* _res_, GError** error) { -#line 25 "/data/projects/seahorse/common/lockable.vala" +#line 25 "/data/src/seahorse/common/lockable.vala" return SEAHORSE_LOCKABLE_GET_INTERFACE (self)->lock_finish (self, _res_, error); #line 47 "lockable.c" } void seahorse_lockable_unlock (SeahorseLockable* self, GTlsInteraction* interaction, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_) { -#line 25 "/data/projects/seahorse/common/lockable.vala" +#line 25 "/data/src/seahorse/common/lockable.vala" SEAHORSE_LOCKABLE_GET_INTERFACE (self)->unlock (self, interaction, cancellable, _callback_, _user_data_); #line 54 "lockable.c" } gboolean seahorse_lockable_unlock_finish (SeahorseLockable* self, GAsyncResult* _res_, GError** error) { -#line 25 "/data/projects/seahorse/common/lockable.vala" +#line 25 "/data/src/seahorse/common/lockable.vala" return SEAHORSE_LOCKABLE_GET_INTERFACE (self)->unlock_finish (self, _res_, error); #line 61 "lockable.c" } @@ -64,31 +64,31 @@ gboolean seahorse_lockable_can_lock (GObject* object) { gboolean result = FALSE; GObject* _tmp0_ = NULL; -#line 35 "/data/projects/seahorse/common/lockable.vala" +#line 35 "/data/src/seahorse/common/lockable.vala" g_return_val_if_fail (object != NULL, FALSE); -#line 36 "/data/projects/seahorse/common/lockable.vala" +#line 36 "/data/src/seahorse/common/lockable.vala" _tmp0_ = object; -#line 36 "/data/projects/seahorse/common/lockable.vala" +#line 36 "/data/src/seahorse/common/lockable.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SEAHORSE_TYPE_LOCKABLE)) { #line 74 "lockable.c" GObject* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 37 "/data/projects/seahorse/common/lockable.vala" +#line 37 "/data/src/seahorse/common/lockable.vala" _tmp1_ = object; -#line 37 "/data/projects/seahorse/common/lockable.vala" +#line 37 "/data/src/seahorse/common/lockable.vala" _tmp2_ = seahorse_lockable_get_lockable (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SEAHORSE_TYPE_LOCKABLE, SeahorseLockable)); -#line 37 "/data/projects/seahorse/common/lockable.vala" +#line 37 "/data/src/seahorse/common/lockable.vala" _tmp3_ = _tmp2_; -#line 37 "/data/projects/seahorse/common/lockable.vala" +#line 37 "/data/src/seahorse/common/lockable.vala" result = _tmp3_; -#line 37 "/data/projects/seahorse/common/lockable.vala" +#line 37 "/data/src/seahorse/common/lockable.vala" return result; #line 88 "lockable.c" } -#line 38 "/data/projects/seahorse/common/lockable.vala" +#line 38 "/data/src/seahorse/common/lockable.vala" result = FALSE; -#line 38 "/data/projects/seahorse/common/lockable.vala" +#line 38 "/data/src/seahorse/common/lockable.vala" return result; #line 94 "lockable.c" } @@ -97,64 +97,64 @@ gboolean seahorse_lockable_can_unlock (GObject* object) { gboolean result = FALSE; GObject* _tmp0_ = NULL; -#line 41 "/data/projects/seahorse/common/lockable.vala" +#line 41 "/data/src/seahorse/common/lockable.vala" g_return_val_if_fail (object != NULL, FALSE); -#line 42 "/data/projects/seahorse/common/lockable.vala" +#line 42 "/data/src/seahorse/common/lockable.vala" _tmp0_ = object; -#line 42 "/data/projects/seahorse/common/lockable.vala" +#line 42 "/data/src/seahorse/common/lockable.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SEAHORSE_TYPE_LOCKABLE)) { #line 107 "lockable.c" GObject* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 43 "/data/projects/seahorse/common/lockable.vala" +#line 43 "/data/src/seahorse/common/lockable.vala" _tmp1_ = object; -#line 43 "/data/projects/seahorse/common/lockable.vala" +#line 43 "/data/src/seahorse/common/lockable.vala" _tmp2_ = seahorse_lockable_get_unlockable (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SEAHORSE_TYPE_LOCKABLE, SeahorseLockable)); -#line 43 "/data/projects/seahorse/common/lockable.vala" +#line 43 "/data/src/seahorse/common/lockable.vala" _tmp3_ = _tmp2_; -#line 43 "/data/projects/seahorse/common/lockable.vala" +#line 43 "/data/src/seahorse/common/lockable.vala" result = _tmp3_; -#line 43 "/data/projects/seahorse/common/lockable.vala" +#line 43 "/data/src/seahorse/common/lockable.vala" return result; #line 121 "lockable.c" } -#line 44 "/data/projects/seahorse/common/lockable.vala" +#line 44 "/data/src/seahorse/common/lockable.vala" result = FALSE; -#line 44 "/data/projects/seahorse/common/lockable.vala" +#line 44 "/data/src/seahorse/common/lockable.vala" return result; #line 127 "lockable.c" } gboolean seahorse_lockable_get_lockable (SeahorseLockable* self) { -#line 26 "/data/projects/seahorse/common/lockable.vala" +#line 26 "/data/src/seahorse/common/lockable.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 26 "/data/projects/seahorse/common/lockable.vala" +#line 26 "/data/src/seahorse/common/lockable.vala" return SEAHORSE_LOCKABLE_GET_INTERFACE (self)->get_lockable (self); #line 136 "lockable.c" } gboolean seahorse_lockable_get_unlockable (SeahorseLockable* self) { -#line 27 "/data/projects/seahorse/common/lockable.vala" +#line 27 "/data/src/seahorse/common/lockable.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 27 "/data/projects/seahorse/common/lockable.vala" +#line 27 "/data/src/seahorse/common/lockable.vala" return SEAHORSE_LOCKABLE_GET_INTERFACE (self)->get_unlockable (self); #line 145 "lockable.c" } static void seahorse_lockable_base_init (SeahorseLockableIface * iface) { -#line 25 "/data/projects/seahorse/common/lockable.vala" +#line 25 "/data/src/seahorse/common/lockable.vala" static gboolean initialized = FALSE; -#line 25 "/data/projects/seahorse/common/lockable.vala" +#line 25 "/data/src/seahorse/common/lockable.vala" if (!initialized) { -#line 25 "/data/projects/seahorse/common/lockable.vala" +#line 25 "/data/src/seahorse/common/lockable.vala" initialized = TRUE; -#line 25 "/data/projects/seahorse/common/lockable.vala" +#line 25 "/data/src/seahorse/common/lockable.vala" g_object_interface_install_property (iface, g_param_spec_boolean ("lockable", "lockable", "lockable", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 25 "/data/projects/seahorse/common/lockable.vala" +#line 25 "/data/src/seahorse/common/lockable.vala" g_object_interface_install_property (iface, g_param_spec_boolean ("unlockable", "unlockable", "unlockable", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 160 "lockable.c" } diff -Nru seahorse-3.10.1/common/place.c seahorse-3.10.2/common/place.c --- seahorse-3.10.1/common/place.c 2013-07-24 15:11:10.000000000 +0000 +++ seahorse-3.10.2/common/place.c 2014-01-08 15:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -/* place.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* place.c generated by valac 0.22.1, the Vala compiler * generated from place.vala, do not modify */ /* @@ -35,80 +35,80 @@ void seahorse_place_load (SeahorsePlace* self, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_) { -#line 26 "/data/projects/seahorse/common/place.vala" +#line 26 "/data/src/seahorse/common/place.vala" SEAHORSE_PLACE_GET_INTERFACE (self)->load (self, cancellable, _callback_, _user_data_); #line 41 "place.c" } gboolean seahorse_place_load_finish (SeahorsePlace* self, GAsyncResult* _res_, GError** error) { -#line 26 "/data/projects/seahorse/common/place.vala" +#line 26 "/data/src/seahorse/common/place.vala" return SEAHORSE_PLACE_GET_INTERFACE (self)->load_finish (self, _res_, error); #line 48 "place.c" } gchar* seahorse_place_get_label (SeahorsePlace* self) { -#line 27 "/data/projects/seahorse/common/place.vala" +#line 27 "/data/src/seahorse/common/place.vala" g_return_val_if_fail (self != NULL, NULL); -#line 27 "/data/projects/seahorse/common/place.vala" +#line 27 "/data/src/seahorse/common/place.vala" return SEAHORSE_PLACE_GET_INTERFACE (self)->get_label (self); #line 57 "place.c" } gchar* seahorse_place_get_description (SeahorsePlace* self) { -#line 28 "/data/projects/seahorse/common/place.vala" +#line 28 "/data/src/seahorse/common/place.vala" g_return_val_if_fail (self != NULL, NULL); -#line 28 "/data/projects/seahorse/common/place.vala" +#line 28 "/data/src/seahorse/common/place.vala" return SEAHORSE_PLACE_GET_INTERFACE (self)->get_description (self); #line 66 "place.c" } gchar* seahorse_place_get_uri (SeahorsePlace* self) { -#line 29 "/data/projects/seahorse/common/place.vala" +#line 29 "/data/src/seahorse/common/place.vala" g_return_val_if_fail (self != NULL, NULL); -#line 29 "/data/projects/seahorse/common/place.vala" +#line 29 "/data/src/seahorse/common/place.vala" return SEAHORSE_PLACE_GET_INTERFACE (self)->get_uri (self); #line 75 "place.c" } GIcon* seahorse_place_get_icon (SeahorsePlace* self) { -#line 30 "/data/projects/seahorse/common/place.vala" +#line 30 "/data/src/seahorse/common/place.vala" g_return_val_if_fail (self != NULL, NULL); -#line 30 "/data/projects/seahorse/common/place.vala" +#line 30 "/data/src/seahorse/common/place.vala" return SEAHORSE_PLACE_GET_INTERFACE (self)->get_icon (self); #line 84 "place.c" } GtkActionGroup* seahorse_place_get_actions (SeahorsePlace* self) { -#line 31 "/data/projects/seahorse/common/place.vala" +#line 31 "/data/src/seahorse/common/place.vala" g_return_val_if_fail (self != NULL, NULL); -#line 31 "/data/projects/seahorse/common/place.vala" +#line 31 "/data/src/seahorse/common/place.vala" return SEAHORSE_PLACE_GET_INTERFACE (self)->get_actions (self); #line 93 "place.c" } static void seahorse_place_base_init (SeahorsePlaceIface * iface) { -#line 26 "/data/projects/seahorse/common/place.vala" +#line 26 "/data/src/seahorse/common/place.vala" static gboolean initialized = FALSE; -#line 26 "/data/projects/seahorse/common/place.vala" +#line 26 "/data/src/seahorse/common/place.vala" if (!initialized) { -#line 26 "/data/projects/seahorse/common/place.vala" +#line 26 "/data/src/seahorse/common/place.vala" initialized = TRUE; -#line 26 "/data/projects/seahorse/common/place.vala" +#line 26 "/data/src/seahorse/common/place.vala" g_object_interface_install_property (iface, g_param_spec_string ("label", "label", "label", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 26 "/data/projects/seahorse/common/place.vala" +#line 26 "/data/src/seahorse/common/place.vala" g_object_interface_install_property (iface, g_param_spec_string ("description", "description", "description", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 26 "/data/projects/seahorse/common/place.vala" +#line 26 "/data/src/seahorse/common/place.vala" g_object_interface_install_property (iface, g_param_spec_string ("uri", "uri", "uri", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 26 "/data/projects/seahorse/common/place.vala" +#line 26 "/data/src/seahorse/common/place.vala" g_object_interface_install_property (iface, g_param_spec_object ("icon", "icon", "icon", G_TYPE_ICON, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 26 "/data/projects/seahorse/common/place.vala" +#line 26 "/data/src/seahorse/common/place.vala" g_object_interface_install_property (iface, g_param_spec_object ("actions", "actions", "actions", GTK_TYPE_ACTION_GROUP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 114 "place.c" } diff -Nru seahorse-3.10.1/common/registry.c seahorse-3.10.2/common/registry.c --- seahorse-3.10.1/common/registry.c 2013-07-24 15:11:10.000000000 +0000 +++ seahorse-3.10.2/common/registry.c 2014-01-08 15:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -/* registry.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* registry.c generated by valac 0.22.1, the Vala compiler * generated from registry.vala, do not modify */ /* @@ -55,7 +55,7 @@ static gpointer _g_object_ref0 (gpointer self) { -#line 33 "/data/projects/seahorse/common/registry.vala" +#line 33 "/data/src/seahorse/common/registry.vala" return self ? g_object_ref (self) : NULL; #line 61 "registry.c" } @@ -66,50 +66,50 @@ SeahorseRegistry* _tmp0_ = NULL; SeahorseRegistry* _tmp2_ = NULL; SeahorseRegistry* _tmp3_ = NULL; -#line 31 "/data/projects/seahorse/common/registry.vala" +#line 31 "/data/src/seahorse/common/registry.vala" _tmp0_ = seahorse_registry__singleton; -#line 31 "/data/projects/seahorse/common/registry.vala" +#line 31 "/data/src/seahorse/common/registry.vala" if (_tmp0_ == NULL) { #line 74 "registry.c" SeahorseRegistry* _tmp1_ = NULL; -#line 32 "/data/projects/seahorse/common/registry.vala" +#line 32 "/data/src/seahorse/common/registry.vala" _tmp1_ = seahorse_registry_new (); -#line 32 "/data/projects/seahorse/common/registry.vala" +#line 32 "/data/src/seahorse/common/registry.vala" _g_object_unref0 (seahorse_registry__singleton); -#line 32 "/data/projects/seahorse/common/registry.vala" +#line 32 "/data/src/seahorse/common/registry.vala" seahorse_registry__singleton = _tmp1_; #line 82 "registry.c" } -#line 33 "/data/projects/seahorse/common/registry.vala" +#line 33 "/data/src/seahorse/common/registry.vala" _tmp2_ = seahorse_registry__singleton; -#line 33 "/data/projects/seahorse/common/registry.vala" +#line 33 "/data/src/seahorse/common/registry.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 33 "/data/projects/seahorse/common/registry.vala" +#line 33 "/data/src/seahorse/common/registry.vala" result = _tmp3_; -#line 33 "/data/projects/seahorse/common/registry.vala" +#line 33 "/data/src/seahorse/common/registry.vala" return result; #line 92 "registry.c" } void seahorse_registry_cleanup (void) { -#line 37 "/data/projects/seahorse/common/registry.vala" +#line 37 "/data/src/seahorse/common/registry.vala" _g_object_unref0 (seahorse_registry__singleton); -#line 37 "/data/projects/seahorse/common/registry.vala" +#line 37 "/data/src/seahorse/common/registry.vala" seahorse_registry__singleton = NULL; #line 101 "registry.c" } static gpointer _g_hash_table_ref0 (gpointer self) { -#line 45 "/data/projects/seahorse/common/registry.vala" +#line 45 "/data/src/seahorse/common/registry.vala" return self ? g_hash_table_ref (self) : NULL; #line 108 "registry.c" } static void _g_object_unref0_ (gpointer var) { -#line 47 "/data/projects/seahorse/common/registry.vala" +#line 47 "/data/src/seahorse/common/registry.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); #line 115 "registry.c" } @@ -130,31 +130,31 @@ GObject* _tmp18_ = NULL; GObject* _tmp19_ = NULL; GObject* _tmp20_ = NULL; -#line 40 "/data/projects/seahorse/common/registry.vala" +#line 40 "/data/src/seahorse/common/registry.vala" g_return_if_fail (object != NULL); -#line 40 "/data/projects/seahorse/common/registry.vala" +#line 40 "/data/src/seahorse/common/registry.vala" g_return_if_fail (category != NULL); -#line 42 "/data/projects/seahorse/common/registry.vala" +#line 42 "/data/src/seahorse/common/registry.vala" _tmp0_ = seahorse_registry_instance (); -#line 42 "/data/projects/seahorse/common/registry.vala" +#line 42 "/data/src/seahorse/common/registry.vala" registry = _tmp0_; -#line 45 "/data/projects/seahorse/common/registry.vala" +#line 45 "/data/src/seahorse/common/registry.vala" _tmp1_ = registry; -#line 45 "/data/projects/seahorse/common/registry.vala" +#line 45 "/data/src/seahorse/common/registry.vala" _tmp2_ = _tmp1_->priv->_objects; -#line 45 "/data/projects/seahorse/common/registry.vala" +#line 45 "/data/src/seahorse/common/registry.vala" _tmp3_ = category; -#line 45 "/data/projects/seahorse/common/registry.vala" +#line 45 "/data/src/seahorse/common/registry.vala" _tmp4_ = g_hash_table_lookup (_tmp2_, _tmp3_); -#line 45 "/data/projects/seahorse/common/registry.vala" +#line 45 "/data/src/seahorse/common/registry.vala" _tmp5_ = _g_hash_table_ref0 ((GHashTable*) _tmp4_); -#line 45 "/data/projects/seahorse/common/registry.vala" +#line 45 "/data/src/seahorse/common/registry.vala" _g_hash_table_unref0 (oset); -#line 45 "/data/projects/seahorse/common/registry.vala" +#line 45 "/data/src/seahorse/common/registry.vala" oset = _tmp5_; -#line 46 "/data/projects/seahorse/common/registry.vala" +#line 46 "/data/src/seahorse/common/registry.vala" _tmp6_ = oset; -#line 46 "/data/projects/seahorse/common/registry.vala" +#line 46 "/data/src/seahorse/common/registry.vala" if (_tmp6_ == NULL) { #line 160 "registry.c" GHashFunc _tmp7_ = NULL; @@ -166,47 +166,47 @@ gchar* _tmp13_ = NULL; GHashTable* _tmp14_ = NULL; GHashTable* _tmp15_ = NULL; -#line 47 "/data/projects/seahorse/common/registry.vala" +#line 47 "/data/src/seahorse/common/registry.vala" _tmp7_ = g_direct_hash; -#line 47 "/data/projects/seahorse/common/registry.vala" +#line 47 "/data/src/seahorse/common/registry.vala" _tmp8_ = g_direct_equal; -#line 47 "/data/projects/seahorse/common/registry.vala" +#line 47 "/data/src/seahorse/common/registry.vala" _tmp9_ = g_hash_table_new_full (_tmp7_, _tmp8_, _g_object_unref0_, _g_object_unref0_); -#line 47 "/data/projects/seahorse/common/registry.vala" +#line 47 "/data/src/seahorse/common/registry.vala" _g_hash_table_unref0 (oset); -#line 47 "/data/projects/seahorse/common/registry.vala" +#line 47 "/data/src/seahorse/common/registry.vala" oset = _tmp9_; -#line 48 "/data/projects/seahorse/common/registry.vala" +#line 48 "/data/src/seahorse/common/registry.vala" _tmp10_ = registry; -#line 48 "/data/projects/seahorse/common/registry.vala" +#line 48 "/data/src/seahorse/common/registry.vala" _tmp11_ = _tmp10_->priv->_objects; -#line 48 "/data/projects/seahorse/common/registry.vala" +#line 48 "/data/src/seahorse/common/registry.vala" _tmp12_ = category; -#line 48 "/data/projects/seahorse/common/registry.vala" +#line 48 "/data/src/seahorse/common/registry.vala" _tmp13_ = g_strdup (_tmp12_); -#line 48 "/data/projects/seahorse/common/registry.vala" +#line 48 "/data/src/seahorse/common/registry.vala" _tmp14_ = oset; -#line 48 "/data/projects/seahorse/common/registry.vala" +#line 48 "/data/src/seahorse/common/registry.vala" _tmp15_ = _g_hash_table_ref0 (_tmp14_); -#line 48 "/data/projects/seahorse/common/registry.vala" +#line 48 "/data/src/seahorse/common/registry.vala" g_hash_table_replace (_tmp11_, _tmp13_, _tmp15_); #line 194 "registry.c" } -#line 51 "/data/projects/seahorse/common/registry.vala" +#line 51 "/data/src/seahorse/common/registry.vala" _tmp16_ = oset; -#line 51 "/data/projects/seahorse/common/registry.vala" +#line 51 "/data/src/seahorse/common/registry.vala" _tmp17_ = object; -#line 51 "/data/projects/seahorse/common/registry.vala" +#line 51 "/data/src/seahorse/common/registry.vala" _tmp18_ = _g_object_ref0 (_tmp17_); -#line 51 "/data/projects/seahorse/common/registry.vala" +#line 51 "/data/src/seahorse/common/registry.vala" _tmp19_ = object; -#line 51 "/data/projects/seahorse/common/registry.vala" +#line 51 "/data/src/seahorse/common/registry.vala" _tmp20_ = _g_object_ref0 (_tmp19_); -#line 51 "/data/projects/seahorse/common/registry.vala" +#line 51 "/data/src/seahorse/common/registry.vala" g_hash_table_replace (_tmp16_, _tmp18_, _tmp20_); -#line 40 "/data/projects/seahorse/common/registry.vala" +#line 40 "/data/src/seahorse/common/registry.vala" _g_hash_table_unref0 (oset); -#line 40 "/data/projects/seahorse/common/registry.vala" +#line 40 "/data/src/seahorse/common/registry.vala" _g_object_unref0 (registry); #line 212 "registry.c" } @@ -227,45 +227,45 @@ GHashTable* _tmp7_ = NULL; GObject* key = NULL; GObject* value = NULL; -#line 54 "/data/projects/seahorse/common/registry.vala" +#line 54 "/data/src/seahorse/common/registry.vala" g_return_val_if_fail (category != NULL, NULL); -#line 55 "/data/projects/seahorse/common/registry.vala" +#line 55 "/data/src/seahorse/common/registry.vala" _tmp0_ = seahorse_registry_instance (); -#line 55 "/data/projects/seahorse/common/registry.vala" +#line 55 "/data/src/seahorse/common/registry.vala" registry = _tmp0_; -#line 58 "/data/projects/seahorse/common/registry.vala" +#line 58 "/data/src/seahorse/common/registry.vala" _tmp1_ = registry; -#line 58 "/data/projects/seahorse/common/registry.vala" +#line 58 "/data/src/seahorse/common/registry.vala" _tmp2_ = _tmp1_->priv->_objects; -#line 58 "/data/projects/seahorse/common/registry.vala" +#line 58 "/data/src/seahorse/common/registry.vala" _tmp3_ = category; -#line 58 "/data/projects/seahorse/common/registry.vala" +#line 58 "/data/src/seahorse/common/registry.vala" _tmp4_ = g_hash_table_lookup (_tmp2_, _tmp3_); -#line 58 "/data/projects/seahorse/common/registry.vala" +#line 58 "/data/src/seahorse/common/registry.vala" _tmp5_ = _g_hash_table_ref0 ((GHashTable*) _tmp4_); -#line 58 "/data/projects/seahorse/common/registry.vala" +#line 58 "/data/src/seahorse/common/registry.vala" _g_hash_table_unref0 (oset); -#line 58 "/data/projects/seahorse/common/registry.vala" +#line 58 "/data/src/seahorse/common/registry.vala" oset = _tmp5_; -#line 59 "/data/projects/seahorse/common/registry.vala" +#line 59 "/data/src/seahorse/common/registry.vala" _tmp6_ = oset; -#line 59 "/data/projects/seahorse/common/registry.vala" +#line 59 "/data/src/seahorse/common/registry.vala" if (_tmp6_ == NULL) { -#line 60 "/data/projects/seahorse/common/registry.vala" +#line 60 "/data/src/seahorse/common/registry.vala" result = NULL; -#line 60 "/data/projects/seahorse/common/registry.vala" +#line 60 "/data/src/seahorse/common/registry.vala" _g_hash_table_unref0 (oset); -#line 60 "/data/projects/seahorse/common/registry.vala" +#line 60 "/data/src/seahorse/common/registry.vala" _g_object_unref0 (registry); -#line 60 "/data/projects/seahorse/common/registry.vala" +#line 60 "/data/src/seahorse/common/registry.vala" return result; #line 263 "registry.c" } -#line 62 "/data/projects/seahorse/common/registry.vala" +#line 62 "/data/src/seahorse/common/registry.vala" _tmp7_ = oset; -#line 62 "/data/projects/seahorse/common/registry.vala" +#line 62 "/data/src/seahorse/common/registry.vala" g_hash_table_iter_init (&iter, _tmp7_); -#line 65 "/data/projects/seahorse/common/registry.vala" +#line 65 "/data/src/seahorse/common/registry.vala" while (TRUE) { #line 271 "registry.c" gconstpointer _tmp8_ = NULL; @@ -273,48 +273,48 @@ gboolean _tmp10_ = FALSE; GObject* _tmp11_ = NULL; GObject* _tmp12_ = NULL; -#line 65 "/data/projects/seahorse/common/registry.vala" - _tmp10_ = g_hash_table_iter_next (&iter, &_tmp8_, &_tmp9_); -#line 65 "/data/projects/seahorse/common/registry.vala" +#line 65 "/data/src/seahorse/common/registry.vala" + _tmp10_ = g_hash_table_iter_next (&iter, (gpointer*) (&_tmp8_), (gpointer*) (&_tmp9_)); +#line 65 "/data/src/seahorse/common/registry.vala" key = _tmp8_; -#line 65 "/data/projects/seahorse/common/registry.vala" +#line 65 "/data/src/seahorse/common/registry.vala" value = _tmp9_; -#line 65 "/data/projects/seahorse/common/registry.vala" +#line 65 "/data/src/seahorse/common/registry.vala" if (!_tmp10_) { -#line 65 "/data/projects/seahorse/common/registry.vala" +#line 65 "/data/src/seahorse/common/registry.vala" break; #line 287 "registry.c" } -#line 66 "/data/projects/seahorse/common/registry.vala" +#line 66 "/data/src/seahorse/common/registry.vala" _tmp11_ = value; -#line 66 "/data/projects/seahorse/common/registry.vala" +#line 66 "/data/src/seahorse/common/registry.vala" _tmp12_ = _g_object_ref0 (_tmp11_); -#line 66 "/data/projects/seahorse/common/registry.vala" +#line 66 "/data/src/seahorse/common/registry.vala" result = _tmp12_; -#line 66 "/data/projects/seahorse/common/registry.vala" +#line 66 "/data/src/seahorse/common/registry.vala" _g_hash_table_unref0 (oset); -#line 66 "/data/projects/seahorse/common/registry.vala" +#line 66 "/data/src/seahorse/common/registry.vala" _g_object_unref0 (registry); -#line 66 "/data/projects/seahorse/common/registry.vala" +#line 66 "/data/src/seahorse/common/registry.vala" return result; #line 301 "registry.c" } -#line 69 "/data/projects/seahorse/common/registry.vala" +#line 69 "/data/src/seahorse/common/registry.vala" result = NULL; -#line 69 "/data/projects/seahorse/common/registry.vala" +#line 69 "/data/src/seahorse/common/registry.vala" _g_hash_table_unref0 (oset); -#line 69 "/data/projects/seahorse/common/registry.vala" +#line 69 "/data/src/seahorse/common/registry.vala" _g_object_unref0 (registry); -#line 69 "/data/projects/seahorse/common/registry.vala" +#line 69 "/data/src/seahorse/common/registry.vala" return result; #line 311 "registry.c" } static void _g_list_free__g_object_unref0_ (GList* self) { -#line 72 "/data/projects/seahorse/common/registry.vala" +#line 72 "/data/src/seahorse/common/registry.vala" g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); -#line 72 "/data/projects/seahorse/common/registry.vala" +#line 72 "/data/src/seahorse/common/registry.vala" g_list_free (self); #line 320 "registry.c" } @@ -336,47 +336,47 @@ GHashTable* _tmp7_ = NULL; GObject* key = NULL; GObject* value = NULL; -#line 72 "/data/projects/seahorse/common/registry.vala" +#line 72 "/data/src/seahorse/common/registry.vala" g_return_val_if_fail (category != NULL, NULL); -#line 73 "/data/projects/seahorse/common/registry.vala" +#line 73 "/data/src/seahorse/common/registry.vala" _tmp0_ = seahorse_registry_instance (); -#line 73 "/data/projects/seahorse/common/registry.vala" +#line 73 "/data/src/seahorse/common/registry.vala" registry = _tmp0_; -#line 75 "/data/projects/seahorse/common/registry.vala" +#line 75 "/data/src/seahorse/common/registry.vala" insts = NULL; -#line 77 "/data/projects/seahorse/common/registry.vala" +#line 77 "/data/src/seahorse/common/registry.vala" _tmp1_ = registry; -#line 77 "/data/projects/seahorse/common/registry.vala" +#line 77 "/data/src/seahorse/common/registry.vala" _tmp2_ = _tmp1_->priv->_objects; -#line 77 "/data/projects/seahorse/common/registry.vala" +#line 77 "/data/src/seahorse/common/registry.vala" _tmp3_ = category; -#line 77 "/data/projects/seahorse/common/registry.vala" +#line 77 "/data/src/seahorse/common/registry.vala" _tmp4_ = g_hash_table_lookup (_tmp2_, _tmp3_); -#line 77 "/data/projects/seahorse/common/registry.vala" +#line 77 "/data/src/seahorse/common/registry.vala" _tmp5_ = _g_hash_table_ref0 ((GHashTable*) _tmp4_); -#line 77 "/data/projects/seahorse/common/registry.vala" +#line 77 "/data/src/seahorse/common/registry.vala" _g_hash_table_unref0 (oset); -#line 77 "/data/projects/seahorse/common/registry.vala" +#line 77 "/data/src/seahorse/common/registry.vala" oset = _tmp5_; -#line 78 "/data/projects/seahorse/common/registry.vala" +#line 78 "/data/src/seahorse/common/registry.vala" _tmp6_ = oset; -#line 78 "/data/projects/seahorse/common/registry.vala" +#line 78 "/data/src/seahorse/common/registry.vala" if (_tmp6_ == NULL) { -#line 79 "/data/projects/seahorse/common/registry.vala" +#line 79 "/data/src/seahorse/common/registry.vala" result = insts; -#line 79 "/data/projects/seahorse/common/registry.vala" +#line 79 "/data/src/seahorse/common/registry.vala" _g_hash_table_unref0 (oset); -#line 79 "/data/projects/seahorse/common/registry.vala" +#line 79 "/data/src/seahorse/common/registry.vala" _g_object_unref0 (registry); -#line 79 "/data/projects/seahorse/common/registry.vala" +#line 79 "/data/src/seahorse/common/registry.vala" return result; #line 374 "registry.c" } -#line 81 "/data/projects/seahorse/common/registry.vala" +#line 81 "/data/src/seahorse/common/registry.vala" _tmp7_ = oset; -#line 81 "/data/projects/seahorse/common/registry.vala" +#line 81 "/data/src/seahorse/common/registry.vala" g_hash_table_iter_init (&iter, _tmp7_); -#line 84 "/data/projects/seahorse/common/registry.vala" +#line 84 "/data/src/seahorse/common/registry.vala" while (TRUE) { #line 382 "registry.c" gconstpointer _tmp8_ = NULL; @@ -384,33 +384,33 @@ gboolean _tmp10_ = FALSE; GObject* _tmp11_ = NULL; GObject* _tmp12_ = NULL; -#line 84 "/data/projects/seahorse/common/registry.vala" - _tmp10_ = g_hash_table_iter_next (&iter, &_tmp8_, &_tmp9_); -#line 84 "/data/projects/seahorse/common/registry.vala" +#line 84 "/data/src/seahorse/common/registry.vala" + _tmp10_ = g_hash_table_iter_next (&iter, (gpointer*) (&_tmp8_), (gpointer*) (&_tmp9_)); +#line 84 "/data/src/seahorse/common/registry.vala" key = _tmp8_; -#line 84 "/data/projects/seahorse/common/registry.vala" +#line 84 "/data/src/seahorse/common/registry.vala" value = _tmp9_; -#line 84 "/data/projects/seahorse/common/registry.vala" +#line 84 "/data/src/seahorse/common/registry.vala" if (!_tmp10_) { -#line 84 "/data/projects/seahorse/common/registry.vala" +#line 84 "/data/src/seahorse/common/registry.vala" break; #line 398 "registry.c" } -#line 85 "/data/projects/seahorse/common/registry.vala" +#line 85 "/data/src/seahorse/common/registry.vala" _tmp11_ = value; -#line 85 "/data/projects/seahorse/common/registry.vala" +#line 85 "/data/src/seahorse/common/registry.vala" _tmp12_ = _g_object_ref0 (_tmp11_); -#line 85 "/data/projects/seahorse/common/registry.vala" +#line 85 "/data/src/seahorse/common/registry.vala" insts = g_list_append (insts, _tmp12_); #line 406 "registry.c" } -#line 88 "/data/projects/seahorse/common/registry.vala" +#line 88 "/data/src/seahorse/common/registry.vala" result = insts; -#line 88 "/data/projects/seahorse/common/registry.vala" +#line 88 "/data/src/seahorse/common/registry.vala" _g_hash_table_unref0 (oset); -#line 88 "/data/projects/seahorse/common/registry.vala" +#line 88 "/data/src/seahorse/common/registry.vala" _g_object_unref0 (registry); -#line 88 "/data/projects/seahorse/common/registry.vala" +#line 88 "/data/src/seahorse/common/registry.vala" return result; #line 416 "registry.c" } @@ -418,23 +418,23 @@ SeahorseRegistry* seahorse_registry_construct (GType object_type) { SeahorseRegistry * self = NULL; -#line 25 "/data/projects/seahorse/common/registry.vala" +#line 25 "/data/src/seahorse/common/registry.vala" self = (SeahorseRegistry*) g_object_new (object_type, NULL); -#line 25 "/data/projects/seahorse/common/registry.vala" +#line 25 "/data/src/seahorse/common/registry.vala" return self; #line 426 "registry.c" } SeahorseRegistry* seahorse_registry_new (void) { -#line 25 "/data/projects/seahorse/common/registry.vala" +#line 25 "/data/src/seahorse/common/registry.vala" return seahorse_registry_construct (SEAHORSE_TYPE_REGISTRY); #line 433 "registry.c" } static void _g_hash_table_unref0_ (gpointer var) { -#line 92 "/data/projects/seahorse/common/registry.vala" +#line 92 "/data/src/seahorse/common/registry.vala" (var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)); #line 440 "registry.c" } @@ -447,43 +447,43 @@ GHashFunc _tmp0_ = NULL; GEqualFunc _tmp1_ = NULL; GHashTable* _tmp2_ = NULL; -#line 91 "/data/projects/seahorse/common/registry.vala" +#line 91 "/data/src/seahorse/common/registry.vala" parent_class = G_OBJECT_CLASS (seahorse_registry_parent_class); -#line 91 "/data/projects/seahorse/common/registry.vala" +#line 91 "/data/src/seahorse/common/registry.vala" obj = parent_class->constructor (type, n_construct_properties, construct_properties); -#line 91 "/data/projects/seahorse/common/registry.vala" +#line 91 "/data/src/seahorse/common/registry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_TYPE_REGISTRY, SeahorseRegistry); -#line 92 "/data/projects/seahorse/common/registry.vala" +#line 92 "/data/src/seahorse/common/registry.vala" _tmp0_ = g_str_hash; -#line 92 "/data/projects/seahorse/common/registry.vala" +#line 92 "/data/src/seahorse/common/registry.vala" _tmp1_ = g_str_equal; -#line 92 "/data/projects/seahorse/common/registry.vala" +#line 92 "/data/src/seahorse/common/registry.vala" _tmp2_ = g_hash_table_new_full (_tmp0_, _tmp1_, NULL, _g_hash_table_unref0_); -#line 92 "/data/projects/seahorse/common/registry.vala" +#line 92 "/data/src/seahorse/common/registry.vala" _g_hash_table_unref0 (self->priv->_objects); -#line 92 "/data/projects/seahorse/common/registry.vala" +#line 92 "/data/src/seahorse/common/registry.vala" self->priv->_objects = _tmp2_; -#line 91 "/data/projects/seahorse/common/registry.vala" +#line 91 "/data/src/seahorse/common/registry.vala" return obj; #line 469 "registry.c" } static void seahorse_registry_class_init (SeahorseRegistryClass * klass) { -#line 25 "/data/projects/seahorse/common/registry.vala" +#line 25 "/data/src/seahorse/common/registry.vala" seahorse_registry_parent_class = g_type_class_peek_parent (klass); -#line 25 "/data/projects/seahorse/common/registry.vala" +#line 25 "/data/src/seahorse/common/registry.vala" g_type_class_add_private (klass, sizeof (SeahorseRegistryPrivate)); -#line 25 "/data/projects/seahorse/common/registry.vala" +#line 25 "/data/src/seahorse/common/registry.vala" G_OBJECT_CLASS (klass)->constructor = seahorse_registry_constructor; -#line 25 "/data/projects/seahorse/common/registry.vala" +#line 25 "/data/src/seahorse/common/registry.vala" G_OBJECT_CLASS (klass)->finalize = seahorse_registry_finalize; #line 482 "registry.c" } static void seahorse_registry_instance_init (SeahorseRegistry * self) { -#line 25 "/data/projects/seahorse/common/registry.vala" +#line 25 "/data/src/seahorse/common/registry.vala" self->priv = SEAHORSE_REGISTRY_GET_PRIVATE (self); #line 489 "registry.c" } @@ -491,11 +491,11 @@ static void seahorse_registry_finalize (GObject* obj) { SeahorseRegistry * self; -#line 25 "/data/projects/seahorse/common/registry.vala" +#line 25 "/data/src/seahorse/common/registry.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_TYPE_REGISTRY, SeahorseRegistry); -#line 26 "/data/projects/seahorse/common/registry.vala" +#line 26 "/data/src/seahorse/common/registry.vala" _g_hash_table_unref0 (self->priv->_objects); -#line 25 "/data/projects/seahorse/common/registry.vala" +#line 25 "/data/src/seahorse/common/registry.vala" G_OBJECT_CLASS (seahorse_registry_parent_class)->finalize (obj); #line 501 "registry.c" } diff -Nru seahorse-3.10.1/common/seahorse-common.h seahorse-3.10.2/common/seahorse-common.h --- seahorse-3.10.1/common/seahorse-common.h 2013-07-24 15:51:41.000000000 +0000 +++ seahorse-3.10.2/common/seahorse-common.h 2014-01-08 15:09:46.000000000 +0000 @@ -1,8 +1,8 @@ -/* seahorse-internal.h generated by valac 0.20.1.64-fa28c, the Vala compiler, do not modify */ +/* seahorse-internal.h generated by valac 0.22.1, the Vala compiler, do not modify */ -#ifndef __SEAHORSE_INTERNAL_H__ -#define __SEAHORSE_INTERNAL_H__ +#ifndef ___DATA_SRC_SEAHORSE_COMMON_SEAHORSE_INTERNAL_H__ +#define ___DATA_SRC_SEAHORSE_COMMON_SEAHORSE_INTERNAL_H__ #include #include diff -Nru seahorse-3.10.1/common/seahorse-internal.h seahorse-3.10.2/common/seahorse-internal.h --- seahorse-3.10.1/common/seahorse-internal.h 2013-07-24 15:51:30.000000000 +0000 +++ seahorse-3.10.2/common/seahorse-internal.h 2014-01-08 15:09:46.000000000 +0000 @@ -1,8 +1,8 @@ -/* seahorse-internal.h generated by valac 0.20.1.64-fa28c, the Vala compiler, do not modify */ +/* seahorse-internal.h generated by valac 0.22.1, the Vala compiler, do not modify */ -#ifndef __SEAHORSE_INTERNAL_H__ -#define __SEAHORSE_INTERNAL_H__ +#ifndef ___DATA_SRC_SEAHORSE_COMMON_SEAHORSE_INTERNAL_H__ +#define ___DATA_SRC_SEAHORSE_COMMON_SEAHORSE_INTERNAL_H__ #include #include @@ -347,7 +347,7 @@ GType seahorse_delete_dialog_get_type (void) G_GNUC_CONST; GtkDialog* seahorse_delete_dialog_new (GtkWindow* parent, const gchar* format, ...); GtkDialog* seahorse_delete_dialog_construct (GType object_type, GtkWindow* parent, const gchar* format, ...); -static GtkDialog* seahorse_delete_dialog_constructv (GType object_type, GtkWindow* parent, const gchar* format, va_list _vala_va_list); +GtkDialog* seahorse_delete_dialog_constructv (GType object_type, GtkWindow* parent, const gchar* format, va_list _vala_va_list); gboolean seahorse_delete_dialog_prompt (GtkWindow* parent, const gchar* text); const gchar* seahorse_delete_dialog_get_check_label (SeahorseDeleteDialog* self); void seahorse_delete_dialog_set_check_label (SeahorseDeleteDialog* self, const gchar* value); diff -Nru seahorse-3.10.1/common/types.c seahorse-3.10.2/common/types.c --- seahorse-3.10.1/common/types.c 2013-07-24 15:11:10.000000000 +0000 +++ seahorse-3.10.2/common/types.c 2014-01-08 15:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -/* types.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* types.c generated by valac 0.22.1, the Vala compiler * generated from types.vala, do not modify */ /* diff -Nru seahorse-3.10.1/common/util.c seahorse-3.10.2/common/util.c --- seahorse-3.10.1/common/util.c 2013-07-24 15:11:10.000000000 +0000 +++ seahorse-3.10.2/common/util.c 2014-01-08 15:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -/* util.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* util.c generated by valac 0.22.1, the Vala compiler * generated from util.vala, do not modify */ /* @@ -43,7 +43,7 @@ static gpointer _g_object_ref0 (gpointer self) { -#line 40 "/data/projects/seahorse/common/util.vala" +#line 40 "/data/src/seahorse/common/util.vala" return self ? g_object_ref (self) : NULL; #line 49 "util.c" } @@ -59,103 +59,103 @@ const gchar* _tmp10_ = NULL; GtkMessageDialog* _tmp16_ = NULL; GtkMessageDialog* _tmp17_ = NULL; -#line 31 "/data/projects/seahorse/common/util.vala" +#line 31 "/data/src/seahorse/common/util.vala" window = NULL; -#line 33 "/data/projects/seahorse/common/util.vala" +#line 33 "/data/src/seahorse/common/util.vala" _tmp0_ = message; -#line 33 "/data/projects/seahorse/common/util.vala" +#line 33 "/data/src/seahorse/common/util.vala" if (_tmp0_ == NULL) { -#line 34 "/data/projects/seahorse/common/util.vala" +#line 34 "/data/src/seahorse/common/util.vala" message = ""; #line 71 "util.c" } -#line 36 "/data/projects/seahorse/common/util.vala" +#line 36 "/data/src/seahorse/common/util.vala" _tmp1_ = parent; -#line 36 "/data/projects/seahorse/common/util.vala" +#line 36 "/data/src/seahorse/common/util.vala" if (_tmp1_ != NULL) { #line 77 "util.c" GtkWidget* _tmp2_ = NULL; GtkWidget* _tmp5_ = NULL; -#line 37 "/data/projects/seahorse/common/util.vala" +#line 37 "/data/src/seahorse/common/util.vala" _tmp2_ = parent; -#line 37 "/data/projects/seahorse/common/util.vala" +#line 37 "/data/src/seahorse/common/util.vala" if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, GTK_TYPE_WINDOW)) { #line 84 "util.c" GtkWidget* _tmp3_ = NULL; GtkWidget* _tmp4_ = NULL; -#line 38 "/data/projects/seahorse/common/util.vala" +#line 38 "/data/src/seahorse/common/util.vala" _tmp3_ = parent; -#line 38 "/data/projects/seahorse/common/util.vala" +#line 38 "/data/src/seahorse/common/util.vala" _tmp4_ = gtk_widget_get_toplevel (_tmp3_); -#line 38 "/data/projects/seahorse/common/util.vala" +#line 38 "/data/src/seahorse/common/util.vala" parent = _tmp4_; #line 93 "util.c" } -#line 39 "/data/projects/seahorse/common/util.vala" +#line 39 "/data/src/seahorse/common/util.vala" _tmp5_ = parent; -#line 39 "/data/projects/seahorse/common/util.vala" +#line 39 "/data/src/seahorse/common/util.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, GTK_TYPE_WINDOW)) { #line 99 "util.c" GtkWidget* _tmp6_ = NULL; GtkWindow* _tmp7_ = NULL; -#line 40 "/data/projects/seahorse/common/util.vala" +#line 40 "/data/src/seahorse/common/util.vala" _tmp6_ = parent; -#line 40 "/data/projects/seahorse/common/util.vala" +#line 40 "/data/src/seahorse/common/util.vala" _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_WINDOW, GtkWindow)); -#line 40 "/data/projects/seahorse/common/util.vala" +#line 40 "/data/src/seahorse/common/util.vala" _g_object_unref0 (window); -#line 40 "/data/projects/seahorse/common/util.vala" +#line 40 "/data/src/seahorse/common/util.vala" window = _tmp7_; #line 110 "util.c" } } -#line 43 "/data/projects/seahorse/common/util.vala" +#line 43 "/data/src/seahorse/common/util.vala" _tmp8_ = window; -#line 43 "/data/projects/seahorse/common/util.vala" +#line 43 "/data/src/seahorse/common/util.vala" _tmp9_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp8_, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, ""); -#line 43 "/data/projects/seahorse/common/util.vala" +#line 43 "/data/src/seahorse/common/util.vala" g_object_ref_sink (_tmp9_); -#line 43 "/data/projects/seahorse/common/util.vala" +#line 43 "/data/src/seahorse/common/util.vala" dialog = _tmp9_; -#line 46 "/data/projects/seahorse/common/util.vala" +#line 46 "/data/src/seahorse/common/util.vala" _tmp10_ = heading; -#line 46 "/data/projects/seahorse/common/util.vala" +#line 46 "/data/src/seahorse/common/util.vala" if (_tmp10_ == NULL) { #line 125 "util.c" GtkMessageDialog* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; -#line 47 "/data/projects/seahorse/common/util.vala" +#line 47 "/data/src/seahorse/common/util.vala" _tmp11_ = dialog; -#line 47 "/data/projects/seahorse/common/util.vala" +#line 47 "/data/src/seahorse/common/util.vala" _tmp12_ = message; -#line 47 "/data/projects/seahorse/common/util.vala" +#line 47 "/data/src/seahorse/common/util.vala" g_object_set ((GObject*) _tmp11_, "text", _tmp12_, NULL); #line 134 "util.c" } else { GtkMessageDialog* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; const gchar* _tmp15_ = NULL; -#line 49 "/data/projects/seahorse/common/util.vala" +#line 49 "/data/src/seahorse/common/util.vala" _tmp13_ = dialog; -#line 49 "/data/projects/seahorse/common/util.vala" +#line 49 "/data/src/seahorse/common/util.vala" _tmp14_ = heading; -#line 49 "/data/projects/seahorse/common/util.vala" +#line 49 "/data/src/seahorse/common/util.vala" _tmp15_ = message; -#line 49 "/data/projects/seahorse/common/util.vala" +#line 49 "/data/src/seahorse/common/util.vala" g_object_set ((GObject*) _tmp13_, "text", _tmp14_, "secondary-text", _tmp15_, NULL); #line 147 "util.c" } -#line 51 "/data/projects/seahorse/common/util.vala" +#line 51 "/data/src/seahorse/common/util.vala" _tmp16_ = dialog; -#line 51 "/data/projects/seahorse/common/util.vala" +#line 51 "/data/src/seahorse/common/util.vala" gtk_dialog_run ((GtkDialog*) _tmp16_); -#line 52 "/data/projects/seahorse/common/util.vala" +#line 52 "/data/src/seahorse/common/util.vala" _tmp17_ = dialog; -#line 52 "/data/projects/seahorse/common/util.vala" +#line 52 "/data/src/seahorse/common/util.vala" gtk_widget_destroy ((GtkWidget*) _tmp17_); -#line 28 "/data/projects/seahorse/common/util.vala" +#line 28 "/data/src/seahorse/common/util.vala" _g_object_unref0 (dialog); -#line 28 "/data/projects/seahorse/common/util.vala" +#line 28 "/data/src/seahorse/common/util.vala" _g_object_unref0 (window); #line 161 "util.c" } @@ -176,53 +176,53 @@ gchar* _tmp6_ = NULL; gint _tmp6__length1 = 0; gchar* _tmp7_ = NULL; -#line 57 "/data/projects/seahorse/common/util.vala" +#line 57 "/data/src/seahorse/common/util.vala" _tmp0_ = time; -#line 57 "/data/projects/seahorse/common/util.vala" +#line 57 "/data/src/seahorse/common/util.vala" if (_tmp0_ == ((glong) 0)) { #line 184 "util.c" gchar* _tmp1_ = NULL; -#line 58 "/data/projects/seahorse/common/util.vala" +#line 58 "/data/src/seahorse/common/util.vala" _tmp1_ = g_strdup (""); -#line 58 "/data/projects/seahorse/common/util.vala" +#line 58 "/data/src/seahorse/common/util.vala" result = _tmp1_; -#line 58 "/data/projects/seahorse/common/util.vala" +#line 58 "/data/src/seahorse/common/util.vala" return result; #line 192 "util.c" } -#line 59 "/data/projects/seahorse/common/util.vala" +#line 59 "/data/src/seahorse/common/util.vala" memset (&created_date, 0, sizeof (GDate)); -#line 60 "/data/projects/seahorse/common/util.vala" +#line 60 "/data/src/seahorse/common/util.vala" _tmp2_ = time; -#line 60 "/data/projects/seahorse/common/util.vala" +#line 60 "/data/src/seahorse/common/util.vala" g_date_set_time_t (&created_date, (time_t) _tmp2_); -#line 61 "/data/projects/seahorse/common/util.vala" +#line 61 "/data/src/seahorse/common/util.vala" _tmp3_ = g_new0 (gchar, 128); -#line 61 "/data/projects/seahorse/common/util.vala" +#line 61 "/data/src/seahorse/common/util.vala" buffer = _tmp3_; -#line 61 "/data/projects/seahorse/common/util.vala" +#line 61 "/data/src/seahorse/common/util.vala" buffer_length1 = 128; -#line 61 "/data/projects/seahorse/common/util.vala" +#line 61 "/data/src/seahorse/common/util.vala" _buffer_size_ = buffer_length1; -#line 62 "/data/projects/seahorse/common/util.vala" +#line 62 "/data/src/seahorse/common/util.vala" _tmp4_ = buffer; -#line 62 "/data/projects/seahorse/common/util.vala" +#line 62 "/data/src/seahorse/common/util.vala" _tmp4__length1 = buffer_length1; -#line 62 "/data/projects/seahorse/common/util.vala" +#line 62 "/data/src/seahorse/common/util.vala" _tmp5_ = _ ("%Y-%m-%d"); -#line 62 "/data/projects/seahorse/common/util.vala" +#line 62 "/data/src/seahorse/common/util.vala" g_date_strftime (_tmp4_, _tmp4__length1, _tmp5_, &created_date); -#line 63 "/data/projects/seahorse/common/util.vala" +#line 63 "/data/src/seahorse/common/util.vala" _tmp6_ = buffer; -#line 63 "/data/projects/seahorse/common/util.vala" +#line 63 "/data/src/seahorse/common/util.vala" _tmp6__length1 = buffer_length1; -#line 63 "/data/projects/seahorse/common/util.vala" +#line 63 "/data/src/seahorse/common/util.vala" _tmp7_ = g_strdup ((const gchar*) _tmp6_); -#line 63 "/data/projects/seahorse/common/util.vala" +#line 63 "/data/src/seahorse/common/util.vala" result = _tmp7_; -#line 63 "/data/projects/seahorse/common/util.vala" +#line 63 "/data/src/seahorse/common/util.vala" buffer = (g_free (buffer), NULL); -#line 63 "/data/projects/seahorse/common/util.vala" +#line 63 "/data/src/seahorse/common/util.vala" return result; #line 228 "util.c" } @@ -242,54 +242,54 @@ GtkContainer* _tmp7_ = NULL; gboolean _tmp9_ = FALSE; GError * _inner_error_ = NULL; -#line 66 "/data/projects/seahorse/common/util.vala" +#line 66 "/data/src/seahorse/common/util.vala" g_return_val_if_fail (name != NULL, NULL); -#line 68 "/data/projects/seahorse/common/util.vala" +#line 68 "/data/src/seahorse/common/util.vala" _tmp0_ = gtk_builder_new (); -#line 68 "/data/projects/seahorse/common/util.vala" +#line 68 "/data/src/seahorse/common/util.vala" builder = _tmp0_; -#line 69 "/data/projects/seahorse/common/util.vala" +#line 69 "/data/src/seahorse/common/util.vala" _tmp1_ = name; -#line 69 "/data/projects/seahorse/common/util.vala" +#line 69 "/data/src/seahorse/common/util.vala" _tmp2_ = g_strdup_printf ("seahorse-%s.xml", _tmp1_); -#line 69 "/data/projects/seahorse/common/util.vala" +#line 69 "/data/src/seahorse/common/util.vala" _tmp3_ = _tmp2_; -#line 69 "/data/projects/seahorse/common/util.vala" +#line 69 "/data/src/seahorse/common/util.vala" _tmp4_ = g_build_filename (UIDIR, _tmp3_, NULL); -#line 69 "/data/projects/seahorse/common/util.vala" +#line 69 "/data/src/seahorse/common/util.vala" _tmp5_ = _tmp4_; -#line 69 "/data/projects/seahorse/common/util.vala" +#line 69 "/data/src/seahorse/common/util.vala" _g_free0 (_tmp3_); -#line 69 "/data/projects/seahorse/common/util.vala" +#line 69 "/data/src/seahorse/common/util.vala" path = _tmp5_; -#line 71 "/data/projects/seahorse/common/util.vala" +#line 71 "/data/src/seahorse/common/util.vala" _tmp7_ = frame; -#line 71 "/data/projects/seahorse/common/util.vala" +#line 71 "/data/src/seahorse/common/util.vala" if (_tmp7_ != NULL) { #line 270 "util.c" GtkContainer* _tmp8_ = NULL; -#line 71 "/data/projects/seahorse/common/util.vala" +#line 71 "/data/src/seahorse/common/util.vala" _tmp8_ = frame; -#line 71 "/data/projects/seahorse/common/util.vala" +#line 71 "/data/src/seahorse/common/util.vala" _tmp6_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, GTK_TYPE_DIALOG); #line 276 "util.c" } else { -#line 71 "/data/projects/seahorse/common/util.vala" +#line 71 "/data/src/seahorse/common/util.vala" _tmp6_ = FALSE; #line 280 "util.c" } -#line 71 "/data/projects/seahorse/common/util.vala" +#line 71 "/data/src/seahorse/common/util.vala" _tmp9_ = _tmp6_; -#line 71 "/data/projects/seahorse/common/util.vala" +#line 71 "/data/src/seahorse/common/util.vala" if (_tmp9_) { #line 286 "util.c" GtkContainer* _tmp10_ = NULL; GtkBox* _tmp11_ = NULL; -#line 72 "/data/projects/seahorse/common/util.vala" +#line 72 "/data/src/seahorse/common/util.vala" _tmp10_ = frame; -#line 72 "/data/projects/seahorse/common/util.vala" +#line 72 "/data/src/seahorse/common/util.vala" _tmp11_ = (GtkBox*) gtk_dialog_get_content_area (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GTK_TYPE_DIALOG, GtkDialog)); -#line 72 "/data/projects/seahorse/common/util.vala" +#line 72 "/data/src/seahorse/common/util.vala" frame = (GtkContainer*) _tmp11_; #line 295 "util.c" } @@ -302,46 +302,46 @@ GObject* _tmp16_ = NULL; GObject* _tmp17_ = NULL; GObject* _tmp18_ = NULL; -#line 75 "/data/projects/seahorse/common/util.vala" +#line 75 "/data/src/seahorse/common/util.vala" _tmp12_ = builder; -#line 75 "/data/projects/seahorse/common/util.vala" +#line 75 "/data/src/seahorse/common/util.vala" _tmp13_ = path; -#line 75 "/data/projects/seahorse/common/util.vala" +#line 75 "/data/src/seahorse/common/util.vala" gtk_builder_add_from_file (_tmp12_, _tmp13_, &_inner_error_); -#line 75 "/data/projects/seahorse/common/util.vala" +#line 75 "/data/src/seahorse/common/util.vala" if (_inner_error_ != NULL) { #line 314 "util.c" goto __catch7_g_error; } -#line 76 "/data/projects/seahorse/common/util.vala" +#line 76 "/data/src/seahorse/common/util.vala" _tmp14_ = builder; -#line 76 "/data/projects/seahorse/common/util.vala" +#line 76 "/data/src/seahorse/common/util.vala" _tmp15_ = name; -#line 76 "/data/projects/seahorse/common/util.vala" +#line 76 "/data/src/seahorse/common/util.vala" _tmp16_ = gtk_builder_get_object (_tmp14_, _tmp15_); -#line 76 "/data/projects/seahorse/common/util.vala" +#line 76 "/data/src/seahorse/common/util.vala" _tmp17_ = _g_object_ref0 (_tmp16_); -#line 76 "/data/projects/seahorse/common/util.vala" +#line 76 "/data/src/seahorse/common/util.vala" obj = _tmp17_; -#line 77 "/data/projects/seahorse/common/util.vala" +#line 77 "/data/src/seahorse/common/util.vala" _tmp18_ = obj; -#line 77 "/data/projects/seahorse/common/util.vala" +#line 77 "/data/src/seahorse/common/util.vala" if (_tmp18_ == NULL) { #line 331 "util.c" const gchar* _tmp19_ = NULL; const gchar* _tmp20_ = NULL; -#line 78 "/data/projects/seahorse/common/util.vala" +#line 78 "/data/src/seahorse/common/util.vala" _tmp19_ = name; -#line 78 "/data/projects/seahorse/common/util.vala" +#line 78 "/data/src/seahorse/common/util.vala" _tmp20_ = path; -#line 78 "/data/projects/seahorse/common/util.vala" +#line 78 "/data/src/seahorse/common/util.vala" g_critical ("util.vala:78: Couldn't find object named %s in %s", _tmp19_, _tmp20_); #line 340 "util.c" } else { GtkContainer* _tmp21_ = NULL; -#line 79 "/data/projects/seahorse/common/util.vala" +#line 79 "/data/src/seahorse/common/util.vala" _tmp21_ = frame; -#line 79 "/data/projects/seahorse/common/util.vala" +#line 79 "/data/src/seahorse/common/util.vala" if (_tmp21_ != NULL) { #line 347 "util.c" GtkWidget* widget = NULL; @@ -350,28 +350,28 @@ GtkContainer* _tmp24_ = NULL; GtkWidget* _tmp25_ = NULL; GtkWidget* _tmp26_ = NULL; -#line 80 "/data/projects/seahorse/common/util.vala" +#line 80 "/data/src/seahorse/common/util.vala" _tmp22_ = obj; -#line 80 "/data/projects/seahorse/common/util.vala" +#line 80 "/data/src/seahorse/common/util.vala" _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_WIDGET, GtkWidget)); -#line 80 "/data/projects/seahorse/common/util.vala" +#line 80 "/data/src/seahorse/common/util.vala" widget = _tmp23_; -#line 81 "/data/projects/seahorse/common/util.vala" +#line 81 "/data/src/seahorse/common/util.vala" _tmp24_ = frame; -#line 81 "/data/projects/seahorse/common/util.vala" +#line 81 "/data/src/seahorse/common/util.vala" _tmp25_ = widget; -#line 81 "/data/projects/seahorse/common/util.vala" +#line 81 "/data/src/seahorse/common/util.vala" gtk_container_add (_tmp24_, _tmp25_); -#line 82 "/data/projects/seahorse/common/util.vala" +#line 82 "/data/src/seahorse/common/util.vala" _tmp26_ = widget; -#line 82 "/data/projects/seahorse/common/util.vala" +#line 82 "/data/src/seahorse/common/util.vala" gtk_widget_show (_tmp26_); -#line 79 "/data/projects/seahorse/common/util.vala" +#line 79 "/data/src/seahorse/common/util.vala" _g_object_unref0 (widget); #line 372 "util.c" } } -#line 74 "/data/projects/seahorse/common/util.vala" +#line 74 "/data/src/seahorse/common/util.vala" _g_object_unref0 (obj); #line 377 "util.c" } @@ -382,42 +382,42 @@ const gchar* _tmp27_ = NULL; GError* _tmp28_ = NULL; const gchar* _tmp29_ = NULL; -#line 74 "/data/projects/seahorse/common/util.vala" +#line 74 "/data/src/seahorse/common/util.vala" err = _inner_error_; -#line 74 "/data/projects/seahorse/common/util.vala" +#line 74 "/data/src/seahorse/common/util.vala" _inner_error_ = NULL; -#line 85 "/data/projects/seahorse/common/util.vala" +#line 85 "/data/src/seahorse/common/util.vala" _tmp27_ = path; -#line 85 "/data/projects/seahorse/common/util.vala" +#line 85 "/data/src/seahorse/common/util.vala" _tmp28_ = err; -#line 85 "/data/projects/seahorse/common/util.vala" +#line 85 "/data/src/seahorse/common/util.vala" _tmp29_ = _tmp28_->message; -#line 85 "/data/projects/seahorse/common/util.vala" +#line 85 "/data/src/seahorse/common/util.vala" g_critical ("util.vala:85: Couldn't load %s: %s", _tmp27_, _tmp29_); -#line 74 "/data/projects/seahorse/common/util.vala" +#line 74 "/data/src/seahorse/common/util.vala" _g_error_free0 (err); #line 400 "util.c" } __finally7: -#line 74 "/data/projects/seahorse/common/util.vala" +#line 74 "/data/src/seahorse/common/util.vala" if (_inner_error_ != NULL) { -#line 74 "/data/projects/seahorse/common/util.vala" +#line 74 "/data/src/seahorse/common/util.vala" _g_free0 (path); -#line 74 "/data/projects/seahorse/common/util.vala" +#line 74 "/data/src/seahorse/common/util.vala" _g_object_unref0 (builder); -#line 74 "/data/projects/seahorse/common/util.vala" +#line 74 "/data/src/seahorse/common/util.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 74 "/data/projects/seahorse/common/util.vala" +#line 74 "/data/src/seahorse/common/util.vala" g_clear_error (&_inner_error_); -#line 74 "/data/projects/seahorse/common/util.vala" +#line 74 "/data/src/seahorse/common/util.vala" return NULL; #line 415 "util.c" } -#line 88 "/data/projects/seahorse/common/util.vala" +#line 88 "/data/src/seahorse/common/util.vala" result = builder; -#line 88 "/data/projects/seahorse/common/util.vala" +#line 88 "/data/src/seahorse/common/util.vala" _g_free0 (path); -#line 88 "/data/projects/seahorse/common/util.vala" +#line 88 "/data/src/seahorse/common/util.vala" return result; #line 423 "util.c" } diff -Nru seahorse-3.10.1/common/viewable.c seahorse-3.10.2/common/viewable.c --- seahorse-3.10.1/common/viewable.c 2013-07-24 15:11:10.000000000 +0000 +++ seahorse-3.10.2/common/viewable.c 2014-01-08 15:09:46.000000000 +0000 @@ -1,4 +1,4 @@ -/* viewable.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* viewable.c generated by valac 0.22.1, the Vala compiler * generated from viewable.vala, do not modify */ /* @@ -47,9 +47,9 @@ GtkWindow* seahorse_viewable_create_viewer (SeahorseViewable* self, GtkWindow* parent) { -#line 29 "/data/projects/seahorse/common/viewable.vala" +#line 29 "/data/src/seahorse/common/viewable.vala" g_return_val_if_fail (self != NULL, NULL); -#line 29 "/data/projects/seahorse/common/viewable.vala" +#line 29 "/data/src/seahorse/common/viewable.vala" return SEAHORSE_VIEWABLE_GET_INTERFACE (self)->create_viewer (self, parent); #line 55 "viewable.c" } @@ -58,29 +58,29 @@ gboolean seahorse_viewable_can_view (GObject* object) { gboolean result = FALSE; GObject* _tmp0_ = NULL; -#line 31 "/data/projects/seahorse/common/viewable.vala" +#line 31 "/data/src/seahorse/common/viewable.vala" g_return_val_if_fail (object != NULL, FALSE); -#line 32 "/data/projects/seahorse/common/viewable.vala" +#line 32 "/data/src/seahorse/common/viewable.vala" _tmp0_ = object; -#line 32 "/data/projects/seahorse/common/viewable.vala" +#line 32 "/data/src/seahorse/common/viewable.vala" result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SEAHORSE_TYPE_VIEWABLE); -#line 32 "/data/projects/seahorse/common/viewable.vala" +#line 32 "/data/src/seahorse/common/viewable.vala" return result; #line 70 "viewable.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 35 "/data/projects/seahorse/common/viewable.vala" +#line 35 "/data/src/seahorse/common/viewable.vala" return self ? g_object_ref (self) : NULL; #line 77 "viewable.c" } static Block7Data* block7_data_ref (Block7Data* _data7_) { -#line 35 "/data/projects/seahorse/common/viewable.vala" +#line 35 "/data/src/seahorse/common/viewable.vala" g_atomic_int_inc (&_data7_->_ref_count_); -#line 35 "/data/projects/seahorse/common/viewable.vala" +#line 35 "/data/src/seahorse/common/viewable.vala" return _data7_; #line 86 "viewable.c" } @@ -89,11 +89,11 @@ static void block7_data_unref (void * _userdata_) { Block7Data* _data7_; _data7_ = (Block7Data*) _userdata_; -#line 35 "/data/projects/seahorse/common/viewable.vala" +#line 35 "/data/src/seahorse/common/viewable.vala" if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) { -#line 35 "/data/projects/seahorse/common/viewable.vala" +#line 35 "/data/src/seahorse/common/viewable.vala" _g_object_unref0 (_data7_->object); -#line 35 "/data/projects/seahorse/common/viewable.vala" +#line 35 "/data/src/seahorse/common/viewable.vala" g_slice_free (Block7Data, _data7_); #line 99 "viewable.c" } @@ -102,16 +102,16 @@ static void ___lambda7_ (Block7Data* _data7_) { GObject* _tmp0_ = NULL; -#line 51 "/data/projects/seahorse/common/viewable.vala" +#line 51 "/data/src/seahorse/common/viewable.vala" _tmp0_ = _data7_->object; -#line 51 "/data/projects/seahorse/common/viewable.vala" +#line 51 "/data/src/seahorse/common/viewable.vala" g_object_set_data_full (_tmp0_, "viewable-window", NULL, NULL); #line 110 "viewable.c" } static void ____lambda7__gtk_widget_destroy (GtkWidget* _sender, gpointer self) { -#line 50 "/data/projects/seahorse/common/viewable.vala" +#line 50 "/data/src/seahorse/common/viewable.vala" ___lambda7_ (self); #line 117 "viewable.c" } @@ -131,51 +131,51 @@ GtkWindow* _tmp7_ = NULL; GtkWindow* _tmp18_ = NULL; GtkWindow* _tmp19_ = NULL; -#line 35 "/data/projects/seahorse/common/viewable.vala" +#line 35 "/data/src/seahorse/common/viewable.vala" g_return_val_if_fail (object != NULL, FALSE); -#line 35 "/data/projects/seahorse/common/viewable.vala" +#line 35 "/data/src/seahorse/common/viewable.vala" _data7_ = g_slice_new0 (Block7Data); -#line 35 "/data/projects/seahorse/common/viewable.vala" +#line 35 "/data/src/seahorse/common/viewable.vala" _data7_->_ref_count_ = 1; -#line 35 "/data/projects/seahorse/common/viewable.vala" +#line 35 "/data/src/seahorse/common/viewable.vala" _tmp0_ = object; -#line 35 "/data/projects/seahorse/common/viewable.vala" +#line 35 "/data/src/seahorse/common/viewable.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 35 "/data/projects/seahorse/common/viewable.vala" +#line 35 "/data/src/seahorse/common/viewable.vala" _g_object_unref0 (_data7_->object); -#line 35 "/data/projects/seahorse/common/viewable.vala" +#line 35 "/data/src/seahorse/common/viewable.vala" _data7_->object = _tmp1_; -#line 37 "/data/projects/seahorse/common/viewable.vala" +#line 37 "/data/src/seahorse/common/viewable.vala" _tmp2_ = _data7_->object; -#line 37 "/data/projects/seahorse/common/viewable.vala" +#line 37 "/data/src/seahorse/common/viewable.vala" _tmp3_ = seahorse_viewable_can_view (_tmp2_); -#line 37 "/data/projects/seahorse/common/viewable.vala" +#line 37 "/data/src/seahorse/common/viewable.vala" if (!_tmp3_) { -#line 38 "/data/projects/seahorse/common/viewable.vala" +#line 38 "/data/src/seahorse/common/viewable.vala" result = FALSE; -#line 38 "/data/projects/seahorse/common/viewable.vala" +#line 38 "/data/src/seahorse/common/viewable.vala" block7_data_unref (_data7_); -#line 38 "/data/projects/seahorse/common/viewable.vala" +#line 38 "/data/src/seahorse/common/viewable.vala" _data7_ = NULL; -#line 38 "/data/projects/seahorse/common/viewable.vala" +#line 38 "/data/src/seahorse/common/viewable.vala" return result; #line 163 "viewable.c" } -#line 40 "/data/projects/seahorse/common/viewable.vala" +#line 40 "/data/src/seahorse/common/viewable.vala" window = NULL; -#line 42 "/data/projects/seahorse/common/viewable.vala" +#line 42 "/data/src/seahorse/common/viewable.vala" _tmp4_ = _data7_->object; -#line 42 "/data/projects/seahorse/common/viewable.vala" +#line 42 "/data/src/seahorse/common/viewable.vala" _tmp5_ = g_object_get_data (_tmp4_, "viewable-window"); -#line 42 "/data/projects/seahorse/common/viewable.vala" +#line 42 "/data/src/seahorse/common/viewable.vala" _tmp6_ = _g_object_ref0 ((GtkWindow*) _tmp5_); -#line 42 "/data/projects/seahorse/common/viewable.vala" +#line 42 "/data/src/seahorse/common/viewable.vala" _g_object_unref0 (window); -#line 42 "/data/projects/seahorse/common/viewable.vala" +#line 42 "/data/src/seahorse/common/viewable.vala" window = _tmp6_; -#line 43 "/data/projects/seahorse/common/viewable.vala" +#line 43 "/data/src/seahorse/common/viewable.vala" _tmp7_ = window; -#line 43 "/data/projects/seahorse/common/viewable.vala" +#line 43 "/data/src/seahorse/common/viewable.vala" if (_tmp7_ == NULL) { #line 181 "viewable.c" SeahorseViewable* viewable = NULL; @@ -189,84 +189,84 @@ GtkWindow* _tmp15_ = NULL; GtkWindow* _tmp16_ = NULL; GtkWindow* _tmp17_ = NULL; -#line 44 "/data/projects/seahorse/common/viewable.vala" +#line 44 "/data/src/seahorse/common/viewable.vala" _tmp8_ = _data7_->object; -#line 44 "/data/projects/seahorse/common/viewable.vala" +#line 44 "/data/src/seahorse/common/viewable.vala" _tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, SEAHORSE_TYPE_VIEWABLE, SeahorseViewable)); -#line 44 "/data/projects/seahorse/common/viewable.vala" +#line 44 "/data/src/seahorse/common/viewable.vala" viewable = _tmp9_; -#line 45 "/data/projects/seahorse/common/viewable.vala" +#line 45 "/data/src/seahorse/common/viewable.vala" _tmp10_ = viewable; -#line 45 "/data/projects/seahorse/common/viewable.vala" +#line 45 "/data/src/seahorse/common/viewable.vala" _tmp11_ = parent; -#line 45 "/data/projects/seahorse/common/viewable.vala" +#line 45 "/data/src/seahorse/common/viewable.vala" _tmp12_ = seahorse_viewable_create_viewer (_tmp10_, _tmp11_); -#line 45 "/data/projects/seahorse/common/viewable.vala" +#line 45 "/data/src/seahorse/common/viewable.vala" _g_object_unref0 (window); -#line 45 "/data/projects/seahorse/common/viewable.vala" +#line 45 "/data/src/seahorse/common/viewable.vala" window = _tmp12_; -#line 46 "/data/projects/seahorse/common/viewable.vala" +#line 46 "/data/src/seahorse/common/viewable.vala" _tmp13_ = window; -#line 46 "/data/projects/seahorse/common/viewable.vala" +#line 46 "/data/src/seahorse/common/viewable.vala" if (_tmp13_ == NULL) { -#line 47 "/data/projects/seahorse/common/viewable.vala" +#line 47 "/data/src/seahorse/common/viewable.vala" result = FALSE; -#line 47 "/data/projects/seahorse/common/viewable.vala" +#line 47 "/data/src/seahorse/common/viewable.vala" _g_object_unref0 (viewable); -#line 47 "/data/projects/seahorse/common/viewable.vala" +#line 47 "/data/src/seahorse/common/viewable.vala" _g_object_unref0 (window); -#line 47 "/data/projects/seahorse/common/viewable.vala" +#line 47 "/data/src/seahorse/common/viewable.vala" block7_data_unref (_data7_); -#line 47 "/data/projects/seahorse/common/viewable.vala" +#line 47 "/data/src/seahorse/common/viewable.vala" _data7_ = NULL; -#line 47 "/data/projects/seahorse/common/viewable.vala" +#line 47 "/data/src/seahorse/common/viewable.vala" return result; #line 225 "viewable.c" } -#line 49 "/data/projects/seahorse/common/viewable.vala" +#line 49 "/data/src/seahorse/common/viewable.vala" _tmp14_ = _data7_->object; -#line 49 "/data/projects/seahorse/common/viewable.vala" +#line 49 "/data/src/seahorse/common/viewable.vala" _tmp15_ = window; -#line 49 "/data/projects/seahorse/common/viewable.vala" +#line 49 "/data/src/seahorse/common/viewable.vala" _tmp16_ = _g_object_ref0 (_tmp15_); -#line 49 "/data/projects/seahorse/common/viewable.vala" +#line 49 "/data/src/seahorse/common/viewable.vala" g_object_set_data_full (_tmp14_, "viewable-window", _tmp16_, g_object_unref); -#line 50 "/data/projects/seahorse/common/viewable.vala" +#line 50 "/data/src/seahorse/common/viewable.vala" _tmp17_ = window; -#line 50 "/data/projects/seahorse/common/viewable.vala" +#line 50 "/data/src/seahorse/common/viewable.vala" g_signal_connect_data ((GtkWidget*) _tmp17_, "destroy", (GCallback) ____lambda7__gtk_widget_destroy, block7_data_ref (_data7_), (GClosureNotify) block7_data_unref, 0); -#line 43 "/data/projects/seahorse/common/viewable.vala" +#line 43 "/data/src/seahorse/common/viewable.vala" _g_object_unref0 (viewable); #line 241 "viewable.c" } -#line 55 "/data/projects/seahorse/common/viewable.vala" +#line 55 "/data/src/seahorse/common/viewable.vala" _tmp18_ = window; -#line 55 "/data/projects/seahorse/common/viewable.vala" +#line 55 "/data/src/seahorse/common/viewable.vala" gtk_window_present (_tmp18_); -#line 56 "/data/projects/seahorse/common/viewable.vala" +#line 56 "/data/src/seahorse/common/viewable.vala" _tmp19_ = window; -#line 56 "/data/projects/seahorse/common/viewable.vala" +#line 56 "/data/src/seahorse/common/viewable.vala" gtk_widget_show ((GtkWidget*) _tmp19_); -#line 57 "/data/projects/seahorse/common/viewable.vala" +#line 57 "/data/src/seahorse/common/viewable.vala" result = TRUE; -#line 57 "/data/projects/seahorse/common/viewable.vala" +#line 57 "/data/src/seahorse/common/viewable.vala" _g_object_unref0 (window); -#line 57 "/data/projects/seahorse/common/viewable.vala" +#line 57 "/data/src/seahorse/common/viewable.vala" block7_data_unref (_data7_); -#line 57 "/data/projects/seahorse/common/viewable.vala" +#line 57 "/data/src/seahorse/common/viewable.vala" _data7_ = NULL; -#line 57 "/data/projects/seahorse/common/viewable.vala" +#line 57 "/data/src/seahorse/common/viewable.vala" return result; #line 261 "viewable.c" } static void seahorse_viewable_base_init (SeahorseViewableIface * iface) { -#line 28 "/data/projects/seahorse/common/viewable.vala" +#line 28 "/data/src/seahorse/common/viewable.vala" static gboolean initialized = FALSE; -#line 28 "/data/projects/seahorse/common/viewable.vala" +#line 28 "/data/src/seahorse/common/viewable.vala" if (!initialized) { -#line 28 "/data/projects/seahorse/common/viewable.vala" +#line 28 "/data/src/seahorse/common/viewable.vala" initialized = TRUE; #line 272 "viewable.c" } diff -Nru seahorse-3.10.1/configure seahorse-3.10.2/configure --- seahorse-3.10.1/configure 2013-10-17 06:25:33.000000000 +0000 +++ seahorse-3.10.2/configure 2014-01-08 15:09:38.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for seahorse 3.10.1. +# Generated by GNU Autoconf 2.69 for seahorse 3.10.2. # # Report bugs to . # @@ -651,8 +651,8 @@ # Identity of this package. PACKAGE_NAME='seahorse' PACKAGE_TARNAME='seahorse' -PACKAGE_VERSION='3.10.1' -PACKAGE_STRING='seahorse 3.10.1' +PACKAGE_VERSION='3.10.2' +PACKAGE_STRING='seahorse 3.10.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse' PACKAGE_URL='' @@ -1534,7 +1534,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 seahorse 3.10.1 to adapt to many kinds of systems. +\`configure' configures seahorse 3.10.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1604,7 +1604,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of seahorse 3.10.1:";; + short | recursive ) echo "Configuration of seahorse 3.10.2:";; esac cat <<\_ACEOF @@ -1765,7 +1765,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -seahorse configure 3.10.1 +seahorse configure 3.10.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2309,7 +2309,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by seahorse $as_me 3.10.1, which was +It was created by seahorse $as_me 3.10.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3184,7 +3184,7 @@ # Define the identity of the package. PACKAGE='seahorse' - VERSION='3.10.1' + VERSION='3.10.2' cat >>confdefs.h <<_ACEOF @@ -8035,7 +8035,7 @@ rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -8053,7 +8053,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; - ppc64-*linux*|powerpc64-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf32lppclinux" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf32ppclinux" ;; s390x-*linux*) @@ -8072,7 +8075,10 @@ x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; - ppc*-*linux*|powerpc*-*linux*) + powerpcle-*linux*) + LD="${LD-ld} -m elf64lppc" + ;; + powerpc-*linux*) LD="${LD-ld} -m elf64ppc" ;; s390*-*linux*|s390*-*tpf*) @@ -16545,7 +16551,7 @@ fi # List of supported lcov versions. - lcov_version_list="1.6 1.7 1.8 1.9" + lcov_version_list="1.6 1.7 1.8 1.9 1.10" # Extract the first word of "lcov", so it can be a program name with args. set dummy lcov; ac_word=$2 @@ -16707,7 +16713,7 @@ # Use recursive makes in order to ignore errors during check check-code-coverage: -ifdef CODE_COVERAGE_ENABLED +ifeq ($(CODE_COVERAGE_ENABLED),yes) -$(MAKE) $(AM_MAKEFLAGS) -k check $(MAKE) $(AM_MAKEFLAGS) code-coverage-capture else @@ -16716,7 +16722,7 @@ # Capture code coverage data code-coverage-capture: code-coverage-capture-hook -ifdef CODE_COVERAGE_ENABLED +ifeq ($(CODE_COVERAGE_ENABLED),yes) $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS) $(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" -@rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp @@ -16729,11 +16735,13 @@ # Hook rule executed before code-coverage-capture, overridable by the user code-coverage-capture-hook: +ifeq ($(CODE_COVERAGE_ENABLED),yes) clean: code-coverage-clean code-coverage-clean: -$(LCOV) --directory $(top_builddir) -z -rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY) -find . -name "*.gcda" -o -name "*.gcov" -delete +endif GITIGNOREFILES ?= GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY) @@ -17190,7 +17198,8 @@ .PHONY: pot pot: $(_HELP_POTFILE) $(_HELP_POTFILE): $(_HELP_C_FILES) $(_HELP_C_EXTRA) $(_HELP_C_MEDIA) - $(AM_V_GEN)$(ITSTOOL) -o "$@" $(_HELP_C_FILES) + $(AM_V_GEN)if test -d "C"; then d=; else d="$(srcdir)/"; fi; \ + $(ITSTOOL) -o "$@" $(foreach f,$(_HELP_C_FILES),"$${d}$(f)") .PHONY: repo repo: $(_HELP_POTFILE) @@ -20608,7 +20617,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by seahorse $as_me 3.10.1, which was +This file was extended by seahorse $as_me 3.10.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20674,7 +20683,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -seahorse config.status 3.10.1 +seahorse config.status 3.10.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru seahorse-3.10.1/configure.ac seahorse-3.10.2/configure.ac --- seahorse-3.10.1/configure.ac 2013-10-17 06:23:55.000000000 +0000 +++ seahorse-3.10.2/configure.ac 2014-01-08 15:07:22.000000000 +0000 @@ -1,5 +1,5 @@ AC_PREREQ([2.63]) -AC_INIT([seahorse], [3.10.1], +AC_INIT([seahorse], [3.10.2], [http://bugzilla.gnome.org/enter_bug.cgi?product=seahorse], [seahorse]) diff -Nru seahorse-3.10.1/debian/changelog seahorse-3.10.2/debian/changelog --- seahorse-3.10.1/debian/changelog 2013-12-16 04:59:51.000000000 +0000 +++ seahorse-3.10.2/debian/changelog 2014-01-08 16:30:23.000000000 +0000 @@ -1,3 +1,9 @@ +seahorse (3.10.2-0ubuntu1) trusty; urgency=medium + + * New upstream version, fix pgp/ssh key export and SSH key generation + + -- Sebastien Bacher Wed, 08 Jan 2014 17:29:01 +0100 + seahorse (3.10.1-0ubuntu1) trusty; urgency=medium * New upstream release: diff -Nru seahorse-3.10.1/gkr/Makefile.am seahorse-3.10.2/gkr/Makefile.am --- seahorse-3.10.1/gkr/Makefile.am 2013-08-26 07:23:51.000000000 +0000 +++ seahorse-3.10.2/gkr/Makefile.am 2014-01-08 15:07:14.000000000 +0000 @@ -4,9 +4,10 @@ localedir = $(datadir)/locale seahorselibexecbindir = $(libdir)/seahorse/ -INCLUDES = -I$(top_builddir) \ +AM_CPPFLAGS = -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/common \ + -I$(top_builddir)/common \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ -DSEAHORSE_UIDIR=\""$(uidir)/"\" \ diff -Nru seahorse-3.10.1/gkr/Makefile.in seahorse-3.10.2/gkr/Makefile.in --- seahorse-3.10.1/gkr/Makefile.in 2013-10-17 06:25:32.000000000 +0000 +++ seahorse-3.10.2/gkr/Makefile.in 2014-01-08 15:09:37.000000000 +0000 @@ -410,9 +410,10 @@ top_srcdir = @top_srcdir@ uidir = $(pkgdatadir)/ui seahorselibexecbindir = $(libdir)/seahorse/ -INCLUDES = -I$(top_builddir) \ +AM_CPPFLAGS = -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/common \ + -I$(top_builddir)/common \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ -DSEAHORSE_UIDIR=\""$(uidir)/"\" \ diff -Nru seahorse-3.10.1/gkr/gkr-backend.c seahorse-3.10.2/gkr/gkr-backend.c --- seahorse-3.10.1/gkr/gkr-backend.c 2013-07-24 15:51:58.000000000 +0000 +++ seahorse-3.10.2/gkr/gkr-backend.c 2014-01-08 15:13:22.000000000 +0000 @@ -1,4 +1,4 @@ -/* gkr-backend.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* gkr-backend.c generated by valac 0.22.1, the Vala compiler * generated from gkr-backend.vala, do not modify */ /* @@ -161,11 +161,11 @@ static GType seahorse_gkr_my_service_real_get_collection_gtype (SecretService* base) { SeahorseGkrMyService * self; GType result = 0UL; -#line 26 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 26 "/data/src/seahorse/gkr/gkr-backend.vala" self = (SeahorseGkrMyService*) base; -#line 27 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 27 "/data/src/seahorse/gkr/gkr-backend.vala" result = SEAHORSE_GKR_TYPE_KEYRING; -#line 27 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 27 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 167 "gkr-backend.c" } @@ -174,11 +174,11 @@ static GType seahorse_gkr_my_service_real_get_item_gtype (SecretService* base) { SeahorseGkrMyService * self; GType result = 0UL; -#line 30 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 30 "/data/src/seahorse/gkr/gkr-backend.vala" self = (SeahorseGkrMyService*) base; -#line 31 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 31 "/data/src/seahorse/gkr/gkr-backend.vala" result = SEAHORSE_GKR_TYPE_ITEM; -#line 31 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 31 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 180 "gkr-backend.c" } @@ -186,27 +186,27 @@ SeahorseGkrMyService* seahorse_gkr_my_service_construct (GType object_type) { SeahorseGkrMyService * self = NULL; -#line 25 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 25 "/data/src/seahorse/gkr/gkr-backend.vala" self = (SeahorseGkrMyService*) g_object_new (object_type, NULL); -#line 25 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 25 "/data/src/seahorse/gkr/gkr-backend.vala" return self; #line 190 "gkr-backend.c" } SeahorseGkrMyService* seahorse_gkr_my_service_new (void) { -#line 25 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 25 "/data/src/seahorse/gkr/gkr-backend.vala" return seahorse_gkr_my_service_construct (SEAHORSE_GKR_TYPE_MY_SERVICE); #line 197 "gkr-backend.c" } static void seahorse_gkr_my_service_class_init (SeahorseGkrMyServiceClass * klass) { -#line 25 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 25 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_gkr_my_service_parent_class = g_type_class_peek_parent (klass); -#line 25 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 25 "/data/src/seahorse/gkr/gkr-backend.vala" SECRET_SERVICE_CLASS (klass)->get_collection_gtype = seahorse_gkr_my_service_real_get_collection_gtype; -#line 25 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 25 "/data/src/seahorse/gkr/gkr-backend.vala" SECRET_SERVICE_CLASS (klass)->get_item_gtype = seahorse_gkr_my_service_real_get_item_gtype; #line 208 "gkr-backend.c" } @@ -233,51 +233,51 @@ GHashTable* _tmp0_ = NULL; GHashTable* _tmp1_ = NULL; GtkActionGroup* _tmp2_ = NULL; -#line 93 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 93 "/data/src/seahorse/gkr/gkr-backend.vala" self = (SeahorseGkrBackend*) base; -#line 94 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 94 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = self->priv->_aliases; -#line 94 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 94 "/data/src/seahorse/gkr/gkr-backend.vala" g_hash_table_remove_all (_tmp0_); -#line 95 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 95 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = self->priv->_keyrings; -#line 95 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 95 "/data/src/seahorse/gkr/gkr-backend.vala" g_hash_table_remove_all (_tmp1_); -#line 96 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 96 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp2_ = self->priv->_actions; -#line 96 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 96 "/data/src/seahorse/gkr/gkr-backend.vala" gtk_action_group_set_sensitive (_tmp2_, FALSE); -#line 97 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 97 "/data/src/seahorse/gkr/gkr-backend.vala" G_OBJECT_CLASS (seahorse_gkr_backend_parent_class)->dispose (G_TYPE_CHECK_INSTANCE_CAST (self, G_TYPE_OBJECT, GObject)); #line 249 "gkr-backend.c" } static void _g_free0_ (gpointer var) { -#line 101 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 101 "/data/src/seahorse/gkr/gkr-backend.vala" var = (g_free (var), NULL); #line 256 "gkr-backend.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 105 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 105 "/data/src/seahorse/gkr/gkr-backend.vala" return self ? g_object_ref (self) : NULL; #line 263 "gkr-backend.c" } static void _g_object_unref0_ (gpointer var) { -#line 100 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 100 "/data/src/seahorse/gkr/gkr-backend.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); #line 270 "gkr-backend.c" } static void _g_list_free__g_object_unref0_ (GList* self) { -#line 100 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 100 "/data/src/seahorse/gkr/gkr-backend.vala" g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); -#line 100 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 100 "/data/src/seahorse/gkr/gkr-backend.vala" g_list_free (self); #line 279 "gkr-backend.c" } @@ -295,38 +295,38 @@ GList* _tmp5_ = NULL; GHashTableIter iter = {0}; GHashTable* _tmp25_ = NULL; -#line 100 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 100 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_if_fail (self != NULL); -#line 101 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 101 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = g_str_hash; -#line 101 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 101 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = g_str_equal; -#line 101 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 101 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp2_ = g_hash_table_new_full (_tmp0_, _tmp1_, _g_free0_, NULL); -#line 101 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 101 "/data/src/seahorse/gkr/gkr-backend.vala" seen = _tmp2_; -#line 102 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 102 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp3_ = self->priv->_service; -#line 102 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 102 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp4_ = secret_service_get_collections (_tmp3_); -#line 102 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 102 "/data/src/seahorse/gkr/gkr-backend.vala" keyrings = _tmp4_; -#line 105 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 105 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp5_ = keyrings; #line 313 "gkr-backend.c" { GList* keyring_collection = NULL; GList* keyring_it = NULL; -#line 105 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 105 "/data/src/seahorse/gkr/gkr-backend.vala" keyring_collection = _tmp5_; -#line 105 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 105 "/data/src/seahorse/gkr/gkr-backend.vala" for (keyring_it = keyring_collection; keyring_it != NULL; keyring_it = keyring_it->next) { #line 321 "gkr-backend.c" SecretCollection* _tmp6_ = NULL; SecretCollection* keyring = NULL; -#line 105 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 105 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp6_ = _g_object_ref0 ((SecretCollection*) keyring_it->data); -#line 105 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 105 "/data/src/seahorse/gkr/gkr-backend.vala" keyring = _tmp6_; #line 328 "gkr-backend.c" { @@ -342,45 +342,45 @@ GHashTable* _tmp16_ = NULL; const gchar* _tmp17_ = NULL; gconstpointer _tmp18_ = NULL; -#line 106 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 106 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp7_ = keyring; -#line 106 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 106 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp8_ = g_dbus_proxy_get_object_path ((GDBusProxy*) _tmp7_); -#line 106 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 106 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp9_ = g_strdup (_tmp8_); -#line 106 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 106 "/data/src/seahorse/gkr/gkr-backend.vala" _g_free0 (object_path); -#line 106 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 106 "/data/src/seahorse/gkr/gkr-backend.vala" object_path = _tmp9_; -#line 109 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 109 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp10_ = self->priv->_aliases; -#line 109 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 109 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp11_ = g_hash_table_lookup (_tmp10_, "session"); -#line 109 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 109 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp12_ = object_path; -#line 109 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 109 "/data/src/seahorse/gkr/gkr-backend.vala" if (g_strcmp0 ((const gchar*) _tmp11_, _tmp12_) == 0) { -#line 110 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 110 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (keyring); -#line 110 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 110 "/data/src/seahorse/gkr/gkr-backend.vala" continue; #line 364 "gkr-backend.c" } -#line 112 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 112 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp13_ = seen; -#line 112 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 112 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp14_ = object_path; -#line 112 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 112 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp15_ = g_strdup (_tmp14_); -#line 112 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 112 "/data/src/seahorse/gkr/gkr-backend.vala" g_hash_table_add (_tmp13_, _tmp15_); -#line 113 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 113 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp16_ = self->priv->_keyrings; -#line 113 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 113 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp17_ = object_path; -#line 113 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 113 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp18_ = g_hash_table_lookup (_tmp16_, _tmp17_); -#line 113 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 113 "/data/src/seahorse/gkr/gkr-backend.vala" if (((SeahorseGkrKeyring*) _tmp18_) == NULL) { #line 382 "gkr-backend.c" GHashTable* _tmp19_ = NULL; @@ -389,35 +389,35 @@ SecretCollection* _tmp22_ = NULL; SeahorseGkrKeyring* _tmp23_ = NULL; SecretCollection* _tmp24_ = NULL; -#line 114 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 114 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp19_ = self->priv->_keyrings; -#line 114 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 114 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp20_ = object_path; -#line 114 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 114 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp21_ = g_strdup (_tmp20_); -#line 114 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 114 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp22_ = keyring; -#line 114 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 114 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp23_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SEAHORSE_GKR_TYPE_KEYRING, SeahorseGkrKeyring)); -#line 114 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 114 "/data/src/seahorse/gkr/gkr-backend.vala" g_hash_table_insert (_tmp19_, _tmp21_, _tmp23_); -#line 115 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 115 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp24_ = keyring; -#line 115 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 115 "/data/src/seahorse/gkr/gkr-backend.vala" gcr_collection_emit_added ((GcrCollection*) self, (GObject*) _tmp24_); #line 405 "gkr-backend.c" } -#line 105 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 105 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (keyring); #line 409 "gkr-backend.c" } } } -#line 120 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 120 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp25_ = self->priv->_keyrings; -#line 120 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 120 "/data/src/seahorse/gkr/gkr-backend.vala" g_hash_table_iter_init (&iter, _tmp25_); -#line 121 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 121 "/data/src/seahorse/gkr/gkr-backend.vala" while (TRUE) { #line 419 "gkr-backend.c" gconstpointer _tmp26_ = NULL; @@ -426,27 +426,27 @@ GHashTable* _tmp29_ = NULL; const gchar* _tmp30_ = NULL; gconstpointer _tmp31_ = NULL; -#line 121 "/data/projects/seahorse/gkr/gkr-backend.vala" - _tmp27_ = g_hash_table_iter_next (&iter, &_tmp26_, NULL); -#line 121 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 121 "/data/src/seahorse/gkr/gkr-backend.vala" + _tmp27_ = g_hash_table_iter_next (&iter, (gpointer*) (&_tmp26_), (gpointer*) NULL); +#line 121 "/data/src/seahorse/gkr/gkr-backend.vala" _g_free0 (object_path); -#line 121 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 121 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp28_ = g_strdup (_tmp26_); -#line 121 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 121 "/data/src/seahorse/gkr/gkr-backend.vala" object_path = _tmp28_; -#line 121 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 121 "/data/src/seahorse/gkr/gkr-backend.vala" if (!_tmp27_) { -#line 121 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 121 "/data/src/seahorse/gkr/gkr-backend.vala" break; #line 438 "gkr-backend.c" } -#line 122 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 122 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp29_ = seen; -#line 122 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 122 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp30_ = object_path; -#line 122 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 122 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp31_ = g_hash_table_lookup (_tmp29_, _tmp30_); -#line 122 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 122 "/data/src/seahorse/gkr/gkr-backend.vala" if (((const gchar*) _tmp31_) == NULL) { #line 448 "gkr-backend.c" SeahorseGkrKeyring* keyring = NULL; @@ -455,32 +455,32 @@ gconstpointer _tmp34_ = NULL; SeahorseGkrKeyring* _tmp35_ = NULL; SeahorseGkrKeyring* _tmp36_ = NULL; -#line 123 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 123 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp32_ = self->priv->_keyrings; -#line 123 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 123 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp33_ = object_path; -#line 123 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 123 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp34_ = g_hash_table_lookup (_tmp32_, _tmp33_); -#line 123 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 123 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp35_ = _g_object_ref0 ((SeahorseGkrKeyring*) _tmp34_); -#line 123 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 123 "/data/src/seahorse/gkr/gkr-backend.vala" keyring = _tmp35_; -#line 124 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 124 "/data/src/seahorse/gkr/gkr-backend.vala" g_hash_table_iter_remove (&iter); -#line 125 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 125 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp36_ = keyring; -#line 125 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 125 "/data/src/seahorse/gkr/gkr-backend.vala" gcr_collection_emit_removed ((GcrCollection*) self, (GObject*) _tmp36_); -#line 122 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 122 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (keyring); #line 473 "gkr-backend.c" } } -#line 100 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 100 "/data/src/seahorse/gkr/gkr-backend.vala" _g_free0 (object_path); -#line 100 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 100 "/data/src/seahorse/gkr/gkr-backend.vala" __g_list_free__g_object_unref0_0 (keyrings); -#line 100 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 100 "/data/src/seahorse/gkr/gkr-backend.vala" _g_hash_table_unref0 (seen); #line 482 "gkr-backend.c" } @@ -491,15 +491,15 @@ guint result = 0U; GHashTable* _tmp0_ = NULL; guint _tmp1_ = 0U; -#line 130 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 130 "/data/src/seahorse/gkr/gkr-backend.vala" self = (SeahorseGkrBackend*) base; -#line 131 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 131 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = self->priv->_keyrings; -#line 131 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 131 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = g_hash_table_size (_tmp0_); -#line 131 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 131 "/data/src/seahorse/gkr/gkr-backend.vala" result = _tmp1_; -#line 131 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 131 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 501 "gkr-backend.c" } @@ -509,13 +509,13 @@ SeahorseGkrBackend * self; GList* result = NULL; GList* _tmp0_ = NULL; -#line 134 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 134 "/data/src/seahorse/gkr/gkr-backend.vala" self = (SeahorseGkrBackend*) base; -#line 135 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 135 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = seahorse_gkr_backend_get_keyrings (self); -#line 135 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 135 "/data/src/seahorse/gkr/gkr-backend.vala" result = _tmp0_; -#line 135 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 135 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 517 "gkr-backend.c" } @@ -525,13 +525,13 @@ SeahorseGkrBackend * self; gboolean result = FALSE; GObject* _tmp0_ = NULL; -#line 138 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 138 "/data/src/seahorse/gkr/gkr-backend.vala" self = (SeahorseGkrBackend*) base; -#line 138 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 138 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_val_if_fail (object != NULL, FALSE); -#line 139 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 139 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = object; -#line 139 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 139 "/data/src/seahorse/gkr/gkr-backend.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SEAHORSE_GKR_TYPE_KEYRING)) { #line 533 "gkr-backend.c" SeahorseGkrKeyring* keyring = NULL; @@ -545,41 +545,41 @@ gconstpointer _tmp8_ = NULL; SeahorseGkrKeyring* _tmp9_ = NULL; gboolean _tmp10_ = FALSE; -#line 140 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 140 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = object; -#line 140 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 140 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SEAHORSE_GKR_TYPE_KEYRING, SeahorseGkrKeyring)); -#line 140 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 140 "/data/src/seahorse/gkr/gkr-backend.vala" keyring = _tmp2_; -#line 141 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 141 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp3_ = self->priv->_keyrings; -#line 141 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 141 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp4_ = keyring; -#line 141 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 141 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp5_ = seahorse_place_get_uri ((SeahorsePlace*) _tmp4_); -#line 141 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 141 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp6_ = _tmp5_; -#line 141 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 141 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp7_ = _tmp6_; -#line 141 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 141 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp8_ = g_hash_table_lookup (_tmp3_, _tmp7_); -#line 141 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 141 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp9_ = keyring; -#line 141 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 141 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp10_ = ((SeahorseGkrKeyring*) _tmp8_) == _tmp9_; -#line 141 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 141 "/data/src/seahorse/gkr/gkr-backend.vala" _g_free0 (_tmp7_); -#line 141 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 141 "/data/src/seahorse/gkr/gkr-backend.vala" result = _tmp10_; -#line 141 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 141 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (keyring); -#line 141 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 141 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 575 "gkr-backend.c" } -#line 143 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 143 "/data/src/seahorse/gkr/gkr-backend.vala" result = FALSE; -#line 143 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 143 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 581 "gkr-backend.c" } @@ -592,21 +592,21 @@ const gchar* _tmp1_ = NULL; gconstpointer _tmp2_ = NULL; SeahorsePlace* _tmp3_ = NULL; -#line 146 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 146 "/data/src/seahorse/gkr/gkr-backend.vala" self = (SeahorseGkrBackend*) base; -#line 146 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 146 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_val_if_fail (uri != NULL, NULL); -#line 147 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 147 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = self->priv->_keyrings; -#line 147 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 147 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = uri; -#line 147 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 147 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp2_ = g_hash_table_lookup (_tmp0_, _tmp1_); -#line 147 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 147 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp3_ = _g_object_ref0 ((SeahorsePlace*) ((SeahorseGkrKeyring*) _tmp2_)); -#line 147 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 147 "/data/src/seahorse/gkr/gkr-backend.vala" result = _tmp3_; -#line 147 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 147 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 608 "gkr-backend.c" } @@ -617,21 +617,21 @@ SeahorseGkrBackend* _tmp1_ = NULL; SeahorseGkrBackend* _tmp2_ = NULL; SeahorseGkrBackend* _tmp3_ = NULL; -#line 151 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 151 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = seahorse_gkr_backend__instance; -#line 151 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 151 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_if_fail (_tmp0_ == NULL); -#line 152 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 152 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = seahorse_gkr_backend_new (); -#line 152 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 152 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp2_ = _tmp1_; -#line 152 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 152 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_backend_register ((SeahorseBackend*) _tmp2_); -#line 152 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 152 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (_tmp2_); -#line 153 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 153 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp3_ = seahorse_gkr_backend__instance; -#line 153 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 153 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_if_fail (_tmp3_ != NULL); #line 633 "gkr-backend.c" } @@ -642,17 +642,17 @@ SeahorseGkrBackend* _tmp0_ = NULL; SeahorseGkrBackend* _tmp1_ = NULL; SeahorseGkrBackend* _tmp2_ = NULL; -#line 157 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 157 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = seahorse_gkr_backend__instance; -#line 157 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 157 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_if_fail (_tmp0_ != NULL); -#line 158 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 158 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = seahorse_gkr_backend__instance; -#line 158 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 158 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 158 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 158 "/data/src/seahorse/gkr/gkr-backend.vala" result = _tmp2_; -#line 158 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 158 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 654 "gkr-backend.c" } @@ -662,24 +662,24 @@ GList* result = NULL; GHashTable* _tmp0_ = NULL; GList* _tmp1_ = NULL; -#line 161 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 161 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_val_if_fail (self != NULL, NULL); -#line 162 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 162 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = self->priv->_keyrings; -#line 162 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 162 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = g_hash_table_get_values (_tmp0_); -#line 162 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 162 "/data/src/seahorse/gkr/gkr-backend.vala" result = _tmp1_; -#line 162 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 162 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 672 "gkr-backend.c" } static Block1Data* block1_data_ref (Block1Data* _data1_) { -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" g_atomic_int_inc (&_data1_->_ref_count_); -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" return _data1_; #line 681 "gkr-backend.c" } @@ -688,17 +688,17 @@ static void block1_data_unref (void * _userdata_) { Block1Data* _data1_; _data1_ = (Block1Data*) _userdata_; -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { #line 690 "gkr-backend.c" SeahorseGkrBackend * self; -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" self = _data1_->self; -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" _g_free0 (_data1_->name); -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (self); -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" g_slice_free (Block1Data, _data1_); #line 700 "gkr-backend.c" } @@ -708,9 +708,9 @@ static void __lambda3_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) { SeahorseGkrBackend * self; GError * _inner_error_ = NULL; -#line 168 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 168 "/data/src/seahorse/gkr/gkr-backend.vala" self = _data1_->self; -#line 168 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 168 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_if_fail (res != NULL); #line 712 "gkr-backend.c" { @@ -718,41 +718,41 @@ SecretService* _tmp0_ = NULL; GAsyncResult* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 170 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 170 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = self->priv->_service; -#line 170 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 170 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = res; -#line 170 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 170 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp2_ = secret_service_read_alias_dbus_path_finish (_tmp0_, _tmp1_, &_inner_error_); -#line 170 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 170 "/data/src/seahorse/gkr/gkr-backend.vala" object_path = _tmp2_; -#line 170 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 170 "/data/src/seahorse/gkr/gkr-backend.vala" if (_inner_error_ != NULL) { #line 728 "gkr-backend.c" goto __catch0_g_error; } -#line 171 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 171 "/data/src/seahorse/gkr/gkr-backend.vala" if (object_path != NULL) { #line 733 "gkr-backend.c" GHashTable* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; -#line 172 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 172 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp3_ = self->priv->_aliases; -#line 172 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 172 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp4_ = _data1_->name; -#line 172 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 172 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp5_ = g_strdup (_tmp4_); -#line 172 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 172 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp6_ = g_strdup (object_path); -#line 172 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 172 "/data/src/seahorse/gkr/gkr-backend.vala" g_hash_table_insert (_tmp3_, _tmp5_, _tmp6_); -#line 173 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 173 "/data/src/seahorse/gkr/gkr-backend.vala" g_object_notify ((GObject*) self, "aliases"); #line 750 "gkr-backend.c" } -#line 169 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 169 "/data/src/seahorse/gkr/gkr-backend.vala" _g_free0 (object_path); #line 754 "gkr-backend.c" } @@ -763,30 +763,30 @@ const gchar* _tmp7_ = NULL; GError* _tmp8_ = NULL; const gchar* _tmp9_ = NULL; -#line 169 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 169 "/data/src/seahorse/gkr/gkr-backend.vala" err = _inner_error_; -#line 169 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 169 "/data/src/seahorse/gkr/gkr-backend.vala" _inner_error_ = NULL; -#line 176 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 176 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp7_ = _data1_->name; -#line 176 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 176 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp8_ = err; -#line 176 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 176 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp9_ = _tmp8_->message; -#line 176 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 176 "/data/src/seahorse/gkr/gkr-backend.vala" g_warning ("gkr-backend.vala:176: Couldn't read secret service alias %s: %s", _tmp7_, _tmp9_); -#line 169 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 169 "/data/src/seahorse/gkr/gkr-backend.vala" _g_error_free0 (err); #line 777 "gkr-backend.c" } __finally0: -#line 169 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 169 "/data/src/seahorse/gkr/gkr-backend.vala" if (_inner_error_ != NULL) { -#line 169 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 169 "/data/src/seahorse/gkr/gkr-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 169 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 169 "/data/src/seahorse/gkr/gkr-backend.vala" g_clear_error (&_inner_error_); -#line 169 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 169 "/data/src/seahorse/gkr/gkr-backend.vala" return; #line 788 "gkr-backend.c" } @@ -794,9 +794,9 @@ static void ___lambda3__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 168 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 168 "/data/src/seahorse/gkr/gkr-backend.vala" __lambda3_ (self, source_object, res); -#line 168 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 168 "/data/src/seahorse/gkr/gkr-backend.vala" block1_data_unref (self); #line 798 "gkr-backend.c" } @@ -809,69 +809,69 @@ SecretService* _tmp2_ = NULL; SecretService* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_if_fail (self != NULL); -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_if_fail (name != NULL); -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" _data1_ = g_slice_new0 (Block1Data); -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" _data1_->_ref_count_ = 1; -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" _data1_->self = g_object_ref (self); -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = name; -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = g_strdup (_tmp0_); -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" _g_free0 (_data1_->name); -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" _data1_->name = _tmp1_; -#line 166 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 166 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp2_ = self->priv->_service; -#line 166 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 166 "/data/src/seahorse/gkr/gkr-backend.vala" if (_tmp2_ == NULL) { -#line 167 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 167 "/data/src/seahorse/gkr/gkr-backend.vala" block1_data_unref (_data1_); -#line 167 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 167 "/data/src/seahorse/gkr/gkr-backend.vala" _data1_ = NULL; -#line 167 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 167 "/data/src/seahorse/gkr/gkr-backend.vala" return; #line 837 "gkr-backend.c" } -#line 168 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 168 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp3_ = self->priv->_service; -#line 168 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 168 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp4_ = _data1_->name; -#line 168 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 168 "/data/src/seahorse/gkr/gkr-backend.vala" secret_service_read_alias_dbus_path (_tmp3_, _tmp4_, NULL, ___lambda3__gasync_ready_callback, block1_data_ref (_data1_)); -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" block1_data_unref (_data1_); -#line 165 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 165 "/data/src/seahorse/gkr/gkr-backend.vala" _data1_ = NULL; #line 849 "gkr-backend.c" } static void seahorse_gkr_backend_refresh_aliases (SeahorseGkrBackend* self) { -#line 182 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 182 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_if_fail (self != NULL); -#line 183 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 183 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_gkr_backend_read_alias (self, "default"); -#line 184 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 184 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_gkr_backend_read_alias (self, "session"); -#line 185 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 185 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_gkr_backend_read_alias (self, "login"); #line 862 "gkr-backend.c" } void seahorse_gkr_backend_refresh (SeahorseGkrBackend* self) { -#line 188 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 188 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_if_fail (self != NULL); -#line 189 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 189 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_gkr_backend_refresh_aliases (self); -#line 190 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 190 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_gkr_backend_refresh_collections (self); #line 873 "gkr-backend.c" } @@ -886,31 +886,31 @@ GHashTable* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; gconstpointer _tmp5_ = NULL; -#line 192 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 192 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 192 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 192 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_val_if_fail (alias != NULL, FALSE); -#line 192 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 192 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_val_if_fail (keyring != NULL, FALSE); -#line 194 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 194 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = keyring; -#line 194 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 194 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = g_dbus_proxy_get_object_path ((GDBusProxy*) _tmp0_); -#line 194 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 194 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp2_ = g_strdup (_tmp1_); -#line 194 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 194 "/data/src/seahorse/gkr/gkr-backend.vala" object_path = _tmp2_; -#line 195 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 195 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp3_ = self->priv->_aliases; -#line 195 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 195 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp4_ = alias; -#line 195 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 195 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp5_ = g_hash_table_lookup (_tmp3_, _tmp4_); -#line 195 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 195 "/data/src/seahorse/gkr/gkr-backend.vala" result = g_strcmp0 ((const gchar*) _tmp5_, object_path) == 0; -#line 195 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 195 "/data/src/seahorse/gkr/gkr-backend.vala" _g_free0 (object_path); -#line 195 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 195 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 912 "gkr-backend.c" } @@ -918,16 +918,16 @@ SeahorseGkrBackend* seahorse_gkr_backend_construct (GType object_type) { SeahorseGkrBackend * self = NULL; -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" self = (SeahorseGkrBackend*) g_object_new (object_type, NULL); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" return self; #line 922 "gkr-backend.c" } SeahorseGkrBackend* seahorse_gkr_backend_new (void) { -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" return seahorse_gkr_backend_construct (SEAHORSE_GKR_TYPE_BACKEND); #line 929 "gkr-backend.c" } @@ -936,11 +936,11 @@ static const gchar* seahorse_gkr_backend_real_get_name (SeahorseBackend* base) { const gchar* result; SeahorseGkrBackend* self; -#line 37 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 37 "/data/src/seahorse/gkr/gkr-backend.vala" self = (SeahorseGkrBackend*) base; -#line 37 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 37 "/data/src/seahorse/gkr/gkr-backend.vala" result = SEAHORSE_GKR_NAME; -#line 37 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 37 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 942 "gkr-backend.c" } @@ -950,13 +950,13 @@ const gchar* result; SeahorseGkrBackend* self; const gchar* _tmp0_ = NULL; -#line 41 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 41 "/data/src/seahorse/gkr/gkr-backend.vala" self = (SeahorseGkrBackend*) base; -#line 41 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 41 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = _ ("Passwords"); -#line 41 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 41 "/data/src/seahorse/gkr/gkr-backend.vala" result = _tmp0_; -#line 41 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 41 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 958 "gkr-backend.c" } @@ -966,13 +966,13 @@ const gchar* result; SeahorseGkrBackend* self; const gchar* _tmp0_ = NULL; -#line 45 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 45 "/data/src/seahorse/gkr/gkr-backend.vala" self = (SeahorseGkrBackend*) base; -#line 45 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 45 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = _ ("Stored personal passwords, credentials and secrets"); -#line 45 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 45 "/data/src/seahorse/gkr/gkr-backend.vala" result = _tmp0_; -#line 45 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 45 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 974 "gkr-backend.c" } @@ -983,15 +983,15 @@ SeahorseGkrBackend* self; GtkActionGroup* _tmp0_ = NULL; GtkActionGroup* _tmp1_ = NULL; -#line 49 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 49 "/data/src/seahorse/gkr/gkr-backend.vala" self = (SeahorseGkrBackend*) base; -#line 49 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 49 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = self->priv->_actions; -#line 49 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 49 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 49 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 49 "/data/src/seahorse/gkr/gkr-backend.vala" result = _tmp1_; -#line 49 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 49 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 993 "gkr-backend.c" } @@ -1000,13 +1000,13 @@ GHashTable* seahorse_gkr_backend_get_aliases (SeahorseGkrBackend* self) { GHashTable* result; GHashTable* _tmp0_ = NULL; -#line 53 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 53 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_val_if_fail (self != NULL, NULL); -#line 53 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 53 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = self->priv->_aliases; -#line 53 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 53 "/data/src/seahorse/gkr/gkr-backend.vala" result = _tmp0_; -#line 53 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 53 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 1008 "gkr-backend.c" } @@ -1015,13 +1015,13 @@ SecretService* seahorse_gkr_backend_get_service (SeahorseGkrBackend* self) { SecretService* result; SecretService* _tmp0_ = NULL; -#line 57 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 57 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_val_if_fail (self != NULL, NULL); -#line 57 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 57 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = self->priv->_service; -#line 57 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 57 "/data/src/seahorse/gkr/gkr-backend.vala" result = _tmp0_; -#line 57 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 57 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 1023 "gkr-backend.c" } @@ -1030,15 +1030,15 @@ static void ___lambda14_ (SeahorseGkrBackend* self, GParamSpec* pspec) { GParamSpec* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 78 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 78 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_if_fail (pspec != NULL); -#line 79 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 79 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = pspec; -#line 79 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 79 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = _tmp0_->name; -#line 79 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 79 "/data/src/seahorse/gkr/gkr-backend.vala" if (g_strcmp0 (_tmp1_, "collections") == 0) { -#line 80 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 80 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_gkr_backend_refresh_collections (self); #line 1040 "gkr-backend.c" } @@ -1046,25 +1046,25 @@ static void ____lambda14__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { -#line 78 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 78 "/data/src/seahorse/gkr/gkr-backend.vala" ___lambda14_ (self, pspec); #line 1048 "gkr-backend.c" } static void ___lambda15_ (SeahorseGkrBackend* self, GObject* obj, GAsyncResult* res) { -#line 82 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 82 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_if_fail (res != NULL); -#line 83 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 83 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_gkr_backend_refresh_collections (self); #line 1057 "gkr-backend.c" } static void ____lambda15__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 82 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 82 "/data/src/seahorse/gkr/gkr-backend.vala" ___lambda15_ (self, source_object, res); -#line 82 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 82 "/data/src/seahorse/gkr/gkr-backend.vala" g_object_unref (self); #line 1066 "gkr-backend.c" } @@ -1072,7 +1072,7 @@ static void _seahorse_gkr_backend___lambda13_ (SeahorseGkrBackend* self, GObject* obj, GAsyncResult* res) { GError * _inner_error_ = NULL; -#line 75 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 75 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_if_fail (res != NULL); #line 1074 "gkr-backend.c" { @@ -1081,30 +1081,30 @@ SecretService* _tmp2_ = NULL; SecretService* _tmp3_ = NULL; SecretService* _tmp4_ = NULL; -#line 77 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 77 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = res; -#line 77 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 77 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp2_ = secret_service_open_finish (_tmp1_, &_inner_error_); -#line 77 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 77 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = _tmp2_; -#line 77 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 77 "/data/src/seahorse/gkr/gkr-backend.vala" if (_inner_error_ != NULL) { #line 1089 "gkr-backend.c" goto __catch1_g_error; } -#line 77 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 77 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (self->priv->_service); -#line 77 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 77 "/data/src/seahorse/gkr/gkr-backend.vala" self->priv->_service = _tmp0_; -#line 78 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 78 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp3_ = self->priv->_service; -#line 78 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 78 "/data/src/seahorse/gkr/gkr-backend.vala" g_signal_connect_object ((GObject*) _tmp3_, "notify", (GCallback) ____lambda14__g_object_notify, self, 0); -#line 82 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 82 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp4_ = self->priv->_service; -#line 82 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 82 "/data/src/seahorse/gkr/gkr-backend.vala" secret_service_load_collections (_tmp4_, NULL, ____lambda15__gasync_ready_callback, g_object_ref (self)); -#line 85 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 85 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_gkr_backend_refresh_aliases (self); #line 1106 "gkr-backend.c" } @@ -1114,41 +1114,41 @@ GError* err = NULL; GError* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; -#line 76 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 76 "/data/src/seahorse/gkr/gkr-backend.vala" err = _inner_error_; -#line 76 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 76 "/data/src/seahorse/gkr/gkr-backend.vala" _inner_error_ = NULL; -#line 87 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 87 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp5_ = err; -#line 87 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 87 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp6_ = _tmp5_->message; -#line 87 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 87 "/data/src/seahorse/gkr/gkr-backend.vala" g_warning ("gkr-backend.vala:87: couldn't connect to secret service: %s", _tmp6_); -#line 76 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 76 "/data/src/seahorse/gkr/gkr-backend.vala" _g_error_free0 (err); #line 1126 "gkr-backend.c" } __finally1: -#line 76 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 76 "/data/src/seahorse/gkr/gkr-backend.vala" if (_inner_error_ != NULL) { -#line 76 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 76 "/data/src/seahorse/gkr/gkr-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 76 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 76 "/data/src/seahorse/gkr/gkr-backend.vala" g_clear_error (&_inner_error_); -#line 76 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 76 "/data/src/seahorse/gkr/gkr-backend.vala" return; #line 1137 "gkr-backend.c" } -#line 89 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 89 "/data/src/seahorse/gkr/gkr-backend.vala" g_object_notify ((GObject*) self, "service"); #line 1141 "gkr-backend.c" } static void __seahorse_gkr_backend___lambda13__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 74 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 74 "/data/src/seahorse/gkr/gkr-backend.vala" _seahorse_gkr_backend___lambda13_ (self, source_object, res); -#line 74 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 74 "/data/src/seahorse/gkr/gkr-backend.vala" g_object_unref (self); #line 1150 "gkr-backend.c" } @@ -1167,117 +1167,117 @@ GHashFunc _tmp6_ = NULL; GEqualFunc _tmp7_ = NULL; GHashTable* _tmp8_ = NULL; -#line 66 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 66 "/data/src/seahorse/gkr/gkr-backend.vala" parent_class = G_OBJECT_CLASS (seahorse_gkr_backend_parent_class); -#line 66 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 66 "/data/src/seahorse/gkr/gkr-backend.vala" obj = parent_class->constructor (type, n_construct_properties, construct_properties); -#line 66 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 66 "/data/src/seahorse/gkr/gkr-backend.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_GKR_TYPE_BACKEND, SeahorseGkrBackend); -#line 67 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 67 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = seahorse_gkr_backend__instance; -#line 67 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 67 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_if_fail (_tmp0_ == NULL); -#line 68 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 68 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = _g_object_ref0 (self); -#line 68 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 68 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (seahorse_gkr_backend__instance); -#line 68 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 68 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_gkr_backend__instance = _tmp1_; -#line 70 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 70 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp2_ = seahorse_gkr_backend_actions_instance (self); -#line 70 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 70 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (self->priv->_actions); -#line 70 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 70 "/data/src/seahorse/gkr/gkr-backend.vala" self->priv->_actions = _tmp2_; -#line 71 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 71 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp3_ = g_str_hash; -#line 71 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 71 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp4_ = g_str_equal; -#line 71 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 71 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp5_ = g_hash_table_new_full (_tmp3_, _tmp4_, _g_free0_, _g_object_unref0_); -#line 71 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 71 "/data/src/seahorse/gkr/gkr-backend.vala" _g_hash_table_unref0 (self->priv->_keyrings); -#line 71 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 71 "/data/src/seahorse/gkr/gkr-backend.vala" self->priv->_keyrings = _tmp5_; -#line 72 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 72 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp6_ = g_str_hash; -#line 72 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 72 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp7_ = g_str_equal; -#line 72 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 72 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp8_ = g_hash_table_new_full (_tmp6_, _tmp7_, _g_free0_, _g_free0_); -#line 72 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 72 "/data/src/seahorse/gkr/gkr-backend.vala" _g_hash_table_unref0 (self->priv->_aliases); -#line 72 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 72 "/data/src/seahorse/gkr/gkr-backend.vala" self->priv->_aliases = _tmp8_; -#line 74 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 74 "/data/src/seahorse/gkr/gkr-backend.vala" secret_service_open (SEAHORSE_GKR_TYPE_MY_SERVICE, NULL, SECRET_SERVICE_OPEN_SESSION, NULL, __seahorse_gkr_backend___lambda13__gasync_ready_callback, g_object_ref (self)); -#line 66 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 66 "/data/src/seahorse/gkr/gkr-backend.vala" return obj; #line 1213 "gkr-backend.c" } static void seahorse_gkr_backend_class_init (SeahorseGkrBackendClass * klass) { -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_gkr_backend_parent_class = g_type_class_peek_parent (klass); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" g_type_class_add_private (klass, sizeof (SeahorseGkrBackendPrivate)); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" G_OBJECT_CLASS (klass)->dispose = seahorse_gkr_backend_real_dispose; -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" G_OBJECT_CLASS (klass)->get_property = _vala_seahorse_gkr_backend_get_property; -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" G_OBJECT_CLASS (klass)->constructor = seahorse_gkr_backend_constructor; -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" G_OBJECT_CLASS (klass)->finalize = seahorse_gkr_backend_finalize; -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_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)); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_BACKEND_LABEL, g_param_spec_string ("label", "label", "label", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_BACKEND_DESCRIPTION, g_param_spec_string ("description", "description", "description", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_BACKEND_ACTIONS, g_param_spec_object ("actions", "actions", "actions", GTK_TYPE_ACTION_GROUP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_BACKEND_ALIASES, g_param_spec_boxed ("aliases", "aliases", "aliases", G_TYPE_HASH_TABLE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_BACKEND_SERVICE, g_param_spec_object ("service", "service", "service", secret_service_get_type (), G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 1242 "gkr-backend.c" } static void seahorse_gkr_backend_gcr_collection_interface_init (GcrCollectionIface * iface) { -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_gkr_backend_gcr_collection_parent_iface = g_type_interface_peek_parent (iface); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" iface->get_length = (guint (*)(GcrCollection*)) seahorse_gkr_backend_real_get_length; -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" iface->get_objects = (GList* (*)(GcrCollection*)) seahorse_gkr_backend_real_get_objects; -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" iface->contains = (gboolean (*)(GcrCollection*, GObject*)) seahorse_gkr_backend_real_contains; #line 1255 "gkr-backend.c" } static void seahorse_gkr_backend_seahorse_backend_interface_init (SeahorseBackendIface * iface) { -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_gkr_backend_seahorse_backend_parent_iface = g_type_interface_peek_parent (iface); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" iface->lookup_place = (SeahorsePlace* (*)(SeahorseBackend*, const gchar*)) seahorse_gkr_backend_real_lookup_place; -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" iface->get_name = seahorse_gkr_backend_real_get_name; -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" iface->get_label = seahorse_gkr_backend_real_get_label; -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" iface->get_description = seahorse_gkr_backend_real_get_description; -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" iface->get_actions = seahorse_gkr_backend_real_get_actions; #line 1272 "gkr-backend.c" } static void seahorse_gkr_backend_instance_init (SeahorseGkrBackend * self) { -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" self->priv = SEAHORSE_GKR_BACKEND_GET_PRIVATE (self); #line 1279 "gkr-backend.c" } @@ -1285,17 +1285,17 @@ static void seahorse_gkr_backend_finalize (GObject* obj) { SeahorseGkrBackend * self; -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_GKR_TYPE_BACKEND, SeahorseGkrBackend); -#line 61 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 61 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (self->priv->_service); -#line 62 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 62 "/data/src/seahorse/gkr/gkr-backend.vala" _g_hash_table_unref0 (self->priv->_keyrings); -#line 63 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 63 "/data/src/seahorse/gkr/gkr-backend.vala" _g_hash_table_unref0 (self->priv->_aliases); -#line 64 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 64 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (self->priv->_actions); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" G_OBJECT_CLASS (seahorse_gkr_backend_parent_class)->finalize (obj); #line 1297 "gkr-backend.c" } @@ -1320,49 +1320,49 @@ static void _vala_seahorse_gkr_backend_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { SeahorseGkrBackend * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEAHORSE_GKR_TYPE_BACKEND, SeahorseGkrBackend); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" switch (property_id) { -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" case SEAHORSE_GKR_BACKEND_NAME: -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" g_value_set_string (value, seahorse_backend_get_name ((SeahorseBackend*) self)); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" break; -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" case SEAHORSE_GKR_BACKEND_LABEL: -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" g_value_set_string (value, seahorse_backend_get_label ((SeahorseBackend*) self)); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" break; -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" case SEAHORSE_GKR_BACKEND_DESCRIPTION: -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" g_value_set_string (value, seahorse_backend_get_description ((SeahorseBackend*) self)); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" break; -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" case SEAHORSE_GKR_BACKEND_ACTIONS: -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" g_value_take_object (value, seahorse_backend_get_actions ((SeahorseBackend*) self)); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" break; -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" case SEAHORSE_GKR_BACKEND_ALIASES: -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" g_value_set_boxed (value, seahorse_gkr_backend_get_aliases (self)); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" break; -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" case SEAHORSE_GKR_BACKEND_SERVICE: -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" g_value_set_object (value, seahorse_gkr_backend_get_service (self)); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" break; #line 1358 "gkr-backend.c" default: -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 35 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 35 "/data/src/seahorse/gkr/gkr-backend.vala" break; #line 1364 "gkr-backend.c" } @@ -1370,14 +1370,14 @@ static void _seahorse_gkr_backend_actions_on_new_keyring_gtk_action_callback (GtkAction* action, gpointer self) { -#line 242 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 242 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_gkr_backend_actions_on_new_keyring (action); #line 1372 "gkr-backend.c" } static void _seahorse_gkr_backend_actions_on_new_item_gtk_action_callback (GtkAction* action, gpointer self) { -#line 242 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 242 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_gkr_backend_actions_on_new_item (action); #line 1379 "gkr-backend.c" } @@ -1386,20 +1386,20 @@ static SeahorseGkrBackendActions* seahorse_gkr_backend_actions_construct (GType object_type, SeahorseGkrBackend* backend) { SeahorseGkrBackendActions * self = NULL; SeahorseGkrBackend* _tmp0_ = NULL; -#line 230 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 230 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_val_if_fail (backend != NULL, NULL); -#line 231 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 231 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = backend; -#line 231 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 231 "/data/src/seahorse/gkr/gkr-backend.vala" self = (SeahorseGkrBackendActions*) g_object_new (object_type, "name", "KeyringBackend", "backend", _tmp0_, NULL); -#line 230 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 230 "/data/src/seahorse/gkr/gkr-backend.vala" return self; #line 1394 "gkr-backend.c" } static SeahorseGkrBackendActions* seahorse_gkr_backend_actions_new (SeahorseGkrBackend* backend) { -#line 230 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 230 "/data/src/seahorse/gkr/gkr-backend.vala" return seahorse_gkr_backend_actions_construct (SEAHORSE_GKR_TYPE_BACKEND_ACTIONS, backend); #line 1401 "gkr-backend.c" } @@ -1411,23 +1411,23 @@ GtkWindow* _tmp2_ = NULL; SeahorseGkrKeyringAdd* _tmp3_ = NULL; SeahorseGkrKeyringAdd* _tmp4_ = NULL; -#line 234 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 234 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_if_fail (action != NULL); -#line 235 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 235 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = action; -#line 235 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 235 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = seahorse_action_get_window (_tmp0_); -#line 235 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 235 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp2_ = _tmp1_; -#line 235 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 235 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp3_ = seahorse_gkr_keyring_add_new (_tmp2_); -#line 235 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 235 "/data/src/seahorse/gkr/gkr-backend.vala" g_object_ref_sink (_tmp3_); -#line 235 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 235 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp4_ = _tmp3_; -#line 235 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 235 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (_tmp4_); -#line 235 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 235 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (_tmp2_); #line 1429 "gkr-backend.c" } @@ -1439,23 +1439,23 @@ GtkWindow* _tmp2_ = NULL; SeahorseGkrItemAdd* _tmp3_ = NULL; SeahorseGkrItemAdd* _tmp4_ = NULL; -#line 238 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 238 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_if_fail (action != NULL); -#line 239 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 239 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = action; -#line 239 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 239 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = seahorse_action_get_window (_tmp0_); -#line 239 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 239 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp2_ = _tmp1_; -#line 239 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 239 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp3_ = seahorse_gkr_item_add_new (_tmp2_); -#line 239 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 239 "/data/src/seahorse/gkr/gkr-backend.vala" g_object_ref_sink (_tmp3_); -#line 239 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 239 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp4_ = _tmp3_; -#line 239 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 239 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (_tmp4_); -#line 239 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 239 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (_tmp2_); #line 1457 "gkr-backend.c" } @@ -1469,37 +1469,37 @@ SeahorseGkrBackend* _tmp2_ = NULL; SeahorseGkrBackendActions* _tmp3_ = NULL; SeahorseGkrBackendActions* _tmp4_ = NULL; -#line 263 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 263 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_val_if_fail (backend != NULL, NULL); -#line 264 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 264 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = g_weak_ref_get (&seahorse_gkr_backend_actions__instance); -#line 264 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 264 "/data/src/seahorse/gkr/gkr-backend.vala" actions = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SEAHORSE_GKR_TYPE_BACKEND_ACTIONS, SeahorseGkrBackendActions); -#line 265 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 265 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = actions; -#line 265 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 265 "/data/src/seahorse/gkr/gkr-backend.vala" if (_tmp1_ != NULL) { -#line 266 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 266 "/data/src/seahorse/gkr/gkr-backend.vala" result = (GtkActionGroup*) actions; -#line 266 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 266 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 1483 "gkr-backend.c" } -#line 267 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 267 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp2_ = backend; -#line 267 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 267 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp3_ = seahorse_gkr_backend_actions_new (_tmp2_); -#line 267 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 267 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (actions); -#line 267 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 267 "/data/src/seahorse/gkr/gkr-backend.vala" actions = _tmp3_; -#line 268 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 268 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp4_ = actions; -#line 268 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 268 "/data/src/seahorse/gkr/gkr-backend.vala" g_weak_ref_set (&seahorse_gkr_backend_actions__instance, (GObject*) _tmp4_); -#line 269 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 269 "/data/src/seahorse/gkr/gkr-backend.vala" result = (GtkActionGroup*) actions; -#line 269 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 269 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 1501 "gkr-backend.c" } @@ -1508,13 +1508,13 @@ SeahorseGkrBackend* seahorse_gkr_backend_actions_get_backend (SeahorseGkrBackendActions* self) { SeahorseGkrBackend* result; SeahorseGkrBackend* _tmp0_ = NULL; -#line 200 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 200 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_val_if_fail (self != NULL, NULL); -#line 200 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 200 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = self->priv->_backend; -#line 200 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 200 "/data/src/seahorse/gkr/gkr-backend.vala" result = _tmp0_; -#line 200 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 200 "/data/src/seahorse/gkr/gkr-backend.vala" return result; #line 1516 "gkr-backend.c" } @@ -1523,17 +1523,17 @@ static void seahorse_gkr_backend_actions_set_backend (SeahorseGkrBackendActions* self, SeahorseGkrBackend* value) { SeahorseGkrBackend* _tmp0_ = NULL; SeahorseGkrBackend* _tmp1_ = NULL; -#line 200 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 200 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_if_fail (self != NULL); -#line 200 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 200 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = value; -#line 200 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 200 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 200 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 200 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (self->priv->_backend); -#line 200 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 200 "/data/src/seahorse/gkr/gkr-backend.vala" self->priv->_backend = _tmp1_; -#line 200 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 200 "/data/src/seahorse/gkr/gkr-backend.vala" g_object_notify ((GObject *) self, "backend"); #line 1535 "gkr-backend.c" } @@ -1551,68 +1551,68 @@ GtkActionGroup* _tmp7_ = NULL; GtkActionGroup* _tmp8_ = NULL; GtkActionGroup* _tmp9_ = NULL; -#line 208 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 208 "/data/src/seahorse/gkr/gkr-backend.vala" g_return_if_fail (pspec != NULL); -#line 209 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 209 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = pspec; -#line 209 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 209 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = _tmp0_->name; -#line 209 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 209 "/data/src/seahorse/gkr/gkr-backend.vala" if (g_strcmp0 (_tmp1_, "service") == 0) { -#line 210 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 210 "/data/src/seahorse/gkr/gkr-backend.vala" return; #line 1561 "gkr-backend.c" } -#line 211 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 211 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp2_ = self->priv->_initialized; -#line 211 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 211 "/data/src/seahorse/gkr/gkr-backend.vala" if (_tmp2_) { -#line 212 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 212 "/data/src/seahorse/gkr/gkr-backend.vala" return; #line 1569 "gkr-backend.c" } -#line 213 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 213 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp3_ = self->priv->_backend; -#line 213 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 213 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp4_ = seahorse_gkr_backend_get_service (_tmp3_); -#line 213 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 213 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp5_ = _tmp4_; -#line 213 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 213 "/data/src/seahorse/gkr/gkr-backend.vala" if (_tmp5_ == NULL) { -#line 214 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 214 "/data/src/seahorse/gkr/gkr-backend.vala" return; #line 1581 "gkr-backend.c" } -#line 216 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 216 "/data/src/seahorse/gkr/gkr-backend.vala" self->priv->_initialized = TRUE; -#line 217 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 217 "/data/src/seahorse/gkr/gkr-backend.vala" gtk_action_group_add_actions ((GtkActionGroup*) self, SEAHORSE_GKR_BACKEND_ACTIONS_BACKEND_ACTIONS, G_N_ELEMENTS (SEAHORSE_GKR_BACKEND_ACTIONS_BACKEND_ACTIONS), NULL); -#line 218 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 218 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_actions_register_definition ((SeahorseActions*) self, SEAHORSE_GKR_BACKEND_ACTIONS_BACKEND_UI); -#line 221 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 221 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp6_ = gtk_action_group_new ("gkr-generate"); -#line 221 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 221 "/data/src/seahorse/gkr/gkr-backend.vala" actions = _tmp6_; -#line 222 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 222 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp7_ = actions; -#line 222 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 222 "/data/src/seahorse/gkr/gkr-backend.vala" gtk_action_group_set_translation_domain (_tmp7_, GETTEXT_PACKAGE); -#line 223 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 223 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp8_ = actions; -#line 223 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 223 "/data/src/seahorse/gkr/gkr-backend.vala" gtk_action_group_add_actions (_tmp8_, SEAHORSE_GKR_BACKEND_ACTIONS_ENTRIES_NEW, G_N_ELEMENTS (SEAHORSE_GKR_BACKEND_ACTIONS_ENTRIES_NEW), NULL); -#line 224 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 224 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp9_ = actions; -#line 224 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 224 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_registry_register_object ((GObject*) _tmp9_, "generator"); -#line 208 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 208 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (actions); #line 1607 "gkr-backend.c" } static void __seahorse_gkr_backend_actions___lambda12__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { -#line 208 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 208 "/data/src/seahorse/gkr/gkr-backend.vala" _seahorse_gkr_backend_actions___lambda12_ (self, pspec); #line 1614 "gkr-backend.c" } @@ -1624,51 +1624,51 @@ SeahorseGkrBackendActions * self; SeahorseGkrBackend* _tmp0_ = NULL; SeahorseGkrBackend* _tmp1_ = NULL; -#line 204 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 204 "/data/src/seahorse/gkr/gkr-backend.vala" parent_class = G_OBJECT_CLASS (seahorse_gkr_backend_actions_parent_class); -#line 204 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 204 "/data/src/seahorse/gkr/gkr-backend.vala" obj = parent_class->constructor (type, n_construct_properties, construct_properties); -#line 204 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 204 "/data/src/seahorse/gkr/gkr-backend.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_GKR_TYPE_BACKEND_ACTIONS, SeahorseGkrBackendActions); -#line 205 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 205 "/data/src/seahorse/gkr/gkr-backend.vala" self->priv->_initialized = FALSE; -#line 206 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 206 "/data/src/seahorse/gkr/gkr-backend.vala" gtk_action_group_set_translation_domain ((GtkActionGroup*) self, GETTEXT_PACKAGE); -#line 208 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 208 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp0_ = self->priv->_backend; -#line 208 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 208 "/data/src/seahorse/gkr/gkr-backend.vala" g_signal_connect_object ((GObject*) _tmp0_, "notify", (GCallback) __seahorse_gkr_backend_actions___lambda12__g_object_notify, self, G_CONNECT_AFTER); -#line 227 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 227 "/data/src/seahorse/gkr/gkr-backend.vala" _tmp1_ = self->priv->_backend; -#line 227 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 227 "/data/src/seahorse/gkr/gkr-backend.vala" g_object_notify ((GObject*) _tmp1_, "service"); -#line 204 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 204 "/data/src/seahorse/gkr/gkr-backend.vala" return obj; #line 1644 "gkr-backend.c" } static void seahorse_gkr_backend_actions_class_init (SeahorseGkrBackendActionsClass * klass) { -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_gkr_backend_actions_parent_class = g_type_class_peek_parent (klass); -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" g_type_class_add_private (klass, sizeof (SeahorseGkrBackendActionsPrivate)); -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" G_OBJECT_CLASS (klass)->get_property = _vala_seahorse_gkr_backend_actions_get_property; -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" G_OBJECT_CLASS (klass)->set_property = _vala_seahorse_gkr_backend_actions_set_property; -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" G_OBJECT_CLASS (klass)->constructor = seahorse_gkr_backend_actions_constructor; -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" G_OBJECT_CLASS (klass)->finalize = seahorse_gkr_backend_actions_finalize; -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_BACKEND_ACTIONS_BACKEND, g_param_spec_object ("backend", "backend", "backend", SEAHORSE_GKR_TYPE_BACKEND, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 1663 "gkr-backend.c" } static void seahorse_gkr_backend_actions_instance_init (SeahorseGkrBackendActions * self) { -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" self->priv = SEAHORSE_GKR_BACKEND_ACTIONS_GET_PRIVATE (self); #line 1670 "gkr-backend.c" } @@ -1676,11 +1676,11 @@ static void seahorse_gkr_backend_actions_finalize (GObject* obj) { SeahorseGkrBackendActions * self; -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_GKR_TYPE_BACKEND_ACTIONS, SeahorseGkrBackendActions); -#line 200 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 200 "/data/src/seahorse/gkr/gkr-backend.vala" _g_object_unref0 (self->priv->_backend); -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" G_OBJECT_CLASS (seahorse_gkr_backend_actions_parent_class)->finalize (obj); #line 1682 "gkr-backend.c" } @@ -1701,19 +1701,19 @@ static void _vala_seahorse_gkr_backend_actions_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { SeahorseGkrBackendActions * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEAHORSE_GKR_TYPE_BACKEND_ACTIONS, SeahorseGkrBackendActions); -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" switch (property_id) { -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" case SEAHORSE_GKR_BACKEND_ACTIONS_BACKEND: -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" g_value_set_object (value, seahorse_gkr_backend_actions_get_backend (self)); -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" break; #line 1709 "gkr-backend.c" default: -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" break; #line 1715 "gkr-backend.c" } @@ -1723,19 +1723,19 @@ static void _vala_seahorse_gkr_backend_actions_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { SeahorseGkrBackendActions * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEAHORSE_GKR_TYPE_BACKEND_ACTIONS, SeahorseGkrBackendActions); -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" switch (property_id) { -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" case SEAHORSE_GKR_BACKEND_ACTIONS_BACKEND: -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" seahorse_gkr_backend_actions_set_backend (self, g_value_get_object (value)); -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" break; #line 1731 "gkr-backend.c" default: -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 199 "/data/projects/seahorse/gkr/gkr-backend.vala" +#line 199 "/data/src/seahorse/gkr/gkr-backend.vala" break; #line 1737 "gkr-backend.c" } diff -Nru seahorse-3.10.1/gkr/gkr-dialogs.c seahorse-3.10.2/gkr/gkr-dialogs.c --- seahorse-3.10.1/gkr/gkr-dialogs.c 2013-07-24 15:11:31.000000000 +0000 +++ seahorse-3.10.2/gkr/gkr-dialogs.c 2014-01-08 15:13:22.000000000 +0000 @@ -1,4 +1,4 @@ -/* gkr-dialogs.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* gkr-dialogs.c generated by valac 0.22.1, the Vala compiler * generated from gkr-dialogs.vala, do not modify */ /* @@ -51,7 +51,7 @@ static gpointer _g_object_ref0 (gpointer self) { -#line 28 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 28 "/data/src/seahorse/gkr/gkr-dialogs.vala" return self ? g_object_ref (self) : NULL; #line 57 "gkr-dialogs.c" } @@ -71,79 +71,79 @@ GtkWidget* _tmp14_ = NULL; GdkWindow* _tmp15_ = NULL; GdkCursor* _tmp16_ = NULL; -#line 27 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 27 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_return_if_fail (widget != NULL); -#line 28 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 28 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp0_ = widget; -#line 28 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 28 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp1_ = g_object_get_data ((GObject*) _tmp0_, "gkr-request"); -#line 28 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 28 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp2_ = _g_object_ref0 ((GCancellable*) _tmp1_); -#line 28 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 28 "/data/src/seahorse/gkr/gkr-dialogs.vala" cancellable = _tmp2_; -#line 31 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 31 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp3_ = cancellable; -#line 31 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 31 "/data/src/seahorse/gkr/gkr-dialogs.vala" if (_tmp3_ == NULL) { #line 89 "gkr-dialogs.c" GtkWidget* _tmp4_ = NULL; GdkWindow* _tmp5_ = NULL; -#line 32 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 32 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp4_ = widget; -#line 32 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 32 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp5_ = gtk_widget_get_window (_tmp4_); -#line 32 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 32 "/data/src/seahorse/gkr/gkr-dialogs.vala" gdk_window_set_cursor (_tmp5_, NULL); -#line 33 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 33 "/data/src/seahorse/gkr/gkr-dialogs.vala" _g_object_unref0 (cancellable); -#line 33 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 33 "/data/src/seahorse/gkr/gkr-dialogs.vala" return; #line 102 "gkr-dialogs.c" } -#line 40 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 40 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp6_ = widget; -#line 40 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 40 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp7_ = g_object_get_data ((GObject*) _tmp6_, "wait-cursor"); -#line 40 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 40 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp8_ = _g_object_ref0 ((GdkCursor*) _tmp7_); -#line 40 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 40 "/data/src/seahorse/gkr/gkr-dialogs.vala" cursor = _tmp8_; -#line 41 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 41 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp9_ = cursor; -#line 41 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 41 "/data/src/seahorse/gkr/gkr-dialogs.vala" if (_tmp9_ == NULL) { #line 116 "gkr-dialogs.c" GdkCursor* _tmp10_ = NULL; GtkWidget* _tmp11_ = NULL; GdkCursor* _tmp12_ = NULL; GdkCursor* _tmp13_ = NULL; -#line 42 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 42 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp10_ = gdk_cursor_new (GDK_WATCH); -#line 42 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 42 "/data/src/seahorse/gkr/gkr-dialogs.vala" _g_object_unref0 (cursor); -#line 42 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 42 "/data/src/seahorse/gkr/gkr-dialogs.vala" cursor = _tmp10_; -#line 43 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 43 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp11_ = widget; -#line 43 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 43 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp12_ = cursor; -#line 43 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 43 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp13_ = _g_object_ref0 (_tmp12_); -#line 43 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 43 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_object_set_data_full ((GObject*) _tmp11_, "wait-cursor", _tmp13_, g_object_unref); #line 135 "gkr-dialogs.c" } -#line 47 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 47 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp14_ = widget; -#line 47 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 47 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp15_ = gtk_widget_get_window (_tmp14_); -#line 47 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 47 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp16_ = cursor; -#line 47 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 47 "/data/src/seahorse/gkr/gkr-dialogs.vala" gdk_window_set_cursor (_tmp15_, _tmp16_); -#line 27 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 27 "/data/src/seahorse/gkr/gkr-dialogs.vala" _g_object_unref0 (cursor); -#line 27 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 27 "/data/src/seahorse/gkr/gkr-dialogs.vala" _g_object_unref0 (cancellable); #line 149 "gkr-dialogs.c" } @@ -153,31 +153,31 @@ GCancellable* c = NULL; void* _tmp0_ = NULL; GCancellable* _tmp1_ = NULL; -#line 60 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 60 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp0_ = data; -#line 60 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 60 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_cancellable_get_type (), GCancellable)); -#line 60 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 60 "/data/src/seahorse/gkr/gkr-dialogs.vala" c = _tmp1_; -#line 61 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 61 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_cancellable_cancel (c); -#line 62 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 62 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_object_unref ((GObject*) c); -#line 59 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 59 "/data/src/seahorse/gkr/gkr-dialogs.vala" _g_object_unref0 (c); #line 169 "gkr-dialogs.c" } static void ___lambda6__gdestroy_notify (void* data) { -#line 59 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 59 "/data/src/seahorse/gkr/gkr-dialogs.vala" __lambda6_ (data); #line 176 "gkr-dialogs.c" } static void _seahorse_gkr_dialog_update_wait_cursor_gtk_widget_realize (GtkWidget* _sender, gpointer self) { -#line 68 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 68 "/data/src/seahorse/gkr/gkr-dialogs.vala" seahorse_gkr_dialog_update_wait_cursor (_sender); #line 183 "gkr-dialogs.c" } @@ -194,52 +194,52 @@ GtkWidget* _tmp5_ = NULL; gboolean _tmp6_ = FALSE; GtkWidget* _tmp9_ = NULL; -#line 50 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 50 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_return_val_if_fail (dialog != NULL, NULL); -#line 52 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 52 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp0_ = dialog; -#line 52 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 52 "/data/src/seahorse/gkr/gkr-dialogs.vala" seahorse_gkr_dialog_complete_request (_tmp0_, TRUE); -#line 58 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 58 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp1_ = g_cancellable_new (); -#line 58 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 58 "/data/src/seahorse/gkr/gkr-dialogs.vala" cancellable = _tmp1_; -#line 59 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 59 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp2_ = dialog; -#line 59 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 59 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp3_ = cancellable; -#line 59 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 59 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp4_ = g_object_ref ((GObject*) _tmp3_); -#line 59 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 59 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_object_set_data_full ((GObject*) _tmp2_, "gkr-request", _tmp4_, ___lambda6__gdestroy_notify); -#line 65 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 65 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp5_ = dialog; -#line 65 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 65 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp6_ = gtk_widget_get_realized (_tmp5_); -#line 65 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 65 "/data/src/seahorse/gkr/gkr-dialogs.vala" if (_tmp6_) { #line 222 "gkr-dialogs.c" GtkWidget* _tmp7_ = NULL; -#line 66 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 66 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp7_ = dialog; -#line 66 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 66 "/data/src/seahorse/gkr/gkr-dialogs.vala" seahorse_gkr_dialog_update_wait_cursor (_tmp7_); #line 228 "gkr-dialogs.c" } else { GtkWidget* _tmp8_ = NULL; -#line 68 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 68 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp8_ = dialog; -#line 68 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 68 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_signal_connect (_tmp8_, "realize", (GCallback) _seahorse_gkr_dialog_update_wait_cursor_gtk_widget_realize, NULL); #line 235 "gkr-dialogs.c" } -#line 70 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 70 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp9_ = dialog; -#line 70 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 70 "/data/src/seahorse/gkr/gkr-dialogs.vala" gtk_widget_set_sensitive (_tmp9_, FALSE); -#line 71 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 71 "/data/src/seahorse/gkr/gkr-dialogs.vala" result = cancellable; -#line 71 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 71 "/data/src/seahorse/gkr/gkr-dialogs.vala" return result; #line 245 "gkr-dialogs.c" } @@ -255,61 +255,61 @@ GtkWidget* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; GtkWidget* _tmp10_ = NULL; -#line 74 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 74 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_return_if_fail (dialog != NULL); -#line 75 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 75 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp0_ = dialog; -#line 75 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 75 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp1_ = g_object_steal_data ((GObject*) _tmp0_, "gkr-request"); -#line 75 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 75 "/data/src/seahorse/gkr/gkr-dialogs.vala" cancellable = (GCancellable*) _tmp1_; -#line 76 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 76 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp3_ = cancellable; -#line 76 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 76 "/data/src/seahorse/gkr/gkr-dialogs.vala" if (_tmp3_ != NULL) { #line 271 "gkr-dialogs.c" gboolean _tmp4_ = FALSE; -#line 76 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 76 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp4_ = cancel; -#line 76 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 76 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp2_ = _tmp4_; #line 277 "gkr-dialogs.c" } else { -#line 76 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 76 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp2_ = FALSE; #line 281 "gkr-dialogs.c" } -#line 76 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 76 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp5_ = _tmp2_; -#line 76 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 76 "/data/src/seahorse/gkr/gkr-dialogs.vala" if (_tmp5_) { #line 287 "gkr-dialogs.c" GCancellable* _tmp6_ = NULL; -#line 77 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 77 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp6_ = cancellable; -#line 77 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 77 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_cancellable_cancel (_tmp6_); #line 293 "gkr-dialogs.c" } -#line 78 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 78 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp7_ = dialog; -#line 78 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 78 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp8_ = gtk_widget_get_realized (_tmp7_); -#line 78 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 78 "/data/src/seahorse/gkr/gkr-dialogs.vala" if (_tmp8_) { #line 301 "gkr-dialogs.c" GtkWidget* _tmp9_ = NULL; -#line 79 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 79 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp9_ = dialog; -#line 79 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 79 "/data/src/seahorse/gkr/gkr-dialogs.vala" seahorse_gkr_dialog_update_wait_cursor (_tmp9_); #line 307 "gkr-dialogs.c" } -#line 80 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 80 "/data/src/seahorse/gkr/gkr-dialogs.vala" _tmp10_ = dialog; -#line 80 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 80 "/data/src/seahorse/gkr/gkr-dialogs.vala" gtk_widget_set_sensitive (_tmp10_, TRUE); -#line 74 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 74 "/data/src/seahorse/gkr/gkr-dialogs.vala" _g_object_unref0 (cancellable); #line 315 "gkr-dialogs.c" } @@ -317,32 +317,32 @@ SeahorseGkrDialog* seahorse_gkr_dialog_construct (GType object_type) { SeahorseGkrDialog* self = NULL; -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" self = (SeahorseGkrDialog*) g_type_create_instance (object_type); -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" return self; #line 325 "gkr-dialogs.c" } SeahorseGkrDialog* seahorse_gkr_dialog_new (void) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" return seahorse_gkr_dialog_construct (SEAHORSE_GKR_TYPE_DIALOG); #line 332 "gkr-dialogs.c" } static void seahorse_gkr_value_dialog_init (GValue* value) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" value->data[0].v_pointer = NULL; #line 339 "gkr-dialogs.c" } static void seahorse_gkr_value_dialog_free_value (GValue* value) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" if (value->data[0].v_pointer) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" seahorse_gkr_dialog_unref (value->data[0].v_pointer); #line 348 "gkr-dialogs.c" } @@ -350,13 +350,13 @@ static void seahorse_gkr_value_dialog_copy_value (const GValue* src_value, GValue* dest_value) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" if (src_value->data[0].v_pointer) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" dest_value->data[0].v_pointer = seahorse_gkr_dialog_ref (src_value->data[0].v_pointer); #line 358 "gkr-dialogs.c" } else { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" dest_value->data[0].v_pointer = NULL; #line 362 "gkr-dialogs.c" } @@ -364,37 +364,37 @@ static gpointer seahorse_gkr_value_dialog_peek_pointer (const GValue* value) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" return value->data[0].v_pointer; #line 370 "gkr-dialogs.c" } static gchar* seahorse_gkr_value_dialog_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" if (collect_values[0].v_pointer) { #line 377 "gkr-dialogs.c" SeahorseGkrDialog* object; object = collect_values[0].v_pointer; -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" if (object->parent_instance.g_class == NULL) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); #line 384 "gkr-dialogs.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.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 388 "gkr-dialogs.c" } -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" value->data[0].v_pointer = seahorse_gkr_dialog_ref (object); #line 392 "gkr-dialogs.c" } else { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" value->data[0].v_pointer = NULL; #line 396 "gkr-dialogs.c" } -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" return NULL; #line 400 "gkr-dialogs.c" } @@ -403,27 +403,27 @@ static gchar* seahorse_gkr_value_dialog_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { SeahorseGkrDialog** object_p; object_p = collect_values[0].v_pointer; -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" if (!object_p) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); #line 411 "gkr-dialogs.c" } -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" if (!value->data[0].v_pointer) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" *object_p = NULL; #line 417 "gkr-dialogs.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" *object_p = value->data[0].v_pointer; #line 421 "gkr-dialogs.c" } else { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" *object_p = seahorse_gkr_dialog_ref (value->data[0].v_pointer); #line 425 "gkr-dialogs.c" } -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" return NULL; #line 429 "gkr-dialogs.c" } @@ -431,22 +431,22 @@ GParamSpec* seahorse_gkr_param_spec_dialog (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { SeahorseGkrParamSpecDialog* spec; -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_return_val_if_fail (g_type_is_a (object_type, SEAHORSE_GKR_TYPE_DIALOG), NULL); -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags); -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" G_PARAM_SPEC (spec)->value_type = object_type; -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" return G_PARAM_SPEC (spec); #line 443 "gkr-dialogs.c" } gpointer seahorse_gkr_value_get_dialog (const GValue* value) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SEAHORSE_GKR_TYPE_DIALOG), NULL); -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" return value->data[0].v_pointer; #line 452 "gkr-dialogs.c" } @@ -454,29 +454,29 @@ void seahorse_gkr_value_set_dialog (GValue* value, gpointer v_object) { SeahorseGkrDialog* old; -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SEAHORSE_GKR_TYPE_DIALOG)); -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" old = value->data[0].v_pointer; -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" if (v_object) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SEAHORSE_GKR_TYPE_DIALOG)); -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" value->data[0].v_pointer = v_object; -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" seahorse_gkr_dialog_ref (value->data[0].v_pointer); #line 472 "gkr-dialogs.c" } else { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" value->data[0].v_pointer = NULL; #line 476 "gkr-dialogs.c" } -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" if (old) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" seahorse_gkr_dialog_unref (old); #line 482 "gkr-dialogs.c" } @@ -485,27 +485,27 @@ void seahorse_gkr_value_take_dialog (GValue* value, gpointer v_object) { SeahorseGkrDialog* old; -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SEAHORSE_GKR_TYPE_DIALOG)); -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" old = value->data[0].v_pointer; -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" if (v_object) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, SEAHORSE_GKR_TYPE_DIALOG)); -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" value->data[0].v_pointer = v_object; #line 501 "gkr-dialogs.c" } else { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" value->data[0].v_pointer = NULL; #line 505 "gkr-dialogs.c" } -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" if (old) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" seahorse_gkr_dialog_unref (old); #line 511 "gkr-dialogs.c" } @@ -513,16 +513,16 @@ static void seahorse_gkr_dialog_class_init (SeahorseGkrDialogClass * klass) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" seahorse_gkr_dialog_parent_class = g_type_class_peek_parent (klass); -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" SEAHORSE_GKR_DIALOG_CLASS (klass)->finalize = seahorse_gkr_dialog_finalize; #line 521 "gkr-dialogs.c" } static void seahorse_gkr_dialog_instance_init (SeahorseGkrDialog * self) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" self->ref_count = 1; #line 528 "gkr-dialogs.c" } @@ -530,7 +530,7 @@ static void seahorse_gkr_dialog_finalize (SeahorseGkrDialog* obj) { SeahorseGkrDialog * self; -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_GKR_TYPE_DIALOG, SeahorseGkrDialog); #line 536 "gkr-dialogs.c" } @@ -553,9 +553,9 @@ gpointer seahorse_gkr_dialog_ref (gpointer instance) { SeahorseGkrDialog* self; self = instance; -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_atomic_int_inc (&self->ref_count); -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" return instance; #line 561 "gkr-dialogs.c" } @@ -564,11 +564,11 @@ void seahorse_gkr_dialog_unref (gpointer instance) { SeahorseGkrDialog* self; self = instance; -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" SEAHORSE_GKR_DIALOG_GET_CLASS (self)->finalize (self); -#line 25 "/data/projects/seahorse/gkr/gkr-dialogs.vala" +#line 25 "/data/src/seahorse/gkr/gkr-dialogs.vala" g_type_free_instance ((GTypeInstance *) self); #line 574 "gkr-dialogs.c" } diff -Nru seahorse-3.10.1/gkr/gkr-item-add.c seahorse-3.10.2/gkr/gkr-item-add.c --- seahorse-3.10.1/gkr/gkr-item-add.c 2013-07-24 15:11:32.000000000 +0000 +++ seahorse-3.10.2/gkr/gkr-item-add.c 2014-01-08 15:13:22.000000000 +0000 @@ -1,4 +1,4 @@ -/* gkr-item-add.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* gkr-item-add.c generated by valac 0.22.1, the Vala compiler * generated from gkr-item-add.vala, do not modify */ /* @@ -39,9 +39,9 @@ #define _g_free0(var) (var = (g_free (var), NULL)) #define _g_list_free0(var) ((var == NULL) ? NULL : (var = (g_list_free (var), NULL))) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) -#define __vala_SecretSchema_free0(var) ((var == NULL) ? NULL : (var = (_vala_SecretSchema_free (var), NULL))) +#define _secret_schema_unref0(var) ((var == NULL) ? NULL : (var = (secret_schema_unref (var), NULL))) #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL))) -#define __vala_SecretValue_free0(var) ((var == NULL) ? NULL : (var = (_vala_SecretValue_free (var), NULL))) +#define _secret_value_unref0(var) ((var == NULL) ? NULL : (var = (secret_value_unref (var), NULL))) struct _Block2Data { int _ref_count_; @@ -69,74 +69,72 @@ static void _g_free0_ (gpointer var); static void __lambda11_ (SeahorseGkrItemAdd* self, GObject* obj, GAsyncResult* res); static void ___lambda11__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); -static void _vala_SecretSchema_free (SecretSchema* self); -static void _vala_SecretValue_free (SecretValue* self); static void __seahorse_gkr_item_add___lambda10__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self); SeahorseGkrItemAdd* seahorse_gkr_item_add_construct (GType object_type, GtkWindow* parent) { SeahorseGkrItemAdd * self = NULL; GtkWindow* _tmp0_ = NULL; -#line 114 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 114 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp0_ = parent; -#line 114 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 114 "/data/src/seahorse/gkr/gkr-item-add.vala" self = (SeahorseGkrItemAdd*) g_object_new (object_type, "transient-for", _tmp0_, NULL); -#line 115 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 115 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_widget_show ((GtkWidget*) self); -#line 116 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 116 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_window_present ((GtkWindow*) self); -#line 113 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 113 "/data/src/seahorse/gkr/gkr-item-add.vala" return self; -#line 91 "gkr-item-add.c" +#line 89 "gkr-item-add.c" } SeahorseGkrItemAdd* seahorse_gkr_item_add_new (GtkWindow* parent) { -#line 113 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 113 "/data/src/seahorse/gkr/gkr-item-add.vala" return seahorse_gkr_item_add_construct (SEAHORSE_GKR_TYPE_ITEM_ADD, parent); -#line 98 "gkr-item-add.c" +#line 96 "gkr-item-add.c" } static Block2Data* block2_data_ref (Block2Data* _data2_) { -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" g_atomic_int_inc (&_data2_->_ref_count_); -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" return _data2_; -#line 107 "gkr-item-add.c" +#line 105 "gkr-item-add.c" } static void block2_data_unref (void * _userdata_) { Block2Data* _data2_; _data2_ = (Block2Data*) _userdata_; -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { -#line 116 "gkr-item-add.c" +#line 114 "gkr-item-add.c" SeahorseGkrItemAdd * self; -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" self = _data2_->self; -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_object_unref0 (_data2_->check); -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_object_unref0 (_data2_->entry); -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_object_unref0 (_data2_->label); -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_object_unref0 (_data2_->combo); -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_object_unref0 (self); -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" g_slice_free (Block2Data, _data2_); -#line 132 "gkr-item-add.c" +#line 130 "gkr-item-add.c" } } static gpointer _g_object_ref0 (gpointer self) { -#line 37 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 37 "/data/src/seahorse/gkr/gkr-item-add.vala" return self ? g_object_ref (self) : NULL; -#line 140 "gkr-item-add.c" +#line 138 "gkr-item-add.c" } @@ -147,32 +145,32 @@ const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; -#line 58 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 58 "/data/src/seahorse/gkr/gkr-item-add.vala" self = _data2_->self; -#line 58 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 58 "/data/src/seahorse/gkr/gkr-item-add.vala" g_return_if_fail (editable != NULL); -#line 59 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 59 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp0_ = _data2_->label; -#line 59 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 59 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp1_ = gtk_entry_get_text (_tmp0_); -#line 59 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 59 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp2_ = g_strdup (_tmp1_); -#line 59 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 59 "/data/src/seahorse/gkr/gkr-item-add.vala" value = _tmp2_; -#line 60 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 60 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp3_ = value; -#line 60 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 60 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_dialog_set_response_sensitive ((GtkDialog*) self, (gint) GTK_RESPONSE_ACCEPT, g_strcmp0 (_tmp3_, "") != 0); -#line 58 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 58 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_free0 (value); -#line 169 "gkr-item-add.c" +#line 167 "gkr-item-add.c" } static void __seahorse_gkr_item_add___lambda8__gtk_editable_changed (GtkEditable* _sender, gpointer self) { -#line 58 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 58 "/data/src/seahorse/gkr/gkr-item-add.vala" _seahorse_gkr_item_add___lambda8_ (self, _sender); -#line 176 "gkr-item-add.c" +#line 174 "gkr-item-add.c" } @@ -182,58 +180,58 @@ GtkToggleButton* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 71 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 71 "/data/src/seahorse/gkr/gkr-item-add.vala" self = _data2_->self; -#line 72 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 72 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp0_ = _data2_->entry; -#line 72 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 72 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp1_ = _data2_->check; -#line 72 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 72 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp2_ = gtk_toggle_button_get_active (_tmp1_); -#line 72 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 72 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp3_ = _tmp2_; -#line 72 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 72 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_entry_set_visibility (_tmp0_, _tmp3_); -#line 198 "gkr-item-add.c" +#line 196 "gkr-item-add.c" } static void __seahorse_gkr_item_add___lambda9__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) { -#line 71 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 71 "/data/src/seahorse/gkr/gkr-item-add.vala" _seahorse_gkr_item_add___lambda9_ (self); -#line 205 "gkr-item-add.c" +#line 203 "gkr-item-add.c" } static void _g_free0_ (gpointer var) { -#line 90 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 90 "/data/src/seahorse/gkr/gkr-item-add.vala" var = (g_free (var), NULL); -#line 212 "gkr-item-add.c" +#line 210 "gkr-item-add.c" } static void __lambda11_ (SeahorseGkrItemAdd* self, GObject* obj, GAsyncResult* res) { GError * _inner_error_ = NULL; -#line 97 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 97 "/data/src/seahorse/gkr/gkr-item-add.vala" g_return_if_fail (res != NULL); -#line 220 "gkr-item-add.c" +#line 218 "gkr-item-add.c" { GAsyncResult* _tmp0_ = NULL; SecretItem* _tmp1_ = NULL; SecretItem* _tmp2_ = NULL; -#line 100 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 100 "/data/src/seahorse/gkr/gkr-item-add.vala" seahorse_gkr_dialog_complete_request ((GtkWidget*) self, FALSE); -#line 102 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 102 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp0_ = res; -#line 102 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 102 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp1_ = secret_item_create_finish (_tmp0_, &_inner_error_); -#line 102 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 102 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp2_ = _tmp1_; -#line 102 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 102 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_object_unref0 (_tmp2_); -#line 102 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 102 "/data/src/seahorse/gkr/gkr-item-add.vala" if (_inner_error_ != NULL) { -#line 237 "gkr-item-add.c" +#line 235 "gkr-item-add.c" goto __catch7_g_error; } } @@ -244,59 +242,45 @@ const gchar* _tmp3_ = NULL; GError* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; -#line 98 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 98 "/data/src/seahorse/gkr/gkr-item-add.vala" err = _inner_error_; -#line 98 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 98 "/data/src/seahorse/gkr/gkr-item-add.vala" _inner_error_ = NULL; -#line 104 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 104 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp3_ = _ ("Couldn't add item"); -#line 104 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 104 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp4_ = err; -#line 104 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 104 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp5_ = _tmp4_->message; -#line 104 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 104 "/data/src/seahorse/gkr/gkr-item-add.vala" seahorse_util_show_error ((GtkWidget*) self, _tmp3_, _tmp5_); -#line 98 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 98 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_error_free0 (err); -#line 262 "gkr-item-add.c" +#line 260 "gkr-item-add.c" } __finally7: -#line 98 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 98 "/data/src/seahorse/gkr/gkr-item-add.vala" if (_inner_error_ != NULL) { -#line 98 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 98 "/data/src/seahorse/gkr/gkr-item-add.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 98 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 98 "/data/src/seahorse/gkr/gkr-item-add.vala" g_clear_error (&_inner_error_); -#line 98 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 98 "/data/src/seahorse/gkr/gkr-item-add.vala" return; -#line 273 "gkr-item-add.c" +#line 271 "gkr-item-add.c" } -#line 107 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 107 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_widget_destroy ((GtkWidget*) self); -#line 277 "gkr-item-add.c" +#line 275 "gkr-item-add.c" } static void ___lambda11__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 95 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 95 "/data/src/seahorse/gkr/gkr-item-add.vala" __lambda11_ (self, source_object, res); -#line 95 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 95 "/data/src/seahorse/gkr/gkr-item-add.vala" g_object_unref (self); -#line 286 "gkr-item-add.c" -} - - -static void _vala_SecretSchema_free (SecretSchema* self) { -#line 75 "/data/projects/seahorse/gkr/gkr-item-add.vala" - g_boxed_free (secret_schema_get_type (), self); -#line 293 "gkr-item-add.c" -} - - -static void _vala_SecretValue_free (SecretValue* self) { -#line 75 "/data/projects/seahorse/gkr/gkr-item-add.vala" - g_boxed_free (secret_value_get_type (), self); -#line 300 "gkr-item-add.c" +#line 284 "gkr-item-add.c" } @@ -331,98 +315,98 @@ const gchar* _tmp20_ = NULL; SecretValue* _tmp21_ = NULL; GCancellable* _tmp22_ = NULL; -#line 75 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 75 "/data/src/seahorse/gkr/gkr-item-add.vala" self = _data2_->self; -#line 76 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 76 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp0_ = resp; -#line 76 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 76 "/data/src/seahorse/gkr/gkr-item-add.vala" if (_tmp0_ != ((gint) GTK_RESPONSE_ACCEPT)) { -#line 77 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 77 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_widget_destroy ((GtkWidget*) self); -#line 78 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 78 "/data/src/seahorse/gkr/gkr-item-add.vala" return; -#line 345 "gkr-item-add.c" +#line 329 "gkr-item-add.c" } -#line 82 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 82 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp1_ = _data2_->combo; -#line 82 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 82 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp3_ = gtk_combo_box_get_active_iter (_tmp1_, &_tmp2_); -#line 82 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 82 "/data/src/seahorse/gkr/gkr-item-add.vala" iter = _tmp2_; -#line 82 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 82 "/data/src/seahorse/gkr/gkr-item-add.vala" if (!_tmp3_) { -#line 83 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 83 "/data/src/seahorse/gkr/gkr-item-add.vala" return; -#line 357 "gkr-item-add.c" +#line 341 "gkr-item-add.c" } -#line 86 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 86 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp4_ = _data2_->combo; -#line 86 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 86 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp5_ = gtk_combo_box_get_model (_tmp4_); -#line 86 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 86 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp6_ = _tmp5_; -#line 86 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 86 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp7_ = iter; -#line 86 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 86 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_tree_model_get (_tmp6_, &_tmp7_, 1, &collection, -1, -1); -#line 88 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 88 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp8_ = _data2_->entry; -#line 88 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 88 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp9_ = gtk_entry_get_text (_tmp8_); -#line 88 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 88 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp10_ = secret_value_new (_tmp9_, (gssize) (-1), "text/plain"); -#line 88 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 88 "/data/src/seahorse/gkr/gkr-item-add.vala" secret = _tmp10_; -#line 89 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 89 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp11_ = seahorse_gkr_dialog_begin_request ((GtkWidget*) self); -#line 89 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 89 "/data/src/seahorse/gkr/gkr-item-add.vala" cancellable = _tmp11_; -#line 90 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 90 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp12_ = g_str_hash; -#line 90 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 90 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp13_ = g_str_equal; -#line 90 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 90 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp14_ = g_hash_table_new_full (_tmp12_, _tmp13_, _g_free0_, _g_free0_); -#line 90 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 90 "/data/src/seahorse/gkr/gkr-item-add.vala" attributes = _tmp14_; -#line 93 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 93 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp15_ = secret_schema_new ("org.gnome.keyring.Note", SECRET_SCHEMA_NONE, NULL); -#line 93 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 93 "/data/src/seahorse/gkr/gkr-item-add.vala" schema = _tmp15_; -#line 95 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 95 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp16_ = collection; -#line 95 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 95 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp17_ = schema; -#line 95 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 95 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp18_ = attributes; -#line 95 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 95 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp19_ = _data2_->label; -#line 95 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 95 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp20_ = gtk_entry_get_text (_tmp19_); -#line 95 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 95 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp21_ = secret; -#line 95 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 95 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp22_ = cancellable; -#line 95 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 95 "/data/src/seahorse/gkr/gkr-item-add.vala" secret_item_create (_tmp16_, _tmp17_, _tmp18_, _tmp20_, _tmp21_, SECRET_ITEM_CREATE_NONE, _tmp22_, ___lambda11__gasync_ready_callback, g_object_ref (self)); -#line 75 "/data/projects/seahorse/gkr/gkr-item-add.vala" - __vala_SecretSchema_free0 (schema); -#line 75 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 75 "/data/src/seahorse/gkr/gkr-item-add.vala" + _secret_schema_unref0 (schema); +#line 75 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_hash_table_unref0 (attributes); -#line 75 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 75 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_object_unref0 (cancellable); -#line 75 "/data/projects/seahorse/gkr/gkr-item-add.vala" - __vala_SecretValue_free0 (secret); -#line 75 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 75 "/data/src/seahorse/gkr/gkr-item-add.vala" + _secret_value_unref0 (secret); +#line 75 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_object_unref0 (collection); -#line 419 "gkr-item-add.c" +#line 403 "gkr-item-add.c" } static void __seahorse_gkr_item_add___lambda10__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { -#line 75 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 75 "/data/src/seahorse/gkr/gkr-item-add.vala" _seahorse_gkr_item_add___lambda10_ (self, response_id); -#line 426 "gkr-item-add.c" +#line 410 "gkr-item-add.c" } @@ -471,93 +455,93 @@ GObject* _tmp46_ = NULL; GtkToggleButton* _tmp47_ = NULL; GtkToggleButton* _tmp48_ = NULL; -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" parent_class = G_OBJECT_CLASS (seahorse_gkr_item_add_parent_class); -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" obj = parent_class->constructor (type, n_construct_properties, construct_properties); -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_GKR_TYPE_ITEM_ADD, SeahorseGkrItemAdd); -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" _data2_ = g_slice_new0 (Block2Data); -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" _data2_->_ref_count_ = 1; -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" _data2_->self = g_object_ref (self); -#line 27 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp0_ = _ ("Add Password"); -#line 27 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_window_set_title ((GtkWindow*) self, _tmp0_); -#line 28 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 28 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_window_set_modal ((GtkWindow*) self, TRUE); -#line 29 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 29 "/data/src/seahorse/gkr/gkr-item-add.vala" g_object_set ((GtkWindow*) self, "window-position", GTK_WIN_POS_CENTER_ON_PARENT, NULL); -#line 30 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 30 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_container_set_border_width ((GtkContainer*) self, (guint) 5); -#line 32 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 32 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp1_ = seahorse_util_load_built_contents ((GtkContainer*) self, "gkr-add-item"); -#line 32 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 32 "/data/src/seahorse/gkr/gkr-item-add.vala" builder = _tmp1_; -#line 33 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 33 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_dialog_add_buttons ((GtkDialog*) self, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); -#line 37 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 37 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp2_ = builder; -#line 37 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 37 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp3_ = gtk_builder_get_object (_tmp2_, "item-keyring"); -#line 37 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 37 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_COMBO_BOX, GtkComboBox)); -#line 37 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 37 "/data/src/seahorse/gkr/gkr-item-add.vala" _data2_->combo = _tmp4_; -#line 38 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 38 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp5_ = gtk_list_store_new (2, G_TYPE_STRING, secret_collection_get_type ()); -#line 38 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 38 "/data/src/seahorse/gkr/gkr-item-add.vala" store = _tmp5_; -#line 39 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 39 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp6_ = _data2_->combo; -#line 39 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 39 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp7_ = store; -#line 39 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 39 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_combo_box_set_model (_tmp6_, (GtkTreeModel*) _tmp7_); -#line 41 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 41 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp8_ = (GtkCellRendererText*) gtk_cell_renderer_text_new (); -#line 41 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 41 "/data/src/seahorse/gkr/gkr-item-add.vala" g_object_ref_sink (_tmp8_); -#line 41 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 41 "/data/src/seahorse/gkr/gkr-item-add.vala" cell = _tmp8_; -#line 42 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 42 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp9_ = _data2_->combo; -#line 42 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 42 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp10_ = cell; -#line 42 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 42 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_cell_layout_pack_start ((GtkCellLayout*) _tmp9_, (GtkCellRenderer*) _tmp10_, TRUE); -#line 43 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 43 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp11_ = _data2_->combo; -#line 43 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 43 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp12_ = cell; -#line 43 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 43 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_cell_layout_add_attribute ((GtkCellLayout*) _tmp11_, (GtkCellRenderer*) _tmp12_, "text", 0); -#line 45 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 45 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp13_ = seahorse_gkr_backend_instance (); -#line 45 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 45 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp14_ = _tmp13_; -#line 45 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 45 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp15_ = seahorse_gkr_backend_get_keyrings (_tmp14_); -#line 45 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 45 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp16_ = _tmp15_; -#line 45 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 45 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_object_unref0 (_tmp14_); -#line 549 "gkr-item-add.c" +#line 533 "gkr-item-add.c" { GList* keyring_collection = NULL; GList* keyring_it = NULL; -#line 45 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 45 "/data/src/seahorse/gkr/gkr-item-add.vala" keyring_collection = _tmp16_; -#line 45 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 45 "/data/src/seahorse/gkr/gkr-item-add.vala" for (keyring_it = keyring_collection; keyring_it != NULL; keyring_it = keyring_it->next) { -#line 557 "gkr-item-add.c" +#line 541 "gkr-item-add.c" SeahorseGkrKeyring* keyring = NULL; -#line 45 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 45 "/data/src/seahorse/gkr/gkr-item-add.vala" keyring = (SeahorseGkrKeyring*) keyring_it->data; -#line 561 "gkr-item-add.c" +#line 545 "gkr-item-add.c" { GtkTreeIter iter = {0}; GtkListStore* _tmp17_ = NULL; @@ -572,143 +556,143 @@ SeahorseGkrKeyring* _tmp26_ = NULL; gboolean _tmp27_ = FALSE; gboolean _tmp28_ = FALSE; -#line 47 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 47 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp17_ = store; -#line 47 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 47 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_list_store_append (_tmp17_, &_tmp18_); -#line 47 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 47 "/data/src/seahorse/gkr/gkr-item-add.vala" iter = _tmp18_; -#line 48 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 48 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp19_ = store; -#line 48 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 48 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp20_ = iter; -#line 48 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 48 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp21_ = keyring; -#line 48 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 48 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp22_ = seahorse_place_get_label ((SeahorsePlace*) _tmp21_); -#line 48 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 48 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp23_ = _tmp22_; -#line 48 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 48 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp24_ = _tmp23_; -#line 48 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 48 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp25_ = keyring; -#line 48 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 48 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_list_store_set (_tmp19_, &_tmp20_, 0, _tmp24_, 1, _tmp25_, -1, -1); -#line 48 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 48 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_free0 (_tmp24_); -#line 52 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp26_ = keyring; -#line 52 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp27_ = seahorse_gkr_keyring_get_is_default (_tmp26_); -#line 52 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp28_ = _tmp27_; -#line 52 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item-add.vala" if (_tmp28_) { -#line 608 "gkr-item-add.c" +#line 592 "gkr-item-add.c" GtkComboBox* _tmp29_ = NULL; GtkTreeIter _tmp30_ = {0}; -#line 53 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 53 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp29_ = _data2_->combo; -#line 53 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 53 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp30_ = iter; -#line 53 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 53 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_combo_box_set_active_iter (_tmp29_, &_tmp30_); -#line 617 "gkr-item-add.c" +#line 601 "gkr-item-add.c" } } } -#line 45 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 45 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_list_free0 (keyring_collection); -#line 623 "gkr-item-add.c" +#line 607 "gkr-item-add.c" } -#line 56 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 56 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp31_ = builder; -#line 56 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 56 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp32_ = gtk_builder_get_object (_tmp31_, "item-label"); -#line 56 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 56 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp33_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, GTK_TYPE_ENTRY, GtkEntry)); -#line 56 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 56 "/data/src/seahorse/gkr/gkr-item-add.vala" _data2_->label = _tmp33_; -#line 57 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 57 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_dialog_set_response_sensitive ((GtkDialog*) self, (gint) GTK_RESPONSE_ACCEPT, FALSE); -#line 58 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 58 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp34_ = _data2_->label; -#line 58 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 58 "/data/src/seahorse/gkr/gkr-item-add.vala" g_signal_connect_data ((GtkEditable*) _tmp34_, "changed", (GCallback) __seahorse_gkr_item_add___lambda8__gtk_editable_changed, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0); -#line 63 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 63 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp35_ = builder; -#line 63 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 63 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp36_ = gtk_builder_get_object (_tmp35_, "password-area"); -#line 63 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 63 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GTK_TYPE_CONTAINER, GtkContainer)); -#line 63 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 63 "/data/src/seahorse/gkr/gkr-item-add.vala" area = _tmp37_; -#line 64 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 64 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp38_ = (GcrSecureEntryBuffer*) gcr_secure_entry_buffer_new (); -#line 64 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 64 "/data/src/seahorse/gkr/gkr-item-add.vala" buffer = _tmp38_; -#line 65 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 65 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp39_ = buffer; -#line 65 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 65 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp40_ = (GtkEntry*) gtk_entry_new_with_buffer ((GtkEntryBuffer*) _tmp39_); -#line 65 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 65 "/data/src/seahorse/gkr/gkr-item-add.vala" g_object_ref_sink (_tmp40_); -#line 65 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 65 "/data/src/seahorse/gkr/gkr-item-add.vala" _data2_->entry = _tmp40_; -#line 66 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 66 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp41_ = _data2_->entry; -#line 66 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 66 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_entry_set_visibility (_tmp41_, FALSE); -#line 67 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 67 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp42_ = area; -#line 67 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 67 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp43_ = _data2_->entry; -#line 67 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 67 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_container_add (_tmp42_, (GtkWidget*) _tmp43_); -#line 68 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 68 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp44_ = _data2_->entry; -#line 68 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 68 "/data/src/seahorse/gkr/gkr-item-add.vala" gtk_widget_show ((GtkWidget*) _tmp44_); -#line 70 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 70 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp45_ = builder; -#line 70 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 70 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp46_ = gtk_builder_get_object (_tmp45_, "show-password"); -#line 70 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 70 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp47_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GTK_TYPE_TOGGLE_BUTTON, GtkToggleButton)); -#line 70 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 70 "/data/src/seahorse/gkr/gkr-item-add.vala" _data2_->check = _tmp47_; -#line 71 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 71 "/data/src/seahorse/gkr/gkr-item-add.vala" _tmp48_ = _data2_->check; -#line 71 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 71 "/data/src/seahorse/gkr/gkr-item-add.vala" g_signal_connect_data (_tmp48_, "toggled", (GCallback) __seahorse_gkr_item_add___lambda9__gtk_toggle_button_toggled, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0); -#line 75 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 75 "/data/src/seahorse/gkr/gkr-item-add.vala" g_signal_connect_data ((GtkDialog*) self, "response", (GCallback) __seahorse_gkr_item_add___lambda10__gtk_dialog_response, block2_data_ref (_data2_), (GClosureNotify) block2_data_unref, 0); -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_object_unref0 (buffer); -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_object_unref0 (area); -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_object_unref0 (cell); -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_object_unref0 (store); -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" _g_object_unref0 (builder); -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" block2_data_unref (_data2_); -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" _data2_ = NULL; -#line 26 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-add.vala" return obj; -#line 703 "gkr-item-add.c" +#line 687 "gkr-item-add.c" } static void seahorse_gkr_item_add_class_init (SeahorseGkrItemAddClass * klass) { -#line 25 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 25 "/data/src/seahorse/gkr/gkr-item-add.vala" seahorse_gkr_item_add_parent_class = g_type_class_peek_parent (klass); -#line 25 "/data/projects/seahorse/gkr/gkr-item-add.vala" +#line 25 "/data/src/seahorse/gkr/gkr-item-add.vala" G_OBJECT_CLASS (klass)->constructor = seahorse_gkr_item_add_constructor; -#line 712 "gkr-item-add.c" +#line 696 "gkr-item-add.c" } diff -Nru seahorse-3.10.1/gkr/gkr-item-properties.c seahorse-3.10.2/gkr/gkr-item-properties.c --- seahorse-3.10.1/gkr/gkr-item-properties.c 2013-07-24 15:11:32.000000000 +0000 +++ seahorse-3.10.2/gkr/gkr-item-properties.c 2014-01-08 15:13:22.000000000 +0000 @@ -1,4 +1,4 @@ -/* gkr-item-properties.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* gkr-item-properties.c generated by valac 0.22.1, the Vala compiler * generated from gkr-item-properties.vala, do not modify */ /* @@ -42,7 +42,7 @@ #define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL))) #define _g_string_free0(var) ((var == NULL) ? NULL : (var = (g_string_free (var, TRUE), NULL))) #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL))) -#define __vala_SecretValue_free0(var) ((var == NULL) ? NULL : (var = (_vala_SecretValue_free (var), NULL))) +#define _secret_value_unref0(var) ((var == NULL) ? NULL : (var = (secret_value_unref (var), NULL))) typedef struct _Block3Data Block3Data; typedef struct _Block4Data Block4Data; @@ -87,7 +87,6 @@ static void __lambda19_ (SeahorseGkrItemProperties* self, GObject* obj, GAsyncResult* res); static void seahorse_gkr_item_properties_password_display (SeahorseGkrItemProperties* self); static void ___lambda19__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); -static void _vala_SecretValue_free (SecretValue* self); static void seahorse_gkr_item_properties_description_activate (SeahorseGkrItemProperties* self, GtkEntry* description); static Block3Data* block3_data_ref (Block3Data* _data3_); static void block3_data_unref (void * _userdata_); @@ -123,35 +122,35 @@ SeahorseGkrItem* _tmp0_ = NULL; GtkWindow* _tmp1_ = NULL; SeahorseGkrItem* _tmp2_ = NULL; -#line 125 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 125 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_val_if_fail (item != NULL, NULL); -#line 127 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 127 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = item; -#line 127 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 127 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp1_ = parent; -#line 127 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 127 "/data/src/seahorse/gkr/gkr-item-properties.vala" self = (SeahorseGkrItemProperties*) g_object_new (object_type, "item", _tmp0_, "transient-for", _tmp1_, NULL); -#line 132 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 132 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp2_ = item; -#line 132 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 132 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_refresh (_tmp2_); -#line 125 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 125 "/data/src/seahorse/gkr/gkr-item-properties.vala" return self; -#line 141 "gkr-item-properties.c" +#line 140 "gkr-item-properties.c" } SeahorseGkrItemProperties* seahorse_gkr_item_properties_new (SeahorseGkrItem* item, GtkWindow* parent) { -#line 125 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 125 "/data/src/seahorse/gkr/gkr-item-properties.vala" return seahorse_gkr_item_properties_construct (SEAHORSE_GKR_TYPE_ITEM_PROPERTIES, item, parent); -#line 148 "gkr-item-properties.c" +#line 147 "gkr-item-properties.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 136 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 136 "/data/src/seahorse/gkr/gkr-item-properties.vala" return self ? g_object_ref (self) : NULL; -#line 155 "gkr-item-properties.c" +#line 154 "gkr-item-properties.c" } @@ -163,119 +162,119 @@ SeahorseGkrItem* _tmp3_ = NULL; SeahorseGkrUse _tmp4_ = 0; SeahorseGkrUse _tmp5_ = 0; -#line 135 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 135 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_if_fail (self != NULL); -#line 136 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 136 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = self->priv->_builder; -#line 136 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 136 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp1_ = gtk_builder_get_object (_tmp0_, "use-field"); -#line 136 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 136 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_LABEL, GtkLabel)); -#line 136 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 136 "/data/src/seahorse/gkr/gkr-item-properties.vala" use = _tmp2_; -#line 137 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 137 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp3_ = self->priv->_item; -#line 137 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 137 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp4_ = seahorse_gkr_item_get_use (_tmp3_); -#line 137 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 137 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp5_ = _tmp4_; -#line 137 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 137 "/data/src/seahorse/gkr/gkr-item-properties.vala" switch (_tmp5_) { -#line 137 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 137 "/data/src/seahorse/gkr/gkr-item-properties.vala" case SEAHORSE_GKR_USE_NETWORK: -#line 187 "gkr-item-properties.c" +#line 186 "gkr-item-properties.c" { GtkLabel* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; -#line 139 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 139 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp6_ = use; -#line 139 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 139 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp7_ = _ ("Access a network share or resource"); -#line 139 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 139 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_label_set_label (_tmp6_, _tmp7_); -#line 140 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 140 "/data/src/seahorse/gkr/gkr-item-properties.vala" break; -#line 199 "gkr-item-properties.c" +#line 198 "gkr-item-properties.c" } -#line 137 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 137 "/data/src/seahorse/gkr/gkr-item-properties.vala" case SEAHORSE_GKR_USE_WEB: -#line 203 "gkr-item-properties.c" +#line 202 "gkr-item-properties.c" { GtkLabel* _tmp8_ = NULL; const gchar* _tmp9_ = NULL; -#line 142 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 142 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp8_ = use; -#line 142 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 142 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp9_ = _ ("Access a website"); -#line 142 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 142 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_label_set_label (_tmp8_, _tmp9_); -#line 143 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 143 "/data/src/seahorse/gkr/gkr-item-properties.vala" break; -#line 215 "gkr-item-properties.c" +#line 214 "gkr-item-properties.c" } -#line 137 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 137 "/data/src/seahorse/gkr/gkr-item-properties.vala" case SEAHORSE_GKR_USE_PGP: -#line 219 "gkr-item-properties.c" +#line 218 "gkr-item-properties.c" { GtkLabel* _tmp10_ = NULL; const gchar* _tmp11_ = NULL; -#line 145 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 145 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp10_ = use; -#line 145 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 145 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp11_ = _ ("Unlocks a PGP key"); -#line 145 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 145 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_label_set_label (_tmp10_, _tmp11_); -#line 146 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 146 "/data/src/seahorse/gkr/gkr-item-properties.vala" break; -#line 231 "gkr-item-properties.c" +#line 230 "gkr-item-properties.c" } -#line 137 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 137 "/data/src/seahorse/gkr/gkr-item-properties.vala" case SEAHORSE_GKR_USE_SSH: -#line 235 "gkr-item-properties.c" +#line 234 "gkr-item-properties.c" { GtkLabel* _tmp12_ = NULL; const gchar* _tmp13_ = NULL; -#line 148 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 148 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp12_ = use; -#line 148 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 148 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp13_ = _ ("Unlocks a Secure Shell key"); -#line 148 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 148 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_label_set_label (_tmp12_, _tmp13_); -#line 149 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 149 "/data/src/seahorse/gkr/gkr-item-properties.vala" break; -#line 247 "gkr-item-properties.c" +#line 246 "gkr-item-properties.c" } -#line 137 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 137 "/data/src/seahorse/gkr/gkr-item-properties.vala" case SEAHORSE_GKR_USE_OTHER: -#line 251 "gkr-item-properties.c" +#line 250 "gkr-item-properties.c" { GtkLabel* _tmp14_ = NULL; const gchar* _tmp15_ = NULL; -#line 151 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 151 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp14_ = use; -#line 151 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 151 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp15_ = _ ("Saved password or login"); -#line 151 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 151 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_label_set_label (_tmp14_, _tmp15_); -#line 152 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 152 "/data/src/seahorse/gkr/gkr-item-properties.vala" break; -#line 263 "gkr-item-properties.c" +#line 262 "gkr-item-properties.c" } default: { GtkLabel* _tmp16_ = NULL; -#line 154 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 154 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp16_ = use; -#line 154 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 154 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_label_set_label (_tmp16_, ""); -#line 155 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 155 "/data/src/seahorse/gkr/gkr-item-properties.vala" break; -#line 274 "gkr-item-properties.c" +#line 273 "gkr-item-properties.c" } } -#line 135 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 135 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (use); -#line 279 "gkr-item-properties.c" +#line 278 "gkr-item-properties.c" } @@ -287,77 +286,77 @@ SeahorseGkrItem* _tmp3_ = NULL; SeahorseGkrUse _tmp4_ = 0; SeahorseGkrUse _tmp5_ = 0; -#line 159 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 159 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_if_fail (self != NULL); -#line 160 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 160 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = self->priv->_builder; -#line 160 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 160 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp1_ = gtk_builder_get_object (_tmp0_, "type-field"); -#line 160 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 160 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_LABEL, GtkLabel)); -#line 160 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 160 "/data/src/seahorse/gkr/gkr-item-properties.vala" type = _tmp2_; -#line 161 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 161 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp3_ = self->priv->_item; -#line 161 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 161 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp4_ = seahorse_gkr_item_get_use (_tmp3_); -#line 161 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 161 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp5_ = _tmp4_; -#line 161 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 161 "/data/src/seahorse/gkr/gkr-item-properties.vala" switch (_tmp5_) { -#line 161 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 161 "/data/src/seahorse/gkr/gkr-item-properties.vala" case SEAHORSE_GKR_USE_NETWORK: -#line 161 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 161 "/data/src/seahorse/gkr/gkr-item-properties.vala" case SEAHORSE_GKR_USE_WEB: -#line 313 "gkr-item-properties.c" +#line 312 "gkr-item-properties.c" { GtkLabel* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; -#line 164 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 164 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp6_ = type; -#line 164 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 164 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp7_ = _ ("Network Credentials"); -#line 164 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 164 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_label_set_label (_tmp6_, _tmp7_); -#line 165 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 165 "/data/src/seahorse/gkr/gkr-item-properties.vala" break; -#line 325 "gkr-item-properties.c" +#line 324 "gkr-item-properties.c" } -#line 161 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 161 "/data/src/seahorse/gkr/gkr-item-properties.vala" case SEAHORSE_GKR_USE_PGP: -#line 161 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 161 "/data/src/seahorse/gkr/gkr-item-properties.vala" case SEAHORSE_GKR_USE_SSH: -#line 161 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 161 "/data/src/seahorse/gkr/gkr-item-properties.vala" case SEAHORSE_GKR_USE_OTHER: -#line 333 "gkr-item-properties.c" +#line 332 "gkr-item-properties.c" { GtkLabel* _tmp8_ = NULL; const gchar* _tmp9_ = NULL; -#line 169 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 169 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp8_ = type; -#line 169 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 169 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp9_ = _ ("Password"); -#line 169 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 169 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_label_set_label (_tmp8_, _tmp9_); -#line 170 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 170 "/data/src/seahorse/gkr/gkr-item-properties.vala" break; -#line 345 "gkr-item-properties.c" +#line 344 "gkr-item-properties.c" } default: { GtkLabel* _tmp10_ = NULL; -#line 172 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 172 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp10_ = type; -#line 172 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 172 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_label_set_label (_tmp10_, ""); -#line 173 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 173 "/data/src/seahorse/gkr/gkr-item-properties.vala" break; -#line 356 "gkr-item-properties.c" +#line 355 "gkr-item-properties.c" } } -#line 159 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 159 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (type); -#line 361 "gkr-item-properties.c" +#line 360 "gkr-item-properties.c" } @@ -378,60 +377,60 @@ GObject* _tmp12_ = NULL; GtkBuilder* _tmp13_ = NULL; GObject* _tmp14_ = NULL; -#line 177 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 177 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_if_fail (self != NULL); -#line 178 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 178 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = self->priv->_item; -#line 178 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 178 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp1_ = seahorse_gkr_item_get_use (_tmp0_); -#line 178 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 178 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp2_ = _tmp1_; -#line 178 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 178 "/data/src/seahorse/gkr/gkr-item-properties.vala" use = _tmp2_; -#line 179 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 179 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp4_ = use; -#line 179 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 179 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (_tmp4_ == SEAHORSE_GKR_USE_NETWORK) { -#line 179 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 179 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp3_ = TRUE; -#line 398 "gkr-item-properties.c" +#line 397 "gkr-item-properties.c" } else { SeahorseGkrUse _tmp5_ = 0; -#line 179 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 179 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp5_ = use; -#line 179 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 179 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp3_ = _tmp5_ == SEAHORSE_GKR_USE_WEB; -#line 405 "gkr-item-properties.c" +#line 404 "gkr-item-properties.c" } -#line 179 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 179 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp6_ = _tmp3_; -#line 179 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 179 "/data/src/seahorse/gkr/gkr-item-properties.vala" visible = _tmp6_; -#line 180 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 180 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp7_ = self->priv->_builder; -#line 180 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 180 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp8_ = gtk_builder_get_object (_tmp7_, "server-label"); -#line 180 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 180 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_object_set (_tmp8_, "visible", visible, NULL); -#line 181 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 181 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp9_ = self->priv->_builder; -#line 181 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 181 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp10_ = gtk_builder_get_object (_tmp9_, "server-field"); -#line 181 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 181 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_object_set (_tmp10_, "visible", visible, NULL); -#line 182 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 182 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp11_ = self->priv->_builder; -#line 182 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 182 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp12_ = gtk_builder_get_object (_tmp11_, "login-label"); -#line 182 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 182 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_object_set (_tmp12_, "visible", visible, NULL); -#line 183 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 183 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp13_ = self->priv->_builder; -#line 183 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 183 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp14_ = gtk_builder_get_object (_tmp13_, "login-field"); -#line 183 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 183 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_object_set (_tmp14_, "visible", visible, NULL); -#line 435 "gkr-item-properties.c" +#line 434 "gkr-item-properties.c" } @@ -446,47 +445,47 @@ const gchar* _tmp5_ = NULL; GtkLabel* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; -#line 186 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 186 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_if_fail (self != NULL); -#line 187 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 187 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = self->priv->_builder; -#line 187 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 187 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp1_ = gtk_builder_get_object (_tmp0_, "server-label"); -#line 187 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 187 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_LABEL, GtkLabel)); -#line 187 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 187 "/data/src/seahorse/gkr/gkr-item-properties.vala" server = _tmp2_; -#line 188 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 188 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp3_ = self->priv->_item; -#line 188 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 188 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp4_ = seahorse_gkr_item_get_attribute (_tmp3_, "server"); -#line 188 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 188 "/data/src/seahorse/gkr/gkr-item-properties.vala" value = _tmp4_; -#line 189 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 189 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp5_ = value; -#line 189 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 189 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (_tmp5_ == NULL) { -#line 470 "gkr-item-properties.c" +#line 469 "gkr-item-properties.c" gchar* _tmp6_ = NULL; -#line 190 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 190 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp6_ = g_strdup (""); -#line 190 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 190 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_free0 (value); -#line 190 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 190 "/data/src/seahorse/gkr/gkr-item-properties.vala" value = _tmp6_; -#line 478 "gkr-item-properties.c" +#line 477 "gkr-item-properties.c" } -#line 191 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 191 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp7_ = server; -#line 191 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 191 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp8_ = value; -#line 191 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 191 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_label_set_label (_tmp7_, _tmp8_); -#line 186 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 186 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_free0 (value); -#line 186 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 186 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (server); -#line 490 "gkr-item-properties.c" +#line 489 "gkr-item-properties.c" } @@ -501,47 +500,47 @@ const gchar* _tmp5_ = NULL; GtkLabel* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; -#line 194 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 194 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_if_fail (self != NULL); -#line 195 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 195 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = self->priv->_builder; -#line 195 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 195 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp1_ = gtk_builder_get_object (_tmp0_, "login-label"); -#line 195 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 195 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_LABEL, GtkLabel)); -#line 195 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 195 "/data/src/seahorse/gkr/gkr-item-properties.vala" login = _tmp2_; -#line 196 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 196 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp3_ = self->priv->_item; -#line 196 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 196 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp4_ = seahorse_gkr_item_get_attribute (_tmp3_, "user"); -#line 196 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 196 "/data/src/seahorse/gkr/gkr-item-properties.vala" value = _tmp4_; -#line 197 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 197 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp5_ = value; -#line 197 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 197 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (_tmp5_ == NULL) { -#line 525 "gkr-item-properties.c" +#line 524 "gkr-item-properties.c" gchar* _tmp6_ = NULL; -#line 198 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 198 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp6_ = g_strdup (""); -#line 198 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 198 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_free0 (value); -#line 198 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 198 "/data/src/seahorse/gkr/gkr-item-properties.vala" value = _tmp6_; -#line 533 "gkr-item-properties.c" +#line 532 "gkr-item-properties.c" } -#line 199 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 199 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp7_ = login; -#line 199 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 199 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp8_ = value; -#line 199 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 199 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_label_set_label (_tmp7_, _tmp8_); -#line 194 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 194 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_free0 (value); -#line 194 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 194 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (login); -#line 545 "gkr-item-properties.c" +#line 544 "gkr-item-properties.c" } @@ -562,27 +561,27 @@ GtkLabel* _tmp25_ = NULL; GString* _tmp26_ = NULL; const gchar* _tmp27_ = NULL; -#line 202 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 202 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_if_fail (self != NULL); -#line 203 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 203 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = g_string_new (""); -#line 203 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 203 "/data/src/seahorse/gkr/gkr-item-properties.vala" contents = _tmp0_; -#line 204 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 204 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp1_ = self->priv->_item; -#line 204 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 204 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_object_get ((SecretItem*) _tmp1_, "attributes", &_tmp2_, NULL); -#line 204 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 204 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp3_ = _tmp2_; -#line 204 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 204 "/data/src/seahorse/gkr/gkr-item-properties.vala" attrs = _tmp3_; -#line 205 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 205 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp4_ = attrs; -#line 205 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 205 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_hash_table_iter_init (&iter, _tmp4_); -#line 207 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 207 "/data/src/seahorse/gkr/gkr-item-properties.vala" while (TRUE) { -#line 586 "gkr-item-properties.c" +#line 585 "gkr-item-properties.c" gconstpointer _tmp5_ = NULL; gconstpointer _tmp6_ = NULL; gboolean _tmp7_ = FALSE; @@ -599,129 +598,129 @@ const gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; gchar* _tmp22_ = NULL; -#line 207 "/data/projects/seahorse/gkr/gkr-item-properties.vala" - _tmp7_ = g_hash_table_iter_next (&iter, &_tmp5_, &_tmp6_); -#line 207 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 207 "/data/src/seahorse/gkr/gkr-item-properties.vala" + _tmp7_ = g_hash_table_iter_next (&iter, (gpointer*) (&_tmp5_), (gpointer*) (&_tmp6_)); +#line 207 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_free0 (key); -#line 207 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 207 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp8_ = g_strdup (_tmp5_); -#line 207 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 207 "/data/src/seahorse/gkr/gkr-item-properties.vala" key = _tmp8_; -#line 207 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 207 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_free0 (value); -#line 207 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 207 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp9_ = g_strdup (_tmp6_); -#line 207 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 207 "/data/src/seahorse/gkr/gkr-item-properties.vala" value = _tmp9_; -#line 207 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 207 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (!_tmp7_) { -#line 207 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 207 "/data/src/seahorse/gkr/gkr-item-properties.vala" break; -#line 621 "gkr-item-properties.c" +#line 620 "gkr-item-properties.c" } -#line 208 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 208 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp11_ = key; -#line 208 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 208 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp12_ = g_str_has_prefix (_tmp11_, "gkr:"); -#line 208 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 208 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (_tmp12_) { -#line 208 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 208 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp10_ = TRUE; -#line 631 "gkr-item-properties.c" +#line 630 "gkr-item-properties.c" } else { const gchar* _tmp13_ = NULL; gboolean _tmp14_ = FALSE; -#line 208 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 208 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp13_ = key; -#line 208 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 208 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp14_ = g_str_has_prefix (_tmp13_, "xdg:"); -#line 208 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 208 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp10_ = _tmp14_; -#line 641 "gkr-item-properties.c" +#line 640 "gkr-item-properties.c" } -#line 208 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 208 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp15_ = _tmp10_; -#line 208 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 208 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (_tmp15_) { -#line 209 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 209 "/data/src/seahorse/gkr/gkr-item-properties.vala" continue; -#line 649 "gkr-item-properties.c" +#line 648 "gkr-item-properties.c" } -#line 210 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 210 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp16_ = contents; -#line 210 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 210 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp17_ = key; -#line 210 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 210 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp18_ = g_markup_escape_text (_tmp17_, (gssize) (-1)); -#line 210 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 210 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp19_ = _tmp18_; -#line 210 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 210 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp20_ = value; -#line 210 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 210 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp21_ = g_markup_escape_text (_tmp20_, (gssize) (-1)); -#line 210 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 210 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp22_ = _tmp21_; -#line 210 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 210 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_string_append_printf (_tmp16_, "%s: %s\n", _tmp19_, _tmp22_); -#line 210 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 210 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_free0 (_tmp22_); -#line 210 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 210 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_free0 (_tmp19_); -#line 671 "gkr-item-properties.c" +#line 670 "gkr-item-properties.c" } -#line 214 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 214 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp23_ = self->priv->_builder; -#line 214 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 214 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp24_ = gtk_builder_get_object (_tmp23_, "details-box"); -#line 214 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 214 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_LABEL, GtkLabel)); -#line 214 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 214 "/data/src/seahorse/gkr/gkr-item-properties.vala" details = _tmp25_; -#line 215 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 215 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_label_set_use_markup (details, TRUE); -#line 216 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 216 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp26_ = contents; -#line 216 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 216 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp27_ = _tmp26_->str; -#line 216 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 216 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_label_set_label (details, _tmp27_); -#line 202 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 202 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (details); -#line 202 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 202 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_free0 (value); -#line 202 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 202 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_free0 (key); -#line 202 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 202 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_hash_table_unref0 (attrs); -#line 202 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 202 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_string_free0 (contents); -#line 699 "gkr-item-properties.c" +#line 698 "gkr-item-properties.c" } static void __lambda19_ (SeahorseGkrItemProperties* self, GObject* obj, GAsyncResult* res) { GtkExpander* _tmp6_ = NULL; GError * _inner_error_ = NULL; -#line 232 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 232 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_if_fail (res != NULL); -#line 708 "gkr-item-properties.c" +#line 707 "gkr-item-properties.c" { SeahorseGkrItem* _tmp0_ = NULL; GAsyncResult* _tmp1_ = NULL; -#line 234 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 234 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = self->priv->_item; -#line 234 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 234 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp1_ = res; -#line 234 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 234 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_set_secret_finish (_tmp0_, _tmp1_, &_inner_error_); -#line 234 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 234 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (_inner_error_ != NULL) { -#line 720 "gkr-item-properties.c" +#line 719 "gkr-item-properties.c" goto __catch8_g_error; } -#line 235 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 235 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_properties_password_display (self); -#line 725 "gkr-item-properties.c" +#line 724 "gkr-item-properties.c" } goto __finally8; __catch8_g_error: @@ -731,60 +730,53 @@ const gchar* _tmp3_ = NULL; GError* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; -#line 233 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 233 "/data/src/seahorse/gkr/gkr-item-properties.vala" err = _inner_error_; -#line 233 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 233 "/data/src/seahorse/gkr/gkr-item-properties.vala" _inner_error_ = NULL; -#line 237 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 237 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp2_ = err; -#line 237 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 237 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_dbus_error_strip_remote_error (_tmp2_); -#line 238 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 238 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp3_ = _ ("Couldn't change password."); -#line 238 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 238 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp4_ = err; -#line 238 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 238 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp5_ = _tmp4_->message; -#line 238 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 238 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_util_show_error ((GtkWidget*) self, _tmp3_, _tmp5_); -#line 233 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 233 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_error_free0 (err); -#line 753 "gkr-item-properties.c" +#line 752 "gkr-item-properties.c" } __finally8: -#line 233 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 233 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (_inner_error_ != NULL) { -#line 233 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 233 "/data/src/seahorse/gkr/gkr-item-properties.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 233 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 233 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_clear_error (&_inner_error_); -#line 233 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 233 "/data/src/seahorse/gkr/gkr-item-properties.vala" return; -#line 764 "gkr-item-properties.c" +#line 763 "gkr-item-properties.c" } -#line 241 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 241 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp6_ = self->priv->_password_expander; -#line 241 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 241 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_widget_set_sensitive ((GtkWidget*) _tmp6_, TRUE); -#line 242 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 242 "/data/src/seahorse/gkr/gkr-item-properties.vala" self->priv->_updating_password = FALSE; -#line 772 "gkr-item-properties.c" +#line 771 "gkr-item-properties.c" } static void ___lambda19__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 232 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 232 "/data/src/seahorse/gkr/gkr-item-properties.vala" __lambda19_ (self, source_object, res); -#line 232 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 232 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_object_unref (self); -#line 781 "gkr-item-properties.c" -} - - -static void _vala_SecretValue_free (SecretValue* self) { -#line 219 "/data/projects/seahorse/gkr/gkr-item-properties.vala" - g_boxed_free (secret_value_get_type (), self); -#line 788 "gkr-item-properties.c" +#line 780 "gkr-item-properties.c" } @@ -802,61 +794,61 @@ SecretValue* _tmp9_ = NULL; SeahorseGkrItem* _tmp10_ = NULL; SecretValue* _tmp11_ = NULL; -#line 219 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 219 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_if_fail (self != NULL); -#line 221 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 221 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = self->priv->_password_expander; -#line 221 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 221 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp1_ = gtk_expander_get_expanded (_tmp0_); -#line 221 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 221 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp2_ = _tmp1_; -#line 221 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 221 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (!_tmp2_) { -#line 222 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 222 "/data/src/seahorse/gkr/gkr-item-properties.vala" return; -#line 818 "gkr-item-properties.c" +#line 810 "gkr-item-properties.c" } -#line 223 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 223 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp3_ = self->priv->_password_changed; -#line 223 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 223 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (!_tmp3_) { -#line 224 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 224 "/data/src/seahorse/gkr/gkr-item-properties.vala" return; -#line 826 "gkr-item-properties.c" +#line 818 "gkr-item-properties.c" } -#line 225 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 225 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp4_ = self->priv->_updating_password; -#line 225 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 225 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (_tmp4_) { -#line 226 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 226 "/data/src/seahorse/gkr/gkr-item-properties.vala" return; -#line 834 "gkr-item-properties.c" +#line 826 "gkr-item-properties.c" } -#line 228 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 228 "/data/src/seahorse/gkr/gkr-item-properties.vala" self->priv->_updating_password = TRUE; -#line 229 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 229 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp5_ = self->priv->_password_expander; -#line 229 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 229 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_widget_set_sensitive ((GtkWidget*) _tmp5_, FALSE); -#line 231 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 231 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp6_ = self->priv->_password_entry; -#line 231 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 231 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp7_ = gtk_entry_get_text (_tmp6_); -#line 231 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 231 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp8_ = _tmp7_; -#line 231 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 231 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp9_ = secret_value_new (_tmp8_, (gssize) (-1), "text/plain"); -#line 231 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 231 "/data/src/seahorse/gkr/gkr-item-properties.vala" value = _tmp9_; -#line 232 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 232 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp10_ = self->priv->_item; -#line 232 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 232 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp11_ = value; -#line 232 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 232 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_set_secret (_tmp10_, _tmp11_, NULL, ___lambda19__gasync_ready_callback, g_object_ref (self)); -#line 219 "/data/projects/seahorse/gkr/gkr-item-properties.vala" - __vala_SecretValue_free0 (value); -#line 860 "gkr-item-properties.c" +#line 219 "/data/src/seahorse/gkr/gkr-item-properties.vala" + _secret_value_unref0 (value); +#line 852 "gkr-item-properties.c" } @@ -865,103 +857,103 @@ gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; GtkEntry* _tmp11_ = NULL; -#line 246 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 246 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_if_fail (self != NULL); -#line 247 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 247 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = self->priv->_password_expander; -#line 247 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 247 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp1_ = gtk_expander_get_expanded (_tmp0_); -#line 247 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 247 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp2_ = _tmp1_; -#line 247 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 247 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (_tmp2_) { -#line 879 "gkr-item-properties.c" +#line 871 "gkr-item-properties.c" SecretValue* secret = NULL; SeahorseGkrItem* _tmp3_ = NULL; SecretValue* _tmp4_ = NULL; SecretValue* _tmp5_ = NULL; -#line 248 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 248 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp3_ = self->priv->_item; -#line 248 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 248 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp4_ = seahorse_gkr_item_get_secret (_tmp3_); -#line 248 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 248 "/data/src/seahorse/gkr/gkr-item-properties.vala" secret = _tmp4_; -#line 249 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 249 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp5_ = secret; -#line 249 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 249 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (_tmp5_ != NULL) { -#line 894 "gkr-item-properties.c" +#line 886 "gkr-item-properties.c" const gchar* password = NULL; SecretValue* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; -#line 250 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 250 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp6_ = secret; -#line 250 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 250 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp7_ = secret_value_get_text (_tmp6_); -#line 250 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 250 "/data/src/seahorse/gkr/gkr-item-properties.vala" password = _tmp7_; -#line 251 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 251 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp8_ = password; -#line 251 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 251 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (_tmp8_ != NULL) { -#line 909 "gkr-item-properties.c" +#line 901 "gkr-item-properties.c" GtkEntry* _tmp9_ = NULL; const gchar* _tmp10_ = NULL; -#line 252 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 252 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp9_ = self->priv->_password_entry; -#line 252 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 252 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp10_ = password; -#line 252 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 252 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_entry_set_text (_tmp9_, _tmp10_); -#line 253 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 253 "/data/src/seahorse/gkr/gkr-item-properties.vala" self->priv->_password_changed = FALSE; -#line 254 "/data/projects/seahorse/gkr/gkr-item-properties.vala" - __vala_SecretValue_free0 (secret); -#line 254 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 254 "/data/src/seahorse/gkr/gkr-item-properties.vala" + _secret_value_unref0 (secret); +#line 254 "/data/src/seahorse/gkr/gkr-item-properties.vala" return; -#line 924 "gkr-item-properties.c" +#line 916 "gkr-item-properties.c" } } -#line 247 "/data/projects/seahorse/gkr/gkr-item-properties.vala" - __vala_SecretValue_free0 (secret); -#line 929 "gkr-item-properties.c" +#line 247 "/data/src/seahorse/gkr/gkr-item-properties.vala" + _secret_value_unref0 (secret); +#line 921 "gkr-item-properties.c" } -#line 258 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 258 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp11_ = self->priv->_password_entry; -#line 258 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 258 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_entry_set_text (_tmp11_, ""); -#line 259 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 259 "/data/src/seahorse/gkr/gkr-item-properties.vala" self->priv->_password_changed = FALSE; -#line 937 "gkr-item-properties.c" +#line 929 "gkr-item-properties.c" } static Block3Data* block3_data_ref (Block3Data* _data3_) { -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_atomic_int_inc (&_data3_->_ref_count_); -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" return _data3_; -#line 946 "gkr-item-properties.c" +#line 938 "gkr-item-properties.c" } static void block3_data_unref (void * _userdata_) { Block3Data* _data3_; _data3_ = (Block3Data*) _userdata_; -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { -#line 955 "gkr-item-properties.c" +#line 947 "gkr-item-properties.c" SeahorseGkrItemProperties * self; -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" self = _data3_->self; -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (_data3_->description); -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (self); -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_slice_free (Block3Data, _data3_); -#line 965 "gkr-item-properties.c" +#line 957 "gkr-item-properties.c" } } @@ -970,23 +962,23 @@ SeahorseGkrItemProperties * self; GtkEntry* _tmp11_ = NULL; GError * _inner_error_ = NULL; -#line 270 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 270 "/data/src/seahorse/gkr/gkr-item-properties.vala" self = _data3_->self; -#line 270 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 270 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_if_fail (res != NULL); -#line 978 "gkr-item-properties.c" +#line 970 "gkr-item-properties.c" { SeahorseGkrItem* _tmp0_ = NULL; GAsyncResult* _tmp1_ = NULL; -#line 272 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 272 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = self->priv->_item; -#line 272 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 272 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp1_ = res; -#line 272 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 272 "/data/src/seahorse/gkr/gkr-item-properties.vala" secret_item_set_label_finish ((SecretItem*) _tmp0_, _tmp1_, &_inner_error_); -#line 272 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 272 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (_inner_error_ != NULL) { -#line 990 "gkr-item-properties.c" +#line 982 "gkr-item-properties.c" goto __catch9_g_error; } } @@ -1003,67 +995,67 @@ const gchar* _tmp8_ = NULL; GError* _tmp9_ = NULL; const gchar* _tmp10_ = NULL; -#line 271 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 271 "/data/src/seahorse/gkr/gkr-item-properties.vala" err = _inner_error_; -#line 271 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 271 "/data/src/seahorse/gkr/gkr-item-properties.vala" _inner_error_ = NULL; -#line 274 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 274 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp2_ = _data3_->description; -#line 274 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 274 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp3_ = self->priv->_item; -#line 274 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 274 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp4_ = seahorse_gkr_item_get_label (_tmp3_); -#line 274 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 274 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp5_ = _tmp4_; -#line 274 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 274 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp6_ = _tmp5_; -#line 274 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 274 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_entry_set_text (_tmp2_, _tmp6_); -#line 274 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 274 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_free0 (_tmp6_); -#line 275 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 275 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp7_ = err; -#line 275 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 275 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_dbus_error_strip_remote_error (_tmp7_); -#line 276 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 276 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp8_ = _ ("Couldn't set description."); -#line 276 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 276 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp9_ = err; -#line 276 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 276 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp10_ = _tmp9_->message; -#line 276 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 276 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_util_show_error ((GtkWidget*) self, _tmp8_, _tmp10_); -#line 271 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 271 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_error_free0 (err); -#line 1039 "gkr-item-properties.c" +#line 1031 "gkr-item-properties.c" } __finally9: -#line 271 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 271 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (_inner_error_ != NULL) { -#line 271 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 271 "/data/src/seahorse/gkr/gkr-item-properties.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 271 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 271 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_clear_error (&_inner_error_); -#line 271 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 271 "/data/src/seahorse/gkr/gkr-item-properties.vala" return; -#line 1050 "gkr-item-properties.c" +#line 1042 "gkr-item-properties.c" } -#line 279 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 279 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp11_ = _data3_->description; -#line 279 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 279 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_widget_set_sensitive ((GtkWidget*) _tmp11_, TRUE); -#line 280 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 280 "/data/src/seahorse/gkr/gkr-item-properties.vala" self->priv->_updating_description = FALSE; -#line 1058 "gkr-item-properties.c" +#line 1050 "gkr-item-properties.c" } static void ___lambda20__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 270 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 270 "/data/src/seahorse/gkr/gkr-item-properties.vala" __lambda20_ (self, source_object, res); -#line 270 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 270 "/data/src/seahorse/gkr/gkr-item-properties.vala" block3_data_unref (self); -#line 1067 "gkr-item-properties.c" +#line 1059 "gkr-item-properties.c" } @@ -1077,57 +1069,57 @@ GtkEntry* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_if_fail (self != NULL); -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_if_fail (description != NULL); -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" _data3_ = g_slice_new0 (Block3Data); -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" _data3_->_ref_count_ = 1; -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" _data3_->self = g_object_ref (self); -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = description; -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (_data3_->description); -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" _data3_->description = _tmp1_; -#line 264 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 264 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp2_ = self->priv->_updating_description; -#line 264 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 264 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (_tmp2_) { -#line 265 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 265 "/data/src/seahorse/gkr/gkr-item-properties.vala" block3_data_unref (_data3_); -#line 265 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 265 "/data/src/seahorse/gkr/gkr-item-properties.vala" _data3_ = NULL; -#line 265 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 265 "/data/src/seahorse/gkr/gkr-item-properties.vala" return; -#line 1109 "gkr-item-properties.c" +#line 1101 "gkr-item-properties.c" } -#line 267 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 267 "/data/src/seahorse/gkr/gkr-item-properties.vala" self->priv->_updating_description = TRUE; -#line 268 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 268 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp3_ = _data3_->description; -#line 268 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 268 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_widget_set_sensitive ((GtkWidget*) _tmp3_, FALSE); -#line 270 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 270 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp4_ = self->priv->_item; -#line 270 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 270 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp5_ = _data3_->description; -#line 270 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 270 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp6_ = gtk_entry_get_text (_tmp5_); -#line 270 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 270 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp7_ = _tmp6_; -#line 270 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 270 "/data/src/seahorse/gkr/gkr-item-properties.vala" secret_item_set_label ((SecretItem*) _tmp4_, _tmp7_, NULL, ___lambda20__gasync_ready_callback, block3_data_ref (_data3_)); -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" block3_data_unref (_data3_); -#line 262 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item-properties.vala" _data3_ = NULL; -#line 1131 "gkr-item-properties.c" +#line 1123 "gkr-item-properties.c" } @@ -1140,138 +1132,138 @@ GObject* _tmp4_ = NULL; GtkCheckButton* _tmp5_ = NULL; GtkCheckButton* _tmp6_ = NULL; -#line 284 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 284 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_if_fail (self != NULL); -#line 284 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 284 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_if_fail (expander != NULL); -#line 286 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 286 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = expander; -#line 286 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 286 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp1_ = gtk_expander_get_expanded (_tmp0_); -#line 286 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 286 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp2_ = _tmp1_; -#line 286 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 286 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (!_tmp2_) { -#line 287 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 287 "/data/src/seahorse/gkr/gkr-item-properties.vala" return; -#line 1158 "gkr-item-properties.c" +#line 1150 "gkr-item-properties.c" } -#line 290 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 290 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp3_ = self->priv->_builder; -#line 290 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 290 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp4_ = gtk_builder_get_object (_tmp3_, "show-password-check"); -#line 290 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 290 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_CHECK_BUTTON, GtkCheckButton)); -#line 290 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 290 "/data/src/seahorse/gkr/gkr-item-properties.vala" check = _tmp5_; -#line 291 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 291 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp6_ = check; -#line 291 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 291 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_toggle_button_set_active ((GtkToggleButton*) _tmp6_, FALSE); -#line 294 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 294 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_properties_password_display (self); -#line 284 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 284 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (check); -#line 1176 "gkr-item-properties.c" +#line 1168 "gkr-item-properties.c" } SeahorseGkrItem* seahorse_gkr_item_properties_get_item (SeahorseGkrItemProperties* self) { SeahorseGkrItem* result; SeahorseGkrItem* _tmp0_ = NULL; -#line 27 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 27 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_val_if_fail (self != NULL, NULL); -#line 27 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 27 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = self->priv->_item; -#line 27 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 27 "/data/src/seahorse/gkr/gkr-item-properties.vala" result = _tmp0_; -#line 27 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 27 "/data/src/seahorse/gkr/gkr-item-properties.vala" return result; -#line 1191 "gkr-item-properties.c" +#line 1183 "gkr-item-properties.c" } static void seahorse_gkr_item_properties_set_item (SeahorseGkrItemProperties* self, SeahorseGkrItem* value) { SeahorseGkrItem* _tmp0_ = NULL; SeahorseGkrItem* _tmp1_ = NULL; -#line 27 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 27 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_if_fail (self != NULL); -#line 27 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 27 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = value; -#line 27 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 27 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 27 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 27 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (self->priv->_item); -#line 27 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 27 "/data/src/seahorse/gkr/gkr-item-properties.vala" self->priv->_item = _tmp1_; -#line 27 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 27 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_object_notify ((GObject *) self, "item"); -#line 1210 "gkr-item-properties.c" +#line 1202 "gkr-item-properties.c" } static Block4Data* block4_data_ref (Block4Data* _data4_) { -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_atomic_int_inc (&_data4_->_ref_count_); -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" return _data4_; -#line 1219 "gkr-item-properties.c" +#line 1211 "gkr-item-properties.c" } static void block4_data_unref (void * _userdata_) { Block4Data* _data4_; _data4_ = (Block4Data*) _userdata_; -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) { -#line 1228 "gkr-item-properties.c" +#line 1220 "gkr-item-properties.c" SeahorseGkrItemProperties * self; -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" self = _data4_->self; -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (_data4_->check); -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (_data4_->description); -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (self); -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_slice_free (Block4Data, _data4_); -#line 1240 "gkr-item-properties.c" +#line 1232 "gkr-item-properties.c" } } static void _seahorse_gkr_item_properties___lambda21_ (SeahorseGkrItemProperties* self, gint response) { -#line 51 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 51 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_widget_destroy ((GtkWidget*) self); -#line 1248 "gkr-item-properties.c" +#line 1240 "gkr-item-properties.c" } static void __seahorse_gkr_item_properties___lambda21__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { -#line 50 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 50 "/data/src/seahorse/gkr/gkr-item-properties.vala" _seahorse_gkr_item_properties___lambda21_ (self, response_id); -#line 1255 "gkr-item-properties.c" +#line 1247 "gkr-item-properties.c" } static void _seahorse_gkr_item_properties___lambda22_ (Block4Data* _data4_) { SeahorseGkrItemProperties * self; GtkEntry* _tmp0_ = NULL; -#line 61 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 61 "/data/src/seahorse/gkr/gkr-item-properties.vala" self = _data4_->self; -#line 62 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 62 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = _data4_->description; -#line 62 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 62 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_properties_description_activate (self, _tmp0_); -#line 1268 "gkr-item-properties.c" +#line 1260 "gkr-item-properties.c" } static void __seahorse_gkr_item_properties___lambda22__gtk_entry_activate (GtkEntry* _sender, gpointer self) { -#line 61 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 61 "/data/src/seahorse/gkr/gkr-item-properties.vala" _seahorse_gkr_item_properties___lambda22_ (self); -#line 1275 "gkr-item-properties.c" +#line 1267 "gkr-item-properties.c" } @@ -1279,33 +1271,33 @@ SeahorseGkrItemProperties * self; gboolean result = FALSE; GtkEntry* _tmp0_ = NULL; -#line 64 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 64 "/data/src/seahorse/gkr/gkr-item-properties.vala" self = _data4_->self; -#line 65 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 65 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = _data4_->description; -#line 65 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 65 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_properties_description_activate (self, _tmp0_); -#line 66 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 66 "/data/src/seahorse/gkr/gkr-item-properties.vala" result = FALSE; -#line 66 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 66 "/data/src/seahorse/gkr/gkr-item-properties.vala" return result; -#line 1293 "gkr-item-properties.c" +#line 1285 "gkr-item-properties.c" } static gboolean __seahorse_gkr_item_properties___lambda23__gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) { gboolean result; result = _seahorse_gkr_item_properties___lambda23_ (self); -#line 64 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 64 "/data/src/seahorse/gkr/gkr-item-properties.vala" return result; -#line 1302 "gkr-item-properties.c" +#line 1294 "gkr-item-properties.c" } static void _seahorse_gkr_item_properties_expander_activate_gtk_expander_activate (GtkExpander* _sender, gpointer self) { -#line 71 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 71 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_properties_expander_activate (self, _sender); -#line 1309 "gkr-item-properties.c" +#line 1301 "gkr-item-properties.c" } @@ -1315,26 +1307,26 @@ GtkCheckButton* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 75 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 75 "/data/src/seahorse/gkr/gkr-item-properties.vala" self = _data4_->self; -#line 76 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 76 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = self->priv->_password_entry; -#line 76 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 76 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp1_ = _data4_->check; -#line 76 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 76 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp2_ = gtk_toggle_button_get_active ((GtkToggleButton*) _tmp1_); -#line 76 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 76 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp3_ = _tmp2_; -#line 76 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 76 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_entry_set_visibility (_tmp0_, _tmp3_); -#line 1331 "gkr-item-properties.c" +#line 1323 "gkr-item-properties.c" } static void __seahorse_gkr_item_properties___lambda24__gtk_toggle_button_toggled (GtkToggleButton* _sender, gpointer self) { -#line 75 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 75 "/data/src/seahorse/gkr/gkr-item-properties.vala" _seahorse_gkr_item_properties___lambda24_ (self); -#line 1338 "gkr-item-properties.c" +#line 1330 "gkr-item-properties.c" } @@ -1343,68 +1335,68 @@ const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; GQuark _tmp4_ = 0U; -#line 84 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 84 "/data/src/seahorse/gkr/gkr-item-properties.vala" static GQuark _tmp3_label0 = 0; -#line 84 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 84 "/data/src/seahorse/gkr/gkr-item-properties.vala" static GQuark _tmp3_label1 = 0; -#line 84 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 84 "/data/src/seahorse/gkr/gkr-item-properties.vala" static GQuark _tmp3_label2 = 0; -#line 83 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 83 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_return_if_fail (pspec != NULL); -#line 84 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 84 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = pspec; -#line 84 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 84 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp1_ = _tmp0_->name; -#line 84 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 84 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp2_ = _tmp1_; -#line 84 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 84 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_); -#line 84 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 84 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("use")))) { -#line 84 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 84 "/data/src/seahorse/gkr/gkr-item-properties.vala" switch (0) { -#line 1367 "gkr-item-properties.c" +#line 1359 "gkr-item-properties.c" default: { -#line 86 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 86 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_properties_update_use (self); -#line 87 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 87 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_properties_update_type (self); -#line 88 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 88 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_properties_update_visibility (self); -#line 89 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 89 "/data/src/seahorse/gkr/gkr-item-properties.vala" break; -#line 1378 "gkr-item-properties.c" +#line 1370 "gkr-item-properties.c" } } } else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("attributes")))) { -#line 84 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 84 "/data/src/seahorse/gkr/gkr-item-properties.vala" switch (0) { -#line 1384 "gkr-item-properties.c" +#line 1376 "gkr-item-properties.c" default: { -#line 91 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 91 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_properties_update_details (self); -#line 92 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 92 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_properties_update_server (self); -#line 93 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 93 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_properties_update_user (self); -#line 94 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 94 "/data/src/seahorse/gkr/gkr-item-properties.vala" break; -#line 1395 "gkr-item-properties.c" +#line 1387 "gkr-item-properties.c" } } } else if (_tmp4_ == ((0 != _tmp3_label2) ? _tmp3_label2 : (_tmp3_label2 = g_quark_from_static_string ("has-secret")))) { -#line 84 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 84 "/data/src/seahorse/gkr/gkr-item-properties.vala" switch (0) { -#line 1401 "gkr-item-properties.c" +#line 1393 "gkr-item-properties.c" default: { -#line 96 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 96 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_properties_password_display (self); -#line 97 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 97 "/data/src/seahorse/gkr/gkr-item-properties.vala" break; -#line 1408 "gkr-item-properties.c" +#line 1400 "gkr-item-properties.c" } } } @@ -1412,51 +1404,51 @@ static void __seahorse_gkr_item_properties___lambda25__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { -#line 83 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 83 "/data/src/seahorse/gkr/gkr-item-properties.vala" _seahorse_gkr_item_properties___lambda25_ (self, pspec); -#line 1418 "gkr-item-properties.c" +#line 1410 "gkr-item-properties.c" } static void _seahorse_gkr_item_properties_password_activate_gtk_entry_activate (GtkEntry* _sender, gpointer self) { -#line 112 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 112 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_properties_password_activate (self); -#line 1425 "gkr-item-properties.c" +#line 1417 "gkr-item-properties.c" } static void _seahorse_gkr_item_properties___lambda26_ (SeahorseGkrItemProperties* self) { -#line 114 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 114 "/data/src/seahorse/gkr/gkr-item-properties.vala" self->priv->_password_changed = TRUE; -#line 1432 "gkr-item-properties.c" +#line 1424 "gkr-item-properties.c" } static void __seahorse_gkr_item_properties___lambda26__gtk_editable_changed (GtkEditable* _sender, gpointer self) { -#line 113 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 113 "/data/src/seahorse/gkr/gkr-item-properties.vala" _seahorse_gkr_item_properties___lambda26_ (self); -#line 1439 "gkr-item-properties.c" +#line 1431 "gkr-item-properties.c" } static gboolean _seahorse_gkr_item_properties___lambda27_ (SeahorseGkrItemProperties* self) { gboolean result = FALSE; -#line 117 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 117 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_properties_password_activate (self); -#line 118 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 118 "/data/src/seahorse/gkr/gkr-item-properties.vala" result = FALSE; -#line 118 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 118 "/data/src/seahorse/gkr/gkr-item-properties.vala" return result; -#line 1451 "gkr-item-properties.c" +#line 1443 "gkr-item-properties.c" } static gboolean __seahorse_gkr_item_properties___lambda27__gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) { gboolean result; result = _seahorse_gkr_item_properties___lambda27_ (self); -#line 116 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 116 "/data/src/seahorse/gkr/gkr-item-properties.vala" return result; -#line 1460 "gkr-item-properties.c" +#line 1452 "gkr-item-properties.c" } @@ -1511,50 +1503,50 @@ SeahorseGkrItem* _tmp45_ = NULL; GtkEntry* _tmp46_ = NULL; GError * _inner_error_ = NULL; -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" parent_class = G_OBJECT_CLASS (seahorse_gkr_item_properties_parent_class); -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" obj = parent_class->constructor (type, n_construct_properties, construct_properties); -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_GKR_TYPE_ITEM_PROPERTIES, SeahorseGkrItemProperties); -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" _data4_ = g_slice_new0 (Block4Data); -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" _data4_->_ref_count_ = 1; -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" _data4_->self = g_object_ref (self); -#line 37 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 37 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp0_ = gtk_builder_new (); -#line 37 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 37 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (self->priv->_builder); -#line 37 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 37 "/data/src/seahorse/gkr/gkr-item-properties.vala" self->priv->_builder = _tmp0_; -#line 1533 "gkr-item-properties.c" +#line 1525 "gkr-item-properties.c" { gchar* path = NULL; gchar* _tmp1_ = NULL; GtkBuilder* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; -#line 39 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 39 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp1_ = g_build_filename (UIDIR, "seahorse-gkr-item-properties.xml", NULL); -#line 39 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 39 "/data/src/seahorse/gkr/gkr-item-properties.vala" path = _tmp1_; -#line 40 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 40 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp2_ = self->priv->_builder; -#line 40 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 40 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp3_ = path; -#line 40 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 40 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_builder_add_from_file (_tmp2_, _tmp3_, &_inner_error_); -#line 40 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 40 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (_inner_error_ != NULL) { -#line 40 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 40 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_free0 (path); -#line 1553 "gkr-item-properties.c" +#line 1545 "gkr-item-properties.c" goto __catch10_g_error; } -#line 38 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 38 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_free0 (path); -#line 1558 "gkr-item-properties.c" +#line 1550 "gkr-item-properties.c" } goto __finally10; __catch10_g_error: @@ -1562,234 +1554,234 @@ GError* err = NULL; GError* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; -#line 38 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 38 "/data/src/seahorse/gkr/gkr-item-properties.vala" err = _inner_error_; -#line 38 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 38 "/data/src/seahorse/gkr/gkr-item-properties.vala" _inner_error_ = NULL; -#line 42 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 42 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp4_ = err; -#line 42 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 42 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp5_ = _tmp4_->message; -#line 42 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 42 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_critical ("gkr-item-properties.vala:42: %s", _tmp5_); -#line 38 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 38 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_error_free0 (err); -#line 1578 "gkr-item-properties.c" +#line 1570 "gkr-item-properties.c" } __finally10: -#line 38 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 38 "/data/src/seahorse/gkr/gkr-item-properties.vala" if (_inner_error_ != NULL) { -#line 38 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 38 "/data/src/seahorse/gkr/gkr-item-properties.vala" block4_data_unref (_data4_); -#line 38 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 38 "/data/src/seahorse/gkr/gkr-item-properties.vala" _data4_ = NULL; -#line 38 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 38 "/data/src/seahorse/gkr/gkr-item-properties.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 38 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 38 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_clear_error (&_inner_error_); -#line 1591 "gkr-item-properties.c" +#line 1583 "gkr-item-properties.c" } -#line 45 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 45 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_dialog_add_button ((GtkDialog*) self, GTK_STOCK_CLOSE, (gint) GTK_RESPONSE_CLOSE); -#line 46 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp6_ = self->priv->_builder; -#line 46 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp7_ = gtk_builder_get_object (_tmp6_, "gkr-item-properties"); -#line 46 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_WIDGET, GtkWidget)); -#line 46 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item-properties.vala" content = _tmp8_; -#line 47 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 47 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp9_ = (GtkBox*) gtk_dialog_get_content_area ((GtkDialog*) self); -#line 47 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 47 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp10_ = content; -#line 47 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 47 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_CONTAINER, GtkContainer), _tmp10_); -#line 48 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 48 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp11_ = content; -#line 48 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 48 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_widget_show (_tmp11_); -#line 50 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 50 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_signal_connect_object ((GtkDialog*) self, "response", (GCallback) __seahorse_gkr_item_properties___lambda21__gtk_dialog_response, self, 0); -#line 55 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 55 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp12_ = self->priv->_item; -#line 55 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 55 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp13_ = self->priv->_builder; -#line 55 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 55 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp14_ = gtk_builder_get_object (_tmp13_, "key-image"); -#line 55 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 55 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_object_bind_property_with_closures ((GObject*) _tmp12_, "icon", _tmp14_, "gicon", G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); -#line 59 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 59 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp15_ = self->priv->_builder; -#line 59 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 59 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp16_ = gtk_builder_get_object (_tmp15_, "description-field"); -#line 59 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 59 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp17_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GTK_TYPE_ENTRY, GtkEntry)); -#line 59 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 59 "/data/src/seahorse/gkr/gkr-item-properties.vala" _data4_->description = _tmp17_; -#line 60 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 60 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp18_ = self->priv->_item; -#line 60 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 60 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp19_ = _data4_->description; -#line 60 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 60 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_object_bind_property_with_closures ((GObject*) _tmp18_, "label", (GObject*) _tmp19_, "text", G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); -#line 61 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 61 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp20_ = _data4_->description; -#line 61 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 61 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_signal_connect_data (_tmp20_, "activate", (GCallback) __seahorse_gkr_item_properties___lambda22__gtk_entry_activate, block4_data_ref (_data4_), (GClosureNotify) block4_data_unref, 0); -#line 64 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 64 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp21_ = _data4_->description; -#line 64 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 64 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_signal_connect_data ((GtkWidget*) _tmp21_, "focus-out-event", (GCallback) __seahorse_gkr_item_properties___lambda23__gtk_widget_focus_out_event, block4_data_ref (_data4_), (GClosureNotify) block4_data_unref, G_CONNECT_AFTER); -#line 70 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 70 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp22_ = self->priv->_builder; -#line 70 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 70 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp23_ = gtk_builder_get_object (_tmp22_, "password-expander"); -#line 70 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 70 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp24_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GTK_TYPE_EXPANDER, GtkExpander)); -#line 70 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 70 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (self->priv->_password_expander); -#line 70 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 70 "/data/src/seahorse/gkr/gkr-item-properties.vala" self->priv->_password_expander = _tmp24_; -#line 71 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 71 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp25_ = self->priv->_password_expander; -#line 71 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 71 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_signal_connect_object (_tmp25_, "activate", (GCallback) _seahorse_gkr_item_properties_expander_activate_gtk_expander_activate, self, G_CONNECT_AFTER); -#line 74 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 74 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp26_ = self->priv->_builder; -#line 74 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 74 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp27_ = gtk_builder_get_object (_tmp26_, "show-password-check"); -#line 74 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 74 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GTK_TYPE_CHECK_BUTTON, GtkCheckButton)); -#line 74 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 74 "/data/src/seahorse/gkr/gkr-item-properties.vala" _data4_->check = _tmp28_; -#line 75 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 75 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp29_ = _data4_->check; -#line 75 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 75 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_signal_connect_data ((GtkToggleButton*) _tmp29_, "toggled", (GCallback) __seahorse_gkr_item_properties___lambda24__gtk_toggle_button_toggled, block4_data_ref (_data4_), (GClosureNotify) block4_data_unref, 0); -#line 80 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 80 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp30_ = self->priv->_item; -#line 80 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 80 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_object_bind_property_with_closures ((GObject*) _tmp30_, "label", (GObject*) self, "title", G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); -#line 83 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 83 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp31_ = self->priv->_item; -#line 83 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 83 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_signal_connect_object ((GObject*) _tmp31_, "notify", (GCallback) __seahorse_gkr_item_properties___lambda25__g_object_notify, self, 0); -#line 102 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 102 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp32_ = (GcrSecureEntryBuffer*) gcr_secure_entry_buffer_new (); -#line 102 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 102 "/data/src/seahorse/gkr/gkr-item-properties.vala" buffer = _tmp32_; -#line 103 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 103 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp33_ = buffer; -#line 103 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 103 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp34_ = (GtkEntry*) gtk_entry_new_with_buffer ((GtkEntryBuffer*) _tmp33_); -#line 103 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 103 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_object_ref_sink (_tmp34_); -#line 103 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 103 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (self->priv->_password_entry); -#line 103 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 103 "/data/src/seahorse/gkr/gkr-item-properties.vala" self->priv->_password_entry = _tmp34_; -#line 104 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 104 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp35_ = self->priv->_builder; -#line 104 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 104 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp36_ = gtk_builder_get_object (_tmp35_, "password-box-area"); -#line 104 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 104 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GTK_TYPE_BOX, GtkBox)); -#line 104 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 104 "/data/src/seahorse/gkr/gkr-item-properties.vala" box = _tmp37_; -#line 105 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 105 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp38_ = box; -#line 105 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 105 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp39_ = self->priv->_password_entry; -#line 105 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 105 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_container_add ((GtkContainer*) _tmp38_, (GtkWidget*) _tmp39_); -#line 106 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 106 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp40_ = self->priv->_password_entry; -#line 106 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 106 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_entry_set_visibility (_tmp40_, FALSE); -#line 107 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 107 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp41_ = self->priv->_password_entry; -#line 107 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 107 "/data/src/seahorse/gkr/gkr-item-properties.vala" gtk_widget_show ((GtkWidget*) _tmp41_); -#line 108 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 108 "/data/src/seahorse/gkr/gkr-item-properties.vala" self->priv->_password_changed = FALSE; -#line 109 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 109 "/data/src/seahorse/gkr/gkr-item-properties.vala" self->priv->_updating_password = FALSE; -#line 112 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 112 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp42_ = self->priv->_password_entry; -#line 112 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 112 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_signal_connect_object (_tmp42_, "activate", (GCallback) _seahorse_gkr_item_properties_password_activate_gtk_entry_activate, self, 0); -#line 113 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 113 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp43_ = self->priv->_password_entry; -#line 113 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 113 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_signal_connect_object ((GtkEditable*) _tmp43_, "changed", (GCallback) __seahorse_gkr_item_properties___lambda26__gtk_editable_changed, self, 0); -#line 116 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 116 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp44_ = self->priv->_password_entry; -#line 116 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 116 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_signal_connect_object ((GtkWidget*) _tmp44_, "focus-out-event", (GCallback) __seahorse_gkr_item_properties___lambda27__gtk_widget_focus_out_event, self, G_CONNECT_AFTER); -#line 122 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 122 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp45_ = self->priv->_item; -#line 122 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 122 "/data/src/seahorse/gkr/gkr-item-properties.vala" _tmp46_ = self->priv->_password_entry; -#line 122 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 122 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_object_bind_property_with_closures ((GObject*) _tmp45_, "has-secret", (GObject*) _tmp46_, "sensitive", G_BINDING_DEFAULT, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (box); -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (buffer); -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (content); -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" block4_data_unref (_data4_); -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" _data4_ = NULL; -#line 36 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item-properties.vala" return obj; -#line 1749 "gkr-item-properties.c" +#line 1741 "gkr-item-properties.c" } static void seahorse_gkr_item_properties_class_init (SeahorseGkrItemPropertiesClass * klass) { -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_properties_parent_class = g_type_class_peek_parent (klass); -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_type_class_add_private (klass, sizeof (SeahorseGkrItemPropertiesPrivate)); -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" G_OBJECT_CLASS (klass)->get_property = _vala_seahorse_gkr_item_properties_get_property; -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" G_OBJECT_CLASS (klass)->set_property = _vala_seahorse_gkr_item_properties_set_property; -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" G_OBJECT_CLASS (klass)->constructor = seahorse_gkr_item_properties_constructor; -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" G_OBJECT_CLASS (klass)->finalize = seahorse_gkr_item_properties_finalize; -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_ITEM_PROPERTIES_ITEM, g_param_spec_object ("item", "item", "item", SEAHORSE_GKR_TYPE_ITEM, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); -#line 1768 "gkr-item-properties.c" +#line 1760 "gkr-item-properties.c" } static void seahorse_gkr_item_properties_instance_init (SeahorseGkrItemProperties * self) { -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" self->priv = SEAHORSE_GKR_ITEM_PROPERTIES_GET_PRIVATE (self); -#line 1775 "gkr-item-properties.c" +#line 1767 "gkr-item-properties.c" } static void seahorse_gkr_item_properties_finalize (GObject* obj) { SeahorseGkrItemProperties * self; -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_GKR_TYPE_ITEM_PROPERTIES, SeahorseGkrItemProperties); -#line 27 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 27 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (self->priv->_item); -#line 29 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 29 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (self->priv->_builder); -#line 30 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 30 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (self->priv->_password_entry); -#line 31 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 31 "/data/src/seahorse/gkr/gkr-item-properties.vala" _g_object_unref0 (self->priv->_password_expander); -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" G_OBJECT_CLASS (seahorse_gkr_item_properties_parent_class)->finalize (obj); -#line 1793 "gkr-item-properties.c" +#line 1785 "gkr-item-properties.c" } @@ -1808,21 +1800,21 @@ static void _vala_seahorse_gkr_item_properties_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { SeahorseGkrItemProperties * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEAHORSE_GKR_TYPE_ITEM_PROPERTIES, SeahorseGkrItemProperties); -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" switch (property_id) { -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" case SEAHORSE_GKR_ITEM_PROPERTIES_ITEM: -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" g_value_set_object (value, seahorse_gkr_item_properties_get_item (self)); -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" break; -#line 1820 "gkr-item-properties.c" +#line 1812 "gkr-item-properties.c" default: -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" break; -#line 1826 "gkr-item-properties.c" +#line 1818 "gkr-item-properties.c" } } @@ -1830,21 +1822,21 @@ static void _vala_seahorse_gkr_item_properties_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { SeahorseGkrItemProperties * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEAHORSE_GKR_TYPE_ITEM_PROPERTIES, SeahorseGkrItemProperties); -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" switch (property_id) { -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" case SEAHORSE_GKR_ITEM_PROPERTIES_ITEM: -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" seahorse_gkr_item_properties_set_item (self, g_value_get_object (value)); -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" break; -#line 1842 "gkr-item-properties.c" +#line 1834 "gkr-item-properties.c" default: -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 26 "/data/projects/seahorse/gkr/gkr-item-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-item-properties.vala" break; -#line 1848 "gkr-item-properties.c" +#line 1840 "gkr-item-properties.c" } } diff -Nru seahorse-3.10.1/gkr/gkr-item.c seahorse-3.10.2/gkr/gkr-item.c --- seahorse-3.10.1/gkr/gkr-item.c 2013-07-24 15:11:31.000000000 +0000 +++ seahorse-3.10.2/gkr/gkr-item.c 2014-01-08 15:13:22.000000000 +0000 @@ -1,4 +1,4 @@ -/* gkr-item.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* gkr-item.c generated by valac 0.22.1, the Vala compiler * generated from gkr-item.vala, do not modify */ /* @@ -41,7 +41,7 @@ #define SEAHORSE_GKR_TYPE_DISPLAY_ENTRY (seahorse_gkr_display_entry_get_type ()) typedef struct _SeahorseGkrDisplayEntry SeahorseGkrDisplayEntry; -#define __vala_SecretValue_free0(var) ((var == NULL) ? NULL : (var = (_vala_SecretValue_free (var), NULL))) +#define _secret_value_unref0(var) ((var == NULL) ? NULL : (var = (secret_value_unref (var), NULL))) #define _seahorse_gkr_display_info_free0(var) ((var == NULL) ? NULL : (var = (seahorse_gkr_display_info_free (var), NULL))) #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) @@ -177,7 +177,6 @@ SEAHORSE_GKR_ITEM_ACTIONS, SEAHORSE_GKR_ITEM_DELETABLE }; -static void _vala_SecretValue_free (SecretValue* self); static void seahorse_gkr_item_real_dispose (GObject* base); static SeahorseDeleter* seahorse_gkr_item_real_create_deleter (SeahorseDeletable* base); SeahorseGkrItemDeleter* seahorse_gkr_item_deleter_new (SeahorseGkrItem* item); @@ -209,7 +208,6 @@ static void seahorse_gkr_item_load_item_secret (SeahorseGkrItem* self); static void ___lambda18_ (SeahorseGkrItem* self, GObject* obj, GAsyncResult* res); static void ____lambda18__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self); -static SecretValue* _vala_SecretValue_copy (SecretValue* self); static void seahorse_gkr_item_set_secret_data_free (gpointer _data); static gboolean seahorse_gkr_item_set_secret_co (SeahorseGkrItemSetSecretData* _data_); static void seahorse_gkr_item_set_secret_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_); @@ -269,73 +267,73 @@ gchar* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = (*self).item_type; -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = g_strdup (_tmp0_); -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*dest).item_type); -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" (*dest).item_type = _tmp1_; -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = (*self).label; -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = g_strdup (_tmp2_); -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*dest).label); -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" (*dest).label = _tmp3_; -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = (*self).details; -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" _tmp5_ = g_strdup (_tmp4_); -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*dest).details); -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" (*dest).details = _tmp5_; -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" _tmp6_ = (*self).description; -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" _tmp7_ = g_strdup (_tmp6_); -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*dest).description); -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" (*dest).description = _tmp7_; -#line 305 "gkr-item.c" +#line 303 "gkr-item.c" } void seahorse_gkr_display_info_destroy (SeahorseGkrDisplayInfo* self) { -#line 35 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 35 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*self).item_type); -#line 36 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 36 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*self).label); -#line 37 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 37 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*self).details); -#line 38 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 38 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*self).description); -#line 318 "gkr-item.c" +#line 316 "gkr-item.c" } SeahorseGkrDisplayInfo* seahorse_gkr_display_info_dup (const SeahorseGkrDisplayInfo* self) { SeahorseGkrDisplayInfo* dup; -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" dup = g_new0 (SeahorseGkrDisplayInfo, 1); -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_display_info_copy (self, dup); -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" return dup; -#line 330 "gkr-item.c" +#line 328 "gkr-item.c" } void seahorse_gkr_display_info_free (SeahorseGkrDisplayInfo* self) { -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_display_info_destroy (self); -#line 34 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 34 "/data/src/seahorse/gkr/gkr-item.vala" g_free (self); -#line 339 "gkr-item.c" +#line 337 "gkr-item.c" } @@ -356,57 +354,57 @@ const gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; SeahorseGkrDisplayCustom _tmp4_ = NULL; -#line 46 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = (*self).item_type; -#line 46 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = g_strdup (_tmp0_); -#line 46 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*dest).item_type); -#line 46 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item.vala" (*dest).item_type = _tmp1_; -#line 46 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = (*self).description; -#line 46 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = g_strdup (_tmp2_); -#line 46 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*dest).description); -#line 46 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item.vala" (*dest).description = _tmp3_; -#line 46 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = (*self).custom_func; -#line 46 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item.vala" (*dest).custom_func = _tmp4_; -#line 380 "gkr-item.c" +#line 378 "gkr-item.c" } void seahorse_gkr_display_entry_destroy (SeahorseGkrDisplayEntry* self) { -#line 47 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 47 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*self).item_type); -#line 48 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 48 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*self).description); -#line 389 "gkr-item.c" +#line 387 "gkr-item.c" } SeahorseGkrDisplayEntry* seahorse_gkr_display_entry_dup (const SeahorseGkrDisplayEntry* self) { SeahorseGkrDisplayEntry* dup; -#line 46 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item.vala" dup = g_new0 (SeahorseGkrDisplayEntry, 1); -#line 46 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_display_entry_copy (self, dup); -#line 46 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item.vala" return dup; -#line 401 "gkr-item.c" +#line 399 "gkr-item.c" } void seahorse_gkr_display_entry_free (SeahorseGkrDisplayEntry* self) { -#line 46 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_display_entry_destroy (self); -#line 46 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 46 "/data/src/seahorse/gkr/gkr-item.vala" g_free (self); -#line 410 "gkr-item.c" +#line 408 "gkr-item.c" } @@ -421,37 +419,30 @@ } -static void _vala_SecretValue_free (SecretValue* self) { -#line 117 "/data/projects/seahorse/gkr/gkr-item.vala" - g_boxed_free (secret_value_get_type (), self); -#line 428 "gkr-item.c" -} - - static void seahorse_gkr_item_real_dispose (GObject* base) { SeahorseGkrItem * self; GCancellable* _tmp0_ = NULL; -#line 137 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 137 "/data/src/seahorse/gkr/gkr-item.vala" self = (SeahorseGkrItem*) base; -#line 138 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 138 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = self->priv->_req_secret; -#line 138 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 138 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp0_ != NULL) { -#line 441 "gkr-item.c" +#line 432 "gkr-item.c" GCancellable* _tmp1_ = NULL; -#line 139 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 139 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = self->priv->_req_secret; -#line 139 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 139 "/data/src/seahorse/gkr/gkr-item.vala" g_cancellable_cancel (_tmp1_); -#line 447 "gkr-item.c" +#line 438 "gkr-item.c" } -#line 140 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 140 "/data/src/seahorse/gkr/gkr-item.vala" _g_object_unref0 (self->priv->_req_secret); -#line 140 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 140 "/data/src/seahorse/gkr/gkr-item.vala" self->priv->_req_secret = NULL; -#line 141 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 141 "/data/src/seahorse/gkr/gkr-item.vala" G_OBJECT_CLASS (seahorse_gkr_item_parent_class)->dispose ((GObject*) G_TYPE_CHECK_INSTANCE_CAST (self, secret_item_get_type (), SecretItem)); -#line 455 "gkr-item.c" +#line 446 "gkr-item.c" } @@ -459,15 +450,15 @@ SeahorseGkrItem * self; SeahorseDeleter* result = NULL; SeahorseGkrItemDeleter* _tmp0_ = NULL; -#line 144 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 144 "/data/src/seahorse/gkr/gkr-item.vala" self = (SeahorseGkrItem*) base; -#line 145 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 145 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = seahorse_gkr_item_deleter_new (self); -#line 145 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 145 "/data/src/seahorse/gkr/gkr-item.vala" result = (SeahorseDeleter*) _tmp0_; -#line 145 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 145 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 471 "gkr-item.c" +#line 462 "gkr-item.c" } @@ -476,54 +467,54 @@ GtkWindow* result = NULL; GtkWindow* _tmp0_ = NULL; SeahorseGkrItemProperties* _tmp1_ = NULL; -#line 148 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 148 "/data/src/seahorse/gkr/gkr-item.vala" self = (SeahorseGkrItem*) base; -#line 149 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 149 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = parent; -#line 149 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 149 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = seahorse_gkr_item_properties_new (self, _tmp0_); -#line 149 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 149 "/data/src/seahorse/gkr/gkr-item.vala" g_object_ref_sink (_tmp1_); -#line 149 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 149 "/data/src/seahorse/gkr/gkr-item.vala" result = (GtkWindow*) _tmp1_; -#line 149 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 149 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 492 "gkr-item.c" +#line 483 "gkr-item.c" } static gpointer _seahorse_gkr_display_info_dup0 (gpointer self) { -#line 156 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 156 "/data/src/seahorse/gkr/gkr-item.vala" return self ? seahorse_gkr_display_info_dup (self) : NULL; -#line 499 "gkr-item.c" +#line 490 "gkr-item.c" } static void _seahorse_gkr_network_custom_seahorse_gkr_display_custom (const gchar* label, GHashTable* item_attrs, SeahorseGkrDisplayInfo* info) { -#line 165 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 165 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_network_custom (label, item_attrs, info); -#line 506 "gkr-item.c" +#line 497 "gkr-item.c" } static void _seahorse_gkr_chrome_custom_seahorse_gkr_display_custom (const gchar* label, GHashTable* item_attrs, SeahorseGkrDisplayInfo* info) { -#line 165 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 165 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_chrome_custom (label, item_attrs, info); -#line 513 "gkr-item.c" +#line 504 "gkr-item.c" } static void _seahorse_gkr_telepathy_custom_seahorse_gkr_display_custom (const gchar* label, GHashTable* item_attrs, SeahorseGkrDisplayInfo* info) { -#line 165 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 165 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_telepathy_custom (label, item_attrs, info); -#line 520 "gkr-item.c" +#line 511 "gkr-item.c" } static void _seahorse_gkr_empathy_custom_seahorse_gkr_display_custom (const gchar* label, GHashTable* item_attrs, SeahorseGkrDisplayInfo* info) { -#line 165 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 165 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_empathy_custom (label, item_attrs, info); -#line 527 "gkr-item.c" +#line 518 "gkr-item.c" } @@ -553,260 +544,260 @@ const gchar* _tmp38_ = NULL; SeahorseGkrDisplayInfo* _tmp41_ = NULL; const gchar* _tmp42_ = NULL; -#line 152 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 152 "/data/src/seahorse/gkr/gkr-item.vala" g_return_if_fail (self != NULL); -#line 153 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 153 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = self->priv->_info; -#line 153 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 153 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp0_ != NULL) { -#line 154 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 154 "/data/src/seahorse/gkr/gkr-item.vala" return; -#line 565 "gkr-item.c" +#line 556 "gkr-item.c" } -#line 156 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 156 "/data/src/seahorse/gkr/gkr-item.vala" memset (&_tmp1_, 0, sizeof (SeahorseGkrDisplayInfo)); -#line 156 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 156 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = _tmp1_; -#line 156 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 156 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = _seahorse_gkr_display_info_dup0 (&_tmp2_); -#line 156 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 156 "/data/src/seahorse/gkr/gkr-item.vala" _seahorse_gkr_display_info_free0 (self->priv->_info); -#line 156 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 156 "/data/src/seahorse/gkr/gkr-item.vala" self->priv->_info = _tmp3_; -#line 156 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 156 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_display_info_destroy (&_tmp2_); -#line 158 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 158 "/data/src/seahorse/gkr/gkr-item.vala" g_object_get ((SecretItem*) self, "attributes", &_tmp4_, NULL); -#line 158 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 158 "/data/src/seahorse/gkr/gkr-item.vala" _tmp5_ = _tmp4_; -#line 158 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 158 "/data/src/seahorse/gkr/gkr-item.vala" attrs = _tmp5_; -#line 159 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 159 "/data/src/seahorse/gkr/gkr-item.vala" _tmp6_ = attrs; -#line 159 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 159 "/data/src/seahorse/gkr/gkr-item.vala" _tmp7_ = seahorse_gkr_get_attribute_string (_tmp6_, "xdg:schema"); -#line 159 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 159 "/data/src/seahorse/gkr/gkr-item.vala" item_type = _tmp7_; -#line 160 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 160 "/data/src/seahorse/gkr/gkr-item.vala" _tmp8_ = item_type; -#line 160 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 160 "/data/src/seahorse/gkr/gkr-item.vala" _tmp9_ = attrs; -#line 160 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 160 "/data/src/seahorse/gkr/gkr-item.vala" _tmp10_ = seahorse_gkr_map_item_type_to_specific (_tmp8_, _tmp9_); -#line 160 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 160 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (item_type); -#line 160 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 160 "/data/src/seahorse/gkr/gkr-item.vala" item_type = _tmp10_; -#line 161 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 161 "/data/src/seahorse/gkr/gkr-item.vala" _tmp11_ = item_type; -#line 161 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 161 "/data/src/seahorse/gkr/gkr-item.vala" _vala_assert (_tmp11_ != NULL, "item_type != null"); -#line 162 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 162 "/data/src/seahorse/gkr/gkr-item.vala" _tmp12_ = self->priv->_info; -#line 162 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 162 "/data/src/seahorse/gkr/gkr-item.vala" _tmp13_ = item_type; -#line 162 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 162 "/data/src/seahorse/gkr/gkr-item.vala" _tmp14_ = g_strdup (_tmp13_); -#line 162 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 162 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*_tmp12_).item_type); -#line 162 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 162 "/data/src/seahorse/gkr/gkr-item.vala" (*_tmp12_).item_type = _tmp14_; -#line 164 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 164 "/data/src/seahorse/gkr/gkr-item.vala" _tmp15_ = secret_item_get_label (G_TYPE_CHECK_INSTANCE_CAST (self, secret_item_get_type (), SecretItem)); -#line 164 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 164 "/data/src/seahorse/gkr/gkr-item.vala" label = _tmp15_; -#line 619 "gkr-item.c" +#line 610 "gkr-item.c" { SeahorseGkrDisplayEntry* entry_collection = NULL; gint entry_collection_length1 = 0; gint _entry_collection_size_ = 0; gint entry_it = 0; -#line 165 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 165 "/data/src/seahorse/gkr/gkr-item.vala" entry_collection = SEAHORSE_GKR_DISPLAY_ENTRIES; -#line 165 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 165 "/data/src/seahorse/gkr/gkr-item.vala" entry_collection_length1 = G_N_ELEMENTS (SEAHORSE_GKR_DISPLAY_ENTRIES); -#line 165 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 165 "/data/src/seahorse/gkr/gkr-item.vala" for (entry_it = 0; entry_it < G_N_ELEMENTS (SEAHORSE_GKR_DISPLAY_ENTRIES); entry_it = entry_it + 1) { -#line 631 "gkr-item.c" +#line 622 "gkr-item.c" SeahorseGkrDisplayEntry entry = {0}; -#line 165 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 165 "/data/src/seahorse/gkr/gkr-item.vala" entry = entry_collection[entry_it]; -#line 635 "gkr-item.c" +#line 626 "gkr-item.c" { SeahorseGkrDisplayEntry _tmp16_ = {0}; const gchar* _tmp17_ = NULL; const gchar* _tmp18_ = NULL; -#line 166 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 166 "/data/src/seahorse/gkr/gkr-item.vala" _tmp16_ = entry; -#line 166 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 166 "/data/src/seahorse/gkr/gkr-item.vala" _tmp17_ = _tmp16_.item_type; -#line 166 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 166 "/data/src/seahorse/gkr/gkr-item.vala" _tmp18_ = item_type; -#line 166 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 166 "/data/src/seahorse/gkr/gkr-item.vala" if (g_strcmp0 (_tmp17_, _tmp18_) == 0) { -#line 648 "gkr-item.c" +#line 639 "gkr-item.c" SeahorseGkrDisplayEntry _tmp19_ = {0}; SeahorseGkrDisplayCustom _tmp20_ = NULL; SeahorseGkrDisplayInfo* _tmp25_ = NULL; const gchar* _tmp26_ = NULL; -#line 167 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 167 "/data/src/seahorse/gkr/gkr-item.vala" _tmp19_ = entry; -#line 167 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 167 "/data/src/seahorse/gkr/gkr-item.vala" _tmp20_ = _tmp19_.custom_func; -#line 167 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 167 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp20_ != NULL) { -#line 659 "gkr-item.c" +#line 650 "gkr-item.c" SeahorseGkrDisplayEntry _tmp21_ = {0}; SeahorseGkrDisplayCustom _tmp22_ = NULL; const gchar* _tmp23_ = NULL; GHashTable* _tmp24_ = NULL; -#line 168 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 168 "/data/src/seahorse/gkr/gkr-item.vala" _tmp21_ = entry; -#line 168 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 168 "/data/src/seahorse/gkr/gkr-item.vala" _tmp22_ = _tmp21_.custom_func; -#line 168 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 168 "/data/src/seahorse/gkr/gkr-item.vala" _tmp23_ = label; -#line 168 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 168 "/data/src/seahorse/gkr/gkr-item.vala" _tmp24_ = attrs; -#line 168 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 168 "/data/src/seahorse/gkr/gkr-item.vala" _tmp22_ (_tmp23_, _tmp24_, self->priv->_info); -#line 674 "gkr-item.c" +#line 665 "gkr-item.c" } -#line 169 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 169 "/data/src/seahorse/gkr/gkr-item.vala" _tmp25_ = self->priv->_info; -#line 169 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 169 "/data/src/seahorse/gkr/gkr-item.vala" _tmp26_ = (*_tmp25_).description; -#line 169 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 169 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp26_ == NULL) { -#line 682 "gkr-item.c" +#line 673 "gkr-item.c" SeahorseGkrDisplayInfo* _tmp27_ = NULL; SeahorseGkrDisplayEntry _tmp28_ = {0}; const gchar* _tmp29_ = NULL; const gchar* _tmp30_ = NULL; gchar* _tmp31_ = NULL; -#line 170 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 170 "/data/src/seahorse/gkr/gkr-item.vala" _tmp27_ = self->priv->_info; -#line 170 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 170 "/data/src/seahorse/gkr/gkr-item.vala" _tmp28_ = entry; -#line 170 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 170 "/data/src/seahorse/gkr/gkr-item.vala" _tmp29_ = _tmp28_.description; -#line 170 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 170 "/data/src/seahorse/gkr/gkr-item.vala" _tmp30_ = _ (_tmp29_); -#line 170 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 170 "/data/src/seahorse/gkr/gkr-item.vala" _tmp31_ = g_strdup (_tmp30_); -#line 170 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 170 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*_tmp27_).description); -#line 170 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 170 "/data/src/seahorse/gkr/gkr-item.vala" (*_tmp27_).description = _tmp31_; -#line 702 "gkr-item.c" +#line 693 "gkr-item.c" } -#line 171 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 171 "/data/src/seahorse/gkr/gkr-item.vala" break; -#line 706 "gkr-item.c" +#line 697 "gkr-item.c" } } } } -#line 175 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 175 "/data/src/seahorse/gkr/gkr-item.vala" _tmp32_ = self->priv->_info; -#line 175 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 175 "/data/src/seahorse/gkr/gkr-item.vala" _tmp33_ = (*_tmp32_).label; -#line 175 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 175 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp33_ == NULL) { -#line 717 "gkr-item.c" +#line 708 "gkr-item.c" SeahorseGkrDisplayInfo* _tmp34_ = NULL; const gchar* _tmp35_ = NULL; gchar* _tmp36_ = NULL; -#line 176 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 176 "/data/src/seahorse/gkr/gkr-item.vala" _tmp34_ = self->priv->_info; -#line 176 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 176 "/data/src/seahorse/gkr/gkr-item.vala" _tmp35_ = label; -#line 176 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 176 "/data/src/seahorse/gkr/gkr-item.vala" _tmp36_ = g_strdup (_tmp35_); -#line 176 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 176 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*_tmp34_).label); -#line 176 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 176 "/data/src/seahorse/gkr/gkr-item.vala" (*_tmp34_).label = _tmp36_; -#line 731 "gkr-item.c" +#line 722 "gkr-item.c" } -#line 177 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 177 "/data/src/seahorse/gkr/gkr-item.vala" _tmp37_ = self->priv->_info; -#line 177 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 177 "/data/src/seahorse/gkr/gkr-item.vala" _tmp38_ = (*_tmp37_).label; -#line 177 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 177 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp38_ == NULL) { -#line 739 "gkr-item.c" +#line 730 "gkr-item.c" SeahorseGkrDisplayInfo* _tmp39_ = NULL; gchar* _tmp40_ = NULL; -#line 178 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 178 "/data/src/seahorse/gkr/gkr-item.vala" _tmp39_ = self->priv->_info; -#line 178 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 178 "/data/src/seahorse/gkr/gkr-item.vala" _tmp40_ = g_strdup (""); -#line 178 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 178 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*_tmp39_).label); -#line 178 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 178 "/data/src/seahorse/gkr/gkr-item.vala" (*_tmp39_).label = _tmp40_; -#line 750 "gkr-item.c" +#line 741 "gkr-item.c" } -#line 179 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 179 "/data/src/seahorse/gkr/gkr-item.vala" _tmp41_ = self->priv->_info; -#line 179 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 179 "/data/src/seahorse/gkr/gkr-item.vala" _tmp42_ = (*_tmp41_).details; -#line 179 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 179 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp42_ == NULL) { -#line 758 "gkr-item.c" +#line 749 "gkr-item.c" SeahorseGkrDisplayInfo* _tmp43_ = NULL; gchar* _tmp44_ = NULL; -#line 180 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 180 "/data/src/seahorse/gkr/gkr-item.vala" _tmp43_ = self->priv->_info; -#line 180 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 180 "/data/src/seahorse/gkr/gkr-item.vala" _tmp44_ = g_strdup (""); -#line 180 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 180 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*_tmp43_).details); -#line 180 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 180 "/data/src/seahorse/gkr/gkr-item.vala" (*_tmp43_).details = _tmp44_; -#line 769 "gkr-item.c" +#line 760 "gkr-item.c" } -#line 152 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 152 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (label); -#line 152 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 152 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (item_type); -#line 152 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 152 "/data/src/seahorse/gkr/gkr-item.vala" _g_hash_table_unref0 (attrs); -#line 777 "gkr-item.c" +#line 768 "gkr-item.c" } static void ___lambda18_ (SeahorseGkrItem* self, GObject* obj, GAsyncResult* res) { GError * _inner_error_ = NULL; -#line 186 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 186 "/data/src/seahorse/gkr/gkr-item.vala" g_return_if_fail (res != NULL); -#line 785 "gkr-item.c" +#line 776 "gkr-item.c" { GAsyncResult* _tmp0_ = NULL; SecretValue* _tmp1_ = NULL; -#line 188 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 188 "/data/src/seahorse/gkr/gkr-item.vala" _g_object_unref0 (self->priv->_req_secret); -#line 188 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 188 "/data/src/seahorse/gkr/gkr-item.vala" self->priv->_req_secret = NULL; -#line 189 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 189 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = res; -#line 189 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 189 "/data/src/seahorse/gkr/gkr-item.vala" secret_item_load_secret_finish ((SecretItem*) self, _tmp0_, &_inner_error_); -#line 189 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 189 "/data/src/seahorse/gkr/gkr-item.vala" if (_inner_error_ != NULL) { -#line 799 "gkr-item.c" +#line 790 "gkr-item.c" goto __catch2_g_error; } -#line 190 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 190 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = secret_item_get_secret (G_TYPE_CHECK_INSTANCE_CAST (self, secret_item_get_type (), SecretItem)); -#line 190 "/data/projects/seahorse/gkr/gkr-item.vala" - __vala_SecretValue_free0 (self->priv->_item_secret); -#line 190 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 190 "/data/src/seahorse/gkr/gkr-item.vala" + _secret_value_unref0 (self->priv->_item_secret); +#line 190 "/data/src/seahorse/gkr/gkr-item.vala" self->priv->_item_secret = _tmp1_; -#line 191 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 191 "/data/src/seahorse/gkr/gkr-item.vala" g_object_notify ((GObject*) self, "has-secret"); -#line 810 "gkr-item.c" +#line 801 "gkr-item.c" } goto __finally2; __catch2_g_error: @@ -814,97 +805,90 @@ GError* err = NULL; GError* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; -#line 187 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 187 "/data/src/seahorse/gkr/gkr-item.vala" err = _inner_error_; -#line 187 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 187 "/data/src/seahorse/gkr/gkr-item.vala" _inner_error_ = NULL; -#line 193 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 193 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = err; -#line 193 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 193 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = _tmp2_->message; -#line 193 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 193 "/data/src/seahorse/gkr/gkr-item.vala" g_warning ("gkr-item.vala:193: Couldn't retrieve secret: %s", _tmp3_); -#line 187 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 187 "/data/src/seahorse/gkr/gkr-item.vala" _g_error_free0 (err); -#line 830 "gkr-item.c" +#line 821 "gkr-item.c" } __finally2: -#line 187 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 187 "/data/src/seahorse/gkr/gkr-item.vala" if (_inner_error_ != NULL) { -#line 187 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 187 "/data/src/seahorse/gkr/gkr-item.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 187 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 187 "/data/src/seahorse/gkr/gkr-item.vala" g_clear_error (&_inner_error_); -#line 187 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 187 "/data/src/seahorse/gkr/gkr-item.vala" return; -#line 841 "gkr-item.c" +#line 832 "gkr-item.c" } } static void ____lambda18__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 186 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 186 "/data/src/seahorse/gkr/gkr-item.vala" ___lambda18_ (self, source_object, res); -#line 186 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 186 "/data/src/seahorse/gkr/gkr-item.vala" g_object_unref (self); -#line 851 "gkr-item.c" +#line 842 "gkr-item.c" } static void seahorse_gkr_item_load_item_secret (SeahorseGkrItem* self) { GCancellable* _tmp0_ = NULL; -#line 183 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 183 "/data/src/seahorse/gkr/gkr-item.vala" g_return_if_fail (self != NULL); -#line 184 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 184 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = self->priv->_req_secret; -#line 184 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 184 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp0_ == NULL) { -#line 863 "gkr-item.c" +#line 854 "gkr-item.c" GCancellable* _tmp1_ = NULL; GCancellable* _tmp2_ = NULL; -#line 185 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 185 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = g_cancellable_new (); -#line 185 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 185 "/data/src/seahorse/gkr/gkr-item.vala" _g_object_unref0 (self->priv->_req_secret); -#line 185 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 185 "/data/src/seahorse/gkr/gkr-item.vala" self->priv->_req_secret = _tmp1_; -#line 186 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 186 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = self->priv->_req_secret; -#line 186 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 186 "/data/src/seahorse/gkr/gkr-item.vala" secret_item_load_secret ((SecretItem*) self, _tmp2_, ____lambda18__gasync_ready_callback, g_object_ref (self)); -#line 876 "gkr-item.c" +#line 867 "gkr-item.c" } } void seahorse_gkr_item_refresh (SeahorseGkrItem* self) { SecretValue* _tmp0_ = NULL; -#line 200 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 200 "/data/src/seahorse/gkr/gkr-item.vala" g_return_if_fail (self != NULL); -#line 201 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 201 "/data/src/seahorse/gkr/gkr-item.vala" secret_item_refresh (G_TYPE_CHECK_INSTANCE_CAST (self, secret_item_get_type (), SecretItem)); -#line 202 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 202 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = self->priv->_item_secret; -#line 202 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 202 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp0_ != NULL) { -#line 203 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 203 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_item_load_item_secret (self); -#line 893 "gkr-item.c" +#line 884 "gkr-item.c" } } -static SecretValue* _vala_SecretValue_copy (SecretValue* self) { -#line 209 "/data/projects/seahorse/gkr/gkr-item.vala" - return g_boxed_copy (secret_value_get_type (), self); -#line 901 "gkr-item.c" -} - - -static gpointer __vala_SecretValue_copy0 (gpointer self) { -#line 209 "/data/projects/seahorse/gkr/gkr-item.vala" - return self ? _vala_SecretValue_copy (self) : NULL; -#line 908 "gkr-item.c" +static gpointer _secret_value_ref0 (gpointer self) { +#line 209 "/data/src/seahorse/gkr/gkr-item.vala" + return self ? secret_value_ref (self) : NULL; +#line 892 "gkr-item.c" } @@ -913,25 +897,25 @@ SecretValue* _tmp0_ = NULL; SecretValue* _tmp1_ = NULL; SecretValue* _tmp2_ = NULL; -#line 206 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 206 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (self != NULL, NULL); -#line 207 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 207 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = self->priv->_item_secret; -#line 207 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 207 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp0_ == NULL) { -#line 208 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 208 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_item_load_item_secret (self); -#line 925 "gkr-item.c" +#line 909 "gkr-item.c" } -#line 209 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 209 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = self->priv->_item_secret; -#line 209 "/data/projects/seahorse/gkr/gkr-item.vala" - _tmp2_ = __vala_SecretValue_copy0 (_tmp1_); -#line 209 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 209 "/data/src/seahorse/gkr/gkr-item.vala" + _tmp2_ = _secret_value_ref0 (_tmp1_); +#line 209 "/data/src/seahorse/gkr/gkr-item.vala" result = _tmp2_; -#line 209 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 209 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 935 "gkr-item.c" +#line 919 "gkr-item.c" } @@ -948,71 +932,71 @@ gconstpointer _tmp8_ = NULL; gchar* _tmp9_ = NULL; gchar* _tmp10_ = NULL; -#line 212 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 212 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (self != NULL, NULL); -#line 212 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 212 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (name != NULL, NULL); -#line 213 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 213 "/data/src/seahorse/gkr/gkr-item.vala" g_object_get ((SecretItem*) self, "attributes", &_tmp0_, NULL); -#line 213 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 213 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = _tmp0_; -#line 213 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 213 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = _tmp1_; -#line 213 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 213 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = _tmp2_ == NULL; -#line 213 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 213 "/data/src/seahorse/gkr/gkr-item.vala" _g_hash_table_unref0 (_tmp2_); -#line 213 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 213 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp3_) { -#line 214 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 214 "/data/src/seahorse/gkr/gkr-item.vala" result = NULL; -#line 214 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 214 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 972 "gkr-item.c" +#line 956 "gkr-item.c" } -#line 215 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 215 "/data/src/seahorse/gkr/gkr-item.vala" g_object_get ((SecretItem*) self, "attributes", &_tmp4_, NULL); -#line 215 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 215 "/data/src/seahorse/gkr/gkr-item.vala" _tmp5_ = _tmp4_; -#line 215 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 215 "/data/src/seahorse/gkr/gkr-item.vala" _tmp6_ = _tmp5_; -#line 215 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 215 "/data/src/seahorse/gkr/gkr-item.vala" _tmp7_ = name; -#line 215 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 215 "/data/src/seahorse/gkr/gkr-item.vala" _tmp8_ = g_hash_table_lookup (_tmp6_, _tmp7_); -#line 215 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 215 "/data/src/seahorse/gkr/gkr-item.vala" _tmp9_ = g_strdup ((const gchar*) _tmp8_); -#line 215 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 215 "/data/src/seahorse/gkr/gkr-item.vala" _tmp10_ = _tmp9_; -#line 215 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 215 "/data/src/seahorse/gkr/gkr-item.vala" _g_hash_table_unref0 (_tmp6_); -#line 215 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 215 "/data/src/seahorse/gkr/gkr-item.vala" result = _tmp10_; -#line 215 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 215 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 994 "gkr-item.c" +#line 978 "gkr-item.c" } static void seahorse_gkr_item_set_secret_data_free (gpointer _data) { SeahorseGkrItemSetSecretData* _data_; _data_ = _data; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" - __vala_SecretValue_free0 (_data_->value); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" + _secret_value_unref0 (_data_->value); +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" _g_object_unref0 (_data_->cancellable); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" _g_object_unref0 (_data_->self); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_slice_free (SeahorseGkrItemSetSecretData, _data_); -#line 1009 "gkr-item.c" +#line 993 "gkr-item.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" return self ? g_object_ref (self) : NULL; -#line 1016 "gkr-item.c" +#line 1000 "gkr-item.c" } @@ -1023,190 +1007,190 @@ SecretValue* _tmp2_ = NULL; GCancellable* _tmp3_ = NULL; GCancellable* _tmp4_ = NULL; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" _data_ = g_slice_new0 (SeahorseGkrItemSetSecretData); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, seahorse_gkr_item_set_secret); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, seahorse_gkr_item_set_secret_data_free); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = _g_object_ref0 (self); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" _data_->self = _tmp0_; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = value; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" - _tmp2_ = __vala_SecretValue_copy0 (_tmp1_); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" - __vala_SecretValue_free0 (_data_->value); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" + _tmp2_ = _secret_value_ref0 (_tmp1_); +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" + _secret_value_unref0 (_data_->value); +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" _data_->value = _tmp2_; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = cancellable; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = _g_object_ref0 (_tmp3_); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" _g_object_unref0 (_data_->cancellable); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" _data_->cancellable = _tmp4_; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_item_set_secret_co (_data_); -#line 1055 "gkr-item.c" +#line 1039 "gkr-item.c" } gboolean seahorse_gkr_item_set_secret_finish (SeahorseGkrItem* self, GAsyncResult* _res_, GError** error) { gboolean result; SeahorseGkrItemSetSecretData* _data_; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" return FALSE; -#line 1066 "gkr-item.c" +#line 1050 "gkr-item.c" } -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" result = _data_->result; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1074 "gkr-item.c" +#line 1058 "gkr-item.c" } static void seahorse_gkr_item_set_secret_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { SeahorseGkrItemSetSecretData* _data_; -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" _data_ = _user_data_; -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_source_object_ = source_object; -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_res_ = _res_; -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_item_set_secret_co (_data_); -#line 1088 "gkr-item.c" +#line 1072 "gkr-item.c" } static gboolean seahorse_gkr_item_set_secret_co (SeahorseGkrItemSetSecretData* _data_) { -#line 218 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 218 "/data/src/seahorse/gkr/gkr-item.vala" switch (_data_->_state_) { -#line 218 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 218 "/data/src/seahorse/gkr/gkr-item.vala" case 0: -#line 1097 "gkr-item.c" +#line 1081 "gkr-item.c" goto _state_0; -#line 218 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 218 "/data/src/seahorse/gkr/gkr-item.vala" case 1: -#line 1101 "gkr-item.c" +#line 1085 "gkr-item.c" goto _state_1; default: -#line 218 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 218 "/data/src/seahorse/gkr/gkr-item.vala" g_assert_not_reached (); -#line 1106 "gkr-item.c" +#line 1090 "gkr-item.c" } _state_0: -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_tmp0_ = NULL; -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_tmp0_ = _data_->value; -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_tmp1_ = NULL; -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_tmp1_ = _data_->cancellable; -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_state_ = 1; -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" secret_item_set_secret (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, secret_item_get_type (), SecretItem), _data_->_tmp0_, _data_->_tmp1_, seahorse_gkr_item_set_secret_ready, _data_); -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" return FALSE; -#line 1123 "gkr-item.c" +#line 1107 "gkr-item.c" _state_1: -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" secret_item_set_secret_finish (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, secret_item_get_type (), SecretItem), _data_->_res_, &_data_->_inner_error_); -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" if (_data_->_inner_error_ != NULL) { -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" g_error_free (_data_->_inner_error_); -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" if (_data_->_state_ == 0) { -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1137 "gkr-item.c" +#line 1121 "gkr-item.c" } else { -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1141 "gkr-item.c" +#line 1125 "gkr-item.c" } -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" g_object_unref (_data_->_async_result); -#line 220 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 220 "/data/src/seahorse/gkr/gkr-item.vala" return FALSE; -#line 1147 "gkr-item.c" +#line 1131 "gkr-item.c" } -#line 221 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 221 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_tmp2_ = NULL; -#line 221 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 221 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_tmp2_ = _data_->value; -#line 221 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 221 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_tmp3_ = NULL; -#line 221 "/data/projects/seahorse/gkr/gkr-item.vala" - _data_->_tmp3_ = __vala_SecretValue_copy0 (_data_->_tmp2_); -#line 221 "/data/projects/seahorse/gkr/gkr-item.vala" - __vala_SecretValue_free0 (_data_->self->priv->_item_secret); -#line 221 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 221 "/data/src/seahorse/gkr/gkr-item.vala" + _data_->_tmp3_ = _secret_value_ref0 (_data_->_tmp2_); +#line 221 "/data/src/seahorse/gkr/gkr-item.vala" + _secret_value_unref0 (_data_->self->priv->_item_secret); +#line 221 "/data/src/seahorse/gkr/gkr-item.vala" _data_->self->priv->_item_secret = _data_->_tmp3_; -#line 222 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 222 "/data/src/seahorse/gkr/gkr-item.vala" g_object_notify ((GObject*) _data_->self, "has-secret"); -#line 223 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 223 "/data/src/seahorse/gkr/gkr-item.vala" _data_->result = TRUE; -#line 223 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 223 "/data/src/seahorse/gkr/gkr-item.vala" if (_data_->_state_ == 0) { -#line 223 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 223 "/data/src/seahorse/gkr/gkr-item.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1169 "gkr-item.c" +#line 1153 "gkr-item.c" } else { -#line 223 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 223 "/data/src/seahorse/gkr/gkr-item.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1173 "gkr-item.c" +#line 1157 "gkr-item.c" } -#line 223 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 223 "/data/src/seahorse/gkr/gkr-item.vala" g_object_unref (_data_->_async_result); -#line 223 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 223 "/data/src/seahorse/gkr/gkr-item.vala" return FALSE; -#line 218 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 218 "/data/src/seahorse/gkr/gkr-item.vala" if (_data_->_state_ == 0) { -#line 218 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 218 "/data/src/seahorse/gkr/gkr-item.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 1183 "gkr-item.c" +#line 1167 "gkr-item.c" } else { -#line 218 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 218 "/data/src/seahorse/gkr/gkr-item.vala" g_simple_async_result_complete (_data_->_async_result); -#line 1187 "gkr-item.c" +#line 1171 "gkr-item.c" } -#line 218 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 218 "/data/src/seahorse/gkr/gkr-item.vala" g_object_unref (_data_->_async_result); -#line 218 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 218 "/data/src/seahorse/gkr/gkr-item.vala" return FALSE; -#line 1193 "gkr-item.c" +#line 1177 "gkr-item.c" } SeahorseGkrItem* seahorse_gkr_item_construct (GType object_type) { SeahorseGkrItem * self = NULL; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" self = (SeahorseGkrItem*) g_object_new (object_type, NULL); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" return self; -#line 1203 "gkr-item.c" +#line 1187 "gkr-item.c" } SeahorseGkrItem* seahorse_gkr_item_new (void) { -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" return seahorse_gkr_item_construct (SEAHORSE_GKR_TYPE_ITEM); -#line 1210 "gkr-item.c" +#line 1194 "gkr-item.c" } @@ -1215,21 +1199,21 @@ SeahorseGkrDisplayInfo* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 54 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 54 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (self != NULL, NULL); -#line 55 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 55 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_item_ensure_display_info (self); -#line 56 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 56 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = self->priv->_info; -#line 56 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 56 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = (*_tmp0_).description; -#line 56 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 56 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = g_strdup (_tmp1_); -#line 56 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 56 "/data/src/seahorse/gkr/gkr-item.vala" result = _tmp2_; -#line 56 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 56 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1233 "gkr-item.c" +#line 1217 "gkr-item.c" } @@ -1240,118 +1224,118 @@ gboolean _tmp1_ = FALSE; const gchar* _tmp2_ = NULL; gboolean _tmp4_ = FALSE; -#line 61 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 61 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (self != NULL, 0); -#line 62 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 62 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = seahorse_gkr_item_get_attribute (self, "xdg:schema"); -#line 62 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 62 "/data/src/seahorse/gkr/gkr-item.vala" schema_name = _tmp0_; -#line 63 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 63 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = schema_name; -#line 63 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 63 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp2_ != NULL) { -#line 1254 "gkr-item.c" +#line 1238 "gkr-item.c" const gchar* _tmp3_ = NULL; -#line 63 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 63 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = schema_name; -#line 63 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 63 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = g_strcmp0 (_tmp3_, SEAHORSE_GKR_NETWORK_PASSWORD) == 0; -#line 1260 "gkr-item.c" +#line 1244 "gkr-item.c" } else { -#line 63 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 63 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = FALSE; -#line 1264 "gkr-item.c" +#line 1248 "gkr-item.c" } -#line 63 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 63 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = _tmp1_; -#line 63 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 63 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp4_) { -#line 64 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 64 "/data/src/seahorse/gkr/gkr-item.vala" result = SEAHORSE_GKR_USE_NETWORK; -#line 64 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 64 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (schema_name); -#line 64 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 64 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1276 "gkr-item.c" +#line 1260 "gkr-item.c" } -#line 65 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 65 "/data/src/seahorse/gkr/gkr-item.vala" result = SEAHORSE_GKR_USE_OTHER; -#line 65 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 65 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (schema_name); -#line 65 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 65 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1284 "gkr-item.c" +#line 1268 "gkr-item.c" } gboolean seahorse_gkr_item_get_has_secret (SeahorseGkrItem* self) { gboolean result; SecretValue* _tmp0_ = NULL; -#line 70 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 70 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 70 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 70 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = self->priv->_item_secret; -#line 70 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 70 "/data/src/seahorse/gkr/gkr-item.vala" result = _tmp0_ != NULL; -#line 70 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 70 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1299 "gkr-item.c" +#line 1283 "gkr-item.c" } SeahorseGkrKeyring* seahorse_gkr_item_get_place (SeahorseGkrItem* self) { SeahorseGkrKeyring* result; GObject* _tmp0_ = NULL; -#line 74 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 74 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (self != NULL, NULL); -#line 74 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 74 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = g_weak_ref_get (&self->priv->_place); -#line 74 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 74 "/data/src/seahorse/gkr/gkr-item.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SEAHORSE_GKR_TYPE_KEYRING, SeahorseGkrKeyring); -#line 74 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 74 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1314 "gkr-item.c" +#line 1298 "gkr-item.c" } void seahorse_gkr_item_set_place (SeahorseGkrItem* self, SeahorseGkrKeyring* value) { SeahorseGkrKeyring* _tmp0_ = NULL; -#line 75 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 75 "/data/src/seahorse/gkr/gkr-item.vala" g_return_if_fail (self != NULL); -#line 75 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 75 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = value; -#line 75 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 75 "/data/src/seahorse/gkr/gkr-item.vala" g_weak_ref_set (&self->priv->_place, (GObject*) _tmp0_); -#line 75 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 75 "/data/src/seahorse/gkr/gkr-item.vala" g_object_notify ((GObject *) self, "place"); -#line 1328 "gkr-item.c" +#line 1312 "gkr-item.c" } SeahorseFlags seahorse_gkr_item_get_object_flags (SeahorseGkrItem* self) { SeahorseFlags result; -#line 79 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 79 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (self != NULL, 0); -#line 79 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 79 "/data/src/seahorse/gkr/gkr-item.vala" result = SEAHORSE_FLAG_DELETABLE | SEAHORSE_FLAG_PERSONAL; -#line 79 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 79 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1340 "gkr-item.c" +#line 1324 "gkr-item.c" } GIcon* seahorse_gkr_item_get_icon (SeahorseGkrItem* self) { GIcon* result; GThemedIcon* _tmp0_ = NULL; -#line 83 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 83 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (self != NULL, NULL); -#line 83 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 83 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = (GThemedIcon*) g_themed_icon_new (SEAHORSE_ICON_PASSWORD); -#line 83 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 83 "/data/src/seahorse/gkr/gkr-item.vala" result = (GIcon*) _tmp0_; -#line 83 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 83 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1355 "gkr-item.c" +#line 1339 "gkr-item.c" } @@ -1360,21 +1344,21 @@ SeahorseGkrDisplayInfo* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 87 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 87 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (self != NULL, NULL); -#line 88 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 88 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_item_ensure_display_info (self); -#line 89 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 89 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = self->priv->_info; -#line 89 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 89 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = (*_tmp0_).label; -#line 89 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 89 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = g_strdup (_tmp1_); -#line 89 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 89 "/data/src/seahorse/gkr/gkr-item.vala" result = _tmp2_; -#line 89 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 89 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1378 "gkr-item.c" +#line 1362 "gkr-item.c" } @@ -1390,120 +1374,120 @@ const gchar* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; -#line 94 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 94 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (self != NULL, NULL); -#line 95 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 95 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_item_ensure_display_info (self); -#line 96 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 96 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = g_string_new (""); -#line 96 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 96 "/data/src/seahorse/gkr/gkr-item.vala" _result_ = _tmp0_; -#line 97 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 97 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = self->priv->_info; -#line 97 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 97 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = (*_tmp1_).label; -#line 97 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 97 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = g_markup_escape_text (_tmp2_, (gssize) (-1)); -#line 97 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 97 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = _tmp3_; -#line 97 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 97 "/data/src/seahorse/gkr/gkr-item.vala" g_string_append (_result_, _tmp4_); -#line 97 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 97 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (_tmp4_); -#line 98 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 98 "/data/src/seahorse/gkr/gkr-item.vala" g_string_append (_result_, "\n"); -#line 99 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 99 "/data/src/seahorse/gkr/gkr-item.vala" _tmp5_ = self->priv->_info; -#line 99 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 99 "/data/src/seahorse/gkr/gkr-item.vala" _tmp6_ = (*_tmp5_).details; -#line 99 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 99 "/data/src/seahorse/gkr/gkr-item.vala" g_string_append (_result_, _tmp6_); -#line 100 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 100 "/data/src/seahorse/gkr/gkr-item.vala" g_string_append (_result_, ""); -#line 101 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 101 "/data/src/seahorse/gkr/gkr-item.vala" _tmp7_ = _result_->str; -#line 101 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 101 "/data/src/seahorse/gkr/gkr-item.vala" _tmp8_ = g_strdup (_tmp7_); -#line 101 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 101 "/data/src/seahorse/gkr/gkr-item.vala" result = _tmp8_; -#line 101 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 101 "/data/src/seahorse/gkr/gkr-item.vala" _g_string_free0 (_result_); -#line 101 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 101 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1434 "gkr-item.c" +#line 1418 "gkr-item.c" } SeahorseUsage seahorse_gkr_item_get_usage (SeahorseGkrItem* self) { SeahorseUsage result; -#line 106 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 106 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (self != NULL, 0); -#line 106 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 106 "/data/src/seahorse/gkr/gkr-item.vala" result = SEAHORSE_USAGE_CREDENTIALS; -#line 106 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 106 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1446 "gkr-item.c" +#line 1430 "gkr-item.c" } GtkActionGroup* seahorse_gkr_item_get_actions (SeahorseGkrItem* self) { GtkActionGroup* result; -#line 110 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 110 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (self != NULL, NULL); -#line 110 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 110 "/data/src/seahorse/gkr/gkr-item.vala" result = NULL; -#line 110 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 110 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1458 "gkr-item.c" +#line 1442 "gkr-item.c" } static gboolean seahorse_gkr_item_real_get_deletable (SeahorseDeletable* base) { gboolean result; SeahorseGkrItem* self; -#line 114 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 114 "/data/src/seahorse/gkr/gkr-item.vala" self = (SeahorseGkrItem*) base; -#line 114 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 114 "/data/src/seahorse/gkr/gkr-item.vala" result = TRUE; -#line 114 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 114 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1471 "gkr-item.c" +#line 1455 "gkr-item.c" } static void _seahorse_gkr_item___lambda28_ (SeahorseGkrItem* self, GVariant* changed_properties, gchar** invalidated_properties, int invalidated_properties_length1) { -#line 123 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 123 "/data/src/seahorse/gkr/gkr-item.vala" g_return_if_fail (changed_properties != NULL); -#line 124 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 124 "/data/src/seahorse/gkr/gkr-item.vala" _seahorse_gkr_display_info_free0 (self->priv->_info); -#line 124 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 124 "/data/src/seahorse/gkr/gkr-item.vala" self->priv->_info = NULL; -#line 125 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 125 "/data/src/seahorse/gkr/gkr-item.vala" g_object_freeze_notify ((GObject*) self); -#line 126 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 126 "/data/src/seahorse/gkr/gkr-item.vala" g_object_notify ((GObject*) self, "has-secret"); -#line 127 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 127 "/data/src/seahorse/gkr/gkr-item.vala" g_object_notify ((GObject*) self, "use"); -#line 128 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 128 "/data/src/seahorse/gkr/gkr-item.vala" g_object_notify ((GObject*) self, "label"); -#line 129 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 129 "/data/src/seahorse/gkr/gkr-item.vala" g_object_notify ((GObject*) self, "icon"); -#line 130 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 130 "/data/src/seahorse/gkr/gkr-item.vala" g_object_notify ((GObject*) self, "markup"); -#line 131 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 131 "/data/src/seahorse/gkr/gkr-item.vala" g_object_notify ((GObject*) self, "description"); -#line 132 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 132 "/data/src/seahorse/gkr/gkr-item.vala" g_object_notify ((GObject*) self, "object-flags"); -#line 133 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 133 "/data/src/seahorse/gkr/gkr-item.vala" g_object_thaw_notify ((GObject*) self); -#line 1500 "gkr-item.c" +#line 1484 "gkr-item.c" } static void __seahorse_gkr_item___lambda28__g_dbus_proxy_g_properties_changed (GDBusProxy* _sender, GVariant* changed_properties, gchar** invalidated_properties, gpointer self) { -#line 123 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 123 "/data/src/seahorse/gkr/gkr-item.vala" _seahorse_gkr_item___lambda28_ (self, changed_properties, invalidated_properties, _vala_array_length (invalidated_properties)); -#line 1507 "gkr-item.c" +#line 1491 "gkr-item.c" } @@ -1511,109 +1495,109 @@ GObject * obj; GObjectClass * parent_class; SeahorseGkrItem * self; -#line 122 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 122 "/data/src/seahorse/gkr/gkr-item.vala" parent_class = G_OBJECT_CLASS (seahorse_gkr_item_parent_class); -#line 122 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 122 "/data/src/seahorse/gkr/gkr-item.vala" obj = parent_class->constructor (type, n_construct_properties, construct_properties); -#line 122 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 122 "/data/src/seahorse/gkr/gkr-item.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_GKR_TYPE_ITEM, SeahorseGkrItem); -#line 123 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 123 "/data/src/seahorse/gkr/gkr-item.vala" g_signal_connect_object ((GDBusProxy*) self, "g-properties-changed", (GCallback) __seahorse_gkr_item___lambda28__g_dbus_proxy_g_properties_changed, self, 0); -#line 122 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 122 "/data/src/seahorse/gkr/gkr-item.vala" return obj; -#line 1525 "gkr-item.c" +#line 1509 "gkr-item.c" } static void seahorse_gkr_item_class_init (SeahorseGkrItemClass * klass) { -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_item_parent_class = g_type_class_peek_parent (klass); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_type_class_add_private (klass, sizeof (SeahorseGkrItemPrivate)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" G_OBJECT_CLASS (klass)->dispose = seahorse_gkr_item_real_dispose; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" G_OBJECT_CLASS (klass)->get_property = _vala_seahorse_gkr_item_get_property; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" G_OBJECT_CLASS (klass)->set_property = _vala_seahorse_gkr_item_set_property; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" G_OBJECT_CLASS (klass)->constructor = seahorse_gkr_item_constructor; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" G_OBJECT_CLASS (klass)->finalize = seahorse_gkr_item_finalize; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_ITEM_DESCRIPTION, g_param_spec_string ("description", "description", "description", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_ITEM_USE, g_param_spec_enum ("use", "use", "use", SEAHORSE_GKR_TYPE_USE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_ITEM_HAS_SECRET, g_param_spec_boolean ("has-secret", "has-secret", "has-secret", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_ITEM_PLACE, g_param_spec_object ("place", "place", "place", SEAHORSE_GKR_TYPE_KEYRING, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_ITEM_OBJECT_FLAGS, g_param_spec_flags ("object-flags", "object-flags", "object-flags", SEAHORSE_TYPE_FLAGS, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_ITEM_ICON, g_param_spec_object ("icon", "icon", "icon", G_TYPE_ICON, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_ITEM_LABEL, g_param_spec_string ("label", "label", "label", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_ITEM_MARKUP, g_param_spec_string ("markup", "markup", "markup", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_ITEM_USAGE, g_param_spec_enum ("usage", "usage", "usage", SEAHORSE_TYPE_USAGE, 0, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_ITEM_ACTIONS, g_param_spec_object ("actions", "actions", "actions", GTK_TYPE_ACTION_GROUP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_ITEM_DELETABLE, g_param_spec_boolean ("deletable", "deletable", "deletable", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 1566 "gkr-item.c" +#line 1550 "gkr-item.c" } static void seahorse_gkr_item_seahorse_deletable_interface_init (SeahorseDeletableIface * iface) { -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_item_seahorse_deletable_parent_iface = g_type_interface_peek_parent (iface); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" iface->create_deleter = (SeahorseDeleter* (*)(SeahorseDeletable*)) seahorse_gkr_item_real_create_deleter; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" iface->get_deletable = seahorse_gkr_item_real_get_deletable; -#line 1577 "gkr-item.c" +#line 1561 "gkr-item.c" } static void seahorse_gkr_item_seahorse_viewable_interface_init (SeahorseViewableIface * iface) { -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_item_seahorse_viewable_parent_iface = g_type_interface_peek_parent (iface); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" iface->create_viewer = (GtkWindow* (*)(SeahorseViewable*, GtkWindow*)) seahorse_gkr_item_real_create_viewer; -#line 1586 "gkr-item.c" +#line 1570 "gkr-item.c" } static void seahorse_gkr_item_instance_init (SeahorseGkrItem * self) { -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" self->priv = SEAHORSE_GKR_ITEM_GET_PRIVATE (self); -#line 117 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 117 "/data/src/seahorse/gkr/gkr-item.vala" self->priv->_item_secret = NULL; -#line 118 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 118 "/data/src/seahorse/gkr/gkr-item.vala" self->priv->_info = NULL; -#line 120 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 120 "/data/src/seahorse/gkr/gkr-item.vala" self->priv->_req_secret = NULL; -#line 1599 "gkr-item.c" +#line 1583 "gkr-item.c" } static void seahorse_gkr_item_finalize (GObject* obj) { SeahorseGkrItem * self; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_GKR_TYPE_ITEM, SeahorseGkrItem); -#line 117 "/data/projects/seahorse/gkr/gkr-item.vala" - __vala_SecretValue_free0 (self->priv->_item_secret); -#line 118 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 117 "/data/src/seahorse/gkr/gkr-item.vala" + _secret_value_unref0 (self->priv->_item_secret); +#line 118 "/data/src/seahorse/gkr/gkr-item.vala" _seahorse_gkr_display_info_free0 (self->priv->_info); -#line 119 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 119 "/data/src/seahorse/gkr/gkr-item.vala" g_weak_ref_clear (&self->priv->_place); -#line 120 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 120 "/data/src/seahorse/gkr/gkr-item.vala" _g_object_unref0 (self->priv->_req_secret); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" G_OBJECT_CLASS (seahorse_gkr_item_parent_class)->finalize (obj); -#line 1617 "gkr-item.c" +#line 1601 "gkr-item.c" } @@ -1636,81 +1620,81 @@ static void _vala_seahorse_gkr_item_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { SeahorseGkrItem * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEAHORSE_GKR_TYPE_ITEM, SeahorseGkrItem); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" switch (property_id) { -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" case SEAHORSE_GKR_ITEM_DESCRIPTION: -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_value_take_string (value, seahorse_gkr_item_get_description (self)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" break; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" case SEAHORSE_GKR_ITEM_USE: -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_value_set_enum (value, seahorse_gkr_item_get_use (self)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" break; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" case SEAHORSE_GKR_ITEM_HAS_SECRET: -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_value_set_boolean (value, seahorse_gkr_item_get_has_secret (self)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" break; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" case SEAHORSE_GKR_ITEM_PLACE: -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_value_take_object (value, seahorse_gkr_item_get_place (self)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" break; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" case SEAHORSE_GKR_ITEM_OBJECT_FLAGS: -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_value_set_flags (value, seahorse_gkr_item_get_object_flags (self)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" break; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" case SEAHORSE_GKR_ITEM_ICON: -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_value_take_object (value, seahorse_gkr_item_get_icon (self)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" break; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" case SEAHORSE_GKR_ITEM_LABEL: -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_value_take_string (value, seahorse_gkr_item_get_label (self)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" break; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" case SEAHORSE_GKR_ITEM_MARKUP: -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_value_take_string (value, seahorse_gkr_item_get_markup (self)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" break; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" case SEAHORSE_GKR_ITEM_USAGE: -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_value_set_enum (value, seahorse_gkr_item_get_usage (self)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" break; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" case SEAHORSE_GKR_ITEM_ACTIONS: -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_value_set_object (value, seahorse_gkr_item_get_actions (self)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" break; -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" case SEAHORSE_GKR_ITEM_DELETABLE: -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" g_value_set_boolean (value, seahorse_deletable_get_deletable ((SeahorseDeletable*) self)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" break; -#line 1708 "gkr-item.c" +#line 1692 "gkr-item.c" default: -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" break; -#line 1714 "gkr-item.c" +#line 1698 "gkr-item.c" } } @@ -1718,21 +1702,21 @@ static void _vala_seahorse_gkr_item_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { SeahorseGkrItem * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEAHORSE_GKR_TYPE_ITEM, SeahorseGkrItem); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" switch (property_id) { -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" case SEAHORSE_GKR_ITEM_PLACE: -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_item_set_place (self, g_value_get_object (value)); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" break; -#line 1730 "gkr-item.c" +#line 1714 "gkr-item.c" default: -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 52 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 52 "/data/src/seahorse/gkr/gkr-item.vala" break; -#line 1736 "gkr-item.c" +#line 1720 "gkr-item.c" } } @@ -1744,31 +1728,31 @@ const gchar* _tmp2_ = NULL; gconstpointer _tmp3_ = NULL; gchar* _tmp4_ = NULL; -#line 239 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 239 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (name != NULL, NULL); -#line 241 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 241 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = attrs; -#line 241 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 241 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp0_ == NULL) { -#line 242 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 242 "/data/src/seahorse/gkr/gkr-item.vala" result = NULL; -#line 242 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 242 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1758 "gkr-item.c" +#line 1742 "gkr-item.c" } -#line 243 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 243 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = attrs; -#line 243 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 243 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = name; -#line 243 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 243 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = g_hash_table_lookup (_tmp1_, _tmp2_); -#line 243 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 243 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = g_strdup ((const gchar*) _tmp3_); -#line 243 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 243 "/data/src/seahorse/gkr/gkr-item.vala" result = _tmp4_; -#line 243 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 243 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1772 "gkr-item.c" +#line 1756 "gkr-item.c" } @@ -1781,54 +1765,54 @@ gconstpointer _tmp3_ = NULL; gchar* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; -#line 246 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 246 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (name != NULL, 0); -#line 249 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 249 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = attrs; -#line 249 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 249 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp0_ == NULL) { -#line 250 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 250 "/data/src/seahorse/gkr/gkr-item.vala" result = 0; -#line 250 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 250 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1795 "gkr-item.c" +#line 1779 "gkr-item.c" } -#line 252 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 252 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = attrs; -#line 252 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 252 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = name; -#line 252 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 252 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = g_hash_table_lookup (_tmp1_, _tmp2_); -#line 252 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 252 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = g_strdup ((const gchar*) _tmp3_); -#line 252 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 252 "/data/src/seahorse/gkr/gkr-item.vala" value = _tmp4_; -#line 253 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 253 "/data/src/seahorse/gkr/gkr-item.vala" _tmp5_ = value; -#line 253 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 253 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp5_ != NULL) { -#line 1811 "gkr-item.c" +#line 1795 "gkr-item.c" const gchar* _tmp6_ = NULL; gint _tmp7_ = 0; -#line 254 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 254 "/data/src/seahorse/gkr/gkr-item.vala" _tmp6_ = value; -#line 254 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 254 "/data/src/seahorse/gkr/gkr-item.vala" _tmp7_ = atoi (_tmp6_); -#line 254 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 254 "/data/src/seahorse/gkr/gkr-item.vala" result = _tmp7_; -#line 254 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 254 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (value); -#line 254 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 254 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1824 "gkr-item.c" +#line 1808 "gkr-item.c" } -#line 256 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 256 "/data/src/seahorse/gkr/gkr-item.vala" result = 0; -#line 256 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 256 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (value); -#line 256 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 256 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1832 "gkr-item.c" +#line 1816 "gkr-item.c" } @@ -1840,45 +1824,45 @@ gboolean _tmp2_ = FALSE; const gchar* _tmp3_ = NULL; gboolean _tmp7_ = FALSE; -#line 259 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 259 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (match != NULL, FALSE); -#line 262 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = attrs; -#line 262 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = seahorse_gkr_get_attribute_string (_tmp0_, "protocol"); -#line 262 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 262 "/data/src/seahorse/gkr/gkr-item.vala" protocol = _tmp1_; -#line 263 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 263 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = protocol; -#line 263 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 263 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp3_ != NULL) { -#line 1856 "gkr-item.c" +#line 1840 "gkr-item.c" const gchar* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; gint _tmp6_ = 0; -#line 263 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 263 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = protocol; -#line 263 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 263 "/data/src/seahorse/gkr/gkr-item.vala" _tmp5_ = match; -#line 263 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 263 "/data/src/seahorse/gkr/gkr-item.vala" _tmp6_ = g_ascii_strcasecmp (_tmp4_, _tmp5_); -#line 263 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 263 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = _tmp6_ == 0; -#line 1868 "gkr-item.c" +#line 1852 "gkr-item.c" } else { -#line 263 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 263 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = FALSE; -#line 1872 "gkr-item.c" +#line 1856 "gkr-item.c" } -#line 263 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 263 "/data/src/seahorse/gkr/gkr-item.vala" _tmp7_ = _tmp2_; -#line 263 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 263 "/data/src/seahorse/gkr/gkr-item.vala" result = _tmp7_; -#line 263 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 263 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (protocol); -#line 263 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 263 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1882 "gkr-item.c" +#line 1866 "gkr-item.c" } @@ -1895,84 +1879,84 @@ GString* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; const gchar* _tmp15_ = NULL; -#line 279 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 279 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = server; -#line 279 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 279 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp0_ == NULL) { -#line 280 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 280 "/data/src/seahorse/gkr/gkr-item.vala" result = TRUE; -#line 280 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 280 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1907 "gkr-item.c" +#line 1891 "gkr-item.c" } -#line 282 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 282 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = g_string_new (""); -#line 282 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 282 "/data/src/seahorse/gkr/gkr-item.vala" generated = _tmp1_; -#line 283 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 283 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = user; -#line 283 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 283 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp2_ != NULL) { -#line 1917 "gkr-item.c" +#line 1901 "gkr-item.c" GString* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; -#line 284 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 284 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = generated; -#line 284 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 284 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = user; -#line 284 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 284 "/data/src/seahorse/gkr/gkr-item.vala" g_string_append_printf (_tmp3_, "%s@", _tmp4_); -#line 1926 "gkr-item.c" +#line 1910 "gkr-item.c" } -#line 285 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 285 "/data/src/seahorse/gkr/gkr-item.vala" _tmp5_ = generated; -#line 285 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 285 "/data/src/seahorse/gkr/gkr-item.vala" _tmp6_ = server; -#line 285 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 285 "/data/src/seahorse/gkr/gkr-item.vala" g_string_append (_tmp5_, _tmp6_); -#line 286 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 286 "/data/src/seahorse/gkr/gkr-item.vala" _tmp7_ = port; -#line 286 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 286 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp7_ != 0) { -#line 1938 "gkr-item.c" +#line 1922 "gkr-item.c" GString* _tmp8_ = NULL; gint _tmp9_ = 0; -#line 287 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 287 "/data/src/seahorse/gkr/gkr-item.vala" _tmp8_ = generated; -#line 287 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 287 "/data/src/seahorse/gkr/gkr-item.vala" _tmp9_ = port; -#line 287 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 287 "/data/src/seahorse/gkr/gkr-item.vala" g_string_append_printf (_tmp8_, ":%d", _tmp9_); -#line 1947 "gkr-item.c" +#line 1931 "gkr-item.c" } -#line 288 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 288 "/data/src/seahorse/gkr/gkr-item.vala" _tmp10_ = object; -#line 288 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 288 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp10_ != NULL) { -#line 1953 "gkr-item.c" +#line 1937 "gkr-item.c" GString* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; -#line 289 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 289 "/data/src/seahorse/gkr/gkr-item.vala" _tmp11_ = generated; -#line 289 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 289 "/data/src/seahorse/gkr/gkr-item.vala" _tmp12_ = object; -#line 289 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 289 "/data/src/seahorse/gkr/gkr-item.vala" g_string_append_printf (_tmp11_, "/%s", _tmp12_); -#line 1962 "gkr-item.c" +#line 1946 "gkr-item.c" } -#line 291 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 291 "/data/src/seahorse/gkr/gkr-item.vala" _tmp13_ = generated; -#line 291 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 291 "/data/src/seahorse/gkr/gkr-item.vala" _tmp14_ = _tmp13_->str; -#line 291 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 291 "/data/src/seahorse/gkr/gkr-item.vala" _tmp15_ = display; -#line 291 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 291 "/data/src/seahorse/gkr/gkr-item.vala" result = g_strcmp0 (_tmp14_, _tmp15_) == 0; -#line 291 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 291 "/data/src/seahorse/gkr/gkr-item.vala" _g_string_free0 (generated); -#line 291 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 291 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 1976 "gkr-item.c" +#line 1960 "gkr-item.c" } @@ -1982,29 +1966,29 @@ GHashTable* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; gboolean _tmp4_ = FALSE; -#line 298 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 298 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = attrs; -#line 298 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 298 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = seahorse_gkr_is_network_item (_tmp1_, "http"); -#line 298 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 298 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp2_) { -#line 1992 "gkr-item.c" +#line 1976 "gkr-item.c" GHashTable* _tmp3_ = NULL; -#line 298 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 298 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = attrs; -#line 298 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 298 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = _tmp3_ != NULL; -#line 1998 "gkr-item.c" +#line 1982 "gkr-item.c" } else { -#line 298 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 298 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = FALSE; -#line 2002 "gkr-item.c" +#line 1986 "gkr-item.c" } -#line 298 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 298 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = _tmp0_; -#line 298 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 298 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp4_) { -#line 2008 "gkr-item.c" +#line 1992 "gkr-item.c" gchar* val = NULL; GHashTable* _tmp5_ = NULL; gchar* _tmp6_ = NULL; @@ -2012,92 +1996,92 @@ const gchar* _tmp8_ = NULL; gboolean _tmp10_ = FALSE; gboolean _tmp11_ = FALSE; -#line 299 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 299 "/data/src/seahorse/gkr/gkr-item.vala" _tmp5_ = attrs; -#line 299 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 299 "/data/src/seahorse/gkr/gkr-item.vala" _tmp6_ = seahorse_gkr_get_attribute_string (_tmp5_, "object"); -#line 299 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 299 "/data/src/seahorse/gkr/gkr-item.vala" val = _tmp6_; -#line 300 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 300 "/data/src/seahorse/gkr/gkr-item.vala" _tmp8_ = val; -#line 300 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 300 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp8_ != NULL) { -#line 2026 "gkr-item.c" +#line 2010 "gkr-item.c" const gchar* _tmp9_ = NULL; -#line 300 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 300 "/data/src/seahorse/gkr/gkr-item.vala" _tmp9_ = val; -#line 300 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 300 "/data/src/seahorse/gkr/gkr-item.vala" _tmp7_ = g_strcmp0 (_tmp9_, "") != 0; -#line 2032 "gkr-item.c" +#line 2016 "gkr-item.c" } else { -#line 300 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 300 "/data/src/seahorse/gkr/gkr-item.vala" _tmp7_ = FALSE; -#line 2036 "gkr-item.c" +#line 2020 "gkr-item.c" } -#line 300 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 300 "/data/src/seahorse/gkr/gkr-item.vala" _tmp10_ = _tmp7_; -#line 300 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 300 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp10_) { -#line 301 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 301 "/data/src/seahorse/gkr/gkr-item.vala" result = val; -#line 301 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 301 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 2046 "gkr-item.c" +#line 2030 "gkr-item.c" } -#line 304 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 304 "/data/src/seahorse/gkr/gkr-item.vala" _tmp11_ = always; -#line 304 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 304 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp11_) { -#line 2052 "gkr-item.c" +#line 2036 "gkr-item.c" GHashTable* _tmp12_ = NULL; gchar* _tmp13_ = NULL; gboolean _tmp14_ = FALSE; const gchar* _tmp15_ = NULL; gboolean _tmp17_ = FALSE; -#line 305 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 305 "/data/src/seahorse/gkr/gkr-item.vala" _tmp12_ = attrs; -#line 305 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 305 "/data/src/seahorse/gkr/gkr-item.vala" _tmp13_ = seahorse_gkr_get_attribute_string (_tmp12_, "server"); -#line 305 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 305 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (val); -#line 305 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 305 "/data/src/seahorse/gkr/gkr-item.vala" val = _tmp13_; -#line 306 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 306 "/data/src/seahorse/gkr/gkr-item.vala" _tmp15_ = val; -#line 306 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 306 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp15_ != NULL) { -#line 2070 "gkr-item.c" +#line 2054 "gkr-item.c" const gchar* _tmp16_ = NULL; -#line 306 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 306 "/data/src/seahorse/gkr/gkr-item.vala" _tmp16_ = val; -#line 306 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 306 "/data/src/seahorse/gkr/gkr-item.vala" _tmp14_ = g_strcmp0 (_tmp16_, "") != 0; -#line 2076 "gkr-item.c" +#line 2060 "gkr-item.c" } else { -#line 306 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 306 "/data/src/seahorse/gkr/gkr-item.vala" _tmp14_ = FALSE; -#line 2080 "gkr-item.c" +#line 2064 "gkr-item.c" } -#line 306 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 306 "/data/src/seahorse/gkr/gkr-item.vala" _tmp17_ = _tmp14_; -#line 306 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 306 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp17_) { -#line 307 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 307 "/data/src/seahorse/gkr/gkr-item.vala" result = val; -#line 307 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 307 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 2090 "gkr-item.c" +#line 2074 "gkr-item.c" } } -#line 298 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 298 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (val); -#line 2095 "gkr-item.c" +#line 2079 "gkr-item.c" } -#line 311 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 311 "/data/src/seahorse/gkr/gkr-item.vala" result = NULL; -#line 311 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 311 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 2101 "gkr-item.c" +#line 2085 "gkr-item.c" } @@ -2133,195 +2117,195 @@ gboolean _tmp29_ = FALSE; const gchar* _tmp30_ = NULL; gboolean _tmp32_ = FALSE; -#line 314 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 314 "/data/src/seahorse/gkr/gkr-item.vala" g_return_if_fail (info != NULL); -#line 318 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 318 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = attrs; -#line 318 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 318 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = seahorse_gkr_get_attribute_string (_tmp0_, "server"); -#line 318 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 318 "/data/src/seahorse/gkr/gkr-item.vala" server = _tmp1_; -#line 319 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 319 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = attrs; -#line 319 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 319 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = seahorse_gkr_get_attribute_string (_tmp2_, "protocol"); -#line 319 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 319 "/data/src/seahorse/gkr/gkr-item.vala" protocol = _tmp3_; -#line 320 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 320 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = attrs; -#line 320 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 320 "/data/src/seahorse/gkr/gkr-item.vala" _tmp5_ = seahorse_gkr_get_attribute_string (_tmp4_, "object"); -#line 320 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 320 "/data/src/seahorse/gkr/gkr-item.vala" object = _tmp5_; -#line 321 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 321 "/data/src/seahorse/gkr/gkr-item.vala" _tmp6_ = attrs; -#line 321 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 321 "/data/src/seahorse/gkr/gkr-item.vala" _tmp7_ = seahorse_gkr_get_attribute_string (_tmp6_, "user"); -#line 321 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 321 "/data/src/seahorse/gkr/gkr-item.vala" user = _tmp7_; -#line 322 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 322 "/data/src/seahorse/gkr/gkr-item.vala" _tmp8_ = attrs; -#line 322 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 322 "/data/src/seahorse/gkr/gkr-item.vala" _tmp9_ = seahorse_gkr_get_attribute_int (_tmp8_, "port"); -#line 322 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 322 "/data/src/seahorse/gkr/gkr-item.vala" port = _tmp9_; -#line 324 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 324 "/data/src/seahorse/gkr/gkr-item.vala" _tmp10_ = protocol; -#line 324 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 324 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp10_ == NULL) { -#line 325 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 325 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (user); -#line 325 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 325 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (object); -#line 325 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 325 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (protocol); -#line 325 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 325 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (server); -#line 325 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 325 "/data/src/seahorse/gkr/gkr-item.vala" return; -#line 2183 "gkr-item.c" +#line 2167 "gkr-item.c" } -#line 328 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 328 "/data/src/seahorse/gkr/gkr-item.vala" _tmp11_ = server; -#line 328 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 328 "/data/src/seahorse/gkr/gkr-item.vala" _tmp12_ = user; -#line 328 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 328 "/data/src/seahorse/gkr/gkr-item.vala" _tmp13_ = object; -#line 328 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 328 "/data/src/seahorse/gkr/gkr-item.vala" _tmp14_ = port; -#line 328 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 328 "/data/src/seahorse/gkr/gkr-item.vala" _tmp15_ = display; -#line 328 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 328 "/data/src/seahorse/gkr/gkr-item.vala" _tmp16_ = seahorse_gkr_is_custom_network_label (_tmp11_, _tmp12_, _tmp13_, _tmp14_, _tmp15_); -#line 328 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 328 "/data/src/seahorse/gkr/gkr-item.vala" if (!_tmp16_) { -#line 2199 "gkr-item.c" +#line 2183 "gkr-item.c" GHashTable* _tmp17_ = NULL; gchar* _tmp18_ = NULL; -#line 329 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 329 "/data/src/seahorse/gkr/gkr-item.vala" _tmp17_ = attrs; -#line 329 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 329 "/data/src/seahorse/gkr/gkr-item.vala" _tmp18_ = seahorse_gkr_calc_network_label (_tmp17_, TRUE); -#line 329 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 329 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*info).label); -#line 329 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 329 "/data/src/seahorse/gkr/gkr-item.vala" (*info).label = _tmp18_; -#line 2210 "gkr-item.c" +#line 2194 "gkr-item.c" } -#line 330 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 330 "/data/src/seahorse/gkr/gkr-item.vala" _tmp19_ = *info; -#line 330 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 330 "/data/src/seahorse/gkr/gkr-item.vala" _tmp20_ = _tmp19_.label; -#line 330 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 330 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp20_ == NULL) { -#line 2218 "gkr-item.c" +#line 2202 "gkr-item.c" const gchar* _tmp21_ = NULL; gchar* _tmp22_ = NULL; -#line 331 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 331 "/data/src/seahorse/gkr/gkr-item.vala" _tmp21_ = display; -#line 331 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 331 "/data/src/seahorse/gkr/gkr-item.vala" _tmp22_ = g_strdup (_tmp21_); -#line 331 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 331 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*info).label); -#line 331 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 331 "/data/src/seahorse/gkr/gkr-item.vala" (*info).label = _tmp22_; -#line 2229 "gkr-item.c" +#line 2213 "gkr-item.c" } -#line 333 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 333 "/data/src/seahorse/gkr/gkr-item.vala" _tmp23_ = g_strdup ("@"); -#line 333 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 333 "/data/src/seahorse/gkr/gkr-item.vala" symbol = _tmp23_; -#line 334 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 334 "/data/src/seahorse/gkr/gkr-item.vala" _tmp24_ = user; -#line 334 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 334 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp24_ == NULL) { -#line 2239 "gkr-item.c" +#line 2223 "gkr-item.c" gchar* _tmp25_ = NULL; gchar* _tmp26_ = NULL; -#line 335 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 335 "/data/src/seahorse/gkr/gkr-item.vala" _tmp25_ = g_strdup (""); -#line 335 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 335 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (user); -#line 335 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 335 "/data/src/seahorse/gkr/gkr-item.vala" user = _tmp25_; -#line 336 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 336 "/data/src/seahorse/gkr/gkr-item.vala" _tmp26_ = g_strdup (""); -#line 336 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 336 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (symbol); -#line 336 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 336 "/data/src/seahorse/gkr/gkr-item.vala" symbol = _tmp26_; -#line 2254 "gkr-item.c" +#line 2238 "gkr-item.c" } -#line 339 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 339 "/data/src/seahorse/gkr/gkr-item.vala" _tmp27_ = object; -#line 339 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 339 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp27_ == NULL) { -#line 2260 "gkr-item.c" +#line 2244 "gkr-item.c" gchar* _tmp28_ = NULL; -#line 340 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 340 "/data/src/seahorse/gkr/gkr-item.vala" _tmp28_ = g_strdup (""); -#line 340 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 340 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (object); -#line 340 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 340 "/data/src/seahorse/gkr/gkr-item.vala" object = _tmp28_; -#line 2268 "gkr-item.c" +#line 2252 "gkr-item.c" } -#line 342 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 342 "/data/src/seahorse/gkr/gkr-item.vala" _tmp30_ = server; -#line 342 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 342 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp30_ != NULL) { -#line 2274 "gkr-item.c" +#line 2258 "gkr-item.c" const gchar* _tmp31_ = NULL; -#line 342 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 342 "/data/src/seahorse/gkr/gkr-item.vala" _tmp31_ = protocol; -#line 342 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 342 "/data/src/seahorse/gkr/gkr-item.vala" _tmp29_ = _tmp31_ != NULL; -#line 2280 "gkr-item.c" +#line 2264 "gkr-item.c" } else { -#line 342 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 342 "/data/src/seahorse/gkr/gkr-item.vala" _tmp29_ = FALSE; -#line 2284 "gkr-item.c" +#line 2268 "gkr-item.c" } -#line 342 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 342 "/data/src/seahorse/gkr/gkr-item.vala" _tmp32_ = _tmp29_; -#line 342 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 342 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp32_) { -#line 2290 "gkr-item.c" +#line 2274 "gkr-item.c" const gchar* _tmp33_ = NULL; const gchar* _tmp34_ = NULL; const gchar* _tmp35_ = NULL; const gchar* _tmp36_ = NULL; const gchar* _tmp37_ = NULL; gchar* _tmp38_ = NULL; -#line 343 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 343 "/data/src/seahorse/gkr/gkr-item.vala" _tmp33_ = protocol; -#line 343 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 343 "/data/src/seahorse/gkr/gkr-item.vala" _tmp34_ = user; -#line 343 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 343 "/data/src/seahorse/gkr/gkr-item.vala" _tmp35_ = symbol; -#line 343 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 343 "/data/src/seahorse/gkr/gkr-item.vala" _tmp36_ = server; -#line 343 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 343 "/data/src/seahorse/gkr/gkr-item.vala" _tmp37_ = object; -#line 343 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 343 "/data/src/seahorse/gkr/gkr-item.vala" _tmp38_ = g_markup_printf_escaped ("%s://%s%s%s/%s", _tmp33_, _tmp34_, _tmp35_, _tmp36_, _tmp37_); -#line 343 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 343 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*info).details); -#line 343 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 343 "/data/src/seahorse/gkr/gkr-item.vala" (*info).details = _tmp38_; -#line 2313 "gkr-item.c" +#line 2297 "gkr-item.c" } -#line 314 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 314 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (symbol); -#line 314 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 314 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (user); -#line 314 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 314 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (object); -#line 314 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 314 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (protocol); -#line 314 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 314 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (server); -#line 2325 "gkr-item.c" +#line 2309 "gkr-item.c" } @@ -2336,38 +2320,38 @@ const gchar* _tmp19_ = NULL; const gchar* _tmp22_ = NULL; GError * _inner_error_ = NULL; -#line 349 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 349 "/data/src/seahorse/gkr/gkr-item.vala" g_return_if_fail (info != NULL); -#line 353 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 353 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = attrs; -#line 353 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 353 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = seahorse_gkr_get_attribute_string (_tmp0_, "origin_url"); -#line 353 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 353 "/data/src/seahorse/gkr/gkr-item.vala" origin = _tmp1_; -#line 356 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 356 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = display; -#line 356 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 356 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp3_ != NULL) { -#line 2352 "gkr-item.c" +#line 2336 "gkr-item.c" const gchar* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; -#line 356 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 356 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = display; -#line 356 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 356 "/data/src/seahorse/gkr/gkr-item.vala" _tmp5_ = origin; -#line 356 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 356 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = g_strcmp0 (_tmp4_, _tmp5_) == 0; -#line 2361 "gkr-item.c" +#line 2345 "gkr-item.c" } else { -#line 356 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 356 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = FALSE; -#line 2365 "gkr-item.c" +#line 2349 "gkr-item.c" } -#line 356 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 356 "/data/src/seahorse/gkr/gkr-item.vala" _tmp6_ = _tmp2_; -#line 356 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 356 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp6_) { -#line 2371 "gkr-item.c" +#line 2355 "gkr-item.c" { GRegex* regex = NULL; GRegex* _tmp7_ = NULL; @@ -2376,67 +2360,67 @@ const gchar* _tmp9_ = NULL; GMatchInfo* _tmp10_ = NULL; gboolean _tmp11_ = FALSE; -#line 358 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 358 "/data/src/seahorse/gkr/gkr-item.vala" _tmp7_ = g_regex_new ("[a-z]+://([^/]+)/", G_REGEX_CASELESS, 0, &_inner_error_); -#line 358 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 358 "/data/src/seahorse/gkr/gkr-item.vala" regex = _tmp7_; -#line 358 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 358 "/data/src/seahorse/gkr/gkr-item.vala" if (_inner_error_ != NULL) { -#line 358 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 358 "/data/src/seahorse/gkr/gkr-item.vala" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2388 "gkr-item.c" +#line 2372 "gkr-item.c" goto __catch3_g_regex_error; } -#line 358 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 358 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (origin); -#line 358 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 358 "/data/src/seahorse/gkr/gkr-item.vala" 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); -#line 358 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 358 "/data/src/seahorse/gkr/gkr-item.vala" g_clear_error (&_inner_error_); -#line 358 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 358 "/data/src/seahorse/gkr/gkr-item.vala" return; -#line 2399 "gkr-item.c" +#line 2383 "gkr-item.c" } -#line 360 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 360 "/data/src/seahorse/gkr/gkr-item.vala" _tmp8_ = regex; -#line 360 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 360 "/data/src/seahorse/gkr/gkr-item.vala" _tmp9_ = display; -#line 360 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 360 "/data/src/seahorse/gkr/gkr-item.vala" _tmp11_ = g_regex_match (_tmp8_, _tmp9_, G_REGEX_MATCH_ANCHORED, &_tmp10_); -#line 360 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 360 "/data/src/seahorse/gkr/gkr-item.vala" _g_match_info_free0 (match); -#line 360 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 360 "/data/src/seahorse/gkr/gkr-item.vala" match = _tmp10_; -#line 360 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 360 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp11_) { -#line 2413 "gkr-item.c" +#line 2397 "gkr-item.c" GMatchInfo* _tmp12_ = NULL; gboolean _tmp13_ = FALSE; -#line 361 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 361 "/data/src/seahorse/gkr/gkr-item.vala" _tmp12_ = match; -#line 361 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 361 "/data/src/seahorse/gkr/gkr-item.vala" _tmp13_ = g_match_info_matches (_tmp12_); -#line 361 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 361 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp13_) { -#line 2422 "gkr-item.c" +#line 2406 "gkr-item.c" GMatchInfo* _tmp14_ = NULL; gchar* _tmp15_ = NULL; -#line 362 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 362 "/data/src/seahorse/gkr/gkr-item.vala" _tmp14_ = match; -#line 362 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 362 "/data/src/seahorse/gkr/gkr-item.vala" _tmp15_ = g_match_info_fetch (_tmp14_, 1); -#line 362 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 362 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*info).label); -#line 362 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 362 "/data/src/seahorse/gkr/gkr-item.vala" (*info).label = _tmp15_; -#line 2433 "gkr-item.c" +#line 2417 "gkr-item.c" } } -#line 357 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 357 "/data/src/seahorse/gkr/gkr-item.vala" _g_match_info_free0 (match); -#line 357 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 357 "/data/src/seahorse/gkr/gkr-item.vala" _g_regex_unref0 (regex); -#line 2440 "gkr-item.c" +#line 2424 "gkr-item.c" } goto __finally3; __catch3_g_regex_error: @@ -2444,99 +2428,99 @@ GError* err = NULL; GError* _tmp16_ = NULL; const gchar* _tmp17_ = NULL; -#line 357 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 357 "/data/src/seahorse/gkr/gkr-item.vala" err = _inner_error_; -#line 357 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 357 "/data/src/seahorse/gkr/gkr-item.vala" _inner_error_ = NULL; -#line 365 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 365 "/data/src/seahorse/gkr/gkr-item.vala" _tmp16_ = err; -#line 365 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 365 "/data/src/seahorse/gkr/gkr-item.vala" _tmp17_ = _tmp16_->message; -#line 365 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 365 "/data/src/seahorse/gkr/gkr-item.vala" g_critical ("gkr-item.vala:365: %s", _tmp17_); -#line 366 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 366 "/data/src/seahorse/gkr/gkr-item.vala" _g_error_free0 (err); -#line 366 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 366 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (origin); -#line 366 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 366 "/data/src/seahorse/gkr/gkr-item.vala" return; -#line 2464 "gkr-item.c" +#line 2448 "gkr-item.c" } __finally3: -#line 357 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 357 "/data/src/seahorse/gkr/gkr-item.vala" if (_inner_error_ != NULL) { -#line 357 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 357 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (origin); -#line 357 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 357 "/data/src/seahorse/gkr/gkr-item.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 357 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 357 "/data/src/seahorse/gkr/gkr-item.vala" g_clear_error (&_inner_error_); -#line 357 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 357 "/data/src/seahorse/gkr/gkr-item.vala" return; -#line 2477 "gkr-item.c" +#line 2461 "gkr-item.c" } } -#line 371 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 371 "/data/src/seahorse/gkr/gkr-item.vala" _tmp18_ = *info; -#line 371 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 371 "/data/src/seahorse/gkr/gkr-item.vala" _tmp19_ = _tmp18_.label; -#line 371 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 371 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp19_ == NULL) { -#line 2486 "gkr-item.c" +#line 2470 "gkr-item.c" const gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; -#line 372 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 372 "/data/src/seahorse/gkr/gkr-item.vala" _tmp20_ = display; -#line 372 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 372 "/data/src/seahorse/gkr/gkr-item.vala" _tmp21_ = g_strdup (_tmp20_); -#line 372 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 372 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*info).label); -#line 372 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 372 "/data/src/seahorse/gkr/gkr-item.vala" (*info).label = _tmp21_; -#line 2497 "gkr-item.c" +#line 2481 "gkr-item.c" } -#line 373 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 373 "/data/src/seahorse/gkr/gkr-item.vala" _tmp22_ = origin; -#line 373 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 373 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp22_ != NULL) { -#line 2503 "gkr-item.c" +#line 2487 "gkr-item.c" const gchar* _tmp23_ = NULL; gchar* _tmp24_ = NULL; -#line 374 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 374 "/data/src/seahorse/gkr/gkr-item.vala" _tmp23_ = origin; -#line 374 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 374 "/data/src/seahorse/gkr/gkr-item.vala" _tmp24_ = g_markup_escape_text (_tmp23_, (gssize) (-1)); -#line 374 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 374 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*info).details); -#line 374 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 374 "/data/src/seahorse/gkr/gkr-item.vala" (*info).details = _tmp24_; -#line 2514 "gkr-item.c" +#line 2498 "gkr-item.c" } else { gchar* _tmp25_ = NULL; -#line 376 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 376 "/data/src/seahorse/gkr/gkr-item.vala" _tmp25_ = g_strdup (""); -#line 376 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 376 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*info).details); -#line 376 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 376 "/data/src/seahorse/gkr/gkr-item.vala" (*info).details = _tmp25_; -#line 2523 "gkr-item.c" +#line 2507 "gkr-item.c" } -#line 349 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 349 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (origin); -#line 2527 "gkr-item.c" +#line 2511 "gkr-item.c" } static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; GError * _inner_error_ = NULL; -#line 1242 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1241 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1242 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1241 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1242 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1241 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 2540 "gkr-item.c" +#line 2524 "gkr-item.c" { GRegex* regex = NULL; const gchar* _tmp0_ = NULL; @@ -2548,94 +2532,94 @@ GRegex* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; gchar* _tmp8_ = NULL; -#line 1244 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp0_ = old; -#line 1244 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1244 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp2_ = _tmp1_; -#line 1244 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1244 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp4_ = _tmp3_; -#line 1244 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _g_free0 (_tmp2_); -#line 1244 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" regex = _tmp4_; -#line 1244 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_inner_error_ != NULL) { -#line 1244 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2570 "gkr-item.c" +#line 2554 "gkr-item.c" goto __catch4_g_regex_error; } -#line 1244 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" 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); -#line 1244 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1244 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1243 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return NULL; -#line 2579 "gkr-item.c" +#line 2563 "gkr-item.c" } -#line 1245 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp6_ = regex; -#line 1245 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp7_ = replacement; -#line 1245 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) (-1), 0, _tmp7_, 0, &_inner_error_); -#line 1245 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp5_ = _tmp8_; -#line 1245 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_inner_error_ != NULL) { -#line 1245 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1245 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2595 "gkr-item.c" +#line 2579 "gkr-item.c" goto __catch4_g_regex_error; } -#line 1245 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1245 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" 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); -#line 1245 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1245 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return NULL; -#line 2606 "gkr-item.c" +#line 2590 "gkr-item.c" } -#line 1245 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" result = _tmp5_; -#line 1245 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1245 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1244 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return result; -#line 2614 "gkr-item.c" +#line 2598 "gkr-item.c" } goto __finally4; __catch4_g_regex_error: { GError* e = NULL; -#line 1243 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1243 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1247 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1246 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1243 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 2628 "gkr-item.c" +#line 2612 "gkr-item.c" } __finally4: -#line 1243 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_inner_error_ != NULL) { -#line 1243 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" 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 1243 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1243 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1242 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return NULL; -#line 2639 "gkr-item.c" +#line 2623 "gkr-item.c" } } @@ -2647,25 +2631,25 @@ gchar* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; -#line 379 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 379 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (account != NULL, NULL); -#line 380 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 380 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = account; -#line 380 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 380 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = string_replace (_tmp0_, "_", "%"); -#line 380 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 380 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = _tmp1_; -#line 380 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 380 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (_tmp2_); -#line 381 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 381 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = account; -#line 381 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 381 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = g_uri_unescape_string (_tmp3_, NULL); -#line 381 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 381 "/data/src/seahorse/gkr/gkr-item.vala" result = _tmp4_; -#line 381 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 381 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 2669 "gkr-item.c" +#line 2653 "gkr-item.c" } @@ -2676,35 +2660,35 @@ gunichar _tmp1_ = 0U; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 918 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 918 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 919 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 919 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 919 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 919 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp1_ = c; -#line 919 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 919 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) (-1), _tmp1_); -#line 919 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 919 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 921 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 921 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 921 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 921 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 2694 "gkr-item.c" +#line 2678 "gkr-item.c" gchar* _tmp4_ = NULL; -#line 922 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 922 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 922 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 922 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 922 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 922 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return result; -#line 2702 "gkr-item.c" +#line 2686 "gkr-item.c" } else { -#line 924 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 924 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" result = -1; -#line 924 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 924 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return result; -#line 2708 "gkr-item.c" +#line 2692 "gkr-item.c" } } @@ -2728,109 +2712,109 @@ glong _tmp21_ = 0L; glong _tmp22_ = 0L; gchar* _tmp23_ = NULL; -#line 1190 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1189 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1191 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1190 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp0_ = strlen (self); -#line 1191 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1190 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp1_ = _tmp0_; -#line 1191 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1190 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" string_length = (glong) _tmp1_; -#line 1192 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1191 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp2_ = start; -#line 1192 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1191 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp2_ < ((glong) 0)) { -#line 2744 "gkr-item.c" +#line 2728 "gkr-item.c" glong _tmp3_ = 0L; glong _tmp4_ = 0L; -#line 1193 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1192 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp3_ = string_length; -#line 1193 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1192 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp4_ = start; -#line 1193 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1192 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" start = _tmp3_ + _tmp4_; -#line 2753 "gkr-item.c" +#line 2737 "gkr-item.c" } -#line 1195 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1194 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1195 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1194 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp5_ < ((glong) 0)) { -#line 2759 "gkr-item.c" +#line 2743 "gkr-item.c" glong _tmp6_ = 0L; glong _tmp7_ = 0L; -#line 1196 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1195 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp6_ = string_length; -#line 1196 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1195 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp7_ = end; -#line 1196 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1195 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" end = _tmp6_ + _tmp7_; -#line 2768 "gkr-item.c" +#line 2752 "gkr-item.c" } -#line 1198 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp9_ = start; -#line 1198 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp9_ >= ((glong) 0)) { -#line 2774 "gkr-item.c" +#line 2758 "gkr-item.c" glong _tmp10_ = 0L; glong _tmp11_ = 0L; -#line 1198 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp10_ = start; -#line 1198 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp11_ = string_length; -#line 1198 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp8_ = _tmp10_ <= _tmp11_; -#line 2783 "gkr-item.c" +#line 2767 "gkr-item.c" } else { -#line 1198 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp8_ = FALSE; -#line 2787 "gkr-item.c" +#line 2771 "gkr-item.c" } -#line 1198 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp12_ = _tmp8_; -#line 1198 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1197 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_, NULL); -#line 1199 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp14_ = end; -#line 1199 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp14_ >= ((glong) 0)) { -#line 2797 "gkr-item.c" +#line 2781 "gkr-item.c" glong _tmp15_ = 0L; glong _tmp16_ = 0L; -#line 1199 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp15_ = end; -#line 1199 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp16_ = string_length; -#line 1199 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp13_ = _tmp15_ <= _tmp16_; -#line 2806 "gkr-item.c" +#line 2790 "gkr-item.c" } else { -#line 1199 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp13_ = FALSE; -#line 2810 "gkr-item.c" +#line 2794 "gkr-item.c" } -#line 1199 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp17_ = _tmp13_; -#line 1199 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1198 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp17_, NULL); -#line 1200 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1199 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp18_ = start; -#line 1200 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1199 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp19_ = end; -#line 1200 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1199 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp18_ <= _tmp19_, NULL); -#line 1201 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp20_ = start; -#line 1201 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp21_ = end; -#line 1201 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp22_ = start; -#line 1201 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp23_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) (_tmp21_ - _tmp22_)); -#line 1201 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" result = _tmp23_; -#line 1201 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 1200 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return result; -#line 2834 "gkr-item.c" +#line 2818 "gkr-item.c" } @@ -2849,47 +2833,47 @@ SeahorseGkrDisplayInfo _tmp38_ = {0}; const gchar* _tmp39_ = NULL; GError * _inner_error_ = NULL; -#line 384 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 384 "/data/src/seahorse/gkr/gkr-item.vala" g_return_if_fail (info != NULL); -#line 388 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 388 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = attrs; -#line 388 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 388 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = seahorse_gkr_get_attribute_string (_tmp0_, "account-id"); -#line 388 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 388 "/data/src/seahorse/gkr/gkr-item.vala" account = _tmp1_; -#line 391 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 391 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = _ ("IM account password for "); -#line 391 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 391 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = g_strdup (_tmp2_); -#line 391 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 391 "/data/src/seahorse/gkr/gkr-item.vala" prefix = _tmp3_; -#line 393 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 393 "/data/src/seahorse/gkr/gkr-item.vala" _tmp5_ = display; -#line 393 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 393 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp5_ != NULL) { -#line 2871 "gkr-item.c" +#line 2855 "gkr-item.c" const gchar* _tmp6_ = NULL; const gchar* _tmp7_ = NULL; gboolean _tmp8_ = FALSE; -#line 393 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 393 "/data/src/seahorse/gkr/gkr-item.vala" _tmp6_ = display; -#line 393 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 393 "/data/src/seahorse/gkr/gkr-item.vala" _tmp7_ = prefix; -#line 393 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 393 "/data/src/seahorse/gkr/gkr-item.vala" _tmp8_ = g_str_has_prefix (_tmp6_, _tmp7_); -#line 393 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 393 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = _tmp8_; -#line 2883 "gkr-item.c" +#line 2867 "gkr-item.c" } else { -#line 393 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 393 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = FALSE; -#line 2887 "gkr-item.c" +#line 2871 "gkr-item.c" } -#line 393 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 393 "/data/src/seahorse/gkr/gkr-item.vala" _tmp9_ = _tmp4_; -#line 393 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 393 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp9_) { -#line 2893 "gkr-item.c" +#line 2877 "gkr-item.c" gint len = 0; const gchar* _tmp10_ = NULL; gint _tmp11_ = 0; @@ -2899,44 +2883,44 @@ gint _tmp14_ = 0; gint _tmp15_ = 0; gint _tmp16_ = 0; -#line 394 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 394 "/data/src/seahorse/gkr/gkr-item.vala" _tmp10_ = prefix; -#line 394 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 394 "/data/src/seahorse/gkr/gkr-item.vala" _tmp11_ = strlen (_tmp10_); -#line 394 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 394 "/data/src/seahorse/gkr/gkr-item.vala" _tmp12_ = _tmp11_; -#line 394 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 394 "/data/src/seahorse/gkr/gkr-item.vala" len = _tmp12_; -#line 395 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 395 "/data/src/seahorse/gkr/gkr-item.vala" _tmp13_ = display; -#line 395 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 395 "/data/src/seahorse/gkr/gkr-item.vala" _tmp14_ = len; -#line 395 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 395 "/data/src/seahorse/gkr/gkr-item.vala" _tmp15_ = string_index_of_char (_tmp13_, (gunichar) '(', (gint) _tmp14_); -#line 395 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 395 "/data/src/seahorse/gkr/gkr-item.vala" pos = _tmp15_; -#line 396 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 396 "/data/src/seahorse/gkr/gkr-item.vala" _tmp16_ = pos; -#line 396 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 396 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp16_ != (-1)) { -#line 2923 "gkr-item.c" +#line 2907 "gkr-item.c" const gchar* _tmp17_ = NULL; gint _tmp18_ = 0; gint _tmp19_ = 0; gchar* _tmp20_ = NULL; -#line 397 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 397 "/data/src/seahorse/gkr/gkr-item.vala" _tmp17_ = display; -#line 397 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 397 "/data/src/seahorse/gkr/gkr-item.vala" _tmp18_ = len; -#line 397 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 397 "/data/src/seahorse/gkr/gkr-item.vala" _tmp19_ = pos; -#line 397 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 397 "/data/src/seahorse/gkr/gkr-item.vala" _tmp20_ = string_slice (_tmp17_, (glong) _tmp18_, (glong) _tmp19_); -#line 397 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 397 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*info).label); -#line 397 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 397 "/data/src/seahorse/gkr/gkr-item.vala" (*info).label = _tmp20_; -#line 2940 "gkr-item.c" +#line 2924 "gkr-item.c" } { GRegex* regex = NULL; @@ -2946,77 +2930,77 @@ const gchar* _tmp23_ = NULL; GMatchInfo* _tmp24_ = NULL; gboolean _tmp25_ = FALSE; -#line 400 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 400 "/data/src/seahorse/gkr/gkr-item.vala" _tmp21_ = g_regex_new ("^.+/.+/(.+)$", G_REGEX_CASELESS, 0, &_inner_error_); -#line 400 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 400 "/data/src/seahorse/gkr/gkr-item.vala" regex = _tmp21_; -#line 400 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 400 "/data/src/seahorse/gkr/gkr-item.vala" if (_inner_error_ != NULL) { -#line 400 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 400 "/data/src/seahorse/gkr/gkr-item.vala" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 2958 "gkr-item.c" +#line 2942 "gkr-item.c" goto __catch5_g_regex_error; } -#line 400 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 400 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (prefix); -#line 400 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 400 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (account); -#line 400 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 400 "/data/src/seahorse/gkr/gkr-item.vala" 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); -#line 400 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 400 "/data/src/seahorse/gkr/gkr-item.vala" g_clear_error (&_inner_error_); -#line 400 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 400 "/data/src/seahorse/gkr/gkr-item.vala" return; -#line 2971 "gkr-item.c" +#line 2955 "gkr-item.c" } -#line 402 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 402 "/data/src/seahorse/gkr/gkr-item.vala" _tmp22_ = regex; -#line 402 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 402 "/data/src/seahorse/gkr/gkr-item.vala" _tmp23_ = account; -#line 402 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 402 "/data/src/seahorse/gkr/gkr-item.vala" _tmp25_ = g_regex_match (_tmp22_, _tmp23_, G_REGEX_MATCH_ANCHORED, &_tmp24_); -#line 402 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 402 "/data/src/seahorse/gkr/gkr-item.vala" _g_match_info_free0 (match); -#line 402 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 402 "/data/src/seahorse/gkr/gkr-item.vala" match = _tmp24_; -#line 402 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 402 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp25_) { -#line 2985 "gkr-item.c" +#line 2969 "gkr-item.c" GMatchInfo* _tmp26_ = NULL; gboolean _tmp27_ = FALSE; -#line 403 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 403 "/data/src/seahorse/gkr/gkr-item.vala" _tmp26_ = match; -#line 403 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 403 "/data/src/seahorse/gkr/gkr-item.vala" _tmp27_ = g_match_info_matches (_tmp26_); -#line 403 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 403 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp27_) { -#line 2994 "gkr-item.c" +#line 2978 "gkr-item.c" GMatchInfo* _tmp28_ = NULL; gchar* _tmp29_ = NULL; gchar* _tmp30_ = NULL; gchar* _tmp31_ = NULL; -#line 404 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 404 "/data/src/seahorse/gkr/gkr-item.vala" _tmp28_ = match; -#line 404 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 404 "/data/src/seahorse/gkr/gkr-item.vala" _tmp29_ = g_match_info_fetch (_tmp28_, 1); -#line 404 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 404 "/data/src/seahorse/gkr/gkr-item.vala" _tmp30_ = _tmp29_; -#line 404 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 404 "/data/src/seahorse/gkr/gkr-item.vala" _tmp31_ = seahorse_gkr_decode_telepathy_id (_tmp30_); -#line 404 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 404 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*info).details); -#line 404 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 404 "/data/src/seahorse/gkr/gkr-item.vala" (*info).details = _tmp31_; -#line 404 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 404 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (_tmp30_); -#line 3013 "gkr-item.c" +#line 2997 "gkr-item.c" } } -#line 399 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 399 "/data/src/seahorse/gkr/gkr-item.vala" _g_match_info_free0 (match); -#line 399 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 399 "/data/src/seahorse/gkr/gkr-item.vala" _g_regex_unref0 (regex); -#line 3020 "gkr-item.c" +#line 3004 "gkr-item.c" } goto __finally5; __catch5_g_regex_error: @@ -3024,85 +3008,85 @@ GError* err = NULL; GError* _tmp32_ = NULL; const gchar* _tmp33_ = NULL; -#line 399 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 399 "/data/src/seahorse/gkr/gkr-item.vala" err = _inner_error_; -#line 399 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 399 "/data/src/seahorse/gkr/gkr-item.vala" _inner_error_ = NULL; -#line 407 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 407 "/data/src/seahorse/gkr/gkr-item.vala" _tmp32_ = err; -#line 407 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 407 "/data/src/seahorse/gkr/gkr-item.vala" _tmp33_ = _tmp32_->message; -#line 407 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 407 "/data/src/seahorse/gkr/gkr-item.vala" g_critical ("gkr-item.vala:407: %s", _tmp33_); -#line 408 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 408 "/data/src/seahorse/gkr/gkr-item.vala" _g_error_free0 (err); -#line 408 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 408 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (prefix); -#line 408 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 408 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (account); -#line 408 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 408 "/data/src/seahorse/gkr/gkr-item.vala" return; -#line 3046 "gkr-item.c" +#line 3030 "gkr-item.c" } __finally5: -#line 399 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 399 "/data/src/seahorse/gkr/gkr-item.vala" if (_inner_error_ != NULL) { -#line 399 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 399 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (prefix); -#line 399 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 399 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (account); -#line 399 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 399 "/data/src/seahorse/gkr/gkr-item.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 399 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 399 "/data/src/seahorse/gkr/gkr-item.vala" g_clear_error (&_inner_error_); -#line 399 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 399 "/data/src/seahorse/gkr/gkr-item.vala" return; -#line 3061 "gkr-item.c" +#line 3045 "gkr-item.c" } } -#line 412 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 412 "/data/src/seahorse/gkr/gkr-item.vala" _tmp34_ = *info; -#line 412 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 412 "/data/src/seahorse/gkr/gkr-item.vala" _tmp35_ = _tmp34_.label; -#line 412 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 412 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp35_ == NULL) { -#line 3070 "gkr-item.c" +#line 3054 "gkr-item.c" const gchar* _tmp36_ = NULL; gchar* _tmp37_ = NULL; -#line 413 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 413 "/data/src/seahorse/gkr/gkr-item.vala" _tmp36_ = display; -#line 413 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 413 "/data/src/seahorse/gkr/gkr-item.vala" _tmp37_ = g_strdup (_tmp36_); -#line 413 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 413 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*info).label); -#line 413 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 413 "/data/src/seahorse/gkr/gkr-item.vala" (*info).label = _tmp37_; -#line 3081 "gkr-item.c" +#line 3065 "gkr-item.c" } -#line 414 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 414 "/data/src/seahorse/gkr/gkr-item.vala" _tmp38_ = *info; -#line 414 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 414 "/data/src/seahorse/gkr/gkr-item.vala" _tmp39_ = _tmp38_.details; -#line 414 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 414 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp39_ == NULL) { -#line 3089 "gkr-item.c" +#line 3073 "gkr-item.c" const gchar* _tmp40_ = NULL; gchar* _tmp41_ = NULL; -#line 415 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 415 "/data/src/seahorse/gkr/gkr-item.vala" _tmp40_ = account; -#line 415 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 415 "/data/src/seahorse/gkr/gkr-item.vala" _tmp41_ = g_markup_escape_text (_tmp40_, (gssize) (-1)); -#line 415 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 415 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*info).details); -#line 415 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 415 "/data/src/seahorse/gkr/gkr-item.vala" (*info).details = _tmp41_; -#line 3100 "gkr-item.c" +#line 3084 "gkr-item.c" } -#line 384 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 384 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (prefix); -#line 384 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 384 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (account); -#line 3106 "gkr-item.c" +#line 3090 "gkr-item.c" } @@ -3113,37 +3097,37 @@ const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; -#line 898 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 898 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, 0); -#line 898 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 898 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, 0); -#line 899 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 899 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp0_ = start_index; -#line 899 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 899 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp1_ = needle; -#line 899 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 899 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_); -#line 899 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 899 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _result_ = _tmp2_; -#line 901 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 901 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp3_ = _result_; -#line 901 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 901 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" if (_tmp3_ != NULL) { -#line 3133 "gkr-item.c" +#line 3117 "gkr-item.c" gchar* _tmp4_ = NULL; -#line 902 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 902 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp4_ = _result_; -#line 902 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 902 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" result = (gint) (_tmp4_ - ((gchar*) self)); -#line 902 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 902 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return result; -#line 3141 "gkr-item.c" +#line 3125 "gkr-item.c" } else { -#line 904 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 904 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" result = -1; -#line 904 "/opt/build/share/vala-0.22/vapi/glib-2.0.vapi" +#line 904 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return result; -#line 3147 "gkr-item.c" +#line 3131 "gkr-item.c" } } @@ -3161,57 +3145,57 @@ const gchar* _tmp25_ = NULL; const gchar* _tmp28_ = NULL; GError * _inner_error_ = NULL; -#line 418 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 418 "/data/src/seahorse/gkr/gkr-item.vala" g_return_if_fail (info != NULL); -#line 422 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 422 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = attrs; -#line 422 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 422 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = seahorse_gkr_get_attribute_string (_tmp0_, "account"); -#line 422 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 422 "/data/src/seahorse/gkr/gkr-item.vala" account = _tmp1_; -#line 423 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 423 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = account; -#line 423 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 423 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp4_ != NULL) { -#line 3177 "gkr-item.c" +#line 3161 "gkr-item.c" const gchar* _tmp5_ = NULL; -#line 423 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 423 "/data/src/seahorse/gkr/gkr-item.vala" _tmp5_ = display; -#line 423 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 423 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = _tmp5_ != NULL; -#line 3183 "gkr-item.c" +#line 3167 "gkr-item.c" } else { -#line 423 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 423 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = FALSE; -#line 3187 "gkr-item.c" +#line 3171 "gkr-item.c" } -#line 423 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 423 "/data/src/seahorse/gkr/gkr-item.vala" _tmp6_ = _tmp3_; -#line 423 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 423 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp6_) { -#line 3193 "gkr-item.c" +#line 3177 "gkr-item.c" const gchar* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; gint _tmp9_ = 0; -#line 423 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 423 "/data/src/seahorse/gkr/gkr-item.vala" _tmp7_ = display; -#line 423 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 423 "/data/src/seahorse/gkr/gkr-item.vala" _tmp8_ = account; -#line 423 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 423 "/data/src/seahorse/gkr/gkr-item.vala" _tmp9_ = string_index_of (_tmp7_, _tmp8_, 0); -#line 423 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 423 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = _tmp9_ != (-1); -#line 3205 "gkr-item.c" +#line 3189 "gkr-item.c" } else { -#line 423 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 423 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = FALSE; -#line 3209 "gkr-item.c" +#line 3193 "gkr-item.c" } -#line 423 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 423 "/data/src/seahorse/gkr/gkr-item.vala" _tmp10_ = _tmp2_; -#line 423 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 423 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp10_) { -#line 3215 "gkr-item.c" +#line 3199 "gkr-item.c" { GRegex* regex = NULL; GRegex* _tmp11_ = NULL; @@ -3220,78 +3204,78 @@ const gchar* _tmp13_ = NULL; GMatchInfo* _tmp14_ = NULL; gboolean _tmp15_ = FALSE; -#line 425 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 425 "/data/src/seahorse/gkr/gkr-item.vala" _tmp11_ = g_regex_new ("^.+/.+/(.+)$", G_REGEX_CASELESS, 0, &_inner_error_); -#line 425 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 425 "/data/src/seahorse/gkr/gkr-item.vala" regex = _tmp11_; -#line 425 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 425 "/data/src/seahorse/gkr/gkr-item.vala" if (_inner_error_ != NULL) { -#line 425 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 425 "/data/src/seahorse/gkr/gkr-item.vala" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 3232 "gkr-item.c" +#line 3216 "gkr-item.c" goto __catch6_g_regex_error; } -#line 425 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 425 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (account); -#line 425 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 425 "/data/src/seahorse/gkr/gkr-item.vala" 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); -#line 425 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 425 "/data/src/seahorse/gkr/gkr-item.vala" g_clear_error (&_inner_error_); -#line 425 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 425 "/data/src/seahorse/gkr/gkr-item.vala" return; -#line 3243 "gkr-item.c" +#line 3227 "gkr-item.c" } -#line 427 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 427 "/data/src/seahorse/gkr/gkr-item.vala" _tmp12_ = regex; -#line 427 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 427 "/data/src/seahorse/gkr/gkr-item.vala" _tmp13_ = account; -#line 427 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 427 "/data/src/seahorse/gkr/gkr-item.vala" _tmp15_ = g_regex_match (_tmp12_, _tmp13_, G_REGEX_MATCH_ANCHORED, &_tmp14_); -#line 427 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 427 "/data/src/seahorse/gkr/gkr-item.vala" _g_match_info_free0 (match); -#line 427 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 427 "/data/src/seahorse/gkr/gkr-item.vala" match = _tmp14_; -#line 427 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 427 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp15_) { -#line 3257 "gkr-item.c" +#line 3241 "gkr-item.c" GMatchInfo* _tmp16_ = NULL; gboolean _tmp17_ = FALSE; -#line 428 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 428 "/data/src/seahorse/gkr/gkr-item.vala" _tmp16_ = match; -#line 428 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 428 "/data/src/seahorse/gkr/gkr-item.vala" _tmp17_ = g_match_info_matches (_tmp16_); -#line 428 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 428 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp17_) { -#line 3266 "gkr-item.c" +#line 3250 "gkr-item.c" gchar* identifier = NULL; GMatchInfo* _tmp18_ = NULL; gchar* _tmp19_ = NULL; const gchar* _tmp20_ = NULL; gchar* _tmp21_ = NULL; -#line 429 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 429 "/data/src/seahorse/gkr/gkr-item.vala" _tmp18_ = match; -#line 429 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 429 "/data/src/seahorse/gkr/gkr-item.vala" _tmp19_ = g_match_info_fetch (_tmp18_, 1); -#line 429 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 429 "/data/src/seahorse/gkr/gkr-item.vala" identifier = _tmp19_; -#line 430 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 430 "/data/src/seahorse/gkr/gkr-item.vala" _tmp20_ = identifier; -#line 430 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 430 "/data/src/seahorse/gkr/gkr-item.vala" _tmp21_ = seahorse_gkr_decode_telepathy_id (_tmp20_); -#line 430 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 430 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*info).label); -#line 430 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 430 "/data/src/seahorse/gkr/gkr-item.vala" (*info).label = _tmp21_; -#line 428 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 428 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (identifier); -#line 3288 "gkr-item.c" +#line 3272 "gkr-item.c" } } -#line 424 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 424 "/data/src/seahorse/gkr/gkr-item.vala" _g_match_info_free0 (match); -#line 424 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 424 "/data/src/seahorse/gkr/gkr-item.vala" _g_regex_unref0 (regex); -#line 3295 "gkr-item.c" +#line 3279 "gkr-item.c" } goto __finally6; __catch6_g_regex_error: @@ -3299,77 +3283,77 @@ GError* err = NULL; GError* _tmp22_ = NULL; const gchar* _tmp23_ = NULL; -#line 424 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 424 "/data/src/seahorse/gkr/gkr-item.vala" err = _inner_error_; -#line 424 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 424 "/data/src/seahorse/gkr/gkr-item.vala" _inner_error_ = NULL; -#line 434 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 434 "/data/src/seahorse/gkr/gkr-item.vala" _tmp22_ = err; -#line 434 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 434 "/data/src/seahorse/gkr/gkr-item.vala" _tmp23_ = _tmp22_->message; -#line 434 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 434 "/data/src/seahorse/gkr/gkr-item.vala" g_critical ("gkr-item.vala:434: %s", _tmp23_); -#line 435 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 435 "/data/src/seahorse/gkr/gkr-item.vala" _g_error_free0 (err); -#line 435 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 435 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (account); -#line 435 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 435 "/data/src/seahorse/gkr/gkr-item.vala" return; -#line 3319 "gkr-item.c" +#line 3303 "gkr-item.c" } __finally6: -#line 424 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 424 "/data/src/seahorse/gkr/gkr-item.vala" if (_inner_error_ != NULL) { -#line 424 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 424 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (account); -#line 424 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 424 "/data/src/seahorse/gkr/gkr-item.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 424 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 424 "/data/src/seahorse/gkr/gkr-item.vala" g_clear_error (&_inner_error_); -#line 424 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 424 "/data/src/seahorse/gkr/gkr-item.vala" return; -#line 3332 "gkr-item.c" +#line 3316 "gkr-item.c" } } -#line 439 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 439 "/data/src/seahorse/gkr/gkr-item.vala" _tmp24_ = *info; -#line 439 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 439 "/data/src/seahorse/gkr/gkr-item.vala" _tmp25_ = _tmp24_.label; -#line 439 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 439 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp25_ == NULL) { -#line 3341 "gkr-item.c" +#line 3325 "gkr-item.c" const gchar* _tmp26_ = NULL; gchar* _tmp27_ = NULL; -#line 440 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 440 "/data/src/seahorse/gkr/gkr-item.vala" _tmp26_ = display; -#line 440 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 440 "/data/src/seahorse/gkr/gkr-item.vala" _tmp27_ = g_strdup (_tmp26_); -#line 440 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 440 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*info).label); -#line 440 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 440 "/data/src/seahorse/gkr/gkr-item.vala" (*info).label = _tmp27_; -#line 3352 "gkr-item.c" +#line 3336 "gkr-item.c" } -#line 441 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 441 "/data/src/seahorse/gkr/gkr-item.vala" _tmp28_ = account; -#line 441 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 441 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp28_ != NULL) { -#line 3358 "gkr-item.c" +#line 3342 "gkr-item.c" const gchar* _tmp29_ = NULL; gchar* _tmp30_ = NULL; -#line 442 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 442 "/data/src/seahorse/gkr/gkr-item.vala" _tmp29_ = account; -#line 442 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 442 "/data/src/seahorse/gkr/gkr-item.vala" _tmp30_ = g_markup_escape_text (_tmp29_, (gssize) (-1)); -#line 442 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 442 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*info).details); -#line 442 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 442 "/data/src/seahorse/gkr/gkr-item.vala" (*info).details = _tmp30_; -#line 3369 "gkr-item.c" +#line 3353 "gkr-item.c" } -#line 418 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 418 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (account); -#line 3373 "gkr-item.c" +#line 3357 "gkr-item.c" } @@ -3382,73 +3366,73 @@ gchar* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = (*self).item_type; -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = g_strdup (_tmp0_); -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*dest).item_type); -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" (*dest).item_type = _tmp1_; -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = (*self).mapped_type; -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = g_strdup (_tmp2_); -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*dest).mapped_type); -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" (*dest).mapped_type = _tmp3_; -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = (*self).match_attribute; -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" _tmp5_ = g_strdup (_tmp4_); -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*dest).match_attribute); -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" (*dest).match_attribute = _tmp5_; -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" _tmp6_ = (*self).match_pattern; -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" _tmp7_ = g_strdup (_tmp6_); -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*dest).match_pattern); -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" (*dest).match_pattern = _tmp7_; -#line 3418 "gkr-item.c" +#line 3402 "gkr-item.c" } void seahorse_gkr_mapping_entry_destroy (SeahorseGkrMappingEntry* self) { -#line 461 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 461 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*self).item_type); -#line 462 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 462 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*self).mapped_type); -#line 463 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 463 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*self).match_attribute); -#line 464 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 464 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 ((*self).match_pattern); -#line 3431 "gkr-item.c" +#line 3415 "gkr-item.c" } SeahorseGkrMappingEntry* seahorse_gkr_mapping_entry_dup (const SeahorseGkrMappingEntry* self) { SeahorseGkrMappingEntry* dup; -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" dup = g_new0 (SeahorseGkrMappingEntry, 1); -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_mapping_entry_copy (self, dup); -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" return dup; -#line 3443 "gkr-item.c" +#line 3427 "gkr-item.c" } void seahorse_gkr_mapping_entry_free (SeahorseGkrMappingEntry* self) { -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_mapping_entry_destroy (self); -#line 460 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 460 "/data/src/seahorse/gkr/gkr-item.vala" g_free (self); -#line 3452 "gkr-item.c" +#line 3436 "gkr-item.c" } @@ -3469,66 +3453,66 @@ GHashTable* _tmp2_ = NULL; const gchar* _tmp28_ = NULL; gchar* _tmp29_ = NULL; -#line 480 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 480 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = item_type; -#line 480 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 480 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp0_ == NULL) { -#line 3477 "gkr-item.c" +#line 3461 "gkr-item.c" gchar* _tmp1_ = NULL; -#line 481 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 481 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = g_strdup (SEAHORSE_GKR_GENERIC_SECRET); -#line 481 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 481 "/data/src/seahorse/gkr/gkr-item.vala" result = _tmp1_; -#line 481 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 481 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 3485 "gkr-item.c" +#line 3469 "gkr-item.c" } -#line 482 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 482 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = attrs; -#line 482 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 482 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp2_ == NULL) { -#line 3491 "gkr-item.c" +#line 3475 "gkr-item.c" const gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; -#line 483 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 483 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = item_type; -#line 483 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 483 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = g_strdup (_tmp3_); -#line 483 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 483 "/data/src/seahorse/gkr/gkr-item.vala" result = _tmp4_; -#line 483 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 483 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 3502 "gkr-item.c" +#line 3486 "gkr-item.c" } { SeahorseGkrMappingEntry* mapping_collection = NULL; gint mapping_collection_length1 = 0; gint _mapping_collection_size_ = 0; gint mapping_it = 0; -#line 485 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 485 "/data/src/seahorse/gkr/gkr-item.vala" mapping_collection = SEAHORSE_GKR_MAPPING_ENTRIES; -#line 485 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 485 "/data/src/seahorse/gkr/gkr-item.vala" mapping_collection_length1 = G_N_ELEMENTS (SEAHORSE_GKR_MAPPING_ENTRIES); -#line 485 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 485 "/data/src/seahorse/gkr/gkr-item.vala" for (mapping_it = 0; mapping_it < G_N_ELEMENTS (SEAHORSE_GKR_MAPPING_ENTRIES); mapping_it = mapping_it + 1) { -#line 3515 "gkr-item.c" +#line 3499 "gkr-item.c" SeahorseGkrMappingEntry mapping = {0}; -#line 485 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 485 "/data/src/seahorse/gkr/gkr-item.vala" mapping = mapping_collection[mapping_it]; -#line 3519 "gkr-item.c" +#line 3503 "gkr-item.c" { const gchar* _tmp5_ = NULL; SeahorseGkrMappingEntry _tmp6_ = {0}; const gchar* _tmp7_ = NULL; -#line 486 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 486 "/data/src/seahorse/gkr/gkr-item.vala" _tmp5_ = item_type; -#line 486 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 486 "/data/src/seahorse/gkr/gkr-item.vala" _tmp6_ = mapping; -#line 486 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 486 "/data/src/seahorse/gkr/gkr-item.vala" _tmp7_ = _tmp6_.item_type; -#line 486 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 486 "/data/src/seahorse/gkr/gkr-item.vala" if (g_strcmp0 (_tmp5_, _tmp7_) == 0) { -#line 3532 "gkr-item.c" +#line 3516 "gkr-item.c" gchar* value = NULL; GHashTable* _tmp8_ = NULL; SeahorseGkrMappingEntry _tmp9_ = {0}; @@ -3537,129 +3521,129 @@ gboolean _tmp12_ = FALSE; const gchar* _tmp13_ = NULL; gboolean _tmp16_ = FALSE; -#line 487 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 487 "/data/src/seahorse/gkr/gkr-item.vala" _tmp8_ = attrs; -#line 487 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 487 "/data/src/seahorse/gkr/gkr-item.vala" _tmp9_ = mapping; -#line 487 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 487 "/data/src/seahorse/gkr/gkr-item.vala" _tmp10_ = _tmp9_.match_attribute; -#line 487 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 487 "/data/src/seahorse/gkr/gkr-item.vala" _tmp11_ = seahorse_gkr_get_attribute_string (_tmp8_, _tmp10_); -#line 487 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 487 "/data/src/seahorse/gkr/gkr-item.vala" value = _tmp11_; -#line 488 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 488 "/data/src/seahorse/gkr/gkr-item.vala" _tmp13_ = value; -#line 488 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 488 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp13_ != NULL) { -#line 3555 "gkr-item.c" +#line 3539 "gkr-item.c" SeahorseGkrMappingEntry _tmp14_ = {0}; const gchar* _tmp15_ = NULL; -#line 488 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 488 "/data/src/seahorse/gkr/gkr-item.vala" _tmp14_ = mapping; -#line 488 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 488 "/data/src/seahorse/gkr/gkr-item.vala" _tmp15_ = _tmp14_.match_pattern; -#line 488 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 488 "/data/src/seahorse/gkr/gkr-item.vala" _tmp12_ = _tmp15_ != NULL; -#line 3564 "gkr-item.c" +#line 3548 "gkr-item.c" } else { -#line 488 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 488 "/data/src/seahorse/gkr/gkr-item.vala" _tmp12_ = FALSE; -#line 3568 "gkr-item.c" +#line 3552 "gkr-item.c" } -#line 488 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 488 "/data/src/seahorse/gkr/gkr-item.vala" _tmp16_ = _tmp12_; -#line 488 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 488 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp16_) { -#line 3574 "gkr-item.c" +#line 3558 "gkr-item.c" SeahorseGkrMappingEntry _tmp17_ = {0}; const gchar* _tmp18_ = NULL; const gchar* _tmp19_ = NULL; gboolean _tmp20_ = FALSE; -#line 489 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 489 "/data/src/seahorse/gkr/gkr-item.vala" _tmp17_ = mapping; -#line 489 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 489 "/data/src/seahorse/gkr/gkr-item.vala" _tmp18_ = _tmp17_.match_pattern; -#line 489 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 489 "/data/src/seahorse/gkr/gkr-item.vala" _tmp19_ = value; -#line 489 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 489 "/data/src/seahorse/gkr/gkr-item.vala" _tmp20_ = g_pattern_match_simple (_tmp18_, _tmp19_); -#line 489 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 489 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp20_) { -#line 3589 "gkr-item.c" +#line 3573 "gkr-item.c" SeahorseGkrMappingEntry _tmp21_ = {0}; const gchar* _tmp22_ = NULL; gchar* _tmp23_ = NULL; -#line 490 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 490 "/data/src/seahorse/gkr/gkr-item.vala" _tmp21_ = mapping; -#line 490 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 490 "/data/src/seahorse/gkr/gkr-item.vala" _tmp22_ = _tmp21_.mapped_type; -#line 490 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 490 "/data/src/seahorse/gkr/gkr-item.vala" _tmp23_ = g_strdup (_tmp22_); -#line 490 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 490 "/data/src/seahorse/gkr/gkr-item.vala" result = _tmp23_; -#line 490 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 490 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (value); -#line 490 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 490 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 3605 "gkr-item.c" +#line 3589 "gkr-item.c" } } else { const gchar* _tmp24_ = NULL; -#line 491 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 491 "/data/src/seahorse/gkr/gkr-item.vala" _tmp24_ = value; -#line 491 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 491 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp24_ != NULL) { -#line 3613 "gkr-item.c" +#line 3597 "gkr-item.c" SeahorseGkrMappingEntry _tmp25_ = {0}; const gchar* _tmp26_ = NULL; gchar* _tmp27_ = NULL; -#line 492 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 492 "/data/src/seahorse/gkr/gkr-item.vala" _tmp25_ = mapping; -#line 492 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 492 "/data/src/seahorse/gkr/gkr-item.vala" _tmp26_ = _tmp25_.mapped_type; -#line 492 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 492 "/data/src/seahorse/gkr/gkr-item.vala" _tmp27_ = g_strdup (_tmp26_); -#line 492 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 492 "/data/src/seahorse/gkr/gkr-item.vala" result = _tmp27_; -#line 492 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 492 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (value); -#line 492 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 492 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 3629 "gkr-item.c" +#line 3613 "gkr-item.c" } } -#line 486 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 486 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (value); -#line 3634 "gkr-item.c" +#line 3618 "gkr-item.c" } } } } -#line 497 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 497 "/data/src/seahorse/gkr/gkr-item.vala" _tmp28_ = item_type; -#line 497 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 497 "/data/src/seahorse/gkr/gkr-item.vala" _tmp29_ = g_strdup (_tmp28_); -#line 497 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 497 "/data/src/seahorse/gkr/gkr-item.vala" result = _tmp29_; -#line 497 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 497 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 3647 "gkr-item.c" +#line 3631 "gkr-item.c" } static void _g_object_unref0_ (gpointer var) { -#line 501 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 501 "/data/src/seahorse/gkr/gkr-item.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); -#line 3654 "gkr-item.c" +#line 3638 "gkr-item.c" } static void _g_list_free__g_object_unref0_ (GList* self) { -#line 501 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 501 "/data/src/seahorse/gkr/gkr-item.vala" g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); -#line 501 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 501 "/data/src/seahorse/gkr/gkr-item.vala" g_list_free (self); -#line 3663 "gkr-item.c" +#line 3647 "gkr-item.c" } @@ -3670,19 +3654,19 @@ GList* _tmp0_ = NULL; guint _tmp1_ = 0U; guint _tmp2_ = 0U; -#line 503 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 503 "/data/src/seahorse/gkr/gkr-item.vala" self = (SeahorseGkrItemDeleter*) base; -#line 504 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 504 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = self->priv->_items; -#line 504 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 504 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = g_list_length (_tmp0_); -#line 504 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 504 "/data/src/seahorse/gkr/gkr-item.vala" num = _tmp1_; -#line 505 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 505 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = num; -#line 505 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 505 "/data/src/seahorse/gkr/gkr-item.vala" if (_tmp2_ == ((guint) 1)) { -#line 3686 "gkr-item.c" +#line 3670 "gkr-item.c" gchar* label = NULL; GList* _tmp3_ = NULL; gconstpointer _tmp4_ = NULL; @@ -3692,56 +3676,56 @@ const gchar* _tmp8_ = NULL; const gchar* _tmp9_ = NULL; SeahorseDeleteDialog* _tmp10_ = NULL; -#line 506 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 506 "/data/src/seahorse/gkr/gkr-item.vala" _tmp3_ = self->priv->_items; -#line 506 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 506 "/data/src/seahorse/gkr/gkr-item.vala" _tmp4_ = _tmp3_->data; -#line 506 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 506 "/data/src/seahorse/gkr/gkr-item.vala" g_object_get (G_TYPE_CHECK_INSTANCE_CAST ((SeahorseGkrItem*) _tmp4_, secret_item_get_type (), SecretItem), "label", &_tmp5_, NULL); -#line 506 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 506 "/data/src/seahorse/gkr/gkr-item.vala" _tmp6_ = _tmp5_; -#line 506 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 506 "/data/src/seahorse/gkr/gkr-item.vala" label = _tmp6_; -#line 507 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 507 "/data/src/seahorse/gkr/gkr-item.vala" _tmp7_ = parent; -#line 507 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 507 "/data/src/seahorse/gkr/gkr-item.vala" _tmp8_ = _ ("Are you sure you want to delete the password '%s'?"); -#line 507 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 507 "/data/src/seahorse/gkr/gkr-item.vala" _tmp9_ = label; -#line 507 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 507 "/data/src/seahorse/gkr/gkr-item.vala" _tmp10_ = (SeahorseDeleteDialog*) seahorse_delete_dialog_new (_tmp7_, _tmp8_, _tmp9_, NULL); -#line 507 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 507 "/data/src/seahorse/gkr/gkr-item.vala" g_object_ref_sink (_tmp10_); -#line 507 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 507 "/data/src/seahorse/gkr/gkr-item.vala" result = (GtkDialog*) _tmp10_; -#line 507 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 507 "/data/src/seahorse/gkr/gkr-item.vala" _g_free0 (label); -#line 507 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 507 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 3722 "gkr-item.c" +#line 3706 "gkr-item.c" } else { GtkWindow* _tmp11_ = NULL; guint _tmp12_ = 0U; const gchar* _tmp13_ = NULL; guint _tmp14_ = 0U; SeahorseDeleteDialog* _tmp15_ = NULL; -#line 509 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 509 "/data/src/seahorse/gkr/gkr-item.vala" _tmp11_ = parent; -#line 509 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 509 "/data/src/seahorse/gkr/gkr-item.vala" _tmp12_ = num; -#line 509 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 509 "/data/src/seahorse/gkr/gkr-item.vala" _tmp13_ = ngettext ("Are you sure you want to delete %d password?", "Are you sure you want to delete %d passwords?", (gulong) _tmp12_); -#line 509 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 509 "/data/src/seahorse/gkr/gkr-item.vala" _tmp14_ = num; -#line 509 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 509 "/data/src/seahorse/gkr/gkr-item.vala" _tmp15_ = (SeahorseDeleteDialog*) seahorse_delete_dialog_new (_tmp11_, _tmp13_, _tmp14_, NULL); -#line 509 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 509 "/data/src/seahorse/gkr/gkr-item.vala" g_object_ref_sink (_tmp15_); -#line 509 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 509 "/data/src/seahorse/gkr/gkr-item.vala" result = (GtkDialog*) _tmp15_; -#line 509 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 509 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 3745 "gkr-item.c" +#line 3729 "gkr-item.c" } } @@ -3750,30 +3734,30 @@ SeahorseGkrItemDeleter * self = NULL; SeahorseGkrItem* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 514 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 514 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (item != NULL, NULL); -#line 514 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 514 "/data/src/seahorse/gkr/gkr-item.vala" self = (SeahorseGkrItemDeleter*) seahorse_deleter_construct (object_type); -#line 515 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 515 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = item; -#line 515 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 515 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = seahorse_deleter_add_object ((SeahorseDeleter*) self, (GObject*) _tmp0_); -#line 515 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 515 "/data/src/seahorse/gkr/gkr-item.vala" if (!_tmp1_) { -#line 516 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 516 "/data/src/seahorse/gkr/gkr-item.vala" g_assert_not_reached (); -#line 3766 "gkr-item.c" +#line 3750 "gkr-item.c" } -#line 514 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 514 "/data/src/seahorse/gkr/gkr-item.vala" return self; -#line 3770 "gkr-item.c" +#line 3754 "gkr-item.c" } SeahorseGkrItemDeleter* seahorse_gkr_item_deleter_new (SeahorseGkrItem* item) { -#line 514 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 514 "/data/src/seahorse/gkr/gkr-item.vala" return seahorse_gkr_item_deleter_construct (SEAHORSE_GKR_TYPE_ITEM_DELETER, item); -#line 3777 "gkr-item.c" +#line 3761 "gkr-item.c" } @@ -3781,15 +3765,15 @@ SeahorseGkrItemDeleter * self; GList* result = NULL; GList* _tmp0_ = NULL; -#line 519 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 519 "/data/src/seahorse/gkr/gkr-item.vala" self = (SeahorseGkrItemDeleter*) base; -#line 520 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 520 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = self->priv->_items; -#line 520 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 520 "/data/src/seahorse/gkr/gkr-item.vala" result = _tmp0_; -#line 520 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 520 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 3793 "gkr-item.c" +#line 3777 "gkr-item.c" } @@ -3797,47 +3781,47 @@ SeahorseGkrItemDeleter * self; gboolean result = FALSE; GObject* _tmp0_ = NULL; -#line 523 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 523 "/data/src/seahorse/gkr/gkr-item.vala" self = (SeahorseGkrItemDeleter*) base; -#line 523 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 523 "/data/src/seahorse/gkr/gkr-item.vala" g_return_val_if_fail (obj != NULL, FALSE); -#line 524 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 524 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = obj; -#line 524 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 524 "/data/src/seahorse/gkr/gkr-item.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SEAHORSE_GKR_TYPE_ITEM)) { -#line 3809 "gkr-item.c" +#line 3793 "gkr-item.c" GObject* _tmp1_ = NULL; SeahorseGkrItem* _tmp2_ = NULL; -#line 525 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 525 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = obj; -#line 525 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 525 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SEAHORSE_GKR_TYPE_ITEM, SeahorseGkrItem)); -#line 525 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 525 "/data/src/seahorse/gkr/gkr-item.vala" self->priv->_items = g_list_append (self->priv->_items, _tmp2_); -#line 526 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 526 "/data/src/seahorse/gkr/gkr-item.vala" result = TRUE; -#line 526 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 526 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 3822 "gkr-item.c" +#line 3806 "gkr-item.c" } -#line 528 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 528 "/data/src/seahorse/gkr/gkr-item.vala" result = FALSE; -#line 528 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 528 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 3828 "gkr-item.c" +#line 3812 "gkr-item.c" } static void seahorse_gkr_item_deleter_real_delete_data_free (gpointer _data) { SeahorseGkrItemDeleterDeleteData* _data_; _data_ = _data; -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" _g_object_unref0 (_data_->cancellable); -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" _g_object_unref0 (_data_->self); -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" g_slice_free (SeahorseGkrItemDeleterDeleteData, _data_); -#line 3841 "gkr-item.c" +#line 3825 "gkr-item.c" } @@ -3847,226 +3831,226 @@ SeahorseGkrItemDeleter* _tmp0_ = NULL; GCancellable* _tmp1_ = NULL; GCancellable* _tmp2_ = NULL; -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" self = (SeahorseGkrItemDeleter*) base; -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" _data_ = g_slice_new0 (SeahorseGkrItemDeleterDeleteData); -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, seahorse_gkr_item_deleter_real_delete); -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, seahorse_gkr_item_deleter_real_delete_data_free); -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" _tmp0_ = _g_object_ref0 (self); -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" _data_->self = _tmp0_; -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" _tmp1_ = cancellable; -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" _g_object_unref0 (_data_->cancellable); -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" _data_->cancellable = _tmp2_; -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_item_deleter_real_delete_co (_data_); -#line 3873 "gkr-item.c" +#line 3857 "gkr-item.c" } static gboolean seahorse_gkr_item_deleter_real_delete_finish (SeahorseDeleter* base, GAsyncResult* _res_, GError** error) { gboolean result; SeahorseGkrItemDeleterDeleteData* _data_; -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" return FALSE; -#line 3884 "gkr-item.c" +#line 3868 "gkr-item.c" } -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" result = _data_->result; -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" return result; -#line 3892 "gkr-item.c" +#line 3876 "gkr-item.c" } static void seahorse_gkr_item_deleter_delete_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { SeahorseGkrItemDeleterDeleteData* _data_; -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" _data_ = _user_data_; -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_source_object_ = source_object; -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_res_ = _res_; -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_item_deleter_real_delete_co (_data_); -#line 3906 "gkr-item.c" +#line 3890 "gkr-item.c" } static gboolean seahorse_gkr_item_deleter_real_delete_co (SeahorseGkrItemDeleterDeleteData* _data_) { -#line 531 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 531 "/data/src/seahorse/gkr/gkr-item.vala" switch (_data_->_state_) { -#line 531 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 531 "/data/src/seahorse/gkr/gkr-item.vala" case 0: -#line 3915 "gkr-item.c" +#line 3899 "gkr-item.c" goto _state_0; -#line 531 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 531 "/data/src/seahorse/gkr/gkr-item.vala" case 1: -#line 3919 "gkr-item.c" +#line 3903 "gkr-item.c" goto _state_1; default: -#line 531 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 531 "/data/src/seahorse/gkr/gkr-item.vala" g_assert_not_reached (); -#line 3924 "gkr-item.c" +#line 3908 "gkr-item.c" } _state_0: -#line 532 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 532 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_tmp0_ = NULL; -#line 532 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 532 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_tmp0_ = _data_->self->priv->_items; -#line 532 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 532 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_tmp1_ = NULL; -#line 532 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 532 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_tmp1_ = g_list_copy (_data_->_tmp0_); -#line 532 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 532 "/data/src/seahorse/gkr/gkr-item.vala" _data_->items = _data_->_tmp1_; -#line 533 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 533 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_tmp2_ = NULL; -#line 533 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 533 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_tmp2_ = _data_->items; -#line 3941 "gkr-item.c" +#line 3925 "gkr-item.c" { -#line 533 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 533 "/data/src/seahorse/gkr/gkr-item.vala" _data_->item_collection = _data_->_tmp2_; -#line 533 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 533 "/data/src/seahorse/gkr/gkr-item.vala" for (_data_->item_it = _data_->item_collection; _data_->item_it != NULL; _data_->item_it = _data_->item_it->next) { -#line 533 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 533 "/data/src/seahorse/gkr/gkr-item.vala" _data_->item = (SeahorseGkrItem*) _data_->item_it->data; -#line 3949 "gkr-item.c" +#line 3933 "gkr-item.c" { -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_tmp3_ = NULL; -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_tmp3_ = _data_->item; -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_tmp4_ = NULL; -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_tmp4_ = _data_->cancellable; -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" _data_->_state_ = 1; -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" secret_item_delete ((SecretItem*) _data_->_tmp3_, _data_->_tmp4_, seahorse_gkr_item_deleter_delete_ready, _data_); -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" return FALSE; -#line 3965 "gkr-item.c" +#line 3949 "gkr-item.c" _state_1: -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" secret_item_delete_finish ((SecretItem*) _data_->_tmp3_, _data_->_res_, &_data_->_inner_error_); -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" if (_data_->_inner_error_ != NULL) { -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" g_error_free (_data_->_inner_error_); -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" _g_list_free0 (_data_->items); -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" if (_data_->_state_ == 0) { -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 3981 "gkr-item.c" +#line 3965 "gkr-item.c" } else { -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" g_simple_async_result_complete (_data_->_async_result); -#line 3985 "gkr-item.c" +#line 3969 "gkr-item.c" } -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" g_object_unref (_data_->_async_result); -#line 534 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 534 "/data/src/seahorse/gkr/gkr-item.vala" return FALSE; -#line 3991 "gkr-item.c" +#line 3975 "gkr-item.c" } } } } -#line 535 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 535 "/data/src/seahorse/gkr/gkr-item.vala" _data_->result = TRUE; -#line 535 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 535 "/data/src/seahorse/gkr/gkr-item.vala" _g_list_free0 (_data_->items); -#line 535 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 535 "/data/src/seahorse/gkr/gkr-item.vala" if (_data_->_state_ == 0) { -#line 535 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 535 "/data/src/seahorse/gkr/gkr-item.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 4004 "gkr-item.c" +#line 3988 "gkr-item.c" } else { -#line 535 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 535 "/data/src/seahorse/gkr/gkr-item.vala" g_simple_async_result_complete (_data_->_async_result); -#line 4008 "gkr-item.c" +#line 3992 "gkr-item.c" } -#line 535 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 535 "/data/src/seahorse/gkr/gkr-item.vala" g_object_unref (_data_->_async_result); -#line 535 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 535 "/data/src/seahorse/gkr/gkr-item.vala" return FALSE; -#line 531 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 531 "/data/src/seahorse/gkr/gkr-item.vala" _g_list_free0 (_data_->items); -#line 531 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 531 "/data/src/seahorse/gkr/gkr-item.vala" if (_data_->_state_ == 0) { -#line 531 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 531 "/data/src/seahorse/gkr/gkr-item.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 4020 "gkr-item.c" +#line 4004 "gkr-item.c" } else { -#line 531 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 531 "/data/src/seahorse/gkr/gkr-item.vala" g_simple_async_result_complete (_data_->_async_result); -#line 4024 "gkr-item.c" +#line 4008 "gkr-item.c" } -#line 531 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 531 "/data/src/seahorse/gkr/gkr-item.vala" g_object_unref (_data_->_async_result); -#line 531 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 531 "/data/src/seahorse/gkr/gkr-item.vala" return FALSE; -#line 4030 "gkr-item.c" +#line 4014 "gkr-item.c" } static void seahorse_gkr_item_deleter_class_init (SeahorseGkrItemDeleterClass * klass) { -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" seahorse_gkr_item_deleter_parent_class = g_type_class_peek_parent (klass); -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" g_type_class_add_private (klass, sizeof (SeahorseGkrItemDeleterPrivate)); -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" SEAHORSE_DELETER_CLASS (klass)->create_confirm = seahorse_gkr_item_deleter_real_create_confirm; -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" SEAHORSE_DELETER_CLASS (klass)->get_objects = seahorse_gkr_item_deleter_real_get_objects; -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" SEAHORSE_DELETER_CLASS (klass)->add_object = seahorse_gkr_item_deleter_real_add_object; -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" SEAHORSE_DELETER_CLASS (klass)->delete = seahorse_gkr_item_deleter_real_delete; -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" SEAHORSE_DELETER_CLASS (klass)->delete_finish = seahorse_gkr_item_deleter_real_delete_finish; -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" G_OBJECT_CLASS (klass)->finalize = seahorse_gkr_item_deleter_finalize; -#line 4051 "gkr-item.c" +#line 4035 "gkr-item.c" } static void seahorse_gkr_item_deleter_instance_init (SeahorseGkrItemDeleter * self) { -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" self->priv = SEAHORSE_GKR_ITEM_DELETER_GET_PRIVATE (self); -#line 4058 "gkr-item.c" +#line 4042 "gkr-item.c" } static void seahorse_gkr_item_deleter_finalize (GObject* obj) { SeahorseGkrItemDeleter * self; -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_GKR_TYPE_ITEM_DELETER, SeahorseGkrItemDeleter); -#line 501 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 501 "/data/src/seahorse/gkr/gkr-item.vala" __g_list_free__g_object_unref0_0 (self->priv->_items); -#line 500 "/data/projects/seahorse/gkr/gkr-item.vala" +#line 500 "/data/src/seahorse/gkr/gkr-item.vala" G_OBJECT_CLASS (seahorse_gkr_item_deleter_parent_class)->finalize (obj); -#line 4070 "gkr-item.c" +#line 4054 "gkr-item.c" } diff -Nru seahorse-3.10.1/gkr/gkr-keyring-add.c seahorse-3.10.2/gkr/gkr-keyring-add.c --- seahorse-3.10.1/gkr/gkr-keyring-add.c 2013-07-24 15:11:32.000000000 +0000 +++ seahorse-3.10.2/gkr/gkr-keyring-add.c 2014-01-08 15:13:22.000000000 +0000 @@ -1,4 +1,4 @@ -/* gkr-keyring-add.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* gkr-keyring-add.c generated by valac 0.22.1, the Vala compiler * generated from gkr-keyring-add.vala, do not modify */ /* @@ -65,31 +65,31 @@ SeahorseGkrKeyringAdd* seahorse_gkr_keyring_add_construct (GType object_type, GtkWindow* parent) { SeahorseGkrKeyringAdd * self = NULL; GtkWindow* _tmp0_ = NULL; -#line 71 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 71 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp0_ = parent; -#line 71 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 71 "/data/src/seahorse/gkr/gkr-keyring-add.vala" self = (SeahorseGkrKeyringAdd*) g_object_new (object_type, "transient-for", _tmp0_, NULL); -#line 72 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 72 "/data/src/seahorse/gkr/gkr-keyring-add.vala" gtk_widget_show ((GtkWidget*) self); -#line 73 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 73 "/data/src/seahorse/gkr/gkr-keyring-add.vala" gtk_window_present ((GtkWindow*) self); -#line 70 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 70 "/data/src/seahorse/gkr/gkr-keyring-add.vala" return self; #line 79 "gkr-keyring-add.c" } SeahorseGkrKeyringAdd* seahorse_gkr_keyring_add_new (GtkWindow* parent) { -#line 70 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 70 "/data/src/seahorse/gkr/gkr-keyring-add.vala" return seahorse_gkr_keyring_add_construct (SEAHORSE_GKR_TYPE_KEYRING_ADD, parent); #line 86 "gkr-keyring-add.c" } static Block7Data* block7_data_ref (Block7Data* _data7_) { -#line 27 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-keyring-add.vala" g_atomic_int_inc (&_data7_->_ref_count_); -#line 27 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-keyring-add.vala" return _data7_; #line 95 "gkr-keyring-add.c" } @@ -98,17 +98,17 @@ static void block7_data_unref (void * _userdata_) { Block7Data* _data7_; _data7_ = (Block7Data*) _userdata_; -#line 27 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-keyring-add.vala" if (g_atomic_int_dec_and_test (&_data7_->_ref_count_)) { #line 104 "gkr-keyring-add.c" SeahorseGkrKeyringAdd * self; -#line 27 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-keyring-add.vala" self = _data7_->self; -#line 27 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _g_object_unref0 (_data7_->entry); -#line 27 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _g_object_unref0 (self); -#line 27 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-keyring-add.vala" g_slice_free (Block7Data, _data7_); #line 114 "gkr-keyring-add.c" } @@ -116,7 +116,7 @@ static gpointer _g_object_ref0 (gpointer self) { -#line 37 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 37 "/data/src/seahorse/gkr/gkr-keyring-add.vala" return self ? g_object_ref (self) : NULL; #line 122 "gkr-keyring-add.c" } @@ -129,30 +129,30 @@ const gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; -#line 39 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 39 "/data/src/seahorse/gkr/gkr-keyring-add.vala" self = _data7_->self; -#line 39 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 39 "/data/src/seahorse/gkr/gkr-keyring-add.vala" g_return_if_fail (editable != NULL); -#line 40 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 40 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp0_ = _data7_->entry; -#line 40 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 40 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp1_ = gtk_entry_get_text (_tmp0_); -#line 40 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 40 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp2_ = g_strdup (_tmp1_); -#line 40 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 40 "/data/src/seahorse/gkr/gkr-keyring-add.vala" name = _tmp2_; -#line 41 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 41 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp3_ = name; -#line 41 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 41 "/data/src/seahorse/gkr/gkr-keyring-add.vala" gtk_dialog_set_response_sensitive ((GtkDialog*) self, (gint) GTK_RESPONSE_ACCEPT, g_strcmp0 (_tmp3_, "") != 0); -#line 39 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 39 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _g_free0 (name); #line 151 "gkr-keyring-add.c" } static void __seahorse_gkr_keyring_add___lambda4__gtk_editable_changed (GtkEditable* _sender, gpointer self) { -#line 39 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 39 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _seahorse_gkr_keyring_add___lambda4_ (self, _sender); #line 158 "gkr-keyring-add.c" } @@ -160,24 +160,24 @@ static void ___lambda7_ (SeahorseGkrKeyringAdd* self, GObject* obj, GAsyncResult* res) { GError * _inner_error_ = NULL; -#line 51 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 51 "/data/src/seahorse/gkr/gkr-keyring-add.vala" g_return_if_fail (res != NULL); -#line 53 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 53 "/data/src/seahorse/gkr/gkr-keyring-add.vala" seahorse_gkr_dialog_complete_request ((GtkWidget*) self, FALSE); #line 168 "gkr-keyring-add.c" { GAsyncResult* _tmp0_ = NULL; SecretCollection* _tmp1_ = NULL; SecretCollection* _tmp2_ = NULL; -#line 56 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 56 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp0_ = res; -#line 56 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 56 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp1_ = secret_collection_create_finish (_tmp0_, &_inner_error_); -#line 56 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 56 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp2_ = _tmp1_; -#line 56 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 56 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _g_object_unref0 (_tmp2_); -#line 56 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 56 "/data/src/seahorse/gkr/gkr-keyring-add.vala" if (_inner_error_ != NULL) { #line 183 "gkr-keyring-add.c" goto __catch14_g_error; @@ -190,43 +190,43 @@ const gchar* _tmp3_ = NULL; GError* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; -#line 55 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 55 "/data/src/seahorse/gkr/gkr-keyring-add.vala" err = _inner_error_; -#line 55 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 55 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _inner_error_ = NULL; -#line 58 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 58 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp3_ = _ ("Couldn't add keyring"); -#line 58 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 58 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp4_ = err; -#line 58 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 58 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp5_ = _tmp4_->message; -#line 58 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 58 "/data/src/seahorse/gkr/gkr-keyring-add.vala" seahorse_util_show_error ((GtkWidget*) self, _tmp3_, _tmp5_); -#line 55 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 55 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _g_error_free0 (err); #line 208 "gkr-keyring-add.c" } __finally14: -#line 55 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 55 "/data/src/seahorse/gkr/gkr-keyring-add.vala" if (_inner_error_ != NULL) { -#line 55 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 55 "/data/src/seahorse/gkr/gkr-keyring-add.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 55 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 55 "/data/src/seahorse/gkr/gkr-keyring-add.vala" g_clear_error (&_inner_error_); -#line 55 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 55 "/data/src/seahorse/gkr/gkr-keyring-add.vala" return; #line 219 "gkr-keyring-add.c" } -#line 61 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 61 "/data/src/seahorse/gkr/gkr-keyring-add.vala" gtk_widget_destroy ((GtkWidget*) self); #line 223 "gkr-keyring-add.c" } static void ____lambda7__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 49 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 49 "/data/src/seahorse/gkr/gkr-keyring-add.vala" ___lambda7_ (self, source_object, res); -#line 49 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 49 "/data/src/seahorse/gkr/gkr-keyring-add.vala" g_object_unref (self); #line 232 "gkr-keyring-add.c" } @@ -235,11 +235,11 @@ static void _seahorse_gkr_keyring_add___lambda5_ (Block7Data* _data7_, gint resp) { SeahorseGkrKeyringAdd * self; gint _tmp0_ = 0; -#line 44 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 44 "/data/src/seahorse/gkr/gkr-keyring-add.vala" self = _data7_->self; -#line 45 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 45 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp0_ = resp; -#line 45 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 45 "/data/src/seahorse/gkr/gkr-keyring-add.vala" if (_tmp0_ == ((gint) GTK_RESPONSE_ACCEPT)) { #line 245 "gkr-keyring-add.c" gchar* name = NULL; @@ -258,51 +258,51 @@ SecretService* _tmp11_ = NULL; const gchar* _tmp12_ = NULL; GCancellable* _tmp13_ = NULL; -#line 46 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 46 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp1_ = _data7_->entry; -#line 46 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 46 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp2_ = gtk_entry_get_text (_tmp1_); -#line 46 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 46 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp3_ = g_strdup (_tmp2_); -#line 46 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 46 "/data/src/seahorse/gkr/gkr-keyring-add.vala" name = _tmp3_; -#line 47 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 47 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp4_ = seahorse_gkr_dialog_begin_request ((GtkWidget*) self); -#line 47 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 47 "/data/src/seahorse/gkr/gkr-keyring-add.vala" cancellable = _tmp4_; -#line 48 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 48 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp5_ = seahorse_gkr_backend_instance (); -#line 48 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 48 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp6_ = _tmp5_; -#line 48 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 48 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp7_ = seahorse_gkr_backend_get_service (_tmp6_); -#line 48 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 48 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp8_ = _tmp7_; -#line 48 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 48 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp9_ = _g_object_ref0 (_tmp8_); -#line 48 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 48 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp10_ = _tmp9_; -#line 48 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 48 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _g_object_unref0 (_tmp6_); -#line 48 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 48 "/data/src/seahorse/gkr/gkr-keyring-add.vala" service = _tmp10_; -#line 49 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 49 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp11_ = service; -#line 49 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 49 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp12_ = name; -#line 49 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 49 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp13_ = cancellable; -#line 49 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 49 "/data/src/seahorse/gkr/gkr-keyring-add.vala" secret_collection_create (_tmp11_, _tmp12_, NULL, SECRET_COLLECTION_CREATE_NONE, _tmp13_, ____lambda7__gasync_ready_callback, g_object_ref (self)); -#line 45 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 45 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _g_object_unref0 (service); -#line 45 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 45 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _g_object_unref0 (cancellable); -#line 45 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 45 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _g_free0 (name); #line 304 "gkr-keyring-add.c" } else { -#line 64 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 64 "/data/src/seahorse/gkr/gkr-keyring-add.vala" gtk_widget_destroy ((GtkWidget*) self); #line 308 "gkr-keyring-add.c" } @@ -310,7 +310,7 @@ static void __seahorse_gkr_keyring_add___lambda5__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { -#line 44 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 44 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _seahorse_gkr_keyring_add___lambda5_ (self, response_id); #line 316 "gkr-keyring-add.c" } @@ -328,66 +328,66 @@ GObject* _tmp3_ = NULL; GtkEntry* _tmp4_ = NULL; GtkEntry* _tmp5_ = NULL; -#line 27 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-keyring-add.vala" parent_class = G_OBJECT_CLASS (seahorse_gkr_keyring_add_parent_class); -#line 27 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-keyring-add.vala" obj = parent_class->constructor (type, n_construct_properties, construct_properties); -#line 27 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-keyring-add.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_GKR_TYPE_KEYRING_ADD, SeahorseGkrKeyringAdd); -#line 27 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _data7_ = g_slice_new0 (Block7Data); -#line 27 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _data7_->_ref_count_ = 1; -#line 27 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _data7_->self = g_object_ref (self); -#line 28 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 28 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp0_ = _ ("Add Password Keyring"); -#line 28 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 28 "/data/src/seahorse/gkr/gkr-keyring-add.vala" gtk_window_set_title ((GtkWindow*) self, _tmp0_); -#line 29 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 29 "/data/src/seahorse/gkr/gkr-keyring-add.vala" gtk_window_set_modal ((GtkWindow*) self, TRUE); -#line 30 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 30 "/data/src/seahorse/gkr/gkr-keyring-add.vala" g_object_set ((GtkWindow*) self, "window-position", GTK_WIN_POS_CENTER_ON_PARENT, NULL); -#line 31 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 31 "/data/src/seahorse/gkr/gkr-keyring-add.vala" gtk_container_set_border_width ((GtkContainer*) self, (guint) 5); -#line 33 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 33 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp1_ = seahorse_util_load_built_contents ((GtkContainer*) self, "add-keyring"); -#line 33 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 33 "/data/src/seahorse/gkr/gkr-keyring-add.vala" builder = _tmp1_; -#line 34 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 34 "/data/src/seahorse/gkr/gkr-keyring-add.vala" gtk_dialog_add_buttons ((GtkDialog*) self, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); -#line 37 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 37 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp2_ = builder; -#line 37 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 37 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp3_ = gtk_builder_get_object (_tmp2_, "keyring-name"); -#line 37 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 37 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_ENTRY, GtkEntry)); -#line 37 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 37 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _data7_->entry = _tmp4_; -#line 38 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 38 "/data/src/seahorse/gkr/gkr-keyring-add.vala" gtk_dialog_set_response_sensitive ((GtkDialog*) self, (gint) GTK_RESPONSE_ACCEPT, FALSE); -#line 39 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 39 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _tmp5_ = _data7_->entry; -#line 39 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 39 "/data/src/seahorse/gkr/gkr-keyring-add.vala" g_signal_connect_data ((GtkEditable*) _tmp5_, "changed", (GCallback) __seahorse_gkr_keyring_add___lambda4__gtk_editable_changed, block7_data_ref (_data7_), (GClosureNotify) block7_data_unref, 0); -#line 44 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 44 "/data/src/seahorse/gkr/gkr-keyring-add.vala" g_signal_connect_data ((GtkDialog*) self, "response", (GCallback) __seahorse_gkr_keyring_add___lambda5__gtk_dialog_response, block7_data_ref (_data7_), (GClosureNotify) block7_data_unref, 0); -#line 27 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _g_object_unref0 (builder); -#line 27 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-keyring-add.vala" block7_data_unref (_data7_); -#line 27 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-keyring-add.vala" _data7_ = NULL; -#line 27 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 27 "/data/src/seahorse/gkr/gkr-keyring-add.vala" return obj; #line 384 "gkr-keyring-add.c" } static void seahorse_gkr_keyring_add_class_init (SeahorseGkrKeyringAddClass * klass) { -#line 26 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring-add.vala" seahorse_gkr_keyring_add_parent_class = g_type_class_peek_parent (klass); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring-add.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring-add.vala" G_OBJECT_CLASS (klass)->constructor = seahorse_gkr_keyring_add_constructor; #line 393 "gkr-keyring-add.c" } diff -Nru seahorse-3.10.1/gkr/gkr-keyring-properties.c seahorse-3.10.2/gkr/gkr-keyring-properties.c --- seahorse-3.10.1/gkr/gkr-keyring-properties.c 2013-07-24 15:11:32.000000000 +0000 +++ seahorse-3.10.2/gkr/gkr-keyring-properties.c 2014-01-08 15:13:22.000000000 +0000 @@ -1,4 +1,4 @@ -/* gkr-keyring-properties.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* gkr-keyring-properties.c generated by valac 0.22.1, the Vala compiler * generated from gkr-keyring-properties.vala, do not modify */ /* @@ -63,22 +63,22 @@ SeahorseGkrKeyringProperties * self = NULL; SeahorseGkrKeyring* _tmp0_ = NULL; GtkWindow* _tmp1_ = NULL; -#line 70 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 70 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" g_return_val_if_fail (keyring != NULL, NULL); -#line 72 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 72 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp0_ = keyring; -#line 72 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 72 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp1_ = parent; -#line 72 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 72 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" self = (SeahorseGkrKeyringProperties*) g_object_new (object_type, "keyring", _tmp0_, "transient-for", _tmp1_, NULL); -#line 70 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 70 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" return self; #line 77 "gkr-keyring-properties.c" } SeahorseGkrKeyringProperties* seahorse_gkr_keyring_properties_new (SeahorseGkrKeyring* keyring, GtkWindow* parent) { -#line 70 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 70 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" return seahorse_gkr_keyring_properties_construct (SEAHORSE_GKR_TYPE_KEYRING_PROPERTIES, keyring, parent); #line 84 "gkr-keyring-properties.c" } @@ -87,20 +87,20 @@ SeahorseGkrKeyring* seahorse_gkr_keyring_properties_get_keyring (SeahorseGkrKeyringProperties* self) { SeahorseGkrKeyring* result; SeahorseGkrKeyring* _tmp0_ = NULL; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" g_return_val_if_fail (self != NULL, NULL); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp0_ = self->priv->_keyring; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" result = _tmp0_; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" return result; #line 99 "gkr-keyring-properties.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 26 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" return self ? g_object_ref (self) : NULL; #line 106 "gkr-keyring-properties.c" } @@ -109,31 +109,31 @@ static void seahorse_gkr_keyring_properties_set_keyring (SeahorseGkrKeyringProperties* self, SeahorseGkrKeyring* value) { SeahorseGkrKeyring* _tmp0_ = NULL; SeahorseGkrKeyring* _tmp1_ = NULL; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" g_return_if_fail (self != NULL); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp0_ = value; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _g_object_unref0 (self->priv->_keyring); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" self->priv->_keyring = _tmp1_; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" g_object_notify ((GObject *) self, "keyring"); #line 125 "gkr-keyring-properties.c" } static void _seahorse_gkr_keyring_properties___lambda29_ (SeahorseGkrKeyringProperties* self, gint response) { -#line 45 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 45 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" gtk_widget_destroy ((GtkWidget*) self); #line 132 "gkr-keyring-properties.c" } static void __seahorse_gkr_keyring_properties___lambda29__gtk_dialog_response (GtkDialog* _sender, gint response_id, gpointer self) { -#line 44 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 44 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _seahorse_gkr_keyring_properties___lambda29_ (self, response_id); #line 139 "gkr-keyring-properties.c" } @@ -144,21 +144,21 @@ const gchar* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; GQuark _tmp4_ = 0U; -#line 61 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 61 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" static GQuark _tmp3_label0 = 0; -#line 60 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 60 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" g_return_if_fail (pspec != NULL); -#line 61 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 61 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp0_ = pspec; -#line 61 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 61 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp1_ = _tmp0_->name; -#line 61 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 61 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp2_ = _tmp1_; -#line 61 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 61 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_); -#line 61 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 61 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("created")))) { -#line 61 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 61 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" switch (0) { #line 164 "gkr-keyring-properties.c" default: @@ -173,33 +173,33 @@ guint64 _tmp11_ = 0ULL; gchar* _tmp12_ = NULL; gchar* _tmp13_ = NULL; -#line 63 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 63 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp5_ = self->priv->_builder; -#line 63 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 63 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp6_ = gtk_builder_get_object (_tmp5_, "created-field"); -#line 63 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 63 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GTK_TYPE_LABEL, GtkLabel)); -#line 63 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 63 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" created = _tmp7_; -#line 64 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 64 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp8_ = created; -#line 64 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 64 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp9_ = self->priv->_keyring; -#line 64 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 64 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" g_object_get ((SecretCollection*) _tmp9_, "created", &_tmp10_, NULL); -#line 64 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 64 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp11_ = _tmp10_; -#line 64 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 64 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp12_ = seahorse_util_get_display_date_string ((glong) _tmp11_); -#line 64 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 64 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp13_ = _tmp12_; -#line 64 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 64 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" gtk_label_set_label (_tmp8_, _tmp13_); -#line 64 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 64 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _g_free0 (_tmp13_); -#line 65 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 65 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _g_object_unref0 (created); -#line 65 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 65 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" break; #line 205 "gkr-keyring-properties.c" } @@ -209,7 +209,7 @@ static void __seahorse_gkr_keyring_properties___lambda30__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { -#line 60 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 60 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _seahorse_gkr_keyring_properties___lambda30_ (self, pspec); #line 215 "gkr-keyring-properties.c" } @@ -239,17 +239,17 @@ GtkLabel* _tmp20_ = NULL; SeahorseGkrKeyring* _tmp21_ = NULL; GError * _inner_error_ = NULL; -#line 30 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 30 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" parent_class = G_OBJECT_CLASS (seahorse_gkr_keyring_properties_parent_class); -#line 30 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 30 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" obj = parent_class->constructor (type, n_construct_properties, construct_properties); -#line 30 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 30 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_GKR_TYPE_KEYRING_PROPERTIES, SeahorseGkrKeyringProperties); -#line 31 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 31 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp0_ = gtk_builder_new (); -#line 31 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 31 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _g_object_unref0 (self->priv->_builder); -#line 31 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 31 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" self->priv->_builder = _tmp0_; #line 255 "gkr-keyring-properties.c" { @@ -257,24 +257,24 @@ gchar* _tmp1_ = NULL; GtkBuilder* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; -#line 33 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 33 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp1_ = g_build_filename (UIDIR, "seahorse-gkr-keyring.xml", NULL); -#line 33 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 33 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" path = _tmp1_; -#line 34 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 34 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp2_ = self->priv->_builder; -#line 34 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 34 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp3_ = path; -#line 34 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 34 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" gtk_builder_add_from_file (_tmp2_, _tmp3_, &_inner_error_); -#line 34 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 34 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" if (_inner_error_ != NULL) { -#line 34 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 34 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _g_free0 (path); #line 275 "gkr-keyring-properties.c" goto __catch15_g_error; } -#line 32 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 32 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _g_free0 (path); #line 280 "gkr-keyring-properties.c" } @@ -284,112 +284,112 @@ GError* err = NULL; GError* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; -#line 32 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 32 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" err = _inner_error_; -#line 32 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 32 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _inner_error_ = NULL; -#line 36 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp4_ = err; -#line 36 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp5_ = _tmp4_->message; -#line 36 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 36 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" g_critical ("gkr-keyring-properties.vala:36: %s", _tmp5_); -#line 32 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 32 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _g_error_free0 (err); #line 300 "gkr-keyring-properties.c" } __finally15: -#line 32 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 32 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" if (_inner_error_ != NULL) { -#line 32 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 32 "/data/src/seahorse/gkr/gkr-keyring-properties.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 32 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 32 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" g_clear_error (&_inner_error_); #line 309 "gkr-keyring-properties.c" } -#line 39 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 39 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" gtk_dialog_add_button ((GtkDialog*) self, GTK_STOCK_CLOSE, (gint) GTK_RESPONSE_CLOSE); -#line 40 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 40 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp6_ = self->priv->_builder; -#line 40 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 40 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp7_ = gtk_builder_get_object (_tmp6_, "gkr-item-properties"); -#line 40 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 40 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_WIDGET, GtkWidget)); -#line 40 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 40 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" content = _tmp8_; -#line 41 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 41 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp9_ = (GtkBox*) gtk_dialog_get_content_area ((GtkDialog*) self); -#line 41 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 41 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp10_ = content; -#line 41 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 41 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GTK_TYPE_CONTAINER, GtkContainer), _tmp10_); -#line 42 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 42 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp11_ = content; -#line 42 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 42 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" gtk_widget_show (_tmp11_); -#line 44 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 44 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" g_signal_connect_object ((GtkDialog*) self, "response", (GCallback) __seahorse_gkr_keyring_properties___lambda29__gtk_dialog_response, self, 0); -#line 49 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 49 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp12_ = self->priv->_keyring; -#line 49 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 49 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp13_ = self->priv->_builder; -#line 49 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 49 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp14_ = gtk_builder_get_object (_tmp13_, "keyring-image"); -#line 49 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 49 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" g_object_bind_property_with_closures ((GObject*) _tmp12_, "icon", _tmp14_, "gicon", G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); -#line 53 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 53 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp15_ = self->priv->_keyring; -#line 53 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 53 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" g_object_bind_property_with_closures ((GObject*) _tmp15_, "label", (GObject*) self, "title", G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); -#line 56 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 56 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp16_ = self->priv->_builder; -#line 56 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 56 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp17_ = gtk_builder_get_object (_tmp16_, "name-field"); -#line 56 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 56 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GTK_TYPE_LABEL, GtkLabel)); -#line 56 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 56 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" name = _tmp18_; -#line 57 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 57 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp19_ = self->priv->_keyring; -#line 57 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 57 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp20_ = name; -#line 57 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 57 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" g_object_bind_property_with_closures ((GObject*) _tmp19_, "label", (GObject*) _tmp20_, "label", G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); -#line 60 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 60 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _tmp21_ = self->priv->_keyring; -#line 60 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 60 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" g_signal_connect_object ((GObject*) _tmp21_, "notify", (GCallback) __seahorse_gkr_keyring_properties___lambda30__g_object_notify, self, 0); -#line 30 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 30 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _g_object_unref0 (name); -#line 30 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 30 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _g_object_unref0 (content); -#line 30 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 30 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" return obj; #line 369 "gkr-keyring-properties.c" } static void seahorse_gkr_keyring_properties_class_init (SeahorseGkrKeyringPropertiesClass * klass) { -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" seahorse_gkr_keyring_properties_parent_class = g_type_class_peek_parent (klass); -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" g_type_class_add_private (klass, sizeof (SeahorseGkrKeyringPropertiesPrivate)); -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" G_OBJECT_CLASS (klass)->get_property = _vala_seahorse_gkr_keyring_properties_get_property; -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" G_OBJECT_CLASS (klass)->set_property = _vala_seahorse_gkr_keyring_properties_set_property; -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" G_OBJECT_CLASS (klass)->constructor = seahorse_gkr_keyring_properties_constructor; -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" G_OBJECT_CLASS (klass)->finalize = seahorse_gkr_keyring_properties_finalize; -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_KEYRING_PROPERTIES_KEYRING, g_param_spec_object ("keyring", "keyring", "keyring", SEAHORSE_GKR_TYPE_KEYRING, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY)); #line 388 "gkr-keyring-properties.c" } static void seahorse_gkr_keyring_properties_instance_init (SeahorseGkrKeyringProperties * self) { -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" self->priv = SEAHORSE_GKR_KEYRING_PROPERTIES_GET_PRIVATE (self); #line 395 "gkr-keyring-properties.c" } @@ -397,13 +397,13 @@ static void seahorse_gkr_keyring_properties_finalize (GObject* obj) { SeahorseGkrKeyringProperties * self; -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_GKR_TYPE_KEYRING_PROPERTIES, SeahorseGkrKeyringProperties); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _g_object_unref0 (self->priv->_keyring); -#line 28 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 28 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" _g_object_unref0 (self->priv->_builder); -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" G_OBJECT_CLASS (seahorse_gkr_keyring_properties_parent_class)->finalize (obj); #line 409 "gkr-keyring-properties.c" } @@ -424,19 +424,19 @@ static void _vala_seahorse_gkr_keyring_properties_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { SeahorseGkrKeyringProperties * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEAHORSE_GKR_TYPE_KEYRING_PROPERTIES, SeahorseGkrKeyringProperties); -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" switch (property_id) { -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" case SEAHORSE_GKR_KEYRING_PROPERTIES_KEYRING: -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" g_value_set_object (value, seahorse_gkr_keyring_properties_get_keyring (self)); -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" break; #line 436 "gkr-keyring-properties.c" default: -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" break; #line 442 "gkr-keyring-properties.c" } @@ -446,19 +446,19 @@ static void _vala_seahorse_gkr_keyring_properties_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) { SeahorseGkrKeyringProperties * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEAHORSE_GKR_TYPE_KEYRING_PROPERTIES, SeahorseGkrKeyringProperties); -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" switch (property_id) { -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" case SEAHORSE_GKR_KEYRING_PROPERTIES_KEYRING: -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" seahorse_gkr_keyring_properties_set_keyring (self, g_value_get_object (value)); -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" break; #line 458 "gkr-keyring-properties.c" default: -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 25 "/data/projects/seahorse/gkr/gkr-keyring-properties.vala" +#line 25 "/data/src/seahorse/gkr/gkr-keyring-properties.vala" break; #line 464 "gkr-keyring-properties.c" } diff -Nru seahorse-3.10.1/gkr/gkr-keyring.c seahorse-3.10.2/gkr/gkr-keyring.c --- seahorse-3.10.1/gkr/gkr-keyring.c 2013-07-24 15:11:32.000000000 +0000 +++ seahorse-3.10.2/gkr/gkr-keyring.c 2014-01-08 15:13:22.000000000 +0000 @@ -1,4 +1,4 @@ -/* gkr-keyring.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* gkr-keyring.c generated by valac 0.22.1, the Vala compiler * generated from gkr-keyring.vala, do not modify */ /* @@ -241,14 +241,14 @@ static const GtkActionEntry SEAHORSE_GKR_KEYRING_KEYRING_ACTIONS[2] = {{"keyring-default", NULL, "_Set as default", NULL, "Applications usually store new passwords in the default keyring.", (GCallback) _seahorse_gkr_keyring_on_keyring_default_gtk_action_callback}, {"keyring-password", NULL, "Change _Password", NULL, "Change the unlock password of the password storage keyring", (GCallback) _seahorse_gkr_keyring_on_keyring_password_gtk_action_callback}}; static void _seahorse_gkr_keyring_on_keyring_default_gtk_action_callback (GtkAction* action, gpointer self) { -#line 210 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 210 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_on_keyring_default (action, self); #line 247 "gkr-keyring.c" } static void _seahorse_gkr_keyring_on_keyring_password_gtk_action_callback (GtkAction* action, gpointer self) { -#line 210 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 210 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_on_keyring_password (action, self); #line 254 "gkr-keyring.c" } @@ -259,15 +259,15 @@ guint result = 0U; GHashTable* _tmp0_ = NULL; guint _tmp1_ = 0U; -#line 84 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 84 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyring*) base; -#line 85 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 85 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = self->priv->_items; -#line 85 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 85 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = g_hash_table_size (_tmp0_); -#line 85 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 85 "/data/src/seahorse/gkr/gkr-keyring.vala" result = _tmp1_; -#line 85 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 85 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 273 "gkr-keyring.c" } @@ -278,15 +278,15 @@ GList* result = NULL; GHashTable* _tmp0_ = NULL; GList* _tmp1_ = NULL; -#line 88 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 88 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyring*) base; -#line 89 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 89 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = self->priv->_items; -#line 89 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 89 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = g_hash_table_get_values (_tmp0_); -#line 89 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 89 "/data/src/seahorse/gkr/gkr-keyring.vala" result = _tmp1_; -#line 89 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 89 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 292 "gkr-keyring.c" } @@ -296,36 +296,36 @@ SeahorseGkrKeyring * self; gboolean result = FALSE; GObject* _tmp0_ = NULL; -#line 92 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 92 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyring*) base; -#line 92 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 92 "/data/src/seahorse/gkr/gkr-keyring.vala" g_return_val_if_fail (obj != NULL, FALSE); -#line 93 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 93 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = obj; -#line 93 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 93 "/data/src/seahorse/gkr/gkr-keyring.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, SEAHORSE_GKR_TYPE_ITEM)) { #line 308 "gkr-keyring.c" GHashTable* _tmp1_ = NULL; GObject* _tmp2_ = NULL; const gchar* _tmp3_ = NULL; gconstpointer _tmp4_ = NULL; -#line 94 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 94 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = self->priv->_items; -#line 94 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 94 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = obj; -#line 94 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 94 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp3_ = g_dbus_proxy_get_object_path ((GDBusProxy*) G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SEAHORSE_GKR_TYPE_ITEM, SeahorseGkrItem)); -#line 94 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 94 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp4_ = g_hash_table_lookup (_tmp1_, _tmp3_); -#line 94 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 94 "/data/src/seahorse/gkr/gkr-keyring.vala" result = ((SeahorseGkrItem*) _tmp4_) != NULL; -#line 94 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 94 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 325 "gkr-keyring.c" } -#line 95 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 95 "/data/src/seahorse/gkr/gkr-keyring.vala" result = FALSE; -#line 95 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 95 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 331 "gkr-keyring.c" } @@ -336,17 +336,17 @@ GtkWindow* result = NULL; GtkWindow* _tmp0_ = NULL; SeahorseGkrKeyringProperties* _tmp1_ = NULL; -#line 98 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 98 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyring*) base; -#line 99 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 99 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = parent; -#line 99 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 99 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = seahorse_gkr_keyring_properties_new (self, _tmp0_); -#line 99 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 99 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_ref_sink (_tmp1_); -#line 99 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 99 "/data/src/seahorse/gkr/gkr-keyring.vala" result = (GtkWindow*) _tmp1_; -#line 99 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 99 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 352 "gkr-keyring.c" } @@ -356,13 +356,13 @@ SeahorseGkrKeyring * self; SeahorseDeleter* result = NULL; SeahorseGkrKeyringDeleter* _tmp0_ = NULL; -#line 102 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 102 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyring*) base; -#line 103 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 103 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = seahorse_gkr_keyring_deleter_new (self); -#line 103 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 103 "/data/src/seahorse/gkr/gkr-keyring.vala" result = (SeahorseDeleter*) _tmp0_; -#line 103 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 103 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 368 "gkr-keyring.c" } @@ -371,20 +371,20 @@ static void seahorse_gkr_keyring_real_lock_data_free (gpointer _data) { SeahorseGkrKeyringLockData* _data_; _data_ = _data; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->interaction); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->cancellable); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->self); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_slice_free (SeahorseGkrKeyringLockData, _data_); #line 383 "gkr-keyring.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" return self ? g_object_ref (self) : NULL; #line 390 "gkr-keyring.c" } @@ -398,35 +398,35 @@ GTlsInteraction* _tmp2_ = NULL; GCancellable* _tmp3_ = NULL; GCancellable* _tmp4_ = NULL; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyring*) base; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_ = g_slice_new0 (SeahorseGkrKeyringLockData); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, seahorse_gkr_keyring_real_lock); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, seahorse_gkr_keyring_real_lock_data_free); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = _g_object_ref0 (self); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->self = _tmp0_; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = interaction; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->interaction); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->interaction = _tmp2_; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp3_ = cancellable; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp4_ = _g_object_ref0 (_tmp3_); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->cancellable); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->cancellable = _tmp4_; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_real_lock_co (_data_); #line 432 "gkr-keyring.c" } @@ -435,17 +435,17 @@ static gboolean seahorse_gkr_keyring_real_lock_finish (SeahorseLockable* base, GAsyncResult* _res_, GError** error) { gboolean result; SeahorseGkrKeyringLockData* _data_; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; #line 443 "gkr-keyring.c" } -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" result = _data_->result; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 451 "gkr-keyring.c" } @@ -453,164 +453,164 @@ static void seahorse_gkr_keyring_lock_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { SeahorseGkrKeyringLockData* _data_; -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_ = _user_data_; -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_source_object_ = source_object; -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_res_ = _res_; -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_real_lock_co (_data_); #line 465 "gkr-keyring.c" } static void _g_object_unref0_ (gpointer var) { -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" (var == NULL) ? NULL : (var = (g_object_unref (var), NULL)); #line 472 "gkr-keyring.c" } static void _g_list_free__g_object_unref0_ (GList* self) { -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" g_list_foreach (self, (GFunc) _g_object_unref0_, NULL); -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" g_list_free (self); #line 481 "gkr-keyring.c" } static gboolean seahorse_gkr_keyring_real_lock_co (SeahorseGkrKeyringLockData* _data_) { -#line 106 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 106 "/data/src/seahorse/gkr/gkr-keyring.vala" switch (_data_->_state_) { -#line 106 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 106 "/data/src/seahorse/gkr/gkr-keyring.vala" case 0: #line 490 "gkr-keyring.c" goto _state_0; -#line 106 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 106 "/data/src/seahorse/gkr/gkr-keyring.vala" case 1: #line 494 "gkr-keyring.c" goto _state_1; default: -#line 106 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 106 "/data/src/seahorse/gkr/gkr-keyring.vala" g_assert_not_reached (); #line 499 "gkr-keyring.c" } _state_0: -#line 108 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 108 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->objects = NULL; -#line 109 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 109 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp0_ = NULL; -#line 109 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 109 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp0_ = _g_object_ref0 ((GDBusProxy*) _data_->self); -#line 109 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 109 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->objects = g_list_prepend (_data_->objects, _data_->_tmp0_); -#line 111 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 111 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp1_ = NULL; -#line 111 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 111 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp1_ = secret_collection_get_service ((SecretCollection*) _data_->self); -#line 111 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 111 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp2_ = NULL; -#line 111 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 111 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp2_ = _g_object_ref0 (_data_->_tmp1_); -#line 111 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 111 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->service = _data_->_tmp2_; -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp3_ = NULL; -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp3_ = _data_->cancellable; -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp4_ = NULL; -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_state_ = 1; -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" secret_service_lock (_data_->service, _data_->objects, _data_->_tmp3_, seahorse_gkr_keyring_lock_ready, _data_); -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; #line 532 "gkr-keyring.c" _state_1: -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" secret_service_lock_finish (_data_->service, _data_->_res_, &_data_->_tmp4_, &_data_->_inner_error_); -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" __g_list_free__g_object_unref0_0 (_data_->locked); -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->locked = _data_->_tmp4_; -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_data_->_inner_error_ != NULL) { -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" g_error_free (_data_->_inner_error_); -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" __g_list_free__g_object_unref0_0 (_data_->locked); -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->service); -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" __g_list_free__g_object_unref0_0 (_data_->objects); -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_data_->_state_ == 0) { -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); #line 556 "gkr-keyring.c" } else { -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete (_data_->_async_result); #line 560 "gkr-keyring.c" } -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_unref (_data_->_async_result); -#line 113 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 113 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; #line 566 "gkr-keyring.c" } -#line 114 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 114 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_refresh_collection (_data_->self); -#line 115 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 115 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp5_ = 0U; -#line 115 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 115 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp5_ = g_list_length (_data_->locked); -#line 115 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 115 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->result = _data_->_tmp5_ > ((guint) 0); -#line 115 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 115 "/data/src/seahorse/gkr/gkr-keyring.vala" __g_list_free__g_object_unref0_0 (_data_->locked); -#line 115 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 115 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->service); -#line 115 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 115 "/data/src/seahorse/gkr/gkr-keyring.vala" __g_list_free__g_object_unref0_0 (_data_->objects); -#line 115 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 115 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_data_->_state_ == 0) { -#line 115 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 115 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); #line 586 "gkr-keyring.c" } else { -#line 115 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 115 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete (_data_->_async_result); #line 590 "gkr-keyring.c" } -#line 115 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 115 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_unref (_data_->_async_result); -#line 115 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 115 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; -#line 106 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 106 "/data/src/seahorse/gkr/gkr-keyring.vala" __g_list_free__g_object_unref0_0 (_data_->locked); -#line 106 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 106 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->service); -#line 106 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 106 "/data/src/seahorse/gkr/gkr-keyring.vala" __g_list_free__g_object_unref0_0 (_data_->objects); -#line 106 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 106 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_data_->_state_ == 0) { -#line 106 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 106 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); #line 606 "gkr-keyring.c" } else { -#line 106 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 106 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete (_data_->_async_result); #line 610 "gkr-keyring.c" } -#line 106 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 106 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_unref (_data_->_async_result); -#line 106 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 106 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; #line 616 "gkr-keyring.c" } @@ -619,13 +619,13 @@ static void seahorse_gkr_keyring_real_unlock_data_free (gpointer _data) { SeahorseGkrKeyringUnlockData* _data_; _data_ = _data; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->interaction); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->cancellable); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->self); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_slice_free (SeahorseGkrKeyringUnlockData, _data_); #line 631 "gkr-keyring.c" } @@ -639,35 +639,35 @@ GTlsInteraction* _tmp2_ = NULL; GCancellable* _tmp3_ = NULL; GCancellable* _tmp4_ = NULL; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyring*) base; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_ = g_slice_new0 (SeahorseGkrKeyringUnlockData); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, seahorse_gkr_keyring_real_unlock); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, seahorse_gkr_keyring_real_unlock_data_free); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = _g_object_ref0 (self); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->self = _tmp0_; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = interaction; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->interaction); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->interaction = _tmp2_; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp3_ = cancellable; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp4_ = _g_object_ref0 (_tmp3_); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->cancellable); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->cancellable = _tmp4_; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_real_unlock_co (_data_); #line 673 "gkr-keyring.c" } @@ -676,17 +676,17 @@ static gboolean seahorse_gkr_keyring_real_unlock_finish (SeahorseLockable* base, GAsyncResult* _res_, GError** error) { gboolean result; SeahorseGkrKeyringUnlockData* _data_; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; #line 684 "gkr-keyring.c" } -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" result = _data_->result; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 692 "gkr-keyring.c" } @@ -694,148 +694,148 @@ static void seahorse_gkr_keyring_unlock_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { SeahorseGkrKeyringUnlockData* _data_; -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_ = _user_data_; -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_source_object_ = source_object; -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_res_ = _res_; -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_real_unlock_co (_data_); #line 706 "gkr-keyring.c" } static gboolean seahorse_gkr_keyring_real_unlock_co (SeahorseGkrKeyringUnlockData* _data_) { -#line 118 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 118 "/data/src/seahorse/gkr/gkr-keyring.vala" switch (_data_->_state_) { -#line 118 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 118 "/data/src/seahorse/gkr/gkr-keyring.vala" case 0: #line 715 "gkr-keyring.c" goto _state_0; -#line 118 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 118 "/data/src/seahorse/gkr/gkr-keyring.vala" case 1: #line 719 "gkr-keyring.c" goto _state_1; default: -#line 118 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 118 "/data/src/seahorse/gkr/gkr-keyring.vala" g_assert_not_reached (); #line 724 "gkr-keyring.c" } _state_0: -#line 120 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 120 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->objects = NULL; -#line 121 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 121 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp0_ = NULL; -#line 121 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 121 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp0_ = _g_object_ref0 ((GDBusProxy*) _data_->self); -#line 121 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 121 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->objects = g_list_prepend (_data_->objects, _data_->_tmp0_); -#line 123 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 123 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp1_ = NULL; -#line 123 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 123 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp1_ = secret_collection_get_service ((SecretCollection*) _data_->self); -#line 123 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 123 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp2_ = NULL; -#line 123 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 123 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp2_ = _g_object_ref0 (_data_->_tmp1_); -#line 123 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 123 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->service = _data_->_tmp2_; -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp3_ = NULL; -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp3_ = _data_->cancellable; -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp4_ = NULL; -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_state_ = 1; -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" secret_service_unlock (_data_->service, _data_->objects, _data_->_tmp3_, seahorse_gkr_keyring_unlock_ready, _data_); -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; #line 757 "gkr-keyring.c" _state_1: -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" secret_service_unlock_finish (_data_->service, _data_->_res_, &_data_->_tmp4_, &_data_->_inner_error_); -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" __g_list_free__g_object_unref0_0 (_data_->unlocked); -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->unlocked = _data_->_tmp4_; -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_data_->_inner_error_ != NULL) { -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" g_error_free (_data_->_inner_error_); -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" __g_list_free__g_object_unref0_0 (_data_->unlocked); -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->service); -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" __g_list_free__g_object_unref0_0 (_data_->objects); -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_data_->_state_ == 0) { -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); #line 781 "gkr-keyring.c" } else { -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete (_data_->_async_result); #line 785 "gkr-keyring.c" } -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_unref (_data_->_async_result); -#line 125 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 125 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; #line 791 "gkr-keyring.c" } -#line 126 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 126 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_refresh_collection (_data_->self); -#line 127 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 127 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp5_ = 0U; -#line 127 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 127 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp5_ = g_list_length (_data_->unlocked); -#line 127 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 127 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->result = _data_->_tmp5_ > ((guint) 0); -#line 127 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 127 "/data/src/seahorse/gkr/gkr-keyring.vala" __g_list_free__g_object_unref0_0 (_data_->unlocked); -#line 127 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 127 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->service); -#line 127 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 127 "/data/src/seahorse/gkr/gkr-keyring.vala" __g_list_free__g_object_unref0_0 (_data_->objects); -#line 127 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 127 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_data_->_state_ == 0) { -#line 127 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 127 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); #line 811 "gkr-keyring.c" } else { -#line 127 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 127 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete (_data_->_async_result); #line 815 "gkr-keyring.c" } -#line 127 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 127 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_unref (_data_->_async_result); -#line 127 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 127 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; -#line 118 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 118 "/data/src/seahorse/gkr/gkr-keyring.vala" __g_list_free__g_object_unref0_0 (_data_->unlocked); -#line 118 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 118 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->service); -#line 118 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 118 "/data/src/seahorse/gkr/gkr-keyring.vala" __g_list_free__g_object_unref0_0 (_data_->objects); -#line 118 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 118 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_data_->_state_ == 0) { -#line 118 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 118 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); #line 831 "gkr-keyring.c" } else { -#line 118 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 118 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete (_data_->_async_result); #line 835 "gkr-keyring.c" } -#line 118 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 118 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_unref (_data_->_async_result); -#line 118 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 118 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; #line 841 "gkr-keyring.c" } @@ -844,11 +844,11 @@ static void seahorse_gkr_keyring_real_load_data_free (gpointer _data) { SeahorseGkrKeyringLoadData* _data_; _data_ = _data; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->cancellable); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->self); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_slice_free (SeahorseGkrKeyringLoadData, _data_); #line 854 "gkr-keyring.c" } @@ -860,27 +860,27 @@ SeahorseGkrKeyring* _tmp0_ = NULL; GCancellable* _tmp1_ = NULL; GCancellable* _tmp2_ = NULL; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyring*) base; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_ = g_slice_new0 (SeahorseGkrKeyringLoadData); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, seahorse_gkr_keyring_real_load); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, seahorse_gkr_keyring_real_load_data_free); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = _g_object_ref0 (self); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->self = _tmp0_; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = cancellable; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->cancellable); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->cancellable = _tmp2_; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_real_load_co (_data_); #line 886 "gkr-keyring.c" } @@ -889,73 +889,73 @@ static gboolean seahorse_gkr_keyring_real_load_finish (SeahorsePlace* base, GAsyncResult* _res_, GError** error) { gboolean result; SeahorseGkrKeyringLoadData* _data_; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; #line 897 "gkr-keyring.c" } -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" result = _data_->result; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 905 "gkr-keyring.c" } static gboolean seahorse_gkr_keyring_real_load_co (SeahorseGkrKeyringLoadData* _data_) { -#line 130 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 130 "/data/src/seahorse/gkr/gkr-keyring.vala" switch (_data_->_state_) { -#line 130 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 130 "/data/src/seahorse/gkr/gkr-keyring.vala" case 0: #line 914 "gkr-keyring.c" goto _state_0; default: -#line 130 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 130 "/data/src/seahorse/gkr/gkr-keyring.vala" g_assert_not_reached (); #line 919 "gkr-keyring.c" } _state_0: -#line 131 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 131 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_refresh_collection (_data_->self); -#line 132 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 132 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->result = TRUE; -#line 132 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 132 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_data_->_state_ == 0) { -#line 132 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 132 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); #line 930 "gkr-keyring.c" } else { -#line 132 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 132 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete (_data_->_async_result); #line 934 "gkr-keyring.c" } -#line 132 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 132 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_unref (_data_->_async_result); -#line 132 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 132 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; -#line 130 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 130 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_data_->_state_ == 0) { -#line 130 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 130 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); #line 944 "gkr-keyring.c" } else { -#line 130 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 130 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete (_data_->_async_result); #line 948 "gkr-keyring.c" } -#line 130 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 130 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_unref (_data_->_async_result); -#line 130 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 130 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; #line 954 "gkr-keyring.c" } static void _g_free0_ (gpointer var) { -#line 136 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 136 "/data/src/seahorse/gkr/gkr-keyring.vala" var = (g_free (var), NULL); #line 961 "gkr-keyring.c" } @@ -972,48 +972,48 @@ GHashTableIter iter = {0}; GHashTable* _tmp23_ = NULL; gchar* object_path = NULL; -#line 135 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 135 "/data/src/seahorse/gkr/gkr-keyring.vala" g_return_if_fail (self != NULL); -#line 136 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 136 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = g_str_hash; -#line 136 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 136 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = g_str_equal; -#line 136 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 136 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = g_hash_table_new_full (_tmp0_, _tmp1_, _g_free0_, NULL); -#line 136 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 136 "/data/src/seahorse/gkr/gkr-keyring.vala" seen = _tmp2_; -#line 138 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 138 "/data/src/seahorse/gkr/gkr-keyring.vala" items = NULL; -#line 139 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 139 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp3_ = secret_collection_get_locked ((SecretCollection*) self); -#line 139 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 139 "/data/src/seahorse/gkr/gkr-keyring.vala" if (!_tmp3_) { #line 992 "gkr-keyring.c" GList* _tmp4_ = NULL; -#line 140 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 140 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp4_ = secret_collection_get_items ((SecretCollection*) self); -#line 140 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 140 "/data/src/seahorse/gkr/gkr-keyring.vala" __g_list_free__g_object_unref0_0 (items); -#line 140 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 140 "/data/src/seahorse/gkr/gkr-keyring.vala" items = _tmp4_; #line 1000 "gkr-keyring.c" } -#line 142 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 142 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp5_ = items; #line 1004 "gkr-keyring.c" { GList* item_collection = NULL; GList* item_it = NULL; -#line 142 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 142 "/data/src/seahorse/gkr/gkr-keyring.vala" item_collection = _tmp5_; -#line 142 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 142 "/data/src/seahorse/gkr/gkr-keyring.vala" for (item_it = item_collection; item_it != NULL; item_it = item_it->next) { #line 1012 "gkr-keyring.c" SecretItem* _tmp6_ = NULL; SecretItem* item = NULL; -#line 142 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 142 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp6_ = _g_object_ref0 ((SecretItem*) item_it->data); -#line 142 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 142 "/data/src/seahorse/gkr/gkr-keyring.vala" item = _tmp6_; #line 1019 "gkr-keyring.c" { @@ -1027,29 +1027,29 @@ GHashTable* _tmp13_ = NULL; const gchar* _tmp14_ = NULL; gconstpointer _tmp15_ = NULL; -#line 143 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 143 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp7_ = item; -#line 143 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 143 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp8_ = g_dbus_proxy_get_object_path ((GDBusProxy*) _tmp7_); -#line 143 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 143 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp9_ = g_strdup (_tmp8_); -#line 143 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 143 "/data/src/seahorse/gkr/gkr-keyring.vala" object_path = _tmp9_; -#line 144 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 144 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp10_ = seen; -#line 144 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 144 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp11_ = object_path; -#line 144 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 144 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp12_ = g_strdup (_tmp11_); -#line 144 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 144 "/data/src/seahorse/gkr/gkr-keyring.vala" g_hash_table_add (_tmp10_, _tmp12_); -#line 146 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 146 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp13_ = self->priv->_items; -#line 146 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 146 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp14_ = object_path; -#line 146 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 146 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp15_ = g_hash_table_lookup (_tmp13_, _tmp14_); -#line 146 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 146 "/data/src/seahorse/gkr/gkr-keyring.vala" if (((SeahorseGkrItem*) _tmp15_) == NULL) { #line 1055 "gkr-keyring.c" SecretItem* _tmp16_ = NULL; @@ -1059,41 +1059,41 @@ SecretItem* _tmp20_ = NULL; SeahorseGkrItem* _tmp21_ = NULL; SecretItem* _tmp22_ = NULL; -#line 147 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 147 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp16_ = item; -#line 147 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 147 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_set ((GObject*) _tmp16_, "place", self, NULL); -#line 148 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 148 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp17_ = self->priv->_items; -#line 148 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 148 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp18_ = object_path; -#line 148 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 148 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp19_ = g_strdup (_tmp18_); -#line 148 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 148 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp20_ = item; -#line 148 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 148 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, SEAHORSE_GKR_TYPE_ITEM, SeahorseGkrItem)); -#line 148 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 148 "/data/src/seahorse/gkr/gkr-keyring.vala" g_hash_table_insert (_tmp17_, _tmp19_, _tmp21_); -#line 149 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 149 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp22_ = item; -#line 149 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 149 "/data/src/seahorse/gkr/gkr-keyring.vala" gcr_collection_emit_added ((GcrCollection*) self, (GObject*) _tmp22_); #line 1083 "gkr-keyring.c" } -#line 142 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 142 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_free0 (object_path); -#line 142 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 142 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (item); #line 1089 "gkr-keyring.c" } } } -#line 154 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 154 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp23_ = self->priv->_items; -#line 154 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 154 "/data/src/seahorse/gkr/gkr-keyring.vala" g_hash_table_iter_init (&iter, _tmp23_); -#line 156 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 156 "/data/src/seahorse/gkr/gkr-keyring.vala" while (TRUE) { #line 1099 "gkr-keyring.c" gconstpointer _tmp24_ = NULL; @@ -1102,27 +1102,27 @@ GHashTable* _tmp27_ = NULL; const gchar* _tmp28_ = NULL; gconstpointer _tmp29_ = NULL; -#line 156 "/data/projects/seahorse/gkr/gkr-keyring.vala" - _tmp25_ = g_hash_table_iter_next (&iter, &_tmp24_, NULL); -#line 156 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 156 "/data/src/seahorse/gkr/gkr-keyring.vala" + _tmp25_ = g_hash_table_iter_next (&iter, (gpointer*) (&_tmp24_), (gpointer*) NULL); +#line 156 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_free0 (object_path); -#line 156 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 156 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp26_ = g_strdup (_tmp24_); -#line 156 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 156 "/data/src/seahorse/gkr/gkr-keyring.vala" object_path = _tmp26_; -#line 156 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 156 "/data/src/seahorse/gkr/gkr-keyring.vala" if (!_tmp25_) { -#line 156 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 156 "/data/src/seahorse/gkr/gkr-keyring.vala" break; #line 1118 "gkr-keyring.c" } -#line 157 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 157 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp27_ = seen; -#line 157 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 157 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp28_ = object_path; -#line 157 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 157 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp29_ = g_hash_table_lookup (_tmp27_, _tmp28_); -#line 157 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 157 "/data/src/seahorse/gkr/gkr-keyring.vala" if (((const gchar*) _tmp29_) == NULL) { #line 1128 "gkr-keyring.c" SeahorseGkrItem* item = NULL; @@ -1132,45 +1132,45 @@ SeahorseGkrItem* _tmp33_ = NULL; SeahorseGkrItem* _tmp34_ = NULL; SeahorseGkrItem* _tmp35_ = NULL; -#line 158 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 158 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp30_ = self->priv->_items; -#line 158 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 158 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp31_ = object_path; -#line 158 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 158 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp32_ = g_hash_table_lookup (_tmp30_, _tmp31_); -#line 158 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 158 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp33_ = _g_object_ref0 ((SeahorseGkrItem*) _tmp32_); -#line 158 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 158 "/data/src/seahorse/gkr/gkr-keyring.vala" item = _tmp33_; -#line 159 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 159 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp34_ = item; -#line 159 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 159 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_set ((GObject*) _tmp34_, "place", NULL, NULL); -#line 160 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 160 "/data/src/seahorse/gkr/gkr-keyring.vala" g_hash_table_iter_remove (&iter); -#line 161 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 161 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp35_ = item; -#line 161 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 161 "/data/src/seahorse/gkr/gkr-keyring.vala" gcr_collection_emit_removed ((GcrCollection*) self, (GObject*) _tmp35_); -#line 157 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 157 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (item); #line 1158 "gkr-keyring.c" } } -#line 135 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 135 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_free0 (object_path); -#line 135 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 135 "/data/src/seahorse/gkr/gkr-keyring.vala" __g_list_free__g_object_unref0_0 (items); -#line 135 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 135 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_hash_table_unref0 (seen); #line 1167 "gkr-keyring.c" } static Block5Data* block5_data_ref (Block5Data* _data5_) { -#line 167 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 167 "/data/src/seahorse/gkr/gkr-keyring.vala" g_atomic_int_inc (&_data5_->_ref_count_); -#line 167 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 167 "/data/src/seahorse/gkr/gkr-keyring.vala" return _data5_; #line 1176 "gkr-keyring.c" } @@ -1179,19 +1179,19 @@ static void block5_data_unref (void * _userdata_) { Block5Data* _data5_; _data5_ = (Block5Data*) _userdata_; -#line 167 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 167 "/data/src/seahorse/gkr/gkr-keyring.vala" if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) { #line 1185 "gkr-keyring.c" SeahorseGkrKeyring * self; -#line 167 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 167 "/data/src/seahorse/gkr/gkr-keyring.vala" self = _data5_->self; -#line 167 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 167 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data5_->service); -#line 167 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 167 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data5_->parent); -#line 167 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 167 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (self); -#line 167 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 167 "/data/src/seahorse/gkr/gkr-keyring.vala" g_slice_free (Block5Data, _data5_); #line 1197 "gkr-keyring.c" } @@ -1201,31 +1201,31 @@ static void __lambda2_ (Block5Data* _data5_, GObject* obj, GAsyncResult* res) { SeahorseGkrKeyring * self; GError * _inner_error_ = NULL; -#line 171 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 171 "/data/src/seahorse/gkr/gkr-keyring.vala" self = _data5_->self; -#line 171 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 171 "/data/src/seahorse/gkr/gkr-keyring.vala" g_return_if_fail (res != NULL); #line 1209 "gkr-keyring.c" { GAsyncResult* _tmp0_ = NULL; SeahorseGkrBackend* _tmp1_ = NULL; SeahorseGkrBackend* _tmp2_ = NULL; -#line 173 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 173 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = res; -#line 173 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 173 "/data/src/seahorse/gkr/gkr-keyring.vala" secret_service_set_alias_finish (_data5_->service, _tmp0_, &_inner_error_); -#line 173 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 173 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_inner_error_ != NULL) { #line 1220 "gkr-keyring.c" goto __catch11_g_error; } -#line 174 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 174 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = seahorse_gkr_backend_instance (); -#line 174 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 174 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = _tmp1_; -#line 174 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 174 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_backend_refresh (_tmp2_); -#line 174 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 174 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_tmp2_); #line 1231 "gkr-keyring.c" } @@ -1236,30 +1236,30 @@ const gchar* _tmp3_ = NULL; GError* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; -#line 172 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 172 "/data/src/seahorse/gkr/gkr-keyring.vala" err = _inner_error_; -#line 172 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 172 "/data/src/seahorse/gkr/gkr-keyring.vala" _inner_error_ = NULL; -#line 176 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 176 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp3_ = _ ("Couldn't set default keyring"); -#line 176 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 176 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp4_ = err; -#line 176 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 176 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp5_ = _tmp4_->message; -#line 176 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 176 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_util_show_error ((GtkWidget*) _data5_->parent, _tmp3_, _tmp5_); -#line 172 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 172 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_error_free0 (err); #line 1254 "gkr-keyring.c" } __finally11: -#line 172 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 172 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_inner_error_ != NULL) { -#line 172 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 172 "/data/src/seahorse/gkr/gkr-keyring.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 172 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 172 "/data/src/seahorse/gkr/gkr-keyring.vala" g_clear_error (&_inner_error_); -#line 172 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 172 "/data/src/seahorse/gkr/gkr-keyring.vala" return; #line 1265 "gkr-keyring.c" } @@ -1267,9 +1267,9 @@ static void ___lambda2__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 171 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 171 "/data/src/seahorse/gkr/gkr-keyring.vala" __lambda2_ (self, source_object, res); -#line 171 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 171 "/data/src/seahorse/gkr/gkr-keyring.vala" block5_data_unref (self); #line 1275 "gkr-keyring.c" } @@ -1282,44 +1282,44 @@ SecretService* _tmp2_ = NULL; SecretService* _tmp3_ = NULL; SecretService* _tmp4_ = NULL; -#line 167 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 167 "/data/src/seahorse/gkr/gkr-keyring.vala" g_return_if_fail (self != NULL); -#line 167 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 167 "/data/src/seahorse/gkr/gkr-keyring.vala" g_return_if_fail (action != NULL); -#line 167 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 167 "/data/src/seahorse/gkr/gkr-keyring.vala" _data5_ = g_slice_new0 (Block5Data); -#line 167 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 167 "/data/src/seahorse/gkr/gkr-keyring.vala" _data5_->_ref_count_ = 1; -#line 167 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 167 "/data/src/seahorse/gkr/gkr-keyring.vala" _data5_->self = g_object_ref (self); -#line 168 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 168 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = action; -#line 168 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 168 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = seahorse_action_get_window (_tmp0_); -#line 168 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 168 "/data/src/seahorse/gkr/gkr-keyring.vala" _data5_->parent = _tmp1_; -#line 169 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 169 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = secret_collection_get_service ((SecretCollection*) self); -#line 169 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 169 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp3_ = _tmp2_; -#line 169 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 169 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp4_ = _g_object_ref0 (_tmp3_); -#line 169 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 169 "/data/src/seahorse/gkr/gkr-keyring.vala" _data5_->service = _tmp4_; -#line 171 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 171 "/data/src/seahorse/gkr/gkr-keyring.vala" secret_service_set_alias (_data5_->service, "default", (SecretCollection*) self, NULL, ___lambda2__gasync_ready_callback, block5_data_ref (_data5_)); -#line 167 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 167 "/data/src/seahorse/gkr/gkr-keyring.vala" block5_data_unref (_data5_); -#line 167 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 167 "/data/src/seahorse/gkr/gkr-keyring.vala" _data5_ = NULL; #line 1316 "gkr-keyring.c" } static Block6Data* block6_data_ref (Block6Data* _data6_) { -#line 182 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 182 "/data/src/seahorse/gkr/gkr-keyring.vala" g_atomic_int_inc (&_data6_->_ref_count_); -#line 182 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 182 "/data/src/seahorse/gkr/gkr-keyring.vala" return _data6_; #line 1325 "gkr-keyring.c" } @@ -1328,19 +1328,19 @@ static void block6_data_unref (void * _userdata_) { Block6Data* _data6_; _data6_ = (Block6Data*) _userdata_; -#line 182 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 182 "/data/src/seahorse/gkr/gkr-keyring.vala" if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) { #line 1334 "gkr-keyring.c" SeahorseGkrKeyring * self; -#line 182 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 182 "/data/src/seahorse/gkr/gkr-keyring.vala" self = _data6_->self; -#line 182 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 182 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data6_->service); -#line 182 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 182 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data6_->parent); -#line 182 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 182 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (self); -#line 182 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 182 "/data/src/seahorse/gkr/gkr-keyring.vala" g_slice_free (Block6Data, _data6_); #line 1346 "gkr-keyring.c" } @@ -1352,24 +1352,24 @@ SeahorseGkrBackend* _tmp6_ = NULL; SeahorseGkrBackend* _tmp7_ = NULL; GError * _inner_error_ = NULL; -#line 196 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 196 "/data/src/seahorse/gkr/gkr-keyring.vala" self = _data6_->self; -#line 196 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 196 "/data/src/seahorse/gkr/gkr-keyring.vala" g_return_if_fail (res != NULL); #line 1360 "gkr-keyring.c" { GAsyncResult* _tmp0_ = NULL; GVariant* _tmp1_ = NULL; GVariant* _tmp2_ = NULL; -#line 198 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 198 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = res; -#line 198 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 198 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = secret_service_prompt_at_dbus_path_finish (_data6_->service, _tmp0_, &_inner_error_); -#line 198 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 198 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = _tmp1_; -#line 198 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 198 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_variant_unref0 (_tmp2_); -#line 198 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 198 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_inner_error_ != NULL) { #line 1375 "gkr-keyring.c" goto __catch13_g_error; @@ -1382,49 +1382,49 @@ const gchar* _tmp3_ = NULL; GError* _tmp4_ = NULL; const gchar* _tmp5_ = NULL; -#line 197 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 197 "/data/src/seahorse/gkr/gkr-keyring.vala" err = _inner_error_; -#line 197 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 197 "/data/src/seahorse/gkr/gkr-keyring.vala" _inner_error_ = NULL; -#line 200 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 200 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp3_ = _ ("Couldn't change keyring password"); -#line 200 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 200 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp4_ = err; -#line 200 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 200 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp5_ = _tmp4_->message; -#line 200 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 200 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_util_show_error ((GtkWidget*) _data6_->parent, _tmp3_, _tmp5_); -#line 197 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 197 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_error_free0 (err); #line 1400 "gkr-keyring.c" } __finally13: -#line 197 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 197 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_inner_error_ != NULL) { -#line 197 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 197 "/data/src/seahorse/gkr/gkr-keyring.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 197 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 197 "/data/src/seahorse/gkr/gkr-keyring.vala" g_clear_error (&_inner_error_); -#line 197 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 197 "/data/src/seahorse/gkr/gkr-keyring.vala" return; #line 1411 "gkr-keyring.c" } -#line 202 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 202 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp6_ = seahorse_gkr_backend_instance (); -#line 202 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 202 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp7_ = _tmp6_; -#line 202 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 202 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_backend_refresh (_tmp7_); -#line 202 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 202 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_tmp7_); #line 1421 "gkr-keyring.c" } static void ____lambda17__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 196 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 196 "/data/src/seahorse/gkr/gkr-keyring.vala" ___lambda17_ (self, source_object, res); -#line 196 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 196 "/data/src/seahorse/gkr/gkr-keyring.vala" block6_data_unref (self); #line 1430 "gkr-keyring.c" } @@ -1433,9 +1433,9 @@ static void __lambda16_ (Block6Data* _data6_, GObject* obj, GAsyncResult* res) { SeahorseGkrKeyring * self; GError * _inner_error_ = NULL; -#line 191 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 191 "/data/src/seahorse/gkr/gkr-keyring.vala" self = _data6_->self; -#line 191 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 191 "/data/src/seahorse/gkr/gkr-keyring.vala" g_return_if_fail (res != NULL); #line 1441 "gkr-keyring.c" { @@ -1445,28 +1445,28 @@ GVariant* _tmp2_ = NULL; gchar* prompt_path = NULL; const gchar* _tmp3_ = NULL; -#line 193 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 193 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = g_dbus_proxy_get_connection ((GDBusProxy*) _data6_->service); -#line 193 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 193 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = res; -#line 193 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 193 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = g_dbus_connection_call_finish (_tmp0_, _tmp1_, &_inner_error_); -#line 193 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 193 "/data/src/seahorse/gkr/gkr-keyring.vala" retval = _tmp2_; -#line 193 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 193 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_inner_error_ != NULL) { #line 1459 "gkr-keyring.c" goto __catch12_g_error; } -#line 195 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 195 "/data/src/seahorse/gkr/gkr-keyring.vala" g_variant_get (retval, "(o)", &prompt_path, NULL); -#line 196 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 196 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp3_ = prompt_path; -#line 196 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 196 "/data/src/seahorse/gkr/gkr-keyring.vala" secret_service_prompt_at_dbus_path (_data6_->service, _tmp3_, NULL, NULL, ____lambda17__gasync_ready_callback, block6_data_ref (_data6_)); -#line 192 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 192 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_free0 (prompt_path); -#line 192 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 192 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_variant_unref0 (retval); #line 1472 "gkr-keyring.c" } @@ -1477,30 +1477,30 @@ const gchar* _tmp4_ = NULL; GError* _tmp5_ = NULL; const gchar* _tmp6_ = NULL; -#line 192 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 192 "/data/src/seahorse/gkr/gkr-keyring.vala" err = _inner_error_; -#line 192 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 192 "/data/src/seahorse/gkr/gkr-keyring.vala" _inner_error_ = NULL; -#line 205 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 205 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp4_ = _ ("Couldn't change keyring password"); -#line 205 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 205 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp5_ = err; -#line 205 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 205 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp6_ = _tmp5_->message; -#line 205 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 205 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_util_show_error ((GtkWidget*) _data6_->parent, _tmp4_, _tmp6_); -#line 192 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 192 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_error_free0 (err); #line 1495 "gkr-keyring.c" } __finally12: -#line 192 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 192 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_inner_error_ != NULL) { -#line 192 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 192 "/data/src/seahorse/gkr/gkr-keyring.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 192 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 192 "/data/src/seahorse/gkr/gkr-keyring.vala" g_clear_error (&_inner_error_); -#line 192 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 192 "/data/src/seahorse/gkr/gkr-keyring.vala" return; #line 1506 "gkr-keyring.c" } @@ -1508,9 +1508,9 @@ static void ___lambda16__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) { -#line 185 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 185 "/data/src/seahorse/gkr/gkr-keyring.vala" __lambda16_ (self, source_object, res); -#line 185 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 185 "/data/src/seahorse/gkr/gkr-keyring.vala" block6_data_unref (self); #line 1516 "gkr-keyring.c" } @@ -1531,57 +1531,57 @@ GVariant* _tmp10_ = NULL; GVariantType* _tmp11_ = NULL; GVariantType* _tmp12_ = NULL; -#line 182 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 182 "/data/src/seahorse/gkr/gkr-keyring.vala" g_return_if_fail (self != NULL); -#line 182 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 182 "/data/src/seahorse/gkr/gkr-keyring.vala" g_return_if_fail (action != NULL); -#line 182 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 182 "/data/src/seahorse/gkr/gkr-keyring.vala" _data6_ = g_slice_new0 (Block6Data); -#line 182 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 182 "/data/src/seahorse/gkr/gkr-keyring.vala" _data6_->_ref_count_ = 1; -#line 182 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 182 "/data/src/seahorse/gkr/gkr-keyring.vala" _data6_->self = g_object_ref (self); -#line 183 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 183 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = action; -#line 183 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 183 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = seahorse_action_get_window (_tmp0_); -#line 183 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 183 "/data/src/seahorse/gkr/gkr-keyring.vala" _data6_->parent = _tmp1_; -#line 184 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 184 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = secret_collection_get_service ((SecretCollection*) self); -#line 184 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 184 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp3_ = _tmp2_; -#line 184 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 184 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp4_ = _g_object_ref0 (_tmp3_); -#line 184 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 184 "/data/src/seahorse/gkr/gkr-keyring.vala" _data6_->service = _tmp4_; -#line 185 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 185 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp5_ = g_dbus_proxy_get_connection ((GDBusProxy*) _data6_->service); -#line 185 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 185 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp6_ = g_dbus_proxy_get_name ((GDBusProxy*) _data6_->service); -#line 185 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 185 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp7_ = g_dbus_proxy_get_object_path ((GDBusProxy*) _data6_->service); -#line 185 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 185 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp8_ = g_dbus_proxy_get_object_path ((GDBusProxy*) self); -#line 185 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 185 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp9_ = g_variant_new ("(o)", _tmp8_, NULL); -#line 185 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 185 "/data/src/seahorse/gkr/gkr-keyring.vala" g_variant_ref_sink (_tmp9_); -#line 185 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 185 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp10_ = _tmp9_; -#line 185 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 185 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp11_ = g_variant_type_new ("(o)"); -#line 185 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 185 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp12_ = _tmp11_; -#line 185 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 185 "/data/src/seahorse/gkr/gkr-keyring.vala" g_dbus_connection_call (_tmp5_, _tmp6_, _tmp7_, "org.gnome.keyring.InternalUnsupportedGuiltRiddenInterface", "ChangeWithPrompt", _tmp10_, _tmp12_, G_DBUS_CALL_FLAGS_NONE, -1, NULL, ___lambda16__gasync_ready_callback, block6_data_ref (_data6_)); -#line 185 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 185 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_variant_type_free0 (_tmp12_); -#line 185 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 185 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_variant_unref0 (_tmp10_); -#line 182 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 182 "/data/src/seahorse/gkr/gkr-keyring.vala" block6_data_unref (_data6_); -#line 182 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 182 "/data/src/seahorse/gkr/gkr-keyring.vala" _data6_ = NULL; #line 1587 "gkr-keyring.c" } @@ -1594,29 +1594,29 @@ GtkAction* action = NULL; GtkAction* _tmp1_ = NULL; GtkAction* _tmp2_ = NULL; -#line 217 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 217 "/data/src/seahorse/gkr/gkr-keyring.vala" g_return_val_if_fail (self != NULL, NULL); -#line 218 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 218 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = gtk_action_group_new ("KeyringActions"); -#line 218 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 218 "/data/src/seahorse/gkr/gkr-keyring.vala" actions = _tmp0_; -#line 221 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 221 "/data/src/seahorse/gkr/gkr-keyring.vala" gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE); -#line 222 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 222 "/data/src/seahorse/gkr/gkr-keyring.vala" gtk_action_group_add_actions (actions, SEAHORSE_GKR_KEYRING_KEYRING_ACTIONS, G_N_ELEMENTS (SEAHORSE_GKR_KEYRING_KEYRING_ACTIONS), self); -#line 224 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 224 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = gtk_action_group_get_action (actions, "keyring-default"); -#line 224 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 224 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 224 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 224 "/data/src/seahorse/gkr/gkr-keyring.vala" action = _tmp2_; -#line 225 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 225 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_bind_property_with_closures ((GObject*) self, "is-default", (GObject*) action, "sensitive", G_BINDING_INVERT_BOOLEAN | G_BINDING_SYNC_CREATE, (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL)), (GClosure*) ((NULL == NULL) ? NULL : g_cclosure_new ((GCallback) NULL, NULL, NULL))); -#line 228 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 228 "/data/src/seahorse/gkr/gkr-keyring.vala" result = actions; -#line 228 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 228 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (action); -#line 228 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 228 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 1622 "gkr-keyring.c" } @@ -1624,16 +1624,16 @@ SeahorseGkrKeyring* seahorse_gkr_keyring_construct (GType object_type) { SeahorseGkrKeyring * self = NULL; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyring*) g_object_new (object_type, NULL); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" return self; #line 1632 "gkr-keyring.c" } SeahorseGkrKeyring* seahorse_gkr_keyring_new (void) { -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" return seahorse_gkr_keyring_construct (SEAHORSE_GKR_TYPE_KEYRING); #line 1639 "gkr-keyring.c" } @@ -1648,40 +1648,40 @@ gboolean _tmp3_ = FALSE; const gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; -#line 28 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 28 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyring*) base; -#line 29 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 29 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = seahorse_gkr_backend_instance (); -#line 29 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 29 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = _tmp0_; -#line 29 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 29 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = seahorse_gkr_backend_has_alias (_tmp1_, "login", self); -#line 29 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 29 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp3_ = _tmp2_; -#line 29 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 29 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_tmp1_); -#line 29 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 29 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_tmp3_) { #line 1666 "gkr-keyring.c" const gchar* _tmp4_ = NULL; gchar* _tmp5_ = NULL; -#line 30 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 30 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp4_ = _ ("A keyring that is automatically unlocked on login"); -#line 30 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 30 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp5_ = g_strdup (_tmp4_); -#line 30 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 30 "/data/src/seahorse/gkr/gkr-keyring.vala" result = _tmp5_; -#line 30 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 30 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 1677 "gkr-keyring.c" } -#line 31 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 31 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp6_ = _ ("A keyring used to store passwords"); -#line 31 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 31 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp7_ = g_strdup (_tmp6_); -#line 31 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 31 "/data/src/seahorse/gkr/gkr-keyring.vala" result = _tmp7_; -#line 31 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 31 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 1687 "gkr-keyring.c" } @@ -1694,21 +1694,21 @@ const gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; -#line 36 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 36 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyring*) base; -#line 37 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 37 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = g_dbus_proxy_get_object_path ((GDBusProxy*) G_TYPE_CHECK_INSTANCE_CAST (self, secret_collection_get_type (), SecretCollection)); -#line 37 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 37 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = g_strdup (_tmp0_); -#line 37 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 37 "/data/src/seahorse/gkr/gkr-keyring.vala" object_path = _tmp1_; -#line 38 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 38 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = g_strdup_printf ("secret-service://%s", object_path); -#line 38 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 38 "/data/src/seahorse/gkr/gkr-keyring.vala" result = _tmp2_; -#line 38 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 38 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_free0 (object_path); -#line 38 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 38 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 1714 "gkr-keyring.c" } @@ -1718,13 +1718,13 @@ GIcon* result; SeahorseGkrKeyring* self; GThemedIcon* _tmp0_ = NULL; -#line 43 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 43 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyring*) base; -#line 43 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 43 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = (GThemedIcon*) g_themed_icon_new ("folder"); -#line 43 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 43 "/data/src/seahorse/gkr/gkr-keyring.vala" result = (GIcon*) _tmp0_; -#line 43 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 43 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 1730 "gkr-keyring.c" } @@ -1736,29 +1736,29 @@ GtkActionGroup* _tmp0_ = NULL; GtkActionGroup* _tmp2_ = NULL; GtkActionGroup* _tmp3_ = NULL; -#line 46 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 46 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyring*) base; -#line 47 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 47 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = self->priv->_actions; -#line 47 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 47 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_tmp0_ == NULL) { #line 1746 "gkr-keyring.c" GtkActionGroup* _tmp1_ = NULL; -#line 48 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 48 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = seahorse_gkr_keyring_create_actions (self); -#line 48 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 48 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (self->priv->_actions); -#line 48 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 48 "/data/src/seahorse/gkr/gkr-keyring.vala" self->priv->_actions = _tmp1_; #line 1754 "gkr-keyring.c" } -#line 49 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 49 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = self->priv->_actions; -#line 49 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 49 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp3_ = _g_object_ref0 (_tmp2_); -#line 49 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 49 "/data/src/seahorse/gkr/gkr-keyring.vala" result = _tmp3_; -#line 49 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 49 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 1764 "gkr-keyring.c" } @@ -1770,21 +1770,21 @@ SeahorseGkrBackend* _tmp1_ = NULL; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; -#line 54 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 54 "/data/src/seahorse/gkr/gkr-keyring.vala" g_return_val_if_fail (self != NULL, FALSE); -#line 54 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 54 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = seahorse_gkr_backend_instance (); -#line 54 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 54 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = _tmp0_; -#line 54 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 54 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = seahorse_gkr_backend_has_alias (_tmp1_, "default", self); -#line 54 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 54 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp3_ = _tmp2_; -#line 54 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 54 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_tmp1_); -#line 54 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 54 "/data/src/seahorse/gkr/gkr-keyring.vala" result = _tmp3_; -#line 54 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 54 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 1790 "gkr-keyring.c" } @@ -1794,13 +1794,13 @@ gboolean result; SeahorseGkrKeyring* self; gboolean _tmp0_ = FALSE; -#line 58 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 58 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyring*) base; -#line 58 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 58 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = secret_collection_get_locked ((SecretCollection*) self); -#line 58 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 58 "/data/src/seahorse/gkr/gkr-keyring.vala" result = !_tmp0_; -#line 58 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 58 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 1806 "gkr-keyring.c" } @@ -1810,13 +1810,13 @@ gboolean result; SeahorseGkrKeyring* self; gboolean _tmp0_ = FALSE; -#line 62 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 62 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyring*) base; -#line 62 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 62 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = secret_collection_get_locked ((SecretCollection*) self); -#line 62 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 62 "/data/src/seahorse/gkr/gkr-keyring.vala" result = _tmp0_; -#line 62 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 62 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 1822 "gkr-keyring.c" } @@ -1825,11 +1825,11 @@ static gboolean seahorse_gkr_keyring_real_get_deletable (SeahorseDeletable* base) { gboolean result; SeahorseGkrKeyring* self; -#line 66 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 66 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyring*) base; -#line 66 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 66 "/data/src/seahorse/gkr/gkr-keyring.vala" result = TRUE; -#line 66 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 66 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 1835 "gkr-keyring.c" } @@ -1840,33 +1840,33 @@ GParamSpec* _tmp1_ = NULL; const gchar* _tmp2_ = NULL; gboolean _tmp5_ = FALSE; -#line 74 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 74 "/data/src/seahorse/gkr/gkr-keyring.vala" g_return_if_fail (pspec != NULL); -#line 75 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 75 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = pspec; -#line 75 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 75 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = _tmp1_->name; -#line 75 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 75 "/data/src/seahorse/gkr/gkr-keyring.vala" if (g_strcmp0 (_tmp2_, "items") == 0) { -#line 75 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 75 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = TRUE; #line 1854 "gkr-keyring.c" } else { GParamSpec* _tmp3_ = NULL; const gchar* _tmp4_ = NULL; -#line 75 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 75 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp3_ = pspec; -#line 75 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 75 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp4_ = _tmp3_->name; -#line 75 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 75 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = g_strcmp0 (_tmp4_, "locked") == 0; #line 1864 "gkr-keyring.c" } -#line 75 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 75 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp5_ = _tmp0_; -#line 75 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 75 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_tmp5_) { -#line 76 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 76 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_refresh_collection (self); #line 1872 "gkr-keyring.c" } @@ -1874,25 +1874,25 @@ static void __seahorse_gkr_keyring___lambda31__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { -#line 74 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 74 "/data/src/seahorse/gkr/gkr-keyring.vala" _seahorse_gkr_keyring___lambda31_ (self, pspec); #line 1880 "gkr-keyring.c" } static void _seahorse_gkr_keyring___lambda32_ (SeahorseGkrKeyring* self, GParamSpec* pspec) { -#line 78 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 78 "/data/src/seahorse/gkr/gkr-keyring.vala" g_return_if_fail (pspec != NULL); -#line 79 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 79 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_notify ((GObject*) self, "is-default"); -#line 80 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 80 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_notify ((GObject*) self, "description"); #line 1891 "gkr-keyring.c" } static void __seahorse_gkr_keyring___lambda32__g_object_notify (GObject* _sender, GParamSpec* pspec, gpointer self) { -#line 78 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 78 "/data/src/seahorse/gkr/gkr-keyring.vala" _seahorse_gkr_keyring___lambda32_ (self, pspec); #line 1898 "gkr-keyring.c" } @@ -1907,144 +1907,144 @@ GHashTable* _tmp2_ = NULL; SeahorseGkrBackend* _tmp3_ = NULL; SeahorseGkrBackend* _tmp4_ = NULL; -#line 72 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 72 "/data/src/seahorse/gkr/gkr-keyring.vala" parent_class = G_OBJECT_CLASS (seahorse_gkr_keyring_parent_class); -#line 72 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 72 "/data/src/seahorse/gkr/gkr-keyring.vala" obj = parent_class->constructor (type, n_construct_properties, construct_properties); -#line 72 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 72 "/data/src/seahorse/gkr/gkr-keyring.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_GKR_TYPE_KEYRING, SeahorseGkrKeyring); -#line 73 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 73 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = g_str_hash; -#line 73 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 73 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = g_str_equal; -#line 73 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 73 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = g_hash_table_new_full (_tmp0_, _tmp1_, _g_free0_, _g_object_unref0_); -#line 73 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 73 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_hash_table_unref0 (self->priv->_items); -#line 73 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 73 "/data/src/seahorse/gkr/gkr-keyring.vala" self->priv->_items = _tmp2_; -#line 74 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 74 "/data/src/seahorse/gkr/gkr-keyring.vala" g_signal_connect_object ((GObject*) self, "notify", (GCallback) __seahorse_gkr_keyring___lambda31__g_object_notify, self, 0); -#line 78 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 78 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp3_ = seahorse_gkr_backend_instance (); -#line 78 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 78 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp4_ = _tmp3_; -#line 78 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 78 "/data/src/seahorse/gkr/gkr-keyring.vala" g_signal_connect_object ((GObject*) _tmp4_, "notify", (GCallback) __seahorse_gkr_keyring___lambda32__g_object_notify, self, 0); -#line 78 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 78 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_tmp4_); -#line 72 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 72 "/data/src/seahorse/gkr/gkr-keyring.vala" return obj; #line 1939 "gkr-keyring.c" } static void seahorse_gkr_keyring_class_init (SeahorseGkrKeyringClass * klass) { -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_parent_class = g_type_class_peek_parent (klass); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_type_class_add_private (klass, sizeof (SeahorseGkrKeyringPrivate)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" G_OBJECT_CLASS (klass)->get_property = _vala_seahorse_gkr_keyring_get_property; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" G_OBJECT_CLASS (klass)->constructor = seahorse_gkr_keyring_constructor; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" G_OBJECT_CLASS (klass)->finalize = seahorse_gkr_keyring_finalize; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_KEYRING_DESCRIPTION, g_param_spec_string ("description", "description", "description", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_KEYRING_URI, g_param_spec_string ("uri", "uri", "uri", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_KEYRING_ICON, g_param_spec_object ("icon", "icon", "icon", G_TYPE_ICON, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_KEYRING_ACTIONS, g_param_spec_object ("actions", "actions", "actions", GTK_TYPE_ACTION_GROUP, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_KEYRING_IS_DEFAULT, g_param_spec_boolean ("is-default", "is-default", "is-default", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_KEYRING_LOCKABLE, g_param_spec_boolean ("lockable", "lockable", "lockable", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_KEYRING_UNLOCKABLE, g_param_spec_boolean ("unlockable", "unlockable", "unlockable", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_GKR_KEYRING_DELETABLE, g_param_spec_boolean ("deletable", "deletable", "deletable", FALSE, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); #line 1970 "gkr-keyring.c" } static void seahorse_gkr_keyring_gcr_collection_interface_init (GcrCollectionIface * iface) { -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_gcr_collection_parent_iface = g_type_interface_peek_parent (iface); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->get_length = (guint (*)(GcrCollection*)) seahorse_gkr_keyring_real_get_length; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->get_objects = (GList* (*)(GcrCollection*)) seahorse_gkr_keyring_real_get_objects; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->contains = (gboolean (*)(GcrCollection*, GObject*)) seahorse_gkr_keyring_real_contains; #line 1983 "gkr-keyring.c" } static void seahorse_gkr_keyring_seahorse_place_interface_init (SeahorsePlaceIface * iface) { -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_seahorse_place_parent_iface = g_type_interface_peek_parent (iface); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->load = (gboolean (*)(SeahorsePlace*, GCancellable*, GError**)) seahorse_gkr_keyring_real_load; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->load_finish = seahorse_gkr_keyring_real_load_finish; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->get_description = seahorse_gkr_keyring_real_get_description; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->get_uri = seahorse_gkr_keyring_real_get_uri; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->get_icon = seahorse_gkr_keyring_real_get_icon; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->get_actions = seahorse_gkr_keyring_real_get_actions; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->get_label = (gchar* (*) (SeahorsePlace *)) secret_collection_get_label; #line 2004 "gkr-keyring.c" } static void seahorse_gkr_keyring_seahorse_deletable_interface_init (SeahorseDeletableIface * iface) { -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_seahorse_deletable_parent_iface = g_type_interface_peek_parent (iface); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->create_deleter = (SeahorseDeleter* (*)(SeahorseDeletable*)) seahorse_gkr_keyring_real_create_deleter; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->get_deletable = seahorse_gkr_keyring_real_get_deletable; #line 2015 "gkr-keyring.c" } static void seahorse_gkr_keyring_seahorse_lockable_interface_init (SeahorseLockableIface * iface) { -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_seahorse_lockable_parent_iface = g_type_interface_peek_parent (iface); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->lock = (gboolean (*)(SeahorseLockable*, GTlsInteraction*, GCancellable*, GError**)) seahorse_gkr_keyring_real_lock; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->lock_finish = seahorse_gkr_keyring_real_lock_finish; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->unlock = (gboolean (*)(SeahorseLockable*, GTlsInteraction*, GCancellable*, GError**)) seahorse_gkr_keyring_real_unlock; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->unlock_finish = seahorse_gkr_keyring_real_unlock_finish; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->get_lockable = seahorse_gkr_keyring_real_get_lockable; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->get_unlockable = seahorse_gkr_keyring_real_get_unlockable; #line 2034 "gkr-keyring.c" } static void seahorse_gkr_keyring_seahorse_viewable_interface_init (SeahorseViewableIface * iface) { -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_seahorse_viewable_parent_iface = g_type_interface_peek_parent (iface); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" iface->create_viewer = (GtkWindow* (*)(SeahorseViewable*, GtkWindow*)) seahorse_gkr_keyring_real_create_viewer; #line 2043 "gkr-keyring.c" } static void seahorse_gkr_keyring_instance_init (SeahorseGkrKeyring * self) { -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" self->priv = SEAHORSE_GKR_KEYRING_GET_PRIVATE (self); #line 2050 "gkr-keyring.c" } @@ -2052,13 +2052,13 @@ static void seahorse_gkr_keyring_finalize (GObject* obj) { SeahorseGkrKeyring * self; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_GKR_TYPE_KEYRING, SeahorseGkrKeyring); -#line 69 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 69 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_hash_table_unref0 (self->priv->_items); -#line 70 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 70 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (self->priv->_actions); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" G_OBJECT_CLASS (seahorse_gkr_keyring_parent_class)->finalize (obj); #line 2064 "gkr-keyring.c" } @@ -2089,61 +2089,61 @@ static void _vala_seahorse_gkr_keyring_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { SeahorseGkrKeyring * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEAHORSE_GKR_TYPE_KEYRING, SeahorseGkrKeyring); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" switch (property_id) { -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" case SEAHORSE_GKR_KEYRING_DESCRIPTION: -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_value_take_string (value, seahorse_place_get_description ((SeahorsePlace*) self)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" break; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" case SEAHORSE_GKR_KEYRING_URI: -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_value_take_string (value, seahorse_place_get_uri ((SeahorsePlace*) self)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" break; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" case SEAHORSE_GKR_KEYRING_ICON: -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_value_take_object (value, seahorse_place_get_icon ((SeahorsePlace*) self)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" break; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" case SEAHORSE_GKR_KEYRING_ACTIONS: -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_value_take_object (value, seahorse_place_get_actions ((SeahorsePlace*) self)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" break; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" case SEAHORSE_GKR_KEYRING_IS_DEFAULT: -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_value_set_boolean (value, seahorse_gkr_keyring_get_is_default (self)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" break; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" case SEAHORSE_GKR_KEYRING_LOCKABLE: -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_value_set_boolean (value, seahorse_lockable_get_lockable ((SeahorseLockable*) self)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" break; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" case SEAHORSE_GKR_KEYRING_UNLOCKABLE: -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_value_set_boolean (value, seahorse_lockable_get_unlockable ((SeahorseLockable*) self)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" break; -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" case SEAHORSE_GKR_KEYRING_DELETABLE: -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" g_value_set_boolean (value, seahorse_deletable_get_deletable ((SeahorseDeletable*) self)); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" break; #line 2143 "gkr-keyring.c" default: -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 26 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 26 "/data/src/seahorse/gkr/gkr-keyring.vala" break; #line 2149 "gkr-keyring.c" } @@ -2163,39 +2163,39 @@ SeahorseDeleteDialog* _tmp6_ = NULL; SeahorseDeleteDialog* _tmp7_ = NULL; const gchar* _tmp8_ = NULL; -#line 237 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 237 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyringDeleter*) base; -#line 238 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 238 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = parent; -#line 238 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 238 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = _ ("Are you sure you want to delete the password keyring '%s'?"); -#line 238 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 238 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = self->priv->_keyring; -#line 238 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 238 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp3_ = seahorse_place_get_label ((SeahorsePlace*) _tmp2_); -#line 238 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 238 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp4_ = _tmp3_; -#line 238 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 238 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp5_ = _tmp4_; -#line 238 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 238 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp6_ = (SeahorseDeleteDialog*) seahorse_delete_dialog_new (_tmp0_, _tmp1_, _tmp5_, NULL); -#line 238 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 238 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_ref_sink (_tmp6_); -#line 238 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 238 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp7_ = _tmp6_; -#line 238 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 238 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_free0 (_tmp5_); -#line 238 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 238 "/data/src/seahorse/gkr/gkr-keyring.vala" dialog = _tmp7_; -#line 242 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 242 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp8_ = _ ("I understand that all items will be permanently deleted."); -#line 242 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 242 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_delete_dialog_set_check_label (dialog, _tmp8_); -#line 243 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 243 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_delete_dialog_set_check_require (dialog, TRUE); -#line 245 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 245 "/data/src/seahorse/gkr/gkr-keyring.vala" result = (GtkDialog*) dialog; -#line 245 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 245 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 2201 "gkr-keyring.c" } @@ -2205,28 +2205,28 @@ SeahorseGkrKeyringDeleter * self = NULL; SeahorseGkrKeyring* _tmp0_ = NULL; gboolean _tmp1_ = FALSE; -#line 248 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 248 "/data/src/seahorse/gkr/gkr-keyring.vala" g_return_val_if_fail (keyring != NULL, NULL); -#line 248 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 248 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyringDeleter*) seahorse_deleter_construct (object_type); -#line 249 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 249 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = keyring; -#line 249 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 249 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = seahorse_deleter_add_object ((SeahorseDeleter*) self, (GObject*) _tmp0_); -#line 249 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 249 "/data/src/seahorse/gkr/gkr-keyring.vala" if (!_tmp1_) { -#line 250 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 250 "/data/src/seahorse/gkr/gkr-keyring.vala" g_assert_not_reached (); #line 2221 "gkr-keyring.c" } -#line 248 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 248 "/data/src/seahorse/gkr/gkr-keyring.vala" return self; #line 2225 "gkr-keyring.c" } SeahorseGkrKeyringDeleter* seahorse_gkr_keyring_deleter_new (SeahorseGkrKeyring* keyring) { -#line 248 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 248 "/data/src/seahorse/gkr/gkr-keyring.vala" return seahorse_gkr_keyring_deleter_construct (SEAHORSE_GKR_TYPE_KEYRING_DELETER, keyring); #line 2232 "gkr-keyring.c" } @@ -2236,13 +2236,13 @@ SeahorseGkrKeyringDeleter * self; GList* result = NULL; GList* _tmp0_ = NULL; -#line 253 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 253 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyringDeleter*) base; -#line 254 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 254 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = self->priv->_objects; -#line 254 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 254 "/data/src/seahorse/gkr/gkr-keyring.vala" result = _tmp0_; -#line 254 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 254 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 2248 "gkr-keyring.c" } @@ -2253,52 +2253,52 @@ gboolean result = FALSE; SeahorseGkrKeyring* _tmp0_ = NULL; GObject* _tmp1_ = NULL; -#line 257 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 257 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyringDeleter*) base; -#line 257 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 257 "/data/src/seahorse/gkr/gkr-keyring.vala" g_return_val_if_fail (obj != NULL, FALSE); -#line 258 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 258 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = self->priv->_keyring; -#line 258 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 258 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_tmp0_ != NULL) { -#line 259 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 259 "/data/src/seahorse/gkr/gkr-keyring.vala" result = FALSE; -#line 259 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 259 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 2269 "gkr-keyring.c" } -#line 260 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 260 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = obj; -#line 260 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 260 "/data/src/seahorse/gkr/gkr-keyring.vala" if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, SEAHORSE_GKR_TYPE_KEYRING)) { #line 2275 "gkr-keyring.c" GObject* _tmp2_ = NULL; SeahorseGkrKeyring* _tmp3_ = NULL; GObject* _tmp4_ = NULL; GObject* _tmp5_ = NULL; -#line 261 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 261 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = obj; -#line 261 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 261 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SEAHORSE_GKR_TYPE_KEYRING, SeahorseGkrKeyring)); -#line 261 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 261 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (self->priv->_keyring); -#line 261 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 261 "/data/src/seahorse/gkr/gkr-keyring.vala" self->priv->_keyring = _tmp3_; -#line 262 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 262 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp4_ = obj; -#line 262 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 262 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp5_ = _g_object_ref0 (_tmp4_); -#line 262 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 262 "/data/src/seahorse/gkr/gkr-keyring.vala" self->priv->_objects = g_list_append (self->priv->_objects, _tmp5_); -#line 263 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 263 "/data/src/seahorse/gkr/gkr-keyring.vala" result = TRUE; -#line 263 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 263 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 2298 "gkr-keyring.c" } -#line 265 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 265 "/data/src/seahorse/gkr/gkr-keyring.vala" result = FALSE; -#line 265 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 265 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 2304 "gkr-keyring.c" } @@ -2307,11 +2307,11 @@ static void seahorse_gkr_keyring_deleter_real_delete_data_free (gpointer _data) { SeahorseGkrKeyringDeleterDeleteData* _data_; _data_ = _data; -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->cancellable); -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->self); -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" g_slice_free (SeahorseGkrKeyringDeleterDeleteData, _data_); #line 2317 "gkr-keyring.c" } @@ -2323,27 +2323,27 @@ SeahorseGkrKeyringDeleter* _tmp0_ = NULL; GCancellable* _tmp1_ = NULL; GCancellable* _tmp2_ = NULL; -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" self = (SeahorseGkrKeyringDeleter*) base; -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_ = g_slice_new0 (SeahorseGkrKeyringDeleterDeleteData); -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, seahorse_gkr_keyring_deleter_real_delete); -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, seahorse_gkr_keyring_deleter_real_delete_data_free); -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp0_ = _g_object_ref0 (self); -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->self = _tmp0_; -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp1_ = cancellable; -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (_data_->cancellable); -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->cancellable = _tmp2_; -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_deleter_real_delete_co (_data_); #line 2349 "gkr-keyring.c" } @@ -2352,17 +2352,17 @@ static gboolean seahorse_gkr_keyring_deleter_real_delete_finish (SeahorseDeleter* base, GAsyncResult* _res_, GError** error) { gboolean result; SeahorseGkrKeyringDeleterDeleteData* _data_; -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; #line 2360 "gkr-keyring.c" } -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" result = _data_->result; -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" return result; #line 2368 "gkr-keyring.c" } @@ -2370,132 +2370,132 @@ static void seahorse_gkr_keyring_deleter_delete_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) { SeahorseGkrKeyringDeleterDeleteData* _data_; -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_ = _user_data_; -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_source_object_ = source_object; -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_res_ = _res_; -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_deleter_real_delete_co (_data_); #line 2382 "gkr-keyring.c" } static gboolean seahorse_gkr_keyring_deleter_real_delete_co (SeahorseGkrKeyringDeleterDeleteData* _data_) { -#line 268 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 268 "/data/src/seahorse/gkr/gkr-keyring.vala" switch (_data_->_state_) { -#line 268 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 268 "/data/src/seahorse/gkr/gkr-keyring.vala" case 0: #line 2391 "gkr-keyring.c" goto _state_0; -#line 268 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 268 "/data/src/seahorse/gkr/gkr-keyring.vala" case 1: #line 2395 "gkr-keyring.c" goto _state_1; default: -#line 268 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 268 "/data/src/seahorse/gkr/gkr-keyring.vala" g_assert_not_reached (); #line 2400 "gkr-keyring.c" } _state_0: -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp0_ = NULL; -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp0_ = _data_->self->priv->_keyring; -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp1_ = NULL; -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_tmp1_ = _data_->cancellable; -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->_state_ = 1; -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" secret_collection_delete ((SecretCollection*) _data_->_tmp0_, _data_->_tmp1_, seahorse_gkr_keyring_deleter_delete_ready, _data_); -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; #line 2417 "gkr-keyring.c" _state_1: -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" secret_collection_delete_finish ((SecretCollection*) _data_->_tmp0_, _data_->_res_, &_data_->_inner_error_); -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_data_->_inner_error_ != NULL) { -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_); -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" g_error_free (_data_->_inner_error_); -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_data_->_state_ == 0) { -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); #line 2431 "gkr-keyring.c" } else { -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete (_data_->_async_result); #line 2435 "gkr-keyring.c" } -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_unref (_data_->_async_result); -#line 269 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 269 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; #line 2441 "gkr-keyring.c" } -#line 270 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 270 "/data/src/seahorse/gkr/gkr-keyring.vala" _data_->result = TRUE; -#line 270 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 270 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_data_->_state_ == 0) { -#line 270 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 270 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); #line 2449 "gkr-keyring.c" } else { -#line 270 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 270 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete (_data_->_async_result); #line 2453 "gkr-keyring.c" } -#line 270 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 270 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_unref (_data_->_async_result); -#line 270 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 270 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; -#line 268 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 268 "/data/src/seahorse/gkr/gkr-keyring.vala" if (_data_->_state_ == 0) { -#line 268 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 268 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); #line 2463 "gkr-keyring.c" } else { -#line 268 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 268 "/data/src/seahorse/gkr/gkr-keyring.vala" g_simple_async_result_complete (_data_->_async_result); #line 2467 "gkr-keyring.c" } -#line 268 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 268 "/data/src/seahorse/gkr/gkr-keyring.vala" g_object_unref (_data_->_async_result); -#line 268 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 268 "/data/src/seahorse/gkr/gkr-keyring.vala" return FALSE; #line 2473 "gkr-keyring.c" } static void seahorse_gkr_keyring_deleter_class_init (SeahorseGkrKeyringDeleterClass * klass) { -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" seahorse_gkr_keyring_deleter_parent_class = g_type_class_peek_parent (klass); -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" g_type_class_add_private (klass, sizeof (SeahorseGkrKeyringDeleterPrivate)); -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" SEAHORSE_DELETER_CLASS (klass)->create_confirm = seahorse_gkr_keyring_deleter_real_create_confirm; -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" SEAHORSE_DELETER_CLASS (klass)->get_objects = seahorse_gkr_keyring_deleter_real_get_objects; -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" SEAHORSE_DELETER_CLASS (klass)->add_object = seahorse_gkr_keyring_deleter_real_add_object; -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" SEAHORSE_DELETER_CLASS (klass)->delete = seahorse_gkr_keyring_deleter_real_delete; -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" SEAHORSE_DELETER_CLASS (klass)->delete_finish = seahorse_gkr_keyring_deleter_real_delete_finish; -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" G_OBJECT_CLASS (klass)->finalize = seahorse_gkr_keyring_deleter_finalize; #line 2494 "gkr-keyring.c" } static void seahorse_gkr_keyring_deleter_instance_init (SeahorseGkrKeyringDeleter * self) { -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" self->priv = SEAHORSE_GKR_KEYRING_DELETER_GET_PRIVATE (self); #line 2501 "gkr-keyring.c" } @@ -2503,13 +2503,13 @@ static void seahorse_gkr_keyring_deleter_finalize (GObject* obj) { SeahorseGkrKeyringDeleter * self; -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_GKR_TYPE_KEYRING_DELETER, SeahorseGkrKeyringDeleter); -#line 234 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 234 "/data/src/seahorse/gkr/gkr-keyring.vala" _g_object_unref0 (self->priv->_keyring); -#line 235 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 235 "/data/src/seahorse/gkr/gkr-keyring.vala" __g_list_free__g_object_unref0_0 (self->priv->_objects); -#line 233 "/data/projects/seahorse/gkr/gkr-keyring.vala" +#line 233 "/data/src/seahorse/gkr/gkr-keyring.vala" G_OBJECT_CLASS (seahorse_gkr_keyring_deleter_parent_class)->finalize (obj); #line 2515 "gkr-keyring.c" } diff -Nru seahorse-3.10.1/gkr/gkr-module.c seahorse-3.10.2/gkr/gkr-module.c --- seahorse-3.10.1/gkr/gkr-module.c 2013-07-24 15:11:31.000000000 +0000 +++ seahorse-3.10.2/gkr/gkr-module.c 2014-01-08 15:13:22.000000000 +0000 @@ -1,4 +1,4 @@ -/* gkr-module.c generated by valac 0.20.1.64-fa28c, the Vala compiler +/* gkr-module.c generated by valac 0.22.1, the Vala compiler * generated from gkr-module.vala, do not modify */ /* diff -Nru seahorse-3.10.1/gkr/seahorse-gkr.h seahorse-3.10.2/gkr/seahorse-gkr.h --- seahorse-3.10.1/gkr/seahorse-gkr.h 2013-07-24 15:11:32.000000000 +0000 +++ seahorse-3.10.2/gkr/seahorse-gkr.h 2014-01-08 15:13:22.000000000 +0000 @@ -1,4 +1,4 @@ -/* seahorse-gkr.h generated by valac 0.20.1.64-fa28c, the Vala compiler, do not modify */ +/* seahorse-gkr.h generated by valac 0.22.1, the Vala compiler, do not modify */ #ifndef __SEAHORSE_GKR_H__ diff -Nru seahorse-3.10.1/libegg/Makefile.am seahorse-3.10.2/libegg/Makefile.am --- seahorse-3.10.1/libegg/Makefile.am 2012-08-21 10:23:16.000000000 +0000 +++ seahorse-3.10.2/libegg/Makefile.am 2014-01-08 15:06:15.000000000 +0000 @@ -2,19 +2,17 @@ libeggdatetime.la \ libeggtreemultidnd.la -libeggdatetime_la_INCLUDES = -DGTK_DISABLE_DEPRECATED \ +libeggdatetime_la_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ - -DG_DISABLE_DEPRECATED \ - -DGETTEXT_PACKAGE=NULL + -DG_DISABLE_DEPRECATED libeggdatetime_la_LIBADD = $(GTK_LIBS) libeggdatetime_la_CFLAGS = $(GTK_CFLAGS) libeggdatetime_la_SOURCES = egg-datetime.h egg-datetime.c -libeggtreemultidnd_la_INCLUDES = -DGTK_DISABLE_DEPRECATED \ +libeggtreemultidnd_la_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ - -DG_DISABLE_DEPRECATED \ - -DGETTEXT_PACKAGE=NULL + -DG_DISABLE_DEPRECATED libeggtreemultidnd_la_LIBADD = $(GTK_LIBS) libeggtreemultidnd_la_CFLAGS = $(GTK_CFLAGS) diff -Nru seahorse-3.10.1/libegg/Makefile.in seahorse-3.10.2/libegg/Makefile.in --- seahorse-3.10.1/libegg/Makefile.in 2013-10-17 06:25:32.000000000 +0000 +++ seahorse-3.10.2/libegg/Makefile.in 2014-01-08 15:09:37.000000000 +0000 @@ -373,18 +373,16 @@ libeggdatetime.la \ libeggtreemultidnd.la -libeggdatetime_la_INCLUDES = -DGTK_DISABLE_DEPRECATED \ +libeggdatetime_la_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ - -DG_DISABLE_DEPRECATED \ - -DGETTEXT_PACKAGE=NULL + -DG_DISABLE_DEPRECATED libeggdatetime_la_LIBADD = $(GTK_LIBS) libeggdatetime_la_CFLAGS = $(GTK_CFLAGS) libeggdatetime_la_SOURCES = egg-datetime.h egg-datetime.c -libeggtreemultidnd_la_INCLUDES = -DGTK_DISABLE_DEPRECATED \ +libeggtreemultidnd_la_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ - -DG_DISABLE_DEPRECATED \ - -DGETTEXT_PACKAGE=NULL + -DG_DISABLE_DEPRECATED libeggtreemultidnd_la_LIBADD = $(GTK_LIBS) libeggtreemultidnd_la_CFLAGS = $(GTK_CFLAGS) @@ -472,18 +470,18 @@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< libeggdatetime_la-egg-datetime.lo: egg-datetime.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) $(libeggdatetime_la_CFLAGS) $(CFLAGS) -MT libeggdatetime_la-egg-datetime.lo -MD -MP -MF $(DEPDIR)/libeggdatetime_la-egg-datetime.Tpo -c -o libeggdatetime_la-egg-datetime.lo `test -f 'egg-datetime.c' || echo '$(srcdir)/'`egg-datetime.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeggdatetime_la_CPPFLAGS) $(CPPFLAGS) $(libeggdatetime_la_CFLAGS) $(CFLAGS) -MT libeggdatetime_la-egg-datetime.lo -MD -MP -MF $(DEPDIR)/libeggdatetime_la-egg-datetime.Tpo -c -o libeggdatetime_la-egg-datetime.lo `test -f 'egg-datetime.c' || echo '$(srcdir)/'`egg-datetime.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libeggdatetime_la-egg-datetime.Tpo $(DEPDIR)/libeggdatetime_la-egg-datetime.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='egg-datetime.c' object='libeggdatetime_la-egg-datetime.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@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) $(libeggdatetime_la_CFLAGS) $(CFLAGS) -c -o libeggdatetime_la-egg-datetime.lo `test -f 'egg-datetime.c' || echo '$(srcdir)/'`egg-datetime.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) $(libeggdatetime_la_CPPFLAGS) $(CPPFLAGS) $(libeggdatetime_la_CFLAGS) $(CFLAGS) -c -o libeggdatetime_la-egg-datetime.lo `test -f 'egg-datetime.c' || echo '$(srcdir)/'`egg-datetime.c libeggtreemultidnd_la-eggtreemultidnd.lo: eggtreemultidnd.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) $(libeggtreemultidnd_la_CFLAGS) $(CFLAGS) -MT libeggtreemultidnd_la-eggtreemultidnd.lo -MD -MP -MF $(DEPDIR)/libeggtreemultidnd_la-eggtreemultidnd.Tpo -c -o libeggtreemultidnd_la-eggtreemultidnd.lo `test -f 'eggtreemultidnd.c' || echo '$(srcdir)/'`eggtreemultidnd.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libeggtreemultidnd_la_CPPFLAGS) $(CPPFLAGS) $(libeggtreemultidnd_la_CFLAGS) $(CFLAGS) -MT libeggtreemultidnd_la-eggtreemultidnd.lo -MD -MP -MF $(DEPDIR)/libeggtreemultidnd_la-eggtreemultidnd.Tpo -c -o libeggtreemultidnd_la-eggtreemultidnd.lo `test -f 'eggtreemultidnd.c' || echo '$(srcdir)/'`eggtreemultidnd.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libeggtreemultidnd_la-eggtreemultidnd.Tpo $(DEPDIR)/libeggtreemultidnd_la-eggtreemultidnd.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eggtreemultidnd.c' object='libeggtreemultidnd_la-eggtreemultidnd.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@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) $(libeggtreemultidnd_la_CFLAGS) $(CFLAGS) -c -o libeggtreemultidnd_la-eggtreemultidnd.lo `test -f 'eggtreemultidnd.c' || echo '$(srcdir)/'`eggtreemultidnd.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) $(libeggtreemultidnd_la_CPPFLAGS) $(CPPFLAGS) $(libeggtreemultidnd_la_CFLAGS) $(CFLAGS) -c -o libeggtreemultidnd_la-eggtreemultidnd.lo `test -f 'eggtreemultidnd.c' || echo '$(srcdir)/'`eggtreemultidnd.c mostlyclean-libtool: -rm -f *.lo diff -Nru seahorse-3.10.1/libseahorse/Makefile.am seahorse-3.10.2/libseahorse/Makefile.am --- seahorse-3.10.1/libseahorse/Makefile.am 2013-06-21 14:04:15.000000000 +0000 +++ seahorse-3.10.2/libseahorse/Makefile.am 2014-01-08 15:06:15.000000000 +0000 @@ -3,9 +3,11 @@ localedir = $(datadir)/locale seahorselibexecbindir = $(libdir)/seahorse/ -INCLUDES = -I$(top_builddir) \ +AM_CPPFLAGS = -I$(top_builddir) \ -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/common \ + -I$(top_builddir)/common \ -I$(top_srcdir)/libegg \ $(SEAHORSE_CFLAGS) \ -DPKGDATADIR=\""$(pkgdatadir)/"\" \ diff -Nru seahorse-3.10.1/libseahorse/Makefile.in seahorse-3.10.2/libseahorse/Makefile.in --- seahorse-3.10.1/libseahorse/Makefile.in 2013-10-17 06:25:32.000000000 +0000 +++ seahorse-3.10.2/libseahorse/Makefile.in 2014-01-08 15:09:37.000000000 +0000 @@ -418,9 +418,11 @@ top_srcdir = @top_srcdir@ uidir = $(datadir)/seahorse/ui/ seahorselibexecbindir = $(libdir)/seahorse/ -INCLUDES = -I$(top_builddir) \ +AM_CPPFLAGS = -I$(top_builddir) \ -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/common \ + -I$(top_builddir)/common \ -I$(top_srcdir)/libegg \ $(SEAHORSE_CFLAGS) \ -DPKGDATADIR=\""$(pkgdatadir)/"\" \ diff -Nru seahorse-3.10.1/libseahorse/seahorse-shell-search-provider-generated.c seahorse-3.10.2/libseahorse/seahorse-shell-search-provider-generated.c --- seahorse-3.10.1/libseahorse/seahorse-shell-search-provider-generated.c 2013-06-21 14:05:05.000000000 +0000 +++ seahorse-3.10.2/libseahorse/seahorse-shell-search-provider-generated.c 2014-01-08 15:09:46.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.36.3. DO NOT EDIT. + * Generated by gdbus-codegen 2.38.2. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ @@ -485,6 +485,9 @@ * Virtual table for the D-Bus interface org.gnome.Shell.SearchProvider2. */ +typedef SeahorseShellSearchProvider2Iface SeahorseShellSearchProvider2Interface; +G_DEFINE_INTERFACE (SeahorseShellSearchProvider2, seahorse_shell_search_provider2, G_TYPE_OBJECT); + static void seahorse_shell_search_provider2_default_init (SeahorseShellSearchProvider2Iface *iface) { @@ -610,9 +613,6 @@ } -typedef SeahorseShellSearchProvider2Iface SeahorseShellSearchProvider2Interface; -G_DEFINE_INTERFACE (SeahorseShellSearchProvider2, seahorse_shell_search_provider2, G_TYPE_OBJECT); - /** * seahorse_shell_search_provider2_call_get_initial_result_set: * @proxy: A #SeahorseShellSearchProvider2Proxy. @@ -1266,9 +1266,16 @@ static void seahorse_shell_search_provider2_proxy_iface_init (SeahorseShellSearchProvider2Iface *iface); +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 +G_DEFINE_TYPE_WITH_CODE (SeahorseShellSearchProvider2Proxy, seahorse_shell_search_provider2_proxy, G_TYPE_DBUS_PROXY, + G_ADD_PRIVATE (SeahorseShellSearchProvider2Proxy) + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_SHELL_SEARCH_PROVIDER2, seahorse_shell_search_provider2_proxy_iface_init)); + +#else G_DEFINE_TYPE_WITH_CODE (SeahorseShellSearchProvider2Proxy, seahorse_shell_search_provider2_proxy, G_TYPE_DBUS_PROXY, G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_SHELL_SEARCH_PROVIDER2, seahorse_shell_search_provider2_proxy_iface_init)); +#endif static void seahorse_shell_search_provider2_proxy_finalize (GObject *object) { @@ -1281,7 +1288,7 @@ seahorse_shell_search_provider2_proxy_get_property (GObject *object, guint prop_id, GValue *value, - GParamSpec *pspec) + GParamSpec *pspec G_GNUC_UNUSED) { } @@ -1289,13 +1296,13 @@ seahorse_shell_search_provider2_proxy_set_property (GObject *object, guint prop_id, const GValue *value, - GParamSpec *pspec) + GParamSpec *pspec G_GNUC_UNUSED) { } static void seahorse_shell_search_provider2_proxy_g_signal (GDBusProxy *proxy, - const gchar *sender_name, + const gchar *sender_name G_GNUC_UNUSED, const gchar *signal_name, GVariant *parameters) { @@ -1366,7 +1373,7 @@ static void seahorse_shell_search_provider2_proxy_init (SeahorseShellSearchProvider2Proxy *proxy) { - proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, SEAHORSE_TYPE_SHELL_SEARCH_PROVIDER2_PROXY, SeahorseShellSearchProvider2ProxyPrivate); + proxy->priv = seahorse_shell_search_provider2_proxy_get_instance_private (proxy); g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), seahorse_shell_search_provider2_interface_info ()); } @@ -1376,8 +1383,6 @@ GObjectClass *gobject_class; GDBusProxyClass *proxy_class; - g_type_class_add_private (klass, sizeof (SeahorseShellSearchProvider2ProxyPrivate)); - gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = seahorse_shell_search_provider2_proxy_finalize; gobject_class->get_property = seahorse_shell_search_provider2_proxy_get_property; @@ -1600,9 +1605,9 @@ static void _seahorse_shell_search_provider2_skeleton_handle_method_call ( - GDBusConnection *connection, - const gchar *sender, - const gchar *object_path, + GDBusConnection *connection G_GNUC_UNUSED, + const gchar *sender G_GNUC_UNUSED, + const gchar *object_path G_GNUC_UNUSED, const gchar *interface_name, const gchar *method_name, GVariant *parameters, @@ -1664,10 +1669,10 @@ static GVariant * _seahorse_shell_search_provider2_skeleton_handle_get_property ( - GDBusConnection *connection, - const gchar *sender, - const gchar *object_path, - const gchar *interface_name, + GDBusConnection *connection G_GNUC_UNUSED, + const gchar *sender G_GNUC_UNUSED, + const gchar *object_path G_GNUC_UNUSED, + const gchar *interface_name G_GNUC_UNUSED, const gchar *property_name, GError **error, gpointer user_data) @@ -1697,10 +1702,10 @@ static gboolean _seahorse_shell_search_provider2_skeleton_handle_set_property ( - GDBusConnection *connection, - const gchar *sender, - const gchar *object_path, - const gchar *interface_name, + GDBusConnection *connection G_GNUC_UNUSED, + const gchar *sender G_GNUC_UNUSED, + const gchar *object_path G_GNUC_UNUSED, + const gchar *interface_name G_GNUC_UNUSED, const gchar *property_name, GVariant *variant, GError **error, @@ -1741,13 +1746,13 @@ }; static GDBusInterfaceInfo * -seahorse_shell_search_provider2_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton) +seahorse_shell_search_provider2_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED) { return seahorse_shell_search_provider2_interface_info (); } static GDBusInterfaceVTable * -seahorse_shell_search_provider2_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton) +seahorse_shell_search_provider2_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton G_GNUC_UNUSED) { return (GDBusInterfaceVTable *) &_seahorse_shell_search_provider2_skeleton_vtable; } @@ -1787,9 +1792,16 @@ } static void seahorse_shell_search_provider2_skeleton_iface_init (SeahorseShellSearchProvider2Iface *iface); +#if GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_38 +G_DEFINE_TYPE_WITH_CODE (SeahorseShellSearchProvider2Skeleton, seahorse_shell_search_provider2_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON, + G_ADD_PRIVATE (SeahorseShellSearchProvider2Skeleton) + G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_SHELL_SEARCH_PROVIDER2, seahorse_shell_search_provider2_skeleton_iface_init)); + +#else G_DEFINE_TYPE_WITH_CODE (SeahorseShellSearchProvider2Skeleton, seahorse_shell_search_provider2_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON, G_IMPLEMENT_INTERFACE (SEAHORSE_TYPE_SHELL_SEARCH_PROVIDER2, seahorse_shell_search_provider2_skeleton_iface_init)); +#endif static void seahorse_shell_search_provider2_skeleton_finalize (GObject *object) { @@ -1805,7 +1817,7 @@ static void seahorse_shell_search_provider2_skeleton_init (SeahorseShellSearchProvider2Skeleton *skeleton) { - skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, SEAHORSE_TYPE_SHELL_SEARCH_PROVIDER2_SKELETON, SeahorseShellSearchProvider2SkeletonPrivate); + skeleton->priv = seahorse_shell_search_provider2_skeleton_get_instance_private (skeleton); g_mutex_init (&skeleton->priv->lock); skeleton->priv->context = g_main_context_ref_thread_default (); } @@ -1816,8 +1828,6 @@ GObjectClass *gobject_class; GDBusInterfaceSkeletonClass *skeleton_class; - g_type_class_add_private (klass, sizeof (SeahorseShellSearchProvider2SkeletonPrivate)); - gobject_class = G_OBJECT_CLASS (klass); gobject_class->finalize = seahorse_shell_search_provider2_skeleton_finalize; diff -Nru seahorse-3.10.1/libseahorse/seahorse-shell-search-provider-generated.h seahorse-3.10.2/libseahorse/seahorse-shell-search-provider-generated.h --- seahorse-3.10.1/libseahorse/seahorse-shell-search-provider-generated.h 2013-06-21 14:05:05.000000000 +0000 +++ seahorse-3.10.2/libseahorse/seahorse-shell-search-provider-generated.h 2014-01-08 15:09:46.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.36.3. DO NOT EDIT. + * Generated by gdbus-codegen 2.38.2. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru seahorse-3.10.1/pgp/Makefile.am seahorse-3.10.2/pgp/Makefile.am --- seahorse-3.10.1/pgp/Makefile.am 2013-05-21 10:35:15.000000000 +0000 +++ seahorse-3.10.2/pgp/Makefile.am 2014-01-08 15:06:15.000000000 +0000 @@ -3,7 +3,7 @@ localedir = $(datadir)/locale seahorselibexecbindir = $(libdir)/seahorse/ -INCLUDES = -I$(top_builddir) \ +AM_CPPFLAGS = -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/libegg \ -I$(top_srcdir)/common \ diff -Nru seahorse-3.10.1/pgp/Makefile.in seahorse-3.10.2/pgp/Makefile.in --- seahorse-3.10.1/pgp/Makefile.in 2013-10-17 06:25:32.000000000 +0000 +++ seahorse-3.10.2/pgp/Makefile.in 2014-01-08 15:09:38.000000000 +0000 @@ -455,7 +455,7 @@ top_srcdir = @top_srcdir@ uidir = $(datadir)/seahorse/ui/ seahorselibexecbindir = $(libdir)/seahorse/ -INCLUDES = -I$(top_builddir) \ +AM_CPPFLAGS = -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/libegg \ -I$(top_srcdir)/common \ diff -Nru seahorse-3.10.1/pgp/seahorse-pgp-key-properties.c seahorse-3.10.2/pgp/seahorse-pgp-key-properties.c --- seahorse-3.10.1/pgp/seahorse-pgp-key-properties.c 2013-08-26 16:33:57.000000000 +0000 +++ seahorse-3.10.2/pgp/seahorse-pgp-key-properties.c 2014-01-08 15:07:14.000000000 +0000 @@ -1162,6 +1162,7 @@ GList *exporters = NULL; GtkWindow *window; GObject *object; + gchar *directory = NULL; GFile *file; object = SEAHORSE_OBJECT_WIDGET (swidget)->object; @@ -1169,9 +1170,10 @@ exporters = g_list_append (exporters, seahorse_gpgme_exporter_new (object, TRUE, TRUE)); window = GTK_WINDOW (seahorse_widget_get_toplevel (swidget)); - if (seahorse_exportable_prompt (exporters, window, NULL, &file, &exporter)) { + if (seahorse_exportable_prompt (exporters, window, &directory, &file, &exporter)) { seahorse_exporter_export_to_file (exporter, file, TRUE, NULL, on_export_complete, g_object_ref (window)); + g_free (directory); g_object_unref (file); g_object_unref (exporter); } diff -Nru seahorse-3.10.1/pkcs11/Makefile.am seahorse-3.10.2/pkcs11/Makefile.am --- seahorse-3.10.1/pkcs11/Makefile.am 2013-10-14 11:37:50.000000000 +0000 +++ seahorse-3.10.2/pkcs11/Makefile.am 2014-01-08 15:06:15.000000000 +0000 @@ -7,9 +7,10 @@ # Generate seahorse-pkcs11.h before building libseahorse_pkcs11_la_SOURCES BUILT_SOURCES = libvala_code_la_vala.stamp -INCLUDES = -I$(top_builddir) \ +AM_CPPFLAGS = -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/common \ + -I$(top_builddir)/common \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ -DSEAHORSE_UIDIR=\""$(uidir)"\" \ diff -Nru seahorse-3.10.1/pkcs11/Makefile.in seahorse-3.10.2/pkcs11/Makefile.in --- seahorse-3.10.1/pkcs11/Makefile.in 2013-10-17 06:25:32.000000000 +0000 +++ seahorse-3.10.2/pkcs11/Makefile.in 2014-01-08 15:09:38.000000000 +0000 @@ -418,9 +418,10 @@ # Generate seahorse-pkcs11.h before building libseahorse_pkcs11_la_SOURCES BUILT_SOURCES = libvala_code_la_vala.stamp -INCLUDES = -I$(top_builddir) \ +AM_CPPFLAGS = -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/common \ + -I$(top_builddir)/common \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ -DSEAHORSE_UIDIR=\""$(uidir)"\" \ diff -Nru seahorse-3.10.1/pkcs11/certificate-der-exporter.c seahorse-3.10.2/pkcs11/certificate-der-exporter.c --- seahorse-3.10.1/pkcs11/certificate-der-exporter.c 2013-05-27 09:03:21.000000000 +0000 +++ seahorse-3.10.2/pkcs11/certificate-der-exporter.c 2014-01-08 15:13:24.000000000 +0000 @@ -1,4 +1,4 @@ -/* certificate-der-exporter.c generated by valac 0.20.1, the Vala compiler +/* certificate-der-exporter.c generated by valac 0.22.1, the Vala compiler * generated from certificate-der-exporter.vala, do not modify */ /* @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) @@ -86,7 +86,7 @@ static gpointer _g_object_ref0 (gpointer self) { -#line 33 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 33 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" return self ? g_object_ref (self) : NULL; #line 92 "certificate-der-exporter.c" } @@ -94,33 +94,33 @@ SeahorseCertificateDerExporter* seahorse_certificate_der_exporter_construct (GType object_type, GcrCertificate* certificate) { SeahorseCertificateDerExporter * self = NULL; - GcrCertificate* _tmp0_; - GcrCertificate* _tmp1_; - GcrCertificate* _tmp2_; -#line 31 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" + GcrCertificate* _tmp0_ = NULL; + GcrCertificate* _tmp1_ = NULL; + GcrCertificate* _tmp2_ = NULL; +#line 31 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_return_val_if_fail (certificate != NULL, NULL); -#line 31 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 31 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" self = (SeahorseCertificateDerExporter*) g_object_new (object_type, NULL); -#line 33 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 33 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp0_ = certificate; -#line 33 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 33 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 33 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 33 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _g_object_unref0 (self->priv->_certificate); -#line 33 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 33 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" self->priv->_certificate = _tmp1_; -#line 34 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 34 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp2_ = certificate; -#line 34 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 34 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" self->priv->_objects = g_list_append (self->priv->_objects, (GObject*) _tmp2_); -#line 31 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 31 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" return self; #line 119 "certificate-der-exporter.c" } SeahorseCertificateDerExporter* seahorse_certificate_der_exporter_new (GcrCertificate* certificate) { -#line 31 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 31 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" return seahorse_certificate_der_exporter_construct (SEAHORSE_TYPE_CERTIFICATE_DER_EXPORTER, certificate); #line 126 "certificate-der-exporter.c" } @@ -129,14 +129,14 @@ static GList* seahorse_certificate_der_exporter_real_get_objects (SeahorseExporter* base) { SeahorseCertificateDerExporter * self; GList* result = NULL; - GList* _tmp0_; -#line 73 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" + GList* _tmp0_ = NULL; +#line 73 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" self = (SeahorseCertificateDerExporter*) base; -#line 74 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 74 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp0_ = self->priv->_objects; -#line 74 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 74 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" result = _tmp0_; -#line 74 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 74 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" return result; #line 142 "certificate-der-exporter.c" } @@ -145,13 +145,13 @@ static gboolean seahorse_certificate_der_exporter_real_add_object (SeahorseExporter* base, GObject* obj) { SeahorseCertificateDerExporter * self; gboolean result = FALSE; -#line 77 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 77 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" self = (SeahorseCertificateDerExporter*) base; -#line 77 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 77 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_return_val_if_fail (obj != NULL, FALSE); -#line 78 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 78 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" result = FALSE; -#line 78 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 78 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" return result; #line 157 "certificate-der-exporter.c" } @@ -160,13 +160,13 @@ static void seahorse_certificate_der_exporter_real_export_data_free (gpointer _data) { SeahorseCertificateDerExporterExportData* _data_; _data_ = _data; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _g_object_unref0 (_data_->cancellable); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _data_->result = (g_free (_data_->result), NULL); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _g_object_unref0 (_data_->self); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_slice_free (SeahorseCertificateDerExporterExportData, _data_); #line 172 "certificate-der-exporter.c" } @@ -175,30 +175,30 @@ static void seahorse_certificate_der_exporter_real_export (SeahorseExporter* base, GCancellable* cancellable, GAsyncReadyCallback _callback_, gpointer _user_data_) { SeahorseCertificateDerExporter * self; SeahorseCertificateDerExporterExportData* _data_; - SeahorseCertificateDerExporter* _tmp0_; - GCancellable* _tmp1_; - GCancellable* _tmp2_; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" + SeahorseCertificateDerExporter* _tmp0_ = NULL; + GCancellable* _tmp1_ = NULL; + GCancellable* _tmp2_ = NULL; +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" self = (SeahorseCertificateDerExporter*) base; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _data_ = g_slice_new0 (SeahorseCertificateDerExporterExportData); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _data_->_async_result = g_simple_async_result_new (G_OBJECT (self), _callback_, _user_data_, seahorse_certificate_der_exporter_real_export); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, seahorse_certificate_der_exporter_real_export_data_free); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp0_ = _g_object_ref0 (self); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _data_->self = _tmp0_; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp1_ = cancellable; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _g_object_unref0 (_data_->cancellable); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _data_->cancellable = _tmp2_; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" seahorse_certificate_der_exporter_real_export_co (_data_); #line 204 "certificate-der-exporter.c" } @@ -207,329 +207,339 @@ static guchar* seahorse_certificate_der_exporter_real_export_finish (SeahorseExporter* base, GAsyncResult* _res_, int* result_length1, GError** error) { guchar* result; SeahorseCertificateDerExporterExportData* _data_; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) { -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" return NULL; #line 215 "certificate-der-exporter.c" } -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_)); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" result = _data_->result; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" *result_length1 = _data_->result_length1; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _data_->result = NULL; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" return result; #line 227 "certificate-der-exporter.c" } static guchar* _vala_array_dup1 (guchar* self, int length) { -#line 83 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" return g_memdup (self, length * sizeof (guchar)); #line 234 "certificate-der-exporter.c" } static gboolean seahorse_certificate_der_exporter_real_export_co (SeahorseCertificateDerExporterExportData* _data_) { -#line 81 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 81 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" switch (_data_->_state_) { -#line 81 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 81 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" case 0: #line 243 "certificate-der-exporter.c" goto _state_0; default: -#line 81 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 81 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_assert_not_reached (); #line 248 "certificate-der-exporter.c" } _state_0: -#line 83 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" + _data_->_tmp0_ = NULL; +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _data_->_tmp0_ = _data_->self->priv->_certificate; -#line 83 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" memset (&_data_->_tmp1_, 0, sizeof (gsize)); -#line 83 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _data_->_tmp2_ = NULL; -#line 83 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _data_->_tmp2_ = gcr_certificate_get_der_data (_data_->_tmp0_, &_data_->_tmp1_); -#line 83 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" + _data_->_tmp3_ = NULL; +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" + _data_->_tmp3__length1 = 0; +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _data_->_tmp3_ = (_data_->_tmp2_ != NULL) ? _vala_array_dup1 (_data_->_tmp2_, _data_->_tmp1_) : ((gpointer) _data_->_tmp2_); -#line 83 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _data_->_tmp3__length1 = _data_->_tmp1_; -#line 83 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" + _data_->_tmp4_ = NULL; +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" + _data_->_tmp4__length1 = 0; +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _data_->_tmp4_ = _data_->_tmp3_; -#line 83 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _data_->_tmp4__length1 = _data_->_tmp3__length1; -#line 83 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _data_->result_length1 = _data_->_tmp4__length1; -#line 83 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _data_->result = _data_->_tmp4_; -#line 83 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" if (_data_->_state_ == 0) { -#line 83 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 275 "certificate-der-exporter.c" +#line 285 "certificate-der-exporter.c" } else { -#line 83 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_simple_async_result_complete (_data_->_async_result); -#line 279 "certificate-der-exporter.c" +#line 289 "certificate-der-exporter.c" } -#line 83 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_object_unref (_data_->_async_result); -#line 83 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 83 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" return FALSE; -#line 81 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 81 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" if (_data_->_state_ == 0) { -#line 81 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 81 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_simple_async_result_complete_in_idle (_data_->_async_result); -#line 289 "certificate-der-exporter.c" +#line 299 "certificate-der-exporter.c" } else { -#line 81 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 81 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_simple_async_result_complete (_data_->_async_result); -#line 293 "certificate-der-exporter.c" +#line 303 "certificate-der-exporter.c" } -#line 81 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 81 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_object_unref (_data_->_async_result); -#line 81 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 81 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" return FALSE; -#line 299 "certificate-der-exporter.c" +#line 309 "certificate-der-exporter.c" } static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar new_delimiter) { gchar* result = NULL; + gchar* _result_ = NULL; gchar* _tmp0_ = NULL; - gchar* _result_; - const gchar* _tmp1_; - const gchar* _tmp2_; - gchar _tmp3_; -#line 1093 "/usr/share/vala-0.20/vapi/glib-2.0.vapi" + const gchar* _tmp1_ = NULL; + const gchar* _tmp2_ = NULL; + gchar _tmp3_ = '\0'; +#line 1092 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1093 "/usr/share/vala-0.20/vapi/glib-2.0.vapi" +#line 1092 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_return_val_if_fail (delimiters != NULL, NULL); -#line 1094 "/usr/share/vala-0.20/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1094 "/usr/share/vala-0.20/vapi/glib-2.0.vapi" +#line 1093 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1095 "/usr/share/vala-0.20/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1095 "/usr/share/vala-0.20/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp2_ = delimiters; -#line 1095 "/usr/share/vala-0.20/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" _tmp3_ = new_delimiter; -#line 1095 "/usr/share/vala-0.20/vapi/glib-2.0.vapi" +#line 1094 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" g_strdelimit (_tmp1_, _tmp2_, _tmp3_); -#line 1096 "/usr/share/vala-0.20/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" result = _result_; -#line 1096 "/usr/share/vala-0.20/vapi/glib-2.0.vapi" +#line 1095 "/usr/share/vala-0.22/vapi/glib-2.0.vapi" return result; -#line 330 "certificate-der-exporter.c" +#line 340 "certificate-der-exporter.c" } static gchar* seahorse_certificate_der_exporter_real_get_filename (SeahorseExporter* base) { gchar* result; SeahorseCertificateDerExporter* self; - gchar* label; - GcrCertificate* _tmp0_; - const gchar* _tmp8_; - const gchar* _tmp11_; - gchar* _tmp12_; - gchar* filename; + gchar* label = NULL; + GcrCertificate* _tmp0_ = NULL; + const gchar* _tmp8_ = NULL; + gchar* filename = NULL; + const gchar* _tmp11_ = NULL; + gchar* _tmp12_ = NULL; gchar* _tmp13_ = NULL; -#line 38 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 38 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" self = (SeahorseCertificateDerExporter*) base; -#line 39 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 39 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" label = NULL; -#line 40 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 40 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp0_ = self->priv->_certificate; -#line 40 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 40 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" if (_tmp0_ != NULL) { -#line 352 "certificate-der-exporter.c" - GcrCertificate* _tmp1_; +#line 362 "certificate-der-exporter.c" + GcrCertificate* _tmp1_ = NULL; gchar* _tmp2_ = NULL; - gchar* _tmp3_; - const gchar* _tmp4_; -#line 41 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" + gchar* _tmp3_ = NULL; + const gchar* _tmp4_ = NULL; +#line 41 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp1_ = self->priv->_certificate; -#line 41 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 41 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_object_get (_tmp1_, "label", &_tmp2_, NULL); -#line 41 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 41 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp3_ = _tmp2_; -#line 41 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 41 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _g_free0 (label); -#line 41 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 41 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" label = _tmp3_; -#line 42 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 42 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp4_ = label; -#line 42 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 42 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" if (_tmp4_ == NULL) { -#line 371 "certificate-der-exporter.c" - GcrCertificate* _tmp5_; +#line 381 "certificate-der-exporter.c" + GcrCertificate* _tmp5_ = NULL; gchar* _tmp6_ = NULL; - gchar* _tmp7_; -#line 43 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" + gchar* _tmp7_ = NULL; +#line 43 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp5_ = self->priv->_certificate; -#line 43 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 43 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_object_get (_tmp5_, "description", &_tmp6_, NULL); -#line 43 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 43 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp7_ = _tmp6_; -#line 43 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 43 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _g_free0 (label); -#line 43 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 43 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" label = _tmp7_; -#line 385 "certificate-der-exporter.c" +#line 395 "certificate-der-exporter.c" } } -#line 45 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 45 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp8_ = label; -#line 45 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 45 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" if (_tmp8_ == NULL) { -#line 392 "certificate-der-exporter.c" +#line 402 "certificate-der-exporter.c" const gchar* _tmp9_ = NULL; - gchar* _tmp10_; -#line 46 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" + gchar* _tmp10_ = NULL; +#line 46 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp9_ = _ ("Certificate"); -#line 46 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 46 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp10_ = g_strdup (_tmp9_); -#line 46 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 46 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _g_free0 (label); -#line 46 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 46 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" label = _tmp10_; -#line 403 "certificate-der-exporter.c" +#line 413 "certificate-der-exporter.c" } -#line 48 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 48 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp11_ = label; -#line 48 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 48 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp12_ = g_strconcat (_tmp11_, ".crt", NULL); -#line 48 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 48 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" filename = _tmp12_; -#line 49 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 49 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp13_ = string_delimit (filename, SEAHORSE_BAD_FILENAME_CHARS, '_'); -#line 49 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 49 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" result = _tmp13_; -#line 49 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 49 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _g_free0 (filename); -#line 49 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 49 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _g_free0 (label); -#line 49 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 49 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" return result; -#line 421 "certificate-der-exporter.c" +#line 431 "certificate-der-exporter.c" } static const gchar* seahorse_certificate_der_exporter_real_get_content_type (SeahorseExporter* base) { const gchar* result; SeahorseCertificateDerExporter* self; -#line 54 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 54 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" self = (SeahorseCertificateDerExporter*) base; -#line 54 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 54 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" result = "application/pkix-cert"; -#line 54 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 54 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" return result; -#line 434 "certificate-der-exporter.c" +#line 444 "certificate-der-exporter.c" } static GtkFileFilter* seahorse_certificate_der_exporter_real_get_file_filter (SeahorseExporter* base) { GtkFileFilter* result; SeahorseCertificateDerExporter* self; - GtkFileFilter* _tmp0_; - GtkFileFilter* filter; + GtkFileFilter* filter = NULL; + GtkFileFilter* _tmp0_ = NULL; const gchar* _tmp1_ = NULL; -#line 58 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 58 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" self = (SeahorseCertificateDerExporter*) base; -#line 59 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 59 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp0_ = gtk_file_filter_new (); -#line 59 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 59 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_object_ref_sink (_tmp0_); -#line 59 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 59 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" filter = _tmp0_; -#line 60 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 60 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _tmp1_ = _ ("Certificates (DER encoded)"); -#line 60 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 60 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" gtk_buildable_set_name ((GtkBuildable*) filter, _tmp1_); -#line 61 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 61 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" gtk_file_filter_add_mime_type (filter, "application/pkix-cert"); -#line 62 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 62 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" gtk_file_filter_add_mime_type (filter, "application/x-x509-ca-cert"); -#line 63 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 63 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" gtk_file_filter_add_mime_type (filter, "application/x-x509-user-cert"); -#line 64 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 64 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" gtk_file_filter_add_pattern (filter, "*.cer"); -#line 65 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 65 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" gtk_file_filter_add_pattern (filter, "*.crt"); -#line 66 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 66 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" gtk_file_filter_add_pattern (filter, "*.cert"); -#line 68 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 68 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" result = filter; -#line 68 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 68 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" return result; -#line 472 "certificate-der-exporter.c" +#line 482 "certificate-der-exporter.c" } static void seahorse_certificate_der_exporter_class_init (SeahorseCertificateDerExporterClass * klass) { -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" seahorse_certificate_der_exporter_parent_class = g_type_class_peek_parent (klass); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_type_class_add_private (klass, sizeof (SeahorseCertificateDerExporterPrivate)); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" G_OBJECT_CLASS (klass)->get_property = _vala_seahorse_certificate_der_exporter_get_property; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" G_OBJECT_CLASS (klass)->finalize = seahorse_certificate_der_exporter_finalize; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_CERTIFICATE_DER_EXPORTER_FILENAME, g_param_spec_string ("filename", "filename", "filename", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_CERTIFICATE_DER_EXPORTER_CONTENT_TYPE, g_param_spec_string ("content-type", "content-type", "content-type", NULL, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_object_class_install_property (G_OBJECT_CLASS (klass), SEAHORSE_CERTIFICATE_DER_EXPORTER_FILE_FILTER, g_param_spec_object ("file-filter", "file-filter", "file-filter", GTK_TYPE_FILE_FILTER, G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB | G_PARAM_READABLE)); -#line 491 "certificate-der-exporter.c" +#line 501 "certificate-der-exporter.c" } static void seahorse_certificate_der_exporter_seahorse_exporter_interface_init (SeahorseExporterIface * iface) { -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" seahorse_certificate_der_exporter_seahorse_exporter_parent_iface = g_type_interface_peek_parent (iface); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" iface->get_objects = (GList* (*)(SeahorseExporter*)) seahorse_certificate_der_exporter_real_get_objects; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" iface->add_object = (gboolean (*)(SeahorseExporter*, GObject*)) seahorse_certificate_der_exporter_real_add_object; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" iface->export = (guint8* (*)(SeahorseExporter*, GCancellable*, size_t*, GError**)) seahorse_certificate_der_exporter_real_export; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" iface->export_finish = seahorse_certificate_der_exporter_real_export_finish; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" iface->get_filename = seahorse_certificate_der_exporter_real_get_filename; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" iface->get_content_type = seahorse_certificate_der_exporter_real_get_content_type; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" iface->get_file_filter = seahorse_certificate_der_exporter_real_get_file_filter; -#line 512 "certificate-der-exporter.c" +#line 522 "certificate-der-exporter.c" } static void seahorse_certificate_der_exporter_instance_init (SeahorseCertificateDerExporter * self) { -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" self->priv = SEAHORSE_CERTIFICATE_DER_EXPORTER_GET_PRIVATE (self); -#line 519 "certificate-der-exporter.c" +#line 529 "certificate-der-exporter.c" } static void seahorse_certificate_der_exporter_finalize (GObject* obj) { SeahorseCertificateDerExporter * self; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEAHORSE_TYPE_CERTIFICATE_DER_EXPORTER, SeahorseCertificateDerExporter); -#line 28 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 28 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _g_object_unref0 (self->priv->_certificate); -#line 29 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 29 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" _g_list_free0 (self->priv->_objects); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" G_OBJECT_CLASS (seahorse_certificate_der_exporter_parent_class)->finalize (obj); -#line 533 "certificate-der-exporter.c" +#line 543 "certificate-der-exporter.c" } @@ -550,33 +560,33 @@ static void _vala_seahorse_certificate_der_exporter_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) { SeahorseCertificateDerExporter * self; self = G_TYPE_CHECK_INSTANCE_CAST (object, SEAHORSE_TYPE_CERTIFICATE_DER_EXPORTER, SeahorseCertificateDerExporter); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" switch (property_id) { -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" case SEAHORSE_CERTIFICATE_DER_EXPORTER_FILENAME: -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_value_take_string (value, seahorse_exporter_get_filename ((SeahorseExporter*) self)); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" break; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" case SEAHORSE_CERTIFICATE_DER_EXPORTER_CONTENT_TYPE: -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_value_set_string (value, seahorse_exporter_get_content_type ((SeahorseExporter*) self)); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" break; -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" case SEAHORSE_CERTIFICATE_DER_EXPORTER_FILE_FILTER: -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" g_value_take_object (value, seahorse_exporter_get_file_filter ((SeahorseExporter*) self)); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" break; -#line 574 "certificate-der-exporter.c" +#line 584 "certificate-der-exporter.c" default: -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); -#line 27 "/data/projects/seahorse/pkcs11/certificate-der-exporter.vala" +#line 27 "/data/src/seahorse/pkcs11/certificate-der-exporter.vala" break; -#line 580 "certificate-der-exporter.c" +#line 590 "certificate-der-exporter.c" } } diff -Nru seahorse-3.10.1/pkcs11/pkcs11-module.c seahorse-3.10.2/pkcs11/pkcs11-module.c --- seahorse-3.10.1/pkcs11/pkcs11-module.c 2013-04-28 15:23:21.000000000 +0000 +++ seahorse-3.10.2/pkcs11/pkcs11-module.c 2014-01-08 15:13:24.000000000 +0000 @@ -1,4 +1,4 @@ -/* pkcs11-module.c generated by valac 0.20.1, the Vala compiler +/* pkcs11-module.c generated by valac 0.22.1, the Vala compiler * generated from pkcs11-module.vala, do not modify */ /* diff -Nru seahorse-3.10.1/pkcs11/seahorse-pkcs11.h seahorse-3.10.2/pkcs11/seahorse-pkcs11.h --- seahorse-3.10.1/pkcs11/seahorse-pkcs11.h 2013-05-27 09:03:21.000000000 +0000 +++ seahorse-3.10.2/pkcs11/seahorse-pkcs11.h 2014-01-08 15:13:24.000000000 +0000 @@ -1,4 +1,4 @@ -/* seahorse-pkcs11.h generated by valac 0.20.1, the Vala compiler, do not modify */ +/* seahorse-pkcs11.h generated by valac 0.22.1, the Vala compiler, do not modify */ #ifndef __SEAHORSE_PKCS11_H__ @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include #include diff -Nru seahorse-3.10.1/po/el.po seahorse-3.10.2/po/el.po --- seahorse-3.10.1/po/el.po 2013-05-21 10:35:15.000000000 +0000 +++ seahorse-3.10.2/po/el.po 2014-01-08 15:06:15.000000000 +0000 @@ -7,13 +7,14 @@ # Jennie Petoumenou , 2009. # Marios Zindilis , 2011. # Dimitris Spingos (Δημήτρης Σπίγγος) , 2012, 2013. +# Efstathios Iosifidis , 2013. msgid "" msgstr "" "Project-Id-Version: seahorse.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=seahor" "se&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-04-21 22:35+0000\n" -"PO-Revision-Date: 2013-04-25 17:38+0300\n" +"POT-Creation-Date: 2013-10-19 04:16+0000\n" +"PO-Revision-Date: 2013-11-05 23:07+0300\n" "Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) \n" "Language-Team: team@gnome.gr\n" "Language: el\n" @@ -24,316 +25,411 @@ "X-Generator: Virtaal 0.7.1\n" "X-Project-Style: gnome\n" -#: ../common/seahorse-exportable.vala:193 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -msgid "Export" -msgstr "Εξαγωγή" +#: ../common/catalog.vala:259 +msgid "Contributions:" +msgstr "Συντελεστές:" -#: ../gkr/seahorse-add-keyring.xml.h:1 -msgid "Add Password Keyring" -msgstr "Προσθήκη κλειδοθήκης κωδικών" +#: ../common/catalog.vala:287 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:661 +msgid "Passwords and Keys" +msgstr "Κωδικοί πρόσβασης και κλειδιά κρυπτογράφησης" -#: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "" -"Please choose a name for the new keyring. You will be prompted for an unlock " -"password." +#: ../common/catalog.vala:289 +msgid "translator-credits" msgstr "" -"Παρακαλώ επιλέξτε ένα όνομα για τη νέα κλειδοθήκη. Θα ερωτηθείτε για κωδικό " -"ξεκλειδώματος." +"Ελληνική μεταφραστική ομάδα GNOME\n" +" Δημήτρης Σπίγγος \n" +" Κώστας Παπαδήμας \n" +" Δημήτριος Τυπάλδος \n" +" Νίκος Χαρωνιτάκης \n" +" Σίμος Ξενιτέλλης \n" +" Νίκος Αγιαννιώτης \n" +" Τζένη Πετούμενου \n" +" Ευστάθιος Ιωσηφίδης \n" +"\n" +"Για περισσότερα δείτε http://www.gnome.gr/" -#: ../gkr/seahorse-add-keyring.xml.h:3 -msgid "New Keyring Name:" -msgstr "Νέο όνομα κλειδοθήκης:" +#: ../common/catalog.vala:292 +msgid "Seahorse Project Homepage" +msgstr "Αρχική σελίδα του Seahorse" -#: ../gkr/seahorse-add-keyring.xml.h:4 -#: ../libseahorse/seahorse-add-keyserver.xml.h:5 -#: ../ssh/seahorse-ssh-upload.xml.h:3 -msgid "The host name or address of the server." -msgstr "Όνομα συστήματος ή διεύθυνση εξυπηρετητή." +#: ../common/catalog.vala:310 +msgid "Cannot delete" +msgstr "Αδυναμία διαγραφής" + +#: ../common/catalog.vala:333 ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "Αδυναμία εξαγωγής κλειδιών" + +#: ../common/catalog.vala:344 +msgid "Couldn't export data" +msgstr "Αδυναμία εξαγωγής δεδομένων" + +#: ../common/catalog.vala:360 ../libseahorse/seahorse-widget.c:460 +#, c-format +msgid "Could not display help: %s" +msgstr "Αδύνατη η προβολή βοήθειας: %s" + +#. Top menu items +#: ../common/catalog.vala:366 +msgid "_File" +msgstr "_Αρχείο" + +#: ../common/catalog.vala:367 +msgid "E_xport..." +msgstr "Ε_ξαγωγή..." -#: ../gkr/seahorse-gkr-actions.c:81 +#: ../common/catalog.vala:368 +msgid "Export to a file" +msgstr "Εξαγωγή σε αρχείο" + +#: ../common/catalog.vala:369 +msgid "_Edit" +msgstr "_Επεξεργασία" + +#: ../common/catalog.vala:372 +msgid "Copy to the clipboard" +msgstr "Αντιγραφή στο πρόχειρο" + +#: ../common/catalog.vala:373 ../pkcs11/seahorse-pkcs11-properties.c:229 +#: ../src/seahorse-sidebar.c:955 +msgid "_Delete" +msgstr "_Διαγραφή" + +#: ../common/catalog.vala:374 +msgid "Delete selected items" +msgstr "Διαγραφή επιλεγμένων αντικειμένων" + +#: ../common/catalog.vala:376 +msgid "Show the properties of this item" +msgstr "Προβολή ιδιοτήτων αυτού του αντικειμένου" + +#: ../common/catalog.vala:378 +msgid "Show the properties of this keyring" +msgstr "Προβολή ιδιοτήτων αυτής της κλειδοθήκης" + +#: ../common/catalog.vala:379 +msgid "Prefere_nces" +msgstr "Προτι_μήσεις" + +#: ../common/catalog.vala:380 +msgid "Change preferences for this program" +msgstr "Αλλαγή προτιμήσεων για το συγκεκριμένο πρόγραμμα" + +#: ../common/catalog.vala:381 +msgid "_View" +msgstr "Προ_βολή" + +#: ../common/catalog.vala:382 +msgid "_Help" +msgstr "_Βοήθεια" + +#: ../common/catalog.vala:384 +msgid "About this program" +msgstr "Περί αυτού του προγράμματος" + +#: ../common/catalog.vala:385 +msgid "_Contents" +msgstr "_Περιεχόμενα" + +#: ../common/catalog.vala:386 +msgid "Show Seahorse help" +msgstr "Εμφάνιση βοήθειας Seahorse" + +#: ../common/exportable.vala:195 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Export" +msgstr "Εξαγωγή" + +#: ../gkr/gkr-backend.vala:41 +msgid "Passwords" +msgstr "Συνθηματικά" + +#: ../gkr/gkr-backend.vala:45 +msgid "Stored personal passwords, credentials and secrets" +msgstr "Αποθηκευμένων κωδικών πρόσβασης, πιστοποιητικών και μυστικών" + +#: ../gkr/gkr-backend.vala:243 msgid "New password keyring" msgstr "Νέα κλειδοθήκη κωδικών" -#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +#: ../gkr/gkr-backend.vala:244 ../gkr/gkr-backend.vala:251 msgid "Used to store application and network passwords" msgstr "Χρησιμοποιείται για την αποθήκευση κωδικών για εφαρμογές και δίκτυα" -#: ../gkr/seahorse-gkr-actions.c:83 +#: ../gkr/gkr-backend.vala:245 msgid "New password..." msgstr "Νέος κωδικός πρόσβασης..." -#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +#: ../gkr/gkr-backend.vala:246 ../gkr/gkr-backend.vala:253 msgid "Safely store a password or secret." msgstr "Ασφαλής αποθήκευση ενός κωδικού πρόσβασης ή μυστικού." -#: ../gkr/seahorse-gkr-actions.c:88 +#: ../gkr/gkr-backend.vala:250 msgid "Password Keyring" msgstr "Κλειδοθήκη κωδικών" -#: ../gkr/seahorse-gkr-actions.c:90 +#: ../gkr/gkr-backend.vala:252 msgid "Stored Password" msgstr "Αποθηκευμένος κωδικός πρόσβασης" -#: ../gkr/seahorse-gkr-actions.c:174 -msgid "Couldn't set default keyring" -msgstr "Αδύνατος ο καθορισμός προεπιλεγμένης κλειδοθήκης" - -#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 -msgid "Couldn't change keyring password" -msgstr "Αδύνατη η αλλαγή κωδικού της κλειδοθήκης" - -#: ../gkr/seahorse-gkr-actions.c:281 -msgid "_Set as default" -msgstr "_Ορισμός ως προεπιλογής" - -#: ../gkr/seahorse-gkr-actions.c:282 -msgid "Applications usually store new passwords in the default keyring." -msgstr "" -"Συνήθως, οι εφαρμογές αποθηκεύουν τους νέους κωδικούς στην προεπιλεγμένη " -"κλειδοθήκη." - -#: ../gkr/seahorse-gkr-actions.c:283 -msgid "Change _Password" -msgstr "Αλλαγή _κωδικού πρόσβασης" - -#: ../gkr/seahorse-gkr-actions.c:284 -msgid "Change the unlock password of the password storage keyring" -msgstr "Αλλαγή του κωδικού ξεκλειδώματος της κλειδοθήκης αποθήκευσης κωδικών" +#: ../gkr/gkr-item-add.vala:27 +msgid "Add Password" +msgstr "Προσθήκη κωδικού" -#: ../gkr/seahorse-gkr-add-item.c:60 +#: ../gkr/gkr-item-add.vala:104 msgid "Couldn't add item" msgstr "Αδυναμία προσθήκης αντικειμένου" -#: ../gkr/seahorse-gkr-add-item.xml.h:1 -msgid "Add Password" -msgstr "Προσθήκη κωδικού" +#: ../gkr/gkr-item-properties.vala:139 +msgid "Access a network share or resource" +msgstr "Πρόσβαση κοινόχρηστου δικτύου ή πόρου" -#: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "_Description:" -msgstr "Περι_γραφή:" +#: ../gkr/gkr-item-properties.vala:142 +msgid "Access a website" +msgstr "Πρόσβαση ιστοσελίδας" -#: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Password:" -msgstr "Κωδικός _πρόσβασης:" +#: ../gkr/gkr-item-properties.vala:145 +msgid "Unlocks a PGP key" +msgstr "Ξεκλειδώνει ένα κλειδί PGP" -#: ../gkr/seahorse-gkr-add-item.xml.h:4 -msgid "_Show Password" -msgstr "Εμφάνιση κωδικού _πρόσβασης" +#: ../gkr/gkr-item-properties.vala:148 +msgid "Unlocks a Secure Shell key" +msgstr "Ξεκλειδώνει ένα κλειδί Secure Shell (SSH)" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 -msgid "_Keyring:" -msgstr "_Κλειδοθήκη:" +#: ../gkr/gkr-item-properties.vala:151 +msgid "Saved password or login" +msgstr "Αποθηκευμένος κωδικός πρόσβασης ή στοιχεία σύνδεσης" -#: ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "Αδύνατη η προσθήκη κλειδοθήκης" +#: ../gkr/gkr-item-properties.vala:164 +msgid "Network Credentials" +msgstr "Πιστοποιητικά δικτύου" -#: ../gkr/seahorse-gkr-backend.c:205 -msgid "Passwords" -msgstr "Κωδικοί πρόσβασης" +#: ../gkr/gkr-item-properties.vala:169 +msgid "Password" +msgstr "Κωδικός πρόσβασης" -#: ../gkr/seahorse-gkr-backend.c:208 -msgid "Stored personal passwords, credentials and secrets" -msgstr "Αποθηκευμένων κωδικών πρόσβασης, πιστοποιητικών και μυστικών" +#: ../gkr/gkr-item-properties.vala:238 +msgid "Couldn't change password." +msgstr "Αδύνατη η αλλαγή κωδικού πρόσβασης." + +#: ../gkr/gkr-item-properties.vala:276 +msgid "Couldn't set description." +msgstr "Αδύνατος ο καθορισμός περιγραφής." #. Translators: This should be the same as the string in empathy -#: ../gkr/seahorse-gkr-item.c:292 +#: ../gkr/gkr-item.vala:391 msgid "IM account password for " msgstr "Κωδικός πρόσβασης για της εφαρμογή αποστολής άμεσων μηνυμάτων " -#: ../gkr/seahorse-gkr-item.c:352 +#: ../gkr/gkr-item.vala:447 msgid "Password or secret" msgstr "Κωδικός πρόσβασης ή μυστικό" -#: ../gkr/seahorse-gkr-item.c:353 +#: ../gkr/gkr-item.vala:448 msgid "Network password" msgstr "Κωδικός πρόσβασης δικτύου" -#: ../gkr/seahorse-gkr-item.c:354 +#: ../gkr/gkr-item.vala:449 msgid "Stored note" msgstr "Αποθηκευμένη σημείωση" -#: ../gkr/seahorse-gkr-item.c:355 +#: ../gkr/gkr-item.vala:450 msgid "Keyring password" msgstr "Κωδικός πρόσβασης κλειδοθήκης" -#: ../gkr/seahorse-gkr-item.c:356 +#: ../gkr/gkr-item.vala:451 msgid "Encryption key password" msgstr "Κρυπτογράφηση συνθηματικού κλειδιού" -#: ../gkr/seahorse-gkr-item.c:357 +#: ../gkr/gkr-item.vala:452 msgid "Key storage password" msgstr "Κωδικός πρόσβασης αποθήκευσης κλειδιού" -#: ../gkr/seahorse-gkr-item.c:358 +#: ../gkr/gkr-item.vala:453 msgid "Google Chrome password" msgstr "Κωδικός πρόσβασης για Google Chrome" -#: ../gkr/seahorse-gkr-item.c:359 +#: ../gkr/gkr-item.vala:454 msgid "Gnome Online Accounts password" msgstr "Κωδικός πρόσβασης για τους διαδικτυακούς λογαριασμούς του GNOME" -#: ../gkr/seahorse-gkr-item.c:360 +#: ../gkr/gkr-item.vala:455 msgid "Telepathy password" msgstr "Κωδικός πρόσβασης για Telepathy" -#: ../gkr/seahorse-gkr-item.c:361 +#: ../gkr/gkr-item.vala:456 msgid "Instant messaging password" msgstr "Κωδικός πρόσβασης της εφαρμογής άμεσων μηνυμάτων" -#: ../gkr/seahorse-gkr-item.c:362 +#: ../gkr/gkr-item.vala:457 msgid "Network Manager secret" msgstr "Μυστικό του Network Manager" -#: ../gkr/seahorse-gkr-item-deleter.c:80 +#: ../gkr/gkr-item.vala:507 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε τον κωδικό πρόσβασης '%s';" -#: ../gkr/seahorse-gkr-item-deleter.c:83 +#: ../gkr/gkr-item.vala:509 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε %d κωδικό πρόσβασης;" msgstr[1] "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε %d κωδικούς πρόσβασης;" -#: ../gkr/seahorse-gkr-item-properties.c:66 -msgid "Access a network share or resource" -msgstr "Πρόσβαση κοινόχρηστου δικτύου ή πόρου" +#: ../gkr/gkr-keyring-add.vala:28 +msgid "Add Password Keyring" +msgstr "Προσθήκη κλειδοθήκης κωδικών" -#: ../gkr/seahorse-gkr-item-properties.c:69 -msgid "Access a website" -msgstr "Πρόσβαση ιστοσελίδας" +#: ../gkr/gkr-keyring-add.vala:58 +msgid "Couldn't add keyring" +msgstr "Αδύνατη η προσθήκη κλειδοθήκης" -#: ../gkr/seahorse-gkr-item-properties.c:72 -msgid "Unlocks a PGP key" -msgstr "Ξεκλειδώνει ένα κλειδί PGP" +#: ../gkr/gkr-keyring.vala:30 +msgid "A keyring that is automatically unlocked on login" +msgstr "Μια κλειδοθήκη που ξεκλειδώνεται αυτόματα κατά την σύνδεση" -#: ../gkr/seahorse-gkr-item-properties.c:75 -msgid "Unlocks a Secure Shell key" -msgstr "Ξεκλειδώνει ένα κλειδί Secure Shell (SSH)" +#: ../gkr/gkr-keyring.vala:31 +msgid "A keyring used to store passwords" +msgstr "" +"Μια κλειδοθήκη που χρησιμοποιείται για την αποθήκευση κωδικών πρόσβασης" -#: ../gkr/seahorse-gkr-item-properties.c:78 -msgid "Saved password or login" -msgstr "Αποθηκευμένος κωδικός πρόσβασης ή στοιχεία σύνδεσης" +#: ../gkr/gkr-keyring.vala:176 +msgid "Couldn't set default keyring" +msgstr "Αδύνατος ο καθορισμός προεπιλεγμένης κλειδοθήκης" -#: ../gkr/seahorse-gkr-item-properties.c:102 -msgid "Network Credentials" -msgstr "Πιστοποιητικά δικτύου" +#: ../gkr/gkr-keyring.vala:200 ../gkr/gkr-keyring.vala:205 +msgid "Couldn't change keyring password" +msgstr "Αδύνατη η αλλαγή κωδικού της κλειδοθήκης" -#: ../gkr/seahorse-gkr-item-properties.c:107 -msgid "Password" -msgstr "Κωδικός πρόσβασης" +#: ../gkr/gkr-keyring.vala:211 +msgid "_Set as default" +msgstr "_Ορισμός ως προεπιλογής" -#: ../gkr/seahorse-gkr-item-properties.c:216 -msgid "Couldn't change password." -msgstr "Αδύνατη η αλλαγή κωδικού πρόσβασης." +#: ../gkr/gkr-keyring.vala:212 +msgid "Applications usually store new passwords in the default keyring." +msgstr "" +"Συνήθως, οι εφαρμογές αποθηκεύουν τους νέους κωδικούς στην προεπιλεγμένη " +"κλειδοθήκη." -#: ../gkr/seahorse-gkr-item-properties.c:263 -#: ../gkr/seahorse-gkr-item-properties.c:385 -msgid "Updating password" -msgstr "Γίνεται ενημέρωση του κωδικού" +#: ../gkr/gkr-keyring.vala:213 +msgid "Change _Password" +msgstr "Αλλαγή _κωδικού πρόσβασης" -#: ../gkr/seahorse-gkr-item-properties.c:346 -msgid "Couldn't set description." -msgstr "Αδύνατος ο καθορισμός περιγραφής." +#: ../gkr/gkr-keyring.vala:214 +msgid "Change the unlock password of the password storage keyring" +msgstr "Αλλαγή του κωδικού ξεκλειδώματος της κλειδοθήκης αποθήκευσης κωδικών" -#: ../gkr/seahorse-gkr-item-properties.xml.h:1 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Key Properties" -msgstr "Ιδιότητες κλειδιού" +#: ../gkr/gkr-keyring.vala:239 +#, c-format +msgid "Are you sure you want to delete the password keyring '%s'?" +msgstr "" +"Είστε σίγουροι ότι επιθυμείτε να διαγράψετε την κλειδοθήκη κωδικών '%s';" + +#: ../gkr/gkr-keyring.vala:242 +msgid "I understand that all items will be permanently deleted." +msgstr "Κατανοώ πως όλα τα αντικείμενα θα διαγραφούν οριστικά." + +#: ../gkr/seahorse-add-keyring.xml.h:1 +msgid "" +"Please choose a name for the new keyring. You will be prompted for an unlock " +"password." +msgstr "" +"Παρακαλώ επιλέξτε ένα όνομα για τη νέα κλειδοθήκη. Θα ερωτηθείτε για κωδικό " +"ξεκλειδώματος." + +#: ../gkr/seahorse-add-keyring.xml.h:2 +msgid "New Keyring Name:" +msgstr "Νέο όνομα κλειδοθήκης:" + +#: ../gkr/seahorse-add-keyring.xml.h:3 +#: ../libseahorse/seahorse-add-keyserver.xml.h:5 +#: ../ssh/seahorse-ssh-upload.xml.h:3 +msgid "The host name or address of the server." +msgstr "Όνομα συστήματος ή διεύθυνση εξυπηρετητή." + +#: ../gkr/seahorse-gkr-add-item.xml.h:1 +#: ../gkr/seahorse-gkr-item-properties.xml.h:1 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 +msgid "_Description:" +msgstr "Περι_γραφή:" + +#: ../gkr/seahorse-gkr-add-item.xml.h:2 +msgid "_Password:" +msgstr "Κωδικός _πρόσβασης:" + +#: ../gkr/seahorse-gkr-add-item.xml.h:3 +msgid "_Show Password" +msgstr "Εμφάνιση κωδικού _πρόσβασης" + +#: ../gkr/seahorse-gkr-add-item.xml.h:4 +msgid "_Keyring:" +msgstr "_Κλειδοθήκη:" #. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:4 +#: ../gkr/seahorse-gkr-item-properties.xml.h:3 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 #: ../ssh/seahorse-ssh-key-properties.xml.h:9 msgid "Use:" msgstr "Χρήση:" -#: ../gkr/seahorse-gkr-item-properties.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:4 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 #: ../ssh/seahorse-ssh-key-properties.xml.h:3 msgid "Type:" msgstr "Τύπος:" -#: ../gkr/seahorse-gkr-item-properties.xml.h:6 +#: ../gkr/seahorse-gkr-item-properties.xml.h:5 msgid "Server:" msgstr "Εξυπηρετητής:" -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +#: ../gkr/seahorse-gkr-item-properties.xml.h:6 msgid "Login:" msgstr "Σύνδεση:" -#: ../gkr/seahorse-gkr-item-properties.xml.h:8 +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Show pass_word" msgstr "Εμφάνιση _κωδικού" -#: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +#: ../gkr/seahorse-gkr-item-properties.xml.h:8 +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:119 msgid "Password:" msgstr "Κωδικός πρόσβασης:" -#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../gkr/seahorse-gkr-item-properties.xml.h:9 #: ../pgp/seahorse-pgp-subkey.c:366 #: ../ssh/seahorse-ssh-key-properties.xml.h:15 msgid "Key" msgstr "Κλειδί" -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 #: ../ssh/seahorse-ssh-key-properties.xml.h:20 msgid "Technical Details:" msgstr "Τεχνικές λεπτομέρειες:" -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 #: ../ssh/seahorse-ssh-key-properties.xml.h:22 msgid "Details" msgstr "Λεπτομέρειες" -#: ../gkr/seahorse-gkr-keyring.c:475 -msgid "A keyring that is automatically unlocked on login" -msgstr "Μια κλειδοθήκη που ξεκλειδώνεται αυτόματα κατά την σύνδεση" - -#: ../gkr/seahorse-gkr-keyring.c:476 -msgid "A keyring used to store passwords" -msgstr "" -"Μια κλειδοθήκη που χρησιμοποιείται για την αποθήκευση κωδικών πρόσβασης" - -#: ../gkr/seahorse-gkr-keyring-deleter.c:76 -#, c-format -msgid "Are you sure you want to delete the password keyring '%s'?" -msgstr "" -"Είστε σίγουροι ότι επιθυμείτε να διαγράψετε την κλειδοθήκη κωδικών '%s';" - -#: ../gkr/seahorse-gkr-keyring-deleter.c:79 -msgid "I understand that all items will be permanently deleted." -msgstr "Κατανοώ πως όλα τα αντικείμενα θα διαγραφούν οριστικά." - #: ../gkr/seahorse-gkr-keyring.xml.h:1 -msgid "Keyring Properties" -msgstr "Ιδιότητες κλειδοθήκης" - -#: ../gkr/seahorse-gkr-keyring.xml.h:2 msgid "Name:" msgstr "Όνομα:" #. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../gkr/seahorse-gkr-keyring.xml.h:3 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 msgid "Created:" msgstr "Δημιουργήθηκε:" -#: ../gkr/seahorse-gkr-keyring.xml.h:5 +#: ../gkr/seahorse-gkr-keyring.xml.h:4 msgid "Keyring" msgstr "Κλειδοθήκη" @@ -618,125 +714,19 @@ msgid "The port to access the server on." msgstr "Θύρα πρόσβασης στον εξυπηρετητή." -#: ../libseahorse/seahorse-application.c:132 +#: ../libseahorse/seahorse-application.c:136 msgid "Version of this application" msgstr "Η έκδοση της εφαρμογής" -#: ../libseahorse/seahorse-application.c:138 -#: ../libseahorse/seahorse-application.c:182 +#: ../libseahorse/seahorse-application.c:142 +#: ../libseahorse/seahorse-application.c:186 msgid "- System Settings" msgstr "- Ρυθμίσεις συστήματος" -#: ../libseahorse/seahorse-application.c:178 +#: ../libseahorse/seahorse-application.c:182 msgid "Don't display a window" msgstr "Να μην εμφανίζεται παράθυρο" -#: ../libseahorse/seahorse-catalog.c:86 -msgid "Contributions:" -msgstr "Συντελεστές:" - -#: ../libseahorse/seahorse-catalog.c:110 ../src/seahorse.desktop.in.in.h:1 -#: ../src/seahorse-key-manager.c:658 -msgid "Passwords and Keys" -msgstr "Κωδικοί πρόσβασης και κλειδιά κρυπτογράφησης" - -#: ../libseahorse/seahorse-catalog.c:112 -msgid "translator-credits" -msgstr "" -"Ελληνική μεταφραστική ομάδα GNOME\n" -" Δημήτρης Σπίγγος \n" -" Κώστας Παπαδήμας \n" -" Δημήτριος Τυπάλδος \n" -" Νίκος Χαρωνιτάκης \n" -" Σίμος Ξενιτέλλης \n" -" Νίκος Αγιαννιώτης \n" -" Τζένη Πετούμενου \n" -"\n" -"Για περισσότερα δείτε http://www.gnome.gr/" - -#: ../libseahorse/seahorse-catalog.c:115 -msgid "Seahorse Project Homepage" -msgstr "Αρχική σελίδα του Seahorse" - -#: ../libseahorse/seahorse-catalog.c:189 -msgid "Cannot delete" -msgstr "Αδυναμία διαγραφής" - -#: ../libseahorse/seahorse-catalog.c:237 -#: ../libseahorse/seahorse-key-manager-store.c:443 -msgid "Couldn't export keys" -msgstr "Αδυναμία εξαγωγής κλειδιών" - -#: ../libseahorse/seahorse-catalog.c:266 -msgid "Couldn't export data" -msgstr "Αδυναμία εξαγωγής δεδομένων" - -#. Top menu items -#: ../libseahorse/seahorse-catalog.c:275 -msgid "_File" -msgstr "_Αρχείο" - -#: ../libseahorse/seahorse-catalog.c:276 -msgid "E_xport..." -msgstr "Ε_ξαγωγή..." - -#: ../libseahorse/seahorse-catalog.c:277 -msgid "Export to a file" -msgstr "Εξαγωγή σε αρχείο" - -#: ../libseahorse/seahorse-catalog.c:278 -msgid "_Edit" -msgstr "_Επεξεργασία" - -#: ../libseahorse/seahorse-catalog.c:281 -msgid "Copy to the clipboard" -msgstr "Αντιγραφή στο πρόχειρο" - -#: ../libseahorse/seahorse-catalog.c:282 -#: ../pkcs11/seahorse-pkcs11-properties.c:232 ../src/seahorse-sidebar.c:966 -msgid "_Delete" -msgstr "_Διαγραφή" - -#: ../libseahorse/seahorse-catalog.c:283 -msgid "Delete selected items" -msgstr "Διαγραφή επιλεγμένων αντικειμένων" - -#: ../libseahorse/seahorse-catalog.c:285 -msgid "Show the properties of this item" -msgstr "Προβολή ιδιοτήτων αυτού του αντικειμένου" - -#: ../libseahorse/seahorse-catalog.c:287 -msgid "Show the properties of this keyring" -msgstr "Προβολή ιδιοτήτων αυτής της κλειδοθήκης" - -#: ../libseahorse/seahorse-catalog.c:288 -msgid "Prefere_nces" -msgstr "Προτι_μήσεις" - -#: ../libseahorse/seahorse-catalog.c:289 -msgid "Change preferences for this program" -msgstr "Αλλαγή προτιμήσεων για το συγκεκριμένο πρόγραμμα" - -#: ../libseahorse/seahorse-catalog.c:290 -msgid "_View" -msgstr "Προ_βολή" - -#: ../libseahorse/seahorse-catalog.c:291 -msgid "_Help" -msgstr "_Βοήθεια" - -#: ../libseahorse/seahorse-catalog.c:293 -msgid "About this program" -msgstr "Περί αυτού του προγράμματος" - -#: ../libseahorse/seahorse-catalog.c:294 -msgid "_Contents" -msgstr "_Περιεχόμενα" - -#: ../libseahorse/seahorse-catalog.c:295 -msgid "Show Seahorse help" -msgstr "Εμφάνιση βοήθειας Seahorse" - #: ../libseahorse/seahorse-interaction.c:99 #, c-format msgid "Enter PIN or password for: %s" @@ -747,11 +737,11 @@ msgid "Confirm:" msgstr "Επιβεβαίωση:" -#: ../libseahorse/seahorse-prefs.c:67 +#: ../libseahorse/seahorse-prefs.c:66 msgid "Not a valid Key Server address." msgstr "Μη έγκυρη διεύθυνση εξυπηρετητή κλειδιών." -#: ../libseahorse/seahorse-prefs.c:68 +#: ../libseahorse/seahorse-prefs.c:67 msgid "" "For help contact your system adminstrator or the administrator of the key " "server." @@ -759,15 +749,15 @@ "Για βοήθεια ελάτε σε επαφή με το διαχειριστή του συστήματός σας ή το " "διαχειριστή του εξυπηρετητή κλειδιών." -#: ../libseahorse/seahorse-prefs.c:181 +#: ../libseahorse/seahorse-prefs.c:180 msgid "URL" msgstr "URL" -#: ../libseahorse/seahorse-prefs.c:351 +#: ../libseahorse/seahorse-prefs.c:350 msgid "Custom" msgstr "Προσαρμοσμένο" -#: ../libseahorse/seahorse-prefs.c:404 +#: ../libseahorse/seahorse-prefs.c:403 msgid "None: Don't publish keys" msgstr "Κανένα: μη δημοσίευση κλειδιών" @@ -796,12 +786,8 @@ msgid "Key Servers" msgstr "Εξυπηρετητές κλειδιών" -#: ../libseahorse/seahorse-util.c:210 -msgid "%Y-%m-%d" -msgstr "%Y-%m-%d" - #: ../libseahorse/seahorse-validity.c:40 -#: ../pgp/seahorse-pgp-key-properties.c:1254 +#: ../pgp/seahorse-pgp-key-properties.c:1252 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 msgctxt "Validity" @@ -809,7 +795,7 @@ msgstr "Άγνωστο" #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1260 +#: ../pgp/seahorse-pgp-key-properties.c:1258 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 msgctxt "Validity" @@ -844,11 +830,6 @@ msgid "Revoked" msgstr "Ανακλήθηκε" -#: ../libseahorse/seahorse-widget.c:460 -#, c-format -msgid "Could not display help: %s" -msgstr "Αδύνατη η προβολή βοήθειας: %s" - #: ../pgp/seahorse-add-subkey.xml.h:1 msgid "Never E_xpires" msgstr "Δε λήγει π_οτέ" @@ -932,7 +913,7 @@ msgid "Add subkey to %s" msgstr "Προσθήκη υποκλειδιού στο %s" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:132 msgid "DSA (sign only)" msgstr "DSA (μόνο υπογραφή)" @@ -940,7 +921,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (μόνο κρυπτογράφηση)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:133 msgid "RSA (sign only)" msgstr "RSA (μόνο υπογραφή)" @@ -957,14 +938,14 @@ msgid "Add user ID to %s" msgstr "Προσθήκη ταυτότητας χρήστη στο %s" -#: ../pgp/seahorse-gpgme.c:69 +#: ../pgp/seahorse-gpgme.c:70 msgid "Decryption failed. You probably do not have the decryption key." msgstr "" "Η αποκρυπτογράφηση απέτυχε. Προφανώς δε διαθέτετε το κλειδί " "αποκρυπτογράφησης." -#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 -#: ../ssh/seahorse-ssh-operation.c:194 +#: ../pgp/seahorse-gpgme.c:74 ../pgp/seahorse-hkp-source.c:512 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The operation was cancelled" msgstr "Η λειτουργία ακυρώθηκε" @@ -985,49 +966,49 @@ msgid "Expiry: %s" msgstr "Λήξη: %s" -#: ../pgp/seahorse-gpgme-exporter.c:84 +#: ../pgp/seahorse-gpgme-exporter.c:85 msgid "Multiple Keys" msgstr "Πολλαπλά κλειδιά" -#: ../pgp/seahorse-gpgme-exporter.c:88 +#: ../pgp/seahorse-gpgme-exporter.c:89 msgid "Key Data" msgstr "Δεδομένα κλειδιού" -#: ../pgp/seahorse-gpgme-exporter.c:114 +#: ../pgp/seahorse-gpgme-exporter.c:117 msgid "Armored PGP keys" msgstr "Θωρακισμένα PGP κλειδιά" -#: ../pgp/seahorse-gpgme-exporter.c:118 +#: ../pgp/seahorse-gpgme-exporter.c:121 msgid "PGP keys" msgstr "Κλειδιά PGP" -#: ../pgp/seahorse-gpgme-generate.c:95 +#: ../pgp/seahorse-gpgme-generate.c:93 msgid "PGP Key" msgstr "Κλειδί PGP" -#: ../pgp/seahorse-gpgme-generate.c:96 +#: ../pgp/seahorse-gpgme-generate.c:94 msgid "Used to encrypt email and files" msgstr "Για κρυπτογράφηση ηλεκτρονικών μηνυμάτων και αρχείων" -#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pgp/seahorse-gpgme-generate.c:130 #: ../pkcs11/seahorse-pkcs11-generate.c:91 #: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:133 +#: ../pgp/seahorse-gpgme-generate.c:131 msgid "DSA ElGamal" msgstr "DSA Elgamal" -#: ../pgp/seahorse-gpgme-generate.c:182 +#: ../pgp/seahorse-gpgme-generate.c:180 msgid "Couldn't generate PGP key" msgstr "Αδύνατη η δημιουργία κλειδιού PGP" -#: ../pgp/seahorse-gpgme-generate.c:214 +#: ../pgp/seahorse-gpgme-generate.c:213 msgid "Passphrase for New PGP Key" msgstr "Συνθηματικό για νέο κλειδί PGP" -#: ../pgp/seahorse-gpgme-generate.c:215 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Enter the passphrase for your new key twice." msgstr "Εισάγετε το συνθηματικό για το νέο σας κλειδί δυο φορές." @@ -1076,42 +1057,42 @@ "Αυτή ήταν η τρίτη φορά που εισάγατε έναν λανθασμένο κωδικό πρόσβασης. " "Παρακαλώ προσπαθήστε ξανά." -#: ../pgp/seahorse-gpgme-keyring.c:91 +#: ../pgp/seahorse-gpgme-keyring.c:90 #, c-format msgid "Wrong passphrase." msgstr "Λανθασμένο συνθηματικό." -#: ../pgp/seahorse-gpgme-keyring.c:95 +#: ../pgp/seahorse-gpgme-keyring.c:94 #, c-format msgid "Enter new passphrase for '%s'" msgstr "Εισαγωγή νέου συνθηματικού για '%s'" -#: ../pgp/seahorse-gpgme-keyring.c:97 +#: ../pgp/seahorse-gpgme-keyring.c:96 #, c-format msgid "Enter passphrase for '%s'" msgstr "Εισαγωγή συνθηματικού για '%s'" -#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../pgp/seahorse-gpgme-keyring.c:99 #: ../src/seahorse-change-passphrase.xml.h:2 msgid "Enter new passphrase" msgstr "Εισαγωγή νέου συνθηματικού" -#: ../pgp/seahorse-gpgme-keyring.c:102 +#: ../pgp/seahorse-gpgme-keyring.c:101 msgid "Enter passphrase" msgstr "Εισαγωγή συνθηματικού" -#: ../pgp/seahorse-gpgme-keyring.c:107 +#: ../pgp/seahorse-gpgme-keyring.c:106 msgid "Passphrase" msgstr "Συνθηματικό" -#: ../pgp/seahorse-gpgme-keyring.c:308 +#: ../pgp/seahorse-gpgme-keyring.c:307 #, c-format msgid "Loaded %d key" msgid_plural "Loaded %d keys" msgstr[0] "Φορτώθηκε %d κλειδί" msgstr[1] "Φορτώθηκαν %d κλειδιά" -#: ../pgp/seahorse-gpgme-keyring.c:655 +#: ../pgp/seahorse-gpgme-keyring.c:654 msgid "" "Invalid key data (missing UIDs). This may be due to a computer with a date " "set in the future or a missing self-signature." @@ -1120,11 +1101,11 @@ "ενός υπολογιστή με ημερομηνία καθορισμένη σε μελλοντικό χρόνο ή λόγω " "απουσίας ιδιο-υπογραφής." -#: ../pgp/seahorse-gpgme-keyring.c:815 +#: ../pgp/seahorse-gpgme-keyring.c:807 msgid "GnuPG keys" msgstr "Κλειδιά GnuPG" -#: ../pgp/seahorse-gpgme-keyring.c:818 +#: ../pgp/seahorse-gpgme-keyring.c:813 msgid "GnuPG: default keyring directory" msgstr "GnuPG: προεπιλεγμένος κατάλογος κλειδιών" @@ -1163,7 +1144,7 @@ msgid "All JPEG files" msgstr "Όλα τα αρχεία JPEG" -#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:307 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:289 msgid "All files" msgstr "Όλα τα αρχεία" @@ -1289,65 +1270,65 @@ msgid "ElGamal" msgstr "ElGamal" -#: ../pgp/seahorse-hkp-source.c:604 +#: ../pgp/seahorse-hkp-source.c:530 #, c-format msgid "Search was not specific enough. Server '%s' found too many keys." msgstr "" "Ανεπαρκώς καθορισμένη αναζήτηση. Ο εξυπηρετητής '%s' βρήκε πάρα πολλά " "κλειδιά." -#: ../pgp/seahorse-hkp-source.c:607 +#: ../pgp/seahorse-hkp-source.c:533 #, c-format msgid "Couldn't communicate with server '%s': %s" msgstr "Αδύνατη η επικοινωνία με τον εξυπηρετητή '%s': %s" -#: ../pgp/seahorse-hkp-source.c:1127 +#: ../pgp/seahorse-hkp-source.c:1041 msgid "HTTP Key Server" msgstr "Eξυπηρετητής κλειδιών HTTP" -#: ../pgp/seahorse-keyserver-results.c:175 +#: ../pgp/seahorse-keyserver-results.c:168 msgid "Couldn't import keys" msgstr "Αδύνατη η εισαγωγή κλειδιών" -#: ../pgp/seahorse-keyserver-results.c:218 +#: ../pgp/seahorse-keyserver-results.c:211 msgid "Importing keys from key servers" msgstr "Εισαγωγή κλειδιών από εξυπηρετητές κλειδιών" #. TRANSLATORS: The "Remote" menu contains key operations on remote systems. -#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:507 +#: ../pgp/seahorse-keyserver-results.c:237 ../src/seahorse-key-manager.c:502 msgid "_Remote" msgstr "_Απομακρυσμένο" -#: ../pgp/seahorse-keyserver-results.c:246 +#: ../pgp/seahorse-keyserver-results.c:239 msgid "Close this window" msgstr "Κλείσιμο αυτού του παραθύρου" -#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:115 +#: ../pgp/seahorse-keyserver-results.c:243 ../pgp/seahorse-pgp-actions.c:113 msgid "_Find Remote Keys..." msgstr "_Εύρεση απομακρυσμένων κλειδιών..." -#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:116 +#: ../pgp/seahorse-keyserver-results.c:244 ../pgp/seahorse-pgp-actions.c:114 msgid "Search for keys on a key server" msgstr "Αναζήτηση για κλειδιά σε έναν εξυπηρετητή κλειδιών" -#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +#: ../pgp/seahorse-keyserver-results.c:248 ../src/seahorse-key-manager.xml.h:3 msgid "_Import" msgstr "Ε_ισαγωγή" -#: ../pgp/seahorse-keyserver-results.c:256 +#: ../pgp/seahorse-keyserver-results.c:249 msgid "Import selected keys to local key ring" msgstr "Εισαγωγή επιλεγμένων κλειδιών στην τοπική κλειδοθήκη" -#: ../pgp/seahorse-keyserver-results.c:286 +#: ../pgp/seahorse-keyserver-results.c:280 msgid "Remote Keys" msgstr "Απομακρυσμένα κλειδιά" -#: ../pgp/seahorse-keyserver-results.c:288 +#: ../pgp/seahorse-keyserver-results.c:282 #, c-format msgid "Remote Keys Containing '%s'" msgstr "Απομακρυσμένα κλειδιά που περιέχουν '%s'" -#: ../pgp/seahorse-keyserver-results.c:486 +#: ../pgp/seahorse-keyserver-results.c:485 msgid "The search for keys failed." msgstr "Απέτυχε η αναζήτηση για κλειδιά." @@ -1436,43 +1417,43 @@ msgid "_Sync" msgstr "_Συγχρονισμός" -#: ../pgp/seahorse-ldap-source.c:441 +#: ../pgp/seahorse-ldap-source.c:440 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "Αδύνατη η επικοινωνία με '%s': %s" -#: ../pgp/seahorse-ldap-source.c:652 +#: ../pgp/seahorse-ldap-source.c:651 #, c-format msgid "Connecting to: %s" msgstr "Σύνδεση στο: %s" -#: ../pgp/seahorse-ldap-source.c:658 +#: ../pgp/seahorse-ldap-source.c:657 #, c-format msgid "Couldn't resolve address: %s" msgstr "Αδύνατη η ανάλυση διεύθυνσης: %s" -#: ../pgp/seahorse-ldap-source.c:702 +#: ../pgp/seahorse-ldap-source.c:701 #, c-format msgid "Resolving server address: %s" msgstr "Γίνεται ανάλυση διεύθυνσης εξυπηρετητή: %s" -#: ../pgp/seahorse-ldap-source.c:1447 +#: ../pgp/seahorse-ldap-source.c:1438 msgid "LDAP Key Server" msgstr "Εξυπηρετητής κλειδιών LDAP" -#: ../pgp/seahorse-pgp-actions.c:120 +#: ../pgp/seahorse-pgp-actions.c:118 msgid "_Sync and Publish Keys..." msgstr "_Συγχρονισμός και δημοσίευση κλειδιών..." -#: ../pgp/seahorse-pgp-actions.c:121 +#: ../pgp/seahorse-pgp-actions.c:119 msgid "Publish and/or synchronize your keys with those online." msgstr "Δημοσίευση και/ή συγχρονισμός των κλειδιών σας με εκείνα του δικτύου." -#: ../pgp/seahorse-pgp-backend.c:172 +#: ../pgp/seahorse-pgp-backend.c:167 msgid "PGP Keys" msgstr "Κλειδιά PGP" -#: ../pgp/seahorse-pgp-backend.c:175 +#: ../pgp/seahorse-pgp-backend.c:173 msgid "PGP keys are for encrypting email or files" msgstr "" "Τα κλειδιά PGP είναι για κρυπτογράφηση ηλεκτρονικών μηνυμάτων και αρχείων" @@ -1492,13 +1473,13 @@ "χρήστες." #: ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "_Comment:" -msgstr "_Σχόλιο:" - -#: ../pgp/seahorse-pgp-generate.xml.h:8 msgid "Ne_ver Expires" msgstr "Δεν λήγει _ποτέ" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "_Comment:" +msgstr "_Σχόλιο:" + #: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "Τύπος _κρυπτογράφησης:" @@ -1519,142 +1500,148 @@ msgid "_Advanced key options" msgstr "_Προχωρημένες επιλογές κλειδιού" -#: ../pgp/seahorse-pgp-key.c:353 +#: ../pgp/seahorse-pgp-key.c:352 msgid "Personal PGP key" msgstr "Προσωπικό κλειδί PGP" -#: ../pgp/seahorse-pgp-key.c:355 +#: ../pgp/seahorse-pgp-key.c:354 msgid "PGP key" msgstr "Κλειδί PGP" -#: ../pgp/seahorse-pgp-key-properties.c:324 +#: ../pgp/seahorse-pgp-key-properties.c:322 msgid "Couldn't change primary user ID" msgstr "Αδυναμία αλλαγής κύριας ταυτότητας χρήστη" -#: ../pgp/seahorse-pgp-key-properties.c:343 +#: ../pgp/seahorse-pgp-key-properties.c:341 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "" "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε μόνιμα την ταυτότητα του χρήστη " "'%s';" -#: ../pgp/seahorse-pgp-key-properties.c:353 +#: ../pgp/seahorse-pgp-key-properties.c:351 msgid "Couldn't delete user ID" msgstr "Αδυναμία διαγραφής του αναγνωριστικού του χρήστη" -#: ../pgp/seahorse-pgp-key-properties.c:428 -#: ../pgp/seahorse-pgp-key-properties.c:1571 +#: ../pgp/seahorse-pgp-key-properties.c:426 +#: ../pgp/seahorse-pgp-key-properties.c:1569 msgid "[Unknown]" msgstr "[Άγνωστο]" -#: ../pgp/seahorse-pgp-key-properties.c:537 -#: ../pgp/seahorse-pgp-key-properties.c:1854 +#: ../pgp/seahorse-pgp-key-properties.c:535 +#: ../pgp/seahorse-pgp-key-properties.c:1852 msgid "Name/Email" msgstr "Όνομα/Ηλ. διεύθυνση" -#: ../pgp/seahorse-pgp-key-properties.c:544 +#: ../pgp/seahorse-pgp-key-properties.c:542 msgid "Signature ID" msgstr "Ταυτότητα υπογραφής" -#: ../pgp/seahorse-pgp-key-properties.c:677 +#: ../pgp/seahorse-pgp-key-properties.c:675 msgid "Couldn't change primary photo" msgstr "Αδύνατη η αλλαγή βασικής φωτογραφίας" #. TRANSLATORS: (unknown) expiry date -#: ../pgp/seahorse-pgp-key-properties.c:911 +#: ../pgp/seahorse-pgp-key-properties.c:909 msgid "(unknown)" msgstr "(άγνωστο)" -#: ../pgp/seahorse-pgp-key-properties.c:914 +#: ../pgp/seahorse-pgp-key-properties.c:912 #, c-format msgid "This key expired on: %s" msgstr "Αυτό το κλειδί έληξε: %s" -#: ../pgp/seahorse-pgp-key-properties.c:977 +#: ../pgp/seahorse-pgp-key-properties.c:975 msgid "Name" msgstr "Όνομα" -#: ../pgp/seahorse-pgp-key-properties.c:1090 +#: ../pgp/seahorse-pgp-key-properties.c:1088 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε το υποκλειδί %d του %s;" -#: ../pgp/seahorse-pgp-key-properties.c:1099 +#: ../pgp/seahorse-pgp-key-properties.c:1097 msgid "Couldn't delete subkey" msgstr "Αδύνατη η διαγραφή υποκλειδιού" -#: ../pgp/seahorse-pgp-key-properties.c:1139 -#: ../pgp/seahorse-pgp-key-properties.c:1545 +#: ../pgp/seahorse-pgp-key-properties.c:1137 +#: ../pgp/seahorse-pgp-key-properties.c:1543 msgid "Unable to change trust" msgstr "Αδύνατη η αλλαγή τύπου εμπιστοσύνης" -#: ../pgp/seahorse-pgp-key-properties.c:1153 -#: ../ssh/seahorse-ssh-key-properties.c:200 +#: ../pgp/seahorse-pgp-key-properties.c:1151 +#: ../ssh/seahorse-ssh-key-properties.c:206 msgid "Couldn't export key" msgstr "Αδυναμία εξαγωγής κλειδιού" -#: ../pgp/seahorse-pgp-key-properties.c:1267 +#: ../pgp/seahorse-pgp-key-properties.c:1265 msgid "Marginal" msgstr "Οριακά" -#: ../pgp/seahorse-pgp-key-properties.c:1273 +#: ../pgp/seahorse-pgp-key-properties.c:1271 msgid "Full" msgstr "Πλήρης" -#: ../pgp/seahorse-pgp-key-properties.c:1279 +#: ../pgp/seahorse-pgp-key-properties.c:1277 msgid "Ultimate" msgstr "Μέγιστη" -#: ../pgp/seahorse-pgp-key-properties.c:1385 -#: ../pgp/seahorse-pgp-key-properties.c:1474 +#: ../pgp/seahorse-pgp-key-properties.c:1383 +#: ../pgp/seahorse-pgp-key-properties.c:1472 msgctxt "Expires" msgid "Never" msgstr "Ποτέ" -#: ../pgp/seahorse-pgp-key-properties.c:1432 +#: ../pgp/seahorse-pgp-key-properties.c:1430 msgid "ID" msgstr "ID" -#: ../pgp/seahorse-pgp-key-properties.c:1435 +#: ../pgp/seahorse-pgp-key-properties.c:1433 msgid "Type" msgstr "Τύπος" -#: ../pgp/seahorse-pgp-key-properties.c:1438 +#: ../pgp/seahorse-pgp-key-properties.c:1436 msgid "Created" msgstr "Δημιουργήθηκε" -#: ../pgp/seahorse-pgp-key-properties.c:1441 +#: ../pgp/seahorse-pgp-key-properties.c:1439 msgid "Expires" msgstr "Λήγει" -#: ../pgp/seahorse-pgp-key-properties.c:1444 +#: ../pgp/seahorse-pgp-key-properties.c:1442 msgid "Status" msgstr "Κατάσταση" -#: ../pgp/seahorse-pgp-key-properties.c:1447 +#: ../pgp/seahorse-pgp-key-properties.c:1445 msgid "Strength" msgstr "Ισχύς" -#: ../pgp/seahorse-pgp-key-properties.c:1465 +#: ../pgp/seahorse-pgp-key-properties.c:1463 msgid "Revoked" msgstr "Ανακλήθηκε" -#: ../pgp/seahorse-pgp-key-properties.c:1467 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Expired" msgstr "Έληξε" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1467 msgid "Disabled" msgstr "Μη ενεργό" -#: ../pgp/seahorse-pgp-key-properties.c:1471 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Good" msgstr "Καλή" -#: ../pgp/seahorse-pgp-key-properties.c:1857 +#: ../pgp/seahorse-pgp-key-properties.c:1855 msgid "Key ID" msgstr "Ταυτότητα κλειδιού" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "Ιδιότητες κλειδιού" + #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 msgid "This key has been revoked" @@ -1796,8 +1783,8 @@ msgstr "Τροποποίηση ε_μπιστοσύνης ιδιοκτήτη:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 -msgid "_Export Complete Key:" -msgstr "Ε_ξαγωγή πλήρους κλειδιού:" +msgid "_Export Secret Key:" +msgstr "Ε_ξαγωγή Μυστικού Κλειδιού:" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "Actions" @@ -2058,28 +2045,28 @@ msgid "Unavailable" msgstr "Μη διαθέσιμο" -#: ../pkcs11/seahorse-certificate.c:441 -msgid "Personal certificate and key" -msgstr "Προσωπικό πιστοποιητικό και κλειδί" - -#: ../pkcs11/seahorse-certificate.c:444 -msgid "Personal certificate" -msgstr "Προσωπικό πιστοποιητικό" - -#: ../pkcs11/seahorse-certificate.c:446 -#: ../pkcs11/seahorse-certificate-der-exporter.c:77 +#: ../pkcs11/certificate-der-exporter.vala:46 +#: ../pkcs11/seahorse-certificate.c:454 msgid "Certificate" msgstr "Πιστοποίηση" -#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +#: ../pkcs11/certificate-der-exporter.vala:60 msgid "Certificates (DER encoded)" msgstr "Πιστοποιητικά (DER κωδικοποιημένα)" +#: ../pkcs11/seahorse-certificate.c:449 +msgid "Personal certificate and key" +msgstr "Προσωπικό πιστοποιητικό και κλειδί" + +#: ../pkcs11/seahorse-certificate.c:452 +msgid "Personal certificate" +msgstr "Προσωπικό πιστοποιητικό" + #: ../pkcs11/seahorse-pkcs11-backend.c:183 msgid "Certificates" msgstr "Πιστοποιητικά" -#: ../pkcs11/seahorse-pkcs11-backend.c:186 +#: ../pkcs11/seahorse-pkcs11-backend.c:189 msgid "X.509 certificates and related keys" msgstr "X.509 πιστοποιητικά και συναφή κλειδιά" @@ -2097,12 +2084,12 @@ msgstr "Αδύνατη η δημιουργία ιδωτικού κλειδιού" #: ../pkcs11/seahorse-pkcs11-generate.c:413 -#: ../pkcs11/seahorse-pkcs11-request.c:255 +#: ../pkcs11/seahorse-pkcs11-request.c:253 msgid "Create" msgstr "Δημιουργία" #: ../pkcs11/seahorse-pkcs11-generate.c:506 -#: ../pkcs11/seahorse-private-key.c:176 +#: ../pkcs11/seahorse-private-key.c:175 msgid "Private key" msgstr "Ιδιωτικό κλειδί" @@ -2126,56 +2113,56 @@ msgid "I understand that this key will be permanently deleted." msgstr "Κατανοώ πως αυτό το κλειδί θα διαγραφεί οριστικά." -#: ../pkcs11/seahorse-pkcs11-properties.c:146 -#: ../pkcs11/seahorse-pkcs11-properties.c:150 +#: ../pkcs11/seahorse-pkcs11-properties.c:143 +#: ../pkcs11/seahorse-pkcs11-properties.c:147 msgid "Unnamed" msgstr "Ανώνυμο" -#: ../pkcs11/seahorse-pkcs11-properties.c:174 +#: ../pkcs11/seahorse-pkcs11-properties.c:171 msgid "Failed to export certificate" msgstr "Αποτυχία εξαγωγής πιστοποιητικού" -#: ../pkcs11/seahorse-pkcs11-properties.c:189 ../src/seahorse-sidebar.c:884 +#: ../pkcs11/seahorse-pkcs11-properties.c:186 ../src/seahorse-sidebar.c:874 msgid "Couldn't delete" msgstr "Αδυναμία διαγραφής" -#: ../pkcs11/seahorse-pkcs11-properties.c:230 +#: ../pkcs11/seahorse-pkcs11-properties.c:227 msgid "_Export" msgstr "_Εξαγωγή" -#: ../pkcs11/seahorse-pkcs11-properties.c:231 +#: ../pkcs11/seahorse-pkcs11-properties.c:228 msgid "Export the certificate" msgstr "Εξαγωγή πιστοποιητικού" -#: ../pkcs11/seahorse-pkcs11-properties.c:233 +#: ../pkcs11/seahorse-pkcs11-properties.c:230 msgid "Delete this certificate or key" msgstr "Διαγραφή αυτού του πιστοποιητικού ή κλειδιού" -#: ../pkcs11/seahorse-pkcs11-properties.c:234 +#: ../pkcs11/seahorse-pkcs11-properties.c:231 msgid "Request _Certificate" msgstr "Αίτηση πι_στοποιητικού" -#: ../pkcs11/seahorse-pkcs11-properties.c:235 +#: ../pkcs11/seahorse-pkcs11-properties.c:232 msgid "Create a certificate request file for this key" msgstr "Δημιουργία αίτησης πιστοποιητικού για αυτό το κλειδί" -#: ../pkcs11/seahorse-pkcs11-request.c:103 +#: ../pkcs11/seahorse-pkcs11-request.c:101 msgid "Couldn't save certificate request" msgstr "Αδυναμία αποθήκευσης αίτησης πιστοποιητικού" -#: ../pkcs11/seahorse-pkcs11-request.c:126 +#: ../pkcs11/seahorse-pkcs11-request.c:124 msgid "Save certificate request" msgstr "Αποθήκευση αίτησης πιστοποιητικού" -#: ../pkcs11/seahorse-pkcs11-request.c:137 +#: ../pkcs11/seahorse-pkcs11-request.c:135 msgid "Certificate request" msgstr "Αίτηση πιστοποίησης" -#: ../pkcs11/seahorse-pkcs11-request.c:145 +#: ../pkcs11/seahorse-pkcs11-request.c:143 msgid "PEM encoded request" msgstr "Κωδικοποιημένο αίτημα PEM" -#: ../pkcs11/seahorse-pkcs11-request.c:193 +#: ../pkcs11/seahorse-pkcs11-request.c:191 msgid "Couldn't create certificate request" msgstr "Αδυναμία δημιουργίας αίτησης πιστοποιητικού" @@ -2191,11 +2178,11 @@ msgid "Name (CN):" msgstr "Όνομα (CN):" -#: ../pkcs11/seahorse-private-key.c:129 +#: ../pkcs11/seahorse-private-key.c:128 msgid "Unnamed private key" msgstr "Ανώνυμο ιδιωτικό κλειδί" -#: ../pkcs11/seahorse-token.c:576 +#: ../pkcs11/seahorse-token.c:574 msgctxt "Label" msgid "Unknown" msgstr "Άγνωστο" @@ -2232,103 +2219,103 @@ msgid "_Select the type of item to create:" msgstr "_Επιλέξτε τον τύπο του στοιχείου για δημιουργία:" -#: ../src/seahorse-import-dialog.c:98 +#: ../src/seahorse-import-dialog.c:97 msgid "Import failed" msgstr "Η εισαγωγή απέτυχε" -#: ../src/seahorse-import-dialog.c:116 +#: ../src/seahorse-import-dialog.c:115 msgid "Import" msgstr "Εισαγωγή" -#: ../src/seahorse-import-dialog.c:129 +#: ../src/seahorse-import-dialog.c:128 msgid "Data to be imported:" msgstr "Δεδομένα προς εισαγωγή:" -#: ../src/seahorse-key-manager.c:261 ../ssh/seahorse-ssh-operation.c:845 +#: ../src/seahorse-key-manager.c:243 ../ssh/seahorse-ssh-operation.c:870 msgid "Import Key" msgstr "Εισαγωγή κλειδιού" -#: ../src/seahorse-key-manager.c:273 +#: ../src/seahorse-key-manager.c:255 msgid "All key files" msgstr "Όλα τα αρχεία κλειδιών" -#: ../src/seahorse-key-manager.c:374 +#: ../src/seahorse-key-manager.c:356 msgid "Dropped text" msgstr "Παραλειπόμενο κείμενο" -#: ../src/seahorse-key-manager.c:397 +#: ../src/seahorse-key-manager.c:392 msgid "Clipboard text" msgstr "Πρόχειρο κείμενο" -#: ../src/seahorse-key-manager.c:508 +#: ../src/seahorse-key-manager.c:503 msgid "_New" msgstr "_Νέο" -#: ../src/seahorse-key-manager.c:510 +#: ../src/seahorse-key-manager.c:505 msgid "Close this program" msgstr "Κλείσιμο προγράμματος" -#: ../src/seahorse-key-manager.c:511 ../src/seahorse-key-manager.c:513 +#: ../src/seahorse-key-manager.c:506 ../src/seahorse-key-manager.c:508 msgid "_New..." msgstr "_Νέο..." -#: ../src/seahorse-key-manager.c:512 +#: ../src/seahorse-key-manager.c:507 msgid "Create a new key or item" msgstr "Δημιουργία νέου κλειδιού ή αντικειμένου" -#: ../src/seahorse-key-manager.c:514 +#: ../src/seahorse-key-manager.c:509 msgid "Add a new key or item" msgstr "Προσθέστε ένα νέο κλειδί ή αντικείμενο" -#: ../src/seahorse-key-manager.c:515 +#: ../src/seahorse-key-manager.c:510 msgid "_Import..." msgstr "Ε_ισαγωγή..." -#: ../src/seahorse-key-manager.c:516 +#: ../src/seahorse-key-manager.c:511 msgid "Import from a file" msgstr "Εισαγωγή από αρχείο" -#: ../src/seahorse-key-manager.c:518 +#: ../src/seahorse-key-manager.c:513 msgid "Import from the clipboard" msgstr "Εισαγωγή από το πρόχειρο" -#: ../src/seahorse-key-manager.c:522 -msgid "By _keyring" -msgstr "Κατά _κλειδοθήκη" +#: ../src/seahorse-key-manager.c:517 +msgid "By _Keyring" +msgstr "Κατά _Κλειδοθήκη" -#: ../src/seahorse-key-manager.c:523 +#: ../src/seahorse-key-manager.c:518 msgid "Show sidebar listing keyrings" msgstr "Εμφάνιση της πλευρικής στήλης κλειδοθηκών" -#: ../src/seahorse-key-manager.c:527 -msgid "Show _personal" -msgstr "Προβολή _προσωπικά" +#: ../src/seahorse-key-manager.c:522 +msgid "Show _Personal" +msgstr "Εμφάνιση _Προσωπικών" -#: ../src/seahorse-key-manager.c:528 +#: ../src/seahorse-key-manager.c:523 msgid "Only show personal keys, certificates and passwords" msgstr "" "Εμφάνισε μόνο τα προσωπικά κλειδιά, τις πιστοποιήσεις και τους κωδικούς " "πρόσβασης" -#: ../src/seahorse-key-manager.c:529 -msgid "Show _trusted" -msgstr "Εμφάνισε _αξιόπιστα" +#: ../src/seahorse-key-manager.c:524 +msgid "Show _Trusted" +msgstr "Εμφάνιση _Αξιόπιστων" -#: ../src/seahorse-key-manager.c:530 +#: ../src/seahorse-key-manager.c:525 msgid "Only show trusted keys, certificates and passwords" msgstr "" "Εμφάνισε μόνο τα αξιόπιστα κλειδιά, τις πιστοποιήσεις και τους κωδικούς " "πρόσβασης" -#: ../src/seahorse-key-manager.c:531 -msgid "Show _any" -msgstr "Εμφάνισε _οποιοδήποτε" +#: ../src/seahorse-key-manager.c:526 +msgid "Show _Any" +msgstr "Εμφάνιση _Οποιουδήποτε" -#: ../src/seahorse-key-manager.c:532 +#: ../src/seahorse-key-manager.c:527 msgid "Show all keys, certificates and passwords" msgstr "Εμφάνισε όλα τα κλειδιά, τις πιστοποιήσεις και τους κωδικούς πρόσβασης" -#: ../src/seahorse-key-manager.c:736 +#: ../src/seahorse-key-manager.c:746 msgid "Filter" msgstr "Φίλτρο" @@ -2348,31 +2335,31 @@ msgid "To get started with encryption you will need keys." msgstr "Για να ξεκινήσετε με κρυπτογράφηση θα χρειαστείτε κλειδιά." -#: ../src/seahorse-sidebar.c:808 +#: ../src/seahorse-sidebar.c:798 msgid "Couldn't lock" msgstr "Αδυναμία κλειδώματος" -#: ../src/seahorse-sidebar.c:845 +#: ../src/seahorse-sidebar.c:835 msgid "Couldn't unlock" msgstr "Αδυναμία ξεκλειδώματος" -#: ../src/seahorse-sidebar.c:953 +#: ../src/seahorse-sidebar.c:942 msgid "_Lock" msgstr "_Κλείδωμα" -#: ../src/seahorse-sidebar.c:958 +#: ../src/seahorse-sidebar.c:947 msgid "_Unlock" msgstr "_Ξεκλείδωμα" -#: ../src/seahorse-sidebar.c:977 +#: ../src/seahorse-sidebar.c:966 msgid "_Properties" msgstr "_Ιδιότητες" -#: ../ssh/seahorse-ssh-actions.c:100 +#: ../ssh/seahorse-ssh-actions.c:98 msgid "Configure Key for _Secure Shell..." msgstr "Ρύθμιση κλειδιού για α_σφαλές κέλυφος..." -#: ../ssh/seahorse-ssh-actions.c:101 +#: ../ssh/seahorse-ssh-actions.c:99 msgid "" "Send public Secure Shell key to another machine, and enable logins using " "that key." @@ -2380,38 +2367,38 @@ "Αποστολή δημόσιου κλειδιού ασφαλούς κελύφους σε άλλο σύστημα και " "ενεργοποίηση συνδέσεων με χρήση αυτού του κλειδιού." -#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 +#: ../ssh/seahorse-ssh-askpass.c:80 ../ssh/seahorse-ssh-askpass.c:88 msgid "Enter your Secure Shell passphrase:" msgstr "Εισάγετε το συνθηματικό σας Secure Shell (SSH):" -#: ../ssh/seahorse-ssh-askpass.c:82 +#: ../ssh/seahorse-ssh-askpass.c:102 msgid "Old Key Passphrase" msgstr "Παλιό συνθηματικό κλειδιού" -#: ../ssh/seahorse-ssh-askpass.c:83 +#: ../ssh/seahorse-ssh-askpass.c:103 #, c-format msgid "Enter the old passphrase for: %s" msgstr "Εισαγωγή παλιού συνθηματικού για: %s" -#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 +#: ../ssh/seahorse-ssh-askpass.c:107 ../ssh/seahorse-ssh-askpass.c:112 msgid "New Key Passphrase" msgstr "Νέο συνθηματικό κλειδιού" -#: ../ssh/seahorse-ssh-askpass.c:88 +#: ../ssh/seahorse-ssh-askpass.c:108 #, c-format msgid "Enter the new passphrase for: %s" msgstr "Εισαγωγή νέου συνθηματικού για: %s" -#: ../ssh/seahorse-ssh-askpass.c:93 +#: ../ssh/seahorse-ssh-askpass.c:113 #, c-format msgid "Enter the new passphrase again: %s" msgstr "Εισάγετε ξανά το νέο συνθηματικό: %s" -#: ../ssh/seahorse-ssh-backend.c:91 +#: ../ssh/seahorse-ssh-backend.c:89 msgid "Secure Shell" msgstr "Ασφαλές κέλυφος" -#: ../ssh/seahorse-ssh-backend.c:94 +#: ../ssh/seahorse-ssh-backend.c:95 msgid "Keys used to connect securely to other computers" msgstr "" "Τα κλειδιά χρησιμοποιούνται για να συνδέεστε με ασφάλεια σε άλλους " @@ -2432,36 +2419,36 @@ msgstr[1] "" "Είστε σίγουροι ότι επιθυμείτε να διαγράψετε τα %d κλειδιά ασφαλούς κελύφους;" -#: ../ssh/seahorse-ssh-exporter.c:92 -msgid "Ssh Key" -msgstr "Κλειδί Ssh" +#: ../ssh/seahorse-ssh-exporter.c:93 +msgid "SSH Key" +msgstr "Κλειδί SSH" -#: ../ssh/seahorse-ssh-exporter.c:122 +#: ../ssh/seahorse-ssh-exporter.c:125 msgid "Secret SSH keys" msgstr "Μυστικά κλειδιά SSH" -#: ../ssh/seahorse-ssh-exporter.c:126 +#: ../ssh/seahorse-ssh-exporter.c:129 msgid "Public SSH keys" msgstr "Δημόσια κλειδιά SSH" -#: ../ssh/seahorse-ssh-exporter.c:290 +#: ../ssh/seahorse-ssh-exporter.c:298 msgid "No public key file is available for this key." msgstr "Δεν υπάρχει διαθέσιμο δημόσιο αρχείο κλειδιού για αυτό το κλειδί." -#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:112 -#: ../ssh/seahorse-ssh-key.c:116 ../ssh/seahorse-ssh-key-properties.xml.h:4 +#: ../ssh/seahorse-ssh-generate.c:53 ../ssh/seahorse-ssh-key.c:110 +#: ../ssh/seahorse-ssh-key.c:114 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "Κλειδί Secure Shell" -#: ../ssh/seahorse-ssh-generate.c:56 +#: ../ssh/seahorse-ssh-generate.c:54 msgid "Used to access other computers (eg: via a terminal)" msgstr "Για πρόσβαση σε άλλους υπολογιστές (π.χ. μέσω τερματικού)" -#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 +#: ../ssh/seahorse-ssh-generate.c:108 ../ssh/seahorse-ssh-generate.c:124 msgid "Couldn't generate Secure Shell key" msgstr "Αδύνατη η δημιουργία κλειδιού SSH" -#: ../ssh/seahorse-ssh-generate.c:192 +#: ../ssh/seahorse-ssh-generate.c:191 msgid "Creating Secure Shell Key" msgstr "Δημιουργία κλειδιού Secure Shell" @@ -2502,15 +2489,15 @@ "το κλειδί, μπορείτε τώρα να ρυθμίσετε τον υπολογιστή αυτό ώστε να " "αναγνωρίζει το κλειδί σας." -#: ../ssh/seahorse-ssh-key.c:108 +#: ../ssh/seahorse-ssh-key.c:106 msgid "(Unreadable Secure Shell Key)" msgstr "(Μη αναγνώσιμο κλειδί Secure Shell/SSH)" -#: ../ssh/seahorse-ssh-key.c:216 +#: ../ssh/seahorse-ssh-key.c:214 msgid "Personal SSH key" msgstr "Προσωπικό SSH κλειδί" -#: ../ssh/seahorse-ssh-key.c:218 +#: ../ssh/seahorse-ssh-key.c:216 msgid "SSH key" msgstr "Αρχείο SSH" @@ -2518,11 +2505,11 @@ msgid "Couldn't rename key." msgstr "Αδύνατη η μετονομασία κλειδιού." -#: ../ssh/seahorse-ssh-key-properties.c:133 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Αδύνατη η αλλαγή εξουσιοδότησης για το κλειδί." -#: ../ssh/seahorse-ssh-key-properties.c:168 +#: ../ssh/seahorse-ssh-key-properties.c:172 msgid "Couldn't change passphrase for key." msgstr "Αδύνατη η αλλαγή του συνθηματικού για το κλειδί." @@ -2563,45 +2550,45 @@ msgid "E_xport Complete Key" msgstr "Ε_ξαγωγή ολόκληρου κλειδιού" -#: ../ssh/seahorse-ssh-operation.c:199 +#: ../ssh/seahorse-ssh-operation.c:204 msgid "The SSH command was terminated unexpectedly." msgstr "Η εντολή SSH τερματίστηκε απρόσμενα." -#: ../ssh/seahorse-ssh-operation.c:209 +#: ../ssh/seahorse-ssh-operation.c:214 msgid "The SSH command failed." msgstr "Η εντολή SSH απέτυχε." -#: ../ssh/seahorse-ssh-operation.c:502 +#: ../ssh/seahorse-ssh-operation.c:523 msgid "Remote Host Password" msgstr "Κωδικός πρόσβασης απομακρυσμένου συστήματος" -#: ../ssh/seahorse-ssh-operation.c:588 +#: ../ssh/seahorse-ssh-operation.c:610 msgid "Enter Key Passphrase" msgstr "Εισαγωγή συνθηματικού κλειδιού" -#: ../ssh/seahorse-ssh-operation.c:678 +#: ../ssh/seahorse-ssh-operation.c:701 msgid "Passphrase for New Secure Shell Key" msgstr "Συνθηματικό για νέο κλειδί Secure Shell (SSH)" -#: ../ssh/seahorse-ssh-operation.c:862 +#: ../ssh/seahorse-ssh-operation.c:887 #, c-format msgid "Importing key: %s" msgstr "Εισαγωγή κλειδιού: %s" -#: ../ssh/seahorse-ssh-operation.c:864 +#: ../ssh/seahorse-ssh-operation.c:889 msgid "Importing key. Enter passphrase" msgstr "Εισαγωγή κλειδιού. Εισάγετε το συνθηματικό σας" -#: ../ssh/seahorse-ssh-source.c:232 +#: ../ssh/seahorse-ssh-source.c:223 msgid "OpenSSH keys" msgstr "Κλειδιά OpenSSH" -#: ../ssh/seahorse-ssh-source.c:235 +#: ../ssh/seahorse-ssh-source.c:230 #, c-format msgid "OpenSSH: %s" msgstr "OpenSSH: %s" -#: ../ssh/seahorse-ssh-source.c:940 +#: ../ssh/seahorse-ssh-source.c:978 msgid "No private key file is available for this key." msgstr "Δεν υπάρχει διαθέσιμο αρχείο προσωπικού κλειδιού για αυτό το κλειδί." @@ -2632,17 +2619,32 @@ msgstr "π.χ: fileserver.example.com:port" #: ../ssh/seahorse-ssh-upload.xml.h:5 -msgid "_Computer Name:" -msgstr "Όνομα _υπολογιστή:" +msgid "_Server address:" +msgstr "Διεύθυνση _Διακομιστή:" #: ../ssh/seahorse-ssh-upload.xml.h:6 -msgid "_Login Name:" +msgid "_Login name:" msgstr "Όνομα ει_σόδου:" #: ../ssh/seahorse-ssh-upload.xml.h:7 msgid "_Set Up" msgstr "_Ρύθμιση" +#~ msgid "Updating password" +#~ msgstr "Γίνεται ενημέρωση του κωδικού" + +#~ msgid "Keyring Properties" +#~ msgstr "Ιδιότητες κλειδοθήκης" + +#~ msgid "%Y-%m-%d" +#~ msgstr "%Y-%m-%d" + +#~ msgid "Ssh Key" +#~ msgstr "Κλειδί Ssh" + +#~ msgid "_Computer Name:" +#~ msgstr "Όνομα _υπολογιστή:" + #~ msgid "Password:" #~ msgstr "Κωδικός πρόσβασης:" diff -Nru seahorse-3.10.1/po/pt_BR.po seahorse-3.10.2/po/pt_BR.po --- seahorse-3.10.1/po/pt_BR.po 2013-10-14 11:37:50.000000000 +0000 +++ seahorse-3.10.2/po/pt_BR.po 2014-01-08 15:06:15.000000000 +0000 @@ -20,16 +20,16 @@ "Project-Id-Version: seahorse\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-09-24 09:34+0000\n" -"PO-Revision-Date: 2013-09-24 07:53-0300\n" -"Last-Translator: Enrico Nicoletto \n" +"POT-Creation-Date: 2013-12-19 16:21+0000\n" +"PO-Revision-Date: 2013-12-22 22:43-0300\n" +"Last-Translator: Fábio Nogueira \n" "Language-Team: Brazilian Portuguese \n" "Language: pt\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" -"X-Generator: Poedit 1.5.7\n" +"X-Generator: Poedit 1.5.4\n" "X-Project-Style: gnome\n" #: ../common/catalog.vala:259 @@ -46,12 +46,12 @@ msgstr "" "Fábio Rafael da Rosa \n" "Max Reinhold Jahnke \n" -"Raphael Higino \n" +"Raphael Higino (In memoriam) \n" "Luiz Armesto \n" "Djavan Fagundes \n" "Leonardo Ferreira Fontenelle \n" "Henrique P. Machado \n" -"André Gondim \n" +"André Gondim (In memoriam) \n" "Carlos José Pereira \n" "Antonio Fernandes C. Neto \n" "Rafael Ferreira " @@ -398,7 +398,7 @@ msgstr "Mostrar _senha" #: ../gkr/seahorse-gkr-item-properties.xml.h:8 -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:119 msgid "Password:" msgstr "Senha:" @@ -789,7 +789,7 @@ # Grau de confiança no dono dessa chave (se ele confere direito as chaves # dos outros antes de assinar.) #: ../libseahorse/seahorse-validity.c:40 -#: ../pgp/seahorse-pgp-key-properties.c:1252 +#: ../pgp/seahorse-pgp-key-properties.c:1254 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:1 msgctxt "Validity" @@ -798,7 +798,7 @@ # Validade da chave #: ../libseahorse/seahorse-validity.c:42 -#: ../pgp/seahorse-pgp-key-properties.c:1258 +#: ../pgp/seahorse-pgp-key-properties.c:1260 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:2 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:2 msgctxt "Validity" @@ -953,7 +953,7 @@ "descriptografia." #: ../pgp/seahorse-gpgme.c:74 ../pgp/seahorse-hkp-source.c:512 -#: ../ssh/seahorse-ssh-operation.c:194 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The operation was cancelled" msgstr "A operação foi cancelada" @@ -1012,16 +1012,16 @@ msgid "Couldn't generate PGP key" msgstr "Não foi possível gerar chave PGP" -#: ../pgp/seahorse-gpgme-generate.c:212 +#: ../pgp/seahorse-gpgme-generate.c:213 msgid "Passphrase for New PGP Key" msgstr "Frase secreta para nova chave PGP" -#: ../pgp/seahorse-gpgme-generate.c:213 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Enter the passphrase for your new key twice." msgstr "Digite a frase secreta para a sua nova chave duas vezes." #. Has line breaks because GtkLabel is completely broken WRT wrapping -#: ../pgp/seahorse-gpgme-generate.c:224 +#: ../pgp/seahorse-gpgme-generate.c:226 msgid "" "When creating a key we need to generate a lot of\n" "random data and we need you to help. It's a good\n" @@ -1036,7 +1036,7 @@ "Isto fornece ao sistema os dados aleatórios que são\n" "necessários." -#: ../pgp/seahorse-gpgme-generate.c:229 +#: ../pgp/seahorse-gpgme-generate.c:231 #: ../pkcs11/seahorse-pkcs11-generate.c:459 msgid "Generating key" msgstr "Gerando a chave" @@ -1526,12 +1526,12 @@ msgstr "Não foi possível excluir a id de usuário" #: ../pgp/seahorse-pgp-key-properties.c:426 -#: ../pgp/seahorse-pgp-key-properties.c:1569 +#: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[Desconhecido]" #: ../pgp/seahorse-pgp-key-properties.c:535 -#: ../pgp/seahorse-pgp-key-properties.c:1852 +#: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "Nome/E-mail" @@ -1568,79 +1568,79 @@ msgstr "Não foi possível excluir a subchave" #: ../pgp/seahorse-pgp-key-properties.c:1137 -#: ../pgp/seahorse-pgp-key-properties.c:1543 +#: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "Não foi possível alterar a confiança" #: ../pgp/seahorse-pgp-key-properties.c:1151 -#: ../ssh/seahorse-ssh-key-properties.c:200 +#: ../ssh/seahorse-ssh-key-properties.c:206 msgid "Couldn't export key" msgstr "Não foi possível exportar a chave" # Validade da chave -#: ../pgp/seahorse-pgp-key-properties.c:1265 +#: ../pgp/seahorse-pgp-key-properties.c:1267 msgid "Marginal" msgstr "Marginal" # Validade da chave -#: ../pgp/seahorse-pgp-key-properties.c:1271 +#: ../pgp/seahorse-pgp-key-properties.c:1273 msgid "Full" msgstr "Completa" # Validade da chave -#: ../pgp/seahorse-pgp-key-properties.c:1277 +#: ../pgp/seahorse-pgp-key-properties.c:1279 msgid "Ultimate" msgstr "Plena" -#: ../pgp/seahorse-pgp-key-properties.c:1383 -#: ../pgp/seahorse-pgp-key-properties.c:1472 +#: ../pgp/seahorse-pgp-key-properties.c:1385 +#: ../pgp/seahorse-pgp-key-properties.c:1474 msgctxt "Expires" msgid "Never" msgstr "Nunca" -#: ../pgp/seahorse-pgp-key-properties.c:1430 +#: ../pgp/seahorse-pgp-key-properties.c:1432 msgid "ID" msgstr "ID" -#: ../pgp/seahorse-pgp-key-properties.c:1433 +#: ../pgp/seahorse-pgp-key-properties.c:1435 msgid "Type" msgstr "Tipo" -#: ../pgp/seahorse-pgp-key-properties.c:1436 +#: ../pgp/seahorse-pgp-key-properties.c:1438 msgid "Created" msgstr "Criado" -#: ../pgp/seahorse-pgp-key-properties.c:1439 +#: ../pgp/seahorse-pgp-key-properties.c:1441 msgid "Expires" msgstr "Expira" -#: ../pgp/seahorse-pgp-key-properties.c:1442 +#: ../pgp/seahorse-pgp-key-properties.c:1444 msgid "Status" msgstr "Estado" -#: ../pgp/seahorse-pgp-key-properties.c:1445 +#: ../pgp/seahorse-pgp-key-properties.c:1447 msgid "Strength" msgstr "Força" # Validade da chave -#: ../pgp/seahorse-pgp-key-properties.c:1463 +#: ../pgp/seahorse-pgp-key-properties.c:1465 msgid "Revoked" msgstr "Revogada" -#: ../pgp/seahorse-pgp-key-properties.c:1465 +#: ../pgp/seahorse-pgp-key-properties.c:1467 msgid "Expired" msgstr "Expirada" # Validade da chave -#: ../pgp/seahorse-pgp-key-properties.c:1467 +#: ../pgp/seahorse-pgp-key-properties.c:1469 msgid "Disabled" msgstr "Desabilitado" -#: ../pgp/seahorse-pgp-key-properties.c:1469 +#: ../pgp/seahorse-pgp-key-properties.c:1471 msgid "Good" msgstr "Bom" -#: ../pgp/seahorse-pgp-key-properties.c:1855 +#: ../pgp/seahorse-pgp-key-properties.c:1857 msgid "Key ID" msgstr "ID da chave" @@ -2221,7 +2221,7 @@ msgid "keyring;encryption;security;sign;ssh;" msgstr "chaveiro;criptografia;segurança;assinar;ssh;" -#: ../src/seahorse-generate-select.c:228 +#: ../src/seahorse-generate-select.c:229 msgid "Continue" msgstr "Continuar" @@ -2241,7 +2241,7 @@ msgid "Data to be imported:" msgstr "Dados a serem importados:" -#: ../src/seahorse-key-manager.c:243 ../ssh/seahorse-ssh-operation.c:845 +#: ../src/seahorse-key-manager.c:243 ../ssh/seahorse-ssh-operation.c:870 msgid "Import Key" msgstr "Importar chave" @@ -2374,29 +2374,29 @@ "Envia chave pública de SSH para outra máquina e habilita seu uso para " "iniciar sessões de SSH." -#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 +#: ../ssh/seahorse-ssh-askpass.c:80 ../ssh/seahorse-ssh-askpass.c:88 msgid "Enter your Secure Shell passphrase:" msgstr "Digite sua frase secreta do SSH:" -#: ../ssh/seahorse-ssh-askpass.c:82 +#: ../ssh/seahorse-ssh-askpass.c:102 msgid "Old Key Passphrase" msgstr "Frase secreta antiga" -#: ../ssh/seahorse-ssh-askpass.c:83 +#: ../ssh/seahorse-ssh-askpass.c:103 #, c-format msgid "Enter the old passphrase for: %s" msgstr "Digite a frase secreta antiga para: %s" -#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 +#: ../ssh/seahorse-ssh-askpass.c:107 ../ssh/seahorse-ssh-askpass.c:112 msgid "New Key Passphrase" msgstr "Nova frase secreta" -#: ../ssh/seahorse-ssh-askpass.c:88 +#: ../ssh/seahorse-ssh-askpass.c:108 #, c-format msgid "Enter the new passphrase for: %s" msgstr "Digite a nova frase secreta para: %s" -#: ../ssh/seahorse-ssh-askpass.c:93 +#: ../ssh/seahorse-ssh-askpass.c:113 #, c-format msgid "Enter the new passphrase again: %s" msgstr "Digite a nova frase secreta novemente: %s" @@ -2450,7 +2450,7 @@ msgid "Couldn't generate Secure Shell key" msgstr "Não foi possível gerar chave de SSH" -#: ../ssh/seahorse-ssh-generate.c:190 +#: ../ssh/seahorse-ssh-generate.c:191 msgid "Creating Secure Shell Key" msgstr "Criando chave de SSH" @@ -2504,11 +2504,11 @@ msgid "Couldn't rename key." msgstr "Não foi possível renomear a chave." -#: ../ssh/seahorse-ssh-key-properties.c:133 +#: ../ssh/seahorse-ssh-key-properties.c:135 msgid "Couldn't change authorization for key." msgstr "Não foi possível alterar a autorização para chave." -#: ../ssh/seahorse-ssh-key-properties.c:168 +#: ../ssh/seahorse-ssh-key-properties.c:172 msgid "Couldn't change passphrase for key." msgstr "Não foi possível alterar a frase secreta para a chave." @@ -2547,32 +2547,32 @@ msgid "E_xport Complete Key" msgstr "E_xportar chave completa" -#: ../ssh/seahorse-ssh-operation.c:199 +#: ../ssh/seahorse-ssh-operation.c:204 msgid "The SSH command was terminated unexpectedly." msgstr "O comando SSH terminou inesperadamente." -#: ../ssh/seahorse-ssh-operation.c:209 +#: ../ssh/seahorse-ssh-operation.c:214 msgid "The SSH command failed." msgstr "O comando SSH falhou." -#: ../ssh/seahorse-ssh-operation.c:502 +#: ../ssh/seahorse-ssh-operation.c:523 msgid "Remote Host Password" msgstr "Senha da rede remota" -#: ../ssh/seahorse-ssh-operation.c:588 +#: ../ssh/seahorse-ssh-operation.c:610 msgid "Enter Key Passphrase" msgstr "Digite a frase secreta" -#: ../ssh/seahorse-ssh-operation.c:678 +#: ../ssh/seahorse-ssh-operation.c:701 msgid "Passphrase for New Secure Shell Key" msgstr "Frase secreta para nova chave de SSH" -#: ../ssh/seahorse-ssh-operation.c:862 +#: ../ssh/seahorse-ssh-operation.c:887 #, c-format msgid "Importing key: %s" msgstr "Importando chave: %s" -#: ../ssh/seahorse-ssh-operation.c:864 +#: ../ssh/seahorse-ssh-operation.c:889 msgid "Importing key. Enter passphrase" msgstr "Importando chave. Digite a frase secreta" @@ -2585,7 +2585,7 @@ msgid "OpenSSH: %s" msgstr "OpenSSH: %s" -#: ../ssh/seahorse-ssh-source.c:974 +#: ../ssh/seahorse-ssh-source.c:978 msgid "No private key file is available for this key." msgstr "Nenhum arquivo de chave privada está disponível para esta chave." diff -Nru seahorse-3.10.1/po/zh_CN.po seahorse-3.10.2/po/zh_CN.po --- seahorse-3.10.1/po/zh_CN.po 2013-04-21 13:50:44.000000000 +0000 +++ seahorse-3.10.2/po/zh_CN.po 2014-01-08 15:06:15.000000000 +0000 @@ -7,15 +7,16 @@ # Aron Xu , 2009, 2010, 2011. # Wylmer Wang , 2010, 2011, 2013. # YunQiang Su , 2012. +# Tong Hui , 2013. # msgid "" msgstr "" "Project-Id-Version: seahorse master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=seahorse&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2013-03-06 19:45+0000\n" -"PO-Revision-Date: 2012-09-23 03:00+0800\n" -"Last-Translator: Wylmer Wang \n" +"POT-Creation-Date: 2013-12-19 16:21+0000\n" +"PO-Revision-Date: 2013-12-28 01:32+0800\n" +"Last-Translator: Tong Hui \n" "Language-Team: Chinese (simplified) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -25,304 +26,401 @@ "X-Launchpad-Export-Date: 2010-10-03 18:56+0000\n" "X-Generator: Gtranslator 2.91.5\n" -#: ../gkr/seahorse-add-keyring.xml.h:1 -msgid "Add Password Keyring" -msgstr "添加密码密钥环" +#: ../common/catalog.vala:259 +msgid "Contributions:" +msgstr "贡献人：" -#: ../gkr/seahorse-add-keyring.xml.h:2 -msgid "" -"Please choose a name for the new keyring. You will be prompted for an unlock " -"password." -msgstr "请为新密钥环选择名称。您将会被提示输入解锁密码。" +#: ../common/catalog.vala:287 ../src/seahorse.desktop.in.in.h:1 +#: ../src/seahorse-key-manager.c:661 +msgid "Passwords and Keys" +msgstr "密码和密钥" -#: ../gkr/seahorse-add-keyring.xml.h:3 -msgid "New Keyring Name:" -msgstr "新密钥环名称：" +#: ../common/catalog.vala:289 +msgid "translator-credits" +msgstr "" +"wei Li \n" +"Zipeco , 2002\n" +"Funda Wang , 2004\n" +"Deng Xiyue 2007, 2008, 2009\n" +"Aron Xu , 2009, 2010, 2011\n" +"YunQiang Su , 2012\n" +"Wylmer Wang , 2010, 2011, 2013\n" +"Tong Hui , 2013" -#: ../gkr/seahorse-add-keyring.xml.h:4 -#: ../libseahorse/seahorse-add-keyserver.xml.h:5 -#: ../ssh/seahorse-ssh-upload.xml.h:3 -msgid "The host name or address of the server." -msgstr "服务器的主机名称或地址" +#: ../common/catalog.vala:292 +msgid "Seahorse Project Homepage" +msgstr "Seahorse 项目首页" + +#: ../common/catalog.vala:310 +msgid "Cannot delete" +msgstr "无法删除" + +#: ../common/catalog.vala:333 ../libseahorse/seahorse-key-manager-store.c:442 +msgid "Couldn't export keys" +msgstr "无法导出密钥" + +#: ../common/catalog.vala:344 +msgid "Couldn't export data" +msgstr "无法导出数据" + +#: ../common/catalog.vala:360 ../libseahorse/seahorse-widget.c:460 +#, c-format +msgid "Could not display help: %s" +msgstr "无法显示帮助：%s" + +#. Top menu items +#: ../common/catalog.vala:366 +msgid "_File" +msgstr "文件(_F)" + +#: ../common/catalog.vala:367 +msgid "E_xport..." +msgstr "导出(_X)..." + +#: ../common/catalog.vala:368 +msgid "Export to a file" +msgstr "导出到文件" -#: ../gkr/seahorse-gkr-actions.c:81 +#: ../common/catalog.vala:369 +msgid "_Edit" +msgstr "编辑(_E)" + +#: ../common/catalog.vala:372 +msgid "Copy to the clipboard" +msgstr "复制到剪贴板" + +#: ../common/catalog.vala:373 ../pkcs11/seahorse-pkcs11-properties.c:229 +#: ../src/seahorse-sidebar.c:955 +msgid "_Delete" +msgstr "删除(_D)" + +#: ../common/catalog.vala:374 +msgid "Delete selected items" +msgstr "删除已选择的项目" + +#: ../common/catalog.vala:376 +msgid "Show the properties of this item" +msgstr "显示此项目的属性" + +#: ../common/catalog.vala:378 +msgid "Show the properties of this keyring" +msgstr "显示此密钥环的属性" + +#: ../common/catalog.vala:379 +msgid "Prefere_nces" +msgstr "首选项(_N)" + +#: ../common/catalog.vala:380 +msgid "Change preferences for this program" +msgstr "修改此程序的首选项" + +#: ../common/catalog.vala:381 +msgid "_View" +msgstr "视图(_V)" + +#: ../common/catalog.vala:382 +msgid "_Help" +msgstr "帮助(_H)" + +#: ../common/catalog.vala:384 +msgid "About this program" +msgstr "关于此程序" + +#: ../common/catalog.vala:385 +msgid "_Contents" +msgstr "内容(_C)" + +#: ../common/catalog.vala:386 +msgid "Show Seahorse help" +msgstr "显示 Seahorse 帮助" + +#: ../common/exportable.vala:195 +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 +msgid "Export" +msgstr "导出" + +#: ../gkr/gkr-backend.vala:41 +msgid "Passwords" +msgstr "密码" + +#: ../gkr/gkr-backend.vala:45 +msgid "Stored personal passwords, credentials and secrets" +msgstr "存储个人密码、证书和私钥" + +#: ../gkr/gkr-backend.vala:243 msgid "New password keyring" msgstr "新建密码密钥环" -#: ../gkr/seahorse-gkr-actions.c:82 ../gkr/seahorse-gkr-actions.c:89 +#: ../gkr/gkr-backend.vala:244 ../gkr/gkr-backend.vala:251 msgid "Used to store application and network passwords" msgstr "用来保存应用程序和网络密码" -#: ../gkr/seahorse-gkr-actions.c:83 +#: ../gkr/gkr-backend.vala:245 msgid "New password..." msgstr "新密码..." -#: ../gkr/seahorse-gkr-actions.c:84 ../gkr/seahorse-gkr-actions.c:91 +#: ../gkr/gkr-backend.vala:246 ../gkr/gkr-backend.vala:253 msgid "Safely store a password or secret." msgstr "安全地储存密码或密语。" -#: ../gkr/seahorse-gkr-actions.c:88 +#: ../gkr/gkr-backend.vala:250 msgid "Password Keyring" msgstr "密码密钥环" -#: ../gkr/seahorse-gkr-actions.c:90 +#: ../gkr/gkr-backend.vala:252 msgid "Stored Password" msgstr "已储存的密码" -#: ../gkr/seahorse-gkr-actions.c:174 -msgid "Couldn't set default keyring" -msgstr "无法设置默认密钥环" - -#: ../gkr/seahorse-gkr-actions.c:225 ../gkr/seahorse-gkr-actions.c:248 -msgid "Couldn't change keyring password" -msgstr "无法修改密钥环密码" - -#: ../gkr/seahorse-gkr-actions.c:281 -msgid "_Set as default" -msgstr "设为默认(_S)" - -#: ../gkr/seahorse-gkr-actions.c:282 -msgid "Applications usually store new passwords in the default keyring." -msgstr "应用程序通常将新密码存储在默认密钥环中。" - -#: ../gkr/seahorse-gkr-actions.c:283 -msgid "Change _Password" -msgstr "更改密码(_P)" - -#: ../gkr/seahorse-gkr-actions.c:284 -msgid "Change the unlock password of the password storage keyring" -msgstr "修改密码存储密钥环的解锁密码" +#: ../gkr/gkr-item-add.vala:27 +msgid "Add Password" +msgstr "添加密码" -#: ../gkr/seahorse-gkr-add-item.c:60 +#: ../gkr/gkr-item-add.vala:104 msgid "Couldn't add item" msgstr "无法添加项目" -#: ../gkr/seahorse-gkr-add-item.xml.h:1 -msgid "Add Password" -msgstr "添加密码" +#: ../gkr/gkr-item-properties.vala:139 +msgid "Access a network share or resource" +msgstr "访问网络共享或资源" -#: ../gkr/seahorse-gkr-add-item.xml.h:2 -#: ../gkr/seahorse-gkr-item-properties.xml.h:2 ../pgp/seahorse-revoke.xml.h:3 -#: ../ssh/seahorse-ssh-generate.xml.h:5 -msgid "_Description:" -msgstr "描述(_D)：" +#: ../gkr/gkr-item-properties.vala:142 +msgid "Access a website" +msgstr "访问站点" -#: ../gkr/seahorse-gkr-add-item.xml.h:3 -msgid "_Password:" -msgstr "密码(_P)：" +#: ../gkr/gkr-item-properties.vala:145 +msgid "Unlocks a PGP key" +msgstr "解锁 PGP 密钥" -#: ../gkr/seahorse-gkr-add-item.xml.h:4 -msgid "_Show Password" -msgstr "显示密码(_S)" +#: ../gkr/gkr-item-properties.vala:148 +msgid "Unlocks a Secure Shell key" +msgstr "解锁 SSH 密钥" -#: ../gkr/seahorse-gkr-add-item.xml.h:5 -msgid "_Keyring:" -msgstr "密钥环(_K)：" +#: ../gkr/gkr-item-properties.vala:151 +msgid "Saved password or login" +msgstr "已存储的密码或登录" -#: ../gkr/seahorse-gkr-add-keyring.c:72 -msgid "Couldn't add keyring" -msgstr "无法添加密钥环" +#: ../gkr/gkr-item-properties.vala:164 +msgid "Network Credentials" +msgstr "网络证书" -#: ../gkr/seahorse-gkr-backend.c:205 -msgid "Passwords" +#: ../gkr/gkr-item-properties.vala:169 +msgid "Password" msgstr "密码" -#: ../gkr/seahorse-gkr-backend.c:208 -msgid "Stored personal passwords, credentials and secrets" -msgstr "存储个人密码、证书和私钥" +#: ../gkr/gkr-item-properties.vala:238 +msgid "Couldn't change password." +msgstr "无法修改密码。" + +#: ../gkr/gkr-item-properties.vala:276 +msgid "Couldn't set description." +msgstr "无法设定说明。" #. Translators: This should be the same as the string in empathy -#: ../gkr/seahorse-gkr-item.c:293 +#: ../gkr/gkr-item.vala:391 msgid "IM account password for " msgstr "即时通信帐号密码" -#: ../gkr/seahorse-gkr-item.c:353 +#: ../gkr/gkr-item.vala:447 msgid "Password or secret" msgstr "密码或私钥" -#: ../gkr/seahorse-gkr-item.c:354 +#: ../gkr/gkr-item.vala:448 msgid "Network password" msgstr "网络密码" -#: ../gkr/seahorse-gkr-item.c:355 +#: ../gkr/gkr-item.vala:449 msgid "Stored note" msgstr "已存储的便笺" -#: ../gkr/seahorse-gkr-item.c:356 +#: ../gkr/gkr-item.vala:450 msgid "Keyring password" msgstr "密钥环密码" -#: ../gkr/seahorse-gkr-item.c:357 +#: ../gkr/gkr-item.vala:451 msgid "Encryption key password" msgstr "加密密钥口令" -#: ../gkr/seahorse-gkr-item.c:358 +#: ../gkr/gkr-item.vala:452 msgid "Key storage password" msgstr "密钥存储口令" -#: ../gkr/seahorse-gkr-item.c:359 +#: ../gkr/gkr-item.vala:453 msgid "Google Chrome password" msgstr "Google Chrome 密码" -#: ../gkr/seahorse-gkr-item.c:360 +#: ../gkr/gkr-item.vala:454 msgid "Gnome Online Accounts password" msgstr "GNOME 在线帐户密码" -#: ../gkr/seahorse-gkr-item.c:361 +#: ../gkr/gkr-item.vala:455 msgid "Telepathy password" msgstr "Telepathy 密码" -#: ../gkr/seahorse-gkr-item.c:362 +#: ../gkr/gkr-item.vala:456 msgid "Instant messaging password" msgstr "即时通讯密码" -#: ../gkr/seahorse-gkr-item.c:363 +#: ../gkr/gkr-item.vala:457 msgid "Network Manager secret" msgstr "网络管理器私钥" -#: ../gkr/seahorse-gkr-item-deleter.c:80 +#: ../gkr/gkr-item.vala:507 #, c-format msgid "Are you sure you want to delete the password '%s'?" msgstr "确认要删除密码“%s”吗？" -#: ../gkr/seahorse-gkr-item-deleter.c:83 +#: ../gkr/gkr-item.vala:509 #, c-format msgid "Are you sure you want to delete %d password?" msgid_plural "Are you sure you want to delete %d passwords?" msgstr[0] "您确定要删除 %d 个密码吗？" -#: ../gkr/seahorse-gkr-item-properties.c:66 -msgid "Access a network share or resource" -msgstr "访问网络共享或资源" +#: ../gkr/gkr-keyring-add.vala:28 +msgid "Add Password Keyring" +msgstr "添加密码密钥环" -#: ../gkr/seahorse-gkr-item-properties.c:69 -msgid "Access a website" -msgstr "访问站点" +#: ../gkr/gkr-keyring-add.vala:58 +msgid "Couldn't add keyring" +msgstr "无法添加密钥环" -#: ../gkr/seahorse-gkr-item-properties.c:72 -msgid "Unlocks a PGP key" -msgstr "解锁 PGP 密钥" +#: ../gkr/gkr-keyring.vala:30 +msgid "A keyring that is automatically unlocked on login" +msgstr "登录系统时自动解锁的密钥环" -#: ../gkr/seahorse-gkr-item-properties.c:75 -msgid "Unlocks a Secure Shell key" -msgstr "解锁 SSH 密钥" +#: ../gkr/gkr-keyring.vala:31 +msgid "A keyring used to store passwords" +msgstr "用于存储密码的密钥环" -#: ../gkr/seahorse-gkr-item-properties.c:78 -msgid "Saved password or login" -msgstr "已存储的密码或登录" +#: ../gkr/gkr-keyring.vala:176 +msgid "Couldn't set default keyring" +msgstr "无法设置默认密钥环" -#: ../gkr/seahorse-gkr-item-properties.c:102 -msgid "Network Credentials" -msgstr "网络证书" +#: ../gkr/gkr-keyring.vala:200 ../gkr/gkr-keyring.vala:205 +msgid "Couldn't change keyring password" +msgstr "无法修改密钥环密码" -#: ../gkr/seahorse-gkr-item-properties.c:107 -msgid "Password" -msgstr "密码" +#: ../gkr/gkr-keyring.vala:211 +msgid "_Set as default" +msgstr "设为默认(_S)" -#: ../gkr/seahorse-gkr-item-properties.c:216 -msgid "Couldn't change password." -msgstr "无法修改密码。" +#: ../gkr/gkr-keyring.vala:212 +msgid "Applications usually store new passwords in the default keyring." +msgstr "应用程序通常将新密码存储在默认密钥环中。" -#: ../gkr/seahorse-gkr-item-properties.c:263 -#: ../gkr/seahorse-gkr-item-properties.c:385 -msgid "Updating password" -msgstr "正在更新密码" +#: ../gkr/gkr-keyring.vala:213 +msgid "Change _Password" +msgstr "更改密码(_P)" -#: ../gkr/seahorse-gkr-item-properties.c:346 -msgid "Couldn't set description." -msgstr "无法设定说明。" +#: ../gkr/gkr-keyring.vala:214 +msgid "Change the unlock password of the password storage keyring" +msgstr "修改密码存储密钥环的解锁密码" -#: ../gkr/seahorse-gkr-item-properties.xml.h:1 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 -#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 -#: ../ssh/seahorse-ssh-key-properties.xml.h:1 -msgid "Key Properties" -msgstr "密钥首选项" +#: ../gkr/gkr-keyring.vala:239 +#, c-format +msgid "Are you sure you want to delete the password keyring '%s'?" +msgstr "确认要删除密码密钥环“%s”吗？" + +#: ../gkr/gkr-keyring.vala:242 +msgid "I understand that all items will be permanently deleted." +msgstr "我明白，所有的条目都将永久删除。" + +#: ../gkr/seahorse-add-keyring.xml.h:1 +msgid "" +"Please choose a name for the new keyring. You will be prompted for an unlock " +"password." +msgstr "请为新密钥环选择名称。您将会被提示输入解锁密码。" + +#: ../gkr/seahorse-add-keyring.xml.h:2 +msgid "New Keyring Name:" +msgstr "新密钥环名称：" + +#: ../gkr/seahorse-add-keyring.xml.h:3 +#: ../libseahorse/seahorse-add-keyserver.xml.h:5 +#: ../ssh/seahorse-ssh-upload.xml.h:3 +msgid "The host name or address of the server." +msgstr "服务器的主机名称或地址" + +#: ../gkr/seahorse-gkr-add-item.xml.h:1 +#: ../gkr/seahorse-gkr-item-properties.xml.h:1 ../pgp/seahorse-revoke.xml.h:3 +#: ../ssh/seahorse-ssh-generate.xml.h:5 +msgid "_Description:" +msgstr "描述(_D)：" + +#: ../gkr/seahorse-gkr-add-item.xml.h:2 +msgid "_Password:" +msgstr "密码(_P)：" + +#: ../gkr/seahorse-gkr-add-item.xml.h:3 +msgid "_Show Password" +msgstr "显示密码(_S)" + +#: ../gkr/seahorse-gkr-add-item.xml.h:4 +msgid "_Keyring:" +msgstr "密钥环(_K)：" #. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-item-properties.xml.h:4 +#: ../gkr/seahorse-gkr-item-properties.xml.h:3 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:23 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:13 #: ../ssh/seahorse-ssh-key-properties.xml.h:9 msgid "Use:" msgstr "使用：" -#: ../gkr/seahorse-gkr-item-properties.xml.h:5 +#: ../gkr/seahorse-gkr-item-properties.xml.h:4 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:24 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:20 #: ../ssh/seahorse-ssh-key-properties.xml.h:3 msgid "Type:" msgstr "类型：" -#: ../gkr/seahorse-gkr-item-properties.xml.h:6 +#: ../gkr/seahorse-gkr-item-properties.xml.h:5 msgid "Server:" msgstr "服务器：" -#: ../gkr/seahorse-gkr-item-properties.xml.h:7 +#: ../gkr/seahorse-gkr-item-properties.xml.h:6 msgid "Login:" msgstr "登录：" -#: ../gkr/seahorse-gkr-item-properties.xml.h:8 +#: ../gkr/seahorse-gkr-item-properties.xml.h:7 msgid "Show pass_word" msgstr "显示密码(_W)" -#: ../gkr/seahorse-gkr-item-properties.xml.h:9 -#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:99 +#: ../gkr/seahorse-gkr-item-properties.xml.h:8 +#: ../libseahorse/seahorse-passphrase.c:183 ../ssh/seahorse-ssh-askpass.c:119 msgid "Password:" msgstr "密码：" -#: ../gkr/seahorse-gkr-item-properties.xml.h:10 +#: ../gkr/seahorse-gkr-item-properties.xml.h:9 #: ../pgp/seahorse-pgp-subkey.c:366 #: ../ssh/seahorse-ssh-key-properties.xml.h:15 msgid "Key" msgstr "密钥" -#: ../gkr/seahorse-gkr-item-properties.xml.h:11 +#: ../gkr/seahorse-gkr-item-properties.xml.h:10 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:38 #: ../ssh/seahorse-ssh-key-properties.xml.h:20 msgid "Technical Details:" msgstr "技术细节：" -#: ../gkr/seahorse-gkr-item-properties.xml.h:12 +#: ../gkr/seahorse-gkr-item-properties.xml.h:11 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:51 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:47 #: ../ssh/seahorse-ssh-key-properties.xml.h:22 msgid "Details" msgstr "细节" -#: ../gkr/seahorse-gkr-keyring.c:466 -msgid "A keyring that is automatically unlocked on login" -msgstr "登录系统时自动解锁的密钥环" - -#: ../gkr/seahorse-gkr-keyring.c:467 -msgid "A keyring used to store passwords" -msgstr "用于存储密码的密钥环" - -#: ../gkr/seahorse-gkr-keyring-deleter.c:76 -#, c-format -msgid "Are you sure you want to delete the password keyring '%s'?" -msgstr "确认要删除密码密钥环“%s”吗？" - -#: ../gkr/seahorse-gkr-keyring-deleter.c:79 -msgid "I understand that all items will be permanently deleted." -msgstr "我明白，所有的条目都将永久删除。" - #: ../gkr/seahorse-gkr-keyring.xml.h:1 -msgid "Keyring Properties" -msgstr "密钥环属性" - -#: ../gkr/seahorse-gkr-keyring.xml.h:2 msgid "Name:" msgstr "名称：" #. To translators: This is the noun not the verb. -#: ../gkr/seahorse-gkr-keyring.xml.h:4 +#: ../gkr/seahorse-gkr-keyring.xml.h:3 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:41 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:42 msgid "Created:" msgstr "创建：" -#: ../gkr/seahorse-gkr-keyring.xml.h:5 +#: ../gkr/seahorse-gkr-keyring.xml.h:4 msgid "Keyring" msgstr "密钥环" @@ -605,121 +703,18 @@ msgid "The port to access the server on." msgstr "连接服务器的端口。" -#: ../libseahorse/seahorse-application.c:118 +#: ../libseahorse/seahorse-application.c:136 msgid "Version of this application" msgstr "本程序的版本" -#: ../libseahorse/seahorse-application.c:124 +#: ../libseahorse/seahorse-application.c:142 +#: ../libseahorse/seahorse-application.c:186 msgid "- System Settings" msgstr "- 系统设置" -#: ../libseahorse/seahorse-catalog.c:88 -msgid "Contributions:" -msgstr "贡献人：" - -#: ../libseahorse/seahorse-catalog.c:112 ../src/seahorse.desktop.in.in.h:1 -#: ../src/seahorse-key-manager.c:658 -msgid "Passwords and Keys" -msgstr "密码和密钥" - -#: ../libseahorse/seahorse-catalog.c:114 -msgid "translator-credits" -msgstr "" -"wei Li \n" -"Zipeco , 2002\n" -"Funda Wang , 2004\n" -"Deng Xiyue 2007, 2008, 2009\n" -"Aron Xu , 2009, 2010, 2011\n" -"YunQiang Su , 2012\n" -"Wylmer Wang , 2010, 2011, 2013" - -#: ../libseahorse/seahorse-catalog.c:117 -msgid "Seahorse Project Homepage" -msgstr "Seahorse 项目首页" - -#: ../libseahorse/seahorse-catalog.c:191 -msgid "Cannot delete" -msgstr "无法删除" - -#: ../libseahorse/seahorse-catalog.c:239 -#: ../libseahorse/seahorse-key-manager-store.c:443 -msgid "Couldn't export keys" -msgstr "无法导出密钥" - -#: ../libseahorse/seahorse-catalog.c:268 -msgid "Couldn't export data" -msgstr "无法导出数据" - -#. Top menu items -#: ../libseahorse/seahorse-catalog.c:277 -msgid "_File" -msgstr "文件(_F)" - -#: ../libseahorse/seahorse-catalog.c:278 -msgid "E_xport..." -msgstr "导出(_X)..." - -#: ../libseahorse/seahorse-catalog.c:279 -msgid "Export to a file" -msgstr "导出到文件" - -#: ../libseahorse/seahorse-catalog.c:280 -msgid "_Edit" -msgstr "编辑(_E)" - -#: ../libseahorse/seahorse-catalog.c:283 -msgid "Copy to the clipboard" -msgstr "复制到剪贴板" - -#: ../libseahorse/seahorse-catalog.c:284 -#: ../pkcs11/seahorse-pkcs11-properties.c:233 ../src/seahorse-sidebar.c:959 -msgid "_Delete" -msgstr "删除(_D)" - -#: ../libseahorse/seahorse-catalog.c:285 -msgid "Delete selected items" -msgstr "删除已选择的项目" - -#: ../libseahorse/seahorse-catalog.c:287 -msgid "Show the properties of this item" -msgstr "显示此项目的属性" - -#: ../libseahorse/seahorse-catalog.c:289 -msgid "Show the properties of this keyring" -msgstr "显示此密钥环的属性" - -#: ../libseahorse/seahorse-catalog.c:290 -msgid "Prefere_nces" -msgstr "首选项(_N)" - -#: ../libseahorse/seahorse-catalog.c:291 -msgid "Change preferences for this program" -msgstr "修改此程序的首选项" - -#: ../libseahorse/seahorse-catalog.c:292 -msgid "_View" -msgstr "视图(_V)" - -#: ../libseahorse/seahorse-catalog.c:293 -msgid "_Help" -msgstr "帮助(_H)" - -#: ../libseahorse/seahorse-catalog.c:295 -msgid "About this program" -msgstr "关于此程序" - -#: ../libseahorse/seahorse-catalog.c:296 -msgid "_Contents" -msgstr "内容(_C)" - -#: ../libseahorse/seahorse-catalog.c:297 -msgid "Show Seahorse help" -msgstr "显示 Seahorse 帮助" - -#: ../libseahorse/seahorse-exportable.c:407 -#: ../pgp/seahorse-pgp-private-key-properties.xml.h:46 -msgid "Export" -msgstr "导出" +#: ../libseahorse/seahorse-application.c:182 +msgid "Don't display a window" +msgstr "不要显示窗口" #: ../libseahorse/seahorse-interaction.c:99 #, c-format @@ -731,25 +726,25 @@ msgid "Confirm:" msgstr "确认：" -#: ../libseahorse/seahorse-prefs.c:67 +#: ../libseahorse/seahorse-prefs.c:66 msgid "Not a valid Key Server address." msgstr "不是有效的密钥服务器地址。" -#: ../libseahorse/seahorse-prefs.c:68 +#: ../libseahorse/seahorse-prefs.c:67 msgid "" "For help contact your system adminstrator or the administrator of the key " "server." msgstr "请向您的系统管理员或密钥服务器管理员寻求帮助。" -#: ../libseahorse/seahorse-prefs.c:181 +#: ../libseahorse/seahorse-prefs.c:180 msgid "URL" msgstr "URL" -#: ../libseahorse/seahorse-prefs.c:351 +#: ../libseahorse/seahorse-prefs.c:350 msgid "Custom" msgstr "制定" -#: ../libseahorse/seahorse-prefs.c:404 +#: ../libseahorse/seahorse-prefs.c:403 msgid "None: Don't publish keys" msgstr "无：不要发行密钥" @@ -777,10 +772,6 @@ msgid "Key Servers" msgstr "密钥服务器" -#: ../libseahorse/seahorse-util.c:210 -msgid "%Y-%m-%d" -msgstr "%Y-%m-%d" - #: ../libseahorse/seahorse-validity.c:40 #: ../pgp/seahorse-pgp-key-properties.c:1254 #: ../pgp/seahorse-pgp-private-key-properties.xml.h:1 @@ -825,11 +816,6 @@ msgid "Revoked" msgstr "已吊销" -#: ../libseahorse/seahorse-widget.c:460 -#, c-format -msgid "Could not display help: %s" -msgstr "无法显示帮助：%s" - #: ../pgp/seahorse-add-subkey.xml.h:1 msgid "Never E_xpires" msgstr "永不过期(_X)" @@ -913,7 +899,7 @@ msgid "Add subkey to %s" msgstr "向 %s 添加子密钥" -#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:134 +#: ../pgp/seahorse-gpgme-add-subkey.c:197 ../pgp/seahorse-gpgme-generate.c:132 msgid "DSA (sign only)" msgstr "DSA (仅签署)" @@ -921,7 +907,7 @@ msgid "ElGamal (encrypt only)" msgstr "ElGamal (仅加密)" -#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:135 +#: ../pgp/seahorse-gpgme-add-subkey.c:211 ../pgp/seahorse-gpgme-generate.c:133 msgid "RSA (sign only)" msgstr "RSA (仅签署)" @@ -938,12 +924,12 @@ msgid "Add user ID to %s" msgstr "向 %s 添加用户 ID" -#: ../pgp/seahorse-gpgme.c:69 +#: ../pgp/seahorse-gpgme.c:70 msgid "Decryption failed. You probably do not have the decryption key." msgstr "解密失败。您可能没有解密密钥。" -#: ../pgp/seahorse-gpgme.c:73 ../pgp/seahorse-hkp-source.c:586 -#: ../ssh/seahorse-ssh-operation.c:194 +#: ../pgp/seahorse-gpgme.c:74 ../pgp/seahorse-hkp-source.c:512 +#: ../ssh/seahorse-ssh-operation.c:199 msgid "The operation was cancelled" msgstr "操作被取消" @@ -964,49 +950,49 @@ msgid "Expiry: %s" msgstr "过期状态：%s" -#: ../pgp/seahorse-gpgme-exporter.c:84 +#: ../pgp/seahorse-gpgme-exporter.c:85 msgid "Multiple Keys" msgstr "多个密钥" -#: ../pgp/seahorse-gpgme-exporter.c:88 +#: ../pgp/seahorse-gpgme-exporter.c:89 msgid "Key Data" msgstr "密钥数据" -#: ../pgp/seahorse-gpgme-exporter.c:114 +#: ../pgp/seahorse-gpgme-exporter.c:117 msgid "Armored PGP keys" msgstr "字符形式的密钥" -#: ../pgp/seahorse-gpgme-exporter.c:118 +#: ../pgp/seahorse-gpgme-exporter.c:121 msgid "PGP keys" msgstr "PGP 密钥" -#: ../pgp/seahorse-gpgme-generate.c:95 +#: ../pgp/seahorse-gpgme-generate.c:93 msgid "PGP Key" msgstr "PGP 密钥" -#: ../pgp/seahorse-gpgme-generate.c:96 +#: ../pgp/seahorse-gpgme-generate.c:94 msgid "Used to encrypt email and files" msgstr "用来加密邮件和文件" -#: ../pgp/seahorse-gpgme-generate.c:132 +#: ../pgp/seahorse-gpgme-generate.c:130 #: ../pkcs11/seahorse-pkcs11-generate.c:91 #: ../ssh/seahorse-ssh-generate.xml.h:9 msgid "RSA" msgstr "RSA" -#: ../pgp/seahorse-gpgme-generate.c:133 +#: ../pgp/seahorse-gpgme-generate.c:131 msgid "DSA ElGamal" msgstr "DSA ElGamal" -#: ../pgp/seahorse-gpgme-generate.c:182 +#: ../pgp/seahorse-gpgme-generate.c:180 msgid "Couldn't generate PGP key" msgstr "无法生成 PGP 密钥" -#: ../pgp/seahorse-gpgme-generate.c:214 +#: ../pgp/seahorse-gpgme-generate.c:213 msgid "Passphrase for New PGP Key" msgstr "新 PGP 密钥的密码" -#: ../pgp/seahorse-gpgme-generate.c:215 +#: ../pgp/seahorse-gpgme-generate.c:214 msgid "Enter the passphrase for your new key twice." msgstr "输入您的新密钥的密码两次" @@ -1050,41 +1036,41 @@ msgid "This was the third time you entered a wrong password. Please try again." msgstr "这是您第三次输错密码了。请重试。" -#: ../pgp/seahorse-gpgme-keyring.c:91 +#: ../pgp/seahorse-gpgme-keyring.c:90 #, c-format msgid "Wrong passphrase." msgstr "错误的密码。" -#: ../pgp/seahorse-gpgme-keyring.c:95 +#: ../pgp/seahorse-gpgme-keyring.c:94 #, c-format msgid "Enter new passphrase for '%s'" msgstr "请输入“%s”的新密码" -#: ../pgp/seahorse-gpgme-keyring.c:97 +#: ../pgp/seahorse-gpgme-keyring.c:96 #, c-format msgid "Enter passphrase for '%s'" msgstr "请输入“%s”的密码" -#: ../pgp/seahorse-gpgme-keyring.c:100 +#: ../pgp/seahorse-gpgme-keyring.c:99 #: ../src/seahorse-change-passphrase.xml.h:2 msgid "Enter new passphrase" msgstr "输入新密码" -#: ../pgp/seahorse-gpgme-keyring.c:102 +#: ../pgp/seahorse-gpgme-keyring.c:101 msgid "Enter passphrase" msgstr "输入密码" -#: ../pgp/seahorse-gpgme-keyring.c:107 +#: ../pgp/seahorse-gpgme-keyring.c:106 msgid "Passphrase" msgstr "密码" -#: ../pgp/seahorse-gpgme-keyring.c:308 +#: ../pgp/seahorse-gpgme-keyring.c:307 #, c-format msgid "Loaded %d key" msgid_plural "Loaded %d keys" msgstr[0] "已载入 %d 个密钥" -#: ../pgp/seahorse-gpgme-keyring.c:655 +#: ../pgp/seahorse-gpgme-keyring.c:654 msgid "" "Invalid key data (missing UIDs). This may be due to a computer with a date " "set in the future or a missing self-signature." @@ -1092,11 +1078,11 @@ "无效的密钥数据(缺少 UID)。这可能是由于电脑时间设置成未来时间或者缺少自我签" "名。" -#: ../pgp/seahorse-gpgme-keyring.c:815 +#: ../pgp/seahorse-gpgme-keyring.c:807 msgid "GnuPG keys" msgstr "GnuPG 密钥" -#: ../pgp/seahorse-gpgme-keyring.c:818 +#: ../pgp/seahorse-gpgme-keyring.c:813 msgid "GnuPG: default keyring directory" msgstr "GnuPG：默认密钥换目录" @@ -1133,7 +1119,7 @@ msgid "All JPEG files" msgstr "所有 JPEG 文件" -#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:307 +#: ../pgp/seahorse-gpgme-photos.c:242 ../src/seahorse-key-manager.c:289 msgid "All files" msgstr "所有文件" @@ -1251,63 +1237,63 @@ msgid "ElGamal" msgstr "ElGamal" -#: ../pgp/seahorse-hkp-source.c:604 +#: ../pgp/seahorse-hkp-source.c:530 #, c-format msgid "Search was not specific enough. Server '%s' found too many keys." msgstr "搜索范围过宽。服务器“%s”中找到太多密钥。" -#: ../pgp/seahorse-hkp-source.c:607 +#: ../pgp/seahorse-hkp-source.c:533 #, c-format msgid "Couldn't communicate with server '%s': %s" msgstr "无法与服务器“%s”通讯：%s" -#: ../pgp/seahorse-hkp-source.c:1127 +#: ../pgp/seahorse-hkp-source.c:1041 msgid "HTTP Key Server" msgstr "HTTP 密钥服务器" -#: ../pgp/seahorse-keyserver-results.c:175 +#: ../pgp/seahorse-keyserver-results.c:168 msgid "Couldn't import keys" msgstr "无法导入密钥" -#: ../pgp/seahorse-keyserver-results.c:218 +#: ../pgp/seahorse-keyserver-results.c:211 msgid "Importing keys from key servers" msgstr "从密钥服务器导入密钥" #. TRANSLATORS: The "Remote" menu contains key operations on remote systems. -#: ../pgp/seahorse-keyserver-results.c:244 ../src/seahorse-key-manager.c:507 +#: ../pgp/seahorse-keyserver-results.c:237 ../src/seahorse-key-manager.c:502 msgid "_Remote" msgstr "远程(_R)" -#: ../pgp/seahorse-keyserver-results.c:246 +#: ../pgp/seahorse-keyserver-results.c:239 msgid "Close this window" msgstr "关闭此窗口" -#: ../pgp/seahorse-keyserver-results.c:250 ../pgp/seahorse-pgp-actions.c:115 +#: ../pgp/seahorse-keyserver-results.c:243 ../pgp/seahorse-pgp-actions.c:113 msgid "_Find Remote Keys..." msgstr "寻找远程密钥(_F)..." -#: ../pgp/seahorse-keyserver-results.c:251 ../pgp/seahorse-pgp-actions.c:116 +#: ../pgp/seahorse-keyserver-results.c:244 ../pgp/seahorse-pgp-actions.c:114 msgid "Search for keys on a key server" msgstr "在密钥服务器搜索密钥" -#: ../pgp/seahorse-keyserver-results.c:255 ../src/seahorse-key-manager.xml.h:3 +#: ../pgp/seahorse-keyserver-results.c:248 ../src/seahorse-key-manager.xml.h:3 msgid "_Import" msgstr "导入(_I)" -#: ../pgp/seahorse-keyserver-results.c:256 +#: ../pgp/seahorse-keyserver-results.c:249 msgid "Import selected keys to local key ring" msgstr "将已选择的密钥导入到本地密钥环" -#: ../pgp/seahorse-keyserver-results.c:286 +#: ../pgp/seahorse-keyserver-results.c:280 msgid "Remote Keys" msgstr "远程密钥" -#: ../pgp/seahorse-keyserver-results.c:288 +#: ../pgp/seahorse-keyserver-results.c:282 #, c-format msgid "Remote Keys Containing '%s'" msgstr "远程密钥包含“%s”" -#: ../pgp/seahorse-keyserver-results.c:486 +#: ../pgp/seahorse-keyserver-results.c:485 msgid "The search for keys failed." msgstr "寻找密钥失败。" @@ -1390,43 +1376,43 @@ msgid "_Sync" msgstr "同步(_S)" -#: ../pgp/seahorse-ldap-source.c:441 +#: ../pgp/seahorse-ldap-source.c:440 #, c-format msgid "Couldn't communicate with '%s': %s" msgstr "无法与“%s”通讯：%s" -#: ../pgp/seahorse-ldap-source.c:652 +#: ../pgp/seahorse-ldap-source.c:651 #, c-format msgid "Connecting to: %s" msgstr "正在连接到：%s" -#: ../pgp/seahorse-ldap-source.c:658 +#: ../pgp/seahorse-ldap-source.c:657 #, c-format msgid "Couldn't resolve address: %s" msgstr "无法解析地址：%s" -#: ../pgp/seahorse-ldap-source.c:702 +#: ../pgp/seahorse-ldap-source.c:701 #, c-format msgid "Resolving server address: %s" msgstr "正在解析服务器地址：%s" -#: ../pgp/seahorse-ldap-source.c:1447 +#: ../pgp/seahorse-ldap-source.c:1438 msgid "LDAP Key Server" msgstr "LDAP 密钥服务器" -#: ../pgp/seahorse-pgp-actions.c:120 +#: ../pgp/seahorse-pgp-actions.c:118 msgid "_Sync and Publish Keys..." msgstr "同步并发布密钥(_S)" -#: ../pgp/seahorse-pgp-actions.c:121 +#: ../pgp/seahorse-pgp-actions.c:119 msgid "Publish and/or synchronize your keys with those online." msgstr "与那些在线的密钥发行并/或同步您的密钥" -#: ../pgp/seahorse-pgp-backend.c:172 +#: ../pgp/seahorse-pgp-backend.c:167 msgid "PGP Keys" msgstr "PGP 密钥" -#: ../pgp/seahorse-pgp-backend.c:175 +#: ../pgp/seahorse-pgp-backend.c:173 msgid "PGP keys are for encrypting email or files" msgstr "PGP 密钥用来加密邮件和文件" @@ -1443,13 +1429,13 @@ msgstr "PGP 密钥允许您加密给别人的电子邮件或文件。" #: ../pgp/seahorse-pgp-generate.xml.h:7 -msgid "_Comment:" -msgstr "备注(_C)：" - -#: ../pgp/seahorse-pgp-generate.xml.h:8 msgid "Ne_ver Expires" msgstr "永不过期(_V)" +#: ../pgp/seahorse-pgp-generate.xml.h:8 +msgid "_Comment:" +msgstr "备注(_C)：" + #: ../pgp/seahorse-pgp-generate.xml.h:9 ../ssh/seahorse-ssh-generate.xml.h:7 msgid "Encryption _Type:" msgstr "加密类型(_T)：" @@ -1470,75 +1456,75 @@ msgid "_Advanced key options" msgstr "高级密钥选项(_A)" -#: ../pgp/seahorse-pgp-key.c:353 +#: ../pgp/seahorse-pgp-key.c:352 msgid "Personal PGP key" msgstr "个人 PGP 密钥" -#: ../pgp/seahorse-pgp-key.c:355 +#: ../pgp/seahorse-pgp-key.c:354 msgid "PGP key" msgstr "PGP 密钥" -#: ../pgp/seahorse-pgp-key-properties.c:325 +#: ../pgp/seahorse-pgp-key-properties.c:322 msgid "Couldn't change primary user ID" msgstr "无法修改主用户 ID" -#: ../pgp/seahorse-pgp-key-properties.c:344 +#: ../pgp/seahorse-pgp-key-properties.c:341 #, c-format msgid "Are you sure you want to permanently delete the '%s' user ID?" msgstr "您确定要永久删除“%s”用户 ID 吗？" -#: ../pgp/seahorse-pgp-key-properties.c:354 +#: ../pgp/seahorse-pgp-key-properties.c:351 msgid "Couldn't delete user ID" msgstr "无法删除用户 ID" -#: ../pgp/seahorse-pgp-key-properties.c:429 +#: ../pgp/seahorse-pgp-key-properties.c:426 #: ../pgp/seahorse-pgp-key-properties.c:1571 msgid "[Unknown]" msgstr "[未知]" -#: ../pgp/seahorse-pgp-key-properties.c:538 +#: ../pgp/seahorse-pgp-key-properties.c:535 #: ../pgp/seahorse-pgp-key-properties.c:1854 msgid "Name/Email" msgstr "名称/电子邮件" -#: ../pgp/seahorse-pgp-key-properties.c:545 +#: ../pgp/seahorse-pgp-key-properties.c:542 msgid "Signature ID" msgstr "签名 ID" -#: ../pgp/seahorse-pgp-key-properties.c:678 +#: ../pgp/seahorse-pgp-key-properties.c:675 msgid "Couldn't change primary photo" msgstr "无法修改主照片" #. TRANSLATORS: (unknown) expiry date -#: ../pgp/seahorse-pgp-key-properties.c:912 +#: ../pgp/seahorse-pgp-key-properties.c:909 msgid "(unknown)" msgstr "(未知)" -#: ../pgp/seahorse-pgp-key-properties.c:915 +#: ../pgp/seahorse-pgp-key-properties.c:912 #, c-format msgid "This key expired on: %s" msgstr "此密钥已于 %s 过期。" -#: ../pgp/seahorse-pgp-key-properties.c:978 +#: ../pgp/seahorse-pgp-key-properties.c:975 msgid "Name" msgstr "名称" -#: ../pgp/seahorse-pgp-key-properties.c:1091 +#: ../pgp/seahorse-pgp-key-properties.c:1088 #, c-format msgid "Are you sure you want to permanently delete subkey %d of %s?" msgstr "您确定要永久删除 %2$s 的子密钥 %1$d 吗？" -#: ../pgp/seahorse-pgp-key-properties.c:1100 +#: ../pgp/seahorse-pgp-key-properties.c:1097 msgid "Couldn't delete subkey" msgstr "无法删除子密钥" -#: ../pgp/seahorse-pgp-key-properties.c:1140 +#: ../pgp/seahorse-pgp-key-properties.c:1137 #: ../pgp/seahorse-pgp-key-properties.c:1545 msgid "Unable to change trust" msgstr "无法修改信任栏" -#: ../pgp/seahorse-pgp-key-properties.c:1153 -#: ../ssh/seahorse-ssh-key-properties.c:202 +#: ../pgp/seahorse-pgp-key-properties.c:1151 +#: ../ssh/seahorse-ssh-key-properties.c:206 msgid "Couldn't export key" msgstr "无法导出密钥" @@ -1604,6 +1590,12 @@ msgid "Key ID" msgstr "密钥 ID" +#: ../pgp/seahorse-pgp-private-key-properties.xml.h:6 +#: ../pgp/seahorse-pgp-public-key-properties.xml.h:6 +#: ../ssh/seahorse-ssh-key-properties.xml.h:1 +msgid "Key Properties" +msgstr "密钥首选项" + #: ../pgp/seahorse-pgp-private-key-properties.xml.h:7 #: ../pgp/seahorse-pgp-public-key-properties.xml.h:7 msgid "This key has been revoked" @@ -1743,8 +1735,8 @@ msgstr "覆盖所有者信任状态(_T)：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:45 -msgid "_Export Complete Key:" -msgstr "导出完整密钥(_E)" +msgid "_Export Secret Key:" +msgstr "导出私钥(_E)：" #: ../pgp/seahorse-pgp-private-key-properties.xml.h:47 msgid "Actions" @@ -1989,28 +1981,28 @@ msgid "Unavailable" msgstr "不可用" -#: ../pkcs11/seahorse-certificate.c:434 -msgid "Personal certificate and key" -msgstr "个人证书和密钥" - -#: ../pkcs11/seahorse-certificate.c:437 -msgid "Personal certificate" -msgstr "个人证书" - -#: ../pkcs11/seahorse-certificate.c:439 -#: ../pkcs11/seahorse-certificate-der-exporter.c:77 +#: ../pkcs11/certificate-der-exporter.vala:46 +#: ../pkcs11/seahorse-certificate.c:454 msgid "Certificate" msgstr "证书" -#: ../pkcs11/seahorse-certificate-der-exporter.c:99 +#: ../pkcs11/certificate-der-exporter.vala:60 msgid "Certificates (DER encoded)" msgstr "密钥(DER 编码)" +#: ../pkcs11/seahorse-certificate.c:449 +msgid "Personal certificate and key" +msgstr "个人证书和密钥" + +#: ../pkcs11/seahorse-certificate.c:452 +msgid "Personal certificate" +msgstr "个人证书" + #: ../pkcs11/seahorse-pkcs11-backend.c:183 msgid "Certificates" msgstr "证书" -#: ../pkcs11/seahorse-pkcs11-backend.c:186 +#: ../pkcs11/seahorse-pkcs11-backend.c:189 msgid "X.509 certificates and related keys" msgstr "X.509 证书和相关的密钥" @@ -2025,12 +2017,12 @@ msgstr "无法生成私钥" #: ../pkcs11/seahorse-pkcs11-generate.c:413 -#: ../pkcs11/seahorse-pkcs11-request.c:255 +#: ../pkcs11/seahorse-pkcs11-request.c:253 msgid "Create" msgstr "创建" #: ../pkcs11/seahorse-pkcs11-generate.c:506 -#: ../pkcs11/seahorse-private-key.c:178 +#: ../pkcs11/seahorse-private-key.c:175 msgid "Private key" msgstr "私钥" @@ -2054,56 +2046,56 @@ msgid "I understand that this key will be permanently deleted." msgstr "我明白，此密钥将永久删除。" +#: ../pkcs11/seahorse-pkcs11-properties.c:143 #: ../pkcs11/seahorse-pkcs11-properties.c:147 -#: ../pkcs11/seahorse-pkcs11-properties.c:151 msgid "Unnamed" msgstr "未命名" -#: ../pkcs11/seahorse-pkcs11-properties.c:175 +#: ../pkcs11/seahorse-pkcs11-properties.c:171 msgid "Failed to export certificate" msgstr "导出证书失败" -#: ../pkcs11/seahorse-pkcs11-properties.c:190 ../src/seahorse-sidebar.c:877 +#: ../pkcs11/seahorse-pkcs11-properties.c:186 ../src/seahorse-sidebar.c:874 msgid "Couldn't delete" msgstr "无法删除" -#: ../pkcs11/seahorse-pkcs11-properties.c:231 +#: ../pkcs11/seahorse-pkcs11-properties.c:227 msgid "_Export" msgstr "导出(_E)" -#: ../pkcs11/seahorse-pkcs11-properties.c:232 +#: ../pkcs11/seahorse-pkcs11-properties.c:228 msgid "Export the certificate" msgstr "导出证书" -#: ../pkcs11/seahorse-pkcs11-properties.c:234 +#: ../pkcs11/seahorse-pkcs11-properties.c:230 msgid "Delete this certificate or key" msgstr "删除此证书或密钥" -#: ../pkcs11/seahorse-pkcs11-properties.c:235 +#: ../pkcs11/seahorse-pkcs11-properties.c:231 msgid "Request _Certificate" msgstr "请求证书(_C)" -#: ../pkcs11/seahorse-pkcs11-properties.c:236 +#: ../pkcs11/seahorse-pkcs11-properties.c:232 msgid "Create a certificate request file for this key" msgstr "为此密钥创建一个证书请求文件" -#: ../pkcs11/seahorse-pkcs11-request.c:103 +#: ../pkcs11/seahorse-pkcs11-request.c:101 msgid "Couldn't save certificate request" msgstr "无法保存证书请求" -#: ../pkcs11/seahorse-pkcs11-request.c:126 +#: ../pkcs11/seahorse-pkcs11-request.c:124 msgid "Save certificate request" msgstr "保存证书请求" -#: ../pkcs11/seahorse-pkcs11-request.c:137 +#: ../pkcs11/seahorse-pkcs11-request.c:135 msgid "Certificate request" msgstr "证书请求" -#: ../pkcs11/seahorse-pkcs11-request.c:145 +#: ../pkcs11/seahorse-pkcs11-request.c:143 msgid "PEM encoded request" msgstr "PEM 编码的请求" -#: ../pkcs11/seahorse-pkcs11-request.c:193 +#: ../pkcs11/seahorse-pkcs11-request.c:191 msgid "Couldn't create certificate request" msgstr "无法创建证书请求" @@ -2119,11 +2111,11 @@ msgid "Name (CN):" msgstr "名称(CN)：" -#: ../pkcs11/seahorse-private-key.c:131 +#: ../pkcs11/seahorse-private-key.c:128 msgid "Unnamed private key" msgstr "未命名的私钥" -#: ../pkcs11/seahorse-token.c:576 +#: ../pkcs11/seahorse-token.c:574 msgctxt "Label" msgid "Unknown" msgstr "未知" @@ -2160,99 +2152,99 @@ msgid "_Select the type of item to create:" msgstr "选择要创建的项目类型(_S)：" -#: ../src/seahorse-import-dialog.c:98 +#: ../src/seahorse-import-dialog.c:97 msgid "Import failed" msgstr "导入失败" -#: ../src/seahorse-import-dialog.c:116 +#: ../src/seahorse-import-dialog.c:115 msgid "Import" msgstr "导入" -#: ../src/seahorse-import-dialog.c:129 +#: ../src/seahorse-import-dialog.c:128 msgid "Data to be imported:" msgstr "要导入的数据：" -#: ../src/seahorse-key-manager.c:261 ../ssh/seahorse-ssh-operation.c:845 +#: ../src/seahorse-key-manager.c:243 ../ssh/seahorse-ssh-operation.c:870 msgid "Import Key" msgstr "导入密钥" -#: ../src/seahorse-key-manager.c:273 +#: ../src/seahorse-key-manager.c:255 msgid "All key files" msgstr "所有密钥文件" -#: ../src/seahorse-key-manager.c:374 +#: ../src/seahorse-key-manager.c:356 msgid "Dropped text" msgstr "丢失的文本" -#: ../src/seahorse-key-manager.c:397 +#: ../src/seahorse-key-manager.c:392 msgid "Clipboard text" msgstr "剪贴板文本" -#: ../src/seahorse-key-manager.c:508 +#: ../src/seahorse-key-manager.c:503 msgid "_New" msgstr "新建(_N)" -#: ../src/seahorse-key-manager.c:510 +#: ../src/seahorse-key-manager.c:505 msgid "Close this program" msgstr "关闭此程序" -#: ../src/seahorse-key-manager.c:511 ../src/seahorse-key-manager.c:513 +#: ../src/seahorse-key-manager.c:506 ../src/seahorse-key-manager.c:508 msgid "_New..." msgstr "新建(_N)..." -#: ../src/seahorse-key-manager.c:512 +#: ../src/seahorse-key-manager.c:507 msgid "Create a new key or item" msgstr "创建新密钥或条目" -#: ../src/seahorse-key-manager.c:514 +#: ../src/seahorse-key-manager.c:509 msgid "Add a new key or item" msgstr "添加新密钥或条目" -#: ../src/seahorse-key-manager.c:515 +#: ../src/seahorse-key-manager.c:510 msgid "_Import..." msgstr "导入(_I)..." -#: ../src/seahorse-key-manager.c:516 +#: ../src/seahorse-key-manager.c:511 msgid "Import from a file" msgstr "从文件导入" -#: ../src/seahorse-key-manager.c:518 +#: ../src/seahorse-key-manager.c:513 msgid "Import from the clipboard" msgstr "从剪贴板导入" -#: ../src/seahorse-key-manager.c:522 -msgid "By _keyring" -msgstr "根据密钥环(_K)：" +#: ../src/seahorse-key-manager.c:517 +msgid "By _Keyring" +msgstr "根据密钥环(_K)" -#: ../src/seahorse-key-manager.c:523 +#: ../src/seahorse-key-manager.c:518 msgid "Show sidebar listing keyrings" msgstr "显示密钥环列表侧边栏" -#: ../src/seahorse-key-manager.c:527 -msgid "Show _personal" +#: ../src/seahorse-key-manager.c:522 +msgid "Show _Personal" msgstr "显示个人(_P)" -#: ../src/seahorse-key-manager.c:528 +#: ../src/seahorse-key-manager.c:523 msgid "Only show personal keys, certificates and passwords" msgstr "只显示个人密钥、证书和密码" -#: ../src/seahorse-key-manager.c:529 -msgid "Show _trusted" +#: ../src/seahorse-key-manager.c:524 +msgid "Show _Trusted" msgstr "仅显示信任的(_T)" -#: ../src/seahorse-key-manager.c:530 +#: ../src/seahorse-key-manager.c:525 msgid "Only show trusted keys, certificates and passwords" msgstr "只显示信任的密钥、证书和密码" -#: ../src/seahorse-key-manager.c:531 -msgid "Show _any" +#: ../src/seahorse-key-manager.c:526 +msgid "Show _Any" msgstr "显示全部(_A)" -#: ../src/seahorse-key-manager.c:532 +#: ../src/seahorse-key-manager.c:527 msgid "Show all keys, certificates and passwords" msgstr "显示全部密钥、证书和密码" -#: ../src/seahorse-key-manager.c:736 +#: ../src/seahorse-key-manager.c:746 msgid "Filter" msgstr "过滤器" @@ -2272,68 +2264,68 @@ msgid "To get started with encryption you will need keys." msgstr "您需要密钥以开始加密。" -#: ../src/seahorse-sidebar.c:801 +#: ../src/seahorse-sidebar.c:798 msgid "Couldn't lock" msgstr "无法锁定" -#: ../src/seahorse-sidebar.c:838 +#: ../src/seahorse-sidebar.c:835 msgid "Couldn't unlock" msgstr "无法解锁" -#: ../src/seahorse-sidebar.c:946 +#: ../src/seahorse-sidebar.c:942 msgid "_Lock" msgstr "锁定(_L)" -#: ../src/seahorse-sidebar.c:951 +#: ../src/seahorse-sidebar.c:947 msgid "_Unlock" msgstr "解锁(_U)" -#: ../src/seahorse-sidebar.c:970 +#: ../src/seahorse-sidebar.c:966 msgid "_Properties" msgstr "属性(_P)" -#: ../ssh/seahorse-ssh-actions.c:100 +#: ../ssh/seahorse-ssh-actions.c:98 msgid "Configure Key for _Secure Shell..." msgstr "为 _SSH 配置密钥..." -#: ../ssh/seahorse-ssh-actions.c:101 +#: ../ssh/seahorse-ssh-actions.c:99 msgid "" "Send public Secure Shell key to another machine, and enable logins using " "that key." msgstr "发送 SSH 公钥到另一个机器，并允许使用该密钥登录。" -#: ../ssh/seahorse-ssh-askpass.c:60 ../ssh/seahorse-ssh-askpass.c:68 +#: ../ssh/seahorse-ssh-askpass.c:80 ../ssh/seahorse-ssh-askpass.c:88 msgid "Enter your Secure Shell passphrase:" msgstr "输入您的 SSH 密码：" -#: ../ssh/seahorse-ssh-askpass.c:82 +#: ../ssh/seahorse-ssh-askpass.c:102 msgid "Old Key Passphrase" msgstr "旧的密钥密码" -#: ../ssh/seahorse-ssh-askpass.c:83 +#: ../ssh/seahorse-ssh-askpass.c:103 #, c-format msgid "Enter the old passphrase for: %s" msgstr "输入 %s 的旧密码：" -#: ../ssh/seahorse-ssh-askpass.c:87 ../ssh/seahorse-ssh-askpass.c:92 +#: ../ssh/seahorse-ssh-askpass.c:107 ../ssh/seahorse-ssh-askpass.c:112 msgid "New Key Passphrase" msgstr "新的密钥密码" -#: ../ssh/seahorse-ssh-askpass.c:88 +#: ../ssh/seahorse-ssh-askpass.c:108 #, c-format msgid "Enter the new passphrase for: %s" msgstr "输入 %s 的新密码：" -#: ../ssh/seahorse-ssh-askpass.c:93 +#: ../ssh/seahorse-ssh-askpass.c:113 #, c-format msgid "Enter the new passphrase again: %s" msgstr "再次输入新密码：%s" -#: ../ssh/seahorse-ssh-backend.c:91 +#: ../ssh/seahorse-ssh-backend.c:89 msgid "Secure Shell" msgstr "SSH" -#: ../ssh/seahorse-ssh-backend.c:94 +#: ../ssh/seahorse-ssh-backend.c:95 msgid "Keys used to connect securely to other computers" msgstr "用来连接到其他计算机的密钥。" @@ -2348,36 +2340,36 @@ msgid_plural "Are you sure you want to delete %d secure shell keys?" msgstr[0] "您确认要删除 %d 个 SSH 密钥吗？" -#: ../ssh/seahorse-ssh-exporter.c:92 -msgid "Ssh Key" +#: ../ssh/seahorse-ssh-exporter.c:93 +msgid "SSH Key" msgstr "SSH 密钥" -#: ../ssh/seahorse-ssh-exporter.c:122 +#: ../ssh/seahorse-ssh-exporter.c:125 msgid "Secret SSH keys" msgstr "SSH 私钥" -#: ../ssh/seahorse-ssh-exporter.c:126 +#: ../ssh/seahorse-ssh-exporter.c:129 msgid "Public SSH keys" msgstr "SSH 公钥" -#: ../ssh/seahorse-ssh-exporter.c:290 +#: ../ssh/seahorse-ssh-exporter.c:298 msgid "No public key file is available for this key." msgstr "此密钥的公钥文件不可用。" -#: ../ssh/seahorse-ssh-generate.c:55 ../ssh/seahorse-ssh-key.c:114 -#: ../ssh/seahorse-ssh-key.c:118 ../ssh/seahorse-ssh-key-properties.xml.h:4 +#: ../ssh/seahorse-ssh-generate.c:53 ../ssh/seahorse-ssh-key.c:110 +#: ../ssh/seahorse-ssh-key.c:114 ../ssh/seahorse-ssh-key-properties.xml.h:4 msgid "Secure Shell Key" msgstr "SSH 密钥" -#: ../ssh/seahorse-ssh-generate.c:56 +#: ../ssh/seahorse-ssh-generate.c:54 msgid "Used to access other computers (eg: via a terminal)" msgstr "用来访问其他计算机(例如：通过终端)" -#: ../ssh/seahorse-ssh-generate.c:110 ../ssh/seahorse-ssh-generate.c:126 +#: ../ssh/seahorse-ssh-generate.c:108 ../ssh/seahorse-ssh-generate.c:124 msgid "Couldn't generate Secure Shell key" msgstr "无法创建 SSH 密钥" -#: ../ssh/seahorse-ssh-generate.c:192 +#: ../ssh/seahorse-ssh-generate.c:191 msgid "Creating Secure Shell Key" msgstr "创建 SSH 密钥" @@ -2413,19 +2405,19 @@ "如果您打算在一台计算机上使用此密钥，您现在可以将那台计算机设定为识别您的密" "钥。" -#: ../ssh/seahorse-ssh-key.c:110 +#: ../ssh/seahorse-ssh-key.c:106 msgid "(Unreadable Secure Shell Key)" msgstr "(无法读取的 SSH 密钥)" -#: ../ssh/seahorse-ssh-key.c:218 +#: ../ssh/seahorse-ssh-key.c:214 msgid "Personal SSH key" msgstr "个人 SSH 密钥" -#: ../ssh/seahorse-ssh-key.c:220 +#: ../ssh/seahorse-ssh-key.c:216 msgid "SSH key" msgstr "SSH 密钥" -#: ../ssh/seahorse-ssh-key-properties.c:82 +#: ../ssh/seahorse-ssh-key-properties.c:80 msgid "Couldn't rename key." msgstr "无法重命名密钥。" @@ -2433,7 +2425,7 @@ msgid "Couldn't change authorization for key." msgstr "无法更改此密钥的授权。" -#: ../ssh/seahorse-ssh-key-properties.c:170 +#: ../ssh/seahorse-ssh-key-properties.c:172 msgid "Couldn't change passphrase for key." msgstr "无法更改此密钥的密码。" @@ -2472,45 +2464,45 @@ msgid "E_xport Complete Key" msgstr "导出完整密钥(_X)" -#: ../ssh/seahorse-ssh-operation.c:199 +#: ../ssh/seahorse-ssh-operation.c:204 msgid "The SSH command was terminated unexpectedly." msgstr "SSH 命令意外终止。" -#: ../ssh/seahorse-ssh-operation.c:209 +#: ../ssh/seahorse-ssh-operation.c:214 msgid "The SSH command failed." msgstr "SSH 命令失败。" -#: ../ssh/seahorse-ssh-operation.c:502 +#: ../ssh/seahorse-ssh-operation.c:523 msgid "Remote Host Password" msgstr "远程主机密码" -#: ../ssh/seahorse-ssh-operation.c:588 +#: ../ssh/seahorse-ssh-operation.c:610 msgid "Enter Key Passphrase" msgstr "输入密钥密码" -#: ../ssh/seahorse-ssh-operation.c:678 +#: ../ssh/seahorse-ssh-operation.c:701 msgid "Passphrase for New Secure Shell Key" msgstr "新的 SSH 密钥的密码" -#: ../ssh/seahorse-ssh-operation.c:862 +#: ../ssh/seahorse-ssh-operation.c:887 #, c-format msgid "Importing key: %s" msgstr "正在导入密钥：%s" -#: ../ssh/seahorse-ssh-operation.c:864 +#: ../ssh/seahorse-ssh-operation.c:889 msgid "Importing key. Enter passphrase" msgstr "正在导入密钥。输入密码" -#: ../ssh/seahorse-ssh-source.c:232 +#: ../ssh/seahorse-ssh-source.c:223 msgid "OpenSSH keys" msgstr "OpenSSH keys" -#: ../ssh/seahorse-ssh-source.c:235 +#: ../ssh/seahorse-ssh-source.c:230 #, c-format msgid "OpenSSH: %s" msgstr "OpenSSH：%s" -#: ../ssh/seahorse-ssh-source.c:940 +#: ../ssh/seahorse-ssh-source.c:978 msgid "No private key file is available for this key." msgstr "此密钥的私钥文件不可用。" @@ -2539,17 +2531,32 @@ msgstr "例如： fireserver.example.com:端口" #: ../ssh/seahorse-ssh-upload.xml.h:5 -msgid "_Computer Name:" -msgstr "计算机名(_C)：" +msgid "_Server address:" +msgstr "服务器地址(_S)：" #: ../ssh/seahorse-ssh-upload.xml.h:6 -msgid "_Login Name:" -msgstr "登录名(_L)" +msgid "_Login name:" +msgstr "登录名(_L)：" #: ../ssh/seahorse-ssh-upload.xml.h:7 msgid "_Set Up" msgstr "设定(_S)" +#~ msgid "Updating password" +#~ msgstr "正在更新密码" + +#~ msgid "Keyring Properties" +#~ msgstr "密钥环属性" + +#~ msgid "%Y-%m-%d" +#~ msgstr "%Y-%m-%d" + +#~ msgid "Ssh Key" +#~ msgstr "SSH 密钥" + +#~ msgid "_Computer Name:" +#~ msgstr "计算机名(_C)：" + #~ msgid "Password:" #~ msgstr "密码：" diff -Nru seahorse-3.10.1/src/Makefile.am seahorse-3.10.2/src/Makefile.am --- seahorse-3.10.1/src/Makefile.am 2013-05-21 10:35:15.000000000 +0000 +++ seahorse-3.10.2/src/Makefile.am 2014-01-08 15:06:15.000000000 +0000 @@ -3,9 +3,10 @@ uidir = $(datadir)/seahorse/ui/ localedir = $(datadir)/locale -INCLUDES = -I$(top_builddir) \ +AM_CPPFLAGS = -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/common \ + -I$(top_builddir)/common \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ -DSEAHORSE_UIDIR=\""$(uidir)"\" \ diff -Nru seahorse-3.10.1/src/Makefile.in seahorse-3.10.2/src/Makefile.in --- seahorse-3.10.1/src/Makefile.in 2013-10-17 06:25:32.000000000 +0000 +++ seahorse-3.10.2/src/Makefile.in 2014-01-08 15:09:38.000000000 +0000 @@ -428,9 +428,10 @@ SUFFIXES = .asn .asn.h .desktop.in .desktop.in.in .service .service.in uidir = $(datadir)/seahorse/ui/ -INCLUDES = -I$(top_builddir) \ +AM_CPPFLAGS = -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/common \ + -I$(top_builddir)/common \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ -DSEAHORSE_UIDIR=\""$(uidir)"\" \ diff -Nru seahorse-3.10.1/ssh/Makefile.am seahorse-3.10.2/ssh/Makefile.am --- seahorse-3.10.1/ssh/Makefile.am 2013-05-21 10:35:15.000000000 +0000 +++ seahorse-3.10.2/ssh/Makefile.am 2014-01-08 15:06:15.000000000 +0000 @@ -3,9 +3,10 @@ localedir = $(datadir)/locale seahorselibexecbindir = $(libdir)/seahorse/ -INCLUDES = -I$(top_builddir) \ +AM_CPPFLAGS = -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/common \ + -I$(top_builddir)/common \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ -DSEAHORSE_UIDIR=\""$(uidir)"\" \ diff -Nru seahorse-3.10.1/ssh/Makefile.in seahorse-3.10.2/ssh/Makefile.in --- seahorse-3.10.1/ssh/Makefile.in 2013-10-17 06:25:32.000000000 +0000 +++ seahorse-3.10.2/ssh/Makefile.in 2014-01-08 15:09:38.000000000 +0000 @@ -405,9 +405,10 @@ top_srcdir = @top_srcdir@ uidir = $(datadir)/seahorse/ui/ seahorselibexecbindir = $(libdir)/seahorse/ -INCLUDES = -I$(top_builddir) \ +AM_CPPFLAGS = -I$(top_builddir) \ -I$(top_srcdir) \ -I$(top_srcdir)/common \ + -I$(top_builddir)/common \ -I$(top_srcdir)/libseahorse \ $(SEAHORSE_CFLAGS) \ -DSEAHORSE_UIDIR=\""$(uidir)"\" \ diff -Nru seahorse-3.10.1/ssh/seahorse-ssh-key-properties.c seahorse-3.10.2/ssh/seahorse-ssh-key-properties.c --- seahorse-3.10.1/ssh/seahorse-ssh-key-properties.c 2013-10-15 15:38:29.000000000 +0000 +++ seahorse-3.10.2/ssh/seahorse-ssh-key-properties.c 2014-01-08 15:07:14.000000000 +0000 @@ -215,6 +215,7 @@ GList *exporters = NULL; GObject *object; GtkWindow *window; + gchar *directory = NULL; GFile *file; object = SEAHORSE_OBJECT_WIDGET (swidget)->object; @@ -222,9 +223,10 @@ exporters = g_list_append (exporters, seahorse_ssh_exporter_new (object, TRUE)); window = GTK_WINDOW (seahorse_widget_get_toplevel (swidget)); - if (seahorse_exportable_prompt (exporters, window, NULL, &file, &exporter)) { + if (seahorse_exportable_prompt (exporters, window, &directory, &file, &exporter)) { seahorse_exporter_export_to_file (exporter, file, TRUE, NULL, on_export_complete, g_object_ref (window)); + g_free (directory); g_object_unref (file); g_object_unref (exporter); } diff -Nru seahorse-3.10.1/ssh/seahorse-ssh-source.c seahorse-3.10.2/ssh/seahorse-ssh-source.c --- seahorse-3.10.1/ssh/seahorse-ssh-source.c 2013-10-15 15:40:15.000000000 +0000 +++ seahorse-3.10.2/ssh/seahorse-ssh-source.c 2014-01-08 15:07:14.000000000 +0000 @@ -917,7 +917,7 @@ break; } - for (i = 0; i < ~0; i++) { + for (i = 0; i < G_MAXINT; i++) { t = (i == 0) ? g_strdup (pref) : g_strdup_printf ("%s.%d", pref, i); filename = g_build_filename (ssrc->priv->ssh_homedir, t, NULL); g_free (t);