Presenting GNOME 2.24 for FreeBSD.

See http://library.gnome.org/misc/release-notes/2.24/ for the general
release notes.  On the FreeBSD front, this release introduces Fuse support
in HAL, adds multi-CPU support to libgtop, WebKit updates, and fixes some
long-standing seahorse and gnome-keyring bugs.  The documentation updates
to the website are forthcoming.

This release features commits by adamw, ahze, kwm, mezz, and myself.  It would
not have been possible without are contributors and testers:

Alexander Loginov
Craig Butler [1]
Dmitry Marakasov [6]
Eric L. Chen
Joseph S. Atkinson
Kris Moore
Lapo Luchini [7]
Nikos Ntarmos
Pawel Worach
Romain Tartiere
TAOKA Fumiyoshi [3]
Yasuda Keisuke
Zyl
aZ [4]
bf [2] [5]
Florent Thoumie
Peter Wemm
pluknet

PR:		125857 [1]
		126993 [2]
		130031 [3]
		127399 [4]
		127661 [5]
		124302 [6]
		129570 [7]
		129936
		123790

25 files changed, 779 insertions, 208 deletions

diff --git a/security/Makefile b/security/Makefile
index 55329fcdd802..158998bb8ecf 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -703,6 +703,7 @@
     SUBDIR += scanlogd
     SUBDIR += scanssh
     SUBDIR += seahorse
+    SUBDIR += seahorse-plugins
     SUBDIR += seccure
     SUBDIR += secpanel
     SUBDIR += sectok
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 68c0a9bf8128..3ad743250648 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnome-keyring/Makefile,v 1.59 2008/03/09 18:30:40 mezz Exp $
+#   $MCom: ports/security/gnome-keyring/Makefile,v 1.71 2009/01/10 01:59:21 mezz Exp $
 #
 
 PORTNAME=	gnome-keyring
-PORTVERSION=	2.22.3
-PORTREVISION=	2
+PORTVERSION=	2.24.1
+PORTREVISION=	1
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,8 +16,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A program that keeps passwords and other secrets
 
-LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
-		tasn1.3:${PORTSDIR}/security/libtasn1 \
+LIB_DEPENDS=	tasn1.3:${PORTSDIR}/security/libtasn1 \
     		gcrypt.16:${PORTSDIR}/security/libgcrypt
 
 USE_BZIP2=	yes
@@ -31,4 +30,15 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 GCONF_SCHEMAS=	gnome-keyring.schemas
 
-.include <bsd.port.mk>
+OPTIONS=	HAL "Use HAL for keys on removable drives" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_HAL)
+LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+CONFIGURE_ARGS+=--enable-hal
+.else
+CONFIGURE_ARGS+=--disable-hal
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
index 20ddac0b6c41..ca5144c4a5e6 100644
--- a/security/gnome-keyring/distinfo
+++ b/security/gnome-keyring/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-2.22.3.tar.bz2) = f9e5cd9efac383076aaefc1086520656
-SHA256 (gnome2/gnome-keyring-2.22.3.tar.bz2) = 1e14eed00d386763352896e540929760264885e1296ac11cfb8ca1c08dcea7f6
-SIZE (gnome2/gnome-keyring-2.22.3.tar.bz2) = 894308
+MD5 (gnome2/gnome-keyring-2.24.1.tar.bz2) = aa5552dc129f3509ee39145b7f0bf977
+SHA256 (gnome2/gnome-keyring-2.24.1.tar.bz2) = 3c9eb7f45dd0026340635b9e1ee18c36a47541610aa5a7ef604ca645aa4763f9
+SIZE (gnome2/gnome-keyring-2.24.1.tar.bz2) = 1125993
diff --git a/security/gnome-keyring/files/patch-common_gkr-daemon-util.h b/security/gnome-keyring/files/patch-common_gkr-daemon-util.h
new file mode 100644
index 000000000000..ebc3f9680b4c
--- /dev/null
+++ b/security/gnome-keyring/files/patch-common_gkr-daemon-util.h
@@ -0,0 +1,11 @@
+--- common/gkr-daemon-util.h.orig	2008-08-04 13:36:06.000000000 -0400
++++ common/gkr-daemon-util.h	2008-08-04 13:36:18.000000000 -0400
+@@ -26,6 +26,8 @@
+ 
+ G_BEGIN_DECLS
+ 
++#include <sys/types.h>
++
+ #include <glib.h>
+ #include <glib-object.h>
+ 
diff --git a/security/gnome-keyring/files/patch-configure b/security/gnome-keyring/files/patch-configure
index 235656df1b7e..75016a356fcb 100644
--- a/security/gnome-keyring/files/patch-configure
+++ b/security/gnome-keyring/files/patch-configure
@@ -1,7 +1,25 @@
---- configure.orig	2008-02-11 21:29:42.000000000 -0500
-+++ configure	2008-02-11 21:29:51.000000000 -0500
-@@ -23793,7 +23793,7 @@ else
-   tests_status="no"
+--- configure.orig	2008-07-22 21:14:15.000000000 -0400
++++ configure	2008-07-22 21:14:35.000000000 -0400
+@@ -25963,7 +25963,7 @@ fi
+ 
+ 	dbus_status=$DBUS_VERSION
+ fi
+- if test "$enable_dbus" == "yes"; then
++ if test "$enable_dbus" = "yes"; then
+   WITH_DBUS_TRUE=
+   WITH_DBUS_FALSE='#'
+ else
+@@ -27001,7 +27001,7 @@ if test "${enable_tests+set}" = set; the
+ fi
+ 
+ 
+-if test "$enable_tests" == "yes"; then
++if test "$enable_tests" = "yes"; then
+ 	echo "building tests and unit tests"
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -27014,7 +27014,7 @@ else
+   	tests_status="no"
  fi
  
 - if test "$enable_tests" == "yes"; then
@@ -9,12 +27,12 @@
    WITH_TESTS_TRUE=
    WITH_TESTS_FALSE='#'
  else
-@@ -25228,7 +25228,7 @@ fi
+@@ -27029,7 +27029,7 @@ if test "${enable_coverage+set}" = set; 
+ fi
  
- 	dbus_status=$DBUS_VERSION
+ 
+-if test "$enable_coverage" == "yes"; then
++if test "$enable_coverage" = "yes"; then
+ 	CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
+ 	LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage"
  fi
