cpw.nader.asynclogging-3: b8f09631: Forgot to commit the changes to fix the ...

[morshed.nader at gmail.com]

----------------------------------------------------------------------
Revision: b8f09631115f534572c970cdf5cf43874dd82cd2
Parent:   2ea7966cb2b0c4f1dd422bcf3d5645237e29bc1d
Author:   morshed.nader at gmail.com
Date:     01/07/12 21:49:16
Branch:   im.pidgin.cpw.nader.asynclogging-3
URL: http://d.pidgin.im/viewmtn/revision/info/b8f09631115f534572c970cdf5cf43874dd82cd2

Changelog: 

Forgot to commit the changes to fix the calls to write_async

Changes against parent 2ea7966cb2b0c4f1dd422bcf3d5645237e29bc1d

  patched  libpurple/connection.c
  patched  libpurple/conversation.c
  patched  libpurple/status.c

-------------- next part --------------
============================================================
--- libpurple/conversation.c	bd2470af445299756a04ad10219c19b44ea0571e
+++ libpurple/conversation.c	837e37950f5bb32273c5c244cbbc24ed179b8b8e
@@ -1143,8 +1143,8 @@ purple_conversation_write(PurpleConversa
 			open_log(conv);
 
 		for (log = conv->logs; log != NULL; log = g_list_next(log))
-			purple_log_write_async((PurpleLog *) log->data, flags, alias, mtime, displayed,
-				G_PRIORITY_DEFAULT, write_conv_cancel, NULL, NULL);
+			purple_log_write_async(PURPLE_LOG(log->data), flags, alias, mtime,
+				displayed, G_PRIORITY_DEFAULT, write_conv_cancel);
 	}
 
 	if (ops && ops->write_conv)
============================================================
--- libpurple/connection.c	1aa25fa64048382cda3227de1c4018cf27b392c5
+++ libpurple/connection.c	76054caa26a8f3acb9694fc1d2fa9f9d4380c828
@@ -347,7 +347,7 @@ purple_connection_set_state(PurpleConnec
 							   purple_account_get_username(account),
 							   purple_presence_get_login_time(presence),
 							   msg, G_PRIORITY_DEFAULT,
-							   write_conn_cancel, NULL, NULL);
+							   write_conn_cancel);
 				g_free(msg);
 			}
 		}
@@ -378,7 +378,7 @@ purple_connection_set_state(PurpleConnec
 				purple_log_write_async(log, PURPLE_MESSAGE_SYSTEM,
 							   purple_account_get_username(account), time(NULL),
 							   msg, G_PRIORITY_DEFAULT,
-							   write_conn_cancel, NULL, NULL);
+							   write_conn_cancel);
 				g_free(msg);
 			}
 		}
============================================================
--- libpurple/status.c	a4a19706e43e974b5f777b4dec892e9c186900af
+++ libpurple/status.c	c98fb4798dc55d967785b501d5673fef6a44b7c4
@@ -610,8 +610,7 @@ notify_buddy_status_update(PurpleBuddy *
 		if (log != NULL)
 		{
 			purple_log_write_async(log, PURPLE_MESSAGE_SYSTEM, buddy_alias,
-				current_time, logtmp, G_PRIORITY_DEFAULT, write_status_cancel,
-				NULL, NULL);
+				current_time, logtmp, G_PRIORITY_DEFAULT, write_status_cancel);
 		}
 
 		g_free(tmp);
@@ -1210,7 +1209,7 @@ update_buddy_idle(PurpleBuddy *buddy, Pu
 
 				purple_log_write_async(log, PURPLE_MESSAGE_SYSTEM,
 					purple_buddy_get_alias(buddy), current_time, tmp2,
-					G_PRIORITY_DEFAULT, write_status_cancel, NULL, NULL);
+					G_PRIORITY_DEFAULT, write_status_cancel);
 				g_free(tmp2);
 			}
 		}
@@ -1231,7 +1230,7 @@ update_buddy_idle(PurpleBuddy *buddy, Pu
 
 				purple_log_write_async(log, PURPLE_MESSAGE_SYSTEM,
 					purple_buddy_get_alias(buddy), current_time, tmp2,
-					G_PRIORITY_DEFAULT, write_status_cancel, NULL, NULL);
+					G_PRIORITY_DEFAULT, write_status_cancel);
 				g_free(tmp2);
 			}
 		}
@@ -1301,7 +1300,7 @@ purple_presence_set_idle(PurplePresence 
 				purple_log_write_async(log, PURPLE_MESSAGE_SYSTEM,
 					purple_account_get_username(account),
 					idle ? idle_time : current_time, msg,
-					G_PRIORITY_DEFAULT, write_status_cancel, NULL, NULL);
+					G_PRIORITY_DEFAULT, write_status_cancel);
 				g_free(msg);
 			}
 		}