# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1191701312 0
# Node ID 85d29a1f4d249a62d181b9075ffaac2ff691b060
# Parent  0077d3b6ecd215221fd1371841964b57bf26a32c# Parent  a08d14d993c523e3443dc8d9de641e59e5b831f3
merge of '7252a43314152ad33cc6dc4d65c0349a16575b81'
     and '96ca620a913d3dbdbf8113d280ae2eec5f09babe'

diff -r 0077d3b6ecd2 -r 85d29a1f4d24 doc/gtkconv-signals.dox
--- a/doc/gtkconv-signals.dox	Sat Oct 06 19:44:49 2007 +0000
+++ b/doc/gtkconv-signals.dox	Sat Oct 06 20:08:32 2007 +0000
@@ -134,7 +134,7 @@
 void (*conversation_displayed)(PidginConversation *gtkconv);
   @endsignalproto
   @signaldesc
-   Emitted right after the Pidgin UI is reattached to a conversation.
+   Emitted right after the Pidgin UI is attached to a new or a hidden conversation.
   @param gtkconv  The PidginConversation
  @endsignaldef
 
diff -r 0077d3b6ecd2 -r 85d29a1f4d24 pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Sat Oct 06 19:44:49 2007 +0000
+++ b/pidgin/gtkblist.c	Sat Oct 06 20:08:32 2007 +0000
@@ -3070,7 +3070,7 @@
 	{ N_("/Buddies/Get User _Info..."), "<CTL>I", pidgin_dialogs_info, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_USER_INFO },
 	{ N_("/Buddies/View User _Log..."), "<CTL>L", pidgin_dialogs_log, 0, "<Item>", NULL },
 	{ "/Buddies/sep1", NULL, NULL, 0, "<Separator>", NULL },
-	{ N_("/Buddies/Show"), NULL, NULL, 0, "<Branch>", NULL},
+	{ N_("/Buddies/Sh_ow"), NULL, NULL, 0, "<Branch>", NULL},
 	{ N_("/Buddies/Show/_Offline Buddies"), NULL, pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL },
 	{ N_("/Buddies/Show/_Empty Groups"), NULL, pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL },
 	{ N_("/Buddies/Show/Buddy _Details"), NULL, pidgin_blist_buddy_details_cb, 1, "<CheckItem>", NULL },
diff -r 0077d3b6ecd2 -r 85d29a1f4d24 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sat Oct 06 19:44:49 2007 +0000
+++ b/pidgin/gtkconv.c	Sat Oct 06 20:08:32 2007 +0000
@@ -5128,6 +5128,9 @@
 pidgin_conv_new(PurpleConversation *conv)
 {
 	private_gtkconv_new(conv, FALSE);
+	if (PIDGIN_IS_PIDGIN_CONVERSATION(conv))
+		purple_signal_emit(pidgin_conversations_get_handle(),
+				"conversation-displayed", PIDGIN_CONVERSATION(conv));
 }
 
 static void