# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 979268540 0
# Node ID c0aa7fdc0a93160757945d3b3f96b27251b9b4c5
# Parent  65f4a032502244c3f80476f80fce4e3f1a2f14d2
[gaim-migrate @ 1413]
hrm. i wonder if this is going to work well. we'll see i guess.

committer: Tailor Script <tailor@pidgin.im>

diff -r 65f4a0325022 -r c0aa7fdc0a93 ChangeLog
--- a/ChangeLog	Thu Jan 11 08:02:35 2001 +0000
+++ b/ChangeLog	Fri Jan 12 03:02:20 2001 +0000
@@ -6,6 +6,8 @@
 	* Negative times fixed
 	* Cannot create blank away messages/messages with blank titles
 	* Can right-click Edit Buddies list to alias/add pounce/etc.
+	* Ability to independently set accounts as away
+	* Can use all away states for ICQ, Yahoo (N/A, Be Right Back, etc.)
 
 version 0.11.0-pre4:
 	* ICQ upgraded to use icqlib 1.1.0
diff -r 65f4a0325022 -r c0aa7fdc0a93 src/conversation.c
--- 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);