From: Minje Ahn <minje.ahn@samsung.com>
Date: Mon, 9 May 2016 02:28:42 +0000 (+0900)
Subject: Fix for block device msg
X-Git-Tag: accepted/tizen/common/20160511.141743^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=adc490afb7069613cdcac694836402ef95e876f0;p=platform%2Fcore%2Fmultimedia%2Fmedia-server.git

Fix for block device msg

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

diff --git a/src/common/media-common-external-storage.c b/src/common/media-common-external-storage.c
index 1937742..b825f9a 100755
--- a/src/common/media-common-external-storage.c
+++ b/src/common/media-common-external-storage.c
@@ -50,23 +50,6 @@
 
 #define MMC_INFO_SIZE 256
 
-#define DEVICED_BUS_NAME       "org.tizen.system.deviced"
-#define DEVICED_OBJECT_PATH    "/Org/Tizen/System/DeviceD"
-#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"
-
-GDBusConnection *g_stg_bus;
-int g_stg_added_handler;
-
 static int __get_contents(const char *filename, char *buf)
 {
 	FILE *fp;
diff --git a/src/common/media-common-system.c b/src/common/media-common-system.c
index 4961c02..284ffbd 100755
--- a/src/common/media-common-system.c
+++ b/src/common/media-common-system.c
@@ -220,7 +220,7 @@ static int __ms_gdbus_method_sync(const char *dest, const char *path, const char
 	GVariant *reply_var = NULL;
 	GVariantIter *iter = NULL;
 	char *type_str = NULL;
-	int val_int[3] = {0, };
+	int val_int[5] = {0, };
 	char *val_str[7] = {NULL, };
 	gboolean val_bool = FALSE;
 
@@ -274,8 +274,8 @@ static int __ms_gdbus_method_sync(const char *dest, const char *path, const char
 
 	g_variant_get(reply_var, type_str, &iter);
 
-	while (g_variant_iter_loop(iter, "(issssssisib)", &val_int[0], &val_str[0], &val_str[1], &val_str[2]
-		, &val_str[3], &val_str[4], &val_str[5], &val_int[1], &val_str[6], &val_int[2], &val_bool)) {
+	while (g_variant_iter_loop(iter, "(issssssisibii)", &val_int[0], &val_str[0], &val_str[1], &val_str[2]
+		, &val_str[3], &val_str[4], &val_str[5], &val_int[1], &val_str[6], &val_int[2], &val_bool, &val_int[3], &val_int[4])) {
 		result++;
 		int i = 0;
 		ms_block_info_s *data = NULL;
@@ -304,6 +304,8 @@ static int __ms_gdbus_method_sync(const char *dest, const char *path, const char
 		MS_DBG("\tmount point(%s)", val_str[6]);
 		MS_DBG("\tstate(%d)", val_int[2]);
 		MS_DBG("\tprimary(%s)", val_bool ? "true" : "false");
+		MS_DBG("\tflags(%d)", val_int[3]);
+		MS_DBG("\tstorage_id(%d)", val_int[4]);
 
 		for (i = 0; i < 7; i++) {
 			MS_SAFE_FREE(val_str[i]);