From 6646ea945da28aca7d183e540377f84a89109dff Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Sun, 2 Apr 2006 11:07:28 +0000
Subject: Fix some issues in gsm-dbus.c as reported by Vincent Untz in
 bugzilla. Bump PKGREVISION to 2.

---
 x11/gnome-session/Makefile         |  4 ++--
 x11/gnome-session/distinfo         |  4 ++--
 x11/gnome-session/patches/patch-ae | 23 +++++++++++++----------
 3 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'x11')

diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 61f4783cf9f..609a110734c 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.64 2006/04/01 17:36:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.65 2006/04/02 11:07:28 jmmv Exp $
 #
 
 DISTNAME=		gnome-session-2.14.0
-PKGREVISION=		1
+PKGREVISION=		2
 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/distinfo b/x11/gnome-session/distinfo
index b4819804710..5463c32c459 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2006/04/01 17:36:41 jmmv Exp $
+$NetBSD: distinfo,v 1.23 2006/04/02 11:07:28 jmmv Exp $
 
 SHA1 (gnome-session-2.14.0.tar.bz2) = 15e34ed8d59fcc10942626f366c2c0f7d42e7777
 RMD160 (gnome-session-2.14.0.tar.bz2) = 6082b9bd9ba84be849bcd365635e8f0733d4d6e3
@@ -10,4 +10,4 @@ SHA1 (patch-aa) = 3a7bac87c0031ea73bf313d3a2dcb983b83d7cbf
 SHA1 (patch-ab) = 7287c9f0a921f2dfe28373027a4f3564d58e5ac8
 SHA1 (patch-ac) = 76104795beb231f8fe69ad8eabe7821b2a6da716
 SHA1 (patch-ad) = 42aa7867f6b660e5eb4b59eb5d74a97a38078fe5
-SHA1 (patch-ae) = 77fac6d0a3cfbfa9929f65e3c0e2d6ae1b48342b
+SHA1 (patch-ae) = a1e2996e9c8ffa8afdc92e60172d9baee285e1a6
diff --git a/x11/gnome-session/patches/patch-ae b/x11/gnome-session/patches/patch-ae
index c23c1df3f50..5b159543c80 100644
--- a/x11/gnome-session/patches/patch-ae
+++ b/x11/gnome-session/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.3 2006/04/01 17:36:41 jmmv Exp $
+$NetBSD: patch-ae,v 1.4 2006/04/02 11:07:28 jmmv Exp $
 
 http://bugzilla.gnome.org/show_bug.cgi?id=336237
 
---- /dev/null	2006-04-01 19:01:40.000000000 +0200
-+++ gnome-session/gsm-dbus.c	2006-04-01 19:02:43.000000000 +0200
-@@ -0,0 +1,356 @@
+--- gnome-session/gsm-dbus.c.orig	2006-04-02 12:32:32.000000000 +0200
++++ gnome-session/gsm-dbus.c
+@@ -0,0 +1,359 @@
 +/* gsm-dbus.c - Handle the dbus-daemon process.
 + *
 + * Copyright (c) 2006 Julio M. Merino Vidal <jmmv@NetBSD.org>
@@ -74,7 +74,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=336237
 +  g_assert (dbus_daemon_pid == 0);
 +
 +  if (have_running_instance ())
-+    return TRUE;
++    return FALSE;
 +  if (! have_dbus_daemon ())
 +    return FALSE;
 +
@@ -155,14 +155,16 @@ http://bugzilla.gnome.org/show_bug.cgi?id=336237
 +static gboolean
 +have_dbus_daemon (void)
 +{
++  gboolean result;
 +  gchar *file_name;
 +
 +  file_name = g_find_program_in_path ("dbus-daemon");
 +  if (file_name == NULL)
 +    g_printerr ("Cannot locate dbus-daemon\n");
++  result = file_name != NULL;
 +  g_free (file_name);
 +
-+  return file_name != NULL;
++  return result;
 +}
 +
 +/*
@@ -213,16 +215,17 @@ http://bugzilla.gnome.org/show_bug.cgi?id=336237
 +      else
 +        done = TRUE;
 +
-+      for (i = 0; i < bytes; i++)
++      for (i = 0; !discard && i < bytes; i++)
 +        if (buf[i] == '\n')
-+          discard = TRUE;
++          {
++            buf[i] = '\0';
++            discard = TRUE;
++          }
 +    }
 +  while (!done);
 +
 +  g_assert (bytes >= 0 && bytes < bufsize);
 +  buf[bytes] = '\0';
-+  if (bytes > 0 && buf[bytes - 1] == '\n')
-+    buf[bytes - 1] = '\0';
 +
 +  return bytes;
 +}
-- 
cgit v1.2.3