update to 2.14.1

changes:
-Share one GConfClient
-Plug leaks
-translation updates

4 files changed, 18 insertions, 19 deletions

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 87dc1de82b9..3bde2d9e951 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2006/04/17 13:46:53 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2006/05/03 11:21:26 drochner Exp $
 #
 
-DISTNAME=		gnome-session-2.14.0
-PKGREVISION=		3
+DISTNAME=		gnome-session-2.14.1
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.14/}
 SITES_gnome-splash-2.14.0.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
diff --git a/x11/gnome-session/PLIST b/x11/gnome-session/PLIST
index a1ccaf1dc25..db4488d37db 100644
--- a/x11/gnome-session/PLIST
+++ b/x11/gnome-session/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/04/17 07:07:39 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/05/03 11:21:26 drochner Exp $
 bin/gnome-session
 bin/gnome-session-properties
 bin/gnome-session-remove
@@ -26,6 +26,7 @@ share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/dz/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/en_CA/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/en_GB/LC_MESSAGES/gnome-session-2.0.mo
@@ -48,6 +49,7 @@ share/locale/id/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/is/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/ka/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/kn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ku/LC_MESSAGES/gnome-session-2.0.mo
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 5463c32c459..62ec578d934 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.23 2006/04/02 11:07:28 jmmv Exp $
+$NetBSD: distinfo,v 1.24 2006/05/03 11:21:26 drochner Exp $
 
-SHA1 (gnome-session-2.14.0.tar.bz2) = 15e34ed8d59fcc10942626f366c2c0f7d42e7777
-RMD160 (gnome-session-2.14.0.tar.bz2) = 6082b9bd9ba84be849bcd365635e8f0733d4d6e3
-Size (gnome-session-2.14.0.tar.bz2) = 652379 bytes
+SHA1 (gnome-session-2.14.1.tar.bz2) = aaa7dea61d4f781871695fae6a86fde83b2a339c
+RMD160 (gnome-session-2.14.1.tar.bz2) = cad4029a978ed64408857707da5fef1a572e082e
+Size (gnome-session-2.14.1.tar.bz2) = 655320 bytes
 SHA1 (gnome-splash-2.14.0.png) = 7f03b85043b12b7f884973ac6ad170d0af7331a3
 RMD160 (gnome-splash-2.14.0.png) = 9421569fa918654492e639990f896d49af3bb44a
 Size (gnome-splash-2.14.0.png) = 38545 bytes
 SHA1 (patch-aa) = 3a7bac87c0031ea73bf313d3a2dcb983b83d7cbf
 SHA1 (patch-ab) = 7287c9f0a921f2dfe28373027a4f3564d58e5ac8
-SHA1 (patch-ac) = 76104795beb231f8fe69ad8eabe7821b2a6da716
+SHA1 (patch-ac) = 3501f6edf0c0e41494cea1908808f1ed64443f5e
 SHA1 (patch-ad) = 42aa7867f6b660e5eb4b59eb5d74a97a38078fe5
 SHA1 (patch-ae) = a1e2996e9c8ffa8afdc92e60172d9baee285e1a6
diff --git a/x11/gnome-session/patches/patch-ac b/x11/gnome-session/patches/patch-ac
index 6633a956c50..2d038f2fd81 100644
--- a/x11/gnome-session/patches/patch-ac
+++ b/x11/gnome-session/patches/patch-ac
@@ -1,8 +1,6 @@
-$NetBSD: patch-ac,v 1.6 2006/04/01 17:36:41 jmmv Exp $
+$NetBSD: patch-ac,v 1.7 2006/05/03 11:21:26 drochner Exp $
 
-http://bugzilla.gnome.org/show_bug.cgi?id=336237
-
---- gnome-session/main.c.orig	2006-03-06 14:30:08.000000000 +0100
+--- gnome-session/main.c.orig	2006-03-21 18:37:40.000000000 +0100
 +++ gnome-session/main.c
 @@ -43,6 +43,7 @@
  #include "command.h"
@@ -13,9 +11,9 @@ http://bugzilla.gnome.org/show_bug.cgi?id=336237
  #include "gsm-gsd.h"
  #include "gsm-keyring.h"
 @@ -334,6 +335,7 @@ main (int argc, char *argv[])
-   int status;
    char *display_str;
    char **versions;
+   GConfClient *gconf_client;
 +  gboolean dbus_daemon_owner;
    
    if (getenv ("GSM_VERBOSE_DEBUG"))
@@ -28,13 +26,13 @@ http://bugzilla.gnome.org/show_bug.cgi?id=336237
  
    /* Make sure children see the right value for DISPLAY.  This is
       useful if --display was specified on the command line.  */
-@@ -497,6 +500,9 @@ main (int argc, char *argv[])
-   gsm_sound_logout ();
+@@ -496,6 +499,9 @@ main (int argc, char *argv[])
  
    gsm_keyring_daemon_stop ();
-+
+ 
 +  if (dbus_daemon_owner)
-+    gsm_dbus_daemon_stop ();
-   
++	gsm_dbus_daemon_stop ();
++
+   g_object_unref (gconf_client);
    gsm_shutdown_gconfd ();