Update to 2.16.0:

2006-09-05  Fernando Herrera  <fherrera@onirica.com>

	* configure.ac: Release 2.16.0

2006-09-02  Daniel Nylander <po@danielnylander.se>

	* docs/sv/sv.po: Updated Swedish translation.

2006-08-22  Fernando Herrera  <fherrera@onirica.com>

	* configure.ac: Relase 2.15.92

2006-08-22  Fernando Herrera  <fherrera@onirica.com>

	* src/gnome-keyring-manager-keyring-editor.c:
	(gkm_keyring_editor_set_acl): Chage a crash by leak :)

2006-08-03  German Poo-Caaman~o  <gpoo@ubiobio.cl>

	* MAINTAINERS: Added myself there (Fernando Herrera asked me
	  to co-maintain this module)

2006-08-03  German Poo-Caaman~o  <gpoo@ubiobio.cl>

	Patch from Przemysrlaw Grzegorczyk <pgrzegorczyk@gmail.com>

	* po/LINGUAS: New file listing all supported languages.
	* configure.ac: Use po/LINGUAS instead of including all languages
	  directly in this file. See the wiki for more information:
	  http://live.gnome.org/GnomeGoals/PoLinguas. Fixed #337908

2006-08-03  Jovan Naumovski  <jovan@lugola.net>

	* Added sl.po to po/ and 'sl' to configure.ac

2006-08-02  German Poo-Caaman~o  <gpoo@ubiobio.cl>

	* data/gnome-keyring-manager.desktop.in.in: Switched 'GNOME;GTK;'
	  instead 'GNOME;' in 'Categories' in order to fix #328039.

2006-08-02  German Poo-Caaman~o  <gpoo@ubiobio.cl>

	* MAINTAINERS: Added this file in order to fix #335041.  At the
	moment I just set to Fernando Herrera as the current maintainer.

2006-08-02  Fernando Herrera  <fherrera@onirica.com>

	* src/gnome-keyring-manager.c: (main): Port to GOption API. Patch by
	Sebastien Bacher. Closes bug #336077

2006-08-02  Fernando Herrera  <fherrera@onirica.com>

	* configure.ac: Branched for gnome-2-14, bump version number to
	2.15.91

2006-07-23  Christophe Bliard <christophe.bliard@trux.info>

	* docs/fr/fr.po: Added French translation.
	* docs/Makefile.am: Added fr to DOC_LINGUAS.

2006-07-23  Daniel Nylander <po@danielnylander.se>

	* sv/sv.po: Updated Swedish translation.

2006-07-03  Runa Bhattacharjee <runabh@gmail.com>

        * configure.ac: Added Bengali India (bn_IN) to ALL_LINGUAS.

2006-06-29  Daniel Nylander  <po@danielnylander.se>

	* docs/sv/sv.po: Added Swedish translation.

2006-06-19  Raivis Dejus  <orvils@gmail.com>

	* configure.ac: Added "lv" Latvian in to ALL_LINGUAS line.

2006-06-12  Ahmad Riza H Nst  <rizahnst@gnome.org>

	* configure.ac: Added "id" Indonesian in to ALL_LINGUAS line.
	* po/id.po: Added Indonesian translation.

2006-05-25  Åsmund Skjæveland  <aasmunds@fys.uio.no>

	* po/nn.po: Added Norwegian Nynorsk translation.
	* configure.ac: Added nn to ALL_LINGUAS.

2006-04-17  Kjartan Maraas  <kmaraas@gnome.org>

	* configure.ac: Remove obsolete entry for no_NO.
	* po/no.po: And the translation.

2006-04-05  Behdad Esfahbod  <behdad@gnome.org>

	Approved by Fernando Herrera on IRC.

	* gnome-keyring-manager-attribute-editor.h:
	* gnome-keyring-manager-attribute-editor.c:
	* gnome-keyring-manager-new-item-dialog.h:
	* gnome-keyring-manager-new-item-dialog.c:
	* gnome-keyring-manager-password-dialog.h:
	* gnome-keyring-manager-password-dialog.c: Remove.  Not needed
	because of UI changes.

	* po/POTFILES.in: Remove above files.

