/soc/2013/ankitkv/gobjectification: bbecf6e1daee: Replace purple...

[Ankit Vani]

Changeset: bbecf6e1daee214c08575367b5614ea9d2ac5664
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-06-23 21:49 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/bbecf6e1daee

Description:

Replace purple_conv_ by purple_conversation_ calls

diffstat:

 libpurple/protocols/msn/msg.c        |  6 +++---
 libpurple/protocols/msn/msn.c        |  6 +++---
 libpurple/protocols/oscar/oscar.c    |  2 +-
 libpurple/protocols/silc/buddy.c     |  2 +-
 libpurple/protocols/yahoo/libyahoo.c |  2 +-
 pidgin/plugins/notify.c              |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diffs (92 lines):

diff --git a/libpurple/protocols/msn/msg.c b/libpurple/protocols/msn/msg.c
--- a/libpurple/protocols/msn/msg.c
+++ b/libpurple/protocols/msn/msg.c
@@ -921,8 +921,8 @@ got_emoticon(MsnSlpCall *slpcall,
 		   instead of all at once, calling write multiple times and
 		   close once at the very end
 		 */
-		purple_conv_custom_smiley_write(conv, slpcall->data_info, data, size);
-		purple_conv_custom_smiley_close(conv, slpcall->data_info );
+		purple_conversation_custom_smiley_write(conv, slpcall->data_info, data, size);
+		purple_conversation_custom_smiley_close(conv, slpcall->data_info );
 	}
 	if (purple_debug_is_verbose())
 		purple_debug_info("msn", "Got smiley: %s\n", slpcall->data_info);
@@ -999,7 +999,7 @@ void msn_emoticon_msg(MsnCmdProc *cmdpro
 			conv = purple_im_conversation_new(session->account, who);
 		}
 
-		if (purple_conv_custom_smiley_add(conv, smile, "sha1", sha1, TRUE)) {
+		if (purple_conversation_custom_smiley_add(conv, smile, "sha1", sha1, TRUE)) {
 			msn_slplink_request_object(slplink, smile, got_emoticon, NULL, obj);
 		}
 
diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
@@ -2052,14 +2052,14 @@ msn_chat_send(PurpleConnection *gc, int 
 	while (smileys) {
 		smile = (MsnEmoticon *)smileys->data;
 		emoticons = msn_msg_emoticon_add(emoticons, smile);
-		if (purple_conv_custom_smiley_add(swboard->conv, smile->smile,
+		if (purple_conversation_custom_smiley_add(swboard->conv, smile->smile,
 		                                  "sha1", purple_smiley_get_checksum(smile->ps),
 		                                  FALSE)) {
 			gconstpointer data;
 			size_t len;
 			data = purple_smiley_get_data(smile->ps, &len);
-			purple_conv_custom_smiley_write(swboard->conv, smile->smile, data, len);
-			purple_conv_custom_smiley_close(swboard->conv, smile->smile);
+			purple_conversation_custom_smiley_write(swboard->conv, smile->smile, data, len);
+			purple_conversation_custom_smiley_close(swboard->conv, smile->smile);
 		}
 		msn_emoticon_destroy(smile);
 		smileys = g_slist_delete_link(smileys, smileys);
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -5653,7 +5653,7 @@ static gboolean oscar_uri_handler(const 
 			if (message) {
 				/* Spaces are encoded as '+' */
 				g_strdelimit(message, "+", ' ');
-				purple_conv_send_confirm(conv, message);
+				purple_conversation_send_confirm(conv, message);
 			}
 		}
 		/*else
diff --git a/libpurple/protocols/silc/buddy.c b/libpurple/protocols/silc/buddy.c
--- a/libpurple/protocols/silc/buddy.c
+++ b/libpurple/protocols/silc/buddy.c
@@ -96,7 +96,7 @@ silcpurple_buddy_keyagr_cb(SilcClient cl
 			if (convo) {
 				/* we don't have windows in the core anymore...but we may want to
 				 * provide some method for asking the UI to show the window
-				purple_conv_window_show(purple_conversation_get_window(convo));
+				purple_conversation_window_show(purple_conversation_get_window(convo));
 				 */
 			} else {
 				convo = purple_im_conversation_new(sg->account,
diff --git a/libpurple/protocols/yahoo/libyahoo.c b/libpurple/protocols/yahoo/libyahoo.c
--- a/libpurple/protocols/yahoo/libyahoo.c
+++ b/libpurple/protocols/yahoo/libyahoo.c
@@ -121,7 +121,7 @@ static gboolean yahoo_uri_handler(const 
 			if (message) {
 				/* Spaces are encoded as '+' */
 				g_strdelimit(message, "+", ' ');
-				purple_conv_send_confirm(conv, message);
+				purple_conversation_send_confirm(conv, message);
 			}
 		}
 		/* else
diff --git a/pidgin/plugins/notify.c b/pidgin/plugins/notify.c
--- a/pidgin/plugins/notify.c
+++ b/pidgin/plugins/notify.c
@@ -454,7 +454,7 @@ conversation_dragging(PurpleConversation
 			printf("if else count = %d\n", count_messages(old_purplewin));
 			/*
 			PurpleConversation *old_active_conv = NULL;
-			old_active_conv = purple_conv_window_get_active_conversation(new_purplewin);
+			old_active_conv = purple_conversation_window_get_active_conversation(new_purplewin);
 
 			purple_conversation_autoset_title(old_active_conv);
 			handle_urgent(old_purplewin, FALSE);