cpw.nader.asynclogging-3: 0edc9e4e: Fixed up a few compiler errors

morshed.nader at gmail.com morshed.nader at gmail.com
Tue May 17 14:36:11 EDT 2011


----------------------------------------------------------------------
Revision: 0edc9e4e6d067b84c73afcf2aff3ae9cf0deca98
Parent:   c60a71e810a47a8559c2743432ff0e3b5ea69283
Author:   morshed.nader at gmail.com
Date:     05/17/11 04:13:06
Branch:   im.pidgin.cpw.nader.asynclogging-3
URL: http://d.pidgin.im/viewmtn/revision/info/0edc9e4e6d067b84c73afcf2aff3ae9cf0deca98

Changelog: 

Fixed up a few compiler errors

Changes against parent c60a71e810a47a8559c2743432ff0e3b5ea69283

  patched  libpurple/commonlog.c

-------------- next part --------------
============================================================
--- libpurple/commonlog.c	80b9dac726ddb36916bba3a36a5871c2f39f9b72
+++ libpurple/commonlog.c	3d79b910d1de7e94aa0936b575a4f27dadf379bd
@@ -281,7 +281,7 @@ purple_log_common_remove(PurpleLog *log,
 purple_log_common_remove(PurpleLog *log, GCancellable *cancellable,
 	GError **error)
 {
-	GFile *file = purple_common_log_get_file(COMMON_LOG(log));
+	GFile *file = purple_common_log_get_file(PURPLE_COMMON_LOG(log));
 	gboolean result;
 
 	if (file == NULL) {
@@ -294,7 +294,7 @@ purple_log_common_remove(PurpleLog *log,
 	}
 
 	result = g_file_delete(file, cancellable, error);
-	purple_log_common_set_file(COMMON_LOG(log), NULL);
+	purple_common_log_set_file(PURPLE_COMMON_LOG(log), NULL);
 
 	return result;
 }
@@ -362,9 +362,9 @@ purple_log_common_writer(PurpleLog *log,
 
 		if (stream != NULL) {
 			g_object_unref(stream);
-			purple_log_common_set_file(common_log, file);
+			purple_common_log_set_file(common_log, file);
 			g_object_unref(file);
-		else {
+		} else {
 			/* XXX: Can uncomment this when the rest of libpurple is thread-safe
 			PurpleConversation *conv = purple_log_get_conversation(log);
 


More information about the Commits mailing list