Fix typo

Signed-off-by: saerome.kim <saerome.kim@samsung.com>

diff --git a/packaging/d2d-manager.spec b/packaging/d2d-manager.spec
index 7c26fae..ad5fc3e 100644 (file)
--- a/packaging/d2d-manager.spec
+++ b/packaging/d2d-manager.spec
@@ -72,9 +72,9 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 
 %cmake . \
     -DMAJORVER=${MAJORVER} -DFULLVER=%{version} \
-       -DLIB_DIR=%{_libdir} -DBIN_DIR=%{_bindir} -DSBIN_DIR=%{_sbindir} \
-       -DNETWORK_FW_DATADIR=%{NETWORK_FW_DATADIR} \
-       -DDBDIR=%{DBDIR}
+       -DLIB_DIR=%{_libdir} -DBIN_DIR=%{_bindir} -DSBIN_DIR=%{_sbindir} \
+       -DNETWORK_FW_DATADIR=%{NETWORK_FW_DATADIR} \
+       -DDBDIR=%{DBDIR}
 make %{?_smp_mflags}
 
 %install
@@ -101,7 +101,7 @@ cp test/oic_svr_db_client.dat oic_svr_db_subowner_client.dat
 %license LICENSE
 %defattr(-,root,root,-)
 %{_bindir}/%{name}
-%{_bindir}/subowner
+%{_bindir}/d2d-subowner
 %{_bindir}/fn-manager
 %attr(644,root,root) %{_datadir}/dbus-1/system-services/*
 %attr(644,root,root) %{_unitdir}/d2dm.service

diff --git a/src/d2d-manager/CMakeLists.txt b/src/d2d-manager/CMakeLists.txt
index 778664c..7baa27c 100644 (file)
--- a/src/d2d-manager/CMakeLists.txt
+++ b/src/d2d-manager/CMakeLists.txt
@@ -3,7 +3,6 @@ MESSAGE("Building...d2d-manager")
 MESSAGE("===================================================================")
 
 SET(INTROSPECTION_PATH ${CMAKE_CURRENT_SOURCE_DIR}/introspection)
-MESSAGE("KSR : ${INTROSPECTION_PATH}")
 ADD_CUSTOM_COMMAND(
        OUTPUT dbus
        COMMAND gdbus-codegen

diff --git a/src/d2d-manager/d2dm-gdbus.c b/src/d2d-manager/d2dm-gdbus.c
index f97dbe7..9c62d62 100644 (file)
--- a/src/d2d-manager/d2dm-gdbus.c
+++ b/src/d2d-manager/d2dm-gdbus.c
@@ -123,7 +123,7 @@ static void _on_unsubscribe_ids(gpointer data, gpointer user_data)
        g_dbus_connection_signal_unsubscribe((GDBusConnection *)service->connection, id);\r
 }\r
 \r
-static void _wmeshd_unsubscribe_event(d2dm_service *service)\r
+static void _d2dm_unsubscribe_event(d2dm_service *service)\r
 {\r
        d2dm_check_null_ret("service", service);\r
 \r
@@ -166,7 +166,7 @@ int d2dm_dbus_stop(d2dm_service *service)
                return D2DM_ERROR_INVALID_PARAMETER;\r
 \r
        /* Unsubscribe events */\r
-       _wmeshd_unsubscribe_event(service);\r
+       _d2dm_unsubscribe_event(service);\r
 \r
        g_cancellable_cancel(service->ca);\r
        g_object_unref(service->ca);\r

