From 1aa94106e7a4e59d94e3892a6067d9e9a9d5edaf Mon Sep 17 00:00:00 2001 From: Imran Zaman Date: Tue, 12 Nov 2013 11:58:08 +0200 Subject: [PATCH] exit daemon if idle for timeout specified by daemon timeout value --- src/daemon/dbus/gumd-dbus-group-service-adapter.c | 4 ++-- src/daemon/dbus/gumd-dbus-user-service-adapter.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/daemon/dbus/gumd-dbus-group-service-adapter.c b/src/daemon/dbus/gumd-dbus-group-service-adapter.c index 80dd5ef..c0bb6c1 100644 --- a/src/daemon/dbus/gumd-dbus-group-service-adapter.c +++ b/src/daemon/dbus/gumd-dbus-group-service-adapter.c @@ -657,8 +657,8 @@ gumd_dbus_group_service_adapter_new_with_connection ( DBG("(+) started group service interface '%p' at path '%s' on connection" " '%p'", adapter, GUM_GROUP_SERVICE_OBJECTPATH, bus_connection); - timeout = gumd_daemon_get_group_timeout (adapter->priv->daemon); - if (timeout) { + timeout = gumd_daemon_get_timeout (adapter->priv->daemon); + if (timeout && bus_type != GUMD_DBUS_SERVER_BUSTYPE_P2P) { gum_disposable_set_timeout (GUM_DISPOSABLE (adapter), timeout); } diff --git a/src/daemon/dbus/gumd-dbus-user-service-adapter.c b/src/daemon/dbus/gumd-dbus-user-service-adapter.c index 04c0315..4dc3728 100644 --- a/src/daemon/dbus/gumd-dbus-user-service-adapter.c +++ b/src/daemon/dbus/gumd-dbus-user-service-adapter.c @@ -657,8 +657,8 @@ gumd_dbus_user_service_adapter_new_with_connection ( DBG("(+) started user service interface '%p' at path '%s' on connection" " '%p'", adapter, GUM_USER_SERVICE_OBJECTPATH, bus_connection); - timeout = gumd_daemon_get_user_timeout (adapter->priv->daemon); - if (timeout) { + timeout = gumd_daemon_get_timeout (adapter->priv->daemon); + if (timeout && bus_type != GUMD_DBUS_SERVER_BUSTYPE_P2P) { gum_disposable_set_timeout (GUM_DISPOSABLE (adapter), timeout); } -- 2.7.4