diff libpurple/log.c @ 16055:4f286fc9cdff

"delete" is a reserved word in C++, rename the "delete" member of PurpleLogLogger struct to "remove"
author Stu Tomlinson <stu@nosnilmot.com>
date Wed, 11 Apr 2007 12:02:45 +0000
parents f33506aa71af
children 4999bbc52881
line wrap: on
line diff
--- 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 *);