Update to 0.7.8:

seahorse 0.7.8
--------------

    * HKP key server support.
    * Reworked drag-and-drop. Now works between Seahorse windows.
    * Added a dialog for adding key servers simply and correctly.
    * Add option to agent 'Authorize' window to turn off prompting
      for authorization [Adam Schriber]
    * Handle empty passwords properly in agent [Adam Schreiber]
    * Keep agent window on top [Adam Schreiber]
    * Removed libeel dependency.
    * Better keyboard handling in the recipients dialog.
    * Fix some rare gnome-vfs problems.
    * Many smaller bug fixes.

seahorse 0.7.7
--------------

    * Working keyserver sync (including upload) support.
    * Compatibility with GNOME 2.10.
    * Nautilus plugin now works with Nautilus 2.10 [Fernando Herrera]
    * Cleaned up and simplified columns in the Key Manager.
    * Fix problems with entering expiry dates.
    * Remove 'Text Mode' option. Clarify 'ASCII Armor' option.
    * Removed lots of 'jargon' from the interface.
    * Can now drag keys from a key list to nautilus.
    * Many smaller bug fixes.

seahorse 0.7.6
--------------

    * Compatible with GPG 1.4
    * Initial LDAP key server searching and importing support.
    * Show descriptive icons (eg: secret, public keys) in the main
      Key Manager window. [Adam Schreiber]
    * Monitor keyring and refresh key list automatically across
      processes, such as gedit plugin, recipient selection etc...
    * Decryption 'Open With' in nautilus for PGP encrypted and
      signed files. [Adam Schreiber]
    * Added Backup Keyrings functionality. [Adam Schreiber]
    * Prompt for signer when no default key is selected.
    * Display UIDs properly in the seahorse-agent status window.
    * Allow selection of a signing key in the Recipients dialog.
    * More usable HIG friendly Key Properties dialog [Jim Pharis]
    * Fix problems with 0 length files being created on error.
    * Gnome HIG compliancy fixes
    * Allow deletion of UIDs from the Key Manager window.
    * Show all UIDs in the Recipient selection dialog.
    * Prompt before overwriting files.
    * More efficient operations on large files.
    * Enable gedit plugin by default.
    * Many smaller bug fixes.

5 files changed, 49 insertions, 34 deletions

diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 004ac17895c..8f12a144469 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2005/04/11 21:47:19 tv Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/19 21:14:11 jmmv Exp $
 
-DISTNAME=	seahorse-0.7.5
-PKGREVISION=	1
+DISTNAME=	seahorse-0.7.8
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/0.7/}
 EXTRACT_SUFX=	.tar.bz2
@@ -35,8 +34,10 @@ BUILDLINK_DEPENDS.gpgme+=	gpgme>=1.0.1nb2
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../net/libsoup-devel/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/security/seahorse/PLIST b/security/seahorse/PLIST
index 6201127b234..d8f51eb2aaf 100644
--- a/security/seahorse/PLIST
+++ b/security/seahorse/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.9 2004/11/07 13:19:24 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/05/19 21:14:11 jmmv Exp $
 bin/seahorse
 bin/seahorse-agent
 bin/seahorse-pgp-preferences
-lib/bonobo/libseahorse-pgp-file-listener.la
-lib/bonobo/servers/Seahorse_PGP_File_Listener.server
 lib/libseahorse-internal.la
+lib/nautilus/extensions-1.0/libnautilus-seahorse.la
+share/applications/seahorse-pgp-encrypted.desktop
+share/applications/seahorse-pgp-preferences.desktop
+share/applications/seahorse-pgp-signature.desktop
 share/applications/seahorse.desktop
 share/control-center-2.0/capplets/seahorse-pgp-preferences.desktop
 share/gconf/schemas/seahorse.schemas
