1 files changed, 15 insertions, 14 deletions
diff --git a/components/chatmessage.hpp b/components/chatmessage.hpp
index 7bc050d..f319449 100644
--- a/components/chatmessage.hpp
+++ b/components/chatmessage.hpp
@@ -25,7 +25,8 @@ protected:
     Gtk::Widget *CreateEmbedComponent(const EmbedData &data); // Message.Embeds[0]
     Gtk::Widget *CreateImageComponent(const std::string &proxy_url, const std::string &url, int inw, int inh);
     Gtk::Widget *CreateAttachmentComponent(const AttachmentData &data); // non-image attachments
-    Gtk::Widget *CreateStickerComponent(const StickerData &data);
+    Gtk::Widget *CreateStickerComponentDeprecated(const StickerData &data);
+    Gtk::Widget *CreateStickersComponent(const std::vector<StickerItem> &data);
     Gtk::Widget *CreateReactionsComponent(const Message &data);
     Gtk::Widget *CreateReplyComponent(const Message &data);
 
@@ -57,8 +58,8 @@ protected:
 
     void AttachEventHandlers(Gtk::Widget &widget);
 
-    Gtk::EventBox *m_ev;
-    Gtk::Box *m_main;
+    Gtk::EventBox *_ev;
+    Gtk::Box m_main;
     Gtk::Label *m_attrib_label = nullptr;
 
     Gtk::TextView *m_text_component = nullptr;
@@ -89,25 +90,25 @@ public:
     ChatMessageHeader(const Message &data);
     void AddContent(Gtk::Widget *widget, bool prepend);
     void UpdateNameColor();
-    std::vector<Gtk::Widget*> GetChildContent();
+    std::vector<Gtk::Widget *> GetChildContent();
 
 protected:
     void AttachUserMenuHandler(Gtk::Widget &widget);
 
     bool on_author_button_press(GdkEventButton *ev);
 
-    std::vector<Gtk::Widget*> m_content_widgets;
+    std::vector<Gtk::Widget *> m_content_widgets;
 
-    Gtk::Box *m_main_box;
-    Gtk::Box *m_content_box;
-    Gtk::EventBox *m_content_box_ev;
-    Gtk::Box *m_meta_box;
-    Gtk::EventBox *m_meta_ev;
-    Gtk::Label *m_author;
-    Gtk::Label *m_timestamp;
+    Gtk::Box m_main_box;
+    Gtk::Box m_content_box;
+    Gtk::EventBox m_content_box_ev;
+    Gtk::Box m_meta_box;
+    Gtk::EventBox m_meta_ev;
+    Gtk::Label m_author;
+    Gtk::Label m_timestamp;
     Gtk::Label *m_extra = nullptr;
-    Gtk::Image *m_avatar;
-    Gtk::EventBox *m_avatar_ev;
+    Gtk::Image m_avatar;
+    Gtk::EventBox m_avatar_ev;
 
     Glib::RefPtr<Gdk::Pixbuf> m_static_avatar;
     Glib::RefPtr<Gdk::PixbufAnimation> m_anim_avatar;