Mercurial > pidgin
changeset 20947:3c4d37b98c31
merge of '60c313e0859ab5b5106920e3133826ed0ec09703'
and '9af00415175d29e7e9227c383939d392ea0af499'
| author | Casey Harkins <charkins@pidgin.im> |
|---|---|
| date | Mon, 15 Oct 2007 04:14:53 +0000 |
| parents | 2c039a40babc (current diff) 5c849ee68659 (diff) |
| children | 128aca651b9a |
| files | pidgin/gtkconv.c |
| diffstat | 3 files changed, 18 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkblist.c Mon Oct 15 03:07:16 2007 +0000 +++ b/pidgin/gtkblist.c Mon Oct 15 04:14:53 2007 +0000 @@ -3907,7 +3907,7 @@ convs = pidgin_conversations_find_unseen_list(PURPLE_CONV_TYPE_IM, PIDGIN_UNSEEN_TEXT, TRUE, 1); if (convs) { - purple_conversation_present((PurpleConversation*)convs->data); + pidgin_conv_present_conversation((PurpleConversation*)convs->data); g_list_free(convs); } break;
--- a/pidgin/gtkconv.c Mon Oct 15 03:07:16 2007 +0000 +++ b/pidgin/gtkconv.c Mon Oct 15 04:14:53 2007 +0000 @@ -2853,9 +2853,6 @@ if (gtkconv != NULL && gtkconv->active_conv != conv) continue; if (gtkconv == NULL) { - if (!hidden_only || - !purple_conversation_get_data(conv, "unseen-count")) - continue; r = g_list_prepend(r, conv); c++; } else {
--- a/pidgin/gtkdocklet.c Mon Oct 15 03:07:16 2007 +0000 +++ b/pidgin/gtkdocklet.c Mon Oct 15 04:14:53 2007 +0000 @@ -145,15 +145,22 @@ if (ui_ops->set_tooltip) { GString *tooltip_text = g_string_new(""); for (l = convs, count = 0 ; l != NULL ; l = l->next, count++) { - if (PIDGIN_IS_PIDGIN_CONVERSATION(l->data)) { - PidginConversation *gtkconv = PIDGIN_CONVERSATION((PurpleConversation *)l->data); - if (count == DOCKLET_TOOLTIP_LINE_LIMIT - 1) - g_string_append(tooltip_text, _("Right-click for more unread messages...\n")); - else - g_string_append_printf(tooltip_text, - ngettext("%d unread message from %s\n", "%d unread messages from %s\n", gtkconv->unseen_count), - gtkconv->unseen_count, - gtk_label_get_text(GTK_LABEL(gtkconv->tab_label))); + PurpleConversation *conv = (PurpleConversation *)l->data; + PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv); + + if (count == DOCKLET_TOOLTIP_LINE_LIMIT - 1) { + g_string_append(tooltip_text, _("Right-click for more unread messages...\n")); + } else if(gtkconv) { + g_string_append_printf(tooltip_text, + ngettext("%d unread message from %s\n", "%d unread messages from %s\n", gtkconv->unseen_count), + gtkconv->unseen_count, + gtk_label_get_text(GTK_LABEL(gtkconv->tab_label))); + } else { + g_string_append_printf(tooltip_text, + ngettext("%d unread message from %s\n", "%d unread messages from %s\n", + GPOINTER_TO_INT(purple_conversation_get_data(conv, "unseen-count"))), + GPOINTER_TO_INT(purple_conversation_get_data(conv, "unseen-count")), + purple_conversation_get_name(conv)); } } @@ -758,7 +765,7 @@ if (pending) { GList *l = get_pending_list(1); if (l != NULL) { - purple_conversation_present((PurpleConversation *)l->data); + pidgin_conv_present_conversation((PurpleConversation *)l->data); g_list_free(l); } } else {