changeset 8635:4aee5a47937d

[gaim-migrate @ 9387] this is some stuff. i think there's logsize caching or something. it hasn't crashed on me yet, and we can rip it out if it sucks. enjoy! committer: Tailor Script <[e-mail]>

--- a/src/account.c	Sun Apr 11 18:18:30 2004 +0000
+++ b/src/account.c	Mon Apr 12 01:11:45 2004 +0000
@@ -923,16 +923,9 @@
 	g_return_val_if_fail(account != NULL, NULL);
 
 	if(!account->system_log){
-		char *name = g_strdup(gaim_account_get_username(account));
-		char *c = strchr(name, '/');
-
-		if(c) {
-			c[0] = '\0';
-		}
-
-		account->system_log	 = gaim_log_new(GAIM_LOG_SYSTEM, name,
-											account, account->gc->login_time);
-		g_free(name);
+		account->system_log	 = gaim_log_new(GAIM_LOG_SYSTEM,
+				gaim_account_get_username(account), account,
+				account->gc->login_time);
 	}
 
 	return account->system_log;

--- a/src/conversation.c	Sun Apr 11 18:18:30 2004 +0000
+++ b/src/conversation.c	Mon Apr 12 01:11:45 2004 +0000
@@ -822,9 +822,9 @@
 	conv->history      = g_string_new("");
 	conv->data         = g_hash_table_new_full(g_str_hash, g_str_equal,
 											   g_free, NULL);
-	conv->log          = gaim_log_new(type == GAIM_CONV_IM ? GAIM_LOG_IM :
-									  type == GAIM_CONV_CHAT ? GAIM_LOG_CHAT :
-									  GAIM_LOG_IM, name, account, time(NULL));
+	conv->log          = gaim_log_new(type == GAIM_CONV_CHAT ? GAIM_LOG_CHAT :
+									  GAIM_LOG_IM, conv->name, account,
+									  time(NULL));
 
 
 	if (type == GAIM_CONV_IM)

--- a/src/log.c	Sun Apr 11 18:18:30 2004 +0000
+++ b/src/log.c	Mon Apr 12 01:11:45 2004 +0000
@@ -37,6 +37,13 @@
 static GaimLogLogger txt_logger;
 static GaimLogLogger old_logger;
 
+struct _gaim_logsize_user {
+	char *name;
+	GaimAccount *account;
+};
+static GHashTable *logsize_users = NULL;
+
+
 /**************************************************************************
  * PUBLIC LOGGING FUNCTIONS ***********************************************
  **************************************************************************/
@@ -44,7 +51,7 @@
 GaimLog *gaim_log_new(GaimLogType type, const char *name, GaimAccount *account, time_t time)
 {
 	GaimLog *log = g_new0(GaimLog, 1);
-	log->name = g_strdup(name);
+	log->name = g_strdup(gaim_normalize(account, name));
 	log->account = account;
 	log->time = time;
 	log->type = type;
@@ -67,14 +74,24 @@
 void gaim_log_write(GaimLog *log, GaimMessageFlags type,
 		    const char *from, time_t time, const char *message)
 {
+	struct _gaim_logsize_user lu;
+
 	g_return_if_fail(log);
 	g_return_if_fail(log->logger);
 	g_return_if_fail(log->logger->write);
 
-	if ((log->type == GAIM_LOG_IM && gaim_prefs_get_bool("/core/logging/log_ims")) ||
-	    (log->type == GAIM_LOG_CHAT && gaim_prefs_get_bool("/core/logging/log_chats")) ||
-+ 		(log->type == GAIM_LOG_SYSTEM && gaim_prefs_get_bool("/core/logging/log_system")))
+	if ((log->type == GAIM_LOG_IM &&
+				gaim_prefs_get_bool("/core/logging/log_ims")) ||
+			(log->type == GAIM_LOG_CHAT &&
+			 gaim_prefs_get_bool("/core/logging/log_chats")) ||
+			(log->type == GAIM_LOG_SYSTEM &&
+			 gaim_prefs_get_bool("/core/logging/log_system"))) {
 		(log->logger->write)(log, type, from, time, message);
+		lu.name = g_strdup(gaim_normalize(log->account, log->name));
+		lu.account = log->account;
+		g_hash_table_remove(logsize_users, &lu);
+		g_free(lu.name);
+	}
 }
 
 char *gaim_log_read(GaimLog *log, GaimLogReadFlags *flags)
@@ -98,33 +115,61 @@
 	return 0;
 }
 
+static guint _gaim_logsize_user_hash(struct _gaim_logsize_user *lu)
+{
+	return g_str_hash(lu->name);
+}
+
+static guint _gaim_logsize_user_equal(struct _gaim_logsize_user *lu1,
+		struct _gaim_logsize_user *lu2)
+{
+	return ((!strcmp(lu1->name, lu2->name)) && lu1->account == lu2->account);
+}
+
+static void _gaim_logsize_user_free_key(struct _gaim_logsize_user *lu)
+{
+	g_free(lu->name);
+	g_free(lu);
+}
+
 int gaim_log_get_total_size(const char *name, GaimAccount *account)
 {
-	int size = 0;
+	int size;
 	GSList *n;
-
-	for (n = loggers; n; n = n->next) {
-		GaimLogLogger *logger = n->data;
+	struct _gaim_logsize_user *lu;
 
-		if(logger->total_size){
-			size += (logger->total_size)(name, account);
-		} else if(logger->list) {
-			GList *logs = (logger->list)(name, account);
-			int this_size = 0;
+	lu = g_new(struct _gaim_logsize_user, 1);
+	lu->name = g_strdup(gaim_normalize(account, name));
+	lu->account = account;
+
+	if((size = GPOINTER_TO_INT(g_hash_table_lookup(logsize_users, lu)))) {
+		g_free(lu->name);
+		g_free(lu);
+	} else {
+		for (n = loggers; n; n = n->next) {
+			GaimLogLogger *logger = n->data;
 
-			while (logs) {
-				GList *logs2 = logs->next;
-				GaimLog *log = (GaimLog*)(logs->data);
-				this_size += gaim_log_get_size(log);
-				gaim_log_free(log);
-				g_list_free_1(logs);
-				logs = logs2;
+			if(logger->total_size){
+				size += (logger->total_size)(name, account);
+			} else if(logger->list) {
+				GList *logs = (logger->list)(name, account);
+				int this_size = 0;
+
+				while (logs) {
+					GList *logs2 = logs->next;
+					GaimLog *log = (GaimLog*)(logs->data);
+					this_size += gaim_log_get_size(log);
+					gaim_log_free(log);
+					g_list_free_1(logs);
+					logs = logs2;
+				}
+
+				size += this_size;
 			}
+		}
 
-			size += this_size;
-		}
+		g_hash_table_replace(logsize_users, lu, GINT_TO_POINTER(size));
 	}
-
 	return size;
 }
 
@@ -269,6 +314,10 @@
 	gaim_prefs_connect_callback("/core/logging/format",
 				    logger_pref_cb, NULL);
 	gaim_prefs_trigger_callback("/core/logging/format");
+
+	logsize_users = g_hash_table_new_full((GHashFunc)_gaim_logsize_user_hash,
+			(GEqualFunc)_gaim_logsize_user_equal,
+			(GDestroyNotify)_gaim_logsize_user_free_key, NULL);
 }
 
 /****************************************************************************