Merge branch 'master' into classic-channels

1 files changed, 30 insertions, 1 deletions

diff --git a/src/abaddon.cpp b/src/abaddon.cpp
index 443fa4e..f8c4b39 100644
--- a/src/abaddon.cpp
+++ b/src/abaddon.cpp
@@ -25,6 +25,23 @@
 #include "remoteauth/remoteauthdialog.hpp"
 #include "util.hpp"
 
+#if defined(__APPLE__)
+#include <CoreFoundation/CoreFoundation.h>
+
+void macOSThemeChanged() {
+    CFPropertyListRef appearanceName = CFPreferencesCopyAppValue(CFSTR("AppleInterfaceStyle"), kCFPreferencesAnyApplication);
+    if (appearanceName != NULL && CFGetTypeID(appearanceName) == CFStringGetTypeID() && CFStringCompare((CFStringRef)appearanceName, CFSTR("Dark"), 0) == kCFCompareEqualTo) {
+        Gtk::Settings::get_default()->set_property("gtk-application-prefer-dark-theme", true);
+    } else {
+        Gtk::Settings::get_default()->set_property("gtk-application-prefer-dark-theme", false);
+    }
+}
+
+void macOSThemeChangedCallback(CFNotificationCenterRef center, void *observer, CFStringRef name, const void *object, CFDictionaryRef userInfo) {
+    macOSThemeChanged();
+}
+#endif
+
 #ifdef WITH_LIBHANDY
 #include <handy.h>
 #endif
@@ -36,7 +53,8 @@
 Abaddon::Abaddon()
     : m_settings(Platform::FindConfigFile())
     , m_discord(GetSettings().UseMemoryDB) // stupid but easy
-    , m_emojis(GetResPath("/emojis.bin")) {
+    , m_emojis(GetResPath("/emojis.bin"))
+    , m_audio(GetSettings().Backends) {
     LoadFromSettings();
 
     // todo: set user agent for non-client(?)
@@ -331,6 +349,17 @@ int Abaddon::StartGTK() {
     m_gtk_app->hold();
     m_main_window->show();
 
+#if defined(__APPLE__)
+    CFNotificationCenterAddObserver(CFNotificationCenterGetDistributedCenter(),
+                                    NULL,
+                                    macOSThemeChangedCallback,
+                                    CFSTR("AppleInterfaceThemeChangedNotification"),
+                                    NULL,
+                                    CFNotificationSuspensionBehaviorCoalesce);
+
+    macOSThemeChanged();
+#endif
+
     RunFirstTimeDiscordStartup();
 
     return m_gtk_app->run(*m_main_window);