From owner-freebsd-gnome@FreeBSD.ORG  Sat Oct  2 13:46:47 2004
Return-Path: <owner-freebsd-gnome@FreeBSD.ORG>
Delivered-To: freebsd-gnome@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 44A1D16A4CE
	for <freebsd-gnome@FreeBSD.org>; Sat,  2 Oct 2004 13:46:47 +0000 (GMT)
Received: from sv02.webonaut.com (kirk.webonaut.com [212.41.243.26])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DD94243D45
	for <freebsd-gnome@FreeBSD.org>; Sat,  2 Oct 2004 13:46:46 +0000 (GMT)
	(envelope-from klammer@webonaut.com)
Received: from localhost (localhost [127.0.0.1])
	by sv02.webonaut.com (Postfix) with ESMTP id 4036076425
	for <freebsd-gnome@FreeBSD.org>;
	Sat,  2 Oct 2004 15:46:45 +0200 (CEST)
Received: from sv02.webonaut.com ([127.0.0.1])
 by localhost (sv02.webonaut.com [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 24168-10 for <freebsd-gnome@FreeBSD.org>;
 Sat,  2 Oct 2004 15:46:39 +0200 (CEST)
Received: from [192.168.0.9] (sisko.webonaut.com [212.41.243.28])
	by sv02.webonaut.com (Postfix) with ESMTP id 9456076423
	for <freebsd-gnome@FreeBSD.org>;
	Sat,  2 Oct 2004 15:46:39 +0200 (CEST)
Message-ID: <415EB142.4080604@webonaut.com>
Date: Sat, 02 Oct 2004 15:46:42 +0200
From: Franz Klammer <klammer@webonaut.com>
User-Agent: Mozilla Thunderbird 0.8 (X11/20041001)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: gnome <freebsd-gnome@FreeBSD.org>
Content-Type: multipart/mixed;
 boundary="------------090900000906070908090908"
X-Virus-Scanned: by amavisd-new at webonaut.com
Subject: gnomeapplet 2.8.0 the 2nd :: drivemout unable to eject cd-drives
X-BeenThere: freebsd-gnome@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: GNOME for FreeBSD -- porting and maintaining
	<freebsd-gnome.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gnome>
List-Post: <mailto:freebsd-gnome@freebsd.org>
List-Help: <mailto:freebsd-gnome-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Oct 2004 13:46:47 -0000

This is a multi-part message in MIME format.
--------------090900000906070908090908
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

drivemout didn't eject cd-drives. i looked a litte bit into the
code and made some changes to use cdcontrol instead of eject.

don't know if this is correct or what happends the drive is
not a cd-drive...

attached a patch.

franz.


--------------090900000906070908090908
Content-Type: text/plain;
 name="patch-drivemount_drivemount.c"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="patch-drivemount_drivemount.c"

--- drivemount/drivemount.c.orig	Sat Oct  2 17:24:52 2004
+++ drivemount/drivemount.c	Sat Oct  2 17:33:10 2004
@@ -254,7 +254,7 @@
 
 	component = panel_applet_get_popup_component (PANEL_APPLET (applet));
 
-	tmp_path = gnome_is_program_in_path ("eject");
+	tmp_path = gnome_is_program_in_path ("cdcontrol");
 	if (!tmp_path)
 		bonobo_ui_component_set_prop (component, "/commands/Eject",
 					      "hidden", "1", NULL);
@@ -966,20 +966,9 @@
 		return;
 	}
 
-	if (dd->mounted) {
-		command_line = g_strdup_printf ("eject -u '%s'", dn);
-		/* perhaps it doesn't like the -u option */
-		if (system (command_line) != 0) {
-			g_free (command_line);
-			command_line = g_strdup_printf ("eject '%s'", dn);
-			gnome_execute_shell (NULL, command_line);
-		}
-		g_free (command_line);
-	} else {
-		command_line = g_strdup_printf ("eject '%s'", dn);
-		gnome_execute_shell (NULL, command_line);
-		g_free (command_line);
-	}
+	command_line = g_strdup_printf ("cdcontrol -f %s Eject", dn);
+	gnome_execute_shell (NULL, command_line);
+	g_free (command_line);
 }
 
 static gboolean 

--------------090900000906070908090908--