2006-04-05  Behdad Esfahbod  <behdad@gnome.org>

	* configure.ac, Makefile.am: Get rid of m4 directory that does not
	exist. (bug #337310)

2006-04-03  Dan Williams  <dcbw@redhat.com>

  * src/gnome-keyring-manager-util.c
    - (gkm_get_application_path): implement for FreeBSD

2006-04-03  Dan Williams  <dcbw@redhat.com>

  * src/gnome-keyring-manager-acl-display.c
    - (gkm_acl_display_set_acl): deal with possibly NULL application path

2006-04-03  Dan Williams  <dcbw@redhat.com>

  * src/gnome-keyring-manager.c
    - (gkm_application_open_keyring_manager): Fix "unused result" error
      on return from g_slist_append()

2006-04-03  Dan Williams  <dcbw@redhat.com>

  Patch from Brent Smith <gnome@nextreality.net>  Bug #327946

  * Makefile.am, configure.ac, docs/gnome-keyring-manager.omf.in,
    docs/Makefile.am: updates for gnome-doc-utils

2006-04-03  Dan Williams  <dcbw@redhat.com>

  Patch from Matthias Clasen <mclasen@redhat.com>  Bug #317037

  * src/gnome-keyring-manager-keyring-editor.c
    - (gkm_keyring_editor_new): don't set edited keyring if not passed
      a keyring name

  * src/gnome-keyring-manager-main-ui.c
    - (gkm_main_ui_init): Don't open 'default' keyring, but defer setting
      the edited keyring until keyrings are loaded
    - (on_keyrings_model_row_changed): new function; if there is no currently
      edited keyring, use the first item in the keyring list
    - (gkm_main_ui_connect_glade_signals): connect keyring treeview
      row-changed signal

2006-04-03  Dan Williams  <dcbw@redhat.com>

  * data/gnome-keyring-manager.glade
    - Remove "invisible_char" items because they override the GTK default,
      which is now pretty, with ugly obfuscation characters

2006-04-03  Dan Williams  <dcbw@redhat.com>

  * src/gnome-keyring-manager-util.c
    - (gkm_show_about_dialog): don't use "GNOME" in about
      dialog title.  Bug #326273

2006-04-03  Dan Williams  <dcbw@redhat.com>

  Patch from Christian Persch <chpe@gnome.org>, bug #336497

  * src/gnome-keyring-manager-main-ui.c
    - (on_about_activate): call gkm_show_about_dialog instead

  * src/gnome-keyring-manager-util.c
    src/gnome-keyring-manager-util.h
    - (gkm_about_dialog_new): renamed to gkm_show_about_dialog
    - (gkm_show_about_dialog): use gtk_show_about_dialog() rather than
        gtk_about_dialog_new()

  * src/gnome-keyring-manager.c
    src/gnome-keyring-manager.h
    - (gkm_application_open_about_dialog): removed

2006-04-03  Dan Williams  <dcbw@redhat.com>

  Fix network attribute mishandling when a default attribute isn't present in
  the attribute list.  For example, if the attribute list had no 'port', but
  the user modified the 'port' in gnome-keyring-manager, the 'user' attribute
  would be set instead.

  * src/gnome-keyring-manager-attribute-display.c
    - (gkm_attribute_display_init, network_password_update_page,
       gkm_attribute_display_clear, on_attribute_entry_changed): Replace usage
        of "NUM_ENTRIES - 3" with NON_PASSWORD_ENTRIES_MAX
    - (gkm_attribute_display_init): initialize mappings to -1
    - (network_password_update_page): enable widgets for attributes that are
        present, and disable widgets for attributes that are not. Reset attribute
        to widget mapping when changing keyring entries, since not all entries
        have every default attribute.
    - (on_attribute_entry_changed): don't do anything for attributes which
        don't have a mapping, should we ever get here (widget should be disabled),
        and clean up function a bit

2006-04-03  Dan Williams  <dcbw@redhat.com>

  * data/gnome-keyring-manager.glade
    - Allow ports higher than 100.  Bug #336692

2006-04-03  Dan Williams  <dcbw@redhat.com>

  Patch from Christian Persch <chpe@gnome.org>

  * src/gnome-keyring-manager.c
    - (gkm_application_window_destroyed_callback): Fix "unused result" error
      on return from g_slist_remove()

2006-03-24  Tommi Vainikainen  <thv@iki.fi>

	* configure.ac (ALL_LINGUAS): Added Dzongkha (dz).

2006-03-21  Vladimer Sichinava  <vlsichinava@gmail.com>

        * configure.ac: Added "ka" (Georgian) to ALL_LINGUAS

4 files changed, 31 insertions, 33 deletions

diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index 1c04ca9ae78..0d2402c415b 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2006/08/28 09:03:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2006/09/15 15:24:16 jmmv Exp $
 #
 
-DISTNAME=	gnome-keyring-manager-2.14.0
-PKGREVISION=	2
+DISTNAME=	gnome-keyring-manager-2.16.0
 CATEGORIES=	security gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring-manager/2.14/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-keyring-manager/2.16/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -19,6 +18,8 @@ USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
 GCONF2_SCHEMAS=		gnome-keyring-manager.schemas
 
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
+
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
diff --git a/security/gnome-keyring-manager/PLIST b/security/gnome-keyring-manager/PLIST
index 19c33bf6f39..5dea003374f 100644
--- a/security/gnome-keyring-manager/PLIST
+++ b/security/gnome-keyring-manager/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/17 07:07:33 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/09/15 15:24:16 jmmv Exp $
 bin/gnome-keyring-manager
 man/man1/gnome-keyring-manager.1
 share/applications/gnome-keyring-manager.desktop
@@ -12,19 +12,24 @@ share/gnome-keyring-manager/stock_new-keyring.png
 share/gnome/help/gnome-keyring-manager/C/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/C/legal.xml
 share/gnome/help/gnome-keyring-manager/es/gnome-keyring-manager.xml
+share/gnome/help/gnome-keyring-manager/fr/gnome-keyring-manager.xml
+share/gnome/help/gnome-keyring-manager/sv/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/uk/gnome-keyring-manager.xml
 share/locale/bg/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/bn/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ca/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/cs/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/cy/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/da/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/de/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/dz/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/el/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/en_CA/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/en_GB/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/es/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/et/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/eu/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/fa/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/fi/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/fr/LC_MESSAGES/gnome-keyring-manager.mo
@@ -32,14 +37,23 @@ share/locale/gl/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/gu/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/hi/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/hu/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/id/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/it/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ja/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/ka/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ko/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/lt/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/lv/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/mg/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/mk/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/ml/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/mn/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/mr/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/nb/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ne/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/nl/LC_MESSAGES/gnome-keyring-manager.mo
-share/locale/no/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/nn/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/or/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/pa/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/pl/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/pt/LC_MESSAGES/gnome-keyring-manager.mo
@@ -48,10 +62,12 @@ share/locale/ro/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ru/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/rw/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sk/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/sl/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sq/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sr/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/sv/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/ta/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/th/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/tr/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/uk/LC_MESSAGES/gnome-keyring-manager.mo
@@ -61,10 +77,14 @@ share/locale/zh_HK/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo
 share/omf/gnome-keyring-manager/gnome-keyring-manager-C.omf
 share/omf/gnome-keyring-manager/gnome-keyring-manager-es.omf
+share/omf/gnome-keyring-manager/gnome-keyring-manager-fr.omf
+share/omf/gnome-keyring-manager/gnome-keyring-manager-sv.omf
 share/omf/gnome-keyring-manager/gnome-keyring-manager-uk.omf
 @dirrm share/omf/gnome-keyring-manager
 @comment in scrollkeeper: @dirrm share/omf
 @dirrm share/gnome/help/gnome-keyring-manager/uk
+@dirrm share/gnome/help/gnome-keyring-manager/sv
+@dirrm share/gnome/help/gnome-keyring-manager/fr
 @dirrm share/gnome/help/gnome-keyring-manager/es
 @dirrm share/gnome/help/gnome-keyring-manager/C
 @dirrm share/gnome/help/gnome-keyring-manager
diff --git a/security/gnome-keyring-manager/distinfo b/security/gnome-keyring-manager/distinfo
index ff9fbd86e88..85e64beaad0 100644
--- a/security/gnome-keyring-manager/distinfo
+++ b/security/gnome-keyring-manager/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2006/08/28 09:03:40 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2006/09/15 15:24:16 jmmv Exp $
 
-SHA1 (gnome-keyring-manager-2.14.0.tar.bz2) = 71e25d2184351954b9d8821b98ade8828d5259bf
-RMD160 (gnome-keyring-manager-2.14.0.tar.bz2) = 799ff976f816ac4aa1339280c0bac8f38e141307
-Size (gnome-keyring-manager-2.14.0.tar.bz2) = 391387 bytes
-SHA1 (patch-aa) = 9e944fc2100ed493447daacd739a5efe3d7f3c97
+SHA1 (gnome-keyring-manager-2.16.0.tar.bz2) = 400e50c2cdfabb846221b217aeb18774ac070d40
+RMD160 (gnome-keyring-manager-2.16.0.tar.bz2) = 30592dc2369e62e1248387a3cf25a673feb3a35a
+Size (gnome-keyring-manager-2.16.0.tar.bz2) = 454066 bytes
diff --git a/security/gnome-keyring-manager/patches/patch-aa b/security/gnome-keyring-manager/patches/patch-aa
deleted file mode 100644
index 2fb4c26d3ce..00000000000
--- a/security/gnome-keyring-manager/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/08/28 09:03:40 jmmv Exp $
-
---- src/gnome-keyring-manager-acl-display.c.orig	2005-04-24 20:40:43.000000000 +0200
-+++ src/gnome-keyring-manager-acl-display.c
-@@ -399,7 +399,7 @@ gkm_acl_display_set_acl (GKMAclDisplay *
-       path = gnome_keyring_item_ac_get_path_name (ac);
- 
-       /* We don't want to include ourself in the list. */
--      if (g_str_equal (path, gkm_get_application_path ()))
-+      if (path != NULL && g_str_equal (path, gkm_get_application_path ()))
- 	{
- 	  self->priv->gkm_ac = gnome_keyring_access_control_copy (ac);
- 	}
-@@ -410,7 +410,7 @@ gkm_acl_display_set_acl (GKMAclDisplay *
- 	  gtk_list_store_append (self->priv->acl_store, &iter);
- 	  gtk_list_store_set (self->priv->acl_store, &iter, 
- 			      AC_COLUMN_NAME, name,
--			      AC_COLUMN_PATH, path,
-+			      AC_COLUMN_PATH, path == NULL ? "Unavailable" : path,
- 			      AC_COLUMN_READ, (at & GNOME_KEYRING_ACCESS_READ),
- 			      AC_COLUMN_WRITE, (at & GNOME_KEYRING_ACCESS_WRITE),
- 			      AC_COLUMN_DELETE, (at & GNOME_KEYRING_ACCESS_REMOVE),