diff --git a/src/d2d-manager/d2dm-service-interface.c b/src/d2d-manager/d2dm-service-interface.c
index 9e03d06..5ab9280 100644 (file)
--- a/src/d2d-manager/d2dm-service-interface.c
+++ b/src/d2d-manager/d2dm-service-interface.c
@@ -214,7 +214,7 @@ static gboolean _d2dm_dbus_handle_enable(Enabler *object,
        enabler_complete_enable(object, invocation, ret);\r
        service->d2dm_activated = TRUE;\r
 \r
-       if (service->d2dp_activated) {\r
+       if (!service->d2dp_activated) {\r
                /* Enable d2d proxy */\r
        }\r
        service->d2dp_activated = TRUE;\r

diff --git a/src/d2d-manager/d2dm.c b/src/d2d-manager/d2dm.c
index 0b7d099..d021a7a 100644 (file)
--- a/src/d2d-manager/d2dm.c
+++ b/src/d2d-manager/d2dm.c
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
                D2DM_LOGE("Service interface init. failed!");
                goto END;
        }
-       /* Run mesh service */
+       /* Run d2d-manager service */
        ret = d2dm_service_run(service);
        if (G_UNLIKELY(FALSE == ret)) {
                D2DM_LOGE("Run service failed!");

diff --git a/src/d2d-manager/d2dm.h b/src/d2d-manager/d2dm.h
index 4a4abad..7136a84 100644 (file)
--- a/src/d2d-manager/d2dm.h
+++ b/src/d2d-manager/d2dm.h
@@ -23,7 +23,7 @@
 #include <gio/gio.h>\r
 #include <tizen.h>\r
 \r
-/**< Internal error code with mesh daemon. It should be matched with API side */\r
+/**< Internal error code with d2dm daemon. It should be matched with API side */\r
 typedef enum {\r
        D2DM_ERROR_NONE = 0, /**< Successful */\r
        D2DM_ERROR_IO_ERROR, /**< I/O error */\r
@@ -35,7 +35,7 @@ typedef enum {
        D2DM_ERROR_IN_PROGRESS /**< operation is in progress */\r
 } d2dm_error_e;\r
 \r
-/**< mesh service structure */\r
+/**< d2d-manager service structure */\r
 typedef struct _d2d_service {\r
        GMainLoop *main_loop; /**< Service main-loop */\r
        guint dbus_id; /**< D-Bus id */\r

diff --git a/src/subowner/CMakeLists.txt b/src/subowner/CMakeLists.txt
index dc27532..b636ca2 100644 (file)
--- a/src/subowner/CMakeLists.txt
+++ b/src/subowner/CMakeLists.txt
@@ -5,7 +5,7 @@ MESSAGE("===================================================================")
 MESSAGE(" - Set source folder") 
 FILE(GLOB SUBOWNER_SRCS *.c)
 
-SET(SUBOWNER "subowner")
+SET(SUBOWNER "d2d-subowner")
 ADD_EXECUTABLE(${SUBOWNER} ${SUBOWNER_SRCS}) 
 TARGET_LINK_LIBRARIES(${SUBOWNER} ${daemon_pkgs_LIBRARIES} pthread) 
 INSTALL(TARGETS ${SUBOWNER} DESTINATION bin)

diff --git a/src/subowner/introspection/.d2d-generated-code.h.swp b/src/subowner/introspection/.d2d-generated-code.h.swp
new file mode 100755 (executable)
index 0000000..d6676cb
Binary files /dev/null and b/src/subowner/introspection/.d2d-generated-code.h.swp differ

diff --git a/src/subowner/introspection/d2ds.xml b/src/subowner/introspection/d2ds.xml
new file mode 100755 (executable)
index 0000000..9184d21
--- /dev/null
+++ b/src/subowner/introspection/d2ds.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>\r
+\r
+<!DOCTYPE node PUBLIC\r
+       "-//freedesktop//DTD D-Bus Object Introspection 1.0//EN"\r
+       "http://standards.freedesktop.org/dbus/1.0/introspect.dtd">\r
+\r
+<node>\r
+       <interface name="net.d2dm">\r
+               <!-- Method definitions -->\r
+               <method name="find_peer">\r
+                       <arg type="i" name="result" direction="out"/>\r
+               </method>\r
+\r
+               <!-- Signal (D-Bus) definitions -->\r
+               <signal name="proxy_enabled">\r
+                       <arg type="i" name="result" direction="out"/>\r
+               </signal>\r
+               <signal name="find_peer_done">\r
+               </signal>\r
+       </interface>\r
+</node>\r

diff --git a/src/subowner/introspection/enabler.xml b/src/subowner/introspection/enabler.xml
new file mode 100755 (executable)
index 0000000..7eed59a
--- /dev/null
+++ b/src/subowner/introspection/enabler.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE node PUBLIC
+       "-//freedesktop//DTD D-Bus Object Introspection 1.0//EN"
+       "http://standards.freedesktop.org/dbus/1.0/introspect.dtd">
+
+<node>
+       <interface name="net.d2ds.enabler">
+               <!-- Method definitions -->
+               <method name="enable">
+                       <arg type="i" name="result" direction="out"/>
+               </method>
+               <method name="disable">
+                       <arg type="i" name="result" direction="out"/>
+               </method>
+       </interface>
+</node>

diff --git a/src/subowner/introspection/gen.sh b/src/subowner/introspection/gen.sh
new file mode 100755 (executable)
index 0000000..003d818
--- /dev/null
+++ b/src/subowner/introspection/gen.sh
@@ -0,0 +1,6 @@
+gdbus-codegen --interface-prefix net.d2ds. \
+        --generate-c-code d2ds-generated-code \
+        --c-generate-object-manager \
+        --generate-docbook generated-docs \
+        d2ds.xml \
+        enabler.xml