Merge lp:~noskcaj/ubuntu/utopic/libcryptui/3.12 into lp:ubuntu/utopic/libcryptui

[Jackson Doak]

New upstream release

[Daniel Holbach (dholbach)]

I took the liberty to change the version number to 3.12.2-0ubuntu1 instead of 3.12.2-1.

review: Approve

Unmerged revisions

9. By Jackson Doak on 2014-06-30

New upstream release.

=== removed directory '.pc/01_autostart_path.patch'
=== removed directory '.pc/01_autostart_path.patch/daemon'
=== removed file '.pc/01_autostart_path.patch/daemon/Makefile.am'
--- .pc/01_autostart_path.patch/daemon/Makefile.am	2013-06-11 20:09:34 +0000
+++ .pc/01_autostart_path.patch/daemon/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,122 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-localedir = $(datadir)/locale
-pixmapsdir = $(datadir)/pixmaps/cryptui/
-uidir = $(datadir)/cryptui/ui/
-
-INCLUDES = -I$(top_builddir) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/libcryptui \
-	-I$(top_srcdir)/libegg \
-	-I$(top_srcdir)/libseahorse \
-	$(SEAHORSE_CFLAGS) \
-	-DDATA_DIR=\""$(datadir)"\" \
-	-DLOCALEDIR=\""$(localedir)"\" \
-	-DPIXMAPSDIR=\""$(pixmapsdir)"\" \
-	-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \
-	-DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
-	-DSEAHORSE_UIDIR=\""$(uidir)"\"
-
-bin_PROGRAMS = seahorse-daemon
-
-MARSHAL_SRCS = \
-	seahorse-marshal.c seahorse-marshal.h
-
-BUILT_SOURCES = \
-	seahorse-service-bindings.h \
-	seahorse-service-keyset-bindings.h \
-	seahorse-service-crypto-bindings.h \
-	$(MARSHAL_SRCS)
-
-seahorse_daemon_SOURCES = \
-	seahorse-daemon.c seahorse-daemon.h \
-	seahorse-dbus-server.c \
-	seahorse-gpgme.c seahorse-gpgme.h \
-	seahorse-gpgme-data.c seahorse-gpgme-data.h \
-	seahorse-gpgme-generate.c seahorse-gpgme-generate.h \
-	seahorse-gpgme-key.c seahorse-gpgme-key.h \
-	seahorse-gpgme-key-op.c seahorse-gpgme-key-op.h \
-	seahorse-gpgme-operation.c seahorse-gpgme-operation.h \
-	seahorse-gpgme-source.c seahorse-gpgme-source.h \
-	seahorse-gpgme-subkey.c seahorse-gpgme-subkey.h \
-	seahorse-gpgme-uid.c seahorse-gpgme-uid.h \
-	seahorse-gpg-op.h seahorse-gpg-op.c \
-	seahorse-gpg-options.c seahorse-gpg-options.h \
-	seahorse-object-list.c seahorse-object-list.h \
-	seahorse-pgp.c seahorse-pgp.h \
-	seahorse-pgp-key.c seahorse-pgp-key.h \
-	seahorse-pgp-module.c seahorse-pgp-module.h \
-	seahorse-pgp-signature.c seahorse-pgp-signature.h \
-	seahorse-pgp-subkey.c seahorse-pgp-subkey.h \
-	seahorse-pgp-uid.c seahorse-pgp-uid.h \
-	seahorse-secure-buffer.c seahorse-secure-buffer.h \
-	seahorse-service.c seahorse-service.h \
-	seahorse-service-keyset.c seahorse-service-crypto.c \
-	seahorse-context.c seahorse-context.h \
-	seahorse-gtkstock.c seahorse-gtkstock.h \
-	seahorse-libdialogs.h \
-	seahorse-notification.c \
-	seahorse-object.c seahorse-object.h \
-	seahorse-operation.c seahorse-operation.h \
-	seahorse-passphrase.c seahorse-passphrase.h \
-	seahorse-progress.c seahorse-progress.h \
-	seahorse-secure-memory.c seahorse-secure-memory.h \
-	seahorse-set.c seahorse-set.h \
-	seahorse-source.c seahorse-source.h \
-	seahorse-transfer-operation.c seahorse-transfer-operation.h \
-	seahorse-types.c seahorse-types.h \
-	seahorse-unix-signal.c seahorse-unix-signal.h \
-	seahorse-unknown.c seahorse-unknown.h \
-	seahorse-unknown-source.c seahorse-unknown-source.h \
-	seahorse-util.c seahorse-util.h \
-	seahorse-validity.c seahorse-validity.h \
-	seahorse-widget.c seahorse-widget.h \
-	$(BUILT_SOURCES)
-
-seahorse_daemon_LDADD = \
-	$(top_builddir)/libcryptui/libcryptui.la \
-	$(top_builddir)/libegg/libeggdatetime.la \
-	$(top_builddir)/libegg/libeggsmclient.la \
-	$(SEAHORSE_LIBS)
-
-man_MANS = seahorse-daemon.1
-
-EXTRA_DIST = \
-	$(man_MANS) \
-	seahorse-service.xml \
-	seahorse-service-keyset.xml \
-	seahorse-service-crypto.xml \
-	seahorse-service-bindings.h \
-	seahorse-service-keyset-bindings.h \
-	seahorse-service-crypto-bindings.h \
-	org.gnome.seahorse.service.in \
-	$(ui_DATA) \
-	seahorse-marshal.list
-
-CLEANFILES = *.bak \
-	org.gnome.seahorse.service
-
-# DBUS binding files
-seahorse-service-bindings.h: seahorse-service.xml
-	dbus-binding-tool --prefix=seahorse_service --mode=glib-server --output=$@ $<
-seahorse-service-keyset-bindings.h: seahorse-service-keyset.xml
-	dbus-binding-tool --prefix=seahorse_service_keyset --mode=glib-server --output=$@ $<
-seahorse-service-crypto-bindings.h: seahorse-service-crypto.xml
-	dbus-binding-tool --prefix=seahorse_service_crypto --mode=glib-server --output=$@ $<
-
-# Dbus service file
-servicedir = $(datadir)/dbus-1/services/
-service_in_files = org.gnome.seahorse.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-seahorse-marshal.h: seahorse-marshal.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) $< --header --prefix=seahorse_marshal > $@
-
-seahorse-marshal.c: seahorse-marshal.list $(GLIB_GENMARSHAL)
-	echo "#include \"seahorse-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) $< --body --prefix=seahorse_marshal >> $@
-
-ui_DATA = \
-	seahorse-progress.xml \
-	seahorse-notify.xml \
-	seahorse-pgp-generate.xml

=== removed directory '.pc/02_seahorse-daemon_libcryptui_static_link.patch'
=== removed directory '.pc/02_seahorse-daemon_libcryptui_static_link.patch/daemon'
=== removed file '.pc/02_seahorse-daemon_libcryptui_static_link.patch/daemon/Makefile.am'
--- .pc/02_seahorse-daemon_libcryptui_static_link.patch/daemon/Makefile.am	2013-06-11 20:09:34 +0000
+++ .pc/02_seahorse-daemon_libcryptui_static_link.patch/daemon/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,122 +0,0 @@
-include $(top_srcdir)/Makefile.decl
-
-localedir = $(datadir)/locale
-pixmapsdir = $(datadir)/pixmaps/cryptui/
-uidir = $(datadir)/cryptui/ui/
-
-INCLUDES = -I$(top_builddir) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/libcryptui \
-	-I$(top_srcdir)/libegg \
-	-I$(top_srcdir)/libseahorse \
-	$(SEAHORSE_CFLAGS) \
-	-DDATA_DIR=\""$(datadir)"\" \
-	-DLOCALEDIR=\""$(localedir)"\" \
-	-DPIXMAPSDIR=\""$(pixmapsdir)"\" \
-	-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \
-	-DAUTOSTARTDIR=\""$(datadir)/gnome/autostart"\" \
-	-DSEAHORSE_UIDIR=\""$(uidir)"\"
-
-bin_PROGRAMS = seahorse-daemon
-
-MARSHAL_SRCS = \
-	seahorse-marshal.c seahorse-marshal.h
-
-BUILT_SOURCES = \
-	seahorse-service-bindings.h \
-	seahorse-service-keyset-bindings.h \
-	seahorse-service-crypto-bindings.h \
-	$(MARSHAL_SRCS)
-
-seahorse_daemon_SOURCES = \
-	seahorse-daemon.c seahorse-daemon.h \
-	seahorse-dbus-server.c \
-	seahorse-gpgme.c seahorse-gpgme.h \
-	seahorse-gpgme-data.c seahorse-gpgme-data.h \
-	seahorse-gpgme-generate.c seahorse-gpgme-generate.h \
-	seahorse-gpgme-key.c seahorse-gpgme-key.h \
-	seahorse-gpgme-key-op.c seahorse-gpgme-key-op.h \
-	seahorse-gpgme-operation.c seahorse-gpgme-operation.h \
-	seahorse-gpgme-source.c seahorse-gpgme-source.h \
-	seahorse-gpgme-subkey.c seahorse-gpgme-subkey.h \
-	seahorse-gpgme-uid.c seahorse-gpgme-uid.h \
-	seahorse-gpg-op.h seahorse-gpg-op.c \
-	seahorse-gpg-options.c seahorse-gpg-options.h \
-	seahorse-object-list.c seahorse-object-list.h \
-	seahorse-pgp.c seahorse-pgp.h \
-	seahorse-pgp-key.c seahorse-pgp-key.h \
-	seahorse-pgp-module.c seahorse-pgp-module.h \
-	seahorse-pgp-signature.c seahorse-pgp-signature.h \
-	seahorse-pgp-subkey.c seahorse-pgp-subkey.h \
-	seahorse-pgp-uid.c seahorse-pgp-uid.h \
-	seahorse-secure-buffer.c seahorse-secure-buffer.h \
-	seahorse-service.c seahorse-service.h \
-	seahorse-service-keyset.c seahorse-service-crypto.c \
-	seahorse-context.c seahorse-context.h \
-	seahorse-gtkstock.c seahorse-gtkstock.h \
-	seahorse-libdialogs.h \
-	seahorse-notification.c \
-	seahorse-object.c seahorse-object.h \
-	seahorse-operation.c seahorse-operation.h \
-	seahorse-passphrase.c seahorse-passphrase.h \
-	seahorse-progress.c seahorse-progress.h \
-	seahorse-secure-memory.c seahorse-secure-memory.h \
-	seahorse-set.c seahorse-set.h \
-	seahorse-source.c seahorse-source.h \
-	seahorse-transfer-operation.c seahorse-transfer-operation.h \
-	seahorse-types.c seahorse-types.h \
-	seahorse-unix-signal.c seahorse-unix-signal.h \
-	seahorse-unknown.c seahorse-unknown.h \
-	seahorse-unknown-source.c seahorse-unknown-source.h \
-	seahorse-util.c seahorse-util.h \
-	seahorse-validity.c seahorse-validity.h \
-	seahorse-widget.c seahorse-widget.h \
-	$(BUILT_SOURCES)
-
-seahorse_daemon_LDADD = \
-	$(top_builddir)/libcryptui/libcryptui.la \
-	$(top_builddir)/libegg/libeggdatetime.la \
-	$(top_builddir)/libegg/libeggsmclient.la \
-	$(SEAHORSE_LIBS)
-
-man_MANS = seahorse-daemon.1
-
-EXTRA_DIST = \
-	$(man_MANS) \
-	seahorse-service.xml \
-	seahorse-service-keyset.xml \
-	seahorse-service-crypto.xml \
-	seahorse-service-bindings.h \
-	seahorse-service-keyset-bindings.h \
-	seahorse-service-crypto-bindings.h \
-	org.gnome.seahorse.service.in \
-	$(ui_DATA) \
-	seahorse-marshal.list
-
-CLEANFILES = *.bak \
-	org.gnome.seahorse.service
-
-# DBUS binding files
-seahorse-service-bindings.h: seahorse-service.xml
-	dbus-binding-tool --prefix=seahorse_service --mode=glib-server --output=$@ $<
-seahorse-service-keyset-bindings.h: seahorse-service-keyset.xml
-	dbus-binding-tool --prefix=seahorse_service_keyset --mode=glib-server --output=$@ $<
-seahorse-service-crypto-bindings.h: seahorse-service-crypto.xml
-	dbus-binding-tool --prefix=seahorse_service_crypto --mode=glib-server --output=$@ $<
-
-# Dbus service file
-servicedir = $(datadir)/dbus-1/services/
-service_in_files = org.gnome.seahorse.service.in
-service_DATA = $(service_in_files:.service.in=.service)
-
-seahorse-marshal.h: seahorse-marshal.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) $< --header --prefix=seahorse_marshal > $@
-
-seahorse-marshal.c: seahorse-marshal.list $(GLIB_GENMARSHAL)
-	echo "#include \"seahorse-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) $< --body --prefix=seahorse_marshal >> $@
-
-ui_DATA = \
-	seahorse-progress.xml \
-	seahorse-notify.xml \
-	seahorse-pgp-generate.xml

