pidgin: 626417ea: I was tired of most of us complaining ab...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 626417eae4e37cb4670be57347e9f2a4daf3f267
Ancestor: 1d1bc145399f692d55db04d75f6f6ae59943450d
Author: rekkanoryo at pidgin.im
Date: 2009-04-30T12:13:21
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/626417eae4e37cb4670be57347e9f2a4daf3f267

Modified files:
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/message.h

ChangeLog: 

I was tired of most of us complaining about these things but never actually
doing anything aobut it, so I decided to borrow zac's work.

*** Plucked rev d4267261 (zacw at adiumx.com):
Remove jabber_message_conv_closed and its caller so that we no longer send the
"has left conversation" ("gone") notices.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.c	26d718a41e4651b5ed0ac0817143325f84a21fd7
+++ libpurple/protocols/jabber/jabber.c	b4749c545721f6d4a4c7d20eeaab46f0f98d409d
@@ -2321,8 +2321,6 @@ void jabber_convo_closed(PurpleConnectio
 			g_free(jbr->thread_id);
 			jbr->thread_id = NULL;
 		}
-		if(jbr->chat_states == JABBER_CHAT_STATES_SUPPORTED)
-			jabber_message_conv_closed(js, who);
 	}
 
 	jabber_id_free(jid);
============================================================
--- libpurple/protocols/jabber/message.c	d4e1306db165c82db178f804639fbc40780782d6
+++ libpurple/protocols/jabber/message.c	87433ed1ad50340793e7912223ceea700520140f
@@ -1226,23 +1226,6 @@ unsigned int jabber_send_typing(PurpleCo
 	return 0;
 }
 
-void jabber_message_conv_closed(JabberStream *js, const char *who)
-{
-	JabberMessage *jm;
-	if (!purple_prefs_get_bool("/purple/conversations/im/send_typing"))
-		return;
-
-	jm  = g_new0(JabberMessage, 1);
-	jm->js = js;
-	jm->type = JABBER_MESSAGE_CHAT;
-	jm->to = g_strdup(who);
-	jm->id = jabber_get_next_id(jm->js);
-	jm->typing_style = JM_TS_JEP_0085;
-	jm->chat_state = JM_STATE_GONE;
-	jabber_message_send(jm);
-	jabber_message_free(jm);
-}
-
 gboolean jabber_buzz_isenabled(JabberStream *js, const gchar *namespace) {
 	return js->allowBuzz;
 }
============================================================
--- libpurple/protocols/jabber/message.h	5b2eaf321c0dd09dad67bef9b00b3193640dbfc1
+++ libpurple/protocols/jabber/message.h	5125e417af8f0104dedefd27227bfd1cd1ab9daa
@@ -78,7 +78,6 @@ unsigned int jabber_send_typing(PurpleCo
 int jabber_message_send_chat(PurpleConnection *gc, int id, const char *message, PurpleMessageFlags flags);
 
 unsigned int jabber_send_typing(PurpleConnection *gc, const char *who, PurpleTypingState state);
-void jabber_message_conv_closed(JabberStream *js, const char *who);
 
 gboolean jabber_buzz_isenabled(JabberStream *js, const gchar *namespace);