setting-storage: apply patch c9d80a195589485f5be92fcc63b5026454e39c7e 10/192210/2
authorLukasz Stanislawski <l.stanislaws@samsung.com>
Wed, 31 Oct 2018 17:12:32 +0000 (18:12 +0100)
committerLukasz Stanislawski <l.stanislaws@samsung.com>
Tue, 13 Nov 2018 07:35:15 +0000 (08:35 +0100)
Change-Id: I41062fd1a75b6dc76cc7ac08a1ea5d56bd25a310

setting-storage/inc/setting-storage.h
setting-storage/src/setting-storage-SD.c

index 20aa32eb7d37a1d744cfc8315b30554cf0cc6e07..e8b445e5008e53de55028515d95c578e4d8f0548 100644 (file)
@@ -26,7 +26,7 @@
 #include <pthread.h>
 
 #include <Elementary.h>
-#include <dd-deviced.h>
+#include <storage-internal.h>
 #include <package-manager.h>
 #include <media_content.h>
 
index 75720d1765f8f83879bb3cb8d773cfd6b7823a90..fde360136ceaf7fc5459781a6ced629440017b75 100755 (executable)
@@ -63,9 +63,9 @@ static void storage_SD_unmount(SettingStorage *ad, storage_mmc_cb cb)
 
        ad->mmc_content.mmc_cb = cb;
        ad->mmc_content.user_data = ad;
-       ret = deviced_request_unmount_mmc(&ad->mmc_content, MNT_FORCE);
+       ret = storage_request_unmount_mmc(&ad->mmc_content, MNT_FORCE);
        if (ret == -1) {
-               SETTING_TRACE_ERROR("deviced_request_unmount_mmc() Fail");
+               SETTING_TRACE_ERROR("storage_request_unmount_mmc() Fail");
                storage_fail_popup(ad);
        }
        ad->sd_request = STORAGE_SD_REQ_UNMOUNT;
@@ -114,10 +114,10 @@ static void storage_SD_handle_mount_unmount(void *data)
 
                ad->mmc_content.mmc_cb = storage_SD_finish_progress;
                ad->mmc_content.user_data = ad;
-               ret = deviced_request_mount_mmc(&ad->mmc_content);
+               ret = storage_request_mount_mmc(&ad->mmc_content);
                /*      if fail, popup failed info */
                if (ret == -1) {
-                       SETTING_TRACE_ERROR("deviced_request_mount_mmc() Fail");
+                       SETTING_TRACE_ERROR("storage_request_mount_mmc() Fail");
                        storage_fail_popup(ad);
                        return;
                }
@@ -166,9 +166,9 @@ static void storage_SD_format(int result, void *data)
 
        ad->mmc_content.mmc_cb = storage_SD_finish_format;
        ad->mmc_content.user_data = ad;
-       ret = deviced_request_format_mmc(&ad->mmc_content);
+       ret = storage_request_format_mmc(&ad->mmc_content);
        if (ret == -1) {
-               SETTING_TRACE_ERROR("fail to call deviced_request_format_mmc");
+               SETTING_TRACE_ERROR("fail to call storage_request_format_mmc");
                storage_fail_popup(ad);
        }
        ad->sd_request = STORAGE_SD_REQ_FORMAT;