Mercurial > pidgin3 / changeset

--- a/src/gaim.h	Wed Oct 23 00:15:13 2002 +0000
+++ b/src/gaim.h	Wed Oct 23 02:49:26 2002 +0000
@@ -334,7 +334,7 @@
 extern guint away_options;
 #define OPT_AWAY_DISCARD		0x00000001
 #define OPT_AWAY_BACK_ON_IM		0x00000002
-#define OPT_AWAY_TIK_HACK		0x00000004
+/* #define OPT_AWAY_TIK_HACK		0x00000004 */
 #define OPT_AWAY_AUTO			0x00000008
 #define OPT_AWAY_NO_AUTO_RESP		0x00000010
 #define OPT_AWAY_QUEUE			0x00000020

--- a/src/gaimrc.c	Wed Oct 23 00:15:13 2002 +0000
+++ b/src/gaimrc.c	Wed Oct 23 02:49:26 2002 +0000
@@ -674,7 +674,9 @@
 { /* OPT_GEN_POPUP_CHAT */		0x00010000,  &chat_options, OPT_CHAT_POPUP },
 { /* OPT_GEN_BACK_ON_IM */		0x00020000,  &away_options, OPT_AWAY_BACK_ON_IM },
 { /* OPT_GEN_CTL_CHARS */		0x00080000, &convo_options, OPT_CONVO_CTL_CHARS },
+#if 0
 { /* OPT_GEN_TIK_HACK */		0x00100000,  &away_options, OPT_AWAY_TIK_HACK },
+#endif
 { /* OPT_GEN_CTL_SMILEYS */		0x00200000, &convo_options, OPT_CONVO_CTL_SMILEYS },
 { /* OPT_GEN_AUTO_AWAY */		0x00800000,  &away_options, OPT_AWAY_AUTO },
 { /* OPT_GEN_ESC_CAN_CLOSE */		0x01000000, &convo_options, OPT_CONVO_ESC_CAN_CLOSE },

--- a/src/prefs.c	Wed Oct 23 00:15:13 2002 +0000
+++ b/src/prefs.c	Wed Oct 23 02:49:26 2002 +0000
@@ -369,7 +369,7 @@
 	gaim_button(_("Ignore c_olors"), &convo_options_new, OPT_CONVO_IGNORE_COLOUR, vbox);
 	gaim_button(_("Ignore font _faces"), &convo_options_new, OPT_CONVO_IGNORE_FONTS, vbox);
 	gaim_button(_("Ignore font si_zes"), &convo_options_new, OPT_CONVO_IGNORE_SIZES, vbox);
-	gaim_button(_("Ignore Ti_K Automated Messages"), &away_options_new, OPT_AWAY_TIK_HACK, vbox);
+/*	gaim_button(_("Ignore Ti_K Automated Messages"), &away_options_new, OPT_AWAY_TIK_HACK, vbox); */
 
 	gtk_widget_show_all(ret);
 	return ret;

--- a/src/server.c	Wed Oct 23 00:15:13 2002 +0000
+++ b/src/server.c	Wed Oct 23 02:49:26 2002 +0000
@@ -577,6 +577,7 @@
 		message = g_memdup(message, len);
 	}
 
+#if 0
 	/* TiK, using TOC, sends an automated message in order to get your away message. Now,
 	 * this is one of the biggest hacks I think I've seen. But, in order to be nice to
 	 * TiK, we're going to give users the option to ignore it. */
@@ -589,6 +590,7 @@
 		g_free(message);
 		return;
 	}
+#endif
 
 	/* if you can't figure this out, stop reading right now.
 	 * "we're not worthy! we're not worthy!" */