# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1190998694 0
# Node ID 6f4defb6f3995366758698b6504d2be00a5e4abf
# Parent  9752389df73264b4f8617cd2b68b33297c154937
applied changes from c0104c111e903cfec5d0a95e0ae9dafb72f0dcbf
             through 80e3a515775c28b61c4c155c4a524374ef3360ff

diff -r 9752389df732 -r 6f4defb6f399 pidgin/gtknotify.c
--- a/pidgin/gtknotify.c	Fri Sep 28 16:23:19 2007 +0000
+++ b/pidgin/gtknotify.c	Fri Sep 28 16:58:14 2007 +0000
@@ -420,8 +420,6 @@
 	GdkPixbuf *icon;
 	gboolean new_n = TRUE;
 
-	icon = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
-
 	if (count > 0 || clear) {
 		/* Allow only one non-detailed email notification for each account */
 		if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(treemodel), &iter)) {
@@ -449,6 +447,11 @@
 		}
 	}
 
+	if (clear)
+		return NULL;
+
+	icon = pidgin_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM);
+
 	if (new_n) {
 		data = g_new0(PidginNotifyMailData, 1);
 		gtk_tree_store_append(treemodel, &iter, NULL);
@@ -550,9 +553,8 @@
 				/* There is no API to clear the headline specifically */
 				/* This will trigger reset_mail_dialog() */
 				pidgin_blist_set_headline(NULL, NULL, NULL, NULL, NULL);
+				return NULL;
 			}
-
-			return NULL;
 		}
 	}