Merge tag 'upstream/0.7.2' into debian
authorSam Hartman <hartmans@debian.org>
Tue, 14 Jul 2015 19:39:26 +0000 (15:39 -0400)
committerSam Hartman <hartmans@debian.org>
Tue, 14 Jul 2015 19:39:26 +0000 (15:39 -0400)
Conflicts:
Makefile.in
aclocal.m4
build-aux/compile
build-aux/config.sub
build-aux/depcomp
build-aux/install-sh
build-aux/ltmain.sh
build-aux/missing
configure
moonshot-ui.spec
po/moonshot-ui.pot
src/moonshot-add-dialog.c
src/moonshot-custom-vbox.c
src/moonshot-id.c
src/moonshot-idcard-store.c
src/moonshot-idcard-widget.c
src/moonshot-identities-manager.c
src/moonshot-identity-management-view.c
src/moonshot-identity-manager-app.c
src/moonshot-identity-request.c
src/moonshot-keyring-store.c
src/moonshot-local-flat-file-store.c
src/moonshot-password-dialog.c
src/moonshot-provisioning-common.c
src/moonshot-server.c
src/moonshot-utils.c
src/moonshot-webp-parser.c

34 files changed:
Makefile.am
Makefile.in
aclocal.m4
build-aux/compile
build-aux/config.sub
build-aux/depcomp
build-aux/install-sh
build-aux/ltmain.sh
build-aux/missing
configure
configure.ac
moonshot-ui.spec
po/Makefile.in [new file with mode: 0644]
po/Makevars.template [new file with mode: 0644]
po/POTFILES [new file with mode: 0644]
po/moonshot-ui.pot
po/remove-potcdate.sed [new file with mode: 0644]
src/moonshot-add-dialog.c
src/moonshot-custom-vbox.c
src/moonshot-id.c
src/moonshot-idcard-store.c
src/moonshot-idcard-widget.c
src/moonshot-identities-manager.c
src/moonshot-identity-management-view.c
src/moonshot-identity-management-view.vala
src/moonshot-identity-manager-app.c
src/moonshot-identity-request.c
src/moonshot-keyring-store.c
src/moonshot-local-flat-file-store.c
src/moonshot-password-dialog.c
src/moonshot-provisioning-common.c
src/moonshot-server.c
src/moonshot-utils.c
src/moonshot-webp-parser.c

index 0f5a240..c4f0c80 100644 (file)
@@ -192,7 +192,7 @@ EXTRA_DIST = webprovisioning/moonshot.xml $(dbusservice_in_files) \
        README.webprovisioning README.windows \
        moonshot-dbus-launch \
        moonshot-ui.spec \
-       vapi/moonshot-gnome-keyring.vapi
+       vapi/moonshot-gnome-keyring.vapi libmoonshot/libmoonshot.vapi
 
 noinst_PROGRAMS = \
         examples/client \
index 3299ee9..d62c32f 100644 (file)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -113,39 +123,10 @@ bin_PROGRAMS = src/moonshot$(EXEEXT) src/moonshot-webp$(EXEEXT)
 @IPC_DBUS_GLIB_FALSE@@IPC_DBUS_TRUE@   --define=IPC_GDBUS \
 @IPC_DBUS_GLIB_FALSE@@IPC_DBUS_TRUE@   --define=IPC_DBUS
 
+@GIO_VAPI_USES_ARRAYS_TRUE@am__append_18 = --define=GIO_VAPI_USES_ARRAYS
 noinst_PROGRAMS = examples/client$(EXEEXT) \
        examples/service-selection$(EXEEXT) tests/basic$(EXEEXT)
 subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-       $(top_srcdir)/configure $(am__configure_deps) \
-       $(srcdir)/config.h.in $(srcdir)/moonshot.desktop.in \
-       $(srcdir)/moonshot-webp.desktop.in \
-       $(srcdir)/moonshot-ui.spec.in \
-       src/moonshot-identity-manager-app.c \
-       src/moonshot-identity-management-view.c \
-       src/moonshot-local-flat-file-store.c \
-       src/moonshot-keyring-store.c src/moonshot-idcard-store.c \
-       src/moonshot-id.c src/moonshot-add-dialog.c \
-       src/moonshot-idcard-widget.c src/moonshot-custom-vbox.c \
-       src/moonshot-identities-manager.c \
-       src/moonshot-identity-request.c src/moonshot-server.c \
-       src/moonshot-password-dialog.c \
-       src/moonshot-provisioning-common.c src/moonshot-utils.c \
-       src/moonshot-webp-parser.c $(top_srcdir)/build-aux/depcomp \
-       $(srcdir)/config.vapi $(srcdir)/src_moonshot_vala.stamp \
-       $(srcdir)/src_moonshot_webp_vala.stamp \
-       $(dist_moonshotsysconf_DATA) $(dist_pkgdata_DATA) \
-       $(include_HEADERS) $(noinst_HEADERS) ABOUT-NLS INSTALL \
-       build-aux/compile build-aux/config.guess \
-       build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
-       build-aux/install-sh build-aux/missing build-aux/ltmain.sh \
-       $(top_srcdir)/build-aux/compile \
-       $(top_srcdir)/build-aux/config.guess \
-       $(top_srcdir)/build-aux/config.rpath \
-       $(top_srcdir)/build-aux/config.sub \
-       $(top_srcdir)/build-aux/install-sh \
-       $(top_srcdir)/build-aux/ltmain.sh \
-       $(top_srcdir)/build-aux/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
        $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \
@@ -158,6 +139,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
        $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+       $(am__configure_deps) $(dist_moonshotsysconf_DATA) \
+       $(dist_pkgdata_DATA) $(include_HEADERS) $(noinst_HEADERS) \
+       $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -375,6 +360,33 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+       $(srcdir)/config.vapi $(srcdir)/moonshot-ui.spec.in \
+       $(srcdir)/moonshot-webp.desktop.in \
+       $(srcdir)/moonshot.desktop.in \
+       $(srcdir)/src_moonshot_vala.stamp \
+       $(srcdir)/src_moonshot_webp_vala.stamp \
+       $(top_srcdir)/build-aux/compile \
+       $(top_srcdir)/build-aux/config.guess \
+       $(top_srcdir)/build-aux/config.rpath \
+       $(top_srcdir)/build-aux/config.sub \
+       $(top_srcdir)/build-aux/depcomp \
+       $(top_srcdir)/build-aux/install-sh \
+       $(top_srcdir)/build-aux/ltmain.sh \
+       $(top_srcdir)/build-aux/missing ABOUT-NLS INSTALL \
+       build-aux/compile build-aux/config.guess \
+       build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
+       build-aux/install-sh build-aux/ltmain.sh build-aux/missing \
+       src/moonshot-add-dialog.c src/moonshot-custom-vbox.c \
+       src/moonshot-id.c src/moonshot-idcard-store.c \
+       src/moonshot-idcard-widget.c src/moonshot-identities-manager.c \
+       src/moonshot-identity-management-view.c \
+       src/moonshot-identity-manager-app.c \
+       src/moonshot-identity-request.c src/moonshot-keyring-store.c \
+       src/moonshot-local-flat-file-store.c \
+       src/moonshot-password-dialog.c \
+       src/moonshot-provisioning-common.c src/moonshot-server.c \
+       src/moonshot-utils.c src/moonshot-webp-parser.c
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -593,7 +605,8 @@ AM_CPPFLAGS = -include config.h -DLOCALEDIR=\""$(localedir)"\" \
        $(am__append_11) $(am__append_16)
 AM_VALAFLAGS = -g config.vapi --vapidir=$(top_srcdir)/vapi --pkg \
        gio-2.0 $(am__append_2) $(am__append_4) $(am__append_8) \
-       $(am__append_12) $(am__append_15) $(am__append_17)
+       $(am__append_12) $(am__append_15) $(am__append_17) \
+       $(am__append_18)
 libmoonshot_libmoonshot_la_CPPFLAGS = \
         $(libmoonshot_CFLAGS) \
         $(AM_CPPFLAGS) 
@@ -666,7 +679,7 @@ EXTRA_DIST = webprovisioning/moonshot.xml $(dbusservice_in_files) \
        README.webprovisioning README.windows \
        moonshot-dbus-launch \
        moonshot-ui.spec \
-       vapi/moonshot-gnome-keyring.vapi
+       vapi/moonshot-gnome-keyring.vapi libmoonshot/libmoonshot.vapi
 
 examples_service_selection_SOURCES = examples/service-selection.c
 examples_service_selection_CPPFLAGS = $(moonshot_CFLAGS) $(AM_CPPFLAGS)
@@ -698,7 +711,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
        $(am__cd) $(top_srcdir) && \
          $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
        @case '$?' in \
          *config.status*) \
@@ -1819,15 +1831,15 @@ dist-xz: distdir
        $(am__post_remove_distdir)
 
 dist-tarZ: distdir
-       @echo WARNING: "Support for shar distribution archives is" \
-                      "deprecated." >&2
+       @echo WARNING: "Support for distribution archives compressed with" \
+                      "legacy program 'compress' is deprecated." >&2
        @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
        tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
        $(am__post_remove_distdir)
 
 dist-shar: distdir
-       @echo WARNING: "Support for distribution archives compressed with" \
-                      "legacy program 'compress' is deprecated." >&2
+       @echo WARNING: "Support for shar distribution archives is" \
+                      "deprecated." >&2
        @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
        shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
        $(am__post_remove_distdir)
@@ -1863,17 +1875,17 @@ distcheck: dist
        esac
        chmod -R a-w $(distdir)
        chmod u+w $(distdir)
-       mkdir $(distdir)/_build $(distdir)/_inst
+       mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
        chmod a-w $(distdir)
        test -d $(distdir)/_build || exit 0; \
        dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
          && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
          && am__cwd=`pwd` \
-         && $(am__cd) $(distdir)/_build \
-         && ../configure \
+         && $(am__cd) $(distdir)/_build/sub \
+         && ../../configure \
            $(AM_DISTCHECK_CONFIGURE_FLAGS) \
            $(DISTCHECK_CONFIGURE_FLAGS) \
-           --srcdir=.. --prefix="$$dc_install_base" \
+           --srcdir=../.. --prefix="$$dc_install_base" \
          && $(MAKE) $(AM_MAKEFLAGS) \
          && $(MAKE) $(AM_MAKEFLAGS) dvi \
          && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -2126,6 +2138,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dbusserviceDATA \
        uninstall-libLTLIBRARIES uninstall-mimeDATA \
        uninstall-pkglibexecSCRIPTS
 
+.PRECIOUS: Makefile
+
 
 # Build the MSVC lib. The sed hack fixes execution in the case that
 # the MSVC toolchain isn't in the PATH.
index 1b6aaac..a39c7e8 100644 (file)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -235,7 +235,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
 AS_VAR_IF([$1], [""], [$5], [$4])dnl
 ])# PKG_CHECK_VAR
 
-# Copyright (C) 2002-2013 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -247,10 +247,10 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.14'
+[am__api_version='1.15'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.14.1], [],
+m4_if([$1], [1.15], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -266,14 +266,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.14.1])dnl
+[AM_AUTOMAKE_VERSION([1.15])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -318,15 +318,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -357,7 +356,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -548,7 +547,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -624,7 +623,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -714,8 +713,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
@@ -789,6 +788,9 @@ END
     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
   fi
 fi
+dnl The trailing newline in this macro's definition is deliberate, for
+dnl backward compatibility and to allow trailing 'dnl'-style comments
+dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
 ])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
@@ -818,7 +820,7 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -829,7 +831,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\    *)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -839,7 +841,7 @@ if test x"${install_sh}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -861,7 +863,7 @@ AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -896,7 +898,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
 
 # Check to see how 'make' treats includes.                 -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -946,7 +948,7 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2013 Free Software Foundation, Inc.
+# Copyright (C) 1997-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -983,7 +985,7 @@ else
 fi
 ])
 
-# Copyright (C) 2003-2013 Free Software Foundation, Inc.
+# Copyright (C) 2003-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1017,7 +1019,7 @@ esac
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1046,7 +1048,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1093,7 +1095,7 @@ AC_LANG_POP([C])])
 # For backward compatibility.
 AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1112,7 +1114,7 @@ AC_DEFUN([AM_RUN_LOG],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1193,7 +1195,7 @@ AC_CONFIG_COMMANDS_PRE(
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+# Copyright (C) 2009-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1253,7 +1255,7 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2013 Free Software Foundation, Inc.
+# Copyright (C) 2001-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1281,7 +1283,7 @@ fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2013 Free Software Foundation, Inc.
+# Copyright (C) 2006-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1300,7 +1302,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2013 Free Software Foundation, Inc.
+# Copyright (C) 2004-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1433,7 +1435,7 @@ AC_SUBST([am__untar])
 
 # Autoconf support for the Vala compiler
 
-# Copyright (C) 2008-2013 Free Software Foundation, Inc.
+# Copyright (C) 2008-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
index 531136b..a85b723 100755 (executable)
@@ -3,7 +3,7 @@
 
 scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
index d654d03..bba4efb 100755 (executable)
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2014-05-01'
+timestamp='2014-09-11'
 
 # 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
@@ -302,6 +302,7 @@ case $basic_machine in
        | pdp10 | pdp11 | pj | pjl \
        | powerpc | powerpc64 | powerpc64le | powerpcle \
        | pyramid \
+       | riscv32 | riscv64 \
        | rl78 | rx \
        | score \
        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -828,6 +829,10 @@ case $basic_machine in
                basic_machine=powerpc-unknown
                os=-morphos
                ;;
+       moxiebox)
+               basic_machine=moxie-unknown
+               os=-moxiebox
+               ;;
        msdos)
                basic_machine=i386-pc
                os=-msdos
