Mercurial > pidgin.yaz
changeset 20801:85d29a1f4d24
merge of '7252a43314152ad33cc6dc4d65c0349a16575b81'
and '96ca620a913d3dbdbf8113d280ae2eec5f09babe'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sat, 06 Oct 2007 20:08:32 +0000 |
| parents | 0077d3b6ecd2 (current diff) a08d14d993c5 (diff) |
| children | 71c7d0222a33 |
| files | doc/gtkconv-signals.dox |
| diffstat | 3 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 },
--- 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