cpw.nader.asynclogging-3: b804c64d: Fixed a compiler warning in log.c

[morshed.nader at gmail.com]

----------------------------------------------------------------------
Revision: b804c64d4ebf9a800b10ae3521b514fc207e5d32
Parent:   29e972f5238c9d4adb5c0ea34306401753c4296a
Author:   morshed.nader at gmail.com
Date:     01/04/12 21:19:06
Branch:   im.pidgin.cpw.nader.asynclogging-3
URL: http://d.pidgin.im/viewmtn/revision/info/b804c64d4ebf9a800b10ae3521b514fc207e5d32

Changelog: 

Fixed a compiler warning in log.c
Fixed the function name called from history.c

Changes against parent 29e972f5238c9d4adb5c0ea34306401753c4296a

  patched  libpurple/log.c
  patched  pidgin/plugins/history.c

-------------- next part --------------
============================================================
--- pidgin/plugins/history.c	3624b8d700fc6fc6b164a0d145987ea4488ef0cc
+++ pidgin/plugins/history.c	1e52608b9376780106bbd3c771250868ef51e731
@@ -315,7 +315,7 @@ historize_log_collector_cb(GObject *obje
 	GList *list;
 	GError *err = NULL;
 
-	list = purple_log_list_logs_finish(PURPLE_LOG(object), res, &err);
+	list = purple_logs_list_logs_finish(res, &err);
 
 	if (list != NULL)
 		callback_data->log = get_last_log(list, callback_data->log);
============================================================
--- libpurple/log.c	cb492aefbf0023425d205712b6e63061cb62fd7f
+++ libpurple/log.c	7d9812819b0ff31a67f5b4fc73285279c81ec7e6
@@ -2140,8 +2140,8 @@ log_total_size_cb(GObject *object, GAsyn
 
 	/* It's hard to pass all the errors up, so just log them :( */
 	if (size < 0 && error != NULL)
-		purple_debug_error("log", "Error getting total size for %s logs: %s\n",
-			PURPLE_LOG_GET_CLASS(log)->logger_name, error->message);
+		purple_debug_error("log", "Error getting total size for logs: %s\n",
+			error->message);
 	else if (size > 0)
 		callback_data->total += size;