diff src/server.c @ 4168:ebfb80bbe1ed

[gaim-migrate @ 4397] (00:16:51) faceprint: apply my g-signal patch too! </whine> (00:17:02) ChipX86: the what? (00:17:20) faceprint: sorry (00:17:23) faceprint: g-timeout, rather (00:17:28) ChipX86: ah good (00:17:33) faceprint: http://faceprint.com/code/gaim/g-timeout.20030101.1301.diff (00:17:33) ChipX86: yes, APPLY THAT (00:17:38) ChipX86: I need that (00:17:40) LSchiere: one at a time (00:17:51) faceprint: ChipX86: you need that? (00:17:56) ChipX86: for the conversation rewrite (00:17:59) faceprint: ahh (00:18:08) faceprint: it also fixes a memleak for msn users committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 02 Jan 2003 05:20:55 +0000
parents 7002b6f16bdf
children 511c2b63caa4
line wrap: on
line diff
--- a/src/server.c	Thu Jan 02 05:18:16 2003 +0000
+++ b/src/server.c	Thu Jan 02 05:20:55 2003 +0000
@@ -190,7 +190,7 @@
 	}
 
 	if (cnv && cnv->type_again_timeout)
-		gtk_timeout_remove(cnv->type_again_timeout);
+		g_source_remove(cnv->type_again_timeout);
 
 	return val;
 }
@@ -881,9 +881,9 @@
 	 do_pounce(gc, name, OPT_POUNCE_TYPING);
 	 if (timeout > 0) {
 		 if (cnv->typing_timeout)
-			 gtk_timeout_remove (cnv->typing_timeout);
-		 cnv->typing_timeout = gtk_timeout_add(timeout * 1000,(GtkFunction)reset_typing,
-						       g_strdup(name));
+			 g_source_remove (cnv->typing_timeout);
+		 cnv->typing_timeout = g_timeout_add_full(G_PRIORITY_DEFAULT_IDLE,
+				 timeout * 1000, reset_typing, g_strdup(name), g_free);
 	 }
 }
 
@@ -892,7 +892,8 @@
 	if(!c)
 		return;
 	if (c->typing_timeout) {
-		gtk_timeout_remove (c->typing_timeout);
+		g_source_remove(c->typing_timeout);
+		c->typing_timeout=0;
 	}
 	c->typing_state = NOT_TYPING;
 	update_convo_status(c);