make qrcodegen optional wow!!!

6 files changed, 42 insertions, 0 deletions

diff --git a/src/abaddon.cpp b/src/abaddon.cpp
index c161595..921549b 100644
--- a/src/abaddon.cpp
+++ b/src/abaddon.cpp
@@ -837,6 +837,7 @@ void Abaddon::ActionSetToken() {
 }
 
 void Abaddon::ActionLoginQR() {
+#ifdef WITH_QRLOGIN
     RemoteAuthDialog dlg(*m_main_window);
     auto response = dlg.run();
     if (response == Gtk::RESPONSE_OK) {
@@ -847,6 +848,7 @@ void Abaddon::ActionLoginQR() {
         ActionConnect();
     }
     m_main_window->UpdateMenus();
+#endif
 }
 
 void Abaddon::ActionChannelOpened(Snowflake id, bool expand_to) {
diff --git a/src/remoteauth/remoteauthclient.cpp b/src/remoteauth/remoteauthclient.cpp
index 467ea8b..7653b78 100644
--- a/src/remoteauth/remoteauthclient.cpp
+++ b/src/remoteauth/remoteauthclient.cpp
@@ -1,8 +1,14 @@
+#ifdef WITH_QRLOGIN
+
+// clang-format off
+
 #include "remoteauthclient.hpp"
 #include "http.hpp"
 #include <nlohmann/json.hpp>
 #include <spdlog/fmt/bin_to_hex.h>
 
+// clang-format on
+
 RemoteAuthClient::RemoteAuthClient()
     : m_ws("remote-auth-ws")
     , m_log(spdlog::get("remote-auth")) {
@@ -341,3 +347,5 @@ RemoteAuthClient::type_signal_token RemoteAuthClient::signal_token() {
 RemoteAuthClient::type_signal_error RemoteAuthClient::signal_error() {
     return m_signal_error;
 }
+
+#endif
diff --git a/src/remoteauth/remoteauthclient.hpp b/src/remoteauth/remoteauthclient.hpp
index c2e00f3..6ab6dbb 100644
--- a/src/remoteauth/remoteauthclient.hpp
+++ b/src/remoteauth/remoteauthclient.hpp
@@ -1,4 +1,9 @@
 #pragma once
+
+#ifdef WITH_QRLOGIN
+
+// clang-format off
+
 #include <string>
 #include <queue>
 #include <spdlog/logger.h>
@@ -6,6 +11,8 @@
 #include "discord/waiter.hpp"
 #include "discord/websocket.hpp"
 
+// clang-format on
+
 class RemoteAuthClient {
 public:
     RemoteAuthClient();
@@ -84,3 +91,5 @@ private:
     type_signal_token m_signal_token;
     type_signal_error m_signal_error;
 };
+
+#endif
diff --git a/src/remoteauth/remoteauthdialog.cpp b/src/remoteauth/remoteauthdialog.cpp
index 7ee045f..7975b4e 100644
--- a/src/remoteauth/remoteauthdialog.cpp
+++ b/src/remoteauth/remoteauthdialog.cpp
@@ -1,6 +1,12 @@
+#ifdef WITH_QRLOGIN
+
+// clang-format off
+
 #include "remoteauthdialog.hpp"
 #include <qrcodegen.hpp>
 
+// clang-format on
+
 RemoteAuthDialog::RemoteAuthDialog(Gtk::Window &parent)
     : Gtk::Dialog("Login with QR Code", parent, true)
     , m_layout(Gtk::ORIENTATION_VERTICAL)
@@ -122,3 +128,5 @@ void RemoteAuthDialog::OnError(const std::string &error) {
     Abaddon::Get().ShowConfirm(error, dynamic_cast<Gtk::Window *>(get_toplevel()));
     response(Gtk::RESPONSE_CANCEL);
 }
+
+#endif
diff --git a/src/remoteauth/remoteauthdialog.hpp b/src/remoteauth/remoteauthdialog.hpp
index 9a6ca29..465a188 100644
--- a/src/remoteauth/remoteauthdialog.hpp
+++ b/src/remoteauth/remoteauthdialog.hpp
@@ -1,7 +1,14 @@
 #pragma once
+
+#ifdef WITH_QRLOGIN
+
+// clang-format off
+
 #include <gtkmm/dialog.h>
 #include "remoteauthclient.hpp"
 
+// clang-format on
+
 class RemoteAuthDialog : public Gtk::Dialog {
 public:
     RemoteAuthDialog(Gtk::Window &parent);
@@ -27,3 +34,5 @@ private:
 
     std::string m_token;
 };
+
+#endif
diff --git a/src/windows/mainwindow.cpp b/src/windows/mainwindow.cpp
index 56d735e..0b21567 100644
--- a/src/windows/mainwindow.cpp
+++ b/src/windows/mainwindow.cpp
@@ -206,7 +206,9 @@ void MainWindow::OnDiscordSubmenuPopup() {
     m_menu_discord_connect.set_sensitive(!token.empty() && !discord_active);
     m_menu_discord_disconnect.set_sensitive(discord_active);
     m_menu_discord_set_token.set_sensitive(!discord_active);
+#ifdef WITH_QRLOGIN
     m_menu_discord_login_qr.set_sensitive(!discord_active);
+#endif
     m_menu_discord_set_status.set_sensitive(discord_active);
 }
 
@@ -249,6 +251,10 @@ void MainWindow::SetupMenu() {
     m_menu_discord_disconnect.set_sensitive(false);
     m_menu_discord_set_token.set_label("Set Token");
     m_menu_discord_login_qr.set_label("Login with QR Code");
+#ifndef WITH_QRLOGIN
+    m_menu_discord_login_qr.set_sensitive(false);
+    m_menu_discord_login_qr.set_tooltip_text("Not compiled with support");
+#endif
     m_menu_discord_set_status.set_label("Set Status");
     m_menu_discord_set_status.set_sensitive(false);
     m_menu_discord_add_recipient.set_label("Add user to DM");