[Gaim-commits] CVS: gaim/src/protocols/oscar oscar.c,1.623,1.624

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

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12677/protocols/oscar

Modified Files:
	oscar.c 
Log Message:
Fix bug 996887, Core/Solaris8/Gaim 0.80: Display Account.
It was a printf("%s", NULL); problem on Solaris


Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.623
retrieving revision 1.624
diff -u -d -p -r1.623 -r1.624
--- oscar.c	31 Jul 2004 23:08:52 -0000	1.623
+++ oscar.c	31 Jul 2004 23:30:01 -0000	1.624
@@ -5046,10 +5046,13 @@ static int gaim_info_change(aim_session_
 	va_end(ap);
 
 	gaim_debug_misc("oscar",
-			   "account info: because of %s, perms=0x%04x, err=0x%04x, url=%s, sn=%s, email=%s\n",
-		change ? "change" : "request", perms, err, url, sn, email);
+					"account info: because of %s, perms=0x%04x, err=0x%04x, url=%s, sn=%s, email=%s\n",
+					change ? "change" : "request", perms, err,
+					(url != NULL) ? url : "(null)",
+					(sn != NULL) ? sn : "(null)",
+					(email != NULL) ? email : "(null)");
 
-	if (err && url) {
+	if ((err > 0) && (url != NULL)) {
 		char *dialog_msg;
 		char *dialog_top = g_strdup_printf(_("Error Changing Account Info"));
 		switch (err) {
@@ -5081,13 +5084,13 @@ static int gaim_info_change(aim_session_
 		return 1;
 	}
 
-	if (sn) {
+	if (sn != NULL) {
 		char *dialog_msg = g_strdup_printf(_("Your screen name is currently formatted as follows:\n%s"), sn);
 		gaim_notify_info(gc, NULL, _("Account Info"), dialog_msg);
 		g_free(dialog_msg);
 	}
 
-	if (email) {
+	if (email != NULL) {
 		char *dialog_msg = g_strdup_printf(_("The email address for %s is %s"), 
 						   gaim_account_get_username(gaim_connection_get_account(gc)), email);
 		gaim_notify_info(gc, NULL, _("Account Info"), dialog_msg);