# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1209440858 0
# Node ID e1012f92ba3bbe761fe3f8ae6d1c02124686ea97
# Parent  1517d3c763fcab012a7be1c5575fdeb10fd1b7d4# Parent  b30516259a8a7f056c929769abce3d7939826a11
merge of '3498a4993b3d552319e5122278d620287093fd20'
     and '69e8be0fb082209074a78effd111c372b9de6603'

diff -r 1517d3c763fc -r e1012f92ba3b ChangeLog.API
--- a/ChangeLog.API	Tue Apr 29 03:08:32 2008 +0000
+++ b/ChangeLog.API	Tue Apr 29 03:47:38 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 1517d3c763fc -r e1012f92ba3b doc/conversation-signals.dox
--- a/doc/conversation-signals.dox	Tue Apr 29 03:08:32 2008 +0000
+++ b/doc/conversation-signals.dox	Tue Apr 29 03:47:38 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 1517d3c763fc -r e1012f92ba3b doc/finch.1.in
--- a/doc/finch.1.in	Tue Apr 29 03:08:32 2008 +0000
+++ b/doc/finch.1.in	Tue Apr 29 03:47:38 2008 +0000
@@ -111,9 +111,12 @@
 .B Alt \+ Shift \+ Tab
 Jump to the previous URGENT (highlighted) window.
 .TP
-.B Ctrl \+ o
+.B Ctrl \+ o \fR or \fB F10
 Bring up the menu (if there is one) for a window.
 .TP
+.B F11
+Popup the context menu (if there is one) for the selected widget.
+.TP
 .B Alt \+ /
 Show a list of available key-bindings for the current widget in focus.
 .TP
diff -r 1517d3c763fc -r e1012f92ba3b finch/libgnt/gntws.c
--- a/finch/libgnt/gntws.c	Tue Apr 29 03:08:32 2008 +0000
+++ b/finch/libgnt/gntws.c	Tue Apr 29 03:47:38 2008 +0000
@@ -13,7 +13,8 @@
 	GntNode *node = g_hash_table_lookup(nodes, widget);
 	if (GNT_IS_WINDOW(widget))
 		gnt_window_workspace_hiding(GNT_WINDOW(widget));
-	hide_panel(node->panel);
+	if (node)
+		hide_panel(node->panel);
 }
 
 static void
diff -r 1517d3c763fc -r e1012f92ba3b libpurple/protocols/jabber/chat.c
diff -r 1517d3c763fc -r e1012f92ba3b libpurple/protocols/jabber/presence.c
diff -r 1517d3c763fc -r e1012f92ba3b libpurple/prpl.h
--- a/libpurple/prpl.h	Tue Apr 29 03:08:32 2008 +0000
+++ b/libpurple/prpl.h	Tue Apr 29 03:47:38 2008 +0000
@@ -186,7 +186,7 @@
  * A protocol plugin information structure.
  *
  * Every protocol plugin initializes this structure. It is the gateway
- * between purple and the protocol plugin.  Many of this callbacks can be
+ * between purple and the protocol plugin.  Many of these callbacks can be
  * NULL.  If a callback must be implemented, it has a comment indicating so.
  */
 struct _PurplePluginProtocolInfo
diff -r 1517d3c763fc -r e1012f92ba3b libpurple/server.c
diff -r 1517d3c763fc -r e1012f92ba3b libpurple/server.h