im.pidgin.pidgin: 92060374e73337f24fcb27c372b2c970120b1252

[charkins at pidgin.im]

-----------------------------------------------------------------
Revision: 92060374e73337f24fcb27c372b2c970120b1252
Ancestor: 9af00415175d29e7e9227c383939d392ea0af499
Author: charkins at pidgin.im
Date: 2007-10-15T04:29:22
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkconv.c pidgin/gtkdocklet.c

ChangeLog: 

disapproval of revision '9af00415175d29e7e9227c383939d392ea0af499'
-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	ab7250b630559f3b0f5a824f0b83c00d94e5c87e
+++ pidgin/gtkconv.c	757d8661206daf66a12999aa1587baf38b40564c
@@ -2853,6 +2853,9 @@ pidgin_conversations_find_unseen_list(Pu
 		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 {
============================================================
--- pidgin/gtkdocklet.c	d3fbe3800758c767e9d16957a12e040757e9afdd
+++ pidgin/gtkdocklet.c	e9549c61d2e3bdf8d4e7c632a8ca8504bdf886b6
@@ -145,22 +145,15 @@ docklet_update_status()
 		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 @@ pidgin_docklet_clicked(int button_type)
 			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 {