Mercurial > pidgin.yaz
changeset 15619:62b3ff6e513a
merge of 'dd2102690e56e010006c8c94b8a7760a34eb4299'
and 'f09bf5f5dae3c84ff2b6df8a8d555208a32c713c'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Sun, 11 Feb 2007 03:06:08 +0000 |
| parents | b74a3bec8dcb (diff) b6f9f5331a82 (current diff) |
| children | 1078be435cc8 |
| files | |
| diffstat | 3 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Sun Feb 11 03:05:41 2007 +0000 +++ b/pidgin/gtkblist.c Sun Feb 11 03:06:08 2007 +0000 @@ -302,7 +302,7 @@ chat->account); if (conv != NULL) - pidgin_conv_present_conversation(conv); + gaim_conversation_present(conv); serv_join_chat(chat->account->gc, chat->components); } @@ -3549,7 +3549,7 @@ convs = pidgin_conversations_find_unseen_list(GAIM_CONV_TYPE_IM, PIDGIN_UNSEEN_TEXT, TRUE, 1); if (convs) { - pidgin_conv_present_conversation((GaimConversation*)convs->data); + gaim_conversation_present((GaimConversation*)convs->data); g_list_free(convs); } break;
--- a/pidgin/gtkdialogs.c Sun Feb 11 03:05:41 2007 +0000 +++ b/pidgin/gtkdialogs.c Sun Feb 11 03:06:08 2007 +0000 @@ -724,7 +724,7 @@ if (conv == NULL) conv = gaim_conversation_new(GAIM_CONV_TYPE_IM, account, username); - pidgin_conv_present_conversation(conv); + gaim_conversation_present(conv); } static gboolean
--- a/pidgin/gtkdocklet.c Sun Feb 11 03:05:41 2007 +0000 +++ b/pidgin/gtkdocklet.c Sun Feb 11 03:06:08 2007 +0000 @@ -587,7 +587,7 @@ if (status == DOCKLET_STATUS_ONLINE_PENDING || status == DOCKLET_STATUS_AWAY_PENDING) { GList *l = get_pending_list(1); if (l != NULL) { - pidgin_conv_present_conversation((GaimConversation *)l->data); + gaim_conversation_present((GaimConversation *)l->data); g_list_free(l); } } else {