# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 966904621 0
# Node ID d05d746384a7a6aea3afbb921269fb1f9bcd1cfe
# Parent  51f1b6f7794bd9b147d4a4eba9cb5260f6c25d2e
[gaim-migrate @ 746]
Eric the Lumberjack continues to hack away at the tree. When people ask
what kinds of trees Eric hacks, he simply replied "CVS trees. They're
mostly used for computer stuff". Then the ignorants go away, thinking
they have been enlightened into the world of computers, which unknowingly
they have been.

committer: Tailor Script <tailor@pidgin.im>

diff -r 51f1b6f7794b -r d05d746384a7 ChangeLog
--- a/ChangeLog	Mon Aug 21 21:41:44 2000 +0000
+++ b/ChangeLog	Tue Aug 22 00:37:01 2000 +0000
@@ -21,6 +21,7 @@
 	  alias him as 'Loser'.
 	* Added GNOME Url Handler as an available web-browser 
 	* Added the S html tag. 		
+	* Optionally Ignore TiK's Automated Messages
 
 version 0.9.20 (07/14/2000):
 	* More plugin events, more plugin features
diff -r 51f1b6f7794b -r d05d746384a7 TODO
--- a/TODO	Mon Aug 21 21:41:44 2000 +0000
+++ b/TODO	Tue Aug 22 00:37:01 2000 +0000
@@ -13,32 +13,6 @@
 		You know, I really like the gnome look to some apps
 		but I dont want to tie gnome into gaim.  oh life sucks
 		sometimes hehe.
-	A TiK Compatiblity Fix:  Make GAIM (optional) Ignore anything that
-		begins with: >>> Automated Message:
-	---------
-		Rob says:
-		Also, we can make a TiK Compatiblity option (when using TOC)
-		to send: >>>Automated Message: Getting Away Message<<
-		This will take the away message thats sent back from the
-		responding client and display it.
-
-			Eric replies:
-			I think the above is a bad idea and should not be
-			implemented. If people want to get away messages,
-			they should send their own message rather than
-			an automated message. Ignoring TiK's automated
-			message is a good idea though.
-			
-			Gaim and TiK are the most popular (are they?) Unix
-			clients, but the number of winaim users still greatly
-			outnumbers us. winaim won't be ignoring the automated
-			message. IMHO, sending an automated message makes the
-			client look weak and incapable.
-	---------
-		Not sure how we want
-		to implement this but since TiK and GAIM are two of the
-		most popular, I figured we might as well make them compatible.
-	
 		
 	Oscar can send messages longer than TOC, and DirectIM has no limit.
 
diff -r 51f1b6f7794b -r d05d746384a7 src/gaim.h
--- a/src/gaim.h	Mon Aug 21 21:41:44 2000 +0000
+++ b/src/gaim.h	Tue Aug 22 00:37:01 2000 +0000
@@ -401,7 +401,7 @@
 #define TYPE_SIGNOFF   4
 #define TYPE_KEEPALIVE 5
 
-#define REVISION "gaim:$Revision: 743 $"
+#define REVISION "gaim:$Revision: 746 $"
 #define FLAPON "FLAPON\r\n\r\n"
 
 #define ROAST "Tic/Toc"
@@ -483,6 +483,7 @@
 #define OPT_GEN_BACK_ON_IM	0x00020000
 #define OPT_GEN_USE_OSCAR	0x00040000
 #define OPT_GEN_CTL_CHARS	0x00080000
+#define OPT_GEN_TIK_HACK        0x00100000
 extern int USE_OSCAR;
 
 extern int display_options;
diff -r 51f1b6f7794b -r d05d746384a7 src/oscar.c
--- a/src/oscar.c	Mon Aug 21 21:41:44 2000 +0000
+++ b/src/oscar.c	Tue Aug 22 00:37:01 2000 +0000
@@ -232,6 +232,7 @@
 		gdk_input_remove(inpa);
 	inpa = -1;
 	aim_logoff(gaim_sess);
+	g_free(gaim_sess);
 	debug_print(_("Signed off.\n"));
 }
 
diff -r 51f1b6f7794b -r d05d746384a7 src/prefs.c
--- a/src/prefs.c	Mon Aug 21 21:41:44 2000 +0000
+++ b/src/prefs.c	Tue Aug 22 00:37:01 2000 +0000
@@ -670,6 +670,7 @@
 	gaim_button(_("Show logins in window"), &display_options, OPT_DISP_SHOW_LOGON, box);
 	gaim_button(_("Raise windows on events"), &general_options, OPT_GEN_POPUP_WINDOWS, box);
 	gaim_button(_("Ignore new conversations when away"), &general_options, OPT_GEN_DISCARD_WHEN_AWAY, box);
+	gaim_button(_("Ignore TiK Automated Messages"), &general_options, OPT_GEN_TIK_HACK, box);
 
 	gtk_widget_show(prefdialog);
 }
diff -r 51f1b6f7794b -r d05d746384a7 src/server.c
--- a/src/server.c	Mon Aug 21 21:41:44 2000 +0000
+++ b/src/server.c	Tue Aug 22 00:37:01 2000 +0000
@@ -672,6 +672,12 @@
 	g_free(angel);
 #endif
 	
+	if ((general_options & OPT_GEN_TIK_HACK) && awaymessage &&
+	    !strcmp(message, ">>>Automated Message: Getting Away Message<<<")) {
+	    	serv_send_im(name, awaymessage->message, 1);
+	    	return;
+	}
+	
         cnv = find_conversation(name);
 
 	if (general_options & OPT_GEN_SEND_LINKS) {