[Gaim-commits] SF.net SVN: gaim: [17176] trunk/libgaim/protocols/gg/gg.c

[<dat...@us...>]

Revision: 17176
          http://svn.sourceforge.net/gaim/?rev=17176&view=rev
Author:   datallah
Date:     2006-09-05 20:12:05 -0700 (Tue, 05 Sep 2006)

Log Message:
-----------
Fix bug #1553112 (printf("%s", NULL) stuff)

Modified Paths:
--------------
    trunk/libgaim/protocols/gg/gg.c

Modified: trunk/libgaim/protocols/gg/gg.c
===================================================================
--- trunk/libgaim/protocols/gg/gg.c	2006-09-06 03:01:57 UTC (rev 17175)
+++ trunk/libgaim/protocols/gg/gg.c	2006-09-06 03:12:05 UTC (rev 17176)
@@ -1324,7 +1324,7 @@
 
 					gaim_debug_info("gg",
 						"notify: (%d) status: %d; descr: %s\n",
-						n->uin, n->status, descr);
+						n->uin, n->status, descr ? descr : "(null)");
 
 					ggp_generic_status_handler(gc,
 						n->uin, n->status, descr);
@@ -1335,7 +1335,8 @@
 			gaim_debug_info("gg",
 				"notify60_pre: (%d) status=%d; version=%d; descr=%s\n",
 				ev->event.notify60->uin, ev->event.notify60->status,
-				ev->event.notify60->version, ev->event.notify60->descr);
+				ev->event.notify60->version,
+				ev->event.notify60->descr ? ev->event.notify60->descr : "(null)");
 
 			for (i = 0; ev->event.notify60[i].uin; i++) {
 				gaim_debug_info("gg",
@@ -1343,7 +1344,7 @@
 					ev->event.notify60[i].uin,
 					ev->event.notify60[i].status,
 					ev->event.notify60[i].version,
-					ev->event.notify60[i].descr);
+					ev->event.notify60[i].descr ? ev->event.notify60[i].descr : "(null)");
 
 				ggp_generic_status_handler(gc, ev->event.notify60[i].uin,
 					ev->event.notify60[i].status,
@@ -1353,7 +1354,7 @@
 		case GG_EVENT_STATUS:
 			gaim_debug_info("gg", "status: (%d) status=%d; descr=%s\n",
 					ev->event.status.uin, ev->event.status.status,
-					ev->event.status.descr);
+					ev->event.status.descr ? ev->event.status.descr : "(null)");
 
 			ggp_generic_status_handler(gc, ev->event.status.uin,
 				ev->event.status.status, ev->event.status.descr);
@@ -1362,7 +1363,8 @@
 			gaim_debug_info("gg",
 				"status60: (%d) status=%d; version=%d; descr=%s\n",
 				ev->event.status60.uin, ev->event.status60.status,
-				ev->event.status60.version, ev->event.status60.descr);
+				ev->event.status60.version,
+				ev->event.status60.descr ? ev->event.status60.descr : "(null)");
 
 			ggp_generic_status_handler(gc, ev->event.status60.uin,
 				ev->event.status60.status, ev->event.status60.descr);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.