@@ -1373,7 +1378,7 @@ case $os in
              | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
              | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
              | -linux-newlib* | -linux-musl* | -linux-uclibc* \
-             | -uxpv* | -beos* | -mpeix* | -udk* \
+             | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
index 4ebd5b3..fc98710 100755 (executable)
@@ -3,7 +3,7 @@
 
 scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
index 377bb86..0b0fdcb 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-11-20.07; # UTC
+scriptversion=2013-12-25.23; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 
+tab='  '
 nl='
 '
-IFS=" ""       $nl"
+IFS=" $tab$nl"
 
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
 
-# Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
 
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@@ -68,17 +64,6 @@ mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
 posix_mkdir=
 
 # Desired mode of installed file.
@@ -97,7 +82,7 @@ dir_arg=
 dst_arg=
 
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 
 usage="\
 Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -137,46 +122,57 @@ while test $# -ne 0; do
     -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-       shift;;
+        shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-       case $mode in
-         *' '* | *'    '* | *'
-'*       | *'*'* | *'?'* | *'['*)
-           echo "$0: invalid mode: $mode" >&2
-           exit 1;;
-       esac
-       shift;;
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
 
     -o) chowncmd="$chownprog $2"
-       shift;;
+        shift;;
 
     -s) stripcmd=$stripprog;;
 
-    -t) dst_arg=$2
-       # Protect names problematic for 'test' and other utilities.
-       case $dst_arg in
-         -* | [=\(\)!]) dst_arg=./$dst_arg;;
-       esac
-       shift;;
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | [=\(\)!]) dst_arg=./$dst_arg;;
+        esac
+        shift;;
 
-    -T) no_target_directory=true;;
+    -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --)        shift
-       break;;
+    --) shift
+        break;;
 
-    -*)        echo "$0: invalid option: $1" >&2
-       exit 1;;
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
 
     *)  break;;
   esac
   shift
 done
 
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -208,6 +204,15 @@ if test $# -eq 0; then
 fi
 
 if test -z "$dir_arg"; then
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
   do_exit='(exit $ret); exit $ret'
   trap "ret=129; $do_exit" 1
   trap "ret=130; $do_exit" 2
@@ -223,16 +228,16 @@ if test -z "$dir_arg"; then
 
     *[0-7])
       if test -z "$stripcmd"; then
-       u_plus_rw=
+        u_plus_rw=
       else
-       u_plus_rw='% 200'
+        u_plus_rw='% 200'
       fi
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
     *)
       if test -z "$stripcmd"; then
-       u_plus_rw=
+        u_plus_rw=
       else
-       u_plus_rw=,u+rw
+        u_plus_rw=,u+rw
       fi
       cp_umask=$mode$u_plus_rw;;
   esac
@@ -269,41 +274,15 @@ do
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-       echo "$0: $dst_arg: Is a directory" >&2
-       exit 1
+      if test "$is_target_a_directory" = never; then
+        echo "$0: $dst_arg: Is a directory" >&2
+        exit 1
       fi
       dstdir=$dst
       dst=$dstdir/`basename "$src"`
       dstdir_status=0
     else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-       (dirname "$dst") 2>/dev/null ||
-       expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-            X"$dst" : 'X\(//\)[^/]' \| \
-            X"$dst" : 'X\(//\)$' \| \
-            X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-       echo X"$dst" |
-           sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-                  s//\1/
-                  q
-                }
-                /^X\(\/\/\)[^/].*/{
-                  s//\1/
-                  q
-                }
-                /^X\(\/\/\)$/{
-                  s//\1/
-                  q
-                }
-                /^X\(\/\).*/{
-                  s//\1/
-                  q
-                }
-                s/.*/./; q'
-      `
-
+      dstdir=`dirname "$dst"`
       test -d "$dstdir"
       dstdir_status=$?
     fi
@@ -314,74 +293,74 @@ do
   if test $dstdir_status != 0; then
     case $posix_mkdir in
       '')
-       # Create intermediate dirs using mode 755 as modified by the umask.
-       # This is like FreeBSD 'install' as of 1997-10-28.
-       umask=`umask`
-       case $stripcmd.$umask in
-         # Optimize common cases.
-         *[2367][2367]) mkdir_umask=$umask;;
-         .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-         *[0-7])
-           mkdir_umask=`expr $umask + 22 \
-             - $umask % 100 % 40 + $umask % 20 \
-             - $umask % 10 % 4 + $umask % 2
-           `;;
-         *) mkdir_umask=$umask,go-w;;
-       esac
-
-       # With -d, create the new directory with the user-specified mode.
-       # Otherwise, rely on $mkdir_umask.
-       if test -n "$dir_arg"; then
-         mkdir_mode=-m$mode
-       else
-         mkdir_mode=
-       fi
-
-       posix_mkdir=false
-       case $umask in
-         *[123567][0-7][0-7])
-           # POSIX mkdir -p sets u+wx bits regardless of umask, which
-           # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-           ;;
-         *)
-           tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-           trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-           if (umask $mkdir_umask &&
-               exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-           then
-             if test -z "$dir_arg" || {
-                  # Check for POSIX incompatibilities with -m.
-                  # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-                  # other-writable bit of parent directory when it shouldn't.
-                  # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-                  ls_ld_tmpdir=`ls -ld "$tmpdir"`
-                  case $ls_ld_tmpdir in
-                    d????-?r-*) different_mode=700;;
-                    d????-?--*) different_mode=755;;
-                    *) false;;
-                  esac &&
-                  $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-                    ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-                    test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-                  }
-                }
-             then posix_mkdir=:
-             fi
-             rmdir "$tmpdir/d" "$tmpdir"
-           else
-             # Remove any dirs left behind by ancient mkdir implementations.
-             rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-           fi
-           trap '' 0;;
-       esac;;
+        # Create intermediate dirs using mode 755 as modified by the umask.
+        # This is like FreeBSD 'install' as of 1997-10-28.
+        umask=`umask`
+        case $stripcmd.$umask in
+          # Optimize common cases.
+          *[2367][2367]) mkdir_umask=$umask;;
+          .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+          *[0-7])
+            mkdir_umask=`expr $umask + 22 \
+              - $umask % 100 % 40 + $umask % 20 \
+              - $umask % 10 % 4 + $umask % 2
+            `;;
+          *) mkdir_umask=$umask,go-w;;
+        esac
+
+        # With -d, create the new directory with the user-specified mode.
+        # Otherwise, rely on $mkdir_umask.
+        if test -n "$dir_arg"; then
+          mkdir_mode=-m$mode
+        else
+          mkdir_mode=
+        fi
+
+        posix_mkdir=false
+        case $umask in
+          *[123567][0-7][0-7])
+            # POSIX mkdir -p sets u+wx bits regardless of umask, which
+            # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+            ;;
+          *)
+            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+            trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+            if (umask $mkdir_umask &&
+                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+            then
+              if test -z "$dir_arg" || {
+                   # Check for POSIX incompatibilities with -m.
+                   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+                   # other-writable bit of parent directory when it shouldn't.
+                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+                   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+                   case $ls_ld_tmpdir in
+                     d????-?r-*) different_mode=700;;
+                     d????-?--*) different_mode=755;;
+                     *) false;;
+                   esac &&
+                   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+                     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+                   }
+                 }
+              then posix_mkdir=:
+              fi
+              rmdir "$tmpdir/d" "$tmpdir"
+            else
+              # Remove any dirs left behind by ancient mkdir implementations.
+              rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+            fi
+            trap '' 0;;
+        esac;;
     esac
 
     if
       $posix_mkdir && (
-       umask $mkdir_umask &&
-       $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+        umask $mkdir_umask &&
+        $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
       )
     then :
     else
@@ -391,53 +370,51 @@ do
       # directory the slow way, step by step, checking for races as we go.
 
       case $dstdir in
-       /*) prefix='/';;
-       [-=\(\)!]*) prefix='./';;
-       *)  prefix='';;
+        /*) prefix='/';;
+        [-=\(\)!]*) prefix='./';;
+        *)  prefix='';;
       esac
 
-      eval "$initialize_posix_glob"
-
       oIFS=$IFS
       IFS=/
-      $posix_glob set -f
+      set -f
       set fnord $dstdir
       shift
-      $posix_glob set +f
+      set +f
       IFS=$oIFS
 
       prefixes=
 
       for d
       do
-       test X"$d" = X && continue
-
-       prefix=$prefix$d
-       if test -d "$prefix"; then
-         prefixes=
-       else
-         if $posix_mkdir; then
-           (umask=$mkdir_umask &&
-            $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-           # Don't fail if two instances are running concurrently.
-           test -d "$prefix" || exit 1
-         else
-           case $prefix in
-             *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-             *) qprefix=$prefix;;
-           esac
-           prefixes="$prefixes '$qprefix'"
-         fi
-       fi
-       prefix=$prefix/
+        test X"$d" = X && continue
+
+        prefix=$prefix$d
+        if test -d "$prefix"; then
+          prefixes=
+        else
+          if $posix_mkdir; then
+            (umask=$mkdir_umask &&
+             $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+            # Don't fail if two instances are running concurrently.
+            test -d "$prefix" || exit 1
+          else
+            case $prefix in
+              *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+              *) qprefix=$prefix;;
+            esac
+            prefixes="$prefixes '$qprefix'"
+          fi
+        fi
+        prefix=$prefix/
       done
 
       if test -n "$prefixes"; then
-       # Don't fail if two instances are running concurrently.
-       (umask $mkdir_umask &&
-        eval "\$doit_exec \$mkdirprog $prefixes") ||
-         test -d "$dstdir" || exit 1
-       obsolete_mkdir_used=true
+        # Don't fail if two instances are running concurrently.
+        (umask $mkdir_umask &&
+         eval "\$doit_exec \$mkdirprog $prefixes") ||
+          test -d "$dstdir" || exit 1
+        obsolete_mkdir_used=true
       fi
     fi
   fi
@@ -472,15 +449,12 @@ do
 
     # If -C, don't bother to copy if it wouldn't change the file.
     if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"    2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
+       old=`LC_ALL=C ls -dlL "$dst"     2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"  2>/dev/null` &&
+       set -f &&
        set X $old && old=:$2:$4:$5:$6 &&
        set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
+       set +f &&
        test "$old" = "$new" &&
        $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
     then
