[Gaim-commits] SF.net SVN: gaim: [17690] trunk/libgaim/protocols/oscar

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

Revision: 17690
          http://svn.sourceforge.net/gaim/?rev=17690&view=rev
Author:   thekingant
Date:     2006-11-06 18:53:42 -0800 (Mon, 06 Nov 2006)

Log Message:
-----------
gbooleanize some things.  No functionality change.

Modified Paths:
--------------
    trunk/libgaim/protocols/oscar/family_feedbag.c
    trunk/libgaim/protocols/oscar/oscar.h

Modified: trunk/libgaim/protocols/oscar/family_feedbag.c
===================================================================
--- trunk/libgaim/protocols/oscar/family_feedbag.c	2006-11-07 02:50:09 UTC (rev 17689)
+++ trunk/libgaim/protocols/oscar/family_feedbag.c	2006-11-07 02:53:42 UTC (rev 17690)
@@ -570,7 +570,7 @@
 
 	/* Make sure we don't send anything else between now
 	 * and when we receive the ack for the following operation */
-	od->ssi.waiting_for_ack = 1;
+	od->ssi.waiting_for_ack = TRUE;
 
 	/* Now go mail off our data and wait 4 to 6 weeks */
 	aim_ssi_addmoddel(od);
@@ -1316,7 +1316,7 @@
 		for (cur=od->ssi.official; cur; cur=cur->next)
 			aim_ssi_itemlist_add(&od->ssi.local, cur->name, cur->gid, cur->bid, cur->type, cur->data);
 
-		od->ssi.received_data = 1;
+		od->ssi.received_data = TRUE;
 
 		if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 			ret = userfunc(od, conn, frame, fmtver, od->ssi.numitems, od->ssi.timestamp);
@@ -1645,7 +1645,7 @@
 
 	/* If we're not waiting for any more acks, then send more SNACs */
 	if (!od->ssi.pending) {
-		od->ssi.waiting_for_ack = 0;
+		od->ssi.waiting_for_ack = FALSE;
 		aim_ssi_sync(od);
 	}
 
@@ -1664,7 +1664,7 @@
 	int ret = 0;
 	aim_rxcallback_t userfunc;
 
-	od->ssi.received_data = 1;
+	od->ssi.received_data = TRUE;
 
 	if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
 		ret = userfunc(od, conn, frame);

Modified: trunk/libgaim/protocols/oscar/oscar.h
===================================================================
--- trunk/libgaim/protocols/oscar/oscar.h	2006-11-07 02:50:09 UTC (rev 17689)
+++ trunk/libgaim/protocols/oscar/oscar.h	2006-11-07 02:53:42 UTC (rev 17690)
@@ -478,18 +478,18 @@
 		struct aim_userinfo_s *userinfo;
 		struct userinfo_node *torequest;
 		struct userinfo_node *requested;
-		int waiting_for_response;
+		gboolean waiting_for_response;
 	} locate;
 
 	/* Server-stored information (ssi) */
 	struct {
-		int received_data;
+		gboolean received_data;
 		guint16 numitems;
 		struct aim_ssi_item *official;
 		struct aim_ssi_item *local;
 		struct aim_ssi_tmp *pending;
 		time_t timestamp;
-		int waiting_for_ack;
+		gboolean waiting_for_ack;
 	} ssi;
 
 	/* TODO: Implement this as a HashTable for HUGE speed improvement! */


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