mirror of
https://github.com/uowuo/abaddon.git
synced 2024-09-20 23:11:51 +00:00
Merge branch 'master' into disk-cache
This commit is contained in:
commit
f277753375
|
@ -21,9 +21,8 @@ Abaddon::Abaddon()
|
|||
LoadFromSettings();
|
||||
|
||||
// todo: set user agent for non-client(?)
|
||||
std::string ua = m_settings.GetSettingString("http", "user_agent", "");
|
||||
if (ua != "")
|
||||
m_discord.SetUserAgent(ua);
|
||||
std::string ua = m_settings.GetSettingString("http", "user_agent", "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) discord/0.0.308 Chrome/78.0.3904.130 Electron/7.3.2 Safari/537.36");
|
||||
m_discord.SetUserAgent(ua);
|
||||
|
||||
m_discord.signal_gateway_ready().connect(sigc::mem_fun(*this, &Abaddon::DiscordOnReady));
|
||||
m_discord.signal_message_create().connect(sigc::mem_fun(*this, &Abaddon::DiscordOnMessageCreate));
|
||||
|
|
|
@ -50,7 +50,7 @@ ChatWindow::ChatWindow() {
|
|||
m_input->set_wrap_mode(Gtk::WRAP_WORD_CHAR);
|
||||
|
||||
m_input_scroll->set_max_content_height(200);
|
||||
m_input_scroll->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
|
||||
m_input_scroll->set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
|
||||
|
||||
m_input_scroll->add(*m_input);
|
||||
m_scroll->add(*m_list);
|
||||
|
|
Loading…
Reference in New Issue
Block a user