diff options
| author | ouwou <26526779+ouwou@users.noreply.github.com> | 2022-10-07 20:34:02 -0400 |
|---|---|---|
| committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2022-10-07 20:34:02 -0400 |
| commit | fd9d1ffb335ad379f8e31be48dc1f86dd1504e7b (patch) | |
| tree | 5a72d8df7abfe873fc1323858ac40a494d1242ec /src/abaddon.cpp | |
| parent | dfcfe4353ae40e11bd4bc779bc1f04f74c9f925f (diff) | |
| parent | 0a34c04b44d3f500317a319d497ce2064fdd852f (diff) | |
| download | abaddon-portaudio-fd9d1ffb335ad379f8e31be48dc1f86dd1504e7b.tar.gz abaddon-portaudio-fd9d1ffb335ad379f8e31be48dc1f86dd1504e7b.zip | |
Merge branch 'master' into voice
Diffstat (limited to 'src/abaddon.cpp')
| -rw-r--r-- | src/abaddon.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/abaddon.cpp b/src/abaddon.cpp index be62f69..701a3f1 100644 --- a/src/abaddon.cpp +++ b/src/abaddon.cpp @@ -7,7 +7,6 @@ #include "discord/discord.hpp" #include "dialogs/token.hpp" #include "dialogs/editmessage.hpp" -#include "dialogs/joinguild.hpp" #include "dialogs/confirm.hpp" #include "dialogs/setstatus.hpp" #include "dialogs/friendpicker.hpp" @@ -251,7 +250,6 @@ int Abaddon::StartGTK() { m_main_window->signal_action_disconnect().connect(sigc::mem_fun(*this, &Abaddon::ActionDisconnect)); m_main_window->signal_action_set_token().connect(sigc::mem_fun(*this, &Abaddon::ActionSetToken)); m_main_window->signal_action_reload_css().connect(sigc::mem_fun(*this, &Abaddon::ActionReloadCSS)); - m_main_window->signal_action_join_guild().connect(sigc::mem_fun(*this, &Abaddon::ActionJoinGuildDialog)); m_main_window->signal_action_set_status().connect(sigc::mem_fun(*this, &Abaddon::ActionSetStatus)); m_main_window->signal_action_add_recipient().connect(sigc::mem_fun(*this, &Abaddon::ActionAddRecipient)); m_main_window->signal_action_view_pins().connect(sigc::mem_fun(*this, &Abaddon::ActionViewPins)); @@ -767,15 +765,6 @@ void Abaddon::ActionSetToken() { m_main_window->UpdateMenus(); } -void Abaddon::ActionJoinGuildDialog() { - JoinGuildDialog dlg(*m_main_window); - auto response = dlg.run(); - if (response == Gtk::RESPONSE_OK) { - auto code = dlg.GetCode(); - m_discord.JoinGuild(code); - } -} - void Abaddon::ActionChannelOpened(Snowflake id, bool expand_to) { if (!id.IsValid()) { m_discord.SetReferringChannel(Snowflake::Invalid); |