celisej567/abaddon
1
0
Fork 0
mirror of https://github.com/celisej567/abaddon.git synced 2026-09-06 20:15:19 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/uowuo/abaddon into msys

Browse Source
This commit is contained in:
ouwou
2021-11-18 01:03:35 -05:00
parent 1f68da6b77 9d21df8e1b
commit 9c285a09e5
24 changed files with 68 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
abaddon.cpp
View File

@@ -23,8 +23,8 @@
Abaddon::Abaddon()
: m_settings(Platform::FindConfigFile())
, m_emojis(GetResPath("/emojis.bin"))
, m_discord(m_settings.GetUseMemoryDB()) { // stupid but easy
, m_discord(m_settings.GetUseMemoryDB()) // stupid but easy
, m_emojis(GetResPath("/emojis.bin")) {
LoadFromSettings();
// todo: set user agent for non-client(?)
@@ -56,7 +56,6 @@ Abaddon::Abaddon()
Abaddon::~Abaddon() {
m_settings.Close();
StopDiscord();
}
Abaddon &Abaddon::Get() {
@@ -268,7 +267,7 @@ void Abaddon::ShowUserMenu(const GdkEvent *event, Snowflake id, Snowflake guild_
if (guild.has_value() && user.has_value()) {
const auto roles = user->GetSortedRoles();
m_user_menu_roles->set_visible(roles.size() > 0);
for (const auto role : roles) {
for (const auto &role : roles) {
auto *item = Gtk::manage(new Gtk::MenuItem(role.Name));
if (role.Color != 0) {
Gdk::RGBA color;