changeset 1659:55bb0e870537

[gaim-migrate @ 1669] patch from phzzzt to not send auto-response. committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Fri, 30 Mar 2001 10:12:36 +0000
parents ea5b31cdd438
children e001fb1b9418
files src/gaim.h src/prefs.c src/server.c
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/gaim.h	Wed Mar 28 03:06:06 2001 +0000
+++ b/src/gaim.h	Fri Mar 30 10:12:36 2001 +0000
@@ -459,6 +459,7 @@
 #define OPT_GEN_ESC_CAN_CLOSE     0x01000000
 #define OPT_GEN_CTL_ENTER         0x02000000
 #define OPT_GEN_F2_TOGGLES        0x04000000
+#define OPT_GEN_NO_AUTO_RESP      0x08000000
 
 extern int display_options;
 #define OPT_DISP_SHOW_TIME        0x00000001
--- a/src/prefs.c	Wed Mar 28 03:06:06 2001 +0000
+++ b/src/prefs.c	Fri Mar 30 10:12:36 2001 +0000
@@ -1502,13 +1502,14 @@
 	gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 0);
 	gtk_widget_show(sep);
 
-	hbox = gtk_hbox_new(FALSE, 0);
+	hbox = gtk_hbox_new(FALSE, 30);
 	gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 0);
 	gtk_widget_show(hbox);
 
-	gaim_button(_("Ignore new conversations when away   "), &general_options,
+	gaim_button(_("Ignore new conversations when away"), &general_options,
 		    OPT_GEN_DISCARD_WHEN_AWAY, hbox);
 	gaim_button(_("Sounds while away"), &sound_options, OPT_SOUND_WHEN_AWAY, hbox);
+	gaim_button(_("Don't send auto-response"), &general_options, OPT_GEN_NO_AUTO_RESP, hbox);
 
 	sep = gtk_hseparator_new();
 	gtk_box_pack_start(GTK_BOX(box), sep, FALSE, FALSE, 0);
--- a/src/server.c	Wed Mar 28 03:06:06 2001 +0000
+++ b/src/server.c	Fri Mar 30 10:12:36 2001 +0000
@@ -387,7 +387,7 @@
 
 
 
-	if (gc->away && strlen(gc->away)) {
+	if (!(general_options & OPT_GEN_NO_AUTO_RESP) && gc->away && strlen(gc->away)) {
 		time_t t;
 		char *tmpmsg;
 		struct buddy *b = find_buddy(gc, name);