# HG changeset patch
# User Will Thompson <will.thompson@collabora.co.uk>
# Date 1192447173 0
# Node ID 07b27e3522e3a02a4d1ddad72846bcfce1a628e1
# Parent  a9f1e320d94d7d8a2e26a66de047ff158237d47e# Parent  52deb216049686886032be9eff2575eda70e01c4
merge of '732917d4f1ac90e4c7e5143bbd59513fd6eef921'
     and 'ce7bc52a1e7b3d401f32806e3c3fe19c759152fc'

diff -r 52deb2160496 -r 07b27e3522e3 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Mon Oct 15 04:48:28 2007 +0000
+++ b/pidgin/gtkconv.c	Mon Oct 15 11:19:33 2007 +0000
@@ -2853,8 +2853,7 @@
 		if (gtkconv != NULL && gtkconv->active_conv != conv)
 			continue;
 		if (gtkconv == NULL) {
-			if (!hidden_only ||
-					!purple_conversation_get_data(conv, "unseen-count"))
+			if (!purple_conversation_get_data(conv, "unseen-count"))
 				continue;
 			r = g_list_prepend(r, conv);
 			c++;
diff -r 52deb2160496 -r 07b27e3522e3 pidgin/gtkdocklet.c
--- a/pidgin/gtkdocklet.c	Mon Oct 15 04:48:28 2007 +0000
+++ b/pidgin/gtkdocklet.c	Mon Oct 15 11:19:33 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 {