cpw.qulogic.msnp16: 2047e8ca: I don't really like this name.

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 2047e8ca11ef3f4bd140cd8ab1bb4067eb531716
Ancestor: db51c4df40b48af0a8ca3e73dbe5520b87a599fc
Author: qulogic at pidgin.im
Date: 2010-03-13T08:18:25
Branch: im.pidgin.cpw.qulogic.msnp16
URL: http://d.pidgin.im/viewmtn/revision/info/2047e8ca11ef3f4bd140cd8ab1bb4067eb531716

Modified files:
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/transaction.c
        libpurple/protocols/msn/transaction.h

ChangeLog: 

I don't really like this name.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/cmdproc.c	639df06d68ed24d23a3a76e40f75752220549c43
+++ libpurple/protocols/msn/cmdproc.c	b784e3ff7a7febe1306288a22cc334ef234721f8
@@ -122,7 +122,7 @@ msn_cmdproc_send_trans(MsnCmdProc *cmdpr
 		return;
 	}
 
-	if (trans->send_trId)
+	if (trans->saveable)
 		msn_history_add(cmdproc->history, trans);
 
 	data = msn_transaction_to_string(trans);
============================================================
--- libpurple/protocols/msn/msn.c	cfa813b7d4037d34156f871662e9dfa1b4b4724c
+++ libpurple/protocols/msn/msn.c	84ed0581e0cc46d1e63e8dae540a2bd0f5f24bff
@@ -1973,7 +1973,7 @@ msn_keepalive(PurpleConnection *gc)
 		cmdproc = session->notification->cmdproc;
 
 		trans = msn_transaction_new(cmdproc, "PNG", NULL);
-		msn_transaction_set_send_trId(trans, FALSE);
+		msn_transaction_set_saveable(trans, FALSE);
 		msn_cmdproc_send_trans(cmdproc, trans);
 	}
 }
============================================================
--- libpurple/protocols/msn/notification.c	97aed0025a1dd50c9cb018a047d4cc125b80e8fa
+++ libpurple/protocols/msn/notification.c	961dd259ebbdcfac011e1a1cac8814ff04900f7d
@@ -312,7 +312,7 @@ msn_notification_close(MsnNotification *
 		return;
 
 	trans = msn_transaction_new(notification->cmdproc, "OUT", NULL);
-	msn_transaction_set_send_trId(trans, FALSE);
+	msn_transaction_set_saveable(trans, FALSE);
 	msn_cmdproc_send_trans(notification->cmdproc, trans);
 
 	msn_notification_disconnect(notification);
============================================================
--- libpurple/protocols/msn/switchboard.c	ba691322308974414f1e13a593b3e362728c3c8f
+++ libpurple/protocols/msn/switchboard.c	02cab694782324b1be1bc9dfd39fd3fb777ab231
@@ -1226,7 +1226,7 @@ msn_switchboard_close(MsnSwitchBoard *sw
 		MsnTransaction *trans;
 		cmdproc = swboard->cmdproc;
 		trans = msn_transaction_new(cmdproc, "OUT", NULL);
-		msn_transaction_set_send_trId(trans, FALSE);
+		msn_transaction_set_saveable(trans, FALSE);
 		msn_cmdproc_send_trans(cmdproc, trans);
 
 		msn_switchboard_destroy(swboard);
============================================================
--- libpurple/protocols/msn/transaction.c	4f2dbba26e272795d691dda0335ee8d807cfcbe1
+++ libpurple/protocols/msn/transaction.c	0ab94e772b185096a51820c3e685b56e06595996
@@ -37,7 +37,7 @@ msn_transaction_new(MsnCmdProc *cmdproc,
 
 	trans->cmdproc = cmdproc;
 	trans->command = g_strdup(command);
-	trans->send_trId = TRUE;
+	trans->saveable = TRUE;
 
 	if (format != NULL)
 	{
@@ -97,7 +97,7 @@ msn_transaction_to_string(MsnTransaction
 
 	if (trans->params != NULL)
 		str = g_strdup_printf("%s %u %s\r\n", trans->command, trans->trId, trans->params);
-	else if (trans->send_trId)
+	else if (trans->saveable)
 		str = g_strdup_printf("%s %u\r\n", trans->command, trans->trId);
 	else
 		str = g_strdup_printf("%s\r\n", trans->command);
@@ -178,11 +178,11 @@ void
 }
 
 void
-msn_transaction_set_send_trId(MsnTransaction  *trans, gboolean send)
+msn_transaction_set_saveable(MsnTransaction  *trans, gboolean saveable)
 {
 	g_return_if_fail(trans != NULL);
 
-	trans->send_trId = send;
+	trans->saveable = saveable;
 }
 
 void
============================================================
--- libpurple/protocols/msn/transaction.h	6cfdac0a7add1e7b25e176adacb84a8712e59209
+++ libpurple/protocols/msn/transaction.h	eab45d686173a78fe366272cbee0ad84efd1a5d7
@@ -40,9 +40,10 @@ struct _MsnTransaction
 struct _MsnTransaction
 {
 	MsnCmdProc *cmdproc;
-	unsigned int trId;
-	gboolean send_trId;
 
+	gboolean saveable;	/**< Whether to save this transaction in the history */
+	unsigned int trId;	/**< The ID of this transaction, if it's being saved */
+
 	char *command;
 	char *params;
 
@@ -75,7 +76,7 @@ void msn_transaction_set_data_free(MsnTr
 								 const char *payload, int payload_len);
 void msn_transaction_set_data(MsnTransaction *trans, void *data);
 void msn_transaction_set_data_free(MsnTransaction *trans, GDestroyNotify fn);
-void msn_transaction_set_send_trId(MsnTransaction  *trans, gboolean send);
+void msn_transaction_set_saveable(MsnTransaction  *trans, gboolean saveable);
 void msn_transaction_add_cb(MsnTransaction *trans, char *answer,
 							MsnTransCb cb);
 void msn_transaction_set_error_cb(MsnTransaction *trans, MsnErrorCb cb);