Replaced purple_conversation_new() with purple_[im,chat]_conversation_new()

30 files changed, 47 insertions, 47 deletions

diff --git a/finch/gntblist.c b/finch/gntblist.c
index 2f2efb044a..2b32f7f79a 100644
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -2731,7 +2731,7 @@ send_im_select_cb(gpointer data, PurpleRequestFields *fields)
 	account  = purple_request_fields_get_account(fields, "account");
 	username = purple_request_fields_get_string(fields,  "screenname");
 
-	conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, username);
+	conv = purple_im_conversation_new(account, username);
 	purple_conversation_present(conv);
 }
 
@@ -2792,7 +2792,7 @@ join_chat_select_cb(gpointer data, PurpleRequestFields *fields)
 	 * But it's necessary to pretend that we left the chat, because otherwise
 	 * a new conversation window will pop up when we finally join the chat. */
 	if (!(conv = purple_conversations_find_chat_with_account(name, account))) {
-		conv = purple_conversation_new(PURPLE_CONV_TYPE_CHAT, account, name);
+		conv = purple_chat_conversation_new(account, name);
 		purple_chat_conversation_left(PURPLE_CONV_CHAT(conv));
 	} else {
 		purple_conversation_present(conv);
diff --git a/finch/gntconv.c b/finch/gntconv.c
index 3e2c75c02d..82227ae65a 100644
--- a/finch/gntconv.c
+++ b/finch/gntconv.c
@@ -518,7 +518,7 @@ send_to_cb(GntMenuItem *m, gpointer n)
 {
 	PurpleAccount *account = g_object_get_data(G_OBJECT(m), "purple_account");
 	gchar *buddy = g_object_get_data(G_OBJECT(m), "purple_buddy_name");
-	PurpleConversation *conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, buddy);
+	PurpleConversation *conv = purple_im_conversation_new(account, buddy);
 	finch_conversation_set_active(conv);
 }
 
@@ -725,7 +725,7 @@ create_conv_from_userlist(GntWidget *widget, FinchConv *fc)
 		realname = prpl_info->get_cb_real_name(gc, purple_chat_conversation_get_id(PURPLE_CONV_CHAT(fc->active_conv)), name);
 	else
 		realname = NULL;
-	purple_conversation_new(PURPLE_CONV_TYPE_IM, account, realname ? realname : name);
+	purple_im_conversation_new(account, realname ? realname : name);
 	g_free(realname);
 }
 
diff --git a/finch/gntmedia.c b/finch/gntmedia.c
index 8b6200a949..d42a48efb8 100644
--- a/finch/gntmedia.c
+++ b/finch/gntmedia.c
@@ -390,7 +390,7 @@ finch_new_media(PurpleMediaManager *manager, PurpleMedia *media,
 	GntWidget *gntmedia;
 	PurpleConversation *conv;
 
-	conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, name);
+	conv = purple_im_conversation_new(account, name);
 
 	gntmedia = finch_media_new(media);
 	g_signal_connect(G_OBJECT(gntmedia), "message", G_CALLBACK(gntmedia_message_cb), conv);
diff --git a/finch/gntpounce.c b/finch/gntpounce.c
index cab0100fbb..e1922f1cae 100644
--- a/finch/gntpounce.c
+++ b/finch/gntpounce.c
@@ -802,7 +802,7 @@ pounce_cb(PurplePounce *pounce, PurplePounceEvent events, void *data)
 	if (purple_pounce_action_is_enabled(pounce, "open-window"))
 	{
 		if (!purple_conversations_find_im_with_account(pouncee, account))
-			purple_conversation_new(PURPLE_CONV_TYPE_IM, account, pouncee);
+			purple_im_conversation_new(account, pouncee);
 	}
 
 	if (purple_pounce_action_is_enabled(pounce, "popup-notify"))
@@ -877,7 +877,7 @@ pounce_cb(PurplePounce *pounce, PurplePounceEvent events, void *data)
 			conv = purple_conversations_find_im_with_account(pouncee, account);
 
 			if (conv == NULL)
