Mercurial > pidgin

changeset 30716:c316749944c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
I don't really like this name.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 13 Mar 2010 08:18:25 +0000
parents 59cf1be8eaa7
children 2bdbf3fbd894
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
diffstat 6 files changed, 12 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/cmdproc.c	Sat Mar 13 08:09:32 2010 +0000
+++ b/libpurple/protocols/msn/cmdproc.c	Sat Mar 13 08:18:25 2010 +0000
@@ -122,7 +122,7 @@
 		return;
 	}
 
-	if (trans->send_trId)
+	if (trans->saveable)
 		msn_history_add(cmdproc->history, trans);
 
 	data = msn_transaction_to_string(trans);
--- a/libpurple/protocols/msn/msn.c	Sat Mar 13 08:09:32 2010 +0000
+++ b/libpurple/protocols/msn/msn.c	Sat Mar 13 08:18:25 2010 +0000
@@ -1973,7 +1973,7 @@
 		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);
 	}
 }
--- a/libpurple/protocols/msn/notification.c	Sat Mar 13 08:09:32 2010 +0000
+++ b/libpurple/protocols/msn/notification.c	Sat Mar 13 08:18:25 2010 +0000
@@ -312,7 +312,7 @@
 		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);
--- a/libpurple/protocols/msn/switchboard.c	Sat Mar 13 08:09:32 2010 +0000
+++ b/libpurple/protocols/msn/switchboard.c	Sat Mar 13 08:18:25 2010 +0000
@@ -1226,7 +1226,7 @@
 		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);
--- a/libpurple/protocols/msn/transaction.c	Sat Mar 13 08:09:32 2010 +0000
+++ b/libpurple/protocols/msn/transaction.c	Sat Mar 13 08:18:25 2010 +0000
@@ -37,7 +37,7 @@
 
 	trans->cmdproc = cmdproc;
 	trans->command = g_strdup(command);
-	trans->send_trId = TRUE;
+	trans->saveable = TRUE;
 
 	if (format != NULL)
 	{
@@ -97,7 +97,7 @@
 
 	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
-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
--- a/libpurple/protocols/msn/transaction.h	Sat Mar 13 08:09:32 2010 +0000
+++ b/libpurple/protocols/msn/transaction.h	Sat Mar 13 08:18:25 2010 +0000
@@ -40,8 +40,9 @@
 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 @@
 								 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);