Remove storage account

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

diff --git a/include/media_info_private.h b/include/media_info_private.h
index 066acf4..af46848 100755 (executable)
--- a/include/media_info_private.h
+++ b/include/media_info_private.h
@@ -344,7 +344,6 @@ typedef struct {
        char *storage_id;
        char *storage_name;
        char *storage_path;
-       char *storage_account;
        int storage_type;
 } media_storage_s;
 

diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h
index aca5d1f..a223074 100755 (executable)
--- a/include_product/media_info_private.h
+++ b/include_product/media_info_private.h
@@ -368,7 +368,6 @@ typedef struct {
        char *storage_id;
        char *storage_name;
        char *storage_path;
-       char *storage_account;
        int storage_type;
 } media_storage_s;
 

diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec
index a34968a..34b2f85 100755 (executable)
--- a/packaging/capi-content-media-content.spec
+++ b/packaging/capi-content-media-content.spec
@@ -1,6 +1,6 @@
 Name:       capi-content-media-content
 Summary:    A Media content library in Tizen Native API
-Version:    0.3.9
+Version:    0.3.10
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_db.c b/src/media_db.c
index ad5379b..eac5b7c 100755 (executable)
--- a/src/media_db.c
+++ b/src/media_db.c
@@ -1488,8 +1488,7 @@ int _media_db_get_storage(filter_h filter, media_storage_cb callback, void *user
                _storage->storage_id = g_strdup((const char *)sqlite3_column_text(stmt, 0));
                _storage->storage_name = g_strdup((const char *)sqlite3_column_text(stmt, 1));
                _storage->storage_path = g_strdup((const char *)sqlite3_column_text(stmt, 2));
-               _storage->storage_account = g_strdup((const char *)sqlite3_column_text(stmt, 3));
-               _storage->storage_type = (int)sqlite3_column_int(stmt, 4);
+               _storage->storage_type = (int)sqlite3_column_int(stmt, 3);
 
                if (callback((media_storage_h)_storage, user_data) == false) {
                        media_storage_destroy((media_storage_h) _storage);

diff --git a/src/media_storage.c b/src/media_storage.c
index c7ff8e0..5664285 100755 (executable)
--- a/src/media_storage.c
+++ b/src/media_storage.c
@@ -24,8 +24,7 @@ static void __media_storage_get_detail(sqlite3_stmt* stmt, media_storage_h stora
        _storage->storage_id = g_strdup((const char *)sqlite3_column_text(stmt, 0));
        _storage->storage_name = g_strdup((const char *)sqlite3_column_text(stmt, 1));
        _storage->storage_path = g_strdup((const char *)sqlite3_column_text(stmt, 2));
-       _storage->storage_account = g_strdup((const char *)sqlite3_column_text(stmt, 3));
-       _storage->storage_type = (int)sqlite3_column_int(stmt, 4);
+       _storage->storage_type = (int)sqlite3_column_int(stmt, 3);
 
        return;
 }
@@ -130,7 +129,6 @@ int media_storage_destroy(media_storage_h storage)
                SAFE_FREE(_storage->storage_id);
                SAFE_FREE(_storage->storage_path);
                SAFE_FREE(_storage->storage_name);
-               SAFE_FREE(_storage->storage_account);
                SAFE_FREE(_storage);
 
                ret = MEDIA_CONTENT_ERROR_NONE;
@@ -178,15 +176,6 @@ int media_storage_clone(media_storage_h *dst, media_storage_h src)
                        }
                }
 
-               if (STRING_VALID(_src->storage_account)) {
-                       _dst->storage_account = strdup(_src->storage_account);
-                       if (_dst->storage_account == NULL) {
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               media_storage_destroy((media_storage_h)_dst);
-                               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                       }
-               }
-
                _dst->storage_type = _src->storage_type;
 
                *dst = (media_storage_h)_dst;