diff --git a/102/features/12-feature-linux-systray-betterbird.patch b/102/features/12-feature-linux-systray-betterbird.patch index bfbddc25..f99ee2d6 100644 --- a/102/features/12-feature-linux-systray-betterbird.patch +++ b/102/features/12-feature-linux-systray-betterbird.patch @@ -1,7 +1,7 @@ # HG changeset patch # User Betterbird -# Date 1673537952 -3600 -# Parent 8c5e05413a2add616f1ef1e5ccd1465649654c86 +# Date 1673862277 -3600 +# Parent 214410f47f762b141341e4772802a1d83192aa97 Feature: Linux systray. diff --git a/mail/branding/betterbird/newmail22.png b/mail/branding/betterbird/newmail22.png @@ -249,7 +249,7 @@ diff --git a/mailnews/base/src/moz.build b/mailnews/base/src/moz.build diff --git a/mailnews/base/src/nsMessengerUnixIntegration.cpp b/mailnews/base/src/nsMessengerUnixIntegration.cpp --- a/mailnews/base/src/nsMessengerUnixIntegration.cpp +++ b/mailnews/base/src/nsMessengerUnixIntegration.cpp -@@ -1,24 +1,70 @@ +@@ -1,24 +1,66 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -260,10 +260,10 @@ diff --git a/mailnews/base/src/nsMessengerUnixIntegration.cpp b/mailnews/base/sr +#include "../../../third_party/appindicator/app-indicator.h" +#include "mozilla/Preferences.h" - /** - * This is only a placeholder for now, register it in components.conf later if - * needed. - */ +-/** +- * This is only a placeholder for now, register it in components.conf later if +- * needed. +- */ nsMessengerUnixIntegration::nsMessengerUnixIntegration() {} NS_IMPL_ISUPPORTS(nsMessengerUnixIntegration, nsIMessengerOSIntegration)