# HG changeset patch # User Elliott Sales de Andrade # Date 1268468305 0 # Node ID c316749944c1d7397de36700501240096be35211 # Parent 59cf1be8eaa7e0647c438c61839d094fd2402a7f I don't really like this name. diff -r 59cf1be8eaa7 -r c316749944c1 libpurple/protocols/msn/cmdproc.c --- 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); diff -r 59cf1be8eaa7 -r c316749944c1 libpurple/protocols/msn/msn.c --- 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); } } diff -r 59cf1be8eaa7 -r c316749944c1 libpurple/protocols/msn/notification.c --- 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); diff -r 59cf1be8eaa7 -r c316749944c1 libpurple/protocols/msn/switchboard.c --- 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); diff -r 59cf1be8eaa7 -r c316749944c1 libpurple/protocols/msn/transaction.c --- 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 diff -r 59cf1be8eaa7 -r c316749944c1 libpurple/protocols/msn/transaction.h --- 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);