fix warning

iptux-src · May 24, 2024 · 6d63251 · 6d63251
1 parent 60c986d
commit 6d63251
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/iptux/DialogBase.cpp b/src/iptux/DialogBase.cpp
@@ -307,9 +307,10 @@ GtkWidget* DialogBase::CreateHistoryArea() {
                    G_CALLBACK(textview_motion_notify_event), NULL);
   g_signal_connect(chat_history_widget, "visibility-notify-event",
                    G_CALLBACK(textview_visibility_notify_event), NULL);
-  g_signal_connect_swapped(
-      grpinf->buffer, "insert-child-anchor",
-      G_CALLBACK(DialogBase::OnChatHistoryInsertChildAnchor), this);
+  g_signal_connect_data(grpinf->buffer, "insert-child-anchor",
+                        G_CALLBACK(DialogBase::OnChatHistoryInsertChildAnchor),
+                        this, NULL,
+                        (GConnectFlags)(G_CONNECT_AFTER | G_CONNECT_SWAPPED));
 
   /* 滚动消息到最末位置 */
   ScrollHistoryTextview();

diff --git a/src/iptux/UiModels.cpp b/src/iptux/UiModels.cpp
@@ -676,11 +676,12 @@ static void InsertPixbufToBuffer(GtkTextBuffer* buffer, const gchar* path) {
   GtkTextIter iter;
 
   gtk_text_buffer_get_end_iter(buffer, &iter);
-  GtkTextChildAnchor* anchor =
-      gtk_text_buffer_create_child_anchor(buffer, &iter);
+  GtkTextChildAnchor* anchor = gtk_text_child_anchor_new();
   g_object_set_data_full(G_OBJECT(anchor), kObjectKeyImagePath, g_strdup(path),
                          GDestroyNotify(g_free));
   gtk_text_buffer_insert_child_anchor(buffer, &iter, anchor);
+  gtk_text_buffer_get_end_iter(buffer, &iter);
+  gtk_text_buffer_insert(buffer, &iter, "\n", -1);
 }
 
 void GroupInfo::addMsgPara(const MsgPara& para) {

diff --git a/src/iptux/UiModelsTest.cpp b/src/iptux/UiModelsTest.cpp
@@ -110,5 +110,5 @@ TEST(GroupInfo, addMsgPara) {
       ChipData(MessageContentType::PICTURE, testDataPath("iptux.png")));
   gi.addMsgPara(msg);
   ASSERT_EQ(igtk_text_get_all_text(gi.buffer).substr(10),
-            " palname:\nhelloworld\n\xEF\xBF\xBC");
+            " palname:\nhelloworld\n\xEF\xBF\xBC\n");
 }