[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.366,1.367

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory sc8-pr-cvs1:/tmp/cvs-serv22180/src/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
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.


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -d -r1.366 -r1.367
--- oscar.c	27 May 2003 20:22:01 -0000	1.366
+++ oscar.c	29 May 2003 00:16:36 -0000	1.367
@@ -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;
 	}