Mercurial > pidgin.yaz

changeset 6479:b808f9734879

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 6992] (19:12:00) Robot101: replacing some slightly crufty old code which makes assumptions like AIM-only, ignores gcs, could've messed up in certain obscure circumstances. (19:12:10) Robot101: my code's probably more efficient in cpu and memory too. (19:12:28) Robot101: and it's orthogonal to my message queue work so I split it off. committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Fri, 15 Aug 2003 23:13:42 +0000
parents 338147ea6896
children d35482c12d51
files src/away.c src/main.c src/server.c src/ui.h
diffstat 4 files changed, 95 insertions(+), 71 deletions(-) [+]
line wrap: on
line diff
--- a/src/away.c	Fri Aug 15 22:16:44 2003 +0000
+++ b/src/away.c	Fri Aug 15 23:13:42 2003 +0000
@@ -37,14 +37,16 @@
 #include "ui.h"
 
 GtkWidget *imaway = NULL;
-
 GtkWidget *awaymenu = NULL;
 GtkWidget *awayqueue = NULL;
 GtkListStore *awayqueuestore = NULL;
 GtkWidget *awayqueuesw;
 
+GSList *message_queue = NULL;
+GSList *unread_message_queue = NULL;
+
+GSList *away_messages = NULL;
 struct away_message *awaymessage = NULL;
-int auto_away;
 
 static void dequeue_message(GtkTreeIter *iter)
 {
@@ -172,12 +174,6 @@
 			return;
 	}
 
-	while (away_time_queue) {
-		struct queued_away_response *qar = away_time_queue->data;
-		away_time_queue = g_slist_remove(away_time_queue, qar);
-		g_free(qar);
-	}
-
 	awaymessage = NULL;
 	awayqueue = NULL;
 	awayqueuesw = NULL;
@@ -277,13 +273,6 @@
 
 	awaymessage = a;
 
-	/* New away message... Clear out the old sent_aways */
-	while (away_time_queue) {
-		struct queued_away_response *qar = away_time_queue->data;
-		away_time_queue = g_slist_remove(away_time_queue, qar);
-		g_free(qar);
-	}
-
 	gtk_widget_show(imaway);
 	serv_set_away_all(awaymessage->message);
 }
--- a/src/main.c	Fri Aug 15 22:16:44 2003 +0000
+++ b/src/main.c	Fri Aug 15 23:13:42 2003 +0000
@@ -65,14 +65,8 @@
 static GtkWidget *name;
 static GtkWidget *pass;
 
-GSList *away_messages = NULL;
-GSList *message_queue = NULL;
-GSList *unread_message_queue = NULL;
-GSList *away_time_queue = NULL;
-
 GtkWidget *mainwindow = NULL;
 
-
 int opt_away = 0;
 int docklet_count = 0;
 char *opt_away_arg = NULL;
--- a/src/server.c	Fri Aug 15 22:16:44 2003 +0000
+++ b/src/server.c	Fri Aug 15 23:13:42 2003 +0000
@@ -176,12 +176,84 @@
 	return 0;
 }
 
