Mercurial > pidgin.yaz

changeset 1667:b5635d882116

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 1677] fixes. committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Fri, 30 Mar 2001 22:12:56 +0000
parents 8b0c165a33f4
children 91cddbcfdd17
files src/buddy.c src/oscar.c src/toc.c
diffstat 3 files changed, 11 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/buddy.c	Fri Mar 30 20:42:15 2001 +0000
+++ b/src/buddy.c	Fri Mar 30 22:12:56 2001 +0000
@@ -1940,18 +1940,15 @@
 void update_idle_times() {
 	GSList *grp = shows;
 	GSList *mem;
-	struct buddy_show *bs;
-	struct group_show *gs;
-	struct buddy *b;
+	struct buddy_show *b;
+	struct group_show *g;
 
 	while (grp) {
-		gs = (struct group_show *)grp->data;
-		mem = gs->members;
+		g = (struct group_show *)grp->data;
+		mem = g->members;
 		while (mem) {
-			bs = (struct buddy_show *)mem->data;
-			b = find_buddy(bs->connlist->data, bs->name);
-			if (b->idle)
-				update_idle_time(bs);
+			b = (struct buddy_show *)mem->data;
+			update_idle_time(b);
 			mem = mem->next;
 		}
 		grp = grp->next;
--- a/src/oscar.c	Fri Mar 30 20:42:15 2001 +0000
+++ b/src/oscar.c	Fri Mar 30 22:12:56 2001 +0000
@@ -455,7 +455,8 @@
 	
 	while (c) {
 		n = (struct chat_connection *)c->data;
-		gdk_input_remove(n->inpa);
+		if (n->inpa > 0)
+			gdk_input_remove(n->inpa);
 		g_free(n->name);
 		c = g_slist_remove(c, n);
 		g_free(n);
@@ -2030,7 +2031,8 @@
 	if (c != NULL) {
 		if (odata)
 			odata->oscar_chats = g_slist_remove(odata->oscar_chats, c);
-		gdk_input_remove(c->inpa);
+		if (c->inpa > 0)
+			gdk_input_remove(c->inpa);
 		if (g && odata->sess)
 			aim_conn_kill(odata->sess, &c->conn);
 		g_free(c->name);
--- a/src/toc.c	Fri Mar 30 20:42:15 2001 +0000
+++ b/src/toc.c	Fri Mar 30 22:12:56 2001 +0000
@@ -181,7 +181,7 @@
 {
 	if (gc->inpa > 0)
 		gdk_input_remove(gc->inpa);
-	gc->inpa = -1;
+	gc->inpa = 0;
 	close(((struct toc_data *)gc->proto_data)->toc_fd);
 }