@@ -493,24 +467,24 @@ do
       # to itself, or perhaps because mv is so ancient that it does not
       # support -f.
       {
-       # Now remove or move aside any old file at destination location.
-       # We try this two ways since rm can't unlink itself on some
-       # systems and the destination file might be busy for other
-       # reasons.  In this case, the final cleanup might fail but the new
-       # file should still install successfully.
-       {
-         test ! -f "$dst" ||
-         $doit $rmcmd -f "$dst" 2>/dev/null ||
-         { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-           { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-         } ||
-         { echo "$0: cannot unlink or rename $dst" >&2
-           (exit 1); exit 1
-         }
-       } &&
-
-       # Now rename the file to the real destination.
-       $doit $mvcmd "$dsttmp" "$dst"
+        # Now remove or move aside any old file at destination location.
+        # We try this two ways since rm can't unlink itself on some
+        # systems and the destination file might be busy for other
+        # reasons.  In this case, the final cleanup might fail but the new
+        # file should still install successfully.
+        {
+          test ! -f "$dst" ||
+          $doit $rmcmd -f "$dst" 2>/dev/null ||
+          { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+            { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+          } ||
+          { echo "$0: cannot unlink or rename $dst" >&2
+            (exit 1); exit 1
+          }
+        } &&
+
+        # Now rename the file to the real destination.
+        $doit $mvcmd "$dsttmp" "$dst"
       }
     fi || exit 1
 
index 3fd54df..bffda54 100644 (file)
@@ -70,7 +70,7 @@
 #         compiler:            $LTCC
 #         compiler flags:              $LTCFLAGS
 #         linker:              $LD (gnu? $with_gnu_ld)
-#         $progname:   (GNU libtool) 2.4.2 Debian-2.4.2-1.10
+#         $progname:   (GNU libtool) 2.4.2 Debian-2.4.2-1.11
 #         automake:    $automake_version
 #         autoconf:    $autoconf_version
 #
@@ -80,7 +80,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.10"
+VERSION="2.4.2 Debian-2.4.2-1.11"
 TIMESTAMP=""
 package_revision=1.3337
 
index db98974..f62bbae 100755 (executable)
@@ -3,7 +3,7 @@
 
 scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
index d7aaaf6..a078e29 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Moonshot-ui 0.7.1.
+# Generated by GNU Autoconf 2.69 for Moonshot-ui 0.7.2.
 #
 # Report bugs to <moonshot-community@jiscmail.ac.uk>.
 #
@@ -650,8 +650,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Moonshot-ui'
 PACKAGE_TARNAME='moonshot-ui'
-PACKAGE_VERSION='0.7.1'
-PACKAGE_STRING='Moonshot-ui 0.7.1'
+PACKAGE_VERSION='0.7.2'
+PACKAGE_STRING='Moonshot-ui 0.7.2'
 PACKAGE_BUGREPORT='moonshot-community@jiscmail.ac.uk'
 PACKAGE_URL='http://www.project-moonshot.org/'
 
@@ -732,6 +732,8 @@ MIDL
 MIDL_WRAPPER
 MSRPC_LIBS
 MSRPC_CFLAGS
+GIO_VAPI_USES_ARRAYS_FALSE
+GIO_VAPI_USES_ARRAYS_TRUE
 IPC_GDBUS_FALSE
 IPC_GDBUS_TRUE
 IPC_DBUS_GLIB_FALSE
@@ -1452,7 +1454,7 @@ if test "$ac_init_help" = "long"; then
   # 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 Moonshot-ui 0.7.1 to adapt to many kinds of systems.
+\`configure' configures Moonshot-ui 0.7.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1522,7 +1524,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Moonshot-ui 0.7.1:";;
+     short | recursive ) echo "Configuration of Moonshot-ui 0.7.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1658,7 +1660,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Moonshot-ui configure 0.7.1
+Moonshot-ui configure 0.7.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1936,7 +1938,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Moonshot-ui $as_me 0.7.1, which was
+It was created by Moonshot-ui $as_me 0.7.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2328,7 +2330,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-am__api_version='1.14'
+am__api_version='1.15'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2500,8 +2502,8 @@ test "$program_suffix" != NONE &&
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
@@ -2520,7 +2522,7 @@ else
 $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
-if test x"${install_sh}" != xset; then
+if test x"${install_sh+set}" != xset; then
   case $am_aux_dir in
   *\ * | *\    *)
     install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
@@ -2814,7 +2816,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='moonshot-ui'
- VERSION='0.7.1'
+ VERSION='0.7.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2848,8 +2850,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
 mkdir_p='$(MKDIR_P)'
 
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
+# We need awk for the "check" target (and possibly the TAP driver).  The
+# system "awk" is bad on some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
@@ -13479,10 +13481,31 @@ else
 fi
 
 
+vala_version=`$VALAC --version | sed 's/Vala  *//'`
+as_arg_v1="$vala_version"
+as_arg_v2=0.11.1
+awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
+case $? in #(
+  1) :
+    gio_vapi_uses_arrays="no" ;; #(
+  0) :
+    gio_vapi_uses_arrays="yes" ;; #(
+  2) :
+    gio_vapi_uses_arrays="yes" ;; #(
+  *) :
+     ;;
+esac
+ if test "$gio_vapi_uses_arrays" = "yes"; then
+  GIO_VAPI_USES_ARRAYS_TRUE=
+  GIO_VAPI_USES_ARRAYS_FALSE='#'
+else
+  GIO_VAPI_USES_ARRAYS_TRUE='#'
+  GIO_VAPI_USES_ARRAYS_FALSE=
+fi
+
 if test "$SERVER_IPC_MODULE" = "dbus-glib-1"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking $VALAC is no greater than 0.12.1" >&5
 $as_echo_n "checking $VALAC is no greater than 0.12.1... " >&6; }
-  vala_version=`$VALAC --version | sed 's/Vala  *//'`
   as_arg_v1=0.12.2
 as_arg_v2="$vala_version"
 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
@@ -16424,6 +16447,10 @@ if test -z "${IPC_GDBUS_TRUE}" && test -z "${IPC_GDBUS_FALSE}"; then
   as_fn_error $? "conditional \"IPC_GDBUS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${GIO_VAPI_USES_ARRAYS_TRUE}" && test -z "${GIO_VAPI_USES_ARRAYS_FALSE}"; then
+  as_fn_error $? "conditional \"GIO_VAPI_USES_ARRAYS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -16821,7 +16848,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Moonshot-ui $as_me 0.7.1, which was
+This file was extended by Moonshot-ui $as_me 0.7.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16888,7 +16915,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Moonshot-ui config.status 0.7.1
+Moonshot-ui config.status 0.7.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
index 8fa658b..ac4284e 100644 (file)
@@ -1,6 +1,6 @@
 AC_PREREQ([2.63])
 AC_INIT([Moonshot-ui],
-        [0.7.1],
+        [0.7.2],
         [moonshot-community@jiscmail.ac.uk],
         [moonshot-ui],
         [http://www.project-moonshot.org/])
index fd7b10e..90462e1 100644 (file)
@@ -1,6 +1,6 @@
 Name:           moonshot-ui
-Version:        0.7.1
-Release:        1%{?dist}
+Version:        0.7.2
+Release:        2%{?dist}
 Summary:        Moonshot Federated Identity User Interface
 
 Group:          Security Tools
diff --git a/po/Makefile.in b/po/Makefile.in
new file mode 100644 (file)
index 0000000..379ac26
--- /dev/null
@@ -0,0 +1,429 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2007 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.17
+GETTEXT_MACRO_VERSION = 0.17
+
+PACKAGE = moonshot-ui
+VERSION = 0.7.2
+PACKAGE_BUGREPORT = moonshot-community@jiscmail.ac.uk
+
+SHELL = /bin/sh
+
+
+srcdir = .
+top_srcdir = ..
+
+
+prefix = /usr/local
+exec_prefix = ${prefix}
+datarootdir = ${prefix}/share
+datadir = ${datarootdir}
+localedir = ${datarootdir}/locale
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = /usr/bin/install -c
+INSTALL_DATA = ${INSTALL} -m 644
+
+# We use $(mkdir_p).
+# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
+# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
+# ${SHELL} /home/hartmans/moonshot/moonshot/ui/build-aux/install-sh does not start with $(SHELL), so we add it.
+# In automake >= 1.10, /bin/mkdir -p is derived from ${MKDIR_P}, which is defined
+# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
+# versions, $(mkinstalldirs) and $(install_sh) are unused.
+mkinstalldirs = $(SHELL) ${SHELL} /home/hartmans/moonshot/moonshot/ui/build-aux/install-sh -d
+install_sh = $(SHELL) ${SHELL} /home/hartmans/moonshot/moonshot/ui/build-aux/install-sh
+MKDIR_P = /bin/mkdir -p
+mkdir_p = /bin/mkdir -p
+
+GMSGFMT_ = /usr/bin/msgfmt
+GMSGFMT_no = /usr/bin/msgfmt
+GMSGFMT_yes = /usr/bin/msgfmt
+GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
+MSGFMT_ = /usr/bin/msgfmt
+MSGFMT_no = /usr/bin/msgfmt
+MSGFMT_yes = /usr/bin/msgfmt
+MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
+XGETTEXT_ = /usr/bin/xgettext
+XGETTEXT_no = /usr/bin/xgettext
+XGETTEXT_yes = /usr/bin/xgettext
+XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = /usr/bin/msgmerge --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+
+# Makevars gets inserted here. (Don't remove this line!)
+
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+
+.po.mo:
+       @echo "$(MSGFMT) -c -o $@ $<"; \
+       $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+
+.po.gmo:
+       @lang=`echo $* | sed -e 's,.*/,,'`; \
+       test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+       echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
+       cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+       sed -e '/^#/d' $< > t-$@
+       mv t-$@ $@
+
+
+all: check-macro-version all-yes
+
+all-yes: stamp-po
+all-no:
+
+# Ensure that the gettext macros and this Makefile.in.in are in sync.
+check-macro-version:
+       @test "$(GETTEXT_MACRO_VERSION)" = "0.17" \
+         || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version 0.17" 1>&2; \
+              exit 1; \
+            }
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+       test ! -f $(srcdir)/$(DOMAIN).pot || \
+         test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+       @test ! -f $(srcdir)/$(DOMAIN).pot || { \
+         echo "touch stamp-po" && \
+         echo timestamp > stamp-poT && \
+         mv stamp-poT stamp-po; \
+       }
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+       if LC_ALL=C grep 'GNU moonshot-ui' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
+         package_gnu='GNU '; \
+       else \
+         package_gnu=''; \
+       fi; \
+       if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+         msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+       else \
+         msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+       fi; \
+       case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+         '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
+           $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS)  \
+             --files-from=$(srcdir)/POTFILES.in \
+             --copyright-holder='$(COPYRIGHT_HOLDER)' \
+             --msgid-bugs-address="$$msgid_bugs_address" \
+           ;; \
+         *) \
+           $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+             --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS)  \
+             --files-from=$(srcdir)/POTFILES.in \
+             --copyright-holder='$(COPYRIGHT_HOLDER)' \
+             --package-name="$${package_gnu}moonshot-ui" \
+             --package-version='0.7.2' \
+             --msgid-bugs-address="$$msgid_bugs_address" \
+           ;; \
+       esac
+       test ! -f $(DOMAIN).po || { \
+         if test -f $(srcdir)/$(DOMAIN).pot; then \
+           sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+           sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+           if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+             rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+           else \
+             rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+             mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+           fi; \
+         else \
+           mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+         fi; \
+       }
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+       $(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+       @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+       if test -f "$(srcdir)/$${lang}.po"; then \
+         test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+         echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+         cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+       else \
+         $(MAKE) $${lang}.po-create; \
+       fi
+
+
+install: install-exec install-data
+install-exec:
+install-data: install-data-yes
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+         for file in $(DISTFILES.common) Makevars.template; do \
+           $(INSTALL_DATA) $(srcdir)/$$file \
+                           $(DESTDIR)$(gettextsrcdir)/$$file; \
+         done; \
+         for file in Makevars; do \
+           rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+         done; \
+       else \
+         : ; \
+       fi
+install-data-no: all
+install-data-yes: all
+       $(mkdir_p) $(DESTDIR)$(datadir)
+       @catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+         cat=`basename $$cat`; \
+         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+         dir=$(localedir)/$$lang/LC_MESSAGES; \
+         $(mkdir_p) $(DESTDIR)$$dir; \
+         if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+         $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+         echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+         for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+           if test -n "$$lc"; then \
+             if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+               link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+               mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+               mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+                for file in *; do \
+                  if test -f $$file; then \
+                    ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+                  fi; \
+                done); \
+               rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+             else \
+               if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+                 :; \
+               else \
+                 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+                 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               fi; \
+             fi; \
+             rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+             ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+             ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+             cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+             echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+           fi; \
+         done; \
+       done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-yes
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+       else \
+         : ; \
+       fi
+installdirs-data-no:
+installdirs-data-yes:
+       $(mkdir_p) $(DESTDIR)$(datadir)
+       @catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+         cat=`basename $$cat`; \
+         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+         dir=$(localedir)/$$lang/LC_MESSAGES; \
+         $(mkdir_p) $(DESTDIR)$$dir; \
+         for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+           if test -n "$$lc"; then \
+             if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+               link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+               mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+               mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+                for file in *; do \
+                  if test -f $$file; then \
+                    ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+                  fi; \
+                done); \
+               rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+             else \
+               if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+                 :; \
+               else \
+                 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+                 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+               fi; \
+             fi; \
+           fi; \
+         done; \
+       done
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-yes
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         for file in $(DISTFILES.common) Makevars.template; do \
+           rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+         done; \
+       else \
+         : ; \
+       fi
+uninstall-data-no:
+uninstall-data-yes:
+       catalogs='$(CATALOGS)'; \
+       for cat in $$catalogs; do \
+         cat=`basename $$cat`; \
+         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+         for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+           rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+         done; \
+       done
+
+check: all
+
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
+
+mostlyclean:
+       rm -f remove-potcdate.sed
+       rm -f stamp-poT
+       rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+       rm -fr *.o
+
+clean: mostlyclean
+
+distclean: clean
+       rm -f Makefile Makefile.in POTFILES *.mo
+
+maintainer-clean: distclean
+       @echo "This command is intended for maintainers to use;"
+       @echo "it deletes files that may require special tools to rebuild."
+       rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+       $(MAKE) update-po
+       @$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
+       dists="$(DISTFILES)"; \
+       if test "$(PACKAGE)" = "gettext-tools"; then \
+         dists="$$dists Makevars.template"; \
+       fi; \
+       if test -f $(srcdir)/$(DOMAIN).pot; then \
+         dists="$$dists $(DOMAIN).pot stamp-po"; \
+       fi; \
+       if test -f $(srcdir)/ChangeLog; then \
+         dists="$$dists ChangeLog"; \
+       fi; \
+       for i in 0 1 2 3 4 5 6 7 8 9; do \
+         if test -f $(srcdir)/ChangeLog.$$i; then \
+           dists="$$dists ChangeLog.$$i"; \
+         fi; \
+       done; \
+       if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+       for file in $$dists; do \
+         if test -f $$file; then \
+           cp -p $$file $(distdir) || exit 1; \
+         else \
+           cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+         fi; \
+       done
+
+update-po: Makefile
+       $(MAKE) $(DOMAIN).pot-update
+       test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+       $(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+       @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+       echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+       exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+       @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+       if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+       tmpdir=`pwd`; \
+       echo "$$lang:"; \
+       test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+       echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+       cd $(srcdir); \
+       if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+         if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+           rm -f $$tmpdir/$$lang.new.po; \
+         else \
+           if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+             :; \
+           else \
+             echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+             exit 1; \
+           fi; \
+         fi; \
+       else \
+         echo "msgmerge for $$lang.po failed!" 1>&2; \
+         rm -f $$tmpdir/$$lang.new.po; \
+       fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+       @:
+
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+       cd $(top_builddir) \
+         && $(SHELL) ./config.status $(subdir)/$@.in po-directories
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/po/Makevars.template b/po/Makevars.template
new file mode 100644 (file)
index 0000000..32692ab
--- /dev/null
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/po/POTFILES b/po/POTFILES
new file mode 100644 (file)
index 0000000..116e01a
--- /dev/null
@@ -0,0 +1 @@
+     ../src/moonshot-identity-management-view.vala
index 0383e80..7c7b026 100644 (file)
@@ -8,9 +8,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: moonshot-ui 0.7.1\n"
+"Project-Id-Version: moonshot-ui 0.7.2\n"
 "Report-Msgid-Bugs-To: moonshot-community@jiscmail.ac.uk\n"
-"POT-Creation-Date: 2014-09-03 18:44+0000\n"
+"POT-Creation-Date: 2015-07-14 19:31+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/remove-potcdate.sed b/po/remove-potcdate.sed
new file mode 100644 (file)
index 0000000..edb38d7
--- /dev/null
@@ -0,0 +1,11 @@
+/^"POT-Creation-Date: .*"$/{
+x
+s/P/P/
+ta
+g
+d
+bb
+:a
+x
+:b
+}
index a3fb92f..d6a3ee0 100644 (file)
@@ -1,4 +1,4 @@
-/* moonshot-add-dialog.c generated by valac 0.26.1, the Vala compiler
+/* moonshot-add-dialog.c generated by valac 0.28.0, the Vala compiler
  * generated from moonshot-add-dialog.vala, do not modify */
 
 /*
@@ -124,11 +124,11 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static const gchar* string_to_string (const gchar* self) {
        const gchar* result = NULL;
-#line 1314 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1314 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        g_return_val_if_fail (self != NULL, NULL);
-#line 1315 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        result = self;
-#line 1315 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        return result;
 #line 134 "moonshot-add-dialog.c"
 }
index 436ad1f..7e6c9d8 100644 (file)
@@ -1,4 +1,4 @@
-/* moonshot-custom-vbox.c generated by valac 0.26.1, the Vala compiler
+/* moonshot-custom-vbox.c generated by valac 0.28.0, the Vala compiler
  * generated from moonshot-custom-vbox.vala, do not modify */
 
 /*
index 2f03990..65e2cce 100644 (file)
@@ -1,4 +1,4 @@
-/* moonshot-id.c generated by valac 0.26.1, the Vala compiler
+/* moonshot-id.c generated by valac 0.28.0, the Vala compiler
  * generated from moonshot-id.vala, do not modify */
 
 /*
index a4fd444..4293afb 100644 (file)
@@ -1,4 +1,4 @@
-/* moonshot-idcard-store.c generated by valac 0.26.1, the Vala compiler
+/* moonshot-idcard-store.c generated by valac 0.28.0, the Vala compiler
  * generated from moonshot-idcard-store.vala, do not modify */
 
 /*
index acb4086..c647c8f 100644 (file)
@@ -1,4 +1,4 @@
-/* moonshot-idcard-widget.c generated by valac 0.26.1, the Vala compiler
+/* moonshot-idcard-widget.c generated by valac 0.28.0, the Vala compiler
  * generated from moonshot-idcard-widget.vala, do not modify */
 
 /*
index a88dc62..374ded9 100644 (file)
@@ -1,4 +1,4 @@
-/* moonshot-identities-manager.c generated by valac 0.26.1, the Vala compiler
+/* moonshot-identities-manager.c generated by valac 0.28.0, the Vala compiler
  * generated from moonshot-identities-manager.vala, do not modify */
 
 /*
@@ -257,9 +257,9 @@ enum  {
 #define IDENTITY_MANAGER_MODEL_FILE_NAME "identities.txt"
 GeeLinkedList* identity_manager_model_get_card_list (IdentityManagerModel* self);
 GeeLinkedList* iidentity_card_store_get_card_list (IIdentityCardStore* self);
-static gint __lambda4_ (IdentityManagerModel* self, IdCard* a, IdCard* b);
+static gint __lambda4_ (gconstpointer a, gconstpointer b);
 gboolean id_card_IsNoIdentity (IdCard* self);
-static gint ___lambda4__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
+static gint ___lambda4__gcompare_func (gconstpointer a, gconstpointer b);
 IdCard* id_card_NewNoIdentity (void);
 gboolean id_card_get_store_password (IdCard* self);
 gboolean identity_manager_model_display_name_is_valid (IdentityManagerModel* self, const gchar* name, gchar** candidate);
@@ -873,13 +873,13 @@ static gpointer _g_object_ref0 (gpointer self) {
 }
 
 
-static gint __lambda4_ (IdentityManagerModel* self, IdCard* a, IdCard* b) {
+static gint __lambda4_ (gconstpointer a, gconstpointer b) {
        gint result = 0;
        IdCard* id_a = NULL;
-       IdCard* _tmp0_ = NULL;
+       gconstpointer _tmp0_ = NULL;
        IdCard* _tmp1_ = NULL;
        IdCard* id_b = NULL;
-       IdCard* _tmp2_ = NULL;
+       gconstpointer _tmp2_ = NULL;
        IdCard* _tmp3_ = NULL;
        gboolean _tmp4_ = FALSE;
        IdCard* _tmp5_ = NULL;
@@ -892,10 +892,6 @@ static gint __lambda4_ (IdentityManagerModel* self, IdCard* a, IdCard* b) {
        const gchar* _tmp19_ = NULL;
        const gchar* _tmp20_ = NULL;
        gint _tmp21_ = 0;
-#line 94 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-       g_return_val_if_fail (a != NULL, 0);
-#line 94 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-       g_return_val_if_fail (b != NULL, 0);
 #line 95 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp0_ = a;
 #line 95 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -914,7 +910,7 @@ static gint __lambda4_ (IdentityManagerModel* self, IdCard* a, IdCard* b) {
        _tmp6_ = id_card_IsNoIdentity (_tmp5_);
 #line 97 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp6_) {
-#line 918 "moonshot-identities-manager.c"
+#line 914 "moonshot-identities-manager.c"
                IdCard* _tmp7_ = NULL;
                gboolean _tmp8_ = FALSE;
 #line 97 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -923,11 +919,11 @@ static gint __lambda4_ (IdentityManagerModel* self, IdCard* a, IdCard* b) {
                _tmp8_ = id_card_IsNoIdentity (_tmp7_);
 #line 97 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp4_ = !_tmp8_;
-#line 927 "moonshot-identities-manager.c"
+#line 923 "moonshot-identities-manager.c"
        } else {
 #line 97 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp4_ = FALSE;
-#line 931 "moonshot-identities-manager.c"
+#line 927 "moonshot-identities-manager.c"
        }
 #line 97 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp4_) {
@@ -939,7 +935,7 @@ static gint __lambda4_ (IdentityManagerModel* self, IdCard* a, IdCard* b) {
                _g_object_unref0 (id_a);
 #line 98 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                return result;
-#line 943 "moonshot-identities-manager.c"
+#line 939 "moonshot-identities-manager.c"
        } else {
                gboolean _tmp9_ = FALSE;
                IdCard* _tmp10_ = NULL;
@@ -950,7 +946,7 @@ static gint __lambda4_ (IdentityManagerModel* self, IdCard* a, IdCard* b) {
                _tmp11_ = id_card_IsNoIdentity (_tmp10_);
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                if (_tmp11_) {
-#line 954 "moonshot-identities-manager.c"
+#line 950 "moonshot-identities-manager.c"
                        IdCard* _tmp12_ = NULL;
                        gboolean _tmp13_ = FALSE;
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -959,11 +955,11 @@ static gint __lambda4_ (IdentityManagerModel* self, IdCard* a, IdCard* b) {
                        _tmp13_ = id_card_IsNoIdentity (_tmp12_);
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _tmp9_ = !_tmp13_;
-#line 963 "moonshot-identities-manager.c"
+#line 959 "moonshot-identities-manager.c"
                } else {
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _tmp9_ = FALSE;
-#line 967 "moonshot-identities-manager.c"
+#line 963 "moonshot-identities-manager.c"
                }
 #line 99 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                if (_tmp9_) {
@@ -975,7 +971,7 @@ static gint __lambda4_ (IdentityManagerModel* self, IdCard* a, IdCard* b) {
                        _g_object_unref0 (id_a);
 #line 100 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        return result;
-#line 979 "moonshot-identities-manager.c"
+#line 975 "moonshot-identities-manager.c"
                }
        }
 #line 102 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -1002,16 +998,16 @@ static gint __lambda4_ (IdentityManagerModel* self, IdCard* a, IdCard* b) {
        _g_object_unref0 (id_a);
 #line 102 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 1006 "moonshot-identities-manager.c"
+#line 1002 "moonshot-identities-manager.c"
 }
 
 
-static gint ___lambda4__gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gint ___lambda4__gcompare_func (gconstpointer a, gconstpointer b) {
        gint result;
-       result = __lambda4_ ((IdentityManagerModel*) self, (IdCard*) a, (IdCard*) b);
+       result = __lambda4_ (a, b);
 #line 94 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 1015 "moonshot-identities-manager.c"
+#line 1011 "moonshot-identities-manager.c"
 }
 
 
@@ -1036,18 +1032,18 @@ GeeLinkedList* identity_manager_model_get_card_list (IdentityManagerModel* self)
 #line 94 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp2_ = identities;
 #line 94 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-       gee_list_sort ((GeeList*) _tmp2_, ___lambda4__gcompare_data_func, g_object_ref (self), g_object_unref);
+       gee_list_sort ((GeeList*) _tmp2_, ___lambda4__gcompare_func);
 #line 104 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp4_ = identities;
 #line 104 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
-       _tmp5_ = gee_collection_get_is_empty ((GeeCollection*) _tmp4_);
+       _tmp5_ = gee_abstract_collection_get_is_empty ((GeeAbstractCollection*) _tmp4_);
 #line 104 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp6_ = _tmp5_;
 #line 104 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp6_) {
 #line 104 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp3_ = TRUE;
-#line 1051 "moonshot-identities-manager.c"
+#line 1047 "moonshot-identities-manager.c"
        } else {
                GeeLinkedList* _tmp7_ = NULL;
                gpointer _tmp8_ = NULL;
@@ -1065,11 +1061,11 @@ GeeLinkedList* identity_manager_model_get_card_list (IdentityManagerModel* self)
                _tmp3_ = !_tmp10_;
 #line 104 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _g_object_unref0 (_tmp9_);
-#line 1069 "moonshot-identities-manager.c"
+#line 1065 "moonshot-identities-manager.c"
        }
 #line 104 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp3_) {
-#line 1073 "moonshot-identities-manager.c"
+#line 1069 "moonshot-identities-manager.c"
                GeeLinkedList* _tmp11_ = NULL;
                IdCard* _tmp12_ = NULL;
                IdCard* _tmp13_ = NULL;
@@ -1083,7 +1079,7 @@ GeeLinkedList* identity_manager_model_get_card_list (IdentityManagerModel* self)
                gee_abstract_list_insert ((GeeAbstractList*) _tmp11_, 0, _tmp13_);
 #line 105 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _g_object_unref0 (_tmp13_);
-#line 1087 "moonshot-identities-manager.c"
+#line 1083 "moonshot-identities-manager.c"
        }
        {
                GeeLinkedList* _id_card_list = NULL;
@@ -1112,7 +1108,7 @@ GeeLinkedList* identity_manager_model_get_card_list (IdentityManagerModel* self)
                _id_card_index = -1;
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                while (TRUE) {
-#line 1116 "moonshot-identities-manager.c"
+#line 1112 "moonshot-identities-manager.c"
                        gint _tmp19_ = 0;
                        gint _tmp20_ = 0;
                        gint _tmp21_ = 0;
@@ -1135,7 +1131,7 @@ GeeLinkedList* identity_manager_model_get_card_list (IdentityManagerModel* self)
                        if (!(_tmp20_ < _tmp21_)) {
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                break;
-#line 1139 "moonshot-identities-manager.c"
+#line 1135 "moonshot-identities-manager.c"
                        }
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _tmp22_ = _id_card_list;
@@ -1153,7 +1149,7 @@ GeeLinkedList* identity_manager_model_get_card_list (IdentityManagerModel* self)
                        _tmp27_ = _tmp26_;
 #line 107 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        if (!_tmp27_) {
-#line 1157 "moonshot-identities-manager.c"
+#line 1153 "moonshot-identities-manager.c"
                                PasswordHashTable* _tmp28_ = NULL;
                                IdCard* _tmp29_ = NULL;
                                IIdentityCardStore* _tmp30_ = NULL;
@@ -1165,21 +1161,21 @@ GeeLinkedList* identity_manager_model_get_card_list (IdentityManagerModel* self)
                                _tmp30_ = self->priv->store;
 #line 108 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                password_hash_table_RetrievePassword (_tmp28_, _tmp29_, _tmp30_);
-#line 1169 "moonshot-identities-manager.c"
+#line 1165 "moonshot-identities-manager.c"
                        }
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _g_object_unref0 (id_card);
-#line 1173 "moonshot-identities-manager.c"
+#line 1169 "moonshot-identities-manager.c"
                }
 #line 106 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _g_object_unref0 (_id_card_list);
-#line 1177 "moonshot-identities-manager.c"
+#line 1173 "moonshot-identities-manager.c"
        }
 #line 111 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        result = identities;
 #line 111 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 1183 "moonshot-identities-manager.c"
+#line 1179 "moonshot-identities-manager.c"
 }
 
 
@@ -1196,7 +1192,7 @@ gboolean identity_manager_model_display_name_is_valid (IdentityManagerModel* sel
                _g_free0 (_vala_candidate);
 #line 120 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _vala_candidate = NULL;
-#line 1200 "moonshot-identities-manager.c"
+#line 1196 "moonshot-identities-manager.c"
        }
        {
                GeeLinkedList* _id_card_list = NULL;
@@ -1225,7 +1221,7 @@ gboolean identity_manager_model_display_name_is_valid (IdentityManagerModel* sel
                _id_card_index = -1;
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                while (TRUE) {
-#line 1229 "moonshot-identities-manager.c"
+#line 1225 "moonshot-identities-manager.c"
                        gint _tmp5_ = 0;
                        gint _tmp6_ = 0;
                        gint _tmp7_ = 0;
@@ -1249,7 +1245,7 @@ gboolean identity_manager_model_display_name_is_valid (IdentityManagerModel* sel
                        if (!(_tmp6_ < _tmp7_)) {
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                break;
-#line 1253 "moonshot-identities-manager.c"
+#line 1249 "moonshot-identities-manager.c"
                        }
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _tmp8_ = _id_card_list;
@@ -1271,19 +1267,19 @@ gboolean identity_manager_model_display_name_is_valid (IdentityManagerModel* sel
                        if (g_strcmp0 (_tmp13_, _tmp14_) == 0) {
 #line 125 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                if ((&_vala_candidate) != NULL) {
-#line 1275 "moonshot-identities-manager.c"
+#line 1271 "moonshot-identities-manager.c"
                                        {
                                                gint i = 0;
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                i = 0;
-#line 1280 "moonshot-identities-manager.c"
+#line 1276 "moonshot-identities-manager.c"
                                                {
                                                        gboolean _tmp15_ = FALSE;
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                        _tmp15_ = TRUE;
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                        while (TRUE) {
-#line 1287 "moonshot-identities-manager.c"
+#line 1283 "moonshot-identities-manager.c"
                                                                gint _tmp17_ = 0;
                                                                gchar* tmp = NULL;
                                                                const gchar* _tmp18_ = NULL;
@@ -1293,13 +1289,13 @@ gboolean identity_manager_model_display_name_is_valid (IdentityManagerModel* sel
                                                                gboolean _tmp22_ = FALSE;
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                                if (!_tmp15_) {
-#line 1297 "moonshot-identities-manager.c"
+#line 1293 "moonshot-identities-manager.c"
                                                                        gint _tmp16_ = 0;
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                                        _tmp16_ = i;
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                                        i = _tmp16_ + 1;
-#line 1303 "moonshot-identities-manager.c"
+#line 1299 "moonshot-identities-manager.c"
                                                                }
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                                _tmp15_ = FALSE;
@@ -1309,7 +1305,7 @@ gboolean identity_manager_model_display_name_is_valid (IdentityManagerModel* sel
                                                                if (!(_tmp17_ < 1000)) {
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                                        break;
-#line 1313 "moonshot-identities-manager.c"
+#line 1309 "moonshot-identities-manager.c"
                                                                }
 #line 129 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                                _tmp18_ = name;
@@ -1325,7 +1321,7 @@ gboolean identity_manager_model_display_name_is_valid (IdentityManagerModel* sel
                                                                _tmp22_ = identity_manager_model_display_name_is_valid (self, _tmp21_, NULL);
 #line 130 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                                if (_tmp22_) {
-#line 1329 "moonshot-identities-manager.c"
+#line 1325 "moonshot-identities-manager.c"
                                                                        const gchar* _tmp23_ = NULL;
                                                                        gchar* _tmp24_ = NULL;
 #line 132 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -1340,11 +1336,11 @@ gboolean identity_manager_model_display_name_is_valid (IdentityManagerModel* sel
                                                                        _g_free0 (tmp);
 #line 133 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                                        break;
-#line 1344 "moonshot-identities-manager.c"
+#line 1340 "moonshot-identities-manager.c"
                                                                }
 #line 127 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                                _g_free0 (tmp);
-#line 1348 "moonshot-identities-manager.c"
+#line 1344 "moonshot-identities-manager.c"
                                                        }
                                                }
                                        }
@@ -1359,23 +1355,23 @@ gboolean identity_manager_model_display_name_is_valid (IdentityManagerModel* sel
                                if (candidate) {
 #line 137 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                        *candidate = _vala_candidate;
-#line 1363 "moonshot-identities-manager.c"
+#line 1359 "moonshot-identities-manager.c"
                                } else {
 #line 137 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                        _g_free0 (_vala_candidate);
-#line 1367 "moonshot-identities-manager.c"
+#line 1363 "moonshot-identities-manager.c"
                                }
 #line 137 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                return result;
-#line 1371 "moonshot-identities-manager.c"
+#line 1367 "moonshot-identities-manager.c"
                        }
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _g_object_unref0 (id_card);
-#line 1375 "moonshot-identities-manager.c"
+#line 1371 "moonshot-identities-manager.c"
                }
 #line 121 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _g_object_unref0 (_id_card_list);
-#line 1379 "moonshot-identities-manager.c"
+#line 1375 "moonshot-identities-manager.c"
        }
 #line 140 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        result = TRUE;
@@ -1383,15 +1379,15 @@ gboolean identity_manager_model_display_name_is_valid (IdentityManagerModel* sel
        if (candidate) {
 #line 140 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                *candidate = _vala_candidate;
-#line 1387 "moonshot-identities-manager.c"
+#line 1383 "moonshot-identities-manager.c"
        } else {
 #line 140 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _g_free0 (_vala_candidate);
-#line 1391 "moonshot-identities-manager.c"
+#line 1387 "moonshot-identities-manager.c"
        }
 #line 140 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 1395 "moonshot-identities-manager.c"
+#line 1391 "moonshot-identities-manager.c"
 }
 
 
@@ -1407,20 +1403,20 @@ static gboolean identity_manager_model_remove_duplicates (IdentityManagerModel*
        duplicate_found = FALSE;
 #line 146 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        found = FALSE;
-#line 1411 "moonshot-identities-manager.c"
+#line 1407 "moonshot-identities-manager.c"
        {
                gboolean _tmp0_ = FALSE;
 #line 147 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp0_ = TRUE;
 #line 147 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                while (TRUE) {
-#line 1418 "moonshot-identities-manager.c"
+#line 1414 "moonshot-identities-manager.c"
                        GeeLinkedList* cards = NULL;
                        IIdentityCardStore* _tmp2_ = NULL;
                        GeeLinkedList* _tmp3_ = NULL;
 #line 147 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        if (!_tmp0_) {
-#line 1424 "moonshot-identities-manager.c"
+#line 1420 "moonshot-identities-manager.c"
                                gboolean _tmp1_ = FALSE;
 #line 158 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                _tmp1_ = found;
@@ -1428,7 +1424,7 @@ static gboolean identity_manager_model_remove_duplicates (IdentityManagerModel*
                                if (!_tmp1_) {
 #line 158 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                        break;
-#line 1432 "moonshot-identities-manager.c"
+#line 1428 "moonshot-identities-manager.c"
                                }
                        }
 #line 147 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -1441,7 +1437,7 @@ static gboolean identity_manager_model_remove_duplicates (IdentityManagerModel*
                        cards = _tmp3_;
 #line 149 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        found = FALSE;
-#line 1445 "moonshot-identities-manager.c"
+#line 1441 "moonshot-identities-manager.c"
                        {
                                GeeLinkedList* _id_card_list = NULL;
                                GeeLinkedList* _tmp4_ = NULL;
@@ -1469,7 +1465,7 @@ static gboolean identity_manager_model_remove_duplicates (IdentityManagerModel*
                                _id_card_index = -1;
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                while (TRUE) {
-#line 1473 "moonshot-identities-manager.c"
+#line 1469 "moonshot-identities-manager.c"
                                        gint _tmp9_ = 0;
                                        gint _tmp10_ = 0;
                                        gint _tmp11_ = 0;
@@ -1492,7 +1488,7 @@ static gboolean identity_manager_model_remove_duplicates (IdentityManagerModel*
                                        if (!(_tmp10_ < _tmp11_)) {
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                break;
-#line 1496 "moonshot-identities-manager.c"
+#line 1492 "moonshot-identities-manager.c"
                                        }
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                        _tmp12_ = _id_card_list;
@@ -1508,7 +1504,7 @@ static gboolean identity_manager_model_remove_duplicates (IdentityManagerModel*
                                        _tmp17_ = id_card;
 #line 151 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                        if (_tmp16_ != _tmp17_) {
-#line 1512 "moonshot-identities-manager.c"
+#line 1508 "moonshot-identities-manager.c"
                                                IdCard* _tmp18_ = NULL;
                                                const gchar* _tmp19_ = NULL;
                                                const gchar* _tmp20_ = NULL;
@@ -1529,15 +1525,15 @@ static gboolean identity_manager_model_remove_duplicates (IdentityManagerModel*
                                                _tmp23_ = _tmp22_;
 #line 151 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                _tmp15_ = g_strcmp0 (_tmp20_, _tmp23_) == 0;
-#line 1533 "moonshot-identities-manager.c"
+#line 1529 "moonshot-identities-manager.c"
                                        } else {
 #line 151 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                _tmp15_ = FALSE;
-#line 1537 "moonshot-identities-manager.c"
+#line 1533 "moonshot-identities-manager.c"
                                        }
 #line 151 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                        if (_tmp15_) {
-#line 1541 "moonshot-identities-manager.c"
+#line 1537 "moonshot-identities-manager.c"
                                                FILE* _tmp24_ = NULL;
                                                IdCard* _tmp25_ = NULL;
                                                const gchar* _tmp26_ = NULL;
@@ -1568,26 +1564,26 @@ static gboolean identity_manager_model_remove_duplicates (IdentityManagerModel*
                                                _g_object_unref0 (id_card);
 #line 155 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                                break;
-#line 1572 "moonshot-identities-manager.c"
+#line 1568 "moonshot-identities-manager.c"
                                        }
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                        _g_object_unref0 (id_card);
-#line 1576 "moonshot-identities-manager.c"
+#line 1572 "moonshot-identities-manager.c"
                                }
 #line 150 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                _g_object_unref0 (_id_card_list);
-#line 1580 "moonshot-identities-manager.c"
+#line 1576 "moonshot-identities-manager.c"
                        }
 #line 147 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _g_object_unref0 (cards);
-#line 1584 "moonshot-identities-manager.c"
+#line 1580 "moonshot-identities-manager.c"
                }
        }
 #line 159 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        result = duplicate_found;
 #line 159 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 1591 "moonshot-identities-manager.c"
+#line 1587 "moonshot-identities-manager.c"
 }
 
 
@@ -1616,7 +1612,7 @@ IdCard* identity_manager_model_find_id_card (IdentityManagerModel* self, const g
        if (_tmp1_) {
 #line 166 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                identity_manager_model_set_store_type (self, IIDENTITY_CARD_STORE_STORE_TYPE_FLAT_FILE);
-#line 1620 "moonshot-identities-manager.c"
+#line 1616 "moonshot-identities-manager.c"
        }
        {
                GeeLinkedList* _id_list = NULL;
@@ -1642,7 +1638,7 @@ IdCard* identity_manager_model_find_id_card (IdentityManagerModel* self, const g
                _id_index = -1;
 #line 168 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                while (TRUE) {
-#line 1646 "moonshot-identities-manager.c"
+#line 1642 "moonshot-identities-manager.c"
                        gint _tmp6_ = 0;
                        gint _tmp7_ = 0;
                        gint _tmp8_ = 0;
@@ -1666,7 +1662,7 @@ IdCard* identity_manager_model_find_id_card (IdentityManagerModel* self, const g
                        if (!(_tmp7_ < _tmp8_)) {
 #line 168 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                break;
-#line 1670 "moonshot-identities-manager.c"
+#line 1666 "moonshot-identities-manager.c"
                        }
 #line 168 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _tmp9_ = _id_list;
@@ -1686,7 +1682,7 @@ IdCard* identity_manager_model_find_id_card (IdentityManagerModel* self, const g
                        _tmp15_ = nai;
 #line 169 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        if (g_strcmp0 (_tmp14_, _tmp15_) == 0) {
-#line 1690 "moonshot-identities-manager.c"
+#line 1686 "moonshot-identities-manager.c"
                                IdCard* _tmp16_ = NULL;
                                IdCard* _tmp17_ = NULL;
 #line 170 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -1701,15 +1697,15 @@ IdCard* identity_manager_model_find_id_card (IdentityManagerModel* self, const g
                                _g_object_unref0 (id);
 #line 171 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                break;
-#line 1705 "moonshot-identities-manager.c"
+#line 1701 "moonshot-identities-manager.c"
                        }
 #line 168 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _g_object_unref0 (id);
-#line 1709 "moonshot-identities-manager.c"
+#line 1705 "moonshot-identities-manager.c"
                }
 #line 168 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _g_object_unref0 (_id_list);
-#line 1713 "moonshot-identities-manager.c"
+#line 1709 "moonshot-identities-manager.c"
        }
 #line 174 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp18_ = saved_store_type;
@@ -1719,29 +1715,29 @@ IdCard* identity_manager_model_find_id_card (IdentityManagerModel* self, const g
        _tmp20_ = force_flat_file_store;
 #line 175 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp20_) {
-#line 1723 "moonshot-identities-manager.c"
+#line 1719 "moonshot-identities-manager.c"
                IIdentityCardStoreStoreType _tmp21_ = 0;
 #line 176 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp21_ = saved_store_type;
 #line 176 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp19_ = _tmp21_ != IIDENTITY_CARD_STORE_STORE_TYPE_FLAT_FILE;
-#line 1729 "moonshot-identities-manager.c"
+#line 1725 "moonshot-identities-manager.c"
        } else {
 #line 175 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp19_ = FALSE;
-#line 1733 "moonshot-identities-manager.c"
+#line 1729 "moonshot-identities-manager.c"
        }
 #line 175 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp19_) {
 #line 177 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                g_signal_emit_by_name (self, "card-list-changed");
-#line 1739 "moonshot-identities-manager.c"
+#line 1735 "moonshot-identities-manager.c"
        }
 #line 178 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        result = retval;
 #line 178 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 1745 "moonshot-identities-manager.c"
+#line 1741 "moonshot-identities-manager.c"
 }
 
 
@@ -1779,7 +1775,7 @@ void identity_manager_model_add_card (IdentityManagerModel* self, IdCard* card,
        if (_tmp2_) {
 #line 183 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                return;
-#line 1783 "moonshot-identities-manager.c"
+#line 1779 "moonshot-identities-manager.c"
        }
 #line 186 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp3_ = identity_manager_model_get_store_type (self);
@@ -1791,7 +1787,7 @@ void identity_manager_model_add_card (IdentityManagerModel* self, IdCard* card,
        if (_tmp4_) {
 #line 189 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                identity_manager_model_set_store_type (self, IIDENTITY_CARD_STORE_STORE_TYPE_FLAT_FILE);
-#line 1795 "moonshot-identities-manager.c"
+#line 1791 "moonshot-identities-manager.c"
        }
 #line 191 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp5_ = card;
@@ -1811,7 +1807,7 @@ void identity_manager_model_add_card (IdentityManagerModel* self, IdCard* card,
        candidate = _tmp9_;
 #line 193 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (!_tmp10_) {
-#line 1815 "moonshot-identities-manager.c"
+#line 1811 "moonshot-identities-manager.c"
                IdCard* _tmp11_ = NULL;
                const gchar* _tmp12_ = NULL;
 #line 195 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -1820,7 +1816,7 @@ void identity_manager_model_add_card (IdentityManagerModel* self, IdCard* card,
                _tmp12_ = candidate;
 #line 195 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                id_card_set_display_name (_tmp11_, _tmp12_);
-#line 1824 "moonshot-identities-manager.c"
+#line 1820 "moonshot-identities-manager.c"
        }
 #line 198 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp13_ = card;
@@ -1830,7 +1826,7 @@ void identity_manager_model_add_card (IdentityManagerModel* self, IdCard* card,
        _tmp15_ = _tmp14_;
 #line 198 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (!_tmp15_) {
-#line 1834 "moonshot-identities-manager.c"
+#line 1830 "moonshot-identities-manager.c"
                PasswordHashTable* _tmp16_ = NULL;
                IdCard* _tmp17_ = NULL;
                IIdentityCardStore* _tmp18_ = NULL;
@@ -1842,7 +1838,7 @@ void identity_manager_model_add_card (IdentityManagerModel* self, IdCard* card,
                _tmp18_ = self->priv->store;
 #line 199 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                password_hash_table_CachePassword (_tmp16_, _tmp17_, _tmp18_);
-#line 1846 "moonshot-identities-manager.c"
+#line 1842 "moonshot-identities-manager.c"
        }
 #line 200 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp19_ = self->priv->store;
@@ -1858,7 +1854,7 @@ void identity_manager_model_add_card (IdentityManagerModel* self, IdCard* card,
        g_signal_emit_by_name (self, "card-list-changed");
 #line 181 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _g_free0 (candidate);
-#line 1862 "moonshot-identities-manager.c"
+#line 1858 "moonshot-identities-manager.c"
 }
 
 
@@ -1886,7 +1882,7 @@ IdCard* identity_manager_model_update_card (IdentityManagerModel* self, IdCard*
        _tmp2_ = _tmp1_;
 #line 207 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp2_) {
-#line 1890 "moonshot-identities-manager.c"
+#line 1886 "moonshot-identities-manager.c"
                IdCard* _tmp3_ = NULL;
                IdCard* _tmp4_ = NULL;
 #line 208 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -1901,7 +1897,7 @@ IdCard* identity_manager_model_update_card (IdentityManagerModel* self, IdCard*
                result = retval;
 #line 209 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                return result;
-#line 1905 "moonshot-identities-manager.c"
+#line 1901 "moonshot-identities-manager.c"
        }
 #line 212 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp5_ = card;
@@ -1911,7 +1907,7 @@ IdCard* identity_manager_model_update_card (IdentityManagerModel* self, IdCard*
        _tmp7_ = _tmp6_;
 #line 212 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (!_tmp7_) {
-#line 1915 "moonshot-identities-manager.c"
+#line 1911 "moonshot-identities-manager.c"
                PasswordHashTable* _tmp8_ = NULL;
                IdCard* _tmp9_ = NULL;
                IIdentityCardStore* _tmp10_ = NULL;
@@ -1923,7 +1919,7 @@ IdCard* identity_manager_model_update_card (IdentityManagerModel* self, IdCard*
                _tmp10_ = self->priv->store;
 #line 213 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                password_hash_table_CachePassword (_tmp8_, _tmp9_, _tmp10_);
-#line 1927 "moonshot-identities-manager.c"
+#line 1923 "moonshot-identities-manager.c"
        } else {
                PasswordHashTable* _tmp11_ = NULL;
                IdCard* _tmp12_ = NULL;
@@ -1936,7 +1932,7 @@ IdCard* identity_manager_model_update_card (IdentityManagerModel* self, IdCard*
                _tmp13_ = self->priv->store;
 #line 215 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                password_hash_table_RemovePassword (_tmp11_, _tmp12_, _tmp13_);
-#line 1940 "moonshot-identities-manager.c"
+#line 1936 "moonshot-identities-manager.c"
        }
 #line 216 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp14_ = self->priv->store;
@@ -1954,7 +1950,7 @@ IdCard* identity_manager_model_update_card (IdentityManagerModel* self, IdCard*
        result = retval;
 #line 218 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 1958 "moonshot-identities-manager.c"
+#line 1954 "moonshot-identities-manager.c"
 }
 
 
@@ -1985,7 +1981,7 @@ static gboolean identity_manager_model_remove_card_internal (IdentityManagerMode
                result = FALSE;
 #line 223 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                return result;
-#line 1989 "moonshot-identities-manager.c"
+#line 1985 "moonshot-identities-manager.c"
        }
 #line 224 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp3_ = self->priv->password_table;
@@ -2005,7 +2001,7 @@ static gboolean identity_manager_model_remove_card_internal (IdentityManagerMode
        result = _tmp8_;
 #line 225 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 2009 "moonshot-identities-manager.c"
+#line 2005 "moonshot-identities-manager.c"
 }
 
 
@@ -2029,13 +2025,13 @@ gboolean identity_manager_model_remove_card (IdentityManagerModel* self, IdCard*
                result = TRUE;
 #line 231 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                return result;
-#line 2033 "moonshot-identities-manager.c"
+#line 2029 "moonshot-identities-manager.c"
        }
 #line 233 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        result = FALSE;
 #line 233 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 2039 "moonshot-identities-manager.c"
+#line 2035 "moonshot-identities-manager.c"
 }
 
 
@@ -2049,7 +2045,7 @@ void identity_manager_model_set_store_type (IdentityManagerModel* self, IIdentit
        _tmp1_ = self->priv->store;
 #line 237 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp1_ != NULL) {
-#line 2053 "moonshot-identities-manager.c"
+#line 2049 "moonshot-identities-manager.c"
                IIdentityCardStore* _tmp2_ = NULL;
                IIdentityCardStoreStoreType _tmp3_ = 0;
                IIdentityCardStoreStoreType _tmp4_ = 0;
@@ -2061,17 +2057,17 @@ void identity_manager_model_set_store_type (IdentityManagerModel* self, IIdentit
                _tmp4_ = type;
 #line 237 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp0_ = _tmp3_ == _tmp4_;
-#line 2065 "moonshot-identities-manager.c"
+#line 2061 "moonshot-identities-manager.c"
        } else {
 #line 237 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _tmp0_ = FALSE;
-#line 2069 "moonshot-identities-manager.c"
+#line 2065 "moonshot-identities-manager.c"
        }
 #line 237 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        if (_tmp0_) {
 #line 238 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                return;
-#line 2075 "moonshot-identities-manager.c"
+#line 2071 "moonshot-identities-manager.c"
        }
 #line 239 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        _tmp5_ = type;
@@ -2079,7 +2075,7 @@ void identity_manager_model_set_store_type (IdentityManagerModel* self, IIdentit
        switch (_tmp5_) {
 #line 239 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                case IIDENTITY_CARD_STORE_STORE_TYPE_KEYRING:
-#line 2083 "moonshot-identities-manager.c"
+#line 2079 "moonshot-identities-manager.c"
                {
                        KeyringStore* _tmp6_ = NULL;
 #line 242 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -2090,12 +2086,12 @@ void identity_manager_model_set_store_type (IdentityManagerModel* self, IIdentit
                        self->priv->store = (IIdentityCardStore*) _tmp6_;
 #line 243 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        break;
-#line 2094 "moonshot-identities-manager.c"
+#line 2090 "moonshot-identities-manager.c"
                }
                default:
 #line 239 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                case IIDENTITY_CARD_STORE_STORE_TYPE_FLAT_FILE:
-#line 2099 "moonshot-identities-manager.c"
+#line 2095 "moonshot-identities-manager.c"
                {
                        LocalFlatFileStore* _tmp7_ = NULL;
 #line 247 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
@@ -2106,7 +2102,7 @@ void identity_manager_model_set_store_type (IdentityManagerModel* self, IIdentit
                        self->priv->store = (IIdentityCardStore*) _tmp7_;
 #line 248 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        break;
-#line 2110 "moonshot-identities-manager.c"
+#line 2106 "moonshot-identities-manager.c"
                }
        }
 }
@@ -2126,7 +2122,7 @@ IIdentityCardStoreStoreType identity_manager_model_get_store_type (IdentityManag
        result = _tmp1_;
 #line 253 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 2130 "moonshot-identities-manager.c"
+#line 2126 "moonshot-identities-manager.c"
 }
 
 
@@ -2134,7 +2130,7 @@ gboolean identity_manager_model_HasNonTrivialIdentities (IdentityManagerModel* s
        gboolean result = FALSE;
 #line 256 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        g_return_val_if_fail (self != NULL, FALSE);
-#line 2138 "moonshot-identities-manager.c"
+#line 2134 "moonshot-identities-manager.c"
        {
                GeeLinkedList* _card_list = NULL;
                IIdentityCardStore* _tmp0_ = NULL;
@@ -2162,7 +2158,7 @@ gboolean identity_manager_model_HasNonTrivialIdentities (IdentityManagerModel* s
                _card_index = -1;
 #line 257 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                while (TRUE) {
-#line 2166 "moonshot-identities-manager.c"
+#line 2162 "moonshot-identities-manager.c"
                        gint _tmp5_ = 0;
                        gint _tmp6_ = 0;
                        gint _tmp7_ = 0;
@@ -2186,7 +2182,7 @@ gboolean identity_manager_model_HasNonTrivialIdentities (IdentityManagerModel* s
                        if (!(_tmp6_ < _tmp7_)) {
 #line 257 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                break;
-#line 2190 "moonshot-identities-manager.c"
+#line 2186 "moonshot-identities-manager.c"
                        }
 #line 257 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _tmp8_ = _card_list;
@@ -2204,7 +2200,7 @@ gboolean identity_manager_model_HasNonTrivialIdentities (IdentityManagerModel* s
                        if (!_tmp14_) {
 #line 260 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                _tmp12_ = TRUE;
-#line 2208 "moonshot-identities-manager.c"
+#line 2204 "moonshot-identities-manager.c"
                        } else {
                                IdCard* _tmp15_ = NULL;
                                gchar** _tmp16_ = NULL;
@@ -2221,13 +2217,13 @@ gboolean identity_manager_model_HasNonTrivialIdentities (IdentityManagerModel* s
                                _tmp17__length1 = _tmp16__length1;
 #line 261 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                _tmp12_ = _tmp17__length1 > 0;
-#line 2225 "moonshot-identities-manager.c"
+#line 2221 "moonshot-identities-manager.c"
                        }
 #line 260 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        if (_tmp12_) {
 #line 260 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                _tmp11_ = TRUE;
-#line 2231 "moonshot-identities-manager.c"
+#line 2227 "moonshot-identities-manager.c"
                        } else {
                                IdCard* _tmp18_ = NULL;
                                Rule* _tmp19_ = NULL;
@@ -2244,7 +2240,7 @@ gboolean identity_manager_model_HasNonTrivialIdentities (IdentityManagerModel* s
                                _tmp20__length1 = _tmp19__length1;
 #line 262 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                _tmp11_ = _tmp20__length1 > 0;
-#line 2248 "moonshot-identities-manager.c"
+#line 2244 "moonshot-identities-manager.c"
                        }
 #line 260 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        if (_tmp11_) {
@@ -2256,28 +2252,28 @@ gboolean identity_manager_model_HasNonTrivialIdentities (IdentityManagerModel* s
                                _g_object_unref0 (_card_list);
 #line 263 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                                return result;
-#line 2260 "moonshot-identities-manager.c"
+#line 2256 "moonshot-identities-manager.c"
                        }
 #line 257 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                        _g_object_unref0 (card);
-#line 2264 "moonshot-identities-manager.c"
+#line 2260 "moonshot-identities-manager.c"
                }
 #line 257 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
                _g_object_unref0 (_card_list);
-#line 2268 "moonshot-identities-manager.c"
+#line 2264 "moonshot-identities-manager.c"
        }
 #line 266 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        result = FALSE;
 #line 266 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return result;
-#line 2274 "moonshot-identities-manager.c"
+#line 2270 "moonshot-identities-manager.c"
 }
 
 
 static gpointer _identity_manager_app_ref0 (gpointer self) {
 #line 273 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return self ? identity_manager_app_ref (self) : NULL;
-#line 2281 "moonshot-identities-manager.c"
+#line 2277 "moonshot-identities-manager.c"
 }
 
 
@@ -2311,14 +2307,14 @@ IdentityManagerModel* identity_manager_model_construct (GType object_type, Ident
        identity_manager_model_set_store_type (self, _tmp3_);
 #line 272 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return self;
-#line 2315 "moonshot-identities-manager.c"
+#line 2311 "moonshot-identities-manager.c"
 }
 
 
 IdentityManagerModel* identity_manager_model_new (IdentityManagerApp* parent_app, IIdentityCardStoreStoreType store_type) {
 #line 272 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        return identity_manager_model_construct (TYPE_IDENTITY_MANAGER_MODEL, parent_app, store_type);
-#line 2322 "moonshot-identities-manager.c"
+#line 2318 "moonshot-identities-manager.c"
 }
 
 
@@ -2331,14 +2327,14 @@ static void identity_manager_model_class_init (IdentityManagerModelClass * klass
        G_OBJECT_CLASS (klass)->finalize = identity_manager_model_finalize;
 #line 88 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        g_signal_new ("card_list_changed", TYPE_IDENTITY_MANAGER_MODEL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 2335 "moonshot-identities-manager.c"
+#line 2331 "moonshot-identities-manager.c"
 }
 
 
 static void identity_manager_model_instance_init (IdentityManagerModel * self) {
 #line 88 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        self->priv = IDENTITY_MANAGER_MODEL_GET_PRIVATE (self);
-#line 2342 "moonshot-identities-manager.c"
+#line 2338 "moonshot-identities-manager.c"
 }
 
 
@@ -2354,7 +2350,7 @@ static void identity_manager_model_finalize (GObject* obj) {
        _identity_manager_app_unref0 (self->priv->parent);
 #line 88 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identities-manager.vala"
        G_OBJECT_CLASS (identity_manager_model_parent_class)->finalize (obj);
-#line 2358 "moonshot-identities-manager.c"
+#line 2354 "moonshot-identities-manager.c"
 }
 
 
index b07f215..938b778 100644 (file)
@@ -1,4 +1,4 @@
-/* moonshot-identity-management-view.c generated by valac 0.26.1, the Vala compiler
+/* moonshot-identity-management-view.c generated by valac 0.28.0, the Vala compiler
  * generated from moonshot-identity-management-view.vala, do not modify */
 
 /*
@@ -534,17 +534,17 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
        gboolean result = FALSE;
        const gchar* _tmp0_ = NULL;
        gchar* _tmp1_ = NULL;
-#line 1278 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1278 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        g_return_val_if_fail (self != NULL, FALSE);
-#line 1278 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1278 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        g_return_val_if_fail (needle != NULL, FALSE);
-#line 1279 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp0_ = needle;
-#line 1279 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1279 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        result = _tmp1_ != NULL;
-#line 1279 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1279 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        return result;
 #line 550 "moonshot-identity-management-view.c"
 }
index 158b652..d9d7c5a 100644 (file)
@@ -55,7 +55,7 @@ public class IdentityManagerView : Window {
     private CheckButton remember_checkbutton;
     private Button update_password_button;
 
-    private ListStore* listmodel;
+    private Gtk.ListStore* listmodel;
     private TreeModelFilter filter;
 
     public IdentityManagerModel identities_manager;
@@ -177,7 +177,7 @@ public class IdentityManagerView : Window {
 
     private void setup_list_model ()
     {
-      this.listmodel = new ListStore (Columns.N_COLUMNS, typeof (IdCard),
+      this.listmodel = new Gtk.ListStore (Columns.N_COLUMNS, typeof (IdCard),
                                                           typeof (Gdk.Pixbuf),
                                                           typeof (string),
                                                           typeof (string),
index 236038f..79392e3 100644 (file)
@@ -1,4 +1,4 @@
-/* moonshot-identity-manager-app.c generated by valac 0.26.1, the Vala compiler
+/* moonshot-identity-manager-app.c generated by valac 0.28.0, the Vala compiler
  * generated from moonshot-identity-manager-app.vala, do not modify */
 
 /*
@@ -683,7 +683,7 @@ IdentityManagerApp* identity_manager_app_construct (GType object_type, gboolean
 #line 96 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identity-manager-app.vala"
                _tmp28_ = card_list;
 #line 96 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identity-manager-app.vala"
-               _tmp29_ = gee_linked_list_last (_tmp28_);
+               _tmp29_ = gee_abstract_list_last ((GeeAbstractList*) _tmp28_);
 #line 96 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identity-manager-app.vala"
                _g_object_unref0 (self->default_id_card);
 #line 96 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-identity-manager-app.vala"
index 24bf811..0c080a4 100644 (file)
@@ -1,4 +1,4 @@
-/* moonshot-identity-request.c generated by valac 0.26.1, the Vala compiler
+/* moonshot-identity-request.c generated by valac 0.28.0, the Vala compiler
  * generated from moonshot-identity-request.vala, do not modify */
 
 /*
index c2cf5ce..64e115e 100644 (file)
@@ -1,4 +1,4 @@
-/* moonshot-keyring-store.c generated by valac 0.26.1, the Vala compiler
+/* moonshot-keyring-store.c generated by valac 0.28.0, the Vala compiler
  * generated from moonshot-keyring-store.vala, do not modify */
 
 /*
@@ -513,19 +513,19 @@ static gchar* string_strip (const gchar* self) {
        gchar* _result_ = NULL;
        gchar* _tmp0_ = NULL;
        const gchar* _tmp1_ = NULL;
-#line 1115 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1115 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        g_return_val_if_fail (self != NULL, NULL);
-#line 1116 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1116 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp0_ = g_strdup (self);
-#line 1116 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1116 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _result_ = _tmp0_;
-#line 1117 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp1_ = _result_;
-#line 1117 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        g_strstrip (_tmp1_);
-#line 1118 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1118 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        result = _result_;
-#line 1118 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1118 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        return result;
 #line 531 "moonshot-keyring-store.c"
 }
@@ -1366,72 +1366,72 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
        gboolean _tmp2_ = FALSE;
        gchar** _tmp3_ = NULL;
        gint _tmp3__length1 = 0;
-#line 964 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 964 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp0_ = separator;
-#line 964 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 964 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        if (_tmp0_ == NULL) {
-#line 965 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 965 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                separator = "";
 #line 1376 "moonshot-keyring-store.c"
        }
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp3_ = str_array;
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp3__length1 = str_array_length1;
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        if (_tmp3_ != NULL) {
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp2_ = TRUE;
 #line 1386 "moonshot-keyring-store.c"
        } else {
                gchar** _tmp4_ = NULL;
                gint _tmp4__length1 = 0;
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp4_ = str_array;
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp4__length1 = str_array_length1;
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp2_ = _tmp4__length1 > 0;
 #line 1396 "moonshot-keyring-store.c"
        }
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        if (_tmp2_) {
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp1_ = TRUE;
 #line 1402 "moonshot-keyring-store.c"
        } else {
                gboolean _tmp5_ = FALSE;
                gchar** _tmp6_ = NULL;
                gint _tmp6__length1 = 0;
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp6_ = str_array;
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp6__length1 = str_array_length1;
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                if (_tmp6__length1 == (-1)) {
 #line 1413 "moonshot-keyring-store.c"
                        gchar** _tmp7_ = NULL;
                        gint _tmp7__length1 = 0;
                        const gchar* _tmp8_ = NULL;
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        _tmp7_ = str_array;
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        _tmp7__length1 = str_array_length1;
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        _tmp8_ = _tmp7_[0];
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        _tmp5_ = _tmp8_ != NULL;
 #line 1425 "moonshot-keyring-store.c"
                } else {
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        _tmp5_ = FALSE;
 #line 1429 "moonshot-keyring-store.c"
                }
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp1_ = _tmp5_;
 #line 1433 "moonshot-keyring-store.c"
        }
-#line 967 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 967 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        if (_tmp1_) {
 #line 1437 "moonshot-keyring-store.c"
                gint i = 0;
@@ -1454,16 +1454,16 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
                const gchar* _tmp44_ = NULL;
                void* _tmp45_ = NULL;
                const gchar* _tmp62_ = NULL;
-#line 969 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 969 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                len = (gsize) 1;
 #line 1460 "moonshot-keyring-store.c"
                {
                        gboolean _tmp9_ = FALSE;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        i = 0;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        _tmp9_ = TRUE;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        while (TRUE) {
 #line 1469 "moonshot-keyring-store.c"
                                gboolean _tmp11_ = FALSE;
@@ -1476,97 +1476,97 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
                                gint _tmp23_ = 0;
                                const gchar* _tmp24_ = NULL;
                                gsize _tmp30_ = 0UL;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                if (!_tmp9_) {
 #line 1482 "moonshot-keyring-store.c"
                                        gint _tmp10_ = 0;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp10_ = i;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        i = _tmp10_ + 1;
 #line 1488 "moonshot-keyring-store.c"
                                }
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp9_ = FALSE;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp13_ = str_array;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp13__length1 = str_array_length1;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                if (_tmp13__length1 != (-1)) {
 #line 1498 "moonshot-keyring-store.c"
                                        gint _tmp14_ = 0;
                                        gchar** _tmp15_ = NULL;
                                        gint _tmp15__length1 = 0;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp14_ = i;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp15_ = str_array;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp15__length1 = str_array_length1;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp12_ = _tmp14_ < _tmp15__length1;
 #line 1510 "moonshot-keyring-store.c"
                                } else {
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp12_ = FALSE;
 #line 1514 "moonshot-keyring-store.c"
                                }
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                if (_tmp12_) {
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp11_ = TRUE;
 #line 1520 "moonshot-keyring-store.c"
                                } else {
                                        gboolean _tmp16_ = FALSE;
                                        gchar** _tmp17_ = NULL;
                                        gint _tmp17__length1 = 0;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp17_ = str_array;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp17__length1 = str_array_length1;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        if (_tmp17__length1 == (-1)) {
 #line 1531 "moonshot-keyring-store.c"
                                                gchar** _tmp18_ = NULL;
                                                gint _tmp18__length1 = 0;
                                                gint _tmp19_ = 0;
                                                const gchar* _tmp20_ = NULL;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                                _tmp18_ = str_array;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                                _tmp18__length1 = str_array_length1;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                                _tmp19_ = i;
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                                _tmp20_ = _tmp18_[_tmp19_];
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                                _tmp16_ = _tmp20_ != NULL;
 #line 1546 "moonshot-keyring-store.c"
                                        } else {
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                                _tmp16_ = FALSE;
 #line 1550 "moonshot-keyring-store.c"
                                        }
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp11_ = _tmp16_;
 #line 1554 "moonshot-keyring-store.c"
                                }
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                if (!_tmp11_) {
-#line 970 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 970 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        break;
 #line 1560 "moonshot-keyring-store.c"
                                }
-#line 971 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp22_ = str_array;
-#line 971 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp22__length1 = str_array_length1;
-#line 971 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp23_ = i;
-#line 971 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp24_ = _tmp22_[_tmp23_];
-#line 971 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                if (_tmp24_ != NULL) {
 #line 1572 "moonshot-keyring-store.c"
                                        gchar** _tmp25_ = NULL;
@@ -1575,91 +1575,91 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
                                        const gchar* _tmp27_ = NULL;
                                        gint _tmp28_ = 0;
                                        gint _tmp29_ = 0;
-#line 971 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp25_ = str_array;
-#line 971 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp25__length1 = str_array_length1;
-#line 971 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp26_ = i;
-#line 971 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp27_ = _tmp25_[_tmp26_];
-#line 971 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 971 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp29_ = _tmp28_;
-#line 971 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp21_ = _tmp29_;
 #line 1593 "moonshot-keyring-store.c"
                                } else {
-#line 971 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp21_ = 0;
 #line 1597 "moonshot-keyring-store.c"
                                }
-#line 971 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp30_ = len;
-#line 971 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 971 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                len = _tmp30_ + _tmp21_;
 #line 1603 "moonshot-keyring-store.c"
                        }
                }
-#line 973 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 973 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp31_ = i;
-#line 973 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 973 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                if (_tmp31_ == 0) {
 #line 1610 "moonshot-keyring-store.c"
                        gchar* _tmp32_ = NULL;
-#line 974 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 974 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        _tmp32_ = g_strdup ("");
-#line 974 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 974 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        result = _tmp32_;
-#line 974 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 974 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        return result;
 #line 1618 "moonshot-keyring-store.c"
                }
-#line 976 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 976 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp33_ = i;
-#line 976 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 976 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                str_array_length1 = _tmp33_;
-#line 976 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 976 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp34_ = str_array_length1;
-#line 977 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp35_ = len;
-#line 977 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp36_ = separator;
-#line 977 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 977 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp38_ = _tmp37_;
-#line 977 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp39_ = i;
-#line 977 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 977 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 979 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 979 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp40_ = len;
-#line 979 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 979 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp41_ = g_malloc (_tmp40_);
-#line 979 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 979 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                res = _tmp41_;
-#line 980 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp42_ = res;
-#line 980 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp43_ = str_array;
-#line 980 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp43__length1 = str_array_length1;
-#line 980 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp44_ = _tmp43_[0];
-#line 980 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 980 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 980 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                ptr = _tmp45_;
 #line 1656 "moonshot-keyring-store.c"
                {
                        gboolean _tmp46_ = FALSE;
-#line 981 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        i = 1;
-#line 981 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        _tmp46_ = TRUE;
-#line 981 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        while (TRUE) {
 #line 1665 "moonshot-keyring-store.c"
                                gint _tmp48_ = 0;
@@ -1675,94 +1675,94 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
                                const gchar* _tmp56_ = NULL;
                                void* _tmp60_ = NULL;
                                void* _tmp61_ = NULL;
-#line 981 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                if (!_tmp46_) {
 #line 1681 "moonshot-keyring-store.c"
                                        gint _tmp47_ = 0;
-#line 981 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp47_ = i;
-#line 981 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        i = _tmp47_ + 1;
 #line 1687 "moonshot-keyring-store.c"
                                }
-#line 981 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp46_ = FALSE;
-#line 981 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp48_ = i;
-#line 981 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp49_ = str_array;
-#line 981 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp49__length1 = str_array_length1;
-#line 981 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                if (!(_tmp48_ < _tmp49__length1)) {
-#line 981 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 981 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        break;
 #line 1701 "moonshot-keyring-store.c"
                                }
-#line 982 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 982 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp50_ = ptr;
-#line 982 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 982 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp51_ = separator;
-#line 982 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 982 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 982 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 982 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                ptr = _tmp52_;
-#line 983 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp54_ = str_array;
-#line 983 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp54__length1 = str_array_length1;
-#line 983 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp55_ = i;
-#line 983 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp56_ = _tmp54_[_tmp55_];
-#line 983 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                if (_tmp56_ != NULL) {
 #line 1721 "moonshot-keyring-store.c"
                                        gchar** _tmp57_ = NULL;
                                        gint _tmp57__length1 = 0;
                                        gint _tmp58_ = 0;
                                        const gchar* _tmp59_ = NULL;
-#line 983 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp57_ = str_array;
-#line 983 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp57__length1 = str_array_length1;
-#line 983 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp58_ = i;
-#line 983 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp59_ = _tmp57_[_tmp58_];
-#line 983 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp53_ = (const gchar*) _tmp59_;
 #line 1736 "moonshot-keyring-store.c"
                                } else {
-#line 983 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                        _tmp53_ = "";
 #line 1740 "moonshot-keyring-store.c"
                                }
-#line 983 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp60_ = ptr;
-#line 983 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                _tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 983 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 983 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                                ptr = _tmp61_;
 #line 1748 "moonshot-keyring-store.c"
                        }
                }
-#line 986 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 986 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp62_ = res;
-#line 986 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 986 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                res = NULL;
-#line 986 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 986 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                result = (gchar*) _tmp62_;
-#line 986 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 986 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                return result;
 #line 1759 "moonshot-keyring-store.c"
        } else {
                gchar* _tmp63_ = NULL;
-#line 988 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp63_ = g_strdup ("");
-#line 988 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                result = _tmp63_;
-#line 988 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                return result;
 #line 1768 "moonshot-keyring-store.c"
        }
@@ -2358,7 +2358,7 @@ KeyringStore* keyring_store_construct (GType object_type) {
 #line 195 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-keyring-store.vala"
        self = (KeyringStore*) g_object_new (object_type, NULL);
 #line 196 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-keyring-store.vala"
-       _tmp0_ = gee_linked_list_new (TYPE_ID_CARD, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+       _tmp0_ = gee_linked_list_new (TYPE_ID_CARD, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL);
 #line 196 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-keyring-store.vala"
        _g_object_unref0 (self->priv->id_card_list);
 #line 196 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-keyring-store.vala"
index 933ffee..e5afdce 100644 (file)
@@ -1,4 +1,4 @@
-/* moonshot-local-flat-file-store.c generated by valac 0.26.1, the Vala compiler
+/* moonshot-local-flat-file-store.c generated by valac 0.28.0, the Vala compiler
  * generated from moonshot-local-flat-file-store.vala, do not modify */
 
 /*
@@ -429,19 +429,19 @@ static gchar* string_strip (const gchar* self) {
        gchar* _result_ = NULL;
        gchar* _tmp0_ = NULL;
        const gchar* _tmp1_ = NULL;
-#line 1115 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1115 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        g_return_val_if_fail (self != NULL, NULL);
-#line 1116 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1116 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp0_ = g_strdup (self);
-#line 1116 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1116 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _result_ = _tmp0_;
-#line 1117 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp1_ = _result_;
-#line 1117 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        g_strstrip (_tmp1_);
-#line 1118 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1118 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        result = _result_;
-#line 1118 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1118 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        return result;
 #line 447 "moonshot-local-flat-file-store.c"
 }
@@ -1530,39 +1530,39 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
        gint _tmp3__length1 = 0;
        guint8* _tmp4_ = NULL;
        gint _tmp4__length1 = 0;
-#line 1300 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1300 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        g_return_val_if_fail (self != NULL, NULL);
-#line 1301 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1301 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        res = (guint8*) self;
-#line 1301 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1301 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        res_length1 = -1;
-#line 1301 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1301 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _res_size_ = res_length1;
-#line 1302 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1302 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp0_ = strlen (self);
-#line 1302 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1302 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp1_ = _tmp0_;
-#line 1302 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1302 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        res_length1 = (gint) _tmp1_;
-#line 1302 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1302 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp2_ = res_length1;
-#line 1303 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp3_ = res;
-#line 1303 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp3__length1 = res_length1;
-#line 1303 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp4_ = _tmp3_;
-#line 1303 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp4__length1 = _tmp3__length1;
-#line 1303 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        if (result_length1) {
-#line 1303 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                *result_length1 = _tmp4__length1;
 #line 1562 "moonshot-local-flat-file-store.c"
        }
-#line 1303 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        result = _tmp4_;
-#line 1303 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 1303 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        return result;
 #line 1568 "moonshot-local-flat-file-store.c"
 }
@@ -2473,7 +2473,7 @@ LocalFlatFileStore* local_flat_file_store_construct (GType object_type) {
 #line 196 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        self = (LocalFlatFileStore*) g_object_new (object_type, NULL);
 #line 197 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
-       _tmp0_ = gee_linked_list_new (TYPE_ID_CARD, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
+       _tmp0_ = gee_linked_list_new (TYPE_ID_CARD, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL);
 #line 197 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
        _g_object_unref0 (self->priv->id_card_list);
 #line 197 "/home/hartmans/moonshot/moonshot/ui/src/moonshot-local-flat-file-store.vala"
index 811a93d..a4adbf6 100644 (file)
@@ -1,4 +1,4 @@
-/* moonshot-password-dialog.c generated by valac 0.26.1, the Vala compiler
+/* moonshot-password-dialog.c generated by valac 0.28.0, the Vala compiler
  * generated from moonshot-password-dialog.vala, do not modify */
 
 /*
index 5953ff6..a4bd053 100644 (file)
@@ -1,4 +1,4 @@
-/* moonshot-provisioning-common.c generated by valac 0.26.1, the Vala compiler
+/* moonshot-provisioning-common.c generated by valac 0.28.0, the Vala compiler
  * generated from moonshot-provisioning-common.vala, do not modify */
 
 /*
index 62ad34e..734ee20 100644 (file)
@@ -1,4 +1,4 @@
-/* moonshot-server.c generated by valac 0.26.1, the Vala compiler
+/* moonshot-server.c generated by valac 0.28.0, the Vala compiler
  * generated from moonshot-server.vala, do not modify */
 
 /*
index 4365965..0387ee1 100644 (file)
@@ -1,4 +1,4 @@
-/* moonshot-utils.c generated by valac 0.26.1, the Vala compiler
+/* moonshot-utils.c generated by valac 0.28.0, the Vala compiler
  * generated from moonshot-utils.vala, do not modify */
 
 /*
@@ -233,11 +233,11 @@ static gchar* g_file_stream_read_line (FILE* self) {
        gint c = 0;
        GString* ret = NULL;
        GString* _tmp7_ = NULL;
-#line 3159 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3171 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        g_return_val_if_fail (self != NULL, NULL);
-#line 3161 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3173 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        ret = NULL;
-#line 3162 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3174 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        while (TRUE) {
 #line 243 "moonshot-utils.c"
                gint _tmp0_ = 0;
@@ -246,78 +246,78 @@ static gchar* g_file_stream_read_line (FILE* self) {
                gint _tmp4_ = 0;
                GString* _tmp5_ = NULL;
                gint _tmp6_ = 0;
-#line 3162 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3174 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp0_ = fgetc (self);
-#line 3162 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3174 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                c = _tmp0_;
-#line 3162 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3174 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp1_ = c;
-#line 3162 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3174 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                if (!(_tmp1_ != EOF)) {
-#line 3162 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3174 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        break;
 #line 260 "moonshot-utils.c"
                }
-#line 3163 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3175 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp2_ = ret;
-#line 3163 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3175 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                if (_tmp2_ == NULL) {
 #line 266 "moonshot-utils.c"
                        GString* _tmp3_ = NULL;
-#line 3164 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3176 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        _tmp3_ = g_string_new ("");
-#line 3164 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3176 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        _g_string_free0 (ret);
-#line 3164 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3176 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        ret = _tmp3_;
 #line 274 "moonshot-utils.c"
                }
-#line 3166 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3178 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp4_ = c;
-#line 3166 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3178 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                if (_tmp4_ == ((gint) '\n')) {
-#line 3167 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3179 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                        break;
 #line 282 "moonshot-utils.c"
                }
-#line 3169 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3181 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp5_ = ret;
-#line 3169 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3181 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp6_ = c;
-#line 3169 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3181 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                g_string_append_c ((GString*) _tmp5_, (gchar) _tmp6_);
 #line 290 "moonshot-utils.c"
        }
-#line 3171 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3183 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp7_ = ret;
-#line 3171 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3183 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        if (_tmp7_ == NULL) {
-#line 3172 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3184 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                result = NULL;
-#line 3172 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3184 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _g_string_free0 (ret);
-#line 3172 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3184 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                return result;
 #line 302 "moonshot-utils.c"
        } else {
                GString* _tmp8_ = NULL;
                const gchar* _tmp9_ = NULL;
                gchar* _tmp10_ = NULL;
-#line 3174 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3186 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp8_ = ret;
-#line 3174 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3186 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp9_ = ((GString*) _tmp8_)->str;
-#line 3174 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3186 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _tmp10_ = g_strdup (_tmp9_);
-#line 3174 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3186 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                result = _tmp10_;
-#line 3174 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3186 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                _g_string_free0 (ret);
-#line 3174 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3186 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
                return result;
 #line 319 "moonshot-utils.c"
        }
-#line 3159 "/usr/share/vala-0.26/vapi/glib-2.0.vapi"
+#line 3171 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _g_string_free0 (ret);
 #line 323 "moonshot-utils.c"
 }
index a01dd18..71e3a9a 100644 (file)
@@ -1,4 +1,4 @@
-/* moonshot-webp-parser.c generated by valac 0.24.0, the Vala compiler
+/* moonshot-webp-parser.c generated by valac 0.28.0, the Vala compiler
  * generated from moonshot-webp-parser.vala, do not modify */
 
 /*
@@ -129,15 +129,15 @@ static gunichar string_get_char (const gchar* self, glong index) {
        gunichar result = 0U;
        glong _tmp0_ = 0L;
        gunichar _tmp1_ = 0U;
-#line 1026 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1026 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        g_return_val_if_fail (self != NULL, 0U);
-#line 1027 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1027 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp0_ = index;
-#line 1027 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1027 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        _tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1027 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1027 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        result = _tmp1_;
-#line 1027 "/usr/share/vala-0.24/vapi/glib-2.0.vapi"
+#line 1027 "/usr/share/vala-0.28/vapi/glib-2.0.vapi"
        return result;
 #line 143 "moonshot-webp-parser.c"
 }