From 4adcb1dd1c02c9085fe08301d86aeb0f00cff10c Mon Sep 17 00:00:00 2001 From: lokilee73 Date: Wed, 23 Nov 2016 20:27:27 +0900 Subject: [PATCH] merge 99588 Change-Id: I4008f170f67533525a6e1df593dd7db05468f554 Signed-off-by: lokilee73 --- data/tizen/etc/gumd/gumd-tizen-common.conf | 2 +- src/daemon/dbus/gumd-dbus-group-service-adapter.c | 6 +++--- src/daemon/dbus/gumd-dbus-server-msg-bus.c | 15 +++++++++++++++ src/daemon/dbus/gumd-dbus-user-service-adapter.c | 6 +++--- 4 files changed, 22 insertions(+), 7 deletions(-) mode change 100644 => 100755 data/tizen/etc/gumd/gumd-tizen-common.conf diff --git a/data/tizen/etc/gumd/gumd-tizen-common.conf b/data/tizen/etc/gumd/gumd-tizen-common.conf old mode 100644 new mode 100755 index 1fa0ffa..fd04d89 --- a/data/tizen/etc/gumd/gumd-tizen-common.conf +++ b/data/tizen/etc/gumd/gumd-tizen-common.conf @@ -15,7 +15,7 @@ USR_PRIMARY_GRPNAME=users # Comma separate listed of groups, which every user (other than system user) # will be added to at the time of user account creation. Default value is: # '' -DEFAULT_USR_GROUPS=video,display +DEFAULT_USR_GROUPS=audio,video,display # Comma separate listed of groups, which admin user will be added to at the # time of user account creation. Default value is: '' diff --git a/src/daemon/dbus/gumd-dbus-group-service-adapter.c b/src/daemon/dbus/gumd-dbus-group-service-adapter.c index 319ae4a..da95288 100755 --- a/src/daemon/dbus/gumd-dbus-group-service-adapter.c +++ b/src/daemon/dbus/gumd-dbus-group-service-adapter.c @@ -262,9 +262,9 @@ _dispose ( * Following code snippet at least closes the stream to avoid any * descriptors leak. * */ - GIOStream *stream = g_dbus_connection_get_stream ( - self->priv->connection); - if (stream) g_io_stream_close (stream, NULL, NULL); + //GIOStream *stream = g_dbus_connection_get_stream ( + // self->priv->connection); + //if (stream) g_io_stream_close (stream, NULL, NULL); g_object_unref (self->priv->connection); self->priv->connection = NULL; } diff --git a/src/daemon/dbus/gumd-dbus-server-msg-bus.c b/src/daemon/dbus/gumd-dbus-server-msg-bus.c index 0ba0e8f..f67d0c8 100755 --- a/src/daemon/dbus/gumd-dbus-server-msg-bus.c +++ b/src/daemon/dbus/gumd-dbus-server-msg-bus.c @@ -69,6 +69,7 @@ struct _GumdDbusServerMsgBusPrivate GumdDbusUserServiceAdapter *user_service; GumdDbusGroupServiceAdapter *group_service; guint name_owner_id; + GDBusConnection *connection; }; #define GUMD_DBUS_SERVER_MSG_BUS_GET_PRIV(obj) G_TYPE_INSTANCE_GET_PRIVATE ( \ @@ -145,6 +146,10 @@ _on_bus_acquired ( GumdDbusServerMsgBus *server = GUMD_DBUS_SERVER_MSG_BUS (user_data); DBG("Export user service interface"); + + server->priv->connection = connection; + g_object_ref(server->priv->connection); + server->priv->user_service = gumd_dbus_user_service_adapter_new_with_connection ( connection, @@ -313,6 +318,16 @@ _gumd_dbus_server_msg_bus_stop ( server->priv->user_service = NULL; } + if (server->priv->connection) { + GIOStream *stream = g_dbus_connection_get_stream (server->priv->connection); + if (stream) { + DBG("g_io_stream_close '%p'", stream); + g_io_stream_close (stream, NULL, NULL); + } + g_object_unref (server->priv->connection); + server->priv->connection = NULL; + } + if (server->priv->name_owner_id) { g_bus_unown_name (server->priv->name_owner_id); server->priv->name_owner_id = 0; diff --git a/src/daemon/dbus/gumd-dbus-user-service-adapter.c b/src/daemon/dbus/gumd-dbus-user-service-adapter.c index eb77333..7bfc5e9 100755 --- a/src/daemon/dbus/gumd-dbus-user-service-adapter.c +++ b/src/daemon/dbus/gumd-dbus-user-service-adapter.c @@ -268,9 +268,9 @@ _dispose ( * Following code snippet at least closes the stream to avoid any * descriptors leak. * */ - GIOStream *stream = g_dbus_connection_get_stream ( - self->priv->connection); - if (stream) g_io_stream_close (stream, NULL, NULL); + //GIOStream *stream = g_dbus_connection_get_stream ( + // self->priv->connection); + //i (stream) g_io_stream_close (stream, NULL, NULL); g_object_unref (self->priv->connection); self->priv->connection = NULL; } -- 2.7.4