[Gaim-commits] CVS: gaim/src conversation.c,1.335,1.336

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv26767/src

Modified Files:
	conversation.c 
Log Message:
Typing notification will go away if you're not using tabs (I don't know why you're not using tabs... they're so cool)


Index: conversation.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/conversation.c,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -d -r1.335 -r1.336
--- conversation.c	6 Mar 2002 17:04:36 -0000	1.335
+++ conversation.c	8 Mar 2002 00:58:38 -0000	1.336
@@ -1699,6 +1699,8 @@
 	if ((c->is_chat && (chat_options & OPT_CHAT_POPUP)) ||
 	    (!c->is_chat && (im_options & OPT_IM_POPUP)))
 		gdk_window_show(c->window->window);
+	if (flags & WFLAG_RECV)
+		reset_typing(g_strdup(c->name));
 
 	/* tab highlighting */
 	if (c->is_chat && !(chat_options & OPT_CHAT_ONE_WINDOW)) /* if chat but not tabbed chat */
@@ -1737,7 +1739,7 @@
 		GList *ws = (c->is_chat ? chats : conversations);
 		GtkWidget *label = gtk_notebook_get_tab_label(notebook,
 							      gtk_notebook_get_nth_page(notebook,
-								      offs + g_list_index(ws, c)));
+											offs + g_list_index(ws, c)));
 		GtkStyle *style;
 		style = gtk_style_new();
 		if (!GTK_WIDGET_REALIZED(label))
@@ -1760,8 +1762,6 @@
 		gtk_widget_set_style(label, style);
 		gtk_style_unref(style);
 	}
-	if (flags & WFLAG_RECV)
-		reset_typing(g_strdup(c->name));
 }
 
 void update_progress(struct conversation *c, float percent) {