From 51a2d0999dca8d5782ad8575d28cd757aaa30c31 Mon Sep 17 00:00:00 2001
From: Curtis Gedak <gedakc@src.gnome.org>
Date: Sun, 27 Jul 2008 15:31:34 +0000
Subject: [PATCH] Added additional check for hald daemon if hal-lock exists

svn path=/trunk/; revision=874
---
 ChangeLog  | 5 +++++
 gparted.in | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ddbc42b2..ebcec788 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-27  Curtis Gedak  <gedakc@gmail.com>
+
+	* gparted.in: Added additional check for hald daemon if hal-lock exists
+	  - Closes GParted bug #543730
+
 2008-07-26  Curtis Gedak  <gedakc@gmail.com>
 
 	* configure.in: Removed full path from gksu
diff --git a/gparted.in b/gparted.in
index ab2d39a6..c61da3f5 100755
--- a/gparted.in
+++ b/gparted.in
@@ -19,8 +19,10 @@
 HAVE_HAL_LOCK=no
 for k in '' `echo "$PATH" | sed 's,:, ,g'`; do
 	if test -x "$k/hal-lock"; then
-		HAVE_HAL_LOCK=yes
-		break
+		if test "z`ps -e | grep hald`" != "z"; then
+			HAVE_HAL_LOCK=yes
+			break
+		fi
 	fi
 done