# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1192423364 0
# Node ID 128aca651b9a069890e90f2bdc7e1c4659a58c61
# Parent  3c4d37b98c313a26a1c8e26e5b113e804ac885b7# Parent  87742ec493b185599e8c32c7451b092a0a691adf
merge of '4ac79800f2efc2dbe9a348189a545b149d6dfb44'
     and '92060374e73337f24fcb27c372b2c970120b1252'

diff -r 3c4d37b98c31 -r 128aca651b9a pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Mon Oct 15 04:14:53 2007 +0000
+++ b/pidgin/gtkconv.c	Mon Oct 15 04:42:44 2007 +0000
@@ -2853,6 +2853,9 @@
 		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 {
diff -r 3c4d37b98c31 -r 128aca651b9a pidgin/gtkdocklet.c
--- a/pidgin/gtkdocklet.c	Mon Oct 15 04:14:53 2007 +0000
+++ b/pidgin/gtkdocklet.c	Mon Oct 15 04:42:44 2007 +0000
@@ -145,22 +145,15 @@
 		if (ui_ops->set_tooltip) {
 			GString *tooltip_text = g_string_new("");
 			for (l = convs, count = 0 ; l != NULL ; l = l->next, count++) {
-				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));
+				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)));
 				}
 			}
 
@@ -765,7 +758,7 @@
 			if (pending) {
 				GList *l = get_pending_list(1);
 				if (l != NULL) {
-					pidgin_conv_present_conversation((PurpleConversation *)l->data);
+					purple_conversation_present((PurpleConversation *)l->data);
 					g_list_free(l);
 				}
 			} else {