@@ -22,6 +24,7 @@ share/gnome/help/seahorse/C/figures/text-editor.png
 share/gnome/help/seahorse/C/legal.xml
 share/gnome/help/seahorse/C/seahorse.xml
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/seahorse.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/seahorse.mo
@@ -38,6 +41,7 @@ ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/seahorse.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/seahorse.mo
@@ -45,6 +49,7 @@ ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/seahorse.mo
+${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/seahorse.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/seahorse.mo
@@ -58,24 +63,33 @@ share/mime-info/seahorse.keys
 share/mime-info/seahorse.mime
 share/mime/packages/seahorse.xml
 share/omf/seahorse/seahorse-C.omf
+share/pixmaps/seahorse-key.png
+share/pixmaps/seahorse-secret.png
 share/pixmaps/seahorse.png
+share/seahorse/glade/seahorse-add-keyserver.glade
 share/seahorse/glade/seahorse-add-subkey.glade
 share/seahorse/glade/seahorse-add-uid.glade
 share/seahorse/glade/seahorse-agent-cache.glade
 share/seahorse/glade/seahorse-change-passphrase.glade
+share/seahorse/glade/seahorse-expires.glade
 share/seahorse/glade/seahorse-generate-adv.glade
 share/seahorse/glade/seahorse-generate-druid.glade
 share/seahorse/glade/seahorse-generate-select.glade
 share/seahorse/glade/seahorse-key-manager.glade
 share/seahorse/glade/seahorse-key-properties.glade
+share/seahorse/glade/seahorse-keyserver-results.glade
+share/seahorse/glade/seahorse-keyserver-search.glade
+share/seahorse/glade/seahorse-keyserver-sync.glade
 share/seahorse/glade/seahorse-multi-encrypt.glade
 share/seahorse/glade/seahorse-passphrase.glade
-share/seahorse/glade/seahorse-pgp-preferences.glade
 share/seahorse/glade/seahorse-preferences.glade
+share/seahorse/glade/seahorse-prefs.glade
+share/seahorse/glade/seahorse-progress.glade
 share/seahorse/glade/seahorse-recipients.glade
 share/seahorse/glade/seahorse-revoke.glade
 share/seahorse/glade/seahorse-sign.glade
 share/seahorse/glade/seahorse-signatures.glade
+share/seahorse/glade/seahorse-signer.glade
 @dirrm share/seahorse/glade
 @dirrm share/seahorse
 @comment in xdg-dirs: @dirrm share/pixmaps
@@ -90,4 +104,4 @@ share/seahorse/glade/seahorse-signatures.glade
 @comment in GConf2: @dirrm share/gconf/schemas
 @comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets
 @comment in xdg-dirs: @dirrm share/applications
-@comment in libbonobo: @dirrm lib/bonobo/servers
+@comment in nautilus: @dirrm lib/nautilus/extensions-1.0
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index e55f31fa662..9a790fe2d53 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2005/03/16 12:04:12 rillig Exp $
+$NetBSD: distinfo,v 1.12 2005/05/19 21:14:11 jmmv Exp $
 
-SHA1 (seahorse-0.7.5.tar.bz2) = e7535125c524d264594f7d82943d27e4472ae6d3
-RMD160 (seahorse-0.7.5.tar.bz2) = 0d6cb29fdd5771f0acab5de40c78fd8f5a5aa475
-Size (seahorse-0.7.5.tar.bz2) = 937238 bytes
-SHA1 (patch-aa) = 5e1448b0de81f36b135d4952ea4d9141d5ff4326
-SHA1 (patch-ab) = 43d6b53d07e970a817d58cda70428b44c0236356
+SHA1 (seahorse-0.7.8.tar.bz2) = 0d4b870555aeed34662ae7edd1cd96bc2a4e7be9
+RMD160 (seahorse-0.7.8.tar.bz2) = 5fb7711a5bac0848a4577bf74fc6e097828de5c7
+Size (seahorse-0.7.8.tar.bz2) = 1116374 bytes
+SHA1 (patch-aa) = b7dbb53b1a012345b13426f50f76a523ff839536
+SHA1 (patch-ab) = 38d3f9ab9a46209f363d2b772d079cde1af83ed2
 SHA1 (patch-ac) = a17c31e312b10d7ba781289b70060ed34a1c006b
 SHA1 (patch-ad) = a7abc7a29a422ec229545f626f37ae173ba56db7
diff --git a/security/seahorse/patches/patch-aa b/security/seahorse/patches/patch-aa
index 8833169eb1f..138dc80b239 100644
--- a/security/seahorse/patches/patch-aa
+++ b/security/seahorse/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2004/11/07 13:19:24 jmmv Exp $
+$NetBSD: patch-aa,v 1.7 2005/05/19 21:14:11 jmmv Exp $
 
---- libseahorse/seahorse-util.c.orig	2004-10-14 11:40:11.000000000 -0600
+--- libseahorse/seahorse-util.c.orig	2005-05-01 19:30:09.000000000 +0000
 +++ libseahorse/seahorse-util.c
-@@ -226,11 +226,12 @@ seahorse_util_write_data_to_file (const 
+@@ -230,11 +230,12 @@ seahorse_util_write_data_to_file (const 
  	gchar *buffer;
  	gint nread;
     
@@ -15,13 +15,13 @@ $NetBSD: patch-aa,v 1.6 2004/11/07 13:19:24 jmmv Exp $
 +    if (gpgme_data_seek (data, 0, SEEK_SET) == -1)
 +    {
 +        gpg_err_code_t e = gpg_err_code_from_errno (errno);
-+        return GPG_E (e);                
++        return GPG_E (e);
 +    }
  	
-     file = seahorse_vfs_data_create (path, TRUE, &err);
-     if(file != NULL)
-@@ -270,11 +271,11 @@ seahorse_util_write_data_to_text (gpgme_
-         guint nread = 0;
+     file = seahorse_vfs_data_create (path, SEAHORSE_VFS_WRITE, &err);
+     if (file != NULL) {
+@@ -275,11 +276,11 @@ seahorse_util_write_data_to_text (gpgme_
+     guint nread = 0;
  	GString *string;
  
 -    /* 
@@ -32,7 +32,7 @@ $NetBSD: patch-aa,v 1.6 2004/11/07 13:19:24 jmmv Exp $
 +        /* Reset the read pointer in data */
 +        if (gpgme_data_seek (data, 0, SEEK_SET) == -1)
 +        {
-+            return NULL;                
++            return NULL;
 +        }
  
  	string = g_string_new ("");
diff --git a/security/seahorse/patches/patch-ab b/security/seahorse/patches/patch-ab
index f2327634692..4f770c20f08 100644
--- a/security/seahorse/patches/patch-ab
+++ b/security/seahorse/patches/patch-ab
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.3 2004/12/30 17:41:58 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2005/05/19 21:14:11 jmmv Exp $
 
---- configure.orig	2004-11-02 18:13:19.000000000 +0100
+--- configure.orig	2005-05-07 17:08:51.000000000 +0000
 +++ configure
-@@ -19342,6 +19342,9 @@ echo $ECHO_N "checking for GnuPG >= $min
- 		sed 's/^gpg (GnuPG) \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
+@@ -19614,6 +19614,9 @@ echo $ECHO_N "checking for GPGME - versi
+ 		 sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
  
- 	  if test "$major" -eq "$req_major"; then
-+	     if test "$minor" -gt "$req_minor"; then
-+		ok="yes"
-+	     fi
- 	     if test "$minor" -eq "$req_minor"; then
- 	  	if test "$micro" -ge "$req_micro"; then
- 		       ok="yes"
+ 	if test "$major" -eq "$req_major"; then
++	   if test "$minor" -gt "$req_minor"; then
++	       ok="yes"
++	   fi
+ 	   if test "$minor" -eq "$req_minor"; then
+ 	     if test "$micro" -ge "$req_micro"; then
+ 	       ok="yes"