Mercurial > pidgin

diff libpurple/conversation.c @ 30435:d487a2adc3a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '86d9ff7ca5af691007b1e85ef39959fa13e7d996' and 'd0cbcbb1a25505fd8801dd556c1ec42e98414c9a'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 23 Aug 2010 05:22:11 +0000
parents 351d07aefb09
children a8cc50c2279f
line wrap: on
line diff
--- a/libpurple/conversation.c	Mon Aug 23 01:18:12 2010 +0000
+++ b/libpurple/conversation.c	Mon Aug 23 05:22:11 2010 +0000
@@ -1124,7 +1124,6 @@
 purple_conv_im_start_typing_timeout(PurpleConvIm *im, int timeout)
 {
 	PurpleConversation *conv;
-	const char *name;
 
 	g_return_if_fail(im != NULL);
 
@@ -1132,7 +1131,6 @@
 		purple_conv_im_stop_typing_timeout(im);
 
 	conv = purple_conv_im_get_conversation(im);
-	name = purple_conversation_get_name(conv);
 
 	im->typing_timeout = purple_timeout_add_seconds(timeout, reset_typing_cb, conv);
 }
@@ -1520,7 +1518,6 @@
 	PurpleAccount *account;
 	PurpleConversation *conv;
 	PurpleConnection *gc;
-	PurplePluginProtocolInfo *prpl_info;
 
 	g_return_if_fail(chat != NULL);
 	g_return_if_fail(who != NULL);
@@ -1529,7 +1526,6 @@
 	conv      = purple_conv_chat_get_conversation(chat);
 	gc        = purple_conversation_get_gc(conv);
 	account   = purple_connection_get_account(gc);
-	prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(purple_connection_get_prpl(gc));
 
 	/* Don't display this if the person who wrote it is ignored. */
 	if (purple_conv_chat_is_user_ignored(chat, who))