-				conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, pouncee);
+				conv = purple_im_conversation_new(account, pouncee);
 
 			purple_conversation_write(conv, NULL, message,
 									PURPLE_MESSAGE_SEND, time(NULL));
diff --git a/finch/plugins/gnttinyurl.c b/finch/plugins/gnttinyurl.c
index a71480d70d..b2beaf82f0 100644
--- a/finch/plugins/gnttinyurl.c
+++ b/finch/plugins/gnttinyurl.c
@@ -278,7 +278,7 @@ static gboolean writing_msg(PurpleAccount *account, char *sender, char **message
 	*message = t->str;
 	g_string_free(t, FALSE);
 	if (conv == NULL)
-		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, sender);
+		conv = purple_im_conversation_new(account, sender);
 	purple_conversation_set_data(conv, "TinyURLs", urls);
 	return FALSE;
 }
diff --git a/libpurple/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c
index 72f077e424..47ad0f6aac 100644
--- a/libpurple/protocols/gg/gg.c
+++ b/libpurple/protocols/gg/gg.c
@@ -420,7 +420,7 @@ void ggp_recv_message_handler(PurpleConnection *gc, const struct gg_event_msg *e
 		conv = purple_conversations_find_with_account(
 			PURPLE_CONV_TYPE_IM, who, account);
 		if (conv == NULL)
-			conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, who);
+			conv = purple_im_conversation_new(account, who);
 		purple_conversation_write(conv, purple_account_get_username(account), msg, PURPLE_MESSAGE_SEND, mtime);
 	} else if (ev->recipients_count == 0) {
 		serv_got_im(gc, from, msg, 0, mtime);
diff --git a/libpurple/protocols/irc/cmds.c b/libpurple/protocols/irc/cmds.c
index de6e04946b..ebcbc2a908 100644
--- a/libpurple/protocols/irc/cmds.c
+++ b/libpurple/protocols/irc/cmds.c
@@ -452,7 +452,7 @@ int irc_cmd_query(struct irc_conn *irc, const char *cmd, const char *target, con
 	if (!args || !args[0])
 		return 0;
 
-	convo = purple_conversation_new(PURPLE_CONV_TYPE_IM, irc->account, args[0]);
+	convo = purple_im_conversation_new(irc->account, args[0]);
 	purple_conversation_present(convo);
 
 	if (args[1]) {
diff --git a/libpurple/protocols/jabber/libfacebook.c b/libpurple/protocols/jabber/libfacebook.c
index b426eac356..843816064b 100644
--- a/libpurple/protocols/jabber/libfacebook.c
+++ b/libpurple/protocols/jabber/libfacebook.c
@@ -230,7 +230,7 @@ static gboolean xmpp_uri_handler(const char *proto, const char *user, GHashTable
 		char *body = g_hash_table_lookup(params, "body");
 		if (user && *user) {
 			PurpleConversation *conv =
-					purple_conversation_new(PURPLE_CONV_TYPE_IM, acct, user);
+					purple_im_conversation_new(acct, user);
 			purple_conversation_present(conv);
 			if (body && *body)
 				purple_conv_send_confirm(conv, body);
diff --git a/libpurple/protocols/jabber/libgtalk.c b/libpurple/protocols/jabber/libgtalk.c
index d52d1842c2..04af6a3a95 100644
--- a/libpurple/protocols/jabber/libgtalk.c
+++ b/libpurple/protocols/jabber/libgtalk.c
@@ -230,7 +230,7 @@ static gboolean xmpp_uri_handler(const char *proto, const char *user, GHashTable
 		char *body = g_hash_table_lookup(params, "body");
 		if (user && *user) {
 			PurpleConversation *conv =
-					purple_conversation_new(PURPLE_CONV_TYPE_IM, acct, user);
+					purple_im_conversation_new(acct, user);
 			purple_conversation_present(conv);
 			if (body && *body)
 				purple_conv_send_confirm(conv, body);
diff --git a/libpurple/protocols/jabber/libxmpp.c b/libpurple/protocols/jabber/libxmpp.c
index 53b7b9bd75..9ee957bf91 100644
--- a/libpurple/protocols/jabber/libxmpp.c
+++ b/libpurple/protocols/jabber/libxmpp.c
@@ -224,7 +224,7 @@ static gboolean xmpp_uri_handler(const char *proto, const char *user, GHashTable
 		char *body = g_hash_table_lookup(params, "body");
 		if (user && *user) {
 			PurpleConversation *conv =
-					purple_conversation_new(PURPLE_CONV_TYPE_IM, acct, user);
+					purple_im_conversation_new(acct, user);
 			purple_conversation_present(conv);
 			if (body && *body)
 				purple_conv_send_confirm(conv, body);
diff --git a/libpurple/protocols/msn/msg.c b/libpurple/protocols/msn/msg.c
index d3d7c42df2..f6eb408ea2 100644
--- a/libpurple/protocols/msn/msg.c
+++ b/libpurple/protocols/msn/msg.c
@@ -800,7 +800,7 @@ datacast_inform_user(MsnSwitchBoard *swboard, const char *who,
 			swboard->conv = purple_conversations_find_with_account(PURPLE_CONV_TYPE_IM,
 									who, account);
 			if (swboard->conv == NULL)
-				swboard->conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, who);
+				swboard->conv = purple_im_conversation_new(account, who);
 		}
 	}
 
@@ -996,7 +996,7 @@ void msn_emoticon_msg(MsnCmdProc *cmdproc, MsnMessage *msg)
 		 * the conversation doesn't exist then we cannot associate the new
 		 * smiley with its GtkIMHtml widget. */
 		if (!conv) {
-			conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, session->account, who);
+			conv = purple_im_conversation_new(session->account, who);
 		}
 
 		if (purple_conv_custom_smiley_add(conv, smile, "sha1", sha1, TRUE)) {
diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c
index 9951b34dc6..af62926884 100644
--- a/libpurple/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
@@ -2888,7 +2888,7 @@ static gboolean msn_uri_handler(const char *proto, const char *cmd, GHashTable *
 			PurpleConversation *conv = purple_conversations_find_with_account(
 				PURPLE_CONV_TYPE_IM, sname, acct);
 			if (conv == NULL)
-				conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, acct, sname);
+				conv = purple_im_conversation_new(acct, sname);
 			purple_conversation_present(conv);
 		}
 		/*else
diff --git a/libpurple/protocols/msn/session.c b/libpurple/protocols/msn/session.c
index 384734a48a..5af34c12f5 100644
--- a/libpurple/protocols/msn/session.c
+++ b/libpurple/protocols/msn/session.c
@@ -189,7 +189,7 @@ msn_session_get_conv(MsnSession *session,const char *passport)
 	conv = purple_conversations_find_with_account(PURPLE_CONV_TYPE_IM,
 									passport, account);
 	if(conv == NULL){
-		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, passport);
+		conv = purple_im_conversation_new(account, passport);
 	}
 	return conv;
 }
diff --git a/libpurple/protocols/myspace/myspace.c b/libpurple/protocols/myspace/myspace.c
index ef90eb8180..79b82e9e69 100644
--- a/libpurple/protocols/myspace/myspace.c
+++ b/libpurple/protocols/myspace/myspace.c
@@ -3501,7 +3501,7 @@ msim_uri_handler_sendIM_cb(MsimSession *session, MsimMessage *userinfo, gpointer
 	conv = purple_conversations_find_im_with_account(username, session->account);
 	if (!conv)  {
 		purple_debug_info("msim_uri_handler", "creating new conversation for %s\n", username);
-		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, session->account, username);
+		conv = purple_im_conversation_new(session->account, username);
 	}
 
 	/* Just open the window so the user can send an IM. */
diff --git a/libpurple/protocols/oscar/odc.c b/libpurple/protocols/oscar/odc.c
index 24ecc90a56..5742016209 100644
--- a/libpurple/protocols/oscar/odc.c
+++ b/libpurple/protocols/oscar/odc.c
@@ -63,7 +63,7 @@ peer_odc_close(PeerConnection *conn)
 		PurpleConversation *conv;
 
 		account = purple_connection_get_account(conn->od->gc);
-		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, conn->bn);
+		conv = purple_im_conversation_new(account, conn->bn);
 		purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL));
 		g_free(tmp);
 	}
@@ -565,7 +565,7 @@ peer_odc_recv_frame(PeerConnection *conn, ByteStream *bs)
 
 		/* Tell the local user that we are connected */
 		account = purple_connection_get_account(gc);
-		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, conn->bn);
+		conv = purple_im_conversation_new(account, conn->bn);
 		purple_conversation_write(conv, NULL, _("Direct IM established"),
 				PURPLE_MESSAGE_SYSTEM, time(NULL));
 	}
