/soc/2013/ankitkv/gobjectification: 98cc09f60623: Merged default...

[Ankit Vani]

Changeset: 98cc09f60623280b08460d3d6e1164a07eab5f53
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-08-31 23:07 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/98cc09f60623

Description:

Merged default branch

diffstat:

 libpurple/conversation.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (14 lines):

diff --git a/libpurple/conversation.c b/libpurple/conversation.c
--- a/libpurple/conversation.c
+++ b/libpurple/conversation.c
@@ -894,8 +894,8 @@ purple_conversation_get_max_message_size
 
 	g_return_val_if_fail(conv != NULL, 0);
 
-	prpl = purple_conversation_get_connection(
-		purple_connection_get_prpl(gc));
+	prpl = purple_connection_get_prpl(
+		purple_conversation_get_connection(conv));
 	g_return_val_if_fail(prpl != NULL, 0);
 
 	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);