CloudFile: ability to disable services

9 files changed, 15 insertions, 15 deletions

diff --git a/plugins/CloudFile/src/Services/dropbox_service.cpp b/plugins/CloudFile/src/Services/dropbox_service.cpp
index 10fbf7ef40..70ff1deb96 100644
--- a/plugins/CloudFile/src/Services/dropbox_service.cpp
+++ b/plugins/CloudFile/src/Services/dropbox_service.cpp
@@ -16,9 +16,9 @@ const wchar_t* CDropboxService::GetText() const
 	return L"Dropbox";
 }
 
-HANDLE CDropboxService::GetIcon() const
+int CDropboxService::GetIconId() const
 {
-	return GetIconHandle(IDI_DROPBOX);
+	return IDI_DROPBOX;
 }
 
 bool CDropboxService::IsLoggedIn()
diff --git a/plugins/CloudFile/src/Services/dropbox_service.h b/plugins/CloudFile/src/Services/dropbox_service.h
index 93b2fb53d3..362a9751fc 100644
--- a/plugins/CloudFile/src/Services/dropbox_service.h
+++ b/plugins/CloudFile/src/Services/dropbox_service.h
@@ -21,8 +21,8 @@ public:
 
 	const char* GetModule() const;
 	const wchar_t* GetText() const;
-	HANDLE GetIcon() const;
-	
+	int GetIconId() const;
+
 	bool IsLoggedIn();
 	void Login();
 	void Logout();
diff --git a/plugins/CloudFile/src/Services/google_service.cpp b/plugins/CloudFile/src/Services/google_service.cpp
index f7ab294135..d378f8bf55 100644
--- a/plugins/CloudFile/src/Services/google_service.cpp
+++ b/plugins/CloudFile/src/Services/google_service.cpp
@@ -16,9 +16,9 @@ const wchar_t* CGDriveService::GetText() const
 	return L"GDrive";
 }
 
-HANDLE CGDriveService::GetIcon() const
+int CGDriveService::GetIconId() const
 {
-	return GetIconHandle(IDI_GDRIVE);
+	return IDI_GDRIVE;
 }
 
 bool CGDriveService::IsLoggedIn()
diff --git a/plugins/CloudFile/src/Services/google_service.h b/plugins/CloudFile/src/Services/google_service.h
index d9c99009c6..a35827eaf8 100644
--- a/plugins/CloudFile/src/Services/google_service.h
+++ b/plugins/CloudFile/src/Services/google_service.h
@@ -19,7 +19,7 @@ public:
 
 	const char* GetModule() const;
 	const wchar_t* GetText() const;
-	HANDLE GetIcon() const;
+	int GetIconId() const;
 
 	bool IsLoggedIn();
 	void Login();
diff --git a/plugins/CloudFile/src/Services/microsoft_api.h b/plugins/CloudFile/src/Services/microsoft_api.h
index b7f6ebd073..0717a7a00a 100644
--- a/plugins/CloudFile/src/Services/microsoft_api.h
+++ b/plugins/CloudFile/src/Services/microsoft_api.h
@@ -31,8 +31,8 @@ namespace OneDriveAPI
 			AddHeader("Content-Type", "application/x-www-form-urlencoded");
 
 			CMStringA data(CMStringDataFormat::FORMAT,
-				"client_id=%s&client_secret=%s&grant_type=refresh_token&refresh_token=%s",
-				MS_APP_ID, MS_CLIENT_SECRET, refreshToken);
+				"client_id=%s&grant_type=refresh_token&refresh_token=%s",
+				MS_APP_ID, refreshToken);
 			SetData(data.GetBuffer(), data.GetLength());
 		}
 	};
diff --git a/plugins/CloudFile/src/Services/microsoft_service.cpp b/plugins/CloudFile/src/Services/microsoft_service.cpp
index d002db45e6..d988ec222a 100644
--- a/plugins/CloudFile/src/Services/microsoft_service.cpp
+++ b/plugins/CloudFile/src/Services/microsoft_service.cpp
@@ -16,9 +16,9 @@ const wchar_t* COneDriveService::GetText() const
 	return L"OneDrive";
 }
 
-HANDLE COneDriveService::GetIcon() const
+int COneDriveService::GetIconId() const
 {
-	return GetIconHandle(IDI_ONEDRIVE);
+	return IDI_ONEDRIVE;
 }
 
 bool COneDriveService::IsLoggedIn()
diff --git a/plugins/CloudFile/src/Services/microsoft_service.h b/plugins/CloudFile/src/Services/microsoft_service.h
index bf689ee8c2..7853378e07 100644
--- a/plugins/CloudFile/src/Services/microsoft_service.h
+++ b/plugins/CloudFile/src/Services/microsoft_service.h
@@ -19,7 +19,7 @@ public:
 
 	const char* GetModule() const;
 	const wchar_t* GetText() const;
-	HANDLE GetIcon() const;
+	int GetIconId() const;
 
 	bool IsLoggedIn();
 	void Login();
diff --git a/plugins/CloudFile/src/Services/yandex_service.cpp b/plugins/CloudFile/src/Services/yandex_service.cpp
index 2d08aa63a2..9ed788fd4c 100644
--- a/plugins/CloudFile/src/Services/yandex_service.cpp
+++ b/plugins/CloudFile/src/Services/yandex_service.cpp
@@ -16,9 +16,9 @@ const wchar_t* CYandexService::GetText() const
 	return L"Яндекс.Диск";
 }
 
-HANDLE CYandexService::GetIcon() const
+int CYandexService::GetIconId() const
 {
-	return GetIconHandle(IDI_YADISK);
+	return IDI_YADISK;
 }
 
 bool CYandexService::IsLoggedIn()
diff --git a/plugins/CloudFile/src/Services/yandex_service.h b/plugins/CloudFile/src/Services/yandex_service.h
index a3a84735c4..e3b122ffa1 100644
--- a/plugins/CloudFile/src/Services/yandex_service.h
+++ b/plugins/CloudFile/src/Services/yandex_service.h
@@ -19,7 +19,7 @@ public:
 
 	const char* GetModule() const;
 	const wchar_t* GetText() const;
-	HANDLE GetIcon() const;
+	int GetIconId() const;
 
 	bool IsLoggedIn();
 	void Login();