Modify some code about deviced signal

Change-Id: I374b2a8f1ab4f971d701d6ccfccbf1bf6c498e6a
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index ca2ef02..25c9839 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.2.102
+Version:    0.2.103
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/common/media-common-system.c b/src/common/media-common-system.c
index 2b67ce5..c2b87c9 100755 (executable)
--- a/src/common/media-common-system.c
+++ b/src/common/media-common-system.c
@@ -44,13 +44,8 @@
 #define DEVICED_INTERFACE_NAME DEVICED_BUS_NAME
 
 #define DEVICED_PATH_BLOCK                  DEVICED_OBJECT_PATH"/Block"
-#define DEVICED_PATH_BLOCK_DEVICES          DEVICED_PATH_BLOCK"/Devices"
 #define DEVICED_PATH_BLOCK_MANAGER          DEVICED_PATH_BLOCK"/Manager"
-#define DEVICED_INTERFACE_BLOCK             DEVICED_INTERFACE_NAME".Block"
 #define DEVICED_INTERFACE_BLOCK_MANAGER     DEVICED_INTERFACE_NAME".BlockManager"
-
-#define BLOCK_OBJECT_ADDED      "ObjectAdded"
-#define BLOCK_OBJECT_REMOVED    "ObjectRemoved"
 #define BLOCK_DEVICE_CHANGED    "DeviceChanged"
 
 #define BLOCK_DEVICE_METHOD "GetDeviceList"
@@ -161,7 +156,7 @@ static int __ms_sys_subscribe_device_block_event(block_changed_cb usr_callback,
        g_usb_handler = g_dbus_connection_signal_subscribe(
                                        g_usb_bus,
                                        NULL,
-                                       DEVICED_INTERFACE_BLOCK,
+                                       DEVICED_INTERFACE_BLOCK_MANAGER,
                                        BLOCK_DEVICE_CHANGED,
                                        NULL,
                                        NULL,

diff --git a/src/mediadb-update.c b/src/mediadb-update.c
index 1edb45d..625c27b 100755 (executable)
--- a/src/mediadb-update.c
+++ b/src/mediadb-update.c
@@ -43,9 +43,7 @@
 #define DBUS_REPLY_TIMEOUT (-1)
 
 #define PATH_BLOCK                  OBJECT_PATH"/Block"
-#define PATH_BLOCK_DEVICES          PATH_BLOCK"/Devices"
 #define PATH_BLOCK_MANAGER          PATH_BLOCK"/Manager"
-#define INTERFACE_BLOCK             INTERFACE_NAME".Block"
 #define INTERFACE_BLOCK_MANAGER     INTERFACE_NAME".BlockManager"
 
 #define DEVICE_METHOD "GetDeviceList"