Mercurial > pidgin3 / file diff

--- a/src/dialogs.c	Mon Dec 29 08:59:22 2003 +0000
+++ b/src/dialogs.c	Mon Dec 29 09:03:47 2003 +0000
@@ -1339,13 +1339,12 @@
 {
 	GaimGtkConversation *gtkconv;
 	char *smiley_text = g_object_get_data(G_OBJECT(widget), "smiley_text");
-	GaimProtocol protocol = gaim_account_get_protocol(gaim_conversation_get_account(c));
-	GaimPlugin *proto = gaim_find_prpl(protocol);
-	
+	GaimPlugin *proto = gaim_find_prpl(gaim_account_get_protocol_id(gaim_conversation_get_account(c)));
+
 	gtkconv = GAIM_GTK_CONVERSATION(c);
-	
+
 	gtk_imhtml_insert_smiley(GTK_IMHTML(gtkconv->entry), proto->info->name, smiley_text);
-	
+
 	close_smiley_dialog(NULL, c);
 }
 
@@ -1397,7 +1396,7 @@
 
 	if(c->account)
 		smileys = get_proto_smileys(
-			gaim_account_get_protocol(gaim_conversation_get_account(c)));
+			gaim_account_get_protocol_id(gaim_conversation_get_account(c)));
 	else
 		smileys = get_proto_smileys(GAIM_PROTO_DEFAULT);