# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 960606714 0
# Node ID 1eae69f076d2b4515cd4bbff79605da8f3804cb2
# Parent  7493af3a4ce2c779b584ff5fb274432a1f05380b
[gaim-migrate @ 385]
option to have you come back when you send an IM or not

committer: Tailor Script <tailor@pidgin.im>

diff -r 7493af3a4ce2 -r 1eae69f076d2 src/buddy_chat.c
--- a/src/buddy_chat.c	Sat Jun 10 02:19:05 2000 +0000
+++ b/src/buddy_chat.c	Sat Jun 10 03:11:54 2000 +0000
@@ -405,6 +405,10 @@
 	gtk_widget_grab_focus(GTK_WIDGET(b->entry));
 
 	serv_set_idle(0);
+
+	if ((general_options & OPT_GEN_BACK_ON_IM) && awaymessage != NULL) {
+		do_im_back();
+	}
 }
 
 
diff -r 7493af3a4ce2 -r 1eae69f076d2 src/conversation.c
--- a/src/conversation.c	Sat Jun 10 02:19:05 2000 +0000
+++ b/src/conversation.c	Sat Jun 10 03:11:54 2000 +0000
@@ -510,7 +510,7 @@
 	if (c->makesound && (sound_options & OPT_SOUND_SEND))
 		play_sound(SEND);
 
-	if (awaymessage != NULL) {
+	if ((general_options & OPT_GEN_BACK_ON_IM) && awaymessage != NULL) {
 		do_im_back();
 	}
 
diff -r 7493af3a4ce2 -r 1eae69f076d2 src/gaim.h
--- a/src/gaim.h	Sat Jun 10 02:19:05 2000 +0000
+++ b/src/gaim.h	Sat Jun 10 03:11:54 2000 +0000
@@ -376,7 +376,7 @@
 #define TYPE_SIGNOFF   4
 #define TYPE_KEEPALIVE 5
 
-#define REVISION "gaim:$Revision: 383 $"
+#define REVISION "gaim:$Revision: 385 $"
 #define FLAPON "FLAPON\r\n\r\n"
 
 #define ROAST "Tic/Toc"
@@ -455,6 +455,7 @@
 #define OPT_GEN_NEAR_APPLET	0x00004000
 #define OPT_GEN_CHECK_SPELLING	0x00008000
 #define OPT_GEN_POPUP_CHAT	0x00010000
+#define OPT_GEN_BACK_ON_IM	0x00020000
 
 extern int display_options;
 #define OPT_DISP_SHOW_TIME       0x00000001
diff -r 7493af3a4ce2 -r 1eae69f076d2 src/prefs.c
--- a/src/prefs.c	Sat Jun 10 02:19:05 2000 +0000
+++ b/src/prefs.c	Sat Jun 10 03:11:54 2000 +0000
@@ -393,6 +393,7 @@
         gaim_button(_("Save some window size/positions"), &general_options, OPT_GEN_SAVED_WINDOWS, genbox);
         gaim_button(_("Ignore new conversations when away"), &general_options, OPT_GEN_DISCARD_WHEN_AWAY, genbox);
 	gaim_button(_("Automagically highlight misspelled words"), &general_options, OPT_GEN_CHECK_SPELLING, genbox);
+	gaim_button(_("Sending messages removes away status"), &general_options, OPT_GEN_BACK_ON_IM, genbox);
 	if (!dw && (general_options & OPT_GEN_DEBUG))
 		general_options = general_options ^ OPT_GEN_DEBUG;
         debugbutton = gaim_button(_("Enable debug mode"), &general_options, OPT_GEN_DEBUG, genbox);