changeset
Merged in default (pull request #547)
Fri, 06 Sep 2019 02:45:43 +0000
- author
- Gary Kramlich <grim@reaperworld.com>
- date
- Fri, 06 Sep 2019 02:45:43 +0000
- changeset 39813
- 73befc5e279d
- parent 39811
- 9df62dea4e56 (current diff)
- parent 39812
- d9367dc7edfd (diff)
- child 39817
- bb365bc11691
Merged in default (pull request #547)
Fix a few broken PURPLE_IS_CHAT checks and fix a incorrect typecast
Approved-by: Elliott Sales de Andrade
Approved-by: Eion Robb
--- a/libpurple/chat.c Wed Sep 04 03:48:47 2019 +0000 +++ b/libpurple/chat.c Fri Sep 06 02:45:43 2019 +0000 @@ -62,7 +62,7 @@ { PurpleChatPrivate *priv = NULL; - g_return_val_if_fail(PURPLE_IS_CHAT(priv), NULL); + g_return_val_if_fail(PURPLE_IS_CHAT(chat), NULL); priv = purple_chat_get_instance_private(chat); @@ -78,7 +78,7 @@ char *ret = NULL; PurpleProtocol *protocol = NULL; - g_return_val_if_fail(PURPLE_IS_CHAT(priv), NULL); + g_return_val_if_fail(PURPLE_IS_CHAT(chat), NULL); priv = purple_chat_get_instance_private(chat); @@ -103,7 +103,7 @@ char *old_alias; char *new_alias = NULL; - g_return_if_fail(PURPLE_IS_CHAT(priv)); + g_return_if_fail(PURPLE_IS_CHAT(chat)); priv = purple_chat_get_instance_private(chat); @@ -149,7 +149,7 @@ { PurpleChatPrivate *priv = NULL; - g_return_val_if_fail(PURPLE_IS_CHAT(priv), NULL); + g_return_val_if_fail(PURPLE_IS_CHAT(chat), NULL); priv = purple_chat_get_instance_private(chat); return priv->account; @@ -160,7 +160,7 @@ { PurpleChatPrivate *priv = NULL; - g_return_val_if_fail(PURPLE_IS_CHAT(priv), NULL); + g_return_val_if_fail(PURPLE_IS_CHAT(chat), NULL); priv = purple_chat_get_instance_private(chat); return priv->components;
--- a/pidgin/gtkconv.c Wed Sep 04 03:48:47 2019 +0000 +++ b/pidgin/gtkconv.c Fri Sep 06 02:45:43 2019 +0000 @@ -4375,7 +4375,7 @@ /* Setup the entry widget and all signals */ gtkconv->editor = talkatu_editor_new(); - talkatu_editor_set_buffer(TALKATU_BUFFER(gtkconv->editor), talkatu_html_buffer_new()); + talkatu_editor_set_buffer(TALKATU_EDITOR(gtkconv->editor), talkatu_html_buffer_new()); gtk_box_pack_start(GTK_BOX(gtkconv->lower_hbox), gtkconv->editor, TRUE, TRUE, 0); view = talkatu_editor_get_view(TALKATU_EDITOR(gtkconv->editor));
