summaryrefslogtreecommitdiff
path: root/obexd/src
diff options
context:
space:
mode:
authorDoHyun Pyun <dh79.pyun@samsung.com>2016-11-21 14:46:12 +0900
committerDoHyun Pyun <dh79.pyun@samsung.com>2016-11-21 14:50:03 +0900
commit0e0b585723c8be6287d729fa300a58fe59c25611 (patch)
treee9f4031f2019a937fa2191f2b5b98108a5cbb22d /obexd/src
parent73983ce4a89dfd73b929364e729e960b3d3bea9d (diff)
downloadbluez-0e0b585723c8be6287d729fa300a58fe59c25611.tar.gz
bluez-0e0b585723c8be6287d729fa300a58fe59c25611.tar.bz2
bluez-0e0b585723c8be6287d729fa300a58fe59c25611.zip
Change-Id: Id474f0db7668bbc4a0d8a4cdafa77fbd4b941a3c Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
Diffstat (limited to 'obexd/src')
-rwxr-xr-xobexd/src/main.c2
-rwxr-xr-xobexd/src/manager.c8
-rw-r--r--obexd/src/obex.c4
-rwxr-xr-xobexd/src/obexd.h2
4 files changed, 8 insertions, 8 deletions
diff --git a/obexd/src/main.c b/obexd/src/main.c
index 00644c94..e2df4eff 100755
--- a/obexd/src/main.c
+++ b/obexd/src/main.c
@@ -179,7 +179,7 @@ static GOptionEntry options[] = {
{ NULL },
};
-#ifdef __TIZEN_PATCH__
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
void obex_option_set_root_folder(const char *root)
{
g_free(option_root);
diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index 9fbac6f6..90c51147 100755
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -190,7 +190,7 @@ static DBusMessage *unregister_agent(DBusConnection *conn,
return dbus_message_new_method_return(msg);
}
-#ifdef __TIZEN_PATCH__
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
static DBusMessage *set_root(DBusConnection *conn, DBusMessage *msg,
const char *root, void *data)
{
@@ -486,7 +486,7 @@ static gboolean transfer_get_filename(const GDBusPropertyTable *property,
return TRUE;
}
-#ifdef __TIZEN_PATCH__
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
static gboolean transfer_operation_exists(const GDBusPropertyTable *property,
void *data)
{
@@ -576,7 +576,7 @@ static const GDBusMethodTable manager_methods[] = {
GDBUS_ARGS({ "agent", "o" }), NULL, register_agent) },
{ GDBUS_METHOD("UnregisterAgent",
GDBUS_ARGS({ "agent", "o" }), NULL, unregister_agent) },
-#ifdef __TIZEN_PATCH__
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
{ GDBUS_METHOD("SetProperty",
GDBUS_ARGS({ "property", "sv" }), NULL, set_property) },
#endif
@@ -597,7 +597,7 @@ static const GDBusPropertyTable transfer_properties[] = {
{ "Time", "t", transfer_get_time, NULL, transfer_time_exists },
{ "Filename", "s", transfer_get_filename, NULL,
transfer_filename_exists },
-#ifdef __TIZEN_PATCH__
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
{ "Operation", "s", transfer_get_operation, NULL,
transfer_operation_exists },
{ "Address", "s", transfer_get_address, NULL,
diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index 580b12ef..fee2461b 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -642,7 +642,7 @@ static void parse_name(struct obex_session *os, GObexPacket *req)
if (!g_obex_header_get_unicode(hdr, &name))
return;
-#ifdef __TIZEN_PATCH__
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
DBG("Obex Session For: %s", os->service->name);
if (name && g_strcmp0(os->service->name, "Object Push server") == 0) {
char *new_name;
@@ -783,7 +783,7 @@ int obex_put_stream_start(struct obex_session *os, const char *filename)
int err;
os->object = os->driver->open(filename, O_WRONLY | O_CREAT | O_TRUNC,
-#ifdef __TIZEN_PATCH__
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
0644, os->service_data,
#else
0600, os->service_data,
diff --git a/obexd/src/obexd.h b/obexd/src/obexd.h
index 41f28d65..ddf5ba03 100755
--- a/obexd/src/obexd.h
+++ b/obexd/src/obexd.h
@@ -41,6 +41,6 @@ gboolean obex_option_auto_accept(void);
const char *obex_option_root_folder(void);
gboolean obex_option_symlinks(void);
const char *obex_option_capability(void);
-#ifdef __TIZEN_PATCH__
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
void obex_option_set_root_folder(const char *root);
#endif