gnome-volume-manager r1366 - in trunk: . src

[fejj svn gnome org]

Author: fejj
Date: Sat Apr 26 15:41:13 2008
New Revision: 1366
URL: http://svn.gnome.org/viewvc/gnome-volume-manager?rev=1366&view=rev

Log:
2008-04-26  Jeffrey Stedfast  <fejj novell com>

	* src/manager.c (gvm_hal_init): *Sigh*. Disable Eject event
	handling as well. Nautilus is supposed to handle this now too.



Modified:
   trunk/ChangeLog
   trunk/src/manager.c

Modified: trunk/src/manager.c
==============================================================================
--- trunk/src/manager.c	(original)
+++ trunk/src/manager.c	Sat Apr 26 15:41:13 2008
@@ -3177,6 +3177,7 @@
 	}
 }
 
+#ifdef ENABLE_AUTOMOUNT
 static void
 gvm_device_eject (const char *udi)
 {
@@ -3274,6 +3275,7 @@
 	if (!strcmp (condition_name, "EjectPressed"))
 		gvm_device_eject (udi);
 }
+#endif /* ENABLE_AUTOMOUNT */
 
 static gboolean
 reinit_dbus (gpointer user_data GNUC_UNUSED)
@@ -3396,7 +3398,9 @@
 	libhal_ctx_set_device_new_capability (ctx, hal_device_new_capability);
 	libhal_ctx_set_device_lost_capability (ctx, hal_device_lost_capability);
 	libhal_ctx_set_device_property_modified (ctx, hal_property_modified);
+#ifdef ENABLE_AUTOMOUNT
 	libhal_ctx_set_device_condition (ctx, hal_device_condition);
+#endif
 	
 	dbus_error_init (&error);
 	if (!libhal_device_property_watch_all (ctx, &error)) {