aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--binding/bluetooth-util.c15
-rw-r--r--conf.d/cmake/config.cmake1
-rw-r--r--conf.d/wgt/config.xml.in4
-rw-r--r--test/CMakeLists.txt2
4 files changed, 15 insertions, 7 deletions
diff --git a/binding/bluetooth-util.c b/binding/bluetooth-util.c
index f07e5ed..8a50731 100644
--- a/binding/bluetooth-util.c
+++ b/binding/bluetooth-util.c
@@ -68,7 +68,8 @@ int str2boolean(const char *value)
json_object *json_object_copy(json_object *jval)
{
json_object *jobj;
- int i, len;
+ size_t len;
+ int i;
/* handle NULL */
if (!jval)
@@ -166,7 +167,7 @@ json_object *simple_gvariant_to_json(GVariant *var, json_object *parent,
break;
case G_VARIANT_CLASS_INT64:
i64 = g_variant_get_int64(var);
- if (i64 >= -(1L << 31) && i64 < (1L << 31))
+ if (i64 >= -(1LL << 31) && i64 < (1LL << 31))
obj = json_object_new_int((int)i64);
else
obj = json_object_new_int64(i64);
@@ -287,7 +288,7 @@ json_object *simple_gvariant_to_json(GVariant *var, json_object *parent,
g_variant_iter_init(&iter, var);
nitems = g_variant_iter_n_children(&iter);
if (nitems != 1) {
- AFB_WARNING("Can't handle variants with more than one children (%lu)", nitems);
+ AFB_WARNING("Can't handle variants with more than one children (%zu)", nitems);
break;
}
@@ -682,7 +683,8 @@ GVariant *property_json_to_gvariant(
double d;
const char *jvalstr, *str;
char c;
- int i, len;
+ size_t len;
+ int i;
gboolean is_config;
if (!fmt)
@@ -922,7 +924,8 @@ GVariant *property_json_to_gvariant(
json_object *get_property_collect(json_object *jreqprop, json_object *jprop,
GError **error)
{
- int i, len;
+ size_t len;
+ int i;
json_object *jkey, *jval, *jobj = NULL, *jobjval;
const char *key;
@@ -1067,7 +1070,7 @@ gchar *return_bluez_path(afb_req_t request) {
gchar **json_array_to_strv(json_object *jobj)
{
- int len = json_object_array_length(jobj);
+ size_t len = json_object_array_length(jobj);
gchar **val = g_malloc0(sizeof(gchar *) * (len + 1));
int i;
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 0b9515b..86d6ca9 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -22,6 +22,7 @@ set(PROJECT_NAME agl-service-bluetooth)
set(PROJECT_VERSION "2.0")
set(PROJECT_PRETTY_NAME "Bluetooth-Manager service")
set(PROJECT_DESCRIPTION "Interface BlueZ through AGL Framework service")
+set(PROJECT_URL "https://gerrit.automotivelinux.org/gerrit/admin/repos/apps/agl-service-bluetooth")
set(PROJECT_ICON "icon.png")
set(PROJECT_AUTHOR "Matt Ranostay")
set(PROJECT_AUTHOR_MAIL "matt.ranostay@konsulko.com")
diff --git a/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in
index 4814329..aa1f563 100644
--- a/conf.d/wgt/config.xml.in
+++ b/conf.d/wgt/config.xml.in
@@ -11,6 +11,7 @@
<param name="urn:AGL:permission::public:hidden" value="required" />
<param name="urn:AGL:permission::public:no-htdocs" value="required" />
<param name="urn:AGL:permission::system:run-by-default" value="required" />
+ <param name="urn:AGL:permission::partner:scope-platform" value="required" />
<param name="http://tizen.org/privilege/internal/dbus" value="required" />
</feature>
@@ -21,6 +22,9 @@
<feature name="urn:AGL:widget:required-api">
<param name="persistence" value="ws" />
<param name="network-manager" value="ws" />
+ </feature>
+
+ <feature name="urn:AGL:widget:required-binding">
<param name="@WIDGET_ENTRY_POINT@" value="local" />
</feature>
</widget>
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 75bcf58..424f2b7 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -23,6 +23,6 @@ PROJECT_SUBDIRS_ADD(${PROJECT_SRC_DIR_PATTERN})
ADD_TEST(NAME AGL_SERVICE_GPS_TESTS
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMAND afb-test.sh "${CMAKE_BINARY_DIR}/package" "${CMAKE_BINARY_DIR}/package-test" SERVICE
+ COMMAND afm-test ${CMAKE_BINARY_DIR}/package ${CMAKE_BINARY_DIR}/package-test
)