summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDoHyun Pyun <dh79.pyun@samsung.com>2018-04-02 18:57:53 +0900
committerDoHyun Pyun <dh79.pyun@samsung.com>2018-04-02 18:57:53 +0900
commit9f879ae7e184e2de8c94902f9b60bbf3eb436ca1 (patch)
tree10e4660f1828d9b334e60fbc797f8f18db787425 /src
parente3f424e3dbf8df1e567f200e7eeca8c0a43184cc (diff)
downloadserial-tizen_5.5.tar.gz
serial-tizen_5.5.tar.bz2
serial-tizen_5.5.zip
Remove dbus-glib-1 dependencyHEADtizen_9.0_m2_releasetizen_8.0_m2_releasetizen_7.0_m2_releasetizen_6.5.m2_releasetizen_6.0.m2_releasetizen_5.5.m2_releasesubmit/tizen_6.5/20211028.161801submit/tizen_6.0_hotfix/20201103.114802submit/tizen_6.0_hotfix/20201102.192502submit/tizen_6.0/20201029.205102submit/tizen_5.5_wearable_hotfix/20201026.184302submit/tizen_5.5_mobile_hotfix/20201026.185102submit/tizen_5.5/20191031.000002submit/tizen_5.0/20181101.000002submit/tizen/20180502.042150accepted/tizen/unified/20180502.071112accepted/tizen/9.0/unified/20241030.231836accepted/tizen/8.0/unified/20231005.092841accepted/tizen/7.0/unified/hotfix/20221116.104826accepted/tizen/7.0/unified/20221110.060148accepted/tizen/6.5/unified/20211028.100156accepted/tizen/6.0/unified/hotfix/20201103.050717accepted/tizen/6.0/unified/hotfix/20201103.004158accepted/tizen/6.0/unified/20201030.121916accepted/tizen/5.5/unified/wearable/hotfix/20201027.120648accepted/tizen/5.5/unified/mobile/hotfix/20201027.065132accepted/tizen/5.5/unified/20191031.030440accepted/tizen/5.0/unified/20181102.013852tizen_9.0tizen_8.0tizen_7.0_hotfixtizen_7.0tizen_6.5tizen_6.0_hotfixtizen_6.0tizen_5.5_wearable_hotfixtizen_5.5_tvtizen_5.5_mobile_hotfixtizen_5.5tizen_5.0tizenaccepted/tizen_unifiedaccepted/tizen_9.0_unifiedaccepted/tizen_8.0_unifiedaccepted/tizen_7.0_unified_hotfixaccepted/tizen_7.0_unifiedaccepted/tizen_6.5_unifiedaccepted/tizen_6.0_unified_hotfixaccepted/tizen_6.0_unifiedaccepted/tizen_5.5_unified_wearable_hotfixaccepted/tizen_5.5_unified_mobile_hotfixaccepted/tizen_5.5_unifiedaccepted/tizen_5.0_unified
Change-Id: I5bbbe316ca6bdf004f6402dbd62e761f0c295b71 Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
Diffstat (limited to 'src')
-rw-r--r--src/serial.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/serial.c b/src/serial.c
index 1772bcc..7c5d783 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -21,8 +21,6 @@
#include <stdio.h>
#include <stdbool.h>
#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
#include <unistd.h>
#include <sys/un.h>
#include <sys/socket.h>
@@ -231,7 +229,6 @@ int serial_create(serial_h * serial)
{
DBG("%s\n", __FUNCTION__);
- GError *error = NULL;
DBusError dbus_error;
serial_s *pHandle = NULL;
@@ -245,14 +242,12 @@ int serial_create(serial_h * serial)
g_type_init();
#endif
- pHandle->client_bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
- if (error) {
- ERR("Couldn't connect to the System bus[%s]", error->message);
- g_error_free(error);
+ dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
+ if (!dbus_connection) {
+ ERR("Couldn't connect to the System bus");
g_free(pHandle);
return SERIAL_ERROR_OPERATION_FAILED;
}
- dbus_connection = dbus_g_connection_get_connection(pHandle->client_bus);
/* Add the filter for network client functions */
dbus_error_init(&dbus_error);
@@ -265,6 +260,8 @@ int serial_create(serial_h * serial)
return SERIAL_ERROR_OPERATION_FAILED;
}
+ pHandle->client_bus = dbus_connection;
+
*serial = (serial_h) pHandle;
return SERIAL_ERROR_NONE;
@@ -322,7 +319,7 @@ int serial_destroy(serial_h serial)
}
if (pHandle->client_bus != NULL) {
- dbus_g_connection_unref(pHandle->client_bus);
+ dbus_connection_unref(pHandle->client_bus);
pHandle->client_bus = NULL;
}