Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
Roy Tam 2019-11-29 11:37:55 +08:00
commit 33f029715a
12 changed files with 38 additions and 25 deletions

View file

@ -249,14 +249,6 @@ nsMessengerOSXIntegration::Observe(nsISupports* aSubject, const char* aTopic, co
return mailSession->AddFolderListener(this, nsIFolderListener::boolPropertyChanged | nsIFolderListener::intPropertyChanged);
}
if (!strcmp(aTopic, kUnreadImCountChangedTopic)) {
nsresult rv;
nsCOMPtr<nsISupportsPRInt32> unreadCount = do_QueryInterface(aSubject, &rv);
NS_ENSURE_SUCCESS(rv, rv);
return BadgeDockIcon();
}
return NS_OK;
}