From: Saurav Babu <saurav.babu@samsung.com>
Date: Fri, 12 Jan 2018 11:27:35 +0000 (+0530)
Subject: comp-manager: Fixed glib warnings
X-Git-Tag: submit/tizen/20190131.065036~226
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07758a94f5ed20d1f902f9b6e29a4db1122c17f4;p=platform%2Fcore%2Fapi%2Fmulti-device-group.git

comp-manager: Fixed glib warnings

Signed-off-by: Saurav Babu <saurav.babu@samsung.com>
---

diff --git a/src/companion-manager/src/comp_group.c b/src/companion-manager/src/comp_group.c
index 977ec57..bc1ce40 100755
--- a/src/companion-manager/src/comp_group.c
+++ b/src/companion-manager/src/comp_group.c
@@ -253,8 +253,6 @@ GVariant *comp_group_get_remote_mot_enabled_devices()
 							  g_variant_new_int32(device->ifindex));
 		g_variant_builder_add(&builder, "{sv}", "RouteData",
 							  g_variant_new_string(device->route_data));
-		g_variant_builder_add(&builder, "{sv}", "RemoteId",
-							  g_variant_new_string(device->remote_id));
 		g_variant_builder_add(&builder, "{sv}", "ConnType",
 							  g_variant_new_int32(device->conn_type));
 		g_variant_builder_add(&builder, "{sv}", "SecurePort",
diff --git a/src/companion-manager/src/comp_mot_agent.c b/src/companion-manager/src/comp_mot_agent.c
index dbf5d39..d1f3cb9 100755
--- a/src/companion-manager/src/comp_mot_agent.c
+++ b/src/companion-manager/src/comp_mot_agent.c
@@ -355,12 +355,17 @@ static gboolean __perform_mot(gpointer data)
 	uuid = comp_group_invite_get_uuid();
 	pin = comp_group_invite_get_pin();
 
+	if (uuid == NULL)
+		return FALSE;
+
 	LOG_DEBUG("Perform MOT uuid: %s pin: %s", uuid, pin);
 
 	ret = agent_mot_device(uuid, pin);
 
 	if (ret != COMP_ERROR_NONE)
 		comp_group_notify_group_invite(ret);
+
+	return FALSE;
 }
 
 static void _agent_signal_handler(GDBusConnection *connection,
@@ -408,7 +413,7 @@ static void _agent_signal_handler(GDBusConnection *connection,
 					LOG_DEBUG("adapter = %d", adapter);
 					device->adapter = adapter;
 				} else if (strcasecmp(key, "flags") == 0)  {
-					int flags = g_variant_get_uint32(val);
+					int flags = g_variant_get_int32(val);
 					LOG_DEBUG("flags = %d", flags);
 					device->flags = flags;
 				} else if (strcasecmp(key, "port") == 0)  {
@@ -420,7 +425,7 @@ static void _agent_signal_handler(GDBusConnection *connection,
 					LOG_DEBUG("addr = %s", addr);
 					device->addr = g_strdup(addr);
 				} else if (strcasecmp(key, "ifindex") == 0)  {
-					int ifindex = g_variant_get_uint32(val);
+					int ifindex = g_variant_get_int32(val);
 					LOG_DEBUG("ifindex = %d", ifindex);
 					device->ifindex = ifindex;
 				} else if (strcasecmp(key, "routeData") == 0)  {