Remove away announce

4 files changed, 0 insertions, 40 deletions

diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c
index 4e7dad5f..9e0146c4 100644
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -373,7 +373,6 @@ const struct prefs vars[] =
 	{"away_auto_unmark", P_OFFINT (hex_away_auto_unmark), TYPE_BOOL},
 	{"away_omit_alerts", P_OFFINT (hex_away_omit_alerts), TYPE_BOOL},
 	{"away_reason", P_OFFSET (hex_away_reason), TYPE_STR},
-	{"away_show_message", P_OFFINT (hex_away_show_message), TYPE_BOOL},
 	{"away_show_once", P_OFFINT (hex_away_show_once), TYPE_BOOL},
 	{"away_size_max", P_OFFINT (hex_away_size_max), TYPE_INT},
 	{"away_timeout", P_OFFINT (hex_away_timeout), TYPE_INT},
diff --git a/src/common/hexchat.h b/src/common/hexchat.h
index 327894df..dd30dce6 100644
--- a/src/common/hexchat.h
+++ b/src/common/hexchat.h
@@ -134,7 +134,6 @@ struct hexchatprefs
 	/* BOOLEANS */
 	unsigned int hex_away_auto_unmark;
 	unsigned int hex_away_omit_alerts;
-	unsigned int hex_away_show_message;
 	unsigned int hex_away_show_once;
 	unsigned int hex_away_track;
 	unsigned int hex_completion_auto;
diff --git a/src/common/outbound.c b/src/common/outbound.c
index c8d0397d..9e8ea6e3 100644
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -362,7 +362,6 @@ cmd_allservers (struct session *sess, char *tbuf, char *word[],
 static int
 cmd_away (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 {
-	GSList *list;
 	char *reason = word_eol[2];
 
 	if (!(*reason))
@@ -382,21 +381,6 @@ cmd_away (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 	}
 	sess->server->p_set_away (sess->server, reason);
 
-	if (prefs.hex_away_show_message)
-	{
-		snprintf (tbuf, TBUFSIZE, "me is away: %s", reason);
-		for (list = sess_list; list; list = list->next)
-		{
-			/* am I the right server and not a dialog box */
-			if (((struct session *) list->data)->server == sess->server
-				 && ((struct session *) list->data)->type == SESS_CHANNEL
-				 && ((struct session *) list->data)->channel[0])
-			{
-				handle_command ((session *) list->data, tbuf, TRUE);
-			}
-		}
-	}
-
 	if (sess->server->last_away_reason != reason)
 	{
 		if (sess->server->last_away_reason)
@@ -417,29 +401,9 @@ cmd_away (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 static int
 cmd_back (struct session *sess, char *tbuf, char *word[], char *word_eol[])
 {
-	GSList *list;
-	unsigned int gone;
-
 	if (sess->server->is_away)
 	{
 		sess->server->p_set_back (sess->server);
-
-		if (prefs.hex_away_show_message)
-		{
-			gone = time (NULL) - sess->server->away_time;
-			sprintf (tbuf, "me is back (gone %.2d:%.2d:%.2d)", gone / 3600,
-						(gone / 60) % 60, gone % 60);
-			for (list = sess_list; list; list = list->next)
-			{
-				/* am I the right server and not a dialog box */
-				if (((struct session *) list->data)->server == sess->server
-					 && ((struct session *) list->data)->type == SESS_CHANNEL
-					 && ((struct session *) list->data)->channel[0])
-				{
-					handle_command ((session *) list->data, tbuf, TRUE);
-				}
-			}
-		}
 	}
 	else
 	{
diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index 0f59e278..333069cb 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -492,8 +492,6 @@ static const setting general_settings[] =
 	{ST_ENTRY,	N_("Away:"), P_OFFSETNL(hex_away_reason), 0, 0, sizeof prefs.hex_away_reason},
 
 	{ST_HEADER,	N_("Away"),0,0,0},
-	{ST_TOGGLE,	N_("Announce away messages"), P_OFFINTNL(hex_away_show_message),
-					N_("Announce your away messages to all channels."), 0, 0},
 	{ST_TOGGLE,	N_("Show away once"), P_OFFINTNL(hex_away_show_once), N_("Show identical away messages only once."), 0, 0},
 	{ST_TOGGLE,	N_("Automatically unmark away"), P_OFFINTNL(hex_away_auto_unmark), N_("Unmark yourself as away before sending messages."), 0, 0},