@@ -610,7 +610,7 @@ peer_odc_recv_frame(PeerConnection *conn, ByteStream *bs)
 			g_free(size2);
 
 			account = purple_connection_get_account(conn->od->gc);
-			conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, conn->bn);
+			conv = purple_im_conversation_new(account, conn->bn);
 			purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL));
 			g_free(tmp);
 
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
index feecdc9090..4c38bf3164 100644
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -4985,7 +4985,7 @@ oscar_close_directim(gpointer object, gpointer ignored)
 
 		/* OSCAR_DISCONNECT_LOCAL_CLOSED doesn't write anything to the convo
 		 * window. Let the user know that we cancelled the Direct IM. */
-		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, name);
+		conv = purple_im_conversation_new(account, name);
 		purple_conversation_write(conv, NULL, _("You closed the connection."),
 				PURPLE_MESSAGE_SYSTEM, time(NULL));
 	}
@@ -5647,7 +5647,7 @@ static gboolean oscar_uri_handler(const char *proto, const char *cmd, GHashTable
 			PurpleConversation *conv = purple_conversations_find_with_account(
 				PURPLE_CONV_TYPE_IM, bname, acct);
 			if (conv == NULL)
-				conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, acct, bname);
+				conv = purple_im_conversation_new(acct, bname);
 			purple_conversation_present(conv);
 
 			if (message) {
diff --git a/libpurple/protocols/oscar/peer.c b/libpurple/protocols/oscar/peer.c
index 082f6c77e1..295e01d0ba 100644
--- a/libpurple/protocols/oscar/peer.c
+++ b/libpurple/protocols/oscar/peer.c
@@ -752,7 +752,7 @@ peer_connection_establish_listener_cb(int listenerfd, gpointer data)
 				listener_port, ++conn->lastrequestnumber);
 
 		/* Print a message to a local conversation window */
