Mercurial > pidgin3 / file diff

--- a/libpurple/purpleconversation.c	Mon Aug 28 22:56:24 2023 -0500
+++ b/libpurple/purpleconversation.c	Tue Aug 29 02:09:55 2023 -0500
@@ -172,8 +172,7 @@
 		PurpleMessage *msg = NULL;
 
 		name = purple_conversation_get_name(conv);
-		msg = purple_message_new_outgoing(priv->account, me, name, sent,
-		                                  msgflags);
+		msg = purple_message_new_outgoing(me, name, sent, msgflags);
 
 		purple_signal_emit(handle, "sending-im-msg", account, msg);
 
@@ -194,8 +193,7 @@
 		PurpleMessage *msg;
 		gint id = purple_chat_conversation_get_id(PURPLE_CHAT_CONVERSATION(conv));
 
-		msg = purple_message_new_outgoing(priv->account, me, NULL, sent,
-		                                  msgflags);
+		msg = purple_message_new_outgoing(me, NULL, sent, msgflags);
 
 		purple_signal_emit(handle, "sending-chat-msg", account, msg, id);
 
@@ -1097,15 +1095,10 @@
                                          const gchar *message,
                                          PurpleMessageFlags flags)
 {
-	PurpleConversationPrivate *priv = NULL;
-
 	g_return_if_fail(PURPLE_IS_CONVERSATION(conv));
 
-	priv = purple_conversation_get_instance_private(conv);
-
 	_purple_conversation_write_common(conv,
-	                                  purple_message_new_system(priv->account,
-	                                                            message,
+	                                  purple_message_new_system(message,
 	                                                            flags));
 }