# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1176292965 0
# Node ID 4f286fc9cdff0dde91daf70b1c8cd86a3cd19588
# Parent  d696a7efd94cc97d3a341928bc2d01ea06631a26
"delete" is a reserved word in C++, rename the "delete" member of
PurpleLogLogger struct to "remove"

diff -r d696a7efd94c -r 4f286fc9cdff libpurple/log.c
--- a/libpurple/log.c	Wed Apr 11 12:01:40 2007 +0000
+++ b/libpurple/log.c	Wed Apr 11 12:02:45 2007 +0000
@@ -253,7 +253,7 @@
 	g_return_val_if_fail(log != NULL, FALSE);
 	g_return_val_if_fail(log->logger != NULL, FALSE);
 
-	if (log->logger->delete == NULL)
+	if (log->logger->remove == NULL)
 		return FALSE;
 
 	if (log->logger->is_deletable != NULL)
@@ -267,8 +267,8 @@
 	g_return_val_if_fail(log != NULL, FALSE);
 	g_return_val_if_fail(log->logger != NULL, FALSE);
 
-	if (log->logger->delete != NULL)
-		return log->logger->delete(log);
+	if (log->logger->remove != NULL)
+		return log->logger->remove(log);
 
 	return FALSE;
 }
@@ -344,7 +344,7 @@
 				int(*total_size)(PurpleLogType type, const char *name, PurpleAccount *account),
 				GList*(*list_syslog)(PurpleAccount *account),
 				void(*get_log_sets)(PurpleLogSetCallback cb, GHashTable *sets),
-				gboolean(*delete)(PurpleLog *log),
+				gboolean(*remove)(PurpleLog *log),
 				gboolean(*is_deletable)(PurpleLog *log))
 {
 #endif
@@ -380,7 +380,7 @@
 	if (functions >= 9)
 		logger->get_log_sets = va_arg(args, void *);
 	if (functions >= 10)
-		logger->delete = va_arg(args, void *);
+		logger->remove = va_arg(args, void *);
 	if (functions >= 11)
 		logger->is_deletable = va_arg(args, void *);
 
diff -r d696a7efd94c -r 4f286fc9cdff libpurple/log.h
--- a/libpurple/log.h	Wed Apr 11 12:01:40 2007 +0000
+++ b/libpurple/log.h	Wed Apr 11 12:02:45 2007 +0000
@@ -105,7 +105,7 @@
 	void (*get_log_sets)(PurpleLogSetCallback cb, GHashTable *sets);
 
 	/* Attempts to delete the specified log, indicating success or failure */
-	gboolean (*delete)(PurpleLog *log);
+	gboolean (*remove)(PurpleLog *log);
 
 	/* Tests whether a log is deletable */
 	gboolean (*is_deletable)(PurpleLog *log);
@@ -472,7 +472,7 @@
  *                     functions are currently available (in order): @c create,
  *                     @c write, @c finalize, @c list, @c read, @c size,
  *                     @c total_size, @c list_syslog, @c get_log_sets,
- *                     @c delete, @c is_deletable.
+ *                     @c remove, @c is_deletable.
  *                     For details on these functions, see PurpleLogLogger.
  *                     Functions may not be skipped. For example, passing
  *                     @c create and @c write is acceptable (for a total of