-		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, conn->bn);
+		conv = purple_im_conversation_new(account, conn->bn);
 		tmp = g_strdup_printf(_("Asking %s to connect to us at %s:%hu for "
 				"Direct IM."), conn->bn, listener_ip, listener_port);
 		purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL));
@@ -840,7 +840,7 @@ peer_connection_trynext(PeerConnection *conn)
 			PurpleConversation *conv;
 			tmp = g_strdup_printf(_("Attempting to connect to %s:%hu."),
 					conn->verifiedip, conn->port);
-			conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, conn->bn);
+			conv = purple_im_conversation_new(account, conn->bn);
 			purple_conversation_write(conv, NULL, tmp,
 					PURPLE_MESSAGE_SYSTEM, time(NULL));
 			g_free(tmp);
@@ -913,7 +913,7 @@ peer_connection_trynext(PeerConnection *conn)
 			gchar *tmp;
 			PurpleConversation *conv;
 			tmp = g_strdup(_("Attempting to connect via proxy server."));
-			conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, conn->bn);
+			conv = purple_im_conversation_new(account, conn->bn);
 			purple_conversation_write(conv, NULL, tmp,
 					PURPLE_MESSAGE_SYSTEM, time(NULL));
 			g_free(tmp);
diff --git a/libpurple/protocols/sametime/sametime.c b/libpurple/protocols/sametime/sametime.c
index 43cbcbf6f5..cbd292ce05 100644
--- a/libpurple/protocols/sametime/sametime.c
+++ b/libpurple/protocols/sametime/sametime.c
@@ -1843,7 +1843,7 @@ static void mw_session_announce(struct mwSession *s,
   pd = mwSession_getClientData(s);
   acct = purple_connection_get_account(pd->gc);
   conv = purple_conversations_find_im_with_account(who, acct);
-  if(! conv) conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, acct, who);
+  if(! conv) conv = purple_im_conversation_new(acct, who);
 
   buddy = purple_find_buddy(acct, who);
   if(buddy) who = (char *) purple_buddy_get_contact_alias(buddy);
