Fix spaces on end of lines
This commit is contained in:
parent
2298eed8bf
commit
c13d637502
|
@ -8,7 +8,7 @@ about: Report errors or unexpected behavior.
|
||||||
Thanks for reporting issues of Telegram Desktop!
|
Thanks for reporting issues of Telegram Desktop!
|
||||||
|
|
||||||
To make it easier for us to help you please enter detailed information below.
|
To make it easier for us to help you please enter detailed information below.
|
||||||
-->
|
-->
|
||||||
### Steps to reproduce
|
### Steps to reproduce
|
||||||
1.
|
1.
|
||||||
2.
|
2.
|
||||||
|
|
|
@ -43,7 +43,7 @@ travisStartFold() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "travis_fold:start:$NAME"
|
echo "travis_fold:start:$NAME"
|
||||||
sameLineInfoMessage "$TITLE"
|
sameLineInfoMessage "$TITLE"
|
||||||
|
|
||||||
TRAVIS_LAST_FOLD="$NAME"
|
TRAVIS_LAST_FOLD="$NAME"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,17 +1,17 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
|
||||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||||
<application>
|
<application>
|
||||||
<!-- Windows 10 -->
|
<!-- Windows 10 -->
|
||||||
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
|
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
|
||||||
<!-- Windows 8.1 -->
|
<!-- Windows 8.1 -->
|
||||||
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
|
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
|
||||||
<!-- Windows Vista -->
|
<!-- Windows Vista -->
|
||||||
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
|
<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
|
||||||
<!-- Windows 7 -->
|
<!-- Windows 7 -->
|
||||||
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
|
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
|
||||||
<!-- Windows 8 -->
|
<!-- Windows 8 -->
|
||||||
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
|
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
|
||||||
</application>
|
</application>
|
||||||
</compatibility>
|
</compatibility>
|
||||||
</assembly>
|
</assembly>
|
|
@ -49,7 +49,7 @@
|
||||||
[anInvocation retainArguments];
|
[anInvocation retainArguments];
|
||||||
anInvocation.target = _object;
|
anInvocation.target = _object;
|
||||||
self.invocation = anInvocation;
|
self.invocation = anInvocation;
|
||||||
|
|
||||||
if(backgroundAfterForward)
|
if(backgroundAfterForward)
|
||||||
[NSThread detachNewThreadSelector:@selector(runInBackground) toTarget:self withObject:nil];
|
[NSThread detachNewThreadSelector:@selector(runInBackground) toTarget:self withObject:nil];
|
||||||
else if(onMainAfterForward)
|
else if(onMainAfterForward)
|
||||||
|
@ -59,7 +59,7 @@
|
||||||
NSMethodSignature *signature = [super methodSignatureForSelector:inSelector];
|
NSMethodSignature *signature = [super methodSignatureForSelector:inSelector];
|
||||||
if (signature == NULL)
|
if (signature == NULL)
|
||||||
signature = [_object methodSignatureForSelector:inSelector];
|
signature = [_object methodSignatureForSelector:inSelector];
|
||||||
|
|
||||||
return signature;
|
return signature;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEv
|
||||||
EventTypeSpec eventType = { kEventClassApplication, kEventAppFrontSwitched };
|
EventTypeSpec eventType = { kEventClassApplication, kEventAppFrontSwitched };
|
||||||
OSStatus err = InstallApplicationEventHandler(NewEventHandlerUPP(appSwitched), 1, &eventType, self, &_app_switching_ref);
|
OSStatus err = InstallApplicationEventHandler(NewEventHandlerUPP(appSwitched), 1, &eventType, self, &_app_switching_ref);
|
||||||
assert(err == noErr);
|
assert(err == noErr);
|
||||||
|
|
||||||
eventType.eventKind = kEventAppTerminated;
|
eventType.eventKind = kEventAppTerminated;
|
||||||
err = InstallApplicationEventHandler(NewEventHandlerUPP(appTerminated), 1, &eventType, self, &_app_terminating_ref);
|
err = InstallApplicationEventHandler(NewEventHandlerUPP(appTerminated), 1, &eventType, self, &_app_terminating_ref);
|
||||||
assert(err == noErr);
|
assert(err == noErr);
|
||||||
|
@ -67,9 +67,9 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEv
|
||||||
{
|
{
|
||||||
// Prevent having multiple mediaKeys threads
|
// Prevent having multiple mediaKeys threads
|
||||||
[self stopWatchingMediaKeys];
|
[self stopWatchingMediaKeys];
|
||||||
|
|
||||||
[self setShouldInterceptMediaKeyEvents:YES];
|
[self setShouldInterceptMediaKeyEvents:YES];
|
||||||
|
|
||||||
// Add an event tap to intercept the system defined media key events
|
// Add an event tap to intercept the system defined media key events
|
||||||
_eventPort = CGEventTapCreate(kCGSessionEventTap,
|
_eventPort = CGEventTapCreate(kCGSessionEventTap,
|
||||||
kCGHeadInsertEventTap,
|
kCGHeadInsertEventTap,
|
||||||
|
@ -81,28 +81,28 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEv
|
||||||
[self stopWatchingMediaKeys];
|
[self stopWatchingMediaKeys];
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
_eventPortSource = CFMachPortCreateRunLoopSource(kCFAllocatorSystemDefault, _eventPort, 0);
|
_eventPortSource = CFMachPortCreateRunLoopSource(kCFAllocatorSystemDefault, _eventPort, 0);
|
||||||
assert(_eventPortSource != NULL);
|
assert(_eventPortSource != NULL);
|
||||||
|
|
||||||
// Let's do this in a separate thread so that a slow app doesn't lag the event tap
|
// Let's do this in a separate thread so that a slow app doesn't lag the event tap
|
||||||
[NSThread detachNewThreadSelector:@selector(eventTapThread) toTarget:self withObject:nil];
|
[NSThread detachNewThreadSelector:@selector(eventTapThread) toTarget:self withObject:nil];
|
||||||
}
|
}
|
||||||
-(void)stopWatchingMediaKeys
|
-(void)stopWatchingMediaKeys
|
||||||
{
|
{
|
||||||
// TODO<nevyn>: Shut down thread, remove event tap port and source
|
// TODO<nevyn>: Shut down thread, remove event tap port and source
|
||||||
|
|
||||||
if(_tapThreadRL){
|
if(_tapThreadRL){
|
||||||
CFRunLoopStop(_tapThreadRL);
|
CFRunLoopStop(_tapThreadRL);
|
||||||
_tapThreadRL=nil;
|
_tapThreadRL=nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(_eventPort){
|
if(_eventPort){
|
||||||
CFMachPortInvalidate(_eventPort);
|
CFMachPortInvalidate(_eventPort);
|
||||||
CFRelease(_eventPort);
|
CFRelease(_eventPort);
|
||||||
_eventPort=nil;
|
_eventPort=nil;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(_eventPortSource){
|
if(_eventPortSource){
|
||||||
CFRelease(_eventPortSource);
|
CFRelease(_eventPortSource);
|
||||||
_eventPortSource=nil;
|
_eventPortSource=nil;
|
||||||
|
@ -119,7 +119,7 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEv
|
||||||
return NO;
|
return NO;
|
||||||
#else
|
#else
|
||||||
// XXX(nevyn): MediaKey event tap doesn't work on 10.4, feel free to figure out why if you have the energy.
|
// XXX(nevyn): MediaKey event tap doesn't work on 10.4, feel free to figure out why if you have the energy.
|
||||||
return
|
return
|
||||||
![[NSUserDefaults standardUserDefaults] boolForKey:kIgnoreMediaKeysDefaultsKey]
|
![[NSUserDefaults standardUserDefaults] boolForKey:kIgnoreMediaKeysDefaultsKey]
|
||||||
&& floor(NSAppKitVersionNumber) >= 949/*NSAppKitVersionNumber10_5*/;
|
&& floor(NSAppKitVersionNumber) >= 949/*NSAppKitVersionNumber10_5*/;
|
||||||
#endif
|
#endif
|
||||||
|
@ -194,7 +194,7 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEv
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#pragma mark
|
#pragma mark
|
||||||
#pragma mark -
|
#pragma mark -
|
||||||
#pragma mark Event tap callbacks
|
#pragma mark Event tap callbacks
|
||||||
|
|
||||||
|
@ -231,10 +231,10 @@ static CGEventRef tapEventCallback2(CGEventTapProxy proxy, CGEventType type, CGE
|
||||||
|
|
||||||
if (![self shouldInterceptMediaKeyEvents])
|
if (![self shouldInterceptMediaKeyEvents])
|
||||||
return event;
|
return event;
|
||||||
|
|
||||||
[nsEvent retain]; // matched in handleAndReleaseMediaKeyEvent:
|
[nsEvent retain]; // matched in handleAndReleaseMediaKeyEvent:
|
||||||
[self performSelectorOnMainThread:@selector(handleAndReleaseMediaKeyEvent:) withObject:nsEvent waitUntilDone:NO];
|
[self performSelectorOnMainThread:@selector(handleAndReleaseMediaKeyEvent:) withObject:nsEvent waitUntilDone:NO];
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -250,7 +250,7 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy, CGEventType type, CGEv
|
||||||
// event will have been retained in the other thread
|
// event will have been retained in the other thread
|
||||||
-(void)handleAndReleaseMediaKeyEvent:(NSEvent *)event {
|
-(void)handleAndReleaseMediaKeyEvent:(NSEvent *)event {
|
||||||
[event autorelease];
|
[event autorelease];
|
||||||
|
|
||||||
[_delegate mediaKeyTap:self receivedMediaKeyEvent:event];
|
[_delegate mediaKeyTap:self receivedMediaKeyEvent:event];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -272,7 +272,7 @@ NSString *kIgnoreMediaKeysDefaultsKey = @"SPIgnoreMediaKeys";
|
||||||
-(void)mediaKeyAppListChanged
|
-(void)mediaKeyAppListChanged
|
||||||
{
|
{
|
||||||
if([_mediaKeyAppList count] == 0) return;
|
if([_mediaKeyAppList count] == 0) return;
|
||||||
|
|
||||||
/*NSLog(@"--");
|
/*NSLog(@"--");
|
||||||
int i = 0;
|
int i = 0;
|
||||||
for (NSValue *psnv in _mediaKeyAppList) {
|
for (NSValue *psnv in _mediaKeyAppList) {
|
||||||
|
@ -284,20 +284,20 @@ NSString *kIgnoreMediaKeysDefaultsKey = @"SPIgnoreMediaKeys";
|
||||||
NSString *bundleIdentifier = [processInfo objectForKey:(id)kCFBundleIdentifierKey];
|
NSString *bundleIdentifier = [processInfo objectForKey:(id)kCFBundleIdentifierKey];
|
||||||
NSLog(@"%d: %@", i++, bundleIdentifier);
|
NSLog(@"%d: %@", i++, bundleIdentifier);
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
ProcessSerialNumber mySerial, topSerial;
|
ProcessSerialNumber mySerial, topSerial;
|
||||||
GetCurrentProcess(&mySerial);
|
GetCurrentProcess(&mySerial);
|
||||||
[[_mediaKeyAppList objectAtIndex:0] getValue:&topSerial];
|
[[_mediaKeyAppList objectAtIndex:0] getValue:&topSerial];
|
||||||
|
|
||||||
Boolean same;
|
Boolean same;
|
||||||
OSErr err = SameProcess(&mySerial, &topSerial, &same);
|
OSErr err = SameProcess(&mySerial, &topSerial, &same);
|
||||||
[self setShouldInterceptMediaKeyEvents:(err == noErr && same)];
|
[self setShouldInterceptMediaKeyEvents:(err == noErr && same)];
|
||||||
|
|
||||||
}
|
}
|
||||||
-(void)appIsNowFrontmost:(ProcessSerialNumber)psn
|
-(void)appIsNowFrontmost:(ProcessSerialNumber)psn
|
||||||
{
|
{
|
||||||
NSValue *psnv = [NSValue valueWithBytes:&psn objCType:@encode(ProcessSerialNumber)];
|
NSValue *psnv = [NSValue valueWithBytes:&psn objCType:@encode(ProcessSerialNumber)];
|
||||||
|
|
||||||
NSDictionary *processInfo = [(id)ProcessInformationCopyDictionary(
|
NSDictionary *processInfo = [(id)ProcessInformationCopyDictionary(
|
||||||
&psn,
|
&psn,
|
||||||
kProcessDictionaryIncludeAllInformationMask
|
kProcessDictionaryIncludeAllInformationMask
|
||||||
|
@ -324,29 +324,29 @@ static pascal OSStatus appSwitched (EventHandlerCallRef nextHandler, EventRef ev
|
||||||
|
|
||||||
ProcessSerialNumber newSerial;
|
ProcessSerialNumber newSerial;
|
||||||
GetFrontProcess(&newSerial);
|
GetFrontProcess(&newSerial);
|
||||||
|
|
||||||
[self appIsNowFrontmost:newSerial];
|
[self appIsNowFrontmost:newSerial];
|
||||||
|
|
||||||
return CallNextEventHandler(nextHandler, evt);
|
return CallNextEventHandler(nextHandler, evt);
|
||||||
}
|
}
|
||||||
|
|
||||||
static pascal OSStatus appTerminated (EventHandlerCallRef nextHandler, EventRef evt, void* userData)
|
static pascal OSStatus appTerminated (EventHandlerCallRef nextHandler, EventRef evt, void* userData)
|
||||||
{
|
{
|
||||||
SPMediaKeyTap *self = (id)userData;
|
SPMediaKeyTap *self = (id)userData;
|
||||||
|
|
||||||
ProcessSerialNumber deadPSN;
|
ProcessSerialNumber deadPSN;
|
||||||
|
|
||||||
GetEventParameter(
|
GetEventParameter(
|
||||||
evt,
|
evt,
|
||||||
kEventParamProcessID,
|
kEventParamProcessID,
|
||||||
typeProcessSerialNumber,
|
typeProcessSerialNumber,
|
||||||
NULL,
|
NULL,
|
||||||
sizeof(deadPSN),
|
sizeof(deadPSN),
|
||||||
NULL,
|
NULL,
|
||||||
&deadPSN
|
&deadPSN
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
[self appTerminated:deadPSN];
|
[self appTerminated:deadPSN];
|
||||||
return CallNextEventHandler(nextHandler, evt);
|
return CallNextEventHandler(nextHandler, evt);
|
||||||
}
|
}
|
||||||
|
|
|
@ -707,7 +707,7 @@ else()
|
||||||
webrtc_dsp/common_audio/vad/vad_core.c
|
webrtc_dsp/common_audio/vad/vad_core.c
|
||||||
webrtc_dsp/common_audio/vad/vad_sp.h
|
webrtc_dsp/common_audio/vad/vad_sp.h
|
||||||
webrtc_dsp/common_audio/vad/vad_filterbank.h
|
webrtc_dsp/common_audio/vad/vad_filterbank.h
|
||||||
webrtc_dsp/common_audio/vad/vad_gmm.c
|
webrtc_dsp/common_audio/vad/vad_gmm.c
|
||||||
|
|
||||||
# ARM/NEON sources
|
# ARM/NEON sources
|
||||||
# TODO check if there's a good way to make these compile with ARM ports of TDesktop
|
# TODO check if there's a good way to make these compile with ARM ports of TDesktop
|
||||||
|
|
|
@ -21,7 +21,7 @@ if (TDESKTOP_API_TEST)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (TDESKTOP_API_ID STREQUAL "0" OR TDESKTOP_API_HASH STREQUAL "")
|
if (TDESKTOP_API_ID STREQUAL "0" OR TDESKTOP_API_HASH STREQUAL "")
|
||||||
message(FATAL_ERROR
|
message(FATAL_ERROR
|
||||||
" \n"
|
" \n"
|
||||||
" PROVIDE: -D TDESKTOP_API_ID=[API_ID] -D TDESKTOP_API_HASH=[API_HASH]\n"
|
" PROVIDE: -D TDESKTOP_API_ID=[API_ID] -D TDESKTOP_API_HASH=[API_HASH]\n"
|
||||||
" \n"
|
" \n"
|
||||||
|
|
|
@ -63,17 +63,17 @@ if apiId == '' or apiHash == '':
|
||||||
|
|
||||||
> To build your version of Telegram Desktop you're required to provide
|
> To build your version of Telegram Desktop you're required to provide
|
||||||
> your own 'api_id' and 'api_hash' for the Telegram API access.
|
> your own 'api_id' and 'api_hash' for the Telegram API access.
|
||||||
>
|
>
|
||||||
> How to obtain your 'api_id' and 'api_hash' is described here:
|
> How to obtain your 'api_id' and 'api_hash' is described here:
|
||||||
> https://core.telegram.org/api/obtaining_api_id
|
> https://core.telegram.org/api/obtaining_api_id
|
||||||
>
|
>
|
||||||
> If you're building the application not for deployment,
|
> If you're building the application not for deployment,
|
||||||
> but only for test purposes you can use TEST ONLY credentials,
|
> but only for test purposes you can use TEST ONLY credentials,
|
||||||
> which are very limited by the Telegram API server:
|
> which are very limited by the Telegram API server:
|
||||||
>
|
>
|
||||||
> api_id: 17349
|
> api_id: 17349
|
||||||
> api_hash: 344583e45741c457fe1862106095a5eb
|
> api_hash: 344583e45741c457fe1862106095a5eb
|
||||||
>
|
>
|
||||||
> Your users will start getting internal server errors on login
|
> Your users will start getting internal server errors on login
|
||||||
> if you deploy an app using those 'api_id' and 'api_hash'.""")
|
> if you deploy an app using those 'api_id' and 'api_hash'.""")
|
||||||
finish(0)
|
finish(0)
|
||||||
|
|
|
@ -408,8 +408,8 @@ Also in this update:
|
||||||
|
|
||||||
1.3.11 alpha (01.08.18)
|
1.3.11 alpha (01.08.18)
|
||||||
|
|
||||||
- Added a new night theme.
|
- Added a new night theme.
|
||||||
- You can now assign custom themes as night and day themes to quickly switch between them.
|
- You can now assign custom themes as night and day themes to quickly switch between them.
|
||||||
|
|
||||||
1.3.10 (13.07.18)
|
1.3.10 (13.07.18)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue