wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-22 08:27:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1258 - Part 10: Remove chat core bits

Browse source
This commit is contained in:
Matt A. Tobin 2019-11-12 21:31:48 -05:00 • committed by Roy Tam
commit 65944ea58a
8 changed files with 5 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

24
mailnews/base/src/nsMessengerOSXIntegration.mm
View file

@ -51,11 +51,8 @@
#include <Carbon/Carbon.h>
#import <Cocoa/Cocoa.h>
#define kChatEnabledPref "mail.chat.enabled"
#define kBiffAnimateDockIconPref "mail.biff.animate_dock_icon"
#define kMaxDisplayCount 10
#define kNewChatMessageTopic "new-directed-incoming-message"
#define kUnreadImCountChangedTopic "unread-im-count-changed"
using namespace mozilla::mailnews;
@ -162,7 +159,6 @@ nsMessengerOSXIntegration::nsMessengerOSXIntegration()
mBiffStateAtom = MsgGetAtom("BiffState");
mNewMailReceivedAtom = MsgGetAtom("NewMailReceived");
mUnreadTotal = 0;
mUnreadChat = 0;
}
nsMessengerOSXIntegration::~nsMessengerOSXIntegration()
@ -231,14 +227,7 @@ nsMessengerOSXIntegration::Observe(nsISupports* aSubject, const char* aTopic, co
if (NS_SUCCEEDED(rv)) {
observerService->RemoveObserver(this, "mail-startup-done");
bool chatEnabled = false;
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
if (NS_SUCCEEDED(rv))
rv = pref->GetBoolPref(kChatEnabledPref, &chatEnabled);
if (NS_SUCCEEDED(rv) && chatEnabled) {
observerService->AddObserver(this, kNewChatMessageTopic, false);
observerService->AddObserver(this, kUnreadImCountChangedTopic, false);
}
}
// Register with the new mail service for changes to the unread message count
@ -260,22 +249,11 @@ nsMessengerOSXIntegration::Observe(nsISupports* aSubject, const char* aTopic, co
return mailSession->AddFolderListener(this, nsIFolderListener::boolPropertyChanged | nsIFolderListener::intPropertyChanged);
}
if (!strcmp(aTopic, kNewChatMessageTopic)) {
// We don't have to bother about checking if the window is already focused
// before attempting to bounce the dock icon, as BounceDockIcon is
// implemented by a getAttention call which won't do anything if the window
// requesting attention is already focused.
return BounceDockIcon();
}
if (!strcmp(aTopic, kUnreadImCountChangedTopic)) {
nsresult rv;
nsCOMPtr<nsISupportsPRInt32> unreadCount = do_QueryInterface(aSubject, &rv);
NS_ENSURE_SUCCESS(rv, rv);
rv = unreadCount->GetData(&mUnreadChat);
NS_ENSURE_SUCCESS(rv, rv);
return BadgeDockIcon();
}
@ -515,7 +493,7 @@ nsMessengerOSXIntegration::BadgeDockIcon()
{
NS_OBJC_BEGIN_TRY_ABORT_BLOCK_NSRESULT;
int32_t unreadCount = mUnreadTotal + mUnreadChat;
int32_t unreadCount = mUnreadTotal;
// If count is less than one, we should restore the original dock icon.
if (unreadCount < 1)
{

15
mailnews/base/src/nsStatusBarBiffManager.cpp
View file

@ -40,15 +40,12 @@ nsStatusBarBiffManager::~nsStatusBarBiffManager()
}
#define NEW_MAIL_PREF_BRANCH "mail.biff."
#define CHAT_PREF_BRANCH "mail.chat."
#define FEED_PREF_BRANCH "mail.feed."
#define PREF_PLAY_SOUND "play_sound"
#define PREF_SOUND_URL "play_sound.url"
#define PREF_SOUND_TYPE "play_sound.type"
#define SYSTEM_SOUND_TYPE 0
#define CUSTOM_SOUND_TYPE 1
#define PREF_CHAT_ENABLED "mail.chat.enabled"
#define PLAY_CHAT_NOTIFICATION_SOUND "play-chat-notification-sound"
nsresult nsStatusBarBiffManager::Init()
{
@ -67,16 +64,6 @@ nsresult nsStatusBarBiffManager::Init()
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
bool chatEnabled = false;
if (NS_SUCCEEDED(rv))
rv = pref->GetBoolPref(PREF_CHAT_ENABLED, &chatEnabled);
if (NS_SUCCEEDED(rv) && chatEnabled) {
nsCOMPtr<nsIObserverService> observerService =
mozilla::services::GetObserverService();
if (observerService)
observerService->AddObserver(this, PLAY_CHAT_NOTIFICATION_SOUND, false);
}
mInitialized = true;
return NS_OK;
}
@ -237,7 +224,7 @@ nsStatusBarBiffManager::Observe(nsISupports *aSubject,
const char *aTopic,
const char16_t *aData)
{
return PlayBiffSound(CHAT_PREF_BRANCH);
return NS_OK;
}
// nsIStatusBarBiffManager method....