Merge branch 'master' into friends

2 files changed, 4 insertions, 4 deletions

diff --git a/windows/profile/mutualfriendspane.cpp b/windows/profile/mutualfriendspane.cpp
index 7d30453..5e6120a 100644
--- a/windows/profile/mutualfriendspane.cpp
+++ b/windows/profile/mutualfriendspane.cpp
@@ -34,6 +34,7 @@ MutualFriendItem::MutualFriendItem(const UserData &user)
 
 MutualFriendsPane::MutualFriendsPane(Snowflake id)
     : UserID(id) {
+    signal_map().connect(sigc::mem_fun(*this, &MutualFriendsPane::OnMap));
     add(m_list);
     show_all_children();
 }
@@ -49,7 +50,7 @@ void MutualFriendsPane::OnFetchRelationships(const std::vector<UserData> &users)
     }
 }
 
-void MutualFriendsPane::on_switched_to() {
+void MutualFriendsPane::OnMap() {
     if (m_requested) return;
     m_requested = true;
 
diff --git a/windows/profile/mutualfriendspane.hpp b/windows/profile/mutualfriendspane.hpp
index 10daa39..764dee9 100644
--- a/windows/profile/mutualfriendspane.hpp
+++ b/windows/profile/mutualfriendspane.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include <gtkmm.h>
-#include "../../components/inotifyswitched.hpp"
 #include "../../discord/objects.hpp"
 
 class MutualFriendItem : public Gtk::Box {
@@ -12,14 +11,14 @@ private:
     Gtk::Label m_name;
 };
 
-class MutualFriendsPane : public Gtk::ScrolledWindow, public INotifySwitched {
+class MutualFriendsPane : public Gtk::ScrolledWindow {
 public:
     MutualFriendsPane(Snowflake id);
 
     Snowflake UserID;
 
 private:
-    void on_switched_to() override;
+    void OnMap();
 
     bool m_requested = false;