# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1209434503 0
# Node ID 84877c54098bcfbc80f467410e05345a7a10a2be
# Parent  5b8dbe4b989856a380f1ae852f9c7ea43c887f6e# Parent  06c98bab9bd2b6cb198a200e1e332a263cf3c255
merge of '0a7f4849f49b45459231087fa690ba9937eae03c'
     and '2f8316df13d1c3e6bf66b91c28abe1504033dae8'

diff -r 5b8dbe4b9898 -r 84877c54098b ChangeLog.API
--- a/ChangeLog.API	Mon Apr 28 22:40:55 2008 +0000
+++ b/ChangeLog.API	Tue Apr 29 02:01:43 2008 +0000
@@ -1,6 +1,10 @@
 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 5b8dbe4b9898 -r 84877c54098b doc/conversation-signals.dox
--- a/doc/conversation-signals.dox	Mon Apr 28 22:40:55 2008 +0000
+++ b/doc/conversation-signals.dox	Tue Apr 29 02:01:43 2008 +0000
@@ -27,6 +27,7 @@
   @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
@@ -400,6 +401,16 @@
   @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);
diff -r 5b8dbe4b9898 -r 84877c54098b libpurple/conversation.c
--- a/libpurple/conversation.c	Mon Apr 28 22:40:55 2008 +0000
+++ b/libpurple/conversation.c	Tue Apr 29 02:01:43 2008 +0000
@@ -2368,6 +2368,12 @@
 						 purple_value_new(PURPLE_TYPE_SUBTYPE,
 										PURPLE_SUBTYPE_CONVERSATION));
 
+	purple_signal_register(handle, "chat-join-failed",
+						   purple_marshal_VOID__POINTER_POINTER, NULL, 2,
+						   purple_value_new(PURPLE_TYPE_SUBTYPE,
+										PURPLE_SUBTYPE_CONNECTION),
+						   purple_value_new(PURPLE_TYPE_STRING));
+
 	purple_signal_register(handle, "chat-left",
 						 purple_marshal_VOID__POINTER, NULL, 1,
 						 purple_value_new(PURPLE_TYPE_SUBTYPE,
diff -r 5b8dbe4b9898 -r 84877c54098b libpurple/protocols/jabber/chat.c
--- a/libpurple/protocols/jabber/chat.c	Mon Apr 28 22:40:55 2008 +0000
+++ b/libpurple/protocols/jabber/chat.c	Tue Apr 29 02:01:43 2008 +0000
@@ -222,33 +222,39 @@
 	if(!handle)
 		handle = js->user->node;
 
+	tmp = g_strdup_printf("%s@%s", room, server);
+	room_jid = g_strdup(jabber_normalize(NULL, tmp));
+	g_free(tmp);
+
 	if(!jabber_nodeprep_validate(room)) {
 		char *buf = g_strdup_printf(_("%s is not a valid room name"), room);
 		purple_notify_error(gc, _("Invalid Room Name"), _("Invalid Room Name"),
 				buf);
+		serv_got_join_chat_failed(gc, room_jid);
+		g_free(room_jid);
 		g_free(buf);
 		return;
 	} else if(!jabber_nameprep_validate(server)) {
 		char *buf = g_strdup_printf(_("%s is not a valid server name"), server);
 		purple_notify_error(gc, _("Invalid Server Name"),
 				_("Invalid Server Name"), buf);
+		serv_got_join_chat_failed(gc, room_jid);
+		g_free(room_jid);
 		g_free(buf);
 		return;
 	} else if(!jabber_resourceprep_validate(handle)) {
 		char *buf = g_strdup_printf(_("%s is not a valid room handle"), handle);
 		purple_notify_error(gc, _("Invalid Room Handle"),
 				_("Invalid Room Handle"), buf);
+		serv_got_join_chat_failed(gc, room_jid);
 		g_free(buf);
+		g_free(room_jid);
 		return;
 	}
 
 	if(jabber_chat_find(js, room, server))
 		return;
 
-	tmp = g_strdup_printf("%s@%s", room, server);
-	room_jid = g_strdup(jabber_normalize(NULL, tmp));
-	g_free(tmp);
-
 	chat = g_new0(JabberChat, 1);
 	chat->js = gc->proto_data;
 
diff -r 5b8dbe4b9898 -r 84877c54098b libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c	Mon Apr 28 22:40:55 2008 +0000
+++ b/libpurple/protocols/jabber/presence.c	Tue Apr 29 02:01:43 2008 +0000
@@ -575,6 +575,7 @@
 					serv_got_chat_left(js->gc, chat->id);
 			} else {
 				title = g_strdup_printf(_("Error joining chat %s"), from);
+				serv_got_join_chat_failed(js->gc, room_jid);
 			}
 			purple_notify_error(js->gc, title, title, msg);
 			g_free(title);
diff -r 5b8dbe4b9898 -r 84877c54098b libpurple/server.c
--- a/libpurple/server.c	Mon Apr 28 22:40:55 2008 +0000
+++ b/libpurple/server.c	Tue Apr 29 02:01:43 2008 +0000
@@ -967,6 +967,12 @@
 	purple_signal_emit(purple_conversations_get_handle(), "chat-left", conv);
 }
 
+void serv_got_join_chat_failed(PurpleConnection *gc, const char *name)
+{
+	purple_signal_emit(purple_conversations_get_handle(), "chat-join-failed",
+					gc, name);
+}
+
 void serv_got_chat_in(PurpleConnection *g, int id, const char *who,
 					  PurpleMessageFlags flags, const char *message, time_t mtime)
 {
diff -r 5b8dbe4b9898 -r 84877c54098b libpurple/server.h
--- a/libpurple/server.h	Mon Apr 28 22:40:55 2008 +0000
+++ b/libpurple/server.h	Tue Apr 29 02:01:43 2008 +0000
@@ -166,6 +166,15 @@
 
 PurpleConversation *serv_got_joined_chat(PurpleConnection *gc,
 									   int id, const char *name);
+/**
+ * Called by a prpl when an attempt to join a chat via serv_join_chat()
+ * fails.
+ *
+ * @param gc      The connection on which chat joining failed
+ * @param name    The name of the chat which we did not join
+ */
+void serv_got_join_chat_failed(PurpleConnection *gc, const char *name);
+	
 void serv_got_chat_left(PurpleConnection *g, int id);
 void serv_got_chat_in(PurpleConnection *g, int id, const char *who,
 					  PurpleMessageFlags flags, const char *message, time_t mtime);