/soc/2013/ankitkv/gobjectification: 54af0dd9faa5: Fixed build er...

[Ankit Vani]

Changeset: 54af0dd9faa54710ea7294ec3b6b87e996c6cebf
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-13 20:41 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/54af0dd9faa5

Description:

Fixed build errors

diffstat:

 libpurple/conversation.c              |  2 +-
 libpurple/conversationtypes.c         |  4 ++--
 libpurple/protocols/jabber/presence.c |  2 +-
 libpurple/xfer.c                      |  6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diffs (68 lines):

diff --git a/libpurple/conversation.c b/libpurple/conversation.c
--- a/libpurple/conversation.c
+++ b/libpurple/conversation.c
@@ -691,7 +691,7 @@ purple_conversation_send_confirm(PurpleC
 		purple_request_cpar_from_account(
 			purple_conversation_get_account(conv)),
 		data, 2, _("_Send Message"),
-		G_CALLBACK(purple_conv_send_confirm_cb), _("Cancel"), NULL);
+		G_CALLBACK(purple_conversation_send_confirm_cb), _("Cancel"), NULL);
 }
 
 gboolean
diff --git a/libpurple/conversationtypes.c b/libpurple/conversationtypes.c
--- a/libpurple/conversationtypes.c
+++ b/libpurple/conversationtypes.c
@@ -1253,8 +1253,8 @@ void purple_chat_conversation_invite_use
 			fields,
 			_("Invite"), G_CALLBACK(invite_user_to_chat),
 			_("Cancel"), NULL,
-			purple_request_cpar_from_conversation(conv),
-			conv);
+			purple_request_cpar_from_conversation(PURPLE_CONVERSATION(chat)),
+			chat);
 }
 
 gboolean
diff --git a/libpurple/protocols/jabber/presence.c b/libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c
+++ b/libpurple/protocols/jabber/presence.c
@@ -600,7 +600,7 @@ handle_presence_chat(JabberStream *js, J
 							" you like to configure it, or"
 							" accept the default settings?"),
 						/* Default Action */ 1,
-						purple_request_cpar_from_conversation(chat->conv),
+						purple_request_cpar_from_conversation(PURPLE_CONVERSATION(chat->conv)),
 						chat, 2,
 						_("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure),
 						_("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room));
diff --git a/libpurple/xfer.c b/libpurple/xfer.c
--- a/libpurple/xfer.c
+++ b/libpurple/xfer.c
@@ -425,7 +425,7 @@ static int
 purple_xfer_choose_file(PurpleXfer *xfer)
 {
 	purple_request_file(xfer, NULL, purple_xfer_get_filename(xfer),
-		(purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE),
+		(purple_xfer_get_xfer_type(xfer) == PURPLE_XFER_TYPE_RECEIVE),
 		G_CALLBACK(purple_xfer_choose_file_ok_cb),
 		G_CALLBACK(purple_xfer_choose_file_cancel_cb),
 		purple_request_cpar_from_account(purple_xfer_get_account(xfer)),
@@ -478,7 +478,7 @@ purple_xfer_ask_recv(PurpleXfer *xfer)
 			serv_got_im(purple_account_get_connection(priv->account),
 								 priv->who, priv->message, 0, time(NULL));
 
-		cpar = purple_request_cpar_from_account(xfer->account);
+		cpar = purple_request_cpar_from_account(priv->account);
 		if ((thumb = purple_xfer_get_thumbnail(xfer, &thumb_size))) {
 			purple_request_cpar_set_custom_icon(cpar, thumb,
 				thumb_size);
@@ -528,7 +528,7 @@ purple_xfer_ask_accept(PurpleXfer *xfer)
 					   purple_xfer_get_remote_port(xfer));
 	purple_request_accept_cancel(xfer, NULL, buf, buf2,
 		PURPLE_DEFAULT_ACTION_NONE,
-		purple_request_cpar_from_account(xfer->account), xfer,
+		purple_request_cpar_from_account(priv->account), xfer,
 		G_CALLBACK(ask_accept_ok), G_CALLBACK(ask_accept_cancel));
 	g_free(buf);
 	g_free(buf2);