Mercurial > pidgin3 / file diff

--- a/src/conversation.c	Thu Jan 11 08:02:35 2001 +0000
+++ b/src/conversation.c	Fri Jan 12 03:02:20 2001 +0000
@@ -705,8 +705,12 @@
 	quiet_set(c->bgcolorbtn, FALSE);
 	quiet_set(c->link, FALSE);
 
-	if ((general_options & OPT_GEN_BACK_ON_IM) && awaymessage != NULL) {
-		serv_set_away(c->gc, GAIM_AWAY_CUSTOM, NULL);
+	if (general_options & OPT_GEN_BACK_ON_IM) {
+		if (awaymessage != NULL) {
+			do_im_back();
+		} else {
+			serv_set_away(c->gc, GAIM_AWAY_CUSTOM, NULL);
+		}
 	}
 
 	gtk_widget_grab_focus(c->entry);