-- if test "$enable_dbus" == "yes"; then
-+ if test "$enable_dbus" = "yes"; then
-   WITH_DBUS_TRUE=
-   WITH_DBUS_FALSE='#'
- else
diff --git a/security/gnome-keyring/files/patch-keyrings_gkr-keyrings.c b/security/gnome-keyring/files/patch-keyrings_gkr-keyrings.c
deleted file mode 100644
index 185e929dd298..000000000000
--- a/security/gnome-keyring/files/patch-keyrings_gkr-keyrings.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- keyrings/gkr-keyrings.c.orig	2008-02-11 21:30:10.000000000 -0500
-+++ keyrings/gkr-keyrings.c	2008-02-11 21:30:19.000000000 -0500
-@@ -35,6 +35,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <errno.h>
-+#include <string.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/types.h>
diff --git a/security/gnome-keyring/files/patch-library_gnome-keyring.c b/security/gnome-keyring/files/patch-library_gnome-keyring.c
deleted file mode 100644
index 625a65cc72c0..000000000000
--- a/security/gnome-keyring/files/patch-library_gnome-keyring.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- library/gnome-keyring.c.orig	2008-02-26 22:05:10.000000000 -0600
-+++ library/gnome-keyring.c	2008-02-26 22:05:30.000000000 -0600
-@@ -50,6 +50,8 @@
- #include <dbus/dbus.h>
- #endif
- 
-+extern char **environ;
-+
- typedef enum {
- 	CALLBACK_DONE,
- 	CALLBACK_GET_STRING,
diff --git a/security/gnome-keyring/files/patch-pam_gkr-pam-client.c b/security/gnome-keyring/files/patch-pam_gkr-pam-client.c
new file mode 100644
index 000000000000..05a0306e6913
--- /dev/null
+++ b/security/gnome-keyring/files/patch-pam_gkr-pam-client.c
@@ -0,0 +1,18 @@
+--- pam/gkr-pam-client.c.orig	2008-10-07 12:25:23.000000000 -0400
++++ pam/gkr-pam-client.c	2008-10-07 12:38:36.000000000 -0400
+@@ -96,12 +96,12 @@ check_peer_same_uid (int sock)
+         struct xucred xuc;
+         socklen_t xuc_len = sizeof (xuc);
+ 
+-	if (getsockopt (sock, SOL_SOCKET, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 && 
+-	    xuc_len == sizeof (xuc)) {
++	if (getsockopt (sock, 0, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 && 
++	    xuc.cr_version == XUCRED_VERSION) {
+ 	    	uid = xuc.cr_uid;
+ 	} else {
+ 		syslog (GKR_LOG_ERR, "could not get gnome-keyring-daemon socket credentials, "
+-		        "(returned len %d/%d)\n", xuc_len, (int)sizeof (xuc));
++		        "(returned version %d/%d)\n", xuc.cr_version, XUCRED_VERSION);
+ 		return -1;   
+ 	}
+ 	
diff --git a/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-daemon.c b/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-daemon.c
deleted file mode 100644
index 4bd5a923f4f4..000000000000
--- a/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-daemon.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- pkcs11/gkr-pkcs11-daemon.c.orig	2008-02-11 21:30:48.000000000 -0500
-+++ pkcs11/gkr-pkcs11-daemon.c	2008-02-11 21:30:58.000000000 -0500
-@@ -35,6 +35,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
-+#include <string.h>
- #include <errno.h>
- #include <unistd.h>
- 
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
index c91389e36cd8..2b3fe4715134 100644
--- a/security/gnome-keyring/pkg-plist
+++ b/security/gnome-keyring/pkg-plist
@@ -1,7 +1,12 @@
+bin/gnome-keyring
 bin/gnome-keyring-daemon
 include/gnome-keyring-1/gnome-keyring-memory.h
 include/gnome-keyring-1/gnome-keyring-result.h
 include/gnome-keyring-1/gnome-keyring.h
+include/gp11/gp11.h
+include/gp11/pkcs11.h
+include/gp11/pkcs11g.h
+include/gp11/pkcs11n.h
 lib/gnome-keyring/gnome-keyring-pkcs11.a
 lib/gnome-keyring/gnome-keyring-pkcs11.la
 lib/gnome-keyring/gnome-keyring-pkcs11.so
@@ -9,10 +14,15 @@ lib/libgnome-keyring.a
 lib/libgnome-keyring.la
 lib/libgnome-keyring.so
 lib/libgnome-keyring.so.0
+lib/libgp11.a
+lib/libgp11.la
+lib/libgp11.so
+lib/libgp11.so.0
 lib/pam_gnome_keyring.a
 lib/pam_gnome_keyring.la
 lib/pam_gnome_keyring.so
 libdata/pkgconfig/gnome-keyring-1.pc
+libdata/pkgconfig/gp11-0.pc
 libexec/gnome-keyring-ask
 share/dbus-1/services/org.gnome.keyring.service
 %%DOCSDIR%%/ch01.html
@@ -39,6 +49,20 @@ share/dbus-1/services/org.gnome.keyring.service
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
+share/doc/gp11/GP11Object.html
+share/doc/gp11/ch01.html
+share/doc/gp11/gp11-GP11Call.html
+share/doc/gp11/gp11-gp11-test.html
+share/doc/gp11/gp11-pkcs11.html
+share/doc/gp11/gp11.devhelp
+share/doc/gp11/gp11.devhelp2
+share/doc/gp11/home.png
+share/doc/gp11/index.html
+share/doc/gp11/index.sgml
+share/doc/gp11/left.png
+share/doc/gp11/right.png
+share/doc/gp11/style.css
+share/doc/gp11/up.png
 share/locale/ar/LC_MESSAGES/gnome-keyring.mo
 share/locale/az/LC_MESSAGES/gnome-keyring.mo
 share/locale/be/LC_MESSAGES/gnome-keyring.mo
@@ -73,6 +97,7 @@ share/locale/is/LC_MESSAGES/gnome-keyring.mo
 share/locale/it/LC_MESSAGES/gnome-keyring.mo
 share/locale/ja/LC_MESSAGES/gnome-keyring.mo
 share/locale/ka/LC_MESSAGES/gnome-keyring.mo
+share/locale/kn/LC_MESSAGES/gnome-keyring.mo
 share/locale/ko/LC_MESSAGES/gnome-keyring.mo
 share/locale/lt/LC_MESSAGES/gnome-keyring.mo
 share/locale/lv/LC_MESSAGES/gnome-keyring.mo
@@ -100,7 +125,7 @@ share/locale/sk/LC_MESSAGES/gnome-keyring.mo
 share/locale/sl/LC_MESSAGES/gnome-keyring.mo
 share/locale/sq/LC_MESSAGES/gnome-keyring.mo
 share/locale/sr/LC_MESSAGES/gnome-keyring.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-keyring.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-keyring.mo
 share/locale/sv/LC_MESSAGES/gnome-keyring.mo
 share/locale/ta/LC_MESSAGES/gnome-keyring.mo
 share/locale/te/LC_MESSAGES/gnome-keyring.mo
@@ -112,8 +137,10 @@ share/locale/xh/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
+@dirrm share/doc/gp11
 @dirrm %%DOCSDIR%%
 @dirrm lib/gnome-keyring
+@dirrm include/gp11
 @dirrm include/gnome-keyring-1
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
@@ -121,6 +148,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile
new file mode 100644
index 000000000000..bf3507e2fff6
--- /dev/null
+++ b/security/seahorse-plugins/Makefile
@@ -0,0 +1,84 @@
+# New ports collection makefile for:	seahorse-plugins
+# Date created:		06 August 2008
+# Whom:			Dave McKay <dave@mu.org>
+#
+# $FreeBSD$
+#   $MCom: ports/security/seahorse-plugins/Makefile,v 1.4 2008/10/20 03:02:56 mezz Exp $
+#
+
+PORTNAME=	seahorse-plugins
+PORTVERSION=	2.24.1
+CATEGORIES=	security gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Plug-ins for the Seahorse key and password management application
+
+LIB_DEPENDS=	cryptui.0:${PORTSDIR}/security/seahorse
+
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GECKO=	firefox xulrunner
+USE_GNOME=	gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
+GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
+INSTALLS_OMF=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+OPTIONS=	EPIPHANY "Enable Epiphany plug-in support" on \
+		NAUTILUS "Enable the Nautilus component" on \
+		GEDIT "Enable GEdit plug-in support" on \
+		APPLET "Enable clipboard encryption applet" on
+
+GCONF_SCHEMAS=	seahorse-plugins.schemas
+MAN1=		seahorse-agent.1 seahorse-tool.1
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_GEDIT)
+BUILD_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
+RUN_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
+PLIST_SUB+=	GEDIT=""
+GCONF_SCHEMAS+=	seahorse-gedit.schemas
+.else
+PLIST_SUB+=	GEDIT="@comment "
+CONFIGURE_ARGS+=--disable-gedit
+.endif
+
+.if !defined(WITHOUT_NAUTILUS)
+USE_GNOME+=	nautilus2
+PLIST_SUB+=	NAUTILUS=""
+.else
+PLIST_SUB+=	NAUTILUS="@comment "
+CONFIGURE_ARGS+=--disable-nautilus
+.endif
+
+.if !defined(WITHOUT_EPIPHANY)
+BUILD_DEPENDS+=	epiphany:${PORTSDIR}/www/epiphany
+RUN_DEPENDS+=	epiphany:${PORTSDIR}/www/epiphany
+PLIST_SUB+=	EPIPHANY="" EPHY_VERSION="2.23"
+.else
+CONFIGURE_ARGS+=--disable-epiphany
+PLIST_SUB+=	EPHY="@comment "
+.endif
+
+.if !defined(WITHOUT_APPLET)
+USE_GNOME+=	gnomepanel
+PLIST_SUB+=	APPLET=""
+.else
+CONFIGURE_ARGS+=--disable-applet
+PLIST_SUB+=	APPLET="@comment "
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|" == "|" = "|g' \
+			${WRKSRC}/configure
+
+post-install:
+	@-update-desktop-database
+	@-update-mime-database ${PREFIX}/share/mime
+
+.include <bsd.port.post.mk>
diff --git a/security/seahorse-plugins/distinfo b/security/seahorse-plugins/distinfo
new file mode 100644
index 000000000000..e9ffdd587f4a
--- /dev/null
+++ b/security/seahorse-plugins/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/seahorse-plugins-2.24.1.tar.bz2) = 842b7b7424c2a5cfe56db5960133f0a1
+SHA256 (gnome2/seahorse-plugins-2.24.1.tar.bz2) = 0a9ee63adc7ad01e9c3d9a3432d467a4df24889b7bd41b065e89bec74ccd7676
+SIZE (gnome2/seahorse-plugins-2.24.1.tar.bz2) = 1843996
diff --git a/security/seahorse/files/patch-agent_seahorse-agent-io.c b/security/seahorse-plugins/files/patch-agent_seahorse-agent-io.c
index 4ecd849405c7..4ecd849405c7 100644
--- a/security/seahorse/files/patch-agent_seahorse-agent-io.c
+++ b/security/seahorse-plugins/files/patch-agent_seahorse-agent-io.c
diff --git a/security/seahorse-plugins/files/patch-agent_seahorse-agent.h b/security/seahorse-plugins/files/patch-agent_seahorse-agent.h
new file mode 100644
index 000000000000..7ba32051e701
--- /dev/null
+++ b/security/seahorse-plugins/files/patch-agent_seahorse-agent.h
@@ -0,0 +1,11 @@
+--- agent/seahorse-agent.h.orig	2008-08-06 01:22:16.000000000 -0400
++++ agent/seahorse-agent.h	2008-08-06 01:22:27.000000000 -0400
+@@ -22,6 +22,8 @@
+ #ifndef __SEAHORSE_AGENT_H__
+ #define __SEAHORSE_AGENT_H__
+ 
++#include <sys/types.h>
++
+ #include <glib.h>
+ #include <gconf/gconf-client.h>
+ #include <gconf/gconf.h>
diff --git a/security/seahorse-plugins/pkg-descr b/security/seahorse-plugins/pkg-descr
new file mode 100644
index 000000000000..1fda4fd5d434
--- /dev/null
+++ b/security/seahorse-plugins/pkg-descr
@@ -0,0 +1,5 @@
+These are various plug-ins for the Seahorse security management application.
+They serve to extend Seahorse, and to integrate Seahorse into other
+applications such as Nautilus, GEdit, etc.
+
+WWW: http://seahorse.sourceforge.net/
diff --git a/security/seahorse-plugins/pkg-plist b/security/seahorse-plugins/pkg-plist
new file mode 100644
index 000000000000..635942266cf5
--- /dev/null
+++ b/security/seahorse-plugins/pkg-plist
@@ -0,0 +1,385 @@
+bin/seahorse-agent
+bin/seahorse-preferences
+bin/seahorse-tool
+%%EPIPHANY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.a
+%%EPIPHANY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.la
+%%EPIPHANY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.so
+%%EPIPHANY%%lib/epiphany/%%EPHY_VERSION%%/extensions/seahorse.ephy-extension
+%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.a
+%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.la
+%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.so
+%%GEDIT%%lib/gedit-2/plugins/seahorse-pgp.gedit-plugin
+%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.a
+%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.la
+%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.so
+lib/seahorse/seahorse-applet
+libdata/bonobo/servers/GNOME_SeahorseApplet.server
+share/applications/seahorse-pgp-encrypted.desktop
+share/applications/seahorse-pgp-keys.desktop
+share/applications/seahorse-pgp-preferences.desktop
+share/applications/seahorse-pgp-signature.desktop
+share/gnome-2.0/ui/GNOME_SeahorseApplet.xml
+share/gnome/help/seahorse-applet/C/legal.xml
+share/gnome/help/seahorse-applet/C/seahorse-applet.xml
+share/gnome/help/seahorse-applet/es/seahorse-applet.xml
+share/gnome/help/seahorse-applet/fr/seahorse-applet.xml
+share/gnome/help/seahorse-applet/it/seahorse-applet.xml
+share/gnome/help/seahorse-applet/oc/seahorse-applet.xml
+share/gnome/help/seahorse-applet/ru/seahorse-applet.xml
+share/gnome/help/seahorse-applet/sv/seahorse-applet.xml
+share/gnome/help/seahorse-applet/vi/seahorse-applet.xml
+share/gnome/help/seahorse-plugins/C/figures/export.png
+share/gnome/help/seahorse-plugins/C/figures/file-manager.png
+share/gnome/help/seahorse-plugins/C/figures/generate.png
+share/gnome/help/seahorse-plugins/C/figures/import.png
+share/gnome/help/seahorse-plugins/C/figures/key-manager.png
+share/gnome/help/seahorse-plugins/C/figures/key-properties.png
+share/gnome/help/seahorse-plugins/C/figures/passphrase.png
+share/gnome/help/seahorse-plugins/C/figures/preferences.png
+share/gnome/help/seahorse-plugins/C/figures/recipients.png
+share/gnome/help/seahorse-plugins/C/figures/seahorse-window.png
+share/gnome/help/seahorse-plugins/C/figures/signature.png
+share/gnome/help/seahorse-plugins/C/figures/text-editor.png
+share/gnome/help/seahorse-plugins/C/legal.xml
+share/gnome/help/seahorse-plugins/C/seahorse-plugins.xml
+share/gnome/help/seahorse-plugins/cs/figures/export.png
+share/gnome/help/seahorse-plugins/cs/figures/file-manager.png
+share/gnome/help/seahorse-plugins/cs/figures/generate.png
+share/gnome/help/seahorse-plugins/cs/figures/import.png
+share/gnome/help/seahorse-plugins/cs/figures/key-manager.png
+share/gnome/help/seahorse-plugins/cs/figures/key-properties.png
+share/gnome/help/seahorse-plugins/cs/figures/passphrase.png
+share/gnome/help/seahorse-plugins/cs/figures/preferences.png
+share/gnome/help/seahorse-plugins/cs/figures/recipients.png
+share/gnome/help/seahorse-plugins/cs/figures/seahorse-window.png
+share/gnome/help/seahorse-plugins/cs/figures/signature.png
+share/gnome/help/seahorse-plugins/cs/figures/text-editor.png
+share/gnome/help/seahorse-plugins/cs/seahorse-plugins.xml
+share/gnome/help/seahorse-plugins/de/figures/export.png
+share/gnome/help/seahorse-plugins/de/figures/file-manager.png
+share/gnome/help/seahorse-plugins/de/figures/generate.png
+share/gnome/help/seahorse-plugins/de/figures/import.png
+share/gnome/help/seahorse-plugins/de/figures/key-manager.png
+share/gnome/help/seahorse-plugins/de/figures/key-properties.png
+share/gnome/help/seahorse-plugins/de/figures/passphrase.png
+share/gnome/help/seahorse-plugins/de/figures/preferences.png
+share/gnome/help/seahorse-plugins/de/figures/recipients.png
+share/gnome/help/seahorse-plugins/de/figures/seahorse-window.png
+share/gnome/help/seahorse-plugins/de/figures/signature.png
+share/gnome/help/seahorse-plugins/de/figures/text-editor.png
+share/gnome/help/seahorse-plugins/de/seahorse-plugins.xml
+share/gnome/help/seahorse-plugins/el/figures/export.png
+share/gnome/help/seahorse-plugins/el/figures/file-manager.png
+share/gnome/help/seahorse-plugins/el/figures/generate.png
+share/gnome/help/seahorse-plugins/el/figures/import.png
+share/gnome/help/seahorse-plugins/el/figures/key-manager.png
+share/gnome/help/seahorse-plugins/el/figures/key-properties.png
+share/gnome/help/seahorse-plugins/el/figures/passphrase.png
+share/gnome/help/seahorse-plugins/el/figures/preferences.png
+share/gnome/help/seahorse-plugins/el/figures/recipients.png
+share/gnome/help/seahorse-plugins/el/figures/seahorse-window.png
+share/gnome/help/seahorse-plugins/el/figures/signature.png
+share/gnome/help/seahorse-plugins/el/figures/text-editor.png
+share/gnome/help/seahorse-plugins/el/seahorse-plugins.xml
+share/gnome/help/seahorse-plugins/en_GB/figures/export.png
+share/gnome/help/seahorse-plugins/en_GB/figures/file-manager.png
+share/gnome/help/seahorse-plugins/en_GB/figures/generate.png
+share/gnome/help/seahorse-plugins/en_GB/figures/import.png
+share/gnome/help/seahorse-plugins/en_GB/figures/key-manager.png
+share/gnome/help/seahorse-plugins/en_GB/figures/key-properties.png
+share/gnome/help/seahorse-plugins/en_GB/figures/passphrase.png
+share/gnome/help/seahorse-plugins/en_GB/figures/preferences.png
+share/gnome/help/seahorse-plugins/en_GB/figures/recipients.png
+share/gnome/help/seahorse-plugins/en_GB/figures/seahorse-window.png
+share/gnome/help/seahorse-plugins/en_GB/figures/signature.png
+share/gnome/help/seahorse-plugins/en_GB/figures/text-editor.png
+share/gnome/help/seahorse-plugins/en_GB/seahorse-plugins.xml
+share/gnome/help/seahorse-plugins/es/figures/export.png
+share/gnome/help/seahorse-plugins/es/figures/file-manager.png
+share/gnome/help/seahorse-plugins/es/figures/generate.png
+share/gnome/help/seahorse-plugins/es/figures/import.png
+share/gnome/help/seahorse-plugins/es/figures/key-manager.png
+share/gnome/help/seahorse-plugins/es/figures/key-properties.png
+share/gnome/help/seahorse-plugins/es/figures/passphrase.png
+share/gnome/help/seahorse-plugins/es/figures/preferences.png
+share/gnome/help/seahorse-plugins/es/figures/recipients.png
+share/gnome/help/seahorse-plugins/es/figures/seahorse-window.png
+share/gnome/help/seahorse-plugins/es/figures/signature.png
+share/gnome/help/seahorse-plugins/es/figures/text-editor.png
+share/gnome/help/seahorse-plugins/es/seahorse-plugins.xml
+share/gnome/help/seahorse-plugins/fr/figures/export.png
+share/gnome/help/seahorse-plugins/fr/figures/file-manager.png
+share/gnome/help/seahorse-plugins/fr/figures/generate.png
+share/gnome/help/seahorse-plugins/fr/figures/import.png
+share/gnome/help/seahorse-plugins/fr/figures/key-manager.png
+share/gnome/help/seahorse-plugins/fr/figures/key-properties.png
+share/gnome/help/seahorse-plugins/fr/figures/passphrase.png
+share/gnome/help/seahorse-plugins/fr/figures/preferences.png
+share/gnome/help/seahorse-plugins/fr/figures/recipients.png
+share/gnome/help/seahorse-plugins/fr/figures/seahorse-window.png
+share/gnome/help/seahorse-plugins/fr/figures/signature.png
+share/gnome/help/seahorse-plugins/fr/figures/text-editor.png
+share/gnome/help/seahorse-plugins/fr/seahorse-plugins.xml
+share/gnome/help/seahorse-plugins/it/figures/export.png
+share/gnome/help/seahorse-plugins/it/figures/file-manager.png
+share/gnome/help/seahorse-plugins/it/figures/generate.png
+share/gnome/help/seahorse-plugins/it/figures/import.png
+share/gnome/help/seahorse-plugins/it/figures/key-manager.png
+share/gnome/help/seahorse-plugins/it/figures/key-properties.png
+share/gnome/help/seahorse-plugins/it/figures/passphrase.png
+share/gnome/help/seahorse-plugins/it/figures/preferences.png
+share/gnome/help/seahorse-plugins/it/figures/recipients.png
+share/gnome/help/seahorse-plugins/it/figures/seahorse-window.png
+share/gnome/help/seahorse-plugins/it/figures/signature.png
+share/gnome/help/seahorse-plugins/it/figures/text-editor.png
+share/gnome/help/seahorse-plugins/it/seahorse-plugins.xml
+share/gnome/help/seahorse-plugins/oc/figures/export.png
+share/gnome/help/seahorse-plugins/oc/figures/file-manager.png
+share/gnome/help/seahorse-plugins/oc/figures/generate.png
+share/gnome/help/seahorse-plugins/oc/figures/import.png
+share/gnome/help/seahorse-plugins/oc/figures/key-manager.png
+share/gnome/help/seahorse-plugins/oc/figures/key-properties.png
+share/gnome/help/seahorse-plugins/oc/figures/passphrase.png
+share/gnome/help/seahorse-plugins/oc/figures/preferences.png
+share/gnome/help/seahorse-plugins/oc/figures/recipients.png
+share/gnome/help/seahorse-plugins/oc/figures/seahorse-window.png
+share/gnome/help/seahorse-plugins/oc/figures/signature.png
+share/gnome/help/seahorse-plugins/oc/figures/text-editor.png
+share/gnome/help/seahorse-plugins/oc/seahorse-plugins.xml
+share/gnome/help/seahorse-plugins/ru/figures/export.png
+share/gnome/help/seahorse-plugins/ru/figures/file-manager.png
+share/gnome/help/seahorse-plugins/ru/figures/generate.png
+share/gnome/help/seahorse-plugins/ru/figures/import.png
+share/gnome/help/seahorse-plugins/ru/figures/key-manager.png
+share/gnome/help/seahorse-plugins/ru/figures/key-properties.png
+share/gnome/help/seahorse-plugins/ru/figures/passphrase.png
+share/gnome/help/seahorse-plugins/ru/figures/preferences.png
+share/gnome/help/seahorse-plugins/ru/figures/recipients.png
+share/gnome/help/seahorse-plugins/ru/figures/seahorse-window.png
+share/gnome/help/seahorse-plugins/ru/figures/signature.png
+share/gnome/help/seahorse-plugins/ru/figures/text-editor.png
+share/gnome/help/seahorse-plugins/ru/seahorse-plugins.xml
+share/gnome/help/seahorse-plugins/sv/figures/export.png
+share/gnome/help/seahorse-plugins/sv/figures/file-manager.png
+share/gnome/help/seahorse-plugins/sv/figures/generate.png
+share/gnome/help/seahorse-plugins/sv/figures/import.png
+share/gnome/help/seahorse-plugins/sv/figures/key-manager.png
+share/gnome/help/seahorse-plugins/sv/figures/key-properties.png
+share/gnome/help/seahorse-plugins/sv/figures/passphrase.png
+share/gnome/help/seahorse-plugins/sv/figures/preferences.png
+share/gnome/help/seahorse-plugins/sv/figures/recipients.png
+share/gnome/help/seahorse-plugins/sv/figures/seahorse-window.png
+share/gnome/help/seahorse-plugins/sv/figures/signature.png
+share/gnome/help/seahorse-plugins/sv/figures/text-editor.png
+share/gnome/help/seahorse-plugins/sv/seahorse-plugins.xml
+share/gnome/help/seahorse-plugins/vi/figures/export.png
+share/gnome/help/seahorse-plugins/vi/figures/file-manager.png
+share/gnome/help/seahorse-plugins/vi/figures/generate.png
+share/gnome/help/seahorse-plugins/vi/figures/import.png
+share/gnome/help/seahorse-plugins/vi/figures/key-manager.png
+share/gnome/help/seahorse-plugins/vi/figures/key-properties.png
+share/gnome/help/seahorse-plugins/vi/figures/passphrase.png
+share/gnome/help/seahorse-plugins/vi/figures/preferences.png
+share/gnome/help/seahorse-plugins/vi/figures/recipients.png
+share/gnome/help/seahorse-plugins/vi/figures/seahorse-window.png
+share/gnome/help/seahorse-plugins/vi/figures/signature.png
+share/gnome/help/seahorse-plugins/vi/figures/text-editor.png
+share/gnome/help/seahorse-plugins/vi/seahorse-plugins.xml
+share/icons/hicolor/48x48/apps/seahorse-applet.png
+share/icons/hicolor/scalable/apps/seahorse-applet.svg
+share/locale/ar/LC_MESSAGES/seahorse-plugins.mo
+share/locale/az/LC_MESSAGES/seahorse-plugins.mo
+share/locale/be@latin/LC_MESSAGES/seahorse-plugins.mo
+share/locale/bg/LC_MESSAGES/seahorse-plugins.mo
+share/locale/bn/LC_MESSAGES/seahorse-plugins.mo
+share/locale/bn_IN/LC_MESSAGES/seahorse-plugins.mo
+share/locale/ca/LC_MESSAGES/seahorse-plugins.mo
+share/locale/cs/LC_MESSAGES/seahorse-plugins.mo
+share/locale/da/LC_MESSAGES/seahorse-plugins.mo
+share/locale/de/LC_MESSAGES/seahorse-plugins.mo
+share/locale/dz/LC_MESSAGES/seahorse-plugins.mo
+share/locale/el/LC_MESSAGES/seahorse-plugins.mo
+share/locale/en_CA/LC_MESSAGES/seahorse-plugins.mo
+share/locale/en_GB/LC_MESSAGES/seahorse-plugins.mo
+share/locale/es/LC_MESSAGES/seahorse-plugins.mo
+share/locale/et/LC_MESSAGES/seahorse-plugins.mo
+share/locale/eu/LC_MESSAGES/seahorse-plugins.mo
+share/locale/fi/LC_MESSAGES/seahorse-plugins.mo
+share/locale/fr/LC_MESSAGES/seahorse-plugins.mo
+share/locale/ga/LC_MESSAGES/seahorse-plugins.mo
+share/locale/gl/LC_MESSAGES/seahorse-plugins.mo
+share/locale/gu/LC_MESSAGES/seahorse-plugins.mo
+share/locale/he/LC_MESSAGES/seahorse-plugins.mo
+share/locale/hi/LC_MESSAGES/seahorse-plugins.mo
+share/locale/hr/LC_MESSAGES/seahorse-plugins.mo
+share/locale/hu/LC_MESSAGES/seahorse-plugins.mo
+share/locale/it/LC_MESSAGES/seahorse-plugins.mo
+share/locale/ja/LC_MESSAGES/seahorse-plugins.mo
+share/locale/kn/LC_MESSAGES/seahorse-plugins.mo
+share/locale/ko/LC_MESSAGES/seahorse-plugins.mo
+share/locale/lt/LC_MESSAGES/seahorse-plugins.mo
+share/locale/lv/LC_MESSAGES/seahorse-plugins.mo
+share/locale/mk/LC_MESSAGES/seahorse-plugins.mo
+share/locale/ml/LC_MESSAGES/seahorse-plugins.mo
+share/locale/mr/LC_MESSAGES/seahorse-plugins.mo
+share/locale/ms/LC_MESSAGES/seahorse-plugins.mo
+share/locale/nb/LC_MESSAGES/seahorse-plugins.mo
+share/locale/ne/LC_MESSAGES/seahorse-plugins.mo
+share/locale/nl/LC_MESSAGES/seahorse-plugins.mo
+share/locale/nn/LC_MESSAGES/seahorse-plugins.mo
+share/locale/oc/LC_MESSAGES/seahorse-plugins.mo
+share/locale/or/LC_MESSAGES/seahorse-plugins.mo
+share/locale/pa/LC_MESSAGES/seahorse-plugins.mo
+share/locale/pl/LC_MESSAGES/seahorse-plugins.mo
+share/locale/pt/LC_MESSAGES/seahorse-plugins.mo
+share/locale/pt_BR/LC_MESSAGES/seahorse-plugins.mo
+share/locale/ru/LC_MESSAGES/seahorse-plugins.mo
+share/locale/rw/LC_MESSAGES/seahorse-plugins.mo
+share/locale/si/LC_MESSAGES/seahorse-plugins.mo
+share/locale/sk/LC_MESSAGES/seahorse-plugins.mo
+share/locale/sl/LC_MESSAGES/seahorse-plugins.mo
+share/locale/sq/LC_MESSAGES/seahorse-plugins.mo
+share/locale/sr/LC_MESSAGES/seahorse-plugins.mo
+share/locale/sr@latin/LC_MESSAGES/seahorse-plugins.mo
+share/locale/sv/LC_MESSAGES/seahorse-plugins.mo
+share/locale/ta/LC_MESSAGES/seahorse-plugins.mo
+share/locale/te/LC_MESSAGES/seahorse-plugins.mo
+share/locale/th/LC_MESSAGES/seahorse-plugins.mo
+share/locale/tr/LC_MESSAGES/seahorse-plugins.mo
+share/locale/uk/LC_MESSAGES/seahorse-plugins.mo
+share/locale/vi/LC_MESSAGES/seahorse-plugins.mo
+share/locale/zh_CN/LC_MESSAGES/seahorse-plugins.mo
+share/locale/zh_HK/LC_MESSAGES/seahorse-plugins.mo
+share/locale/zh_TW/LC_MESSAGES/seahorse-plugins.mo
+share/mime/packages/seahorse.xml
+share/omf/seahorse-applet/seahorse-applet-C.omf
+share/omf/seahorse-applet/seahorse-applet-es.omf
+share/omf/seahorse-applet/seahorse-applet-fr.omf
+share/omf/seahorse-applet/seahorse-applet-it.omf
+share/omf/seahorse-applet/seahorse-applet-oc.omf
+share/omf/seahorse-applet/seahorse-applet-ru.omf
+share/omf/seahorse-applet/seahorse-applet-sv.omf
+share/omf/seahorse-applet/seahorse-applet-vi.omf
+share/omf/seahorse-plugins/seahorse-plugins-C.omf
+share/omf/seahorse-plugins/seahorse-plugins-cs.omf
+share/omf/seahorse-plugins/seahorse-plugins-de.omf
+share/omf/seahorse-plugins/seahorse-plugins-el.omf
+share/omf/seahorse-plugins/seahorse-plugins-en_GB.omf
+share/omf/seahorse-plugins/seahorse-plugins-es.omf
+share/omf/seahorse-plugins/seahorse-plugins-fr.omf
+share/omf/seahorse-plugins/seahorse-plugins-it.omf
+share/omf/seahorse-plugins/seahorse-plugins-oc.omf
+share/omf/seahorse-plugins/seahorse-plugins-ru.omf
+share/omf/seahorse-plugins/seahorse-plugins-sv.omf
+share/omf/seahorse-plugins/seahorse-plugins-vi.omf
+share/pixmaps/seahorse-applet.svg
+share/pixmaps/seahorse-plugins/22x22/seahorse-applet-encrypted.png
+share/pixmaps/seahorse-plugins/22x22/seahorse-applet-key.png
+share/pixmaps/seahorse-plugins/22x22/seahorse-applet-signed.png
+share/pixmaps/seahorse-plugins/22x22/seahorse-applet-text.png
+share/pixmaps/seahorse-plugins/22x22/seahorse-applet-unknown.png
+share/pixmaps/seahorse-plugins/22x22/seahorse-key-personal.png
+share/pixmaps/seahorse-plugins/22x22/seahorse-key.png
+share/pixmaps/seahorse-plugins/22x22/seahorse-sign-bad.png
+share/pixmaps/seahorse-plugins/22x22/seahorse-sign-ok.png
+share/pixmaps/seahorse-plugins/22x22/seahorse-sign.png
+share/pixmaps/seahorse-plugins/48x48/seahorse-applet-encrypted.png
+share/pixmaps/seahorse-plugins/48x48/seahorse-applet-key.png
+share/pixmaps/seahorse-plugins/48x48/seahorse-applet-signed.png
+share/pixmaps/seahorse-plugins/48x48/seahorse-applet-text.png
+share/pixmaps/seahorse-plugins/48x48/seahorse-applet-unknown.png
+share/pixmaps/seahorse-plugins/48x48/seahorse-applet.png
+share/pixmaps/seahorse-plugins/48x48/seahorse-key-personal.png
+share/pixmaps/seahorse-plugins/48x48/seahorse-key.png
+share/pixmaps/seahorse-plugins/48x48/seahorse-sign-bad.png
+share/pixmaps/seahorse-plugins/48x48/seahorse-sign-ok.png
+share/pixmaps/seahorse-plugins/48x48/seahorse-sign-unknown.png
+share/pixmaps/seahorse-plugins/48x48/seahorse-sign.png
+share/pixmaps/seahorse-plugins/scalable/seahorse-applet-encrypted.svg
+share/pixmaps/seahorse-plugins/scalable/seahorse-applet-key.svg
+share/pixmaps/seahorse-plugins/scalable/seahorse-applet-signed.svg
+share/pixmaps/seahorse-plugins/scalable/seahorse-applet-text.svg
+share/pixmaps/seahorse-plugins/scalable/seahorse-applet-unknown.svg
+share/pixmaps/seahorse-plugins/scalable/seahorse-applet.svg
+share/pixmaps/seahorse-plugins/scalable/seahorse-key-personal.svg
+share/pixmaps/seahorse-plugins/scalable/seahorse-key-ssh.svg
+share/pixmaps/seahorse-plugins/scalable/seahorse-key.svg
+share/pixmaps/seahorse-plugins/scalable/seahorse-person.svg
+share/pixmaps/seahorse-plugins/scalable/seahorse-share-keys.svg
+share/pixmaps/seahorse-plugins/scalable/seahorse-sign-bad.svg
+share/pixmaps/seahorse-plugins/scalable/seahorse-sign-ok.svg
+share/pixmaps/seahorse-plugins/scalable/seahorse-sign-unknown.svg
+share/pixmaps/seahorse-plugins/scalable/seahorse-sign.svg
+%%DATADIR%%/glade/seahorse-agent-cache.glade
+%%DATADIR%%/glade/seahorse-applet-preferences.glade
+%%DATADIR%%/glade/seahorse-multi-encrypt.glade
+%%DATADIR%%/glade/seahorse-notify.glade
+%%DATADIR%%/glade/seahorse-prefs.glade
+%%DATADIR%%/glade/seahorse-progress.glade
+@dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%
+@dirrmtry share/pixmaps/seahorse-plugins/scalable
+@dirrmtry share/pixmaps/seahorse-plugins/48x48
+@dirrmtry share/pixmaps/seahorse-plugins/22x22
+@dirrmtry share/pixmaps/seahorse-plugins
+@dirrm share/omf/seahorse-plugins
+@dirrm share/omf/seahorse-applet
+@dirrm share/gnome/help/seahorse-plugins/vi/figures
+@dirrm share/gnome/help/seahorse-plugins/vi
+@dirrm share/gnome/help/seahorse-plugins/sv/figures
+@dirrm share/gnome/help/seahorse-plugins/sv
+@dirrm share/gnome/help/seahorse-plugins/ru/figures
+@dirrm share/gnome/help/seahorse-plugins/ru
+@dirrm share/gnome/help/seahorse-plugins/oc/figures
+@dirrm share/gnome/help/seahorse-plugins/oc
+@dirrm share/gnome/help/seahorse-plugins/it/figures
+@dirrm share/gnome/help/seahorse-plugins/it
+@dirrm share/gnome/help/seahorse-plugins/fr/figures
+@dirrm share/gnome/help/seahorse-plugins/fr
+@dirrm share/gnome/help/seahorse-plugins/es/figures
+@dirrm share/gnome/help/seahorse-plugins/es
+@dirrm share/gnome/help/seahorse-plugins/en_GB/figures
+@dirrm share/gnome/help/seahorse-plugins/en_GB
+@dirrm share/gnome/help/seahorse-plugins/el/figures
+@dirrm share/gnome/help/seahorse-plugins/el
+@dirrm share/gnome/help/seahorse-plugins/de/figures
+@dirrm share/gnome/help/seahorse-plugins/de
+@dirrm share/gnome/help/seahorse-plugins/cs/figures
+@dirrm share/gnome/help/seahorse-plugins/cs
+@dirrm share/gnome/help/seahorse-plugins/C/figures
+@dirrm share/gnome/help/seahorse-plugins/C
+@dirrm share/gnome/help/seahorse-plugins
+@dirrm share/gnome/help/seahorse-applet/vi
+@dirrm share/gnome/help/seahorse-applet/sv
+@dirrm share/gnome/help/seahorse-applet/ru
+@dirrm share/gnome/help/seahorse-applet/oc
+@dirrm share/gnome/help/seahorse-applet/it
+@dirrm share/gnome/help/seahorse-applet/fr
+@dirrm share/gnome/help/seahorse-applet/es
+@dirrm share/gnome/help/seahorse-applet/C
+@dirrm share/gnome/help/seahorse-applet
+@dirrmtry share/applications
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index b6aa77eb52d5..0b5e7cd21ef2 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Dave McKay <dave@mu.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/seahorse/Makefile,v 1.61 2008/03/14 14:13:03 mezz Exp $
+#   $MCom: ports/security/seahorse/Makefile,v 1.73 2008/11/24 02:44:50 marcus Exp $
 #
 
 PORTNAME=	seahorse
-PORTVERSION=	2.22.3
+PORTVERSION=	2.24.1
 PORTREVISION=	1
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
@@ -26,47 +26,23 @@ USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GECKO=	firefox xulrunner firefox-devel<->firefox
-USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui
+USE_GNOME=	gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ARGS=	--with-gecko=${GECKO}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	seahorse.schemas
-MAN1=		seahorse-agent.1 seahorse-daemon.1 seahorse-tool.1
+MAN1=		seahorse-daemon.1
 
 OPTIONS=	LDAP "Enable LDAP support" on \
 		HKP "Enable HKP keyserver interface" on \
 		NOTIFY "Enable libnotify support" on \
-		APPLET "Enable clipboard encryption applet" on \
-		MDNS "Enable mDNS key sharing" on \
-		GEDIT "Enable GEdit plug-in support" on \
-		NAUTILUS "Enable the Nautilus component" on \
-		EPIPHANY "Enable Epiphany plug-in support" on
+		MDNS "Enable mDNS key sharing" on
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_GEDIT)
-BUILD_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
-RUN_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
-PLIST_SUB+=	GEDIT=""
-GCONF_SCHEMAS+=	seahorse-gedit.schemas
-.else
-PLIST_SUB+=	GEDIT="@comment "
-CONFIGURE_ARGS+=--disable-gedit
-.endif
-
-.if !defined(WITHOUT_NAUTILUS)
-USE_GNOME+=	nautilus2
-PLIST_SUB+=	NAUTILUS=""
-.else
-PLIST_SUB+=	NAUTILUS="@comment "
-CONFIGURE_ARGS+=--disable-nautilus
-.endif
-
 .if !defined(WITHOUT_LDAP)
 USE_OPENLDAP=	yes
 .else
