remove old HAL remnants

1 files changed, 1 insertions, 37 deletions

diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
index 4abcd2b..fa8d9e9 100644
--- a/src/gs-listener-dbus.c
+++ b/src/gs-listener-dbus.c
@@ -56,8 +56,6 @@ static DBusHandlerResult gs_listener_message_handler    (DBusConnection  *connec
 #define GS_LISTENER_PATH      "/org/mate/ScreenSaver"
 #define GS_LISTENER_INTERFACE "org.mate.ScreenSaver"
 
-#define HAL_DEVICE_INTERFACE "org.freedesktop.Hal.Device"
-
 /* systemd logind */
 #define SYSTEMD_LOGIND_SERVICE   "org.freedesktop.login1"
 #define SYSTEMD_LOGIND_PATH      "/org/freedesktop/login1"
@@ -1770,36 +1768,7 @@ listener_dbus_handle_system_message (DBusConnection *connection,
 
 #ifdef WITH_CONSOLE_KIT
 
-	if (dbus_message_is_signal (message, HAL_DEVICE_INTERFACE, "Condition"))
-	{
-		DBusError   error;
-		const char *event;
-		const char *keyname;
-
-		dbus_error_init (&error);
-		if (dbus_message_get_args (message, &error,
-		                           DBUS_TYPE_STRING, &event,
-		                           DBUS_TYPE_STRING, &keyname,
-		                           DBUS_TYPE_INVALID))
-		{
-			if ((event && strcmp (event, "ButtonPressed") == 0) &&
-			        (keyname && strcmp (keyname, "coffee") == 0))
-			{
-				gs_debug ("Coffee key was pressed - locking");
-				g_signal_emit (listener, signals [LOCK], 0);
-			}
-		}
-
-		if (dbus_error_is_set (&error))
-		{
-			dbus_error_free (&error);
-		}
-
-		return DBUS_HANDLER_RESULT_HANDLED;
-	}
-
-
-	else if (dbus_message_is_signal (message, CK_SESSION_INTERFACE, "Unlock"))
+	if (dbus_message_is_signal (message, CK_SESSION_INTERFACE, "Unlock"))
 	{
 		if (_listener_message_path_is_our_session (listener, message))
 		{
@@ -2388,11 +2357,6 @@ gs_listener_acquire (GSListener *listener,
 #ifdef WITH_CONSOLE_KIT
 		dbus_bus_add_match (listener->priv->system_connection,
 		                    "type='signal'"
-		                    ",interface='"HAL_DEVICE_INTERFACE"'"
-		                    ",member='Condition'",
-		                    NULL);
-		dbus_bus_add_match (listener->priv->system_connection,
-		                    "type='signal'"
 		                    ",interface='"CK_SESSION_INTERFACE"'"
 		                    ",member='Unlock'",
 		                    NULL);