# 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 06c98bab9bd2 -r 84877c54098b doc/finch.1.in
--- a/doc/finch.1.in	Tue Apr 29 01:53:08 2008 +0000
+++ b/doc/finch.1.in	Tue Apr 29 02:01:43 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 06c98bab9bd2 -r 84877c54098b finch/libgnt/gntws.c
--- a/finch/libgnt/gntws.c	Tue Apr 29 01:53:08 2008 +0000
+++ b/finch/libgnt/gntws.c	Tue Apr 29 02:01:43 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 06c98bab9bd2 -r 84877c54098b libpurple/prpl.h
--- a/libpurple/prpl.h	Tue Apr 29 01:53:08 2008 +0000
+++ b/libpurple/prpl.h	Tue Apr 29 02:01:43 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