Merge pull request #1152 from eduardosm/disable-register-custom-scheme2

Allow to disable 'register custom scheme' functions using a macro
This commit is contained in:
telegramdesktop 2015-10-03 20:01:06 +03:00
commit dbc98062ed
3 changed files with 6 additions and 0 deletions

View File

@ -1165,6 +1165,7 @@ namespace {
}
void psRegisterCustomScheme() {
#ifndef TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
QString home(_psHomeDir());
if (home.isEmpty()) return;
@ -1249,6 +1250,7 @@ void psRegisterCustomScheme() {
LOG(("App Error: Could not open '%1' for write").arg(file));
}
}
#endif
}
void psNewVersion() {

View File

@ -936,8 +936,10 @@ void objc_finish() {
}
void objc_registerCustomScheme() {
#ifndef TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
OSStatus result = LSSetDefaultHandlerForURLScheme(CFSTR("tg"), (CFStringRef)[[NSBundle mainBundle] bundleIdentifier]);
DEBUG_LOG(("App Info: set default handler for 'tg' scheme result: %1").arg(result));
#endif
}
BOOL _execUpdater(BOOL update = YES) {

View File

@ -2216,6 +2216,7 @@ namespace {
}
void RegisterCustomScheme() {
#ifndef TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
DEBUG_LOG(("App Info: Checking custom scheme 'tg'.."));
HKEY rkey;
@ -2232,6 +2233,7 @@ void RegisterCustomScheme() {
if (!_psOpenRegKey(L"Software\\Classes\\tg\\shell\\open", &rkey)) return;
if (!_psOpenRegKey(L"Software\\Classes\\tg\\shell\\open\\command", &rkey)) return;
if (!_psSetKeyValue(rkey, 0, '"' + exe + qsl("\" -workdir \"") + cWorkingDir() + qsl("\" -- \"%1\""))) return;
#endif
}
void psNewVersion() {