@@ -4280,7 +4280,7 @@ static void notify_im(PurpleConnection *gc, GList *row, void *user_data) {
   acct = purple_connection_get_account(gc);
   id = g_list_nth_data(row, 1);
   conv = purple_conversations_find_im_with_account(id, acct);
-  if(! conv) conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, acct, id);
+  if(! conv) conv = purple_im_conversation_new(acct, id);
   purple_conversation_present(conv);
 }
 
diff --git a/libpurple/protocols/silc/buddy.c b/libpurple/protocols/silc/buddy.c
index 3457385679..22af0c810e 100644
--- a/libpurple/protocols/silc/buddy.c
+++ b/libpurple/protocols/silc/buddy.c
@@ -99,7 +99,7 @@ silcpurple_buddy_keyagr_cb(SilcClient client,
 				purple_conv_window_show(purple_conversation_get_window(convo));
 				 */
 			} else {
-				convo = purple_conversation_new(PURPLE_CONV_TYPE_IM, sg->account,
+				convo = purple_im_conversation_new(sg->account,
 								client_entry->nickname);
 			}
 			g_snprintf(tmp, sizeof(tmp), "%s [private key]", client_entry->nickname);
diff --git a/libpurple/protocols/silc/silc.c b/libpurple/protocols/silc/silc.c
index 86ffd8cb81..ea6892ec40 100644
--- a/libpurple/protocols/silc/silc.c
+++ b/libpurple/protocols/silc/silc.c
@@ -1695,7 +1695,7 @@ static PurpleCmdRet silcpurple_cmd_query(PurpleConversation *conv,
 
 	account = purple_connection_get_account(gc);
 
-	convo = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, args[0]);
+	convo = purple_im_conversation_new(account, args[0]);
 
 	if (args[1]) {
 		ret = silcpurple_send_im(gc, args[0], args[1], PURPLE_MESSAGE_SEND);
diff --git a/libpurple/protocols/yahoo/libyahoo.c b/libpurple/protocols/yahoo/libyahoo.c
index 5c995d02d6..f612fb176a 100644
--- a/libpurple/protocols/yahoo/libyahoo.c
+++ b/libpurple/protocols/yahoo/libyahoo.c
@@ -115,7 +115,7 @@ static gboolean yahoo_uri_handler(const char *proto, const char *cmd, GHashTable
 			PurpleConversation *conv = purple_conversations_find_with_account(
 				PURPLE_CONV_TYPE_IM, sname, acct);
 			if (conv == NULL)
-				conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, acct, sname);
+				conv = purple_im_conversation_new(acct, sname);
 			purple_conversation_present(conv);
 
 			if (message) {
diff --git a/libpurple/protocols/yahoo/libymsg.c b/libpurple/protocols/yahoo/libymsg.c
index b4a3240e4f..d53b5ba9ed 100644
--- a/libpurple/protocols/yahoo/libymsg.c
+++ b/libpurple/protocols/yahoo/libymsg.c
@@ -930,7 +930,7 @@ static void yahoo_process_sms_message(PurpleConnection *gc, struct yahoo_packet
 			PurpleConversation *c;
 			c = purple_conversations_find_im_with_account(sms->from, account);
 			if (c == NULL)
-				c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, sms->from);
+				c = purple_im_conversation_new(account, sms->from);
 			purple_conversation_write(c, NULL, server_msg, PURPLE_MESSAGE_SYSTEM, time(NULL));
 		}
 		else
diff --git a/libpurple/prpl.c b/libpurple/prpl.c
index dd300c16fb..6d32dd404b 100644
--- a/libpurple/prpl.c
+++ b/libpurple/prpl.c
@@ -474,7 +474,7 @@ purple_prpl_send_attention(PurpleConnection *gc, const char *who, guint type_cod
 	if (!send_attention(gc, who, type_code))
 		return;
 
-	conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, purple_connection_get_account(gc), who);
+	conv = purple_im_conversation_new(purple_connection_get_account(gc), who);
 	purple_im_conversation_write_message(PURPLE_CONV_IM(conv), NULL, description, flags, mtime);
 	purple_prpl_attention(conv, who, type_code, PURPLE_MESSAGE_SEND, time(NULL));
 
diff --git a/libpurple/server.c b/libpurple/server.c
index fc93cf2bca..837b281991 100644
--- a/libpurple/server.c
+++ b/libpurple/server.c
@@ -600,7 +600,7 @@ void serv_got_im(PurpleConnection *gc, const char *who, const char *msg,
 		conv = purple_conversations_find_im_with_account(name, purple_connection_get_account(gc));
 
 	if (conv == NULL)
-		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, name);
+		conv = purple_im_conversation_new(account, name);
 
 	purple_im_conversation_write_message(PURPLE_CONV_IM(conv), name, message, flags, mtime);
 	g_free(message);
@@ -829,7 +829,7 @@ PurpleConversation *serv_got_joined_chat(PurpleConnection *gc,
 	g_return_val_if_fail(account != NULL, NULL);
 	g_return_val_if_fail(name != NULL, NULL);
 
-	conv = purple_conversation_new(PURPLE_CONV_TYPE_CHAT, account, name);
+	conv = purple_chat_conversation_new(account, name);
 	g_return_val_if_fail(conv != NULL, NULL);
 
 	chat = PURPLE_CONV_CHAT(conv);
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index 84a2e69b6e..c1262e8328 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -2437,7 +2437,7 @@ menu_conv_sel_send_cb(GObject *m, gpointer data)
 	if (gtk_check_menu_item_get_active((GtkCheckMenuItem*) m) == FALSE)
 		return;
 
-	conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, name);
+	conv = purple_im_conversation_new(account, name);
 	pidgin_conv_switch_active_conversation(conv);
 }
 
@@ -5595,7 +5595,7 @@ conv_dnd_recv(GtkWidget *widget, GdkDragContext *dc, guint x, guint y,
 					pidgin_conv_window_add_gtkconv(win, gtkconv);
 				}
 			} else {
-				c = purple_conversation_new(PURPLE_CONV_TYPE_IM, buddyaccount, buddyname);
+				c = purple_im_conversation_new(buddyaccount, buddyname);
 				gtkconv = PIDGIN_CONVERSATION(c);
 				if (gtkconv->win != win) {
 					pidgin_conv_window_remove_gtkconv(gtkconv->win, gtkconv);
@@ -5635,7 +5635,7 @@ conv_dnd_recv(GtkWidget *widget, GdkDragContext *dc, guint x, guint y,
 						strcmp(purple_account_get_protocol_id(convaccount), protocol) == 0) {
 					purple_chat_conversation_invite_user(PURPLE_CONV_CHAT(conv), username, NULL, TRUE);
 				} else {
-					c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, username);
+					c = purple_im_conversation_new(account, username);
 					gtkconv = PIDGIN_CONVERSATION(c);
 					if (gtkconv->win != win) {
 						pidgin_conv_window_remove_gtkconv(gtkconv->win, gtkconv);
@@ -5951,7 +5951,7 @@ received_im_msg_cb(PurpleAccount *account, char *sender, char *message,
 
 	if (hide) {
 		ui_ops->create_conversation = pidgin_conv_new_hidden;
-		purple_conversation_new(PURPLE_CONV_TYPE_IM, account, sender);
+		purple_im_conversation_new(account, sender);
 		ui_ops->create_conversation = pidgin_conv_new;
 	}
 
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
index ba384d6224..ce76665c0b 100644
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -960,7 +960,7 @@ pidgin_dialogs_im_with_user(PurpleAccount *account, const char *username)
 	conv = purple_conversations_find_im_with_account(username, account);
 
 	if (conv == NULL)
-		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, username);
+		conv = purple_im_conversation_new(account, username);
 
 	pidgin_conv_attach_to_conversation(conv);
 	purple_conversation_present(conv);
diff --git a/pidgin/gtkpounce.c b/pidgin/gtkpounce.c
index 6b17ee2a1e..76302ee3c5 100644
--- a/pidgin/gtkpounce.c
+++ b/pidgin/gtkpounce.c
@@ -1434,7 +1434,7 @@ pounce_cb(PurplePounce *pounce, PurplePounceEvent events, void *data)
 	if (purple_pounce_action_is_enabled(pounce, "open-window"))
 	{
 		if (!purple_conversations_find_im_with_account(pouncee, account))
-			purple_conversation_new(PURPLE_CONV_TYPE_IM, account, pouncee);
+			purple_im_conversation_new(account, pouncee);
 	}
 
 	if (purple_pounce_action_is_enabled(pounce, "popup-notify"))
@@ -1490,7 +1490,7 @@ pounce_cb(PurplePounce *pounce, PurplePounceEvent events, void *data)
 			conv = purple_conversations_find_im_with_account(pouncee, account);
 
 			if (conv == NULL)
-				conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, pouncee);
+				conv = purple_im_conversation_new(account, pouncee);
 
 			purple_conversation_write(conv, NULL, message,
 									PURPLE_MESSAGE_SEND, time(NULL));
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
index 9212b9b182..358bf8dd8b 100644
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -1393,7 +1393,7 @@ static void dnd_image_ok_callback(_DndData *data, int choice)
 		serv_send_file(purple_account_get_connection(data->account), data->who, data->filename);
 		break;
 	case DND_IM_IMAGE:
-		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, data->account, data->who);
+		conv = purple_im_conversation_new(data->account, data->who);
 		gtkconv = PIDGIN_CONVERSATION(conv);
 
 		if (!g_file_get_contents(data->filename, &filedata, &size,
@@ -1573,7 +1573,7 @@ pidgin_dnd_file_manage(GtkSelectionData *sd, PurpleAccount *account, const char
 				PidginConversation *gtkconv;
 
 			case PURPLE_DESKTOP_ITEM_TYPE_LINK:
-				conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, who);
+				conv = purple_im_conversation_new(account, who);
 				gtkconv =  PIDGIN_CONVERSATION(conv);
 				gtk_webview_insert_link(GTK_WEBVIEW(gtkconv->entry),
 				                        purple_desktop_item_get_string(item, "URL"),
diff --git a/pidgin/plugins/crazychat/cc_network.c b/pidgin/plugins/crazychat/cc_network.c
index 90108a4676..45c30eab14 100644
--- a/pidgin/plugins/crazychat/cc_network.c
+++ b/pidgin/plugins/crazychat/cc_network.c
@@ -106,7 +106,7 @@ void cc_net_send_invite(struct crazychat *cc, char *name, PurpleAccount *account
 	session->state = INVITE;
 	conv = purple_conversations_find_with_account(name, account);
 	if (!conv) {
-		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, name);
+		conv = purple_im_conversation_new(account, name);
 	}
 	im = purple_conversation_get_im_data(conv);
 	snprintf(buf, BUFSIZ, "%s%s!%d", CRAZYCHAT_INVITE_CODE,
@@ -210,7 +210,7 @@ static void cc_net_send_ready(PurpleAccount *account, struct cc_session *session
 
 	conv = purple_conversations_find_with_account(session->name, account);
 	if (!conv) {
-		conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account,
+		conv = purple_im_conversation_new(account,
 				session->name);
 	}
 	im = purple_conversation_get_im_data(conv);
diff --git a/pidgin/plugins/pidgininc.c b/pidgin/plugins/pidgininc.c
index af00bb1558..8078c5ba55 100644
--- a/pidgin/plugins/pidgininc.c
+++ b/pidgin/plugins/pidgininc.c
@@ -49,7 +49,7 @@ static void
 bud(PurpleBuddy *who)
 {
 	PurpleAccount *acct = who->account;
-	PurpleConversation *conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, acct, who->name);
+	PurpleConversation *conv = purple_im_conversation_new(acct, who->name);
 
 	purple_im_conversation_send(PURPLE_CONV_IM(conv), "Hello!");
 }