=== removed directory '.pc/02_seahorse-daemon_libcryptui_static_link.patch/libcryptui'
=== removed file '.pc/02_seahorse-daemon_libcryptui_static_link.patch/libcryptui/Makefile.am'
--- .pc/02_seahorse-daemon_libcryptui_static_link.patch/libcryptui/Makefile.am	2011-11-23 12:30:54 +0000
+++ .pc/02_seahorse-daemon_libcryptui_static_link.patch/libcryptui/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-if WITH_TESTS
-TESTS_DIR = tests
-else
-TESTS_DIR = 
-endif
-
-SUBDIRS = . $(TESTS_DIR)
-
-# -----------------------------------------------------------------
-# LIBRARY HEADERS
-# 
-
-incdir = $(includedir)/libcryptui
-
-inc_HEADERS = \
-    $(srcdir)/cryptui.h \
-    $(srcdir)/cryptui-keyset.h \
-    $(srcdir)/cryptui-key-store.h \
-    $(srcdir)/cryptui-key-combo.h \
-    $(srcdir)/cryptui-key-list.h \
-    $(srcdir)/cryptui-key-chooser.h
-
-# -----------------------------------------------------------------
-# MARSHALLERS
-# 
-
-MARSHALLERS = \
-    cryptui-marshal.c cryptui-marshal.h
-
-cryptui-marshal.h: cryptui-marshal.list $(GLIB_GENMARSHAL)
-	$(AM_V_GEN) $(GLIB_GENMARSHAL) $< --header --prefix=cryptui_marshal > $@
-
-cryptui-marshal.c: cryptui-marshal.list $(GLIB_GENMARSHAL)
-	$(AM_V_GEN) echo "#include \"cryptui-marshal.h\"" > $@ && \
-	$(GLIB_GENMARSHAL) $< --body --prefix=cryptui_marshal >> $@
-	
-
-# -----------------------------------------------------------------
-# LIBRARY SOURCES
-# 
-
-lib_LTLIBRARIES = libcryptui.la
-
-libcryptui_src = \
-    $(srcdir)/cryptui.c \
-    $(srcdir)/cryptui-keyset.c \
-    $(srcdir)/cryptui-key-store.c \
-    $(srcdir)/cryptui-key-combo.c \
-    $(srcdir)/cryptui-key-list.c \
-    $(srcdir)/cryptui-key-chooser.c
-
-libcryptui_la_SOURCES = \
-    cryptui-defines.h \
-    cryptui-priv.h \
-    $(inc_HEADERS) \
-    $(libcryptui_src) \
-    $(MARSHALLERS)
-    
-libcryptui_la_LDFLAGS = \
-    -version-info $(LIBCRYPTUI_LT_RELEASE)
-    
-libcryptui_la_LIBADD = $(LIBCRYPTUI_LIBS) 
-
-# ------------------------------------------------------------------
-# PKGCONFIG
-# 
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = cryptui-$(LIBCRYPTUI_MAJOR).pc
-
-cryptui-$(LIBCRYPTUI_MAJOR).pc: cryptui.pc
-	$(AM_V_GEN) cp cryptui.pc cryptui-$(LIBCRYPTUI_MAJOR).pc
-
-# ------------------------------------------------------------------
-# COMMON
-
-INCLUDES = -I$(top_builddir) \
-	-I$(top_srcdir) \
-	$(LIBCRYPTUI_CFLAGS) \
-	-DLIBCRYPTUI_BUILD=1 \
-	-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE
-
-EXTRA_DIST = \
-	cryptui-marshal.list \
-	cryptui.pc.in
-    
-CLEANFILES = \
-	cryptui-marshal.h \
-    	cryptui-marshal.c \
-    	$(pkgconfig_DATA)
-
-BUILT_SOURCES = \
-	$(MARSHALLERS)
-
-# ------------------------------------------------------------------
-# GObject Introspection
-BUILT_GIRSOURCES =
-
-if HAVE_INTROSPECTION
-CryptUI-@LIBCRYPTUI_MAJOR@.gir: $(INTROSPECTION_SCANNER) libcryptui.la
-	$(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
-	--namespace CryptUI --nsversion=@LIBCRYPTUI_MAJOR@ \
-	$(INCLUDES) \
-	--include=Gtk-3.0 \
-	--library=libcryptui.la \
-	--pkg gtk+-3.0 \
-	--output $@ \
-	$(inc_HEADERS) \
-	$(libcryptui_src)
-
-BUILT_GIRSOURCES += CryptUI-@LIBCRYPTUI_MAJOR@.gir
-
-# INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
-# install anything - we need to install inside our prefix.
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(BUILT_GIRSOURCES)
-
-typelibsdir = $(libdir)/girepository-1.0/
-
-typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
-
-%.typelib: %.gir $(INTROSPECTION_COMPILER)
-	$(QUIET_GEN)$(DEBUG) $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(INTROSPECTION_COMPILER_OPTS) $< -o $(builddir)/$(@F)
-
-CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
-endif # HAVE_INTROSPECTION

=== removed file '.pc/applied-patches'
--- .pc/applied-patches	2013-06-11 20:09:34 +0000
+++ .pc/applied-patches	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-01_autostart_path.patch
-02_seahorse-daemon_libcryptui_static_link.patch

=== modified file 'ChangeLog'
--- ChangeLog	2013-06-11 20:09:34 +0000
+++ ChangeLog	2014-07-01 03:49:19 +0000
@@ -1,5 +1,512 @@
 # Generated automatically. Do not edit.
 
+commit 5787b929c026573ba7df40fd5e08f6dd6a82f831
+Author: Stef Walter <[e-mail]>
+Date:   2014-05-13
+
+    Release version 3.12.2
+
+ NEWS         | 4 ++++
+ configure.ac | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+commit 5670703c80abb9d35539c07ecf0fbc078da52231
+Author: Ting-Wei Lan <[e-mail]>
+Date:   2014-03-28
+
+    Add --libtool option to g-ir-scanner
+    
+    Not using libtool causes strange build problem on FreeBSD. We may add
+    the -- libtool option or use INTROSPECTION_MAKEFILE.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=727196
+
+ libcryptui/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit f351daab1c644e4dcf344a0f65a6d97daae3005b
+Author: Andika Triwidada <[e-mail]>
+Date:   2014-03-30
+
+    Updated Indonesian translation
+
+ po/id.po | 3019 +++++++++-----------------------------------------------------
+ 1 file changed, 438 insertions(+), 2581 deletions(-)
+
+commit a909b453846c92a28f6af68d4d3db383fcb17794
+Author: Daniel Mustieles <[e-mail]>
+Date:   2014-01-23
+
+    Updated FSF's address
+
+ daemon/seahorse-context.c            | 5 +----
+ daemon/seahorse-context.h            | 5 +----
+ daemon/seahorse-daemon.c             | 5 +----
+ daemon/seahorse-daemon.h             | 5 +----
+ daemon/seahorse-dbus-server.c        | 5 +----
+ daemon/seahorse-gpg-op.c             | 5 +----
+ daemon/seahorse-gpg-op.h             | 5 +----
+ daemon/seahorse-gpg-options.c        | 5 +----
+ daemon/seahorse-gpg-options.h        | 5 +----
+ daemon/seahorse-gpgme-data.c         | 5 +----
+ daemon/seahorse-gpgme-data.h         | 4 +---
+ daemon/seahorse-gpgme-generate.c     | 5 +----
+ daemon/seahorse-gpgme-generate.h     | 5 +----
+ daemon/seahorse-gpgme-key-op.c       | 5 +----
+ daemon/seahorse-gpgme-key-op.h       | 5 +----
+ daemon/seahorse-gpgme-key.c          | 5 +----
+ daemon/seahorse-gpgme-key.h          | 5 +----
+ daemon/seahorse-gpgme-operation.c    | 5 +----
+ daemon/seahorse-gpgme-operation.h    | 5 +----
+ daemon/seahorse-gpgme-source.c       | 5 +----
+ daemon/seahorse-gpgme-source.h       | 5 +----
+ daemon/seahorse-gpgme-subkey.c       | 5 +----
+ daemon/seahorse-gpgme-subkey.h       | 5 +----
+ daemon/seahorse-gpgme-uid.c          | 5 +----
+ daemon/seahorse-gpgme-uid.h          | 5 +----
+ daemon/seahorse-gpgme.c              | 4 +---
+ daemon/seahorse-gpgme.h              | 4 +---
+ daemon/seahorse-libdialogs.h         | 5 +----
+ daemon/seahorse-notification.c       | 5 +----
+ daemon/seahorse-object-list.c        | 4 +---
+ daemon/seahorse-object-list.h        | 4 +---
+ daemon/seahorse-object.c             | 4 +---
+ daemon/seahorse-object.h             | 4 +---
+ daemon/seahorse-operation.c          | 5 +----
+ daemon/seahorse-operation.h          | 5 +----
+ daemon/seahorse-passphrase.c         | 5 +----
+ daemon/seahorse-passphrase.h         | 5 +----
+ daemon/seahorse-pgp-key.c            | 5 +----
+ daemon/seahorse-pgp-key.h            | 5 +----
+ daemon/seahorse-pgp-module.c         | 4 +---
+ daemon/seahorse-pgp-module.h         | 4 +---
+ daemon/seahorse-pgp-signature.c      | 5 +----
+ daemon/seahorse-pgp-signature.h      | 5 +----
+ daemon/seahorse-pgp-subkey.c         | 5 +----
+ daemon/seahorse-pgp-subkey.h         | 5 +----
+ daemon/seahorse-pgp-uid.c            | 5 +----
+ daemon/seahorse-pgp-uid.h            | 5 +----
+ daemon/seahorse-pgp.c                | 4 +---
+ daemon/seahorse-pgp.h                | 4 +---
+ daemon/seahorse-progress.c           | 5 +----
+ daemon/seahorse-progress.h           | 5 +----
+ daemon/seahorse-secure-buffer.c      | 4 +---
+ daemon/seahorse-secure-buffer.h      | 4 +---
+ daemon/seahorse-secure-memory.c      | 5 +----
+ daemon/seahorse-service-crypto.c     | 5 +----
+ daemon/seahorse-service-keyset.c     | 5 +----
+ daemon/seahorse-service.c            | 5 +----
+ daemon/seahorse-service.h            | 5 +----
+ daemon/seahorse-set.c                | 5 +----
+ daemon/seahorse-set.h                | 5 +----
+ daemon/seahorse-source.c             | 5 +----
+ daemon/seahorse-source.h             | 5 +----
+ daemon/seahorse-transfer-operation.c | 5 +----
+ daemon/seahorse-transfer-operation.h | 5 +----
+ daemon/seahorse-types.c              | 5 +----
+ daemon/seahorse-types.h              | 5 +----
+ daemon/seahorse-unix-signal.c        | 5 +----
+ daemon/seahorse-unix-signal.h        | 5 +----
+ daemon/seahorse-unknown-source.c     | 5 +----
+ daemon/seahorse-unknown-source.h     | 5 +----
+ daemon/seahorse-unknown.c            | 5 +----
+ daemon/seahorse-unknown.h            | 5 +----
+ daemon/seahorse-util.c               | 5 +----
+ daemon/seahorse-util.h               | 5 +----
+ daemon/seahorse-validity.c           | 5 +----
+ daemon/seahorse-validity.h           | 5 +----
+ daemon/seahorse-widget.c             | 5 +----
+ daemon/seahorse-widget.h             | 5 +----
+ libcryptui/cryptui-defines.h         | 4 +---
+ libcryptui/cryptui-key-chooser.c     | 4 +---
+ libcryptui/cryptui-key-chooser.h     | 4 +---
+ libcryptui/cryptui-key-combo.c       | 4 +---
+ libcryptui/cryptui-key-combo.h       | 4 +---
+ libcryptui/cryptui-key-list.c        | 4 +---
+ libcryptui/cryptui-key-list.h        | 4 +---
+ libcryptui/cryptui-key-store.c       | 4 +---
+ libcryptui/cryptui-key-store.h       | 4 +---
+ libcryptui/cryptui-keyset.c          | 4 +---
+ libcryptui/cryptui-keyset.h          | 4 +---
+ libcryptui/cryptui-priv.h            | 4 +---
+ libcryptui/cryptui.c                 | 4 +---
+ libcryptui/cryptui.h                 | 4 +---
+ libcryptui/tests/cryptui-test-ui.c   | 4 +---
+ libegg/egg-datetime.c                | 4 +---
+ libegg/egg-datetime.h                | 4 +---
+ libegg/eggdesktopfile.c              | 3 +--
+ libegg/eggdesktopfile.h              | 3 +--
+ libegg/eggsmclient-private.h         | 4 +---
+ libegg/eggsmclient-xsmp.c            | 4 +---
+ libegg/eggsmclient.c                 | 4 +---
+ libegg/eggsmclient.h                 | 4 +---
+ 101 files changed, 101 insertions(+), 366 deletions(-)
+
+commit 6dc7d1f78bbb489a2d9761b88dfb285e840f15ce
+Author: YunQiang Su <[e-mail]>
+Date:   2014-01-25
+
+    Update Chinese simplified translation
+
+ po/zh_CN.po | 3691 +++++++++++++++++++++++++----------------------------------
+ 1 file changed, 1560 insertions(+), 2131 deletions(-)
+
+commit 40d7edf65e71078ea72d573f0fbe471273dfe437
+Author: Stef Walter <[e-mail]>
+Date:   2013-10-17
+
+    Release version 3.10.1
+
+ NEWS         | 3 +++
+ configure.ac | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+commit 69b7df4fa38f3e8a4272f4e3a9bc5493a8b991e8
+Author: Мирослав Николић <[e-mail]>
+Date:   2013-10-15
+
+    Updated Serbian translation
+
+ po/sr.po       | 3099 +++++++++-----------------------------------------------
+ po/[e-mail] | 3099 +++++++++-----------------------------------------------
+ 2 files changed, 904 insertions(+), 5294 deletions(-)
+
+commit d18f167ea209440d593bd379ffc8122703bab919
+Author: Rūdolfs Mazurs <[e-mail]>
+Date:   2013-10-05
+
+    Updated Latvian translation
+
+ po/lv.po | 3914 +++++++++++++++++++++++++++-----------------------------------
+ 1 file changed, 1678 insertions(+), 2236 deletions(-)
+
+commit 37d998fe35400dd48054d7298ec46478bdd5a031
+Author: Stef Walter <[e-mail]>
+Date:   2013-09-23
+
+    Release version 3.10.0
+
+ NEWS         | 4 ++++
+ configure.ac | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+commit 7d05922758ed3b2150ac48f0f818e2f50b574b75
+Author: Fran Diéguez <[e-mail]>
+Date:   2013-09-23
+
+    Updated Galician translations
+
+ po/gl.po | 3953 +++++++++++++++++++++++++++-----------------------------------
+ 1 file changed, 1695 insertions(+), 2258 deletions(-)
+
+commit 7165ca8c49304a8e2a9c62fe4c5888feae4f5cee
+Author: Matej Urbančič <[e-mail]>
+Date:   2013-09-02
+
+    Updated Slovenian translation
+
+ po/sl.po | 61 +++++++++++++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 43 insertions(+), 18 deletions(-)
+
+commit 74611e260f88d4401ecca8bc4e39d74336aef079
+Author: Stef Walter <[e-mail]>
+Date:   2013-08-26
+
+    Add upload-release make target
+
+ Makefile.am | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit a7f47ed6f1218423698a627e09be6a4bf1d18feb
+Author: Stef Walter <[e-mail]>
+Date:   2013-08-26
+
+    Release version 3.9.90
+
+ NEWS | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+commit 5cf466ddc004d6d005c1143ef1b6f5f9465154a8
+Author: Milo Casagrande <[e-mail]>
+Date:   2013-08-26
+
+    [l10n] Updated Italian translation.
+
+ po/it.po | 48 ++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 38 insertions(+), 10 deletions(-)
+
+commit 578c5888af148a5effefec7c4c2859e54535c543
+Author: Piotr Drąg <[e-mail]>
+Date:   2013-08-20
+
+    Updated Polish translation
+
+ po/pl.po | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+commit 29a182624c255a3553e9074f35ba550d84c0f604
+Author: Stef Walter <[e-mail]>
+Date:   2013-08-16
+
+    Include the correct project version in pkg-config file
+
+ libcryptui/cryptui.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 28c88e5a63c325c0a246c986497b83394dfb2f72
+Author: Stef Walter <[e-mail]>
+Date:   2013-08-16
+
+    Bump version number
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit eb1c3495d977197ae3014d302af11feebc35dbd2
+Author: Aurimas Černius <[e-mail]>
+Date:   2013-08-15
+
+    Updated Lithuanian translation
+
+ po/lt.po | 3879 ++++++++------------------------------------------------------
+ 1 file changed, 448 insertions(+), 3431 deletions(-)
+
+commit d8ff32e846b74fe1b97822d212eb6711d90c2a2c
+Author: Piotr Drąg <[e-mail]>
+Date:   2013-08-11
+
+    Updated Polish translation
+
+ po/pl.po | 115 ++++++++++++++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 74 insertions(+), 41 deletions(-)
+
+commit 5b125b10cb709460412e87dfaed1e946f2c46a61
+Author: Enrico Nicoletto <[e-mail]>
+Date:   2013-07-29
+
+    Updated Brazilian Portuguese translation
+
+ po/pt_BR.po | 3912 ++++++++++++++---------------------------------------------
+ 1 file changed, 908 insertions(+), 3004 deletions(-)
+
+commit 0fd5f0b8db23924df1c13d14e3289d8d1e9100c5
+Author: Russ Adams <[e-mail]>
+Date:   2013-02-23
+
+    Updating Python test scripts for Python 3 migration.
+
+ tests/dbus-crypto-test.py               | 16 ++++++++--------
+ tests/dbus-discover-test.py             | 10 +++++-----
+ tests/dbus-display-notification-test.py |  4 ++--
+ tests/dbus-import.py                    | 12 ++++++------
+ tests/dbus-listen-keyset.py             | 10 +++++-----
+ tests/dbus-match-test.py                | 12 ++++++------
+ tests/dbus-test.py                      | 24 ++++++++++++------------
+ 7 files changed, 44 insertions(+), 44 deletions(-)
+
+commit 6a996f137139ab46823aec041155d65c791783e3
+Author: Marek Černocký <[e-mail]>
+Date:   2013-07-09
+
+    Updated Czech translation
+
+ po/cs.po | 50 +++++++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 39 insertions(+), 11 deletions(-)
+
+commit 4c4b3b0adf287ba7327809f9847a95a61c769a73
+Author: Daniel Mustieles <[e-mail]>
+Date:   2013-07-09
+
+    Updated Spanish translation
+
+ po/es.po | 58 +++++++++++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 45 insertions(+), 13 deletions(-)
+
+commit aff4f36a112b4243eae0ef1fd581914c879f0940
+Author: Stef Walter <[e-mail]>
+Date:   2013-07-09
+
+    Remove the --enable-tests configure arg, and always build tests
+
+ configure.ac           | 11 -----------
+ libcryptui/Makefile.am |  8 +-------
+ 2 files changed, 1 insertion(+), 18 deletions(-)
+
+commit cd74aa6bf810a5ce0935d2ec89d6db64dbbde24d
+Author: Jérémy Bobbio <[e-mail]>
+Date:   2013-05-02
+
+    Add symmetric encryption as a choice in "choose recipients" dialog
+    
+    This extends the current "choose recipients" dialog to offer symmetric
+    encryption instead of public key recipients.
+    
+    Callers need to use the new cryptui_prompt_recipients_with_symmetric()
+    function to offer symmetric encryption. cryptui_prompt_recipients()
+    behaviour is unchanged.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=325803
+
+ libcryptui/cryptui-key-chooser.c   | 131 +++++++++++++++++++++++++++++++++++--
+ libcryptui/cryptui-key-chooser.h   |  12 +++-
+ libcryptui/cryptui.c               |  62 ++++++++++++++----
+ libcryptui/cryptui.h               |   4 ++
+ libcryptui/tests/cryptui-test-ui.c |  12 +++-
+ 5 files changed, 196 insertions(+), 25 deletions(-)
+
+commit c744886a9c4c723589b8c8d6b3fb6a225c54dd21
+Author: Jérémy Bobbio <[e-mail]>
+Date:   2013-06-11
+
+    Add cryptui_need_to_get_keys_or_symmetric()
+    
+    When encryption is requested but no public keys are available, it is a viable
+    option to perform symmetric instead of public key encryption. This new
+    function is similar to cryptui_need_to_get_keys() but adds the possibility to
+    opt for symmetric encryption.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=325803
+
+ libcryptui/cryptui.c | 36 ++++++++++++++++++++++++++++++++++++
+ libcryptui/cryptui.h |  2 ++
+ 2 files changed, 38 insertions(+)
+
+commit 884f61bf72a1d7cc939510aadbb4889e07cb01b2
+Author: Milo Casagrande <[e-mail]>
+Date:   2013-06-19
+
+    [l10n] Updated Italian translation.
+
+ po/it.po | 3030 +++++++++-----------------------------------------------------
+ 1 file changed, 415 insertions(+), 2615 deletions(-)
+
+commit f110e1c8a2efa46c106b910b765a4a8728021dce
+Author: Jérémy Bobbio <[e-mail]>
+Date:   2013-05-16
+
+    Avoid repeating the self encryption key in cryptui_key_chooser_get_recipients()
+    
+    When using self encryption, cryptui_key_chooser_get_recipients() would
+    previously always prepend the key to the recipient list. This is uneeded
+    if the key is already in there.
+    
+    This change makes prompt_recipients() in seahorse-tool.c happier when
+    selecting the key using for signing in the recipient list.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=701987
+
+ libcryptui/cryptui-key-chooser.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+commit 11287e83276e52f8df7168c1dc98f2729b79da88
+Author: Marek Černocký <[e-mail]>
+Date:   2013-06-08
+
+    Updated Czech translation
+
+ po/cs.po | 3009 +++++++++-----------------------------------------------------
+ 1 file changed, 416 insertions(+), 2593 deletions(-)
+
+commit d9ab48f438b8eb169b7dc97e6a6a0da5e4b7037f
+Author: Kjartan Maraas <[e-mail]>
+Date:   2013-05-29
+
+    Updated Norwegian bokmål translation
+
+ po/nb.po | 2994 +++++++++-----------------------------------------------------
+ 1 file changed, 413 insertions(+), 2581 deletions(-)
+
+commit 094625ca0d2aad04a01de1e64aab5976af748c38
+Author: Matej Urbančič <[e-mail]>
+Date:   2013-05-25
+
+    Added Slovenian translation
+
+ po/sl.po | 3915 +++++++++++++++++++++++++++-----------------------------------
+ 1 file changed, 1713 insertions(+), 2202 deletions(-)
+
+commit 7fc9298a90fe0236cb24c55b6118157265afdd46
+Author: Daniel Mustieles <[e-mail]>
+Date:   2013-05-24
+
+    Updated Spanish translation
+
+ po/es.po | 83 ++++++++++++++++++++++++++++++++++------------------------------
+ 1 file changed, 44 insertions(+), 39 deletions(-)
+
+commit a35642937469e501012d5c1d0cac83e10dee14cf
+Author: Yaron Shahrabani <[e-mail]>
+Date:   2013-05-24
+
+    Updated Hebrew translation.
+
+ po/he.po | 3856 ++++++++++++++++++++++++++------------------------------------
+ 1 file changed, 1599 insertions(+), 2257 deletions(-)
+
+commit 1a7c9d7e75a3be0a3fbf3398575d6296528b079e
+Author: Stef Walter <[e-mail]>
+Date:   2013-05-23
+
+    Set the source on UID objects
+    
+    This allows them to be used for selecting encryption recipients
+
+ daemon/seahorse-gpgme-key.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+commit fe681ef53a050eda6be5308151202c86cd123301
+Author: Stef Walter <[e-mail]>
+Date:   2013-05-23
+
+    Remove some unused code
+
+ daemon/seahorse-pgp-uid.c | 145 ----------------------------------------------
+ daemon/seahorse-pgp-uid.h |   2 -
+ 2 files changed, 147 deletions(-)
+
+commit 86bcf96fc5926e07f0a77db3745304b1236fa896
+Author: Stef Walter <[e-mail]>
+Date:   2013-05-23
+
+    Fix warning on startup about missing seahorse-daemon.desktop file
+
+ daemon/seahorse-daemon.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+commit c062d0fea72244bddbb1ef42f03057fd6dad5794
+Author: Stef Walter <[e-mail]>
+Date:   2013-05-23
+
+    Ignore files created when doing code coverage
+
+ .gitignore | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 6012bfe8e9db61902d8db439be488b0fb118bf50
+Author: Jérémy Bobbio <[e-mail]>
+Date:   2013-04-10
+
+    Add support for symmetric encryption
+    
+    A new flag, FLAG_SYMMETRIC is added for the EncryptText and EncryptFile
+    services. When specified, both will perform symmetric encryption instead of
+    using public keys.
+    
+    To prevent programming mistakes, we error out if there is anything in the list
+    of recipients as it will not be used when performing symmetric encryption.
+    
+    The default passphrase callback - seahorse-gpgme-source.c:passphrase_get() -
+    will be used to prompt users to enter the passphrase used for symmetric
+    encryption, like we already do for symmetric decryption.
+    
+    https://bugzilla.gnome.org/show_bug.cgi?id=699161
+
+ daemon/seahorse-service-crypto.c   | 221 ++++++++++++++++++++-----------------
+ daemon/seahorse-service-crypto.xml |   1 +
+ tests/dbus-crypto-test.py          |   8 ++
+ tests/dbus-test.py                 |   4 +-
+ 4 files changed, 131 insertions(+), 103 deletions(-)
+
 commit 7081f311b822be618e03d5e387f5a7bf6ce0fe62
 Author: Stef Walter <[e-mail]>
 Date:   2013-03-25

=== modified file 'Makefile.am'
--- Makefile.am	2011-11-23 12:30:54 +0000
+++ Makefile.am	2014-07-01 03:49:19 +0000
@@ -55,3 +55,7 @@
 
 distuninstallcheck:
 	@:
+
+upload-release: $(DIST_ARCHIVES)
+	scp $(DIST_ARCHIVES) master.gnome.org:
+	ssh master.gnome.org ftpadmin install $(DIST_ARCHIVES)

=== modified file 'Makefile.in'
--- Makefile.in	2013-06-11 20:09:34 +0000
+++ Makefile.in	2014-07-01 03:49:19 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.2 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,23 +14,51 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -50,11 +78,11 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	config.guess config.sub depcomp install-sh ltmain.sh missing \
-	mkinstalldirs
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in mkinstalldirs COPYING config.guess \
+	config.sub depcomp install-sh missing ltmain.sh
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
@@ -84,13 +112,14 @@
 am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -98,9 +127,30 @@
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
@@ -202,6 +252,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -452,14 +503,13 @@
 # (1) if the variable is set in 'config.status', edit 'config.status'
 #     (which will cause the Makefiles to be regenerated when you run 'make');
 # (2) otherwise, pass the desired values on the 'make' command line.
-$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	case "$@" in \
@@ -480,31 +530,13 @@
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-cscopelist-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -520,12 +552,7 @@
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -537,15 +564,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -554,18 +577,16 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
-
 cscope: cscope.files
 	test ! -s cscope.files \
 	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-
 clean-cscope:
 	-rm -f cscope.files
-
-cscope.files: clean-cscope cscopelist-recursive cscopelist
-
-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -702,9 +723,9 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod u+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
@@ -855,27 +876,24 @@
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	cscopelist-recursive ctags-recursive install-am install-strip \
-	tags-recursive
+.MAKE: $(am__recursive_targets) all install-am install-strip
 
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-cscope \
-	clean-generic clean-libtool cscope cscopelist \
-	cscopelist-recursive ctags ctags-recursive dist dist-all \
-	dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \
-	dist-xz dist-zip distcheck distclean distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags distcleancheck \
-	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
+	dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 
 dist-hook:
@@ -895,6 +913,10 @@
 distuninstallcheck:
 	@:
 
+upload-release: $(DIST_ARCHIVES)
+	scp $(DIST_ARCHIVES) master.gnome.org:
+	ssh master.gnome.org ftpadmin install $(DIST_ARCHIVES)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

=== modified file 'NEWS'
--- NEWS	2013-06-11 20:09:34 +0000
+++ NEWS	2014-07-01 03:49:19 +0000
@@ -1,3 +1,24 @@
+libcryptui 3.12.2:
+ * Updated translations
+ * Build fix on FreeBSD [#727196]
+ 
+libcryptui 3.10.1:
+ * Updated translations
+
+libcryptui 3.10.0:
+ * Updated translations
+ * Build fix
+
+libcryptui 3.9.90:
+ * Add symmetric encryption as a choice in "choose recipients" dialog [#325803]
+ * Add support for symmetric encryption [#699161]
+ * Add cryptui_need_to_get_keys_or_symmetric() [#325803]
+ * Avoid repeating the self encryption key in cryptui_key_chooser_ge [#701987]
+ * Fix warning on startup about missing seahorse-daemon.desktop file
+ * Set the source on UID objects
+ * Build fixes
+ * Updated translations
+
 libcryptui 3.8.0:
  (no changes from previous release)
 

=== modified file 'aclocal.m4'
--- aclocal.m4	2013-06-11 20:09:34 +0000
+++ aclocal.m4	2014-07-01 03:49:19 +0000
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.12.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -11,6 +11,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
@@ -336,7 +337,6 @@
 dnl
 glib_DEFUN([GLIB_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
    
    GLIB_LC_MESSAGES
    GLIB_WITH_NLS
@@ -541,7 +541,7 @@
 )
 
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -773,24 +773,37 @@
 m4_popdef([pkg_description])
 ]) dnl PKG_NOARCH_INSTALLDIR
 
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+
+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -------------------------------------------
+# Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])# PKG_CHECK_VAR
+
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
-
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # 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.12'
+[am__api_version='1.13'
 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.12.2], [],
+m4_if([$1], [1.13.4], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -806,21 +819,19 @@
 # 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.12.2])dnl
+[AM_AUTOMAKE_VERSION([1.13.4])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-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
 # '$srcdir', '$srcdir/..', or '$srcdir/../..'.
@@ -868,14 +879,12 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
@@ -901,13 +910,12 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 17
 
 # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -1093,19 +1101,18 @@
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2012 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -1134,7 +1141,7 @@
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
@@ -1168,27 +1175,14 @@
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 19
-
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
@@ -1204,7 +1198,7 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -1234,8 +1228,7 @@
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
 [AC_DIAGNOSE([obsolete],
-[$0: two- and three-arguments forms are deprecated.  For more info, see:
-http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation])
+             [$0: two- and three-arguments forms are deprecated.])
 m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
@@ -1289,18 +1282,15 @@
 		  [_AM_DEPENDENCIES([OBJC])],
 		  [m4_define([AC_PROG_OBJC],
 			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
-dnl Support for Objective C++ was only introduced in Autoconf 2.65,
-dnl but we still cater to Autoconf 2.62.
-m4_ifdef([AC_PROG_OBJCXX],
-[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
 		  [_AM_DEPENDENCIES([OBJCXX])],
 		  [m4_define([AC_PROG_OBJCXX],
-			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
-dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
@@ -1334,14 +1324,12 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
-
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -1357,14 +1345,12 @@
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -1381,14 +1367,12 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 7
-
 # AM_MAINTAINER_MODE([DEFAULT-MODE])
 # ----------------------------------
 # Control maintainer-specific portions of Makefiles.
@@ -1416,18 +1400,14 @@
 ]
 )
 
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -1472,14 +1452,12 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997-2012 Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 7
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -1487,11 +1465,10 @@
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -1504,24 +1481,51 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
   AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
+#  -*- Autoconf -*-
+# Obsolete and "removed" macros, that must however still report explicit
+# error messages when used, to smooth transition.
+#
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([AM_CONFIG_HEADER],
+[AC_DIAGNOSE([obsolete],
+['$0': this macro is obsolete.
+You should use the 'AC][_CONFIG_HEADERS' macro instead.])dnl
+AC_CONFIG_HEADERS($@)])
+
+AC_DEFUN([AM_PROG_CC_STDC],
+[AC_PROG_CC
+am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc
+AC_DIAGNOSE([obsolete],
+['$0': this macro is obsolete.
+You should simply use the 'AC][_PROG_CC' macro instead.
+Also, your code should no longer depend upon 'am_cv_prog_cc_stdc',
+but upon 'ac_cv_prog_cc_stdc'.])])
+
+AC_DEFUN([AM_C_PROTOTYPES],
+         [AC_FATAL([automatic de-ANSI-fication support has been removed])])
+AU_DEFUN([fp_C_PROTOTYPES], [AM_C_PROTOTYPES])
+
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
@@ -1547,14 +1551,12 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996-2012 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
-
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
@@ -1630,14 +1632,12 @@
 rm -f conftest.file
 ])
 
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
-
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
@@ -1692,14 +1692,12 @@
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001-2012 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor 'install' (even GNU) is that you can't
@@ -1722,14 +1720,12 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -1743,14 +1739,12 @@
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004-2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
@@ -1764,76 +1758,114 @@
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+
 m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of '-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
+
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
+  rm -rf conftest.dir
+
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR

=== modified file 'config.guess'
--- config.guess	2013-06-11 20:09:34 +0000
+++ config.guess	2014-07-01 03:49:19 +0000
@@ -2,13 +2,13 @@
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   2011, 2012, 2013 Free Software Foundation, Inc.
 
-timestamp='2012-01-01'
+timestamp='2012-12-29'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -17,26 +17,22 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <[e-mail]> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner. 
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to [e-mail].
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -57,8 +53,8 @@
 
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -202,6 +198,10 @@
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -304,7 +304,7 @@
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -803,6 +803,9 @@
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
@@ -863,6 +866,13 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -1196,6 +1206,9 @@
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1251,7 +1264,7 @@
     NEO-?:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1320,11 +1333,11 @@
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_

=== modified file 'config.sub'
--- config.sub	2013-06-11 20:09:34 +0000
+++ config.sub	2014-07-01 03:49:19 +0000
@@ -2,37 +2,32 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
-
-timestamp='2012-01-01'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# 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
-# the Free Software Foundation; either version 2 of the License, or
+#   2011, 2012, 2013 Free Software Foundation, Inc.
+
+timestamp='2012-12-29'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <[e-mail]>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+
+
+# Please send patches with a ChangeLog entry to [e-mail].
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -76,8 +71,8 @@
 GNU config.sub ($timestamp)
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -125,13 +120,17 @@
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -154,7 +153,7 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
@@ -223,6 +222,12 @@
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -247,11 +252,14 @@
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
+	| arc \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
@@ -264,7 +272,7 @@
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -319,7 +327,7 @@
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -332,7 +340,10 @@
 	strongarm | thumb | xscale)
 		basic_machine=arm-unknown
 		;;
-
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
 	xscaleeb)
 		basic_machine=armeb-unknown
 		;;
@@ -355,6 +366,7 @@
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
@@ -376,7 +388,8 @@
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -775,9 +788,13 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze)
+	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -991,7 +1008,7 @@
 		;;
 	ppc64)	basic_machine=powerpc64-unknown
 		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
 		basic_machine=powerpc64le-unknown
@@ -1006,7 +1023,11 @@
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1339,15 +1360,15 @@
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1530,6 +1551,9 @@
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;

=== modified file 'configure'
--- configure	2013-06-11 20:09:34 +0000
+++ configure	2014-07-01 03:49:19 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libcryptui 3.8.0.
+# Generated by GNU Autoconf 2.69 for libcryptui 3.12.2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
 # Identity of this package.
 PACKAGE_NAME='libcryptui'
 PACKAGE_TARNAME='libcryptui'
-PACKAGE_VERSION='3.8.0'
-PACKAGE_STRING='libcryptui 3.8.0'
+PACKAGE_VERSION='3.12.2'
+PACKAGE_STRING='libcryptui 3.12.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -672,8 +672,6 @@
 LIBCRYPTUI_LT_RELEASE
 GNOME_KEYRING_LIBS
 GNOME_KEYRING_CFLAGS
-WITH_TESTS_FALSE
-WITH_TESTS_TRUE
 LIBNOTIFY_LIBS
 LIBNOTIFY_CFLAGS
 DBUS_BINDING_TOOL
@@ -706,11 +704,14 @@
 GTK_DOC_BUILD_HTML_TRUE
 ENABLE_GTK_DOC_FALSE
 ENABLE_GTK_DOC_TRUE
+HAVE_GTK_DOC_FALSE
+HAVE_GTK_DOC_TRUE
 GTKDOC_DEPS_LIBS
 GTKDOC_DEPS_CFLAGS
 HTML_DIR
 GTKDOC_MKPDF
 GTKDOC_REBASE
+GTKDOC_CHECK_PATH
 GTKDOC_CHECK
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
@@ -897,7 +898,6 @@
 enable_libnotify
 enable_debug
 enable_fatal_messages
-enable_tests
 enable_introspection
 enable_update_mime_database
 '
@@ -1477,7 +1477,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libcryptui 3.8.0 to adapt to many kinds of systems.
+\`configure' configures libcryptui 3.12.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1547,7 +1547,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libcryptui 3.8.0:";;
+     short | recursive ) echo "Configuration of libcryptui 3.12.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1581,7 +1581,6 @@
   --enable-debug          Compile binaries in debug mode
   --enable-fatal-messages Don't make compile and or runtime messages fatal in
                           debug mode.
-  --enable-tests          Compile Test Programs
   --enable-introspection=[no/auto/yes]
                           Enable introspection for this build
   --disable-update-mime-database
@@ -1714,7 +1713,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libcryptui configure 3.8.0
+libcryptui configure 3.12.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2254,7 +2253,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libcryptui $as_me 3.8.0, which was
+It was created by libcryptui $as_me 3.12.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2610,7 +2609,7 @@
 
 
 
-am__api_version='1.12'
+am__api_version='1.13'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2823,8 +2822,8 @@
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
@@ -3064,6 +3063,45 @@
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -3087,7 +3125,7 @@
 # Define the identity of the package.
 
  PACKAGE=libcryptui
- VERSION=3.8.0
+ VERSION=3.12.2
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3127,12 +3165,17 @@
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
 
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
 
 
+
 ac_config_headers="$ac_config_headers config.h"
 
 # Check whether --enable-silent-rules was given.
@@ -7553,7 +7596,7 @@
   rm -rf conftest*
   ;;
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -7571,7 +7614,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_i386"
 	    ;;
-	  ppc64-*linux*|powerpc64-*linux*)
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
 	  s390x-*linux*)
@@ -7590,7 +7636,10 @@
 	  x86_64-*linux*)
 	    LD="${LD-ld} -m elf_x86_64"
 	    ;;
-	  ppc*-*linux*|powerpc*-*linux*)
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
 	  s390*-*linux*|s390*-*tpf*)
@@ -16055,26 +16104,49 @@
 
 
 
-    # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+  gtk_doc_requires="gtk-doc >= 1.9"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5
+$as_echo_n "checking for gtk-doc... " >&6; }
+  if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_doc_requires\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "$gtk_doc_requires") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  have_gtk_doc=yes
+else
+  have_gtk_doc=no
+fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_gtk_doc" >&5
+$as_echo "$have_gtk_doc" >&6; }
+
+  if test "$have_gtk_doc" = "no"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+  You will not be able to create source packages with 'make dist'
+  because $gtk_doc_requires is not found." >&5
+$as_echo "$as_me: WARNING:
+  You will not be able to create source packages with 'make dist'
+  because $gtk_doc_requires is not found." >&2;}
+  fi
+
+            # Extract the first word of "gtkdoc-check", so it can be a program name with args.
 set dummy gtkdoc-check; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GTKDOC_CHECK+:} false; then :
+if ${ac_cv_prog_GTKDOC_CHECK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $GTKDOC_CHECK in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  if test -n "$GTKDOC_CHECK"; then
+  ac_cv_prog_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_prog_GTKDOC_CHECK="gtkdoc-check.test"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -16082,10 +16154,9 @@
   done
 IFS=$as_save_IFS
 
-  ;;
-esac
-fi
-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
+fi
+fi
+GTKDOC_CHECK=$ac_cv_prog_GTKDOC_CHECK
 if test -n "$GTKDOC_CHECK"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
 $as_echo "$GTKDOC_CHECK" >&6; }
@@ -16095,6 +16166,46 @@
 fi
 
 
+  # Extract the first word of "gtkdoc-check", so it can be a program name with args.
+set dummy gtkdoc-check; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GTKDOC_CHECK_PATH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GTKDOC_CHECK_PATH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GTKDOC_CHECK_PATH="$GTKDOC_CHECK_PATH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GTKDOC_CHECK_PATH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GTKDOC_CHECK_PATH=$ac_cv_path_GTKDOC_CHECK_PATH
+if test -n "$GTKDOC_CHECK_PATH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK_PATH" >&5
+$as_echo "$GTKDOC_CHECK_PATH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
   for ac_prog in gtkdoc-rebase
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -16201,18 +16312,19 @@
 fi
 
 
-  if test x$enable_gtk_doc = xyes; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.9\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.9") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  :
-else
-  as_fn_error $? "You need to have gtk-doc >= 1.9 installed to build $PACKAGE_NAME" "$LINENO" 5
-fi
-        if test "x$PACKAGE_NAME" != "xglib"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
+$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
+$as_echo "$enable_gtk_doc" >&6; }
+
+  if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then
+    as_fn_error $? "
+  You must have $gtk_doc_requires installed to build documentation for
+  $PACKAGE_NAME. Please install gtk-doc or disable building the
+  documentation by adding '--disable-gtk-doc' to '$0'." "$LINENO" 5
+  fi
+
+    if test "x$PACKAGE_NAME" != "xglib"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKDOC_DEPS" >&5
@@ -16272,31 +16384,11 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GTKDOC_DEPS_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0) were not met:
-
-$GTKDOC_DEPS_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
-and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+	:
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS
-and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+	:
 else
 	GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS
 	GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS
@@ -16304,14 +16396,8 @@
 $as_echo "yes" >&6; }
 
 fi
-    fi
   fi
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
-$as_echo "$enable_gtk_doc" >&6; }
-
     # Check whether --enable-gtk-doc-html was given.
 if test "${enable_gtk_doc_html+set}" = set; then :
   enableval=$enable_gtk_doc_html;
@@ -16331,6 +16417,18 @@
     enable_gtk_doc_pdf=no
   fi
 
+  if test -z "$AM_DEFAULT_VERBOSITY"; then
+    AM_DEFAULT_VERBOSITY=1
+  fi
+
+
+   if test x$have_gtk_doc = xyes; then
+  HAVE_GTK_DOC_TRUE=
+  HAVE_GTK_DOC_FALSE='#'
+else
+  HAVE_GTK_DOC_TRUE='#'
+  HAVE_GTK_DOC_FALSE=
+fi
 
    if test x$enable_gtk_doc = xyes; then
   ENABLE_GTK_DOC_TRUE=
@@ -17731,26 +17829,6 @@
     echo "enabling fatal runtime messages"
 fi
 
-# Build Tests
-# Check whether --enable-tests was given.
-if test "${enable_tests+set}" = set; then :
-  enableval=$enable_tests;
-fi
-
-
-if test "$enable_tests" != "yes"; then
-    enable_tests="no"
-fi
-
- if test "$enable_tests" = "yes"; then
-  WITH_TESTS_TRUE=
-  WITH_TESTS_FALSE='#'
-else
-  WITH_TESTS_TRUE='#'
-  WITH_TESTS_FALSE=
-fi
-
-
 
 
 pkg_failed=no
@@ -19104,7 +19182,6 @@
 
 ac_libobjs=
 ac_ltlibobjs=
-U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -19155,6 +19232,10 @@
   ac_config_commands="$ac_config_commands po/stamp-it"
 
 
+if test -z "${HAVE_GTK_DOC_TRUE}" && test -z "${HAVE_GTK_DOC_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_GTK_DOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -19183,10 +19264,6 @@
   as_fn_error $? "conditional \"OS_WIN32\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${WITH_TESTS_TRUE}" && test -z "${WITH_TESTS_FALSE}"; then
-  as_fn_error $? "conditional \"WITH_TESTS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -19592,7 +19669,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libcryptui $as_me 3.8.0, which was
+This file was extended by libcryptui $as_me 3.12.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19658,7 +19735,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libcryptui config.status 3.8.0
+libcryptui config.status 3.12.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -20779,7 +20856,7 @@
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -20830,7 +20907,7 @@
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the

=== modified file 'configure.ac'
--- configure.ac	2013-06-11 20:09:34 +0000
+++ configure.ac	2014-07-01 03:49:19 +0000
@@ -5,7 +5,7 @@
 dnl ****************************************************************************
 dnl MAIN SEAHORSE VERSION (update after release)
 
-AC_INIT(libcryptui, 3.8.0)
+AC_INIT(libcryptui, 3.12.2)
 
 dnl ****************************************************************************
 dnl LIBCRYPTUI libtool versioning
@@ -251,17 +251,6 @@
     echo "enabling fatal runtime messages"
 fi
 
-# Build Tests
-AC_ARG_ENABLE(tests,
-        AC_HELP_STRING([--enable-tests],
-        [Compile Test Programs]))
-        
-if test "$enable_tests" != "yes"; then
-    enable_tests="no"
-fi
-
-AM_CONDITIONAL(WITH_TESTS, test "$enable_tests" = "yes")
-
 dnl ****************************************************************************
 dnl GNOME-KEYRING
 dnl ****************************************************************************

=== modified file 'daemon/Makefile.am'
--- daemon/Makefile.am	2013-06-11 20:09:34 +0000
+++ daemon/Makefile.am	2014-07-01 03:49:19 +0000
@@ -14,7 +14,7 @@
 	-DLOCALEDIR=\""$(localedir)"\" \
 	-DPIXMAPSDIR=\""$(pixmapsdir)"\" \
 	-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \
-	-DAUTOSTARTDIR=\""$(datadir)/gnome/autostart"\" \
+	-DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\" \
 	-DSEAHORSE_UIDIR=\""$(uidir)"\"
 
 bin_PROGRAMS = seahorse-daemon
@@ -74,7 +74,7 @@
 	$(BUILT_SOURCES)
 
 seahorse_daemon_LDADD = \
-	$(top_builddir)/libcryptui/libcryptui-private.la \
+	$(top_builddir)/libcryptui/libcryptui.la \
 	$(top_builddir)/libegg/libeggdatetime.la \
 	$(top_builddir)/libegg/libeggsmclient.la \
 	$(SEAHORSE_LIBS)

=== modified file 'daemon/Makefile.in'
--- daemon/Makefile.in	2013-06-11 20:09:34 +0000
+++ daemon/Makefile.in	2014-07-01 03:49:19 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.2 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -16,23 +16,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,9 +79,9 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/Makefile.decl $(top_srcdir)/depcomp \
-	$(top_srcdir)/mkinstalldirs
+DIST_COMMON = $(top_srcdir)/Makefile.decl $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/mkinstalldirs \
+	$(top_srcdir)/depcomp
 bin_PROGRAMS = seahorse-daemon$(EXEEXT)
 subdir = daemon
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -181,6 +209,23 @@
 NROFF = nroff
 MANS = $(man_MANS)
 DATA = $(service_DATA) $(ui_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -239,6 +284,7 @@
 GREP = @GREP@
 GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@
 GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
 GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
@@ -547,10 +593,12 @@
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -571,7 +619,8 @@
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -584,6 +633,7 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 seahorse-daemon$(EXEEXT): $(seahorse_daemon_OBJECTS) $(seahorse_daemon_DEPENDENCIES) $(EXTRA_seahorse_daemon_DEPENDENCIES) 
 	@rm -f seahorse-daemon$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(seahorse_daemon_OBJECTS) $(seahorse_daemon_LDADD) $(LIBS)
@@ -750,26 +800,15 @@
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -781,15 +820,11 @@
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -798,9 +833,10 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
 
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -817,19 +853,6 @@
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically 'make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -975,21 +998,22 @@
 
 .MAKE: all check install install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libtool cscopelist ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-binPROGRAMS install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man1 install-pdf \
-	install-pdf-am install-ps install-ps-am install-serviceDATA \
-	install-strip install-uiDATA installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-man \
-	uninstall-man1 uninstall-serviceDATA uninstall-uiDATA
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-man1 \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-serviceDATA install-strip install-uiDATA installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-man uninstall-man1 uninstall-serviceDATA \
+	uninstall-uiDATA
 
 
 .desktop.in.in.desktop.in:

=== modified file 'daemon/seahorse-context.c'
--- daemon/seahorse-context.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-context.c	2014-07-01 03:49:19 +0000
@@ -14,10 +14,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-context.h'
--- daemon/seahorse-context.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-context.h	2014-07-01 03:49:19 +0000
@@ -14,10 +14,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __SEAHORSE_CONTEXT_H__

=== modified file 'daemon/seahorse-daemon.c'
--- daemon/seahorse-daemon.c	2013-06-11 20:09:34 +0000
+++ daemon/seahorse-daemon.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -242,8 +239,7 @@
     }
      	 
 	g_signal_connect (egg_sm_client_get (), "quit", G_CALLBACK (smclient_quit), NULL);
-    egg_set_desktop_file(AUTOSTARTDIR "/seahorse-daemon.desktop");
-    
+
     /*
      * All functions after this point have to print messages
      * nicely and not just called exit()

=== modified file 'daemon/seahorse-daemon.h'
--- daemon/seahorse-daemon.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-daemon.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _SEAHORSE_DAEMON_H_

=== modified file 'daemon/seahorse-dbus-server.c'
--- daemon/seahorse-dbus-server.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-dbus-server.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 #include "config.h"

=== modified file 'daemon/seahorse-gpg-op.c'
--- daemon/seahorse-gpg-op.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpg-op.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-gpg-op.h'
--- daemon/seahorse-gpg-op.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpg-op.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __SEAHORSE_GPG_OP_H__

=== modified file 'daemon/seahorse-gpg-options.c'
--- daemon/seahorse-gpg-options.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpg-options.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-gpg-options.h'
--- daemon/seahorse-gpg-options.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpg-options.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /** 

=== modified file 'daemon/seahorse-gpgme-data.c'
--- daemon/seahorse-gpgme-data.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme-data.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-gpgme-data.h'
--- daemon/seahorse-gpgme-data.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme-data.h	2014-07-01 03:49:19 +0000
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *  
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 /**

=== modified file 'daemon/seahorse-gpgme-generate.c'
--- daemon/seahorse-gpgme-generate.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme-generate.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-gpgme-generate.h'
--- daemon/seahorse-gpgme-generate.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme-generate.h	2014-07-01 03:49:19 +0000
@@ -14,10 +14,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*

=== modified file 'daemon/seahorse-gpgme-key-op.c'
--- daemon/seahorse-gpgme-key-op.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme-key-op.c	2014-07-01 03:49:19 +0000
@@ -15,10 +15,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-gpgme-key-op.h'
--- daemon/seahorse-gpgme-key-op.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme-key-op.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __SEAHORSE_GPGME_KEY_OP_H__

=== modified file 'daemon/seahorse-gpgme-key.c'
--- daemon/seahorse-gpgme-key.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme-key.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "config.h"
 
@@ -166,6 +163,7 @@
 	SeahorseGpgmeUid *uid;
 	GList *results = NULL;
 	gboolean changed = FALSE;
+	SeahorseSource *source;
 	GList *uids;
 
 	uids = self->pv->uids;
@@ -189,10 +187,12 @@
 	}
 
 	/* Add new UIDs */
+	source = seahorse_object_get_source (SEAHORSE_OBJECT (self));
 	while (guid != NULL) {
 		uid = seahorse_gpgme_uid_new (self->pv->pubkey, guid);
 		changed = TRUE;
 		results = seahorse_object_list_append (results, uid);
+		g_object_set (uid, "source", source, NULL);
 		g_object_unref (uid);
 		guid = guid->next;
 	}

=== modified file 'daemon/seahorse-gpgme-key.h'
--- daemon/seahorse-gpgme-key.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme-key.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __SEAHORSE_GPGME_KEY_H__

=== modified file 'daemon/seahorse-gpgme-operation.c'
--- daemon/seahorse-gpgme-operation.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme-operation.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-gpgme-operation.h'
--- daemon/seahorse-gpgme-operation.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme-operation.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /** 

=== modified file 'daemon/seahorse-gpgme-source.c'
--- daemon/seahorse-gpgme-source.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme-source.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-gpgme-source.h'
--- daemon/seahorse-gpgme-source.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme-source.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /** 

=== modified file 'daemon/seahorse-gpgme-subkey.c'
--- daemon/seahorse-gpgme-subkey.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme-subkey.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-gpgme-subkey.h'
--- daemon/seahorse-gpgme-subkey.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme-subkey.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __SEAHORSE_GPGME_SUBKEY_H__

=== modified file 'daemon/seahorse-gpgme-uid.c'
--- daemon/seahorse-gpgme-uid.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme-uid.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-gpgme-uid.h'
--- daemon/seahorse-gpgme-uid.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme-uid.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __SEAHORSE_GPGME_UID_H__

=== modified file 'daemon/seahorse-gpgme.c'
--- daemon/seahorse-gpgme.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme.c	2014-07-01 03:49:19 +0000
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *  
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-gpgme.h'
--- daemon/seahorse-gpgme.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-gpgme.h	2014-07-01 03:49:19 +0000
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *  
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifndef SEAHORSEGPGME_H_

=== modified file 'daemon/seahorse-libdialogs.h'
--- daemon/seahorse-libdialogs.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-libdialogs.h	2014-07-01 03:49:19 +0000
@@ -14,10 +14,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**

=== modified file 'daemon/seahorse-notification.c'
--- daemon/seahorse-notification.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-notification.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 #include "config.h"

=== modified file 'daemon/seahorse-object-list.c'
--- daemon/seahorse-object-list.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-object-list.c	2014-07-01 03:49:19 +0000
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *  
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #include "seahorse-object-list.h"

=== modified file 'daemon/seahorse-object-list.h'
--- daemon/seahorse-object-list.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-object-list.h	2014-07-01 03:49:19 +0000
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *  
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #include <glib.h>

=== modified file 'daemon/seahorse-object.c'
--- daemon/seahorse-object.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-object.c	2014-07-01 03:49:19 +0000
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *  
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-object.h'
--- daemon/seahorse-object.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-object.h	2014-07-01 03:49:19 +0000
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *  
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifndef __SEAHORSE_OBJECT_H__

=== modified file 'daemon/seahorse-operation.c'
--- daemon/seahorse-operation.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-operation.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "config.h"
 

=== modified file 'daemon/seahorse-operation.h'
--- daemon/seahorse-operation.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-operation.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __SEAHORSE_OPERATION_H__

=== modified file 'daemon/seahorse-passphrase.c'
--- daemon/seahorse-passphrase.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-passphrase.c	2014-07-01 03:49:19 +0000
@@ -14,10 +14,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-passphrase.h'
--- daemon/seahorse-passphrase.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-passphrase.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __SEAHORSE_PASSPHRASE__

=== modified file 'daemon/seahorse-pgp-key.c'
--- daemon/seahorse-pgp-key.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-pgp-key.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "config.h"
 

=== modified file 'daemon/seahorse-pgp-key.h'
--- daemon/seahorse-pgp-key.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-pgp-key.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __SEAHORSE_PGP_KEY_H__

=== modified file 'daemon/seahorse-pgp-module.c'
--- daemon/seahorse-pgp-module.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-pgp-module.c	2014-07-01 03:49:19 +0000
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *  
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-pgp-module.h'
--- daemon/seahorse-pgp-module.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-pgp-module.h	2014-07-01 03:49:19 +0000
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *  
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifndef SEAHORSEPGP_H_

=== modified file 'daemon/seahorse-pgp-signature.c'
--- daemon/seahorse-pgp-signature.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-pgp-signature.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-pgp-signature.h'
--- daemon/seahorse-pgp-signature.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-pgp-signature.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __SEAHORSE_PGP_SIGNATURE_H__

=== modified file 'daemon/seahorse-pgp-subkey.c'
--- daemon/seahorse-pgp-subkey.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-pgp-subkey.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-pgp-subkey.h'
--- daemon/seahorse-pgp-subkey.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-pgp-subkey.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __SEAHORSE_PGP_SUBKEY_H__

=== modified file 'daemon/seahorse-pgp-uid.c'
--- daemon/seahorse-pgp-uid.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-pgp-uid.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -69,131 +66,6 @@
 	return g_strdup (str);
 }
 
-#ifndef HAVE_STRSEP
-/* code taken from glibc-2.2.1/sysdeps/generic/strsep.c */
-char *
-strsep (char **stringp, const char *delim)
-{
-    char *begin, *end;
-
-    begin = *stringp;
-    if (begin == NULL)
-        return NULL;
-
-      /* A frequent case is when the delimiter string contains only one
-         character.  Here we don't need to call the expensive `strpbrk'
-         function and instead work using `strchr'.  */
-      if (delim[0] == '\0' || delim[1] == '\0') {
-        char ch = delim[0];
-
-        if (ch == '\0')
-            end = NULL; 
-        else {
-            if (*begin == ch)
-                end = begin;
-            else if (*begin == '\0')
-                end = NULL;
-            else
-                end = strchr (begin + 1, ch);
-        }
-    } else
-        /* Find the end of the token.  */
-        end = strpbrk (begin, delim);
-
-    if (end) {
-      /* Terminate the token and set *STRINGP past NUL character.  */
-      *end++ = '\0';
-      *stringp = end;
-    } else
-        /* No more delimiters; this is the last token.  */
-        *stringp = NULL;
-
-    return begin;
-}
-#endif /*HAVE_STRSEP*/
-
-/* Copied from GPGME */
-static void
-parse_user_id (const gchar *uid, gchar **name, gchar **email, gchar **comment)
-{
-    gchar *src, *tail, *x;
-    int in_name = 0;
-    int in_email = 0;
-    int in_comment = 0;
-
-    x = tail = src = g_strdup (uid);
-    
-    while (*src) {
-        if (in_email) {
-	        if (*src == '<')
-	            /* Not legal but anyway.  */
-	            in_email++;
-	        else if (*src == '>') {
-	            if (!--in_email && !*email) {
-		            *email = tail;
-                    *src = 0;
-                    tail = src + 1;
-		        }
-	        }
-	    } else if (in_comment) {
-	        if (*src == '(')
-	            in_comment++;
-	        else if (*src == ')') {
-	            if (!--in_comment && !*comment) {
-		            *comment = tail;
-                    *src = 0;
-                    tail = src + 1;
-		        }
-	        }
-	    } else if (*src == '<') {
-	        if (in_name) {
-	            if (!*name) {
-		            *name = tail;
-                    *src = 0;
-                    tail = src + 1;
-		        }
-	            in_name = 0;
-	        } else
-	            tail = src + 1;
-	            
-	        in_email = 1;
-	    } else if (*src == '(') {
-	        if (in_name) {
-	            if (!*name) {
-		            *name = tail;
-                    *src = 0;
-                    tail = src + 1;
-		        }
-	            in_name = 0;
-	        }
-	        in_comment = 1;
-	    } else if (!in_name && *src != ' ' && *src != '\t') {
-	        in_name = 1;
-	    }    
-        src++;
-    }
- 
-    if (in_name) {
-        if (!*name) {
-	        *name = tail;
-            *src = 0;
-            tail = src + 1;
-	    }
-    }
- 
-    /* Let unused parts point to an EOS.  */
-    *name = g_strdup (*name ? *name : "");
-    *email = g_strdup (*email ? *email : "");
-    *comment = g_strdup (*comment ? *comment : "");
-    
-    g_strstrip (*name);
-    g_strstrip (*email);
-    g_strstrip (*comment);
-    
-    g_free (x);
-}
-
-
 /* -----------------------------------------------------------------------------
  * OBJECT 
  */
@@ -341,26 +213,6 @@
  * PUBLIC 
  */
 
-SeahorsePgpUid*
-seahorse_pgp_uid_new (const gchar *uid_string)
-{
-	SeahorsePgpUid *uid;
-	gchar *name = NULL;
-	gchar *email = NULL;
-	gchar *comment = NULL;
-	
-	if (uid_string)
-		parse_user_id (uid_string, &name, &email, &comment);
-	
-	uid = g_object_new (SEAHORSE_TYPE_PGP_UID, "name", name, "email", email, "comment", comment, NULL);
-	
-	g_free (name);
-	g_free (comment);
-	g_free (email);
-	
-	return uid;
-}
-
 GList*
 seahorse_pgp_uid_get_signatures (SeahorsePgpUid *self)
 {

=== modified file 'daemon/seahorse-pgp-uid.h'
--- daemon/seahorse-pgp-uid.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-pgp-uid.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __SEAHORSE_PGP_UID_H__
@@ -50,8 +47,6 @@
 
 GType             seahorse_pgp_uid_get_type             (void);
 
-SeahorsePgpUid*   seahorse_pgp_uid_new                  (const gchar *uid_string);
-
 GList*            seahorse_pgp_uid_get_signatures       (SeahorsePgpUid *self);
 
 void              seahorse_pgp_uid_set_signatures       (SeahorsePgpUid *self,

=== modified file 'daemon/seahorse-pgp.c'
--- daemon/seahorse-pgp.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-pgp.c	2014-07-01 03:49:19 +0000
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *  
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #include "seahorse-pgp.h"

=== modified file 'daemon/seahorse-pgp.h'
--- daemon/seahorse-pgp.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-pgp.h	2014-07-01 03:49:19 +0000
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *  
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifndef __SEAHORSE_PGP_H__

=== modified file 'daemon/seahorse-progress.c'
--- daemon/seahorse-progress.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-progress.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "seahorse-progress.h"

=== modified file 'daemon/seahorse-progress.h'
--- daemon/seahorse-progress.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-progress.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**

=== modified file 'daemon/seahorse-secure-buffer.c'
--- daemon/seahorse-secure-buffer.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-secure-buffer.c	2014-07-01 03:49:19 +0000
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-secure-buffer.h'
--- daemon/seahorse-secure-buffer.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-secure-buffer.h	2014-07-01 03:49:19 +0000
@@ -14,9 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __SEAHORSE_SECURE_BUFFER_H__

=== modified file 'daemon/seahorse-secure-memory.c'
--- daemon/seahorse-secure-memory.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-secure-memory.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
   
 #include "config.h"

=== modified file 'daemon/seahorse-service-crypto-bindings.h'
--- daemon/seahorse-service-crypto-bindings.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-service-crypto-bindings.h	2014-07-01 03:49:19 +0000
@@ -10,7 +10,7 @@
 
 #ifdef G_ENABLE_DEBUG
 #define g_marshal_value_peek_boolean(v)  g_value_get_boolean (v)
-#define g_marshal_value_peek_char(v)     g_value_get_char (v)
+#define g_marshal_value_peek_char(v)     g_value_get_schar (v)
 #define g_marshal_value_peek_uchar(v)    g_value_get_uchar (v)
 #define g_marshal_value_peek_int(v)      g_value_get_int (v)
 #define g_marshal_value_peek_uint(v)     g_value_get_uint (v)

=== modified file 'daemon/seahorse-service-crypto.c'
--- daemon/seahorse-service-crypto.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-service-crypto.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
@@ -38,6 +35,7 @@
 
 /* flags from seahorse-service-cyrpto.xml */
 #define FLAG_QUIET 0x01
+#define FLAG_SYMMETRIC 0x02
 
 G_DEFINE_TYPE (SeahorseServiceCrypto, seahorse_service_crypto, G_TYPE_OBJECT);
 
@@ -274,8 +272,9 @@
 /**
 * crypto: the crypto service (#SeahorseServiceCrypto)
 * recipients: A list of recipients (keyids "openpgp:B8098FB063E2C811")
+*             Must be empty when symmetric encryption is used.
 * signer: optional, the keyid of the signer
-* flags: 0, not used
+* flags: FLAG_SYMMETRIC to perform symmetric encryption
 * cleartext: the text to encrypt
 * clearlength: Length of the cleartext
 * crypttext: the encrypted text (out)
@@ -295,110 +294,126 @@
                         char **crypttext, gsize *cryptlength, gboolean textmode,
                         gboolean ascii_armor, GError **error)
 {
-    GList *recipkeys = NULL;
-    SeahorseGpgmeOperation *pop; 
-    SeahorseObject *signkey = NULL;
-    SeahorseObject *skey;
-    gpgme_key_t *recips;
-    gpgme_data_t plain, cipher;
-    gpgme_error_t gerr;
-    gboolean ret = TRUE;
-    GSettings *settings;
-    gchar *keyid;
-
-    /* 
-     * TODO: Once we support different kinds of keys that support encryption
-     * then all this logic will need to change. 
-     */
-    /* The signer */
-    if (signer && signer[0]) {
-        signkey = seahorse_context_object_from_dbus (SCTX_APP (), signer);
-        if (!signkey) {
-            g_set_error (error, SEAHORSE_DBUS_ERROR, SEAHORSE_DBUS_ERROR_INVALID, 
-                         _("Invalid or unrecognized signer: %s"), signer);
-            return FALSE;
-        }
-        
-        if (!SEAHORSE_IS_GPGME_KEY (signkey) || 
-            !(seahorse_object_get_flags (signkey) & SEAHORSE_FLAG_CAN_SIGN)) {
-            g_set_error (error, SEAHORSE_DBUS_ERROR, SEAHORSE_DBUS_ERROR_INVALID,
-                         _("Key is not valid for signing: %s"), signer);
-            return FALSE;
-        }
-    }
-    /* The recipients */
-    for( ; recipients[0]; recipients++)
-    {
-        skey = seahorse_context_object_from_dbus (SCTX_APP (), recipients[0]);
-        if (!skey) {
-            g_list_free (recipkeys);
-            g_set_error (error, SEAHORSE_DBUS_ERROR, SEAHORSE_DBUS_ERROR_INVALID, 
-                         _("Invalid or unrecognized recipient: %s"), recipients[0]);
-            return FALSE;
-        }
-        
-        if (!SEAHORSE_IS_GPGME_KEY (skey) ||
-            !(seahorse_object_get_flags (skey) & SEAHORSE_FLAG_CAN_ENCRYPT)) {
-            g_list_free (recipkeys);
-            g_set_error (error, SEAHORSE_DBUS_ERROR, SEAHORSE_DBUS_ERROR_INVALID,
-                         _("Key is not a valid recipient for encryption: %s"), recipients[0]);
-            return FALSE;
-        }
-        
-        recipkeys = g_list_prepend (recipkeys, SEAHORSE_PGP_KEY (skey));
-    }
-    
-    if (!recipkeys) {
-        g_set_error (error, SEAHORSE_DBUS_ERROR, SEAHORSE_DBUS_ERROR_INVALID,
-                     _("No recipients specified"));
-        return FALSE;
-    }
-    pop = seahorse_gpgme_operation_new (NULL);
-    
-    /* new data form text */
-    gerr = gpgme_data_new_from_mem (&plain, cleartext, clearlength, FALSE);
-    g_return_val_if_fail (GPG_IS_OK (gerr), FALSE);
-    gerr = gpgme_data_new (&cipher);
-    g_return_val_if_fail (GPG_IS_OK (gerr), FALSE);
-   
-    /* encrypt with armor */
-    gpgme_set_textmode (pop->gctx, textmode);
-    gpgme_set_armor (pop->gctx, ascii_armor);
-
-	/* Add the default key if set and necessary */
-	settings = g_settings_new ("org.gnome.crypto.pgp");
-	if (g_settings_get_boolean (settings, "encrypt-to-self")) {
-		keyid = g_settings_get_string (settings, "default-key");
-		if (keyid && keyid[0]) {
-			skey = seahorse_context_find_object (NULL, g_quark_from_string (keyid),
-			                                     SEAHORSE_LOCATION_LOCAL);
-			if (SEAHORSE_IS_PGP_KEY (skey))
-				recipkeys = g_list_append (recipkeys, skey);
-		}
-		g_free (keyid);
-	}
-	g_object_unref (settings);
-
-    /* Make keys into the right format for GPGME */
-    recips = keylist_to_keys (recipkeys);
-    g_list_free (recipkeys);
-    
-    /* Do the encryption */
-    if (signkey) {
-        gpgme_signers_add (pop->gctx, seahorse_gpgme_key_get_private (SEAHORSE_GPGME_KEY (signkey)));
-        gerr = gpgme_op_encrypt_sign_start (pop->gctx, recips, GPGME_ENCRYPT_ALWAYS_TRUST, 
-                                            plain, cipher);
-    } else {
-        gerr = gpgme_op_encrypt_start (pop->gctx, recips, GPGME_ENCRYPT_ALWAYS_TRUST, 
-                                       plain, cipher);
-    }
-    free_keys (recips);
-
-    /* Frees cipher */
-    ret = process_crypto_result (pop, gerr, cipher, crypttext, cryptlength, error);
-    g_object_unref (pop);
-    gpgme_data_release (plain);
-    return ret;
+	GList *recipkeys = NULL;
+	SeahorseGpgmeOperation *pop;
+	SeahorseObject *signkey = NULL;
+	SeahorseObject *skey;
+	gpgme_key_t *recips;
+	gboolean symmetric = FALSE;
+	gpgme_data_t plain, cipher;
+	gpgme_error_t gerr;
+	gboolean ret = TRUE;
+	GSettings *settings;
+	gchar *keyid;
+
+	if ((flags & FLAG_SYMMETRIC) == FLAG_SYMMETRIC)
+		symmetric = TRUE;
+
+	if (symmetric && recipients[0] != NULL) {
+		g_set_error (error, SEAHORSE_DBUS_ERROR, SEAHORSE_DBUS_ERROR_INVALID,
+		             _("Recipients specified for symmetric encryption"));
+		return FALSE;
+	}
+
+	/* The signer */
+	if (signer && signer[0]) {
+		signkey = seahorse_context_object_from_dbus (SCTX_APP (), signer);
+		if (!signkey) {
+			g_set_error (error, SEAHORSE_DBUS_ERROR, SEAHORSE_DBUS_ERROR_INVALID,
+			             _("Invalid or unrecognized signer: %s"), signer);
+			return FALSE;
+		}
+
+		if (!SEAHORSE_IS_GPGME_KEY (signkey) ||
+			!(seahorse_object_get_flags (signkey) & SEAHORSE_FLAG_CAN_SIGN)) {
+			g_set_error (error, SEAHORSE_DBUS_ERROR, SEAHORSE_DBUS_ERROR_INVALID,
+			             _("Key is not valid for signing: %s"), signer);
+			return FALSE;
+		}
+	}
+
+	if (!symmetric) {
+		/* The recipients */
+		for( ; recipients[0]; recipients++)
+		{
+			skey = seahorse_context_object_from_dbus (SCTX_APP (), recipients[0]);
+			if (!skey) {
+				g_list_free (recipkeys);
+				g_set_error (error, SEAHORSE_DBUS_ERROR, SEAHORSE_DBUS_ERROR_INVALID,
+					     _("Invalid or unrecognized recipient: %s"), recipients[0]);
+				return FALSE;
+			}
+
+			if (!SEAHORSE_IS_GPGME_KEY (skey) ||
+				!(seahorse_object_get_flags (skey) & SEAHORSE_FLAG_CAN_ENCRYPT)) {
+				g_list_free (recipkeys);
+				g_set_error (error, SEAHORSE_DBUS_ERROR, SEAHORSE_DBUS_ERROR_INVALID,
+					     _("Key is not a valid recipient for encryption: %s"), recipients[0]);
+				return FALSE;
+			}
+
+			recipkeys = g_list_prepend (recipkeys, SEAHORSE_PGP_KEY (skey));
+		}
+
+		if (!recipkeys) {
+			g_set_error (error, SEAHORSE_DBUS_ERROR, SEAHORSE_DBUS_ERROR_INVALID,
+				     _("No recipients specified"));
+			return FALSE;
+		}
+	}
+
+	pop = seahorse_gpgme_operation_new (NULL);
+
+	/* new data form text */
+	gerr = gpgme_data_new_from_mem (&plain, cleartext, clearlength, FALSE);
+	g_return_val_if_fail (GPG_IS_OK (gerr), FALSE);
+	gerr = gpgme_data_new (&cipher);
+	g_return_val_if_fail (GPG_IS_OK (gerr), FALSE);
+
+	/* encrypt with armor */
+	gpgme_set_textmode (pop->gctx, textmode);
+	gpgme_set_armor (pop->gctx, ascii_armor);
+
+	if (symmetric) {
+		/* gpgme_op_encrypt{_sign,}_start() will perform symmetric encryption
+		 * when no recipients are specified. */
+		recips = NULL;
+	} else {
+		/* Add the default key if set and necessary */
+		settings = g_settings_new ("org.gnome.crypto.pgp");
+		if (g_settings_get_boolean (settings, "encrypt-to-self")) {
+			keyid = g_settings_get_string (settings, "default-key");
+			if (keyid && keyid[0]) {
+				skey = seahorse_context_find_object (NULL, g_quark_from_string (keyid),
+								     SEAHORSE_LOCATION_LOCAL);
+				if (SEAHORSE_IS_PGP_KEY (skey))
+					recipkeys = g_list_append (recipkeys, skey);
+			}
+			g_free (keyid);
+		}
+		g_object_unref (settings);
+
+		/* Make keys into the right format for GPGME */
+		recips = keylist_to_keys (recipkeys);
+		g_list_free (recipkeys);
+	}
+
+	/* Do the encryption */
+	if (signkey) {
+		gpgme_signers_add (pop->gctx, seahorse_gpgme_key_get_private (SEAHORSE_GPGME_KEY (signkey)));
+		gerr = gpgme_op_encrypt_sign_start (pop->gctx, recips, GPGME_ENCRYPT_ALWAYS_TRUST,
+		                                    plain, cipher);
+	} else {
+		gerr = gpgme_op_encrypt_start (pop->gctx, recips, GPGME_ENCRYPT_ALWAYS_TRUST,
+		                               plain, cipher);
+	}
+	free_keys (recips);
+
+	/* Frees cipher */
+	ret = process_crypto_result (pop, gerr, cipher, crypttext, cryptlength, error);
+	g_object_unref (pop);
+	gpgme_data_release (plain);
+	return ret;
 }
 
 
@@ -494,9 +509,10 @@
 /**
  * seahorse_service_crypto_encrypt_text:
  * @crypto: the crypto service (#SeahorseServiceCrypto)
- * @recipients: A list of recipients (keyids "openpgp:B8098FB063E2C811")
+ * @recipients: A list of recipients (keyids "openpgp:B8098FB063E2C811").
+ *              Must be empty when symmetric encryption is used.
  * @signer: optional, the keyid of the signer
- * @flags: 0, not used
+ * @flags: FLAG_SYMMETRIC to perform symmetric encryption
  * @cleartext: the text to encrypt
  * @crypttext: the encrypted text (out)
  * @error: an error (out)

=== modified file 'daemon/seahorse-service-crypto.xml'
--- daemon/seahorse-service-crypto.xml	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-service-crypto.xml	2014-07-01 03:49:19 +0000
@@ -6,6 +6,7 @@
      *
      * FLAGS for use in |flags| fields 
      *   FLAG_QUIET  =  0x01   (Don't display unnecessary UI)
+     *   FLAG_SYMMETRIC  =  0x02 (Perform symmetric encryption)
      *
     -->
 

=== modified file 'daemon/seahorse-service-keyset.c'
--- daemon/seahorse-service-keyset.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-service-keyset.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-service.c'
--- daemon/seahorse-service.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-service.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-service.h'
--- daemon/seahorse-service.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-service.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __SEAHORSE_SERVICE_H__

=== modified file 'daemon/seahorse-set.c'
--- daemon/seahorse-set.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-set.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "seahorse-set.h"

=== modified file 'daemon/seahorse-set.h'
--- daemon/seahorse-set.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-set.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __SEAHORSE_SET_H__

=== modified file 'daemon/seahorse-source.c'
--- daemon/seahorse-source.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-source.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 #include "config.h"

=== modified file 'daemon/seahorse-source.h'
--- daemon/seahorse-source.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-source.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 /**

=== modified file 'daemon/seahorse-transfer-operation.c'
--- daemon/seahorse-transfer-operation.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-transfer-operation.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 #include "config.h"

=== modified file 'daemon/seahorse-transfer-operation.h'
--- daemon/seahorse-transfer-operation.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-transfer-operation.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 #ifndef __SEAHORSE_TRANSFER_OPERATION_H__

=== modified file 'daemon/seahorse-types.c'
--- daemon/seahorse-types.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-types.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-types.h'
--- daemon/seahorse-types.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-types.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __SEAHORSE_TYPES_H__

=== modified file 'daemon/seahorse-unix-signal.c'
--- daemon/seahorse-unix-signal.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-unix-signal.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <sys/types.h>

=== modified file 'daemon/seahorse-unix-signal.h'
--- daemon/seahorse-unix-signal.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-unix-signal.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /** 

=== modified file 'daemon/seahorse-unknown-source.c'
--- daemon/seahorse-unknown-source.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-unknown-source.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-unknown-source.h'
--- daemon/seahorse-unknown-source.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-unknown-source.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 #ifndef __SEAHORSE_UNKNOWN_SOURCE_H__

=== modified file 'daemon/seahorse-unknown.c'
--- daemon/seahorse-unknown.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-unknown.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-unknown.h'
--- daemon/seahorse-unknown.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-unknown.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __SEAHORSE_UNKNOWN_H__

=== modified file 'daemon/seahorse-util.c'
--- daemon/seahorse-util.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-util.c	2014-07-01 03:49:19 +0000
@@ -14,10 +14,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"

=== modified file 'daemon/seahorse-util.h'
--- daemon/seahorse-util.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-util.h	2014-07-01 03:49:19 +0000
@@ -14,10 +14,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 /**

=== modified file 'daemon/seahorse-validity.c'
--- daemon/seahorse-validity.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-validity.c	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include <config.h>
 

=== modified file 'daemon/seahorse-validity.h'
--- daemon/seahorse-validity.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-validity.h	2014-07-01 03:49:19 +0000
@@ -13,10 +13,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**

=== modified file 'daemon/seahorse-widget.c'
--- daemon/seahorse-widget.c	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-widget.c	2014-07-01 03:49:19 +0000
@@ -14,10 +14,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>

=== modified file 'daemon/seahorse-widget.h'
--- daemon/seahorse-widget.h	2011-11-23 12:30:54 +0000
+++ daemon/seahorse-widget.h	2014-07-01 03:49:19 +0000
@@ -14,10 +14,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 #ifndef __SEAHORSE_WIDGET_H__

=== modified file 'data/Makefile.in'
--- data/Makefile.in	2013-06-11 20:09:34 +0000
+++ data/Makefile.in	2014-07-01 03:49:19 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.2 from Makefile.am.
+# Makefile.in generated by automake 1.13.4 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
-    esac; \
-    test $$am__dry = yes; \
-  }
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \