# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1054167396 0
# Node ID d6c748a19ef8c2ea1b6dbdafe53d55906bcf9b8d
# Parent  aee0ee45897442877557695afb7054ef80f2ec0f
[gaim-migrate @ 5942]
I think this should reduce the number of "unable to add" errors when signing
on with an oscar account.  It only affects the ones that have (no name) or
(no item) or whatever.

I also changed some mail notification stuff so you won't get that little
gdk assertion failed error or whatever it was.  My bad.

committer: Tailor Script <tailor@pidgin.im>

diff -r aee0ee458974 -r d6c748a19ef8 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Tue May 27 22:44:06 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Thu May 29 00:16:36 2003 +0000
@@ -3446,11 +3446,8 @@
 
 	if (emailinfo) {
 		gchar *to = g_strdup_printf("%s@%s", gc->username, emailinfo->domain);
-		if (emailinfo->unread) {
-			if (havenewmail)
-				gaim_notify_emails(gc, emailinfo->nummsgs, FALSE, NULL, NULL, (const char **)&to, (const char **)&emailinfo->url, NULL, NULL);
-		} else
-			gaim_notify_emails(gc, 0, FALSE, NULL, NULL, (const char **)&to, (const char **)&emailinfo->url, NULL, NULL);
+		if (emailinfo->unread && havenewmail)
+			gaim_notify_emails(gc, emailinfo->nummsgs, FALSE, NULL, NULL, (const char **)&to, (const char **)&emailinfo->url, NULL, NULL);
 		g_free(to);
 	}
 
@@ -4498,11 +4495,11 @@
 	}
 
 	if (strcmp(state, _("Invisible"))) {
-		if (aim_ssi_getpermdeny(od->sess->ssi.local) != gc->account->permdeny)
+		if ((od->sess->ssi.received_data) && (aim_ssi_getpermdeny(od->sess->ssi.local) != gc->account->permdeny))
 			aim_ssi_setpermdeny(od->sess, gc->account->permdeny, 0xffffffff);
 		gc->account->permdeny = 4;
 	} else {
-		if (aim_ssi_getpermdeny(od->sess->ssi.local) != 0x03)
+		if ((od->sess->ssi.received_data) && (aim_ssi_getpermdeny(od->sess->ssi.local) != 0x03))
 			aim_ssi_setpermdeny(od->sess, 0x03, 0xffffffff);
 		gc->account->permdeny = 3;
 	}