SHA256
1
0
forked from pool/fcitx

Accepting request 366060 from home:MargueriteSu:branches:M17N

OBS-URL: https://build.opensuse.org/request/show/366060
OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=137
This commit is contained in:
Marguerite Su 2016-03-04 16:10:27 +00:00 committed by Git OBS Bridge
parent aebcd8a6f1
commit d0f28a413a

View File

@ -11,12 +11,12 @@ Index: fcitx-4.2.9.1/src/module/notificationitem/notificationitem.c
return false; return false;
+ +
+ if (notificationitem->callback == callback) { + if (notificationitem->callback == callback) {
+ return true; + return true;
+ } + }
+ +
+ if (notificationitem->callback) { + if (notificationitem->callback) {
+ return false; + return false;
+ end + }
+ +
if (notificationitem->serviceName) { if (notificationitem->serviceName) {
FcitxLog(ERROR, "This should not happen, please report bug."); FcitxLog(ERROR, "This should not happen, please report bug.");
@ -35,8 +35,8 @@ Index: fcitx-4.2.9.1/src/ui/classic/TrayWindow.c
TrayWindowRelease(trayWindow); TrayWindowRelease(trayWindow);
- TrayWindowInit(trayWindow); - TrayWindowInit(trayWindow);
+ if (!classicui->notificationItemAvailable && !classicui->isSuspend) { + if (!classicui->notificationItemAvailable && !classicui->isSuspend) {
+ TrayWindowInit(trayWindow); + TrayWindowInit(trayWindow);
+ } + }
return true; return true;
} }
break; break;