@@ -85,23 +61,6 @@ LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
 CONFIGURE_ARGS+=--disable-libnotify
 .endif
 
-.if !defined(WITHOUT_EPIPHANY)
-BUILD_DEPENDS+=	epiphany:${PORTSDIR}/www/epiphany
-RUN_DEPENDS+=	epiphany:${PORTSDIR}/www/epiphany
-PLIST_SUB+=	EPHY="" EPHY_VERSION="2.22"
-.else
-CONFIGURE_ARGS+=--disable-epiphany
-PLIST_SUB+=	EPHY="@comment "
-.endif
-
-.if !defined(WITHOUT_APPLET)
-USE_GNOME+=	gnomepanel
-PLIST_SUB+=	APPLET=""
-.else
-CONFIGURE_ARGS+=--disable-applet
-PLIST_SUB+=	APPLET="@comment "
-.endif
-
 .if !defined(WITHOUT_MDNS)
 LIB_DEPENDS+=	avahi-client:${PORTSDIR}/net/avahi-app
 .else
@@ -112,8 +71,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|" == "|" = "|g' \
 			${WRKSRC}/configure
 
-post-install:
-	-@update-desktop-database
-
-.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
 .include <bsd.port.post.mk>
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 369eb9ddb871..0ca292a08fc0 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seahorse-2.22.3.tar.bz2) = 7fdab30dbf8684881199e15246c3765a
-SHA256 (gnome2/seahorse-2.22.3.tar.bz2) = 245ff3752f72d14615937ef03d5a5e6f1a3abdf12a907af775ce31aa337e95d1
-SIZE (gnome2/seahorse-2.22.3.tar.bz2) = 2121204
+MD5 (gnome2/seahorse-2.24.1.tar.bz2) = b35076c2ae46aa58d9b1ca76fe929515
+SHA256 (gnome2/seahorse-2.24.1.tar.bz2) = b86c045fe1d8cf7a3fd56e078175e32cd94154eb77f9fe2a4a4e1f1aa13a5d04
+SIZE (gnome2/seahorse-2.24.1.tar.bz2) = 2197087
diff --git a/security/seahorse/files/patch-common_seahorse-registry.c b/security/seahorse/files/patch-common_seahorse-registry.c
new file mode 100644
index 000000000000..a9b0cc424a6e
--- /dev/null
+++ b/security/seahorse/files/patch-common_seahorse-registry.c
@@ -0,0 +1,76 @@
+--- common/seahorse-registry.c.orig	2008-11-23 18:26:38.000000000 -0500
++++ common/seahorse-registry.c	2008-11-23 19:20:08.000000000 -0500
+@@ -49,6 +49,25 @@ cleanup_registry (void *unused)
+ 	registry_singleton = NULL;
+ }
+ 
++static guint registry_hash (gconstpointer key)
++{
++	SeahorseRegistryType *rtype;
++
++	rtype = (SeahorseRegistryType *) key;
++
++	return (guint) rtype->type;
++}
++
++static gboolean registry_equal (gconstpointer a, gconstpointer b)
++{
++	SeahorseRegistryType *rta, *rtb;
++
++	rta = (SeahorseRegistryType *) a;
++	rtb = (SeahorseRegistryType *) b;
++
++	return (rta->type == rtb->type);
++}
++
+ static void
+ keys_to_list (gpointer key, gpointer value, gpointer user_data)
+ {
+@@ -61,6 +80,7 @@ register_type_for_category (SeahorseRegi
+ {
+ 	SeahorseRegistryPrivate *pv = SEAHORSE_REGISTRY_GET_PRIVATE (registry);
+ 	GHashTable *set;
++	SeahorseRegistryType *rtype;
+ 	
+ 	g_return_if_fail (SEAHORSE_IS_REGISTRY (registry));
+ 	g_return_if_fail (category);
+@@ -68,11 +88,14 @@ register_type_for_category (SeahorseRegi
+ 	
+ 	set = g_hash_table_lookup (pv->categories, category);
+ 	if (!set) {
+-		set = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, NULL);
++		set = g_hash_table_new_full (registry_hash, registry_equal, (GDestroyNotify) g_free, NULL);
+ 		g_hash_table_replace (pv->categories, g_strdup (category), set);
+ 	}
++
++	rtype = g_new (SeahorseRegistryType, 1);
++	rtype->type = type;
+ 	
+-	g_hash_table_replace (set, GUINT_TO_POINTER (type), NO_VALUE);
++	g_hash_table_replace (set, rtype, NO_VALUE);
+ }
+ 
+ static GList*
+@@ -115,6 +138,7 @@ lookup_types (SeahorseRegistry *registry
+ 		
+ 		/* Go through each item in list and make sure it exists in this cat */
+ 		for (l = types; l; l = l ? g_list_next (l) : types) {
++			SeahorseRegistryType *rtype;
+ 			type = l;
+ 			if (!g_hash_table_lookup (set, type->data)) {
+ 				l = g_list_previous (l);
+@@ -224,8 +248,12 @@ seahorse_registry_find_type (SeahorseReg
+ 	va_end (cats);
+ 
+ 	type = 0;
+-	if (types)
+-		type = GPOINTER_TO_UINT (types->data);
++	if (types) {
++		SeahorseRegistryType *rtype;
++
++		rtype = (SeahorseRegistryType *) types->data;
++		type = rtype->type;
++	}
+ 	g_list_free (types);
+ 	return type;
+ }
diff --git a/security/seahorse/files/patch-common_seahorse-registry.h b/security/seahorse/files/patch-common_seahorse-registry.h
new file mode 100644
index 000000000000..f1f57de3b042
--- /dev/null
+++ b/security/seahorse/files/patch-common_seahorse-registry.h
@@ -0,0 +1,21 @@
+--- common/seahorse-registry.h.orig	2008-11-23 18:26:42.000000000 -0500
++++ common/seahorse-registry.h	2008-11-23 18:26:47.000000000 -0500
+@@ -35,6 +35,7 @@ G_BEGIN_DECLS
+ 
+ typedef struct _SeahorseRegistry      SeahorseRegistry;
+ typedef struct _SeahorseRegistryClass SeahorseRegistryClass;
++typedef struct _SeahorseRegistryType  SeahorseRegistryType;
+ 
+ struct _SeahorseRegistry {
+ 	 GObject parent;
+@@ -44,6 +45,10 @@ struct _SeahorseRegistryClass {
+ 	GObjectClass parent_class;
+ };
+ 
++struct _SeahorseRegistryType {
++	GType type;
++};
++
+ /* member functions */
+ GType                seahorse_registry_get_type        (void) G_GNUC_CONST;
+ 
diff --git a/security/seahorse/files/patch-libseahorse_seahorse-ssh-operation.c b/security/seahorse/files/patch-libseahorse_seahorse-ssh-operation.c
deleted file mode 100644
index e7a7e4f605a8..000000000000
--- a/security/seahorse/files/patch-libseahorse_seahorse-ssh-operation.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libseahorse/seahorse-ssh-operation.c.orig	Sun Dec  3 23:21:01 2006
-+++ libseahorse/seahorse-ssh-operation.c	Sun Dec  3 23:21:10 2006
-@@ -24,6 +24,7 @@
- #include <sys/socket.h>
- #include <gnome.h>
- #include <fcntl.h>
-+#include <signal.h>
- 
- #include "seahorse-ssh-operation.h"
- #include "seahorse-util.h"
diff --git a/security/seahorse/files/patch-src_seahorse-generate-select.c b/security/seahorse/files/patch-src_seahorse-generate-select.c
new file mode 100644
index 000000000000..7de1b7ff476d
--- /dev/null
+++ b/security/seahorse/files/patch-src_seahorse-generate-select.c
@@ -0,0 +1,14 @@
+--- src/seahorse-generate-select.c.orig	2008-11-23 18:28:34.000000000 -0500
++++ src/seahorse-generate-select.c	2008-11-23 18:29:30.000000000 -0500
+@@ -197,8 +197,10 @@ static GObject * seahorse_generate_selec
+ 			GList* typ_it;
+ 			typ_collection = types;
+ 			for (typ_it = typ_collection; typ_it != NULL; typ_it = typ_it->next) {
++				SeahorseRegistryType *rtype;
+ 				GType typ;
+-				typ = GPOINTER_TO_INT (typ_it->data);
++				rtype = (SeahorseRegistryType *) typ_it->data;
++				typ = rtype->type;
+ 				{
+ 					SeahorseGenerator* generator;
+ 					gint _tmp5;
diff --git a/security/seahorse/files/patch-src_seahorse-viewer.c b/security/seahorse/files/patch-src_seahorse-viewer.c
new file mode 100644
index 000000000000..5acb2e00d676
--- /dev/null
+++ b/security/seahorse/files/patch-src_seahorse-viewer.c
@@ -0,0 +1,17 @@
+--- src/seahorse-viewer.c.orig	2008-11-23 18:27:49.000000000 -0500
++++ src/seahorse-viewer.c	2008-11-23 18:28:27.000000000 -0500
+@@ -556,10 +556,13 @@ seahorse_viewer_constructor (GType type,
+ 		/* Setup the commands */
+ 		types = seahorse_registry_find_types (seahorse_registry_get (), "commands", NULL, NULL);
+ 		for (l = types; l; l = g_list_next (l)) {
+-			GType typ = GPOINTER_TO_INT (l->data);
++			SeahorseRegistryType *rtype = (SeahorseRegistryType *) l->data;
++			GType typ;
+ 			SeahorseCommands *commands;
+ 			GtkActionGroup *actions;
+ 			const gchar *uidef;
++
++			typ = rtype->type;
+ 			
+ 			/* Add each commands to our hash table */
+ 			commands = g_object_new (typ, "view", self, NULL);
diff --git a/security/seahorse/files/patch-ssh_seahorse-ssh-operation.c b/security/seahorse/files/patch-ssh_seahorse-ssh-operation.c
new file mode 100644
index 000000000000..d3528e2a7a64
--- /dev/null
+++ b/security/seahorse/files/patch-ssh_seahorse-ssh-operation.c
@@ -0,0 +1,19 @@
+--- ssh/seahorse-ssh-operation.c.orig	2008-07-21 18:15:51.000000000 -0400
++++ ssh/seahorse-ssh-operation.c	2008-07-22 22:49:51.000000000 -0400
+@@ -280,11 +280,14 @@ askpass_handler (GIOChannel *source, GIO
+     const gchar *result = NULL;
+ 
+     if (condition & G_IO_IN) {
++	GIOStatus status;
+         
+         /* Read 1 line from the io channel, including newline character */
+-        g_io_channel_read_line (source, &string, &length, NULL, &err);
++        status = g_io_channel_read_line (source, &string, &length, NULL, &err);
+ 
+-        if (err != NULL) {
++	if (status == G_IO_STATUS_EOF) {
++		ret = FALSE;
++	} else if (err != NULL) {
+             g_critical ("couldn't read from seahorse-ssh-askpass: %s", err->message);
+             g_clear_error (&err);
+             ret = FALSE;
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index 364434aee3a8..a94f07390a6f 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -1,50 +1,20 @@
 bin/seahorse
-bin/seahorse-agent
 bin/seahorse-daemon
-bin/seahorse-preferences
-bin/seahorse-tool
 include/libcryptui/cryptui-key-chooser.h
 include/libcryptui/cryptui-key-combo.h
 include/libcryptui/cryptui-key-list.h
 include/libcryptui/cryptui-key-store.h
 include/libcryptui/cryptui-keyset.h
 include/libcryptui/cryptui.h
-%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.a
-%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.la
-%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.so
-%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/seahorse.ephy-extension
-%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.a
-%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.la
-%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.so
-%%GEDIT%%lib/gedit-2/plugins/seahorse-pgp.gedit-plugin
 lib/libcryptui.a
 lib/libcryptui.la
 lib/libcryptui.so
 lib/libcryptui.so.0
-%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.a
-%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.la
-%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.so
-%%APPLET%%lib/seahorse/seahorse-applet
 lib/seahorse/seahorse-ssh-askpass
 lib/seahorse/xloadimage
-%%APPLET%%libdata/bonobo/servers/GNOME_SeahorseApplet.server
 libdata/pkgconfig/cryptui-0.0.pc
-share/applications/seahorse-pgp-encrypted.desktop
-share/applications/seahorse-pgp-keys.desktop
-share/applications/seahorse-pgp-preferences.desktop
-share/applications/seahorse-pgp-signature.desktop
 share/applications/seahorse.desktop
 share/dbus-1/services/org.gnome.seahorse.service
-%%APPLET%%share/gnome-2.0/ui/GNOME_SeahorseApplet.xml
-%%APPLET%%share/gnome/help/seahorse-applet/C/legal.xml
-%%APPLET%%share/gnome/help/seahorse-applet/C/seahorse-applet.xml
-%%APPLET%%share/gnome/help/seahorse-applet/es/seahorse-applet.xml
-%%APPLET%%share/gnome/help/seahorse-applet/fr/seahorse-applet.xml
-%%APPLET%%share/gnome/help/seahorse-applet/it/seahorse-applet.xml
-%%APPLET%%share/gnome/help/seahorse-applet/oc/seahorse-applet.xml
-%%APPLET%%share/gnome/help/seahorse-applet/ru/seahorse-applet.xml
-%%APPLET%%share/gnome/help/seahorse-applet/sv/seahorse-applet.xml
-%%APPLET%%share/gnome/help/seahorse-applet/vi/seahorse-applet.xml
 share/gnome/help/seahorse/C/figures/export.png
 share/gnome/help/seahorse/C/figures/file-manager.png
 share/gnome/help/seahorse/C/figures/generate.png
@@ -59,6 +29,19 @@ share/gnome/help/seahorse/C/figures/signature.png
 share/gnome/help/seahorse/C/figures/text-editor.png
 share/gnome/help/seahorse/C/legal.xml
 share/gnome/help/seahorse/C/seahorse.xml
+share/gnome/help/seahorse/de/figures/export.png
+share/gnome/help/seahorse/de/figures/file-manager.png
+share/gnome/help/seahorse/de/figures/generate.png
+share/gnome/help/seahorse/de/figures/import.png
+share/gnome/help/seahorse/de/figures/key-manager.png
+share/gnome/help/seahorse/de/figures/key-properties.png
+share/gnome/help/seahorse/de/figures/passphrase.png
+share/gnome/help/seahorse/de/figures/preferences.png
+share/gnome/help/seahorse/de/figures/recipients.png
+share/gnome/help/seahorse/de/figures/seahorse-window.png
+share/gnome/help/seahorse/de/figures/signature.png
+share/gnome/help/seahorse/de/figures/text-editor.png
+share/gnome/help/seahorse/de/seahorse.xml
 share/gnome/help/seahorse/en_GB/figures/export.png
 share/gnome/help/seahorse/en_GB/figures/file-manager.png
 share/gnome/help/seahorse/en_GB/figures/generate.png
@@ -163,14 +146,16 @@ share/gnome/help/seahorse/vi/figures/seahorse-window.png
 share/gnome/help/seahorse/vi/figures/signature.png
 share/gnome/help/seahorse/vi/figures/text-editor.png
 share/gnome/help/seahorse/vi/seahorse.xml
-share/icons/hicolor/22x22/apps/seahorse-preferences.svg
-share/icons/hicolor/22x22/apps/seahorse.svg
-share/icons/hicolor/48x48/apps/seahorse-applet.png
+share/icons/hicolor/16x16/apps/seahorse-preferences.png
+share/icons/hicolor/16x16/apps/seahorse.png
+share/icons/hicolor/22x22/apps/seahorse-preferences.png
+share/icons/hicolor/22x22/apps/seahorse.png
+share/icons/hicolor/24x24/apps/seahorse-preferences.png
+share/icons/hicolor/24x24/apps/seahorse.png
+share/icons/hicolor/32x32/apps/seahorse-preferences.png
+share/icons/hicolor/32x32/apps/seahorse.png
 share/icons/hicolor/48x48/apps/seahorse-preferences.png
 share/icons/hicolor/48x48/apps/seahorse.png
-share/icons/hicolor/scalable/apps/seahorse-applet.svg
-share/icons/hicolor/scalable/apps/seahorse-preferences.svg
-share/icons/hicolor/scalable/apps/seahorse.svg
 share/locale/ar/LC_MESSAGES/seahorse.mo
 share/locale/az/LC_MESSAGES/seahorse.mo
 share/locale/be@latin/LC_MESSAGES/seahorse.mo
@@ -224,7 +209,7 @@ share/locale/sk/LC_MESSAGES/seahorse.mo
 share/locale/sl/LC_MESSAGES/seahorse.mo
 share/locale/sq/LC_MESSAGES/seahorse.mo
 share/locale/sr/LC_MESSAGES/seahorse.mo
-share/locale/sr@Latn/LC_MESSAGES/seahorse.mo
+share/locale/sr@latin/LC_MESSAGES/seahorse.mo
 share/locale/sv/LC_MESSAGES/seahorse.mo
 share/locale/ta/LC_MESSAGES/seahorse.mo
 share/locale/te/LC_MESSAGES/seahorse.mo
@@ -235,16 +220,8 @@ share/locale/vi/LC_MESSAGES/seahorse.mo
 share/locale/zh_CN/LC_MESSAGES/seahorse.mo
 share/locale/zh_HK/LC_MESSAGES/seahorse.mo
 share/locale/zh_TW/LC_MESSAGES/seahorse.mo
-share/mime/packages/seahorse.xml
-%%APPLET%%share/omf/seahorse-applet/seahorse-applet-C.omf
-%%APPLET%%share/omf/seahorse-applet/seahorse-applet-es.omf
-%%APPLET%%share/omf/seahorse-applet/seahorse-applet-fr.omf
-%%APPLET%%share/omf/seahorse-applet/seahorse-applet-it.omf
-%%APPLET%%share/omf/seahorse-applet/seahorse-applet-oc.omf
-%%APPLET%%share/omf/seahorse-applet/seahorse-applet-ru.omf
-%%APPLET%%share/omf/seahorse-applet/seahorse-applet-sv.omf
-%%APPLET%%share/omf/seahorse-applet/seahorse-applet-vi.omf
 share/omf/seahorse/seahorse-C.omf
+share/omf/seahorse/seahorse-de.omf
 share/omf/seahorse/seahorse-en_GB.omf
 share/omf/seahorse/seahorse-es.omf
 share/omf/seahorse/seahorse-fr.omf
@@ -253,64 +230,36 @@ share/omf/seahorse/seahorse-oc.omf
 share/omf/seahorse/seahorse-ru.omf
 share/omf/seahorse/seahorse-sv.omf
 share/omf/seahorse/seahorse-vi.omf
-share/pixmaps/seahorse-applet.svg
-share/pixmaps/seahorse-preferences.png
-share/pixmaps/seahorse.png
-share/pixmaps/seahorse/22x22/seahorse-applet-encrypted.png
-share/pixmaps/seahorse/22x22/seahorse-applet-key.png
-share/pixmaps/seahorse/22x22/seahorse-applet-signed.png
-share/pixmaps/seahorse/22x22/seahorse-applet-text.png
-share/pixmaps/seahorse/22x22/seahorse-applet-unknown.png
 share/pixmaps/seahorse/22x22/seahorse-key-personal.png
 share/pixmaps/seahorse/22x22/seahorse-key-ssh.png
 share/pixmaps/seahorse/22x22/seahorse-key.png
 share/pixmaps/seahorse/22x22/seahorse-person.png
-share/pixmaps/seahorse/22x22/seahorse-preferences.png
 share/pixmaps/seahorse/22x22/seahorse-share-keys.png
 share/pixmaps/seahorse/22x22/seahorse-sign-bad.png
 share/pixmaps/seahorse/22x22/seahorse-sign-ok.png
 share/pixmaps/seahorse/22x22/seahorse-sign.png
-share/pixmaps/seahorse/22x22/seahorse.png
-share/pixmaps/seahorse/48x48/seahorse-applet-encrypted.png
-share/pixmaps/seahorse/48x48/seahorse-applet-key.png
-share/pixmaps/seahorse/48x48/seahorse-applet-signed.png
-share/pixmaps/seahorse/48x48/seahorse-applet-text.png
-share/pixmaps/seahorse/48x48/seahorse-applet-unknown.png
-share/pixmaps/seahorse/48x48/seahorse-applet.png
 share/pixmaps/seahorse/48x48/seahorse-key-personal.png
 share/pixmaps/seahorse/48x48/seahorse-key-ssh.png
 share/pixmaps/seahorse/48x48/seahorse-key.png
 share/pixmaps/seahorse/48x48/seahorse-person.png
-share/pixmaps/seahorse/48x48/seahorse-preferences.png
 share/pixmaps/seahorse/48x48/seahorse-share-keys.png
 share/pixmaps/seahorse/48x48/seahorse-sign-bad.png
 share/pixmaps/seahorse/48x48/seahorse-sign-ok.png
 share/pixmaps/seahorse/48x48/seahorse-sign-unknown.png
 share/pixmaps/seahorse/48x48/seahorse-sign.png
-share/pixmaps/seahorse/48x48/seahorse.png
-share/pixmaps/seahorse/scalable/seahorse-applet-encrypted.svg
-share/pixmaps/seahorse/scalable/seahorse-applet-key.svg
-share/pixmaps/seahorse/scalable/seahorse-applet-signed.svg
-share/pixmaps/seahorse/scalable/seahorse-applet-text.svg
-share/pixmaps/seahorse/scalable/seahorse-applet-unknown.svg
-share/pixmaps/seahorse/scalable/seahorse-applet.svg
 share/pixmaps/seahorse/scalable/seahorse-key-personal.svg
 share/pixmaps/seahorse/scalable/seahorse-key-ssh.svg
 share/pixmaps/seahorse/scalable/seahorse-key.svg
 share/pixmaps/seahorse/scalable/seahorse-person.svg
-share/pixmaps/seahorse/scalable/seahorse-preferences.svg
 share/pixmaps/seahorse/scalable/seahorse-share-keys.svg
 share/pixmaps/seahorse/scalable/seahorse-sign-bad.svg
 share/pixmaps/seahorse/scalable/seahorse-sign-ok.svg
 share/pixmaps/seahorse/scalable/seahorse-sign-unknown.svg
 share/pixmaps/seahorse/scalable/seahorse-sign.svg
-share/pixmaps/seahorse/scalable/seahorse.svg
 %%DATADIR%%/glade/seahorse-add-keyring.glade
 %%DATADIR%%/glade/seahorse-add-keyserver.glade
 %%DATADIR%%/glade/seahorse-add-subkey.glade
 %%DATADIR%%/glade/seahorse-add-uid.glade
-%%DATADIR%%/glade/seahorse-agent-cache.glade
-%%APPLET%%%%DATADIR%%/glade/seahorse-applet-preferences.glade
 %%DATADIR%%/glade/seahorse-change-passphrase.glade
 %%DATADIR%%/glade/seahorse-expires.glade
 %%DATADIR%%/glade/seahorse-generate-select.glade
@@ -321,7 +270,6 @@ share/pixmaps/seahorse/scalable/seahorse.svg
 %%DATADIR%%/glade/seahorse-keyserver-results.ui
 %%DATADIR%%/glade/seahorse-keyserver-search.glade
 %%DATADIR%%/glade/seahorse-keyserver-sync.glade
-%%DATADIR%%/glade/seahorse-multi-encrypt.glade
 %%DATADIR%%/glade/seahorse-notify.glade
 %%DATADIR%%/glade/seahorse-pgp-generate.glade
 %%DATADIR%%/glade/seahorse-pgp-private-key-properties.glade
@@ -340,7 +288,6 @@ share/pixmaps/seahorse/scalable/seahorse.svg
 @dirrm share/pixmaps/seahorse/48x48
 @dirrm share/pixmaps/seahorse/22x22
 @dirrm share/pixmaps/seahorse
-%%APPLET%%@dirrm share/omf/seahorse-applet
 @dirrm share/omf/seahorse
 @dirrm share/gnome/help/seahorse/vi/figures
 @dirrm share/gnome/help/seahorse/vi
@@ -358,32 +305,20 @@ share/pixmaps/seahorse/scalable/seahorse.svg
 @dirrm share/gnome/help/seahorse/es
 @dirrm share/gnome/help/seahorse/en_GB/figures
 @dirrm share/gnome/help/seahorse/en_GB
+@dirrm share/gnome/help/seahorse/de/figures
+@dirrm share/gnome/help/seahorse/de
 @dirrm share/gnome/help/seahorse/C/figures
 @dirrm share/gnome/help/seahorse/C
-%%APPLET%%@dirrm share/gnome/help/seahorse-applet/vi
-%%APPLET%%@dirrm share/gnome/help/seahorse-applet/sv
-%%APPLET%%@dirrm share/gnome/help/seahorse-applet/ru
-%%APPLET%%@dirrm share/gnome/help/seahorse-applet/oc
-%%APPLET%%@dirrm share/gnome/help/seahorse-applet/it
-%%APPLET%%@dirrm share/gnome/help/seahorse-applet/fr
-%%APPLET%%@dirrm share/gnome/help/seahorse-applet/es
-%%APPLET%%@dirrm share/gnome/help/seahorse-applet/C
-%%APPLET%%@dirrm share/gnome/help/seahorse-applet
 @dirrm share/gnome/help/seahorse
+@dirrmtry share/applications
 @dirrm lib/seahorse
-%%EPHY%%@dirrmtry lib/epiphany/%%EPHY_VERSION%%/extensions
-%%EPHY%%@dirrmtry lib/epiphany/%%EPHY_VERSION%%
-%%EPHY%%@dirrmtry lib/epiphany
 @dirrm include/libcryptui
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES