diff options
| author | ouwou <26526779+ouwou@users.noreply.github.com> | 2024-06-22 04:25:56 -0400 |
|---|---|---|
| committer | ouwou <26526779+ouwou@users.noreply.github.com> | 2024-06-22 04:25:56 -0400 |
| commit | e65174f5aab55fe3917dd52f97b1b00a07d30d38 (patch) | |
| tree | fed590caf0440fd47b72a51e21e692fe703860bd /src/components/channellist/channellisttree.hpp | |
| parent | 3dc8fa8e65bdd1bd45dfa0171a06dfbb448baf0d (diff) | |
| parent | 7af15b326df5a638b24c5e637d5f37396276f906 (diff) | |
| download | abaddon-portaudio-e65174f5aab55fe3917dd52f97b1b00a07d30d38.tar.gz abaddon-portaudio-e65174f5aab55fe3917dd52f97b1b00a07d30d38.zip | |
Merge branch 'master' into stages
Diffstat (limited to 'src/components/channellist/channellisttree.hpp')
| -rw-r--r-- | src/components/channellist/channellisttree.hpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/components/channellist/channellisttree.hpp b/src/components/channellist/channellisttree.hpp index f61cea7..323f843 100644 --- a/src/components/channellist/channellisttree.hpp +++ b/src/components/channellist/channellisttree.hpp @@ -104,10 +104,7 @@ protected: Gtk::TreeModel::iterator AddGuild(const GuildData &guild, const Gtk::TreeNodeChildren &root); Gtk::TreeModel::iterator UpdateCreateChannelCategory(const ChannelData &channel); Gtk::TreeModel::iterator CreateThreadRow(const Gtk::TreeNodeChildren &children, const ChannelData &channel); - -#ifdef WITH_VOICE Gtk::TreeModel::iterator CreateVoiceParticipantRow(const UserData &user, const Gtk::TreeNodeChildren &parent); -#endif void UpdateChannelCategory(const ChannelData &channel); @@ -162,7 +159,6 @@ protected: Gtk::MenuItem m_menu_channel_open_tab; #endif -#ifdef WITH_VOICE Gtk::Menu m_menu_voice_channel; Gtk::MenuItem m_menu_voice_channel_join; Gtk::MenuItem m_menu_voice_channel_disconnect; @@ -170,7 +166,8 @@ protected: Gtk::Menu m_menu_voice_stage; Gtk::MenuItem m_menu_voice_stage_join; Gtk::MenuItem m_menu_voice_stage_disconnect; -#endif + Gtk::MenuItem m_menu_voice_channel_mark_as_read; + Gtk::MenuItem m_menu_voice_open_chat; Gtk::Menu m_menu_dm; Gtk::MenuItem m_menu_dm_copy_id; @@ -198,11 +195,8 @@ protected: void OnChannelSubmenuPopup(); void OnDMSubmenuPopup(); void OnThreadSubmenuPopup(); - -#ifdef WITH_VOICE void OnVoiceChannelSubmenuPopup(); void OnVoiceStageSubmenuPopup(); -#endif bool m_updating_listing = false; |