-struct queued_away_response {
+GSList *last_auto_responses = NULL;
+struct last_auto_response {
+	GaimConnection *gc;
 	char name[80];
-	time_t sent_away;
+	time_t sent;
 };
 
-struct queued_away_response *find_queued_away_response_by_name(const char *name);
+gboolean expire_last_auto_responses(gpointer data)
+{
+	GSList *tmp, *cur;
+	struct last_auto_response *lar;
+
+	tmp = last_auto_responses;
+
+	while (tmp) {
+		cur = tmp;
+		tmp = tmp->next;
+		lar = (struct last_auto_response *)cur->data;
+
+		if ((time(NULL) - lar->sent) >
+				gaim_prefs_get_int("/core/away/auto_response/sec_before_resend")) {
+
+			last_auto_responses = g_slist_remove(last_auto_responses, lar);
+			g_free(lar);
+		}
+	}
+
+	return FALSE; /* do not run again */
+}
+
+struct last_auto_response *get_last_auto_response(GaimConnection *gc, const char *name)
+{
+	GSList *tmp;
+	struct last_auto_response *lar;
+
+	/* because we're modifying or creating a lar, schedule the
+	 * function to expire them as the pref dictates */
+	g_timeout_add((gaim_prefs_get_int("/core/away/auto_response/sec_before_resend") + 1) * 1000,
+			expire_last_auto_responses, NULL);
+
+	tmp = last_auto_responses;
+
+	while (tmp) {
+		lar = (struct last_auto_response *)tmp->data;
+
+		if (gc == lar->gc && !strncmp(name, lar->name, sizeof(lar->name)))
+			return lar;
+
+		tmp = tmp->next;
+	}
+
+	lar = (struct last_auto_response *)g_new0(struct last_auto_response, 1);
+	g_snprintf(lar->name, sizeof(lar->name), "%s", name);
+	lar->gc = gc;
+	lar->sent = 0;
+	last_auto_responses = g_slist_append(last_auto_responses, lar);
+
+	return lar;
+}
+
+void flush_last_auto_responses(GaimConnection *gc)
+{
+	GSList *tmp, *cur;
+	struct last_auto_response *lar;
+
+	tmp = last_auto_responses;
+
+	while (tmp) {
+		cur = tmp;
+		tmp = tmp->next;
+		lar = (struct last_auto_response *)cur->data;
+
+		if (lar->gc == gc) {
+			last_auto_responses = g_slist_remove(last_auto_responses, lar);
+			g_free(lar);
+		}
+	}
+}
 
 int serv_send_im(GaimConnection *gc, const char *name, const char *message,
 				 int len, int flags)
@@ -202,20 +274,13 @@
 		serv_touch_idle(gc);
 
 	if (gc->away &&
-		!gaim_prefs_get_bool("/core/away/auto_response/in_active_conv") &&
-		gaim_prefs_get_bool("/core/away/auto_response/enabled")) {
+		(gc->flags & OPT_CONN_AUTO_RESP) &&
+		gaim_prefs_get_bool("/core/away/auto_response/enabled") &&
+		!gaim_prefs_get_bool("/core/away/auto_response/in_active_conv")) {
 
-		time_t t;
-		struct queued_away_response *qar;
-		time(&t);
-		qar = find_queued_away_response_by_name(name);
-		if (!qar) {
-			qar = (struct queued_away_response *)g_new0(struct queued_away_response, 1);
-			g_snprintf(qar->name, sizeof(qar->name), "%s", name);
-			qar->sent_away = 0;
-			away_time_queue = g_slist_append(away_time_queue, qar);
-		}
-		qar->sent_away = t;
+		struct last_auto_response *lar;
+		lar = get_last_auto_response(gc, name);
+		lar->sent = time(NULL);
 	}
 
 	if (c && gaim_im_get_type_again_timeout(GAIM_IM(c)))
@@ -325,6 +390,9 @@
 
 	}
 
+	/* New away message... Clear out the record of sent autoresponses */
+	flush_last_auto_responses(gc);
+
 	system_log(log_away, gc, NULL, OPT_LOG_BUDDY_AWAY | OPT_LOG_MY_SIGNON);
 }
 
@@ -716,25 +784,6 @@
 	return i;
 }
 
-struct queued_away_response *find_queued_away_response_by_name(const char *name)
-{
-	GSList *templist;
-	struct queued_away_response *qar;
-
-	templist = away_time_queue;
-
-	while (templist) {
-		qar = (struct queued_away_response *)templist->data;
-
-		if (!strcmp(name, qar->name))
-			return qar;
-
-		templist = templist->next;
-	}
-
-	return NULL;
-}
-
 /*
  * woo. i'm actually going to comment this function. isn't that fun. make
  * sure to follow along, kids
@@ -826,14 +875,12 @@
 	 * things we have to do for each.
 	 */
 	if (gc->away) {
-		time_t t;
+		time_t t = time(NULL);
 		char *tmpmsg;
 		struct buddy *b = gaim_find_buddy(gc->account, name);
 		char *alias = b ? gaim_get_buddy_alias(b) : name;
 		int row;
-		struct queued_away_response *qar;
-
-		time(&t);
+		struct last_auto_response *lar;
 
 		/*
 		 * Either we're going to queue it or not. Because of the way
@@ -930,23 +977,17 @@
 		 * sent you another one, they'd get the auto-response back too
 		 * soon. Besides that, we need to keep track of this even if we've
 		 * got a queue. So the rest of this block is just the auto-response,
-		 * if necessary
+		 * if necessary.
 		 */
-		qar = find_queued_away_response_by_name(name);
-		if (!qar) {
-			qar = (struct queued_away_response *)g_new0(struct queued_away_response, 1);
-			g_snprintf(qar->name, sizeof(qar->name), "%s", name);
-			qar->sent_away = 0;
-			away_time_queue = g_slist_append(away_time_queue, qar);
-		}
-		if ((t - qar->sent_away) <
+		lar = get_last_auto_response(gc, name);
+		if ((t - lar->sent) <
 			gaim_prefs_get_int("/core/away/auto_response/sec_before_resend")) {
 
 			g_free(name);
 			g_free(message);
 			return;
 		}
-		qar->sent_away = t;
+		lar->sent = t;
 
 		/* apply default fonts and colors */
 		tmpmsg = stylize(gc->away, MSG_LEN);
--- a/src/ui.h	Fri Aug 15 22:16:44 2003 +0000
+++ b/src/ui.h	Fri Aug 15 23:13:42 2003 +0000
@@ -98,11 +98,11 @@
 };
 
 /* Globals in aim.c */
-extern GSList *away_messages; /* this should be moved to away.c */
 extern GtkWidget *mainwindow;
 extern int docklet_count;
 
 /* Globals in away.c */
+extern GSList *away_messages;
 extern struct away_message *awaymessage;
 extern GtkWidget *awaymenu;
 extern GtkWidget *awayqueue;