block: Remove duplicated 'DeviceChanged2' dbus signal

- No one subscribes to the 'DeviceChanged2' signal.

- All data of the 'DeviceChanged2' signal is contained in
'DeviceChange' signal data.

Change-Id: I48e6ef3e8423ce856730d2c26087581cc4b384a8
Signed-off-by: Yunmi Ha <yunmi.ha@samsung.com>

diff --git a/src/block/block.c b/src/block/block.c
index 879fdf6..9f0463c 100644 (file)
--- a/src/block/block.c
+++ b/src/block/block.c
@@ -85,7 +85,6 @@
 #define BLOCK_DEVICE_REMOVED    "DeviceRemoved"
 #define BLOCK_DEVICE_BLOCKED    "DeviceBlocked"
 #define BLOCK_DEVICE_CHANGED    "DeviceChanged"
-#define BLOCK_DEVICE_CHANGED_2  "DeviceChanged2"
 
 #define BLOCK_TYPE_MMC          "mmc"
 #define BLOCK_TYPE_SCSI         "scsi"
@@ -236,7 +235,6 @@ static void terminate_threads(void);
 
 #define nullstr(x) (x ? x : "")
 static GVariant *block_data_to_gvariant(struct block_data *data, int flags);
-static GVariant *block_data_to_gvariant2(struct block_data *data, int flags);
 
 #define block_send_dbus_reply(invocation, result) if (invocation) {g_dbus_method_invocation_return_value(invocation, g_variant_new("(i)", result)); }
 
@@ -472,23 +470,6 @@ static void broadcast_device_changed(struct block_device *bdev,
                                param);
        if (ret < 0)
                _E("Failed to broadcast device changed signal. op(%d)", op);
-
-       /* broadcast one more signal for mount, unmount, format */
-       switch(op) {
-       case BLOCK_DEV_MOUNT:
-       case BLOCK_DEV_UNMOUNT:
-       case BLOCK_DEV_FORMAT:
-               ret = dbus_handle_emit_dbus_signal(NULL,
-                                       STORAGED_PATH_BLOCK_MANAGER,
-                                       STORAGED_INTERFACE_BLOCK_MANAGER,
-                                       BLOCK_DEVICE_CHANGED_2,
-                                       block_data_to_gvariant2(data, flags));
-               if (ret < 0)
-                       _E("Failed to broadcast device changed signal. op(%d)", op);
-       default:
-               /* do nothing */
-               break;
-       }
 }
 
 static int get_mmc_mount_node(char *devnode, char *node, size_t len)
@@ -3185,27 +3166,6 @@ static GVariant *block_data_to_gvariant(struct block_data *data, int flags)
                        data->id);
 }
 
-static GVariant *block_data_to_gvariant2(struct block_data *data, int flags)
-{
-       if (!data)
-               return dbus_handle_new_g_variant_tuple();
-
-       return g_variant_new("(issssssisibi)",
-                       data->block_type,
-                       nullstr(data->devnode),
-                       nullstr(data->syspath),
-                       nullstr(data->fs_usage),
-                       nullstr(data->fs_type),
-                       nullstr(data->fs_version),
-                       nullstr(data->fs_uuid_enc),
-                       data->readonly,
-                       nullstr(data->mount_point),
-                       data->state,
-                       data->primary,
-                       flags >= 0 ? flags : data->flags);
-}
-
-
 //static int add_device_to_struct_iter(struct block_data *data, DBusMessageIter *iter)
 //{
 //     //DBusMessageIter piter;