# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1209441426 0
# Node ID 19dffacf8638c6974f4c19d892089b17628357e0
# Parent  d4d57a5505ab88fbf78dc2249fb3a296b20dba66# Parent  e1012f92ba3bbe761fe3f8ae6d1c02124686ea97
merge of '6bf9ac8e017081c907061167edd28a1adcbec3c9'
     and '91a643a04016322c0da1e540889a828686bb5d8d'

diff -r e1012f92ba3b -r 19dffacf8638 ChangeLog.API
--- a/ChangeLog.API	Tue Apr 29 03:47:38 2008 +0000
+++ b/ChangeLog.API	Tue Apr 29 03:57:06 2008 +0000
@@ -1,10 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.x.x:
-    libpurple:
-        Added:
-        * serv_got_join_chat_failed
-        * chat-join-failed signal (see conversation-signals.dox)
 	perl:
 		Added:
 		* Purple::Prefs::get_children_names.
diff -r e1012f92ba3b -r 19dffacf8638 doc/conversation-signals.dox
--- a/doc/conversation-signals.dox	Tue Apr 29 03:47:38 2008 +0000
+++ b/doc/conversation-signals.dox	Tue Apr 29 03:57:06 2008 +0000
@@ -27,7 +27,6 @@
   @signal chat-invited-user
   @signal chat-invited
   @signal chat-joined
-  @signal chat-join-failed
   @signal chat-left
   @signal chat-topic-changed
   @signal conversation-extended-menu
@@ -401,16 +400,6 @@
   @param conv The conversation that joined the chat room.
  @endsignaldef
 
- @signaldef chat-join-failed
-  @signalproto
-void (*chat_join_failed)(PurpleConnection *gc, const char *name);
-  @endsignalproto
-  @signaldesc
-   Emitted when an account fails to join a chat room
-  @param gc The PurpleConnection of the account which failed to join the chat.
-  @param name The name of the chat.
- @endsignaldef
- 
  @signaldef chat-left
   @signalproto
 void (*chat_left)(PurpleConversation *conv);