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 977ec57915663e63bce9f2d3040c251c905b79a3..bc1ce40fc698b89e373cb1edc2c1e5b577db63a0 100755 (executable)
--- 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 dbf5d39a86053080db35ba1fc3960233d57e10ce..d1f3cb96e43c122a0fa685a6dd8dde5c2929782b 100755 (executable)
--- 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)  {