# HG changeset patch # User Evan Schoenberg # Date 1209441426 0 # Node ID 19dffacf8638c6974f4c19d892089b17628357e0 # Parent d4d57a5505ab88fbf78dc2249fb3a296b20dba66# Parent e1012f92ba3bbe761fe3f8ae6d1c02124686ea97 merge of '6bf9ac8e017081c907061167edd28a1adcbec3c9' and '91a643a04016322c0da1e540889a828686bb5d8d' diff -r d4d57a5505ab -r 19dffacf8638 ChangeLog.API diff -r d4d57a5505ab -r 19dffacf8638 doc/finch.1.in --- a/doc/finch.1.in Tue Apr 29 03:56:56 2008 +0000 +++ b/doc/finch.1.in Tue Apr 29 03:57:06 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 d4d57a5505ab -r 19dffacf8638 finch/libgnt/gntws.c --- a/finch/libgnt/gntws.c Tue Apr 29 03:56:56 2008 +0000 +++ b/finch/libgnt/gntws.c Tue Apr 29 03:57:06 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 d4d57a5505ab -r 19dffacf8638 libpurple/conversation.c --- a/libpurple/conversation.c Tue Apr 29 03:56:56 2008 +0000 +++ b/libpurple/conversation.c Tue Apr 29 03:57:06 2008 +0000 @@ -2368,12 +2368,6 @@ 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 d4d57a5505ab -r 19dffacf8638 libpurple/protocols/jabber/chat.c --- a/libpurple/protocols/jabber/chat.c Tue Apr 29 03:56:56 2008 +0000 +++ b/libpurple/protocols/jabber/chat.c Tue Apr 29 03:57:06 2008 +0000 @@ -222,39 +222,33 @@ 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 d4d57a5505ab -r 19dffacf8638 libpurple/protocols/jabber/presence.c --- a/libpurple/protocols/jabber/presence.c Tue Apr 29 03:56:56 2008 +0000 +++ b/libpurple/protocols/jabber/presence.c Tue Apr 29 03:57:06 2008 +0000 @@ -575,7 +575,6 @@ 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 d4d57a5505ab -r 19dffacf8638 libpurple/prpl.h --- a/libpurple/prpl.h Tue Apr 29 03:56:56 2008 +0000 +++ b/libpurple/prpl.h Tue Apr 29 03:57:06 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 d4d57a5505ab -r 19dffacf8638 libpurple/server.c --- a/libpurple/server.c Tue Apr 29 03:56:56 2008 +0000 +++ b/libpurple/server.c Tue Apr 29 03:57:06 2008 +0000 @@ -967,12 +967,6 @@ 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 d4d57a5505ab -r 19dffacf8638 libpurple/server.h --- a/libpurple/server.h Tue Apr 29 03:56:56 2008 +0000 +++ b/libpurple/server.h Tue Apr 29 03:57:06 2008 +0000 @@ -166,15 +166,6 @@ 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);