procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

moved instance id to Global namespace, 0.9.19 dev version

This commit is contained in:
John Preston 2016-01-09 21:00:50 +08:00
parent 325e45eafd
commit 5531f49c3e
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Telegram/SourceFiles/pspecific_mac_p.mm
View File

@ -208,10 +208,10 @@ public:
} }
- (void) userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification { - (void) userNotificationCenter:(NSUserNotificationCenter *)center didActivateNotification:(NSUserNotification *)notification {
NSNumber *instObj = [[notification userInfo] objectForKey:@"inst"]; NSNumber *instObj = [[notification userInfo] objectForKey:@"launch"];
unsigned long long instLong = instObj ? [instObj unsignedLongLongValue] : 0; unsigned long long instLong = instObj ? [instObj unsignedLongLongValue] : 0;
DEBUG_LOG(("Received notification with instance %1").arg(instLong)); DEBUG_LOG(("Received notification with instance %1").arg(instLong));
if (instLong != cInstance()) { // other app instance notification if (instLong != Global::LaunchId()) { // other app instance notification
return; return;
} }
if (notification.activationType == NSUserNotificationActivationTypeReplied) { if (notification.activationType == NSUserNotificationActivationTypeReplied) {
@ -283,8 +283,8 @@ void PsMacWindowPrivate::showNotify(uint64 peer, int32 msgId, const QPixmap &pix
NSUserNotification *notification = [[NSUserNotification alloc] init]; NSUserNotification *notification = [[NSUserNotification alloc] init];
NSImage *img = qt_mac_create_nsimage(pix); NSImage *img = qt_mac_create_nsimage(pix);
DEBUG_LOG(("Sending notification with userinfo: peer %1, msgId %2 and instance %3").arg(peer).arg(msgId).arg(cInstance())); DEBUG_LOG(("Sending notification with userinfo: peer %1, msgId %2 and instance %3").arg(peer).arg(msgId).arg(Global::LaunchId()));
[notification setUserInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedLongLong:peer],@"peer",[NSNumber numberWithInt:msgId],@"msgid",[NSNumber numberWithUnsignedLongLong:cInstance()],@"inst",nil]]; [notification setUserInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedLongLong:peer],@"peer",[NSNumber numberWithInt:msgId],@"msgid",[NSNumber numberWithUnsignedLongLong:Global::LaunchId()],@"launch",nil]];
[notification setTitle:QNSString(title).s()]; [notification setTitle:QNSString(title).s()];
[notification setSubtitle:QNSString(subtitle).s()]; [notification setSubtitle:QNSString(subtitle).s()];
@ -352,7 +352,7 @@ void PsMacWindowPrivate::clearNotifies(unsigned long long peer) {
NSArray *notifies = [center deliveredNotifications]; NSArray *notifies = [center deliveredNotifications];
for (id notify in notifies) { for (id notify in notifies) {
NSDictionary *dict = [notify userInfo]; NSDictionary *dict = [notify userInfo];
if ([[dict objectForKey:@"peer"] unsignedLongLongValue] == peer && [[dict objectForKey:@"inst"] unsignedLongLongValue] == cInstance()) { if ([[dict objectForKey:@"peer"] unsignedLongLongValue] == peer && [[dict objectForKey:@"launch"] unsignedLongLongValue] == Global::LaunchId()) {
[center removeDeliveredNotification:notify]; [center removeDeliveredNotification:notify];
} }
} }

1
Telegram/SourceFiles/settings.cpp
View File

@ -134,7 +134,6 @@ bool gRetina = false;
float64 gRetinaFactor = 1.; float64 gRetinaFactor = 1.;
int32 gIntRetinaFactor = 1; int32 gIntRetinaFactor = 1;
bool gCustomNotifies = true; bool gCustomNotifies = true;
uint64 gInstance = 0.;
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
DBIPlatform gPlatform = dbipWindows; DBIPlatform gPlatform = dbipWindows;

2
Telegram/SourceFiles/settings.h
View File

@ -309,8 +309,6 @@ DeclareSetting(float64, RetinaFactor);
DeclareSetting(int32, IntRetinaFactor); DeclareSetting(int32, IntRetinaFactor);
DeclareSetting(bool, CustomNotifies); DeclareSetting(bool, CustomNotifies);
DeclareReadSetting(uint64, Instance);
DeclareReadSetting(DBIPlatform, Platform); DeclareReadSetting(DBIPlatform, Platform);
DeclareReadSetting(bool, IsElCapitan); DeclareReadSetting(bool, IsElCapitan);
DeclareReadSetting(QUrl, UpdateURL); DeclareReadSetting(QUrl, UpdateURL);