summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common/cfgfiles.c1
-rw-r--r--src/common/dbus/example.c2
-rw-r--r--src/common/hexchat.h1
-rw-r--r--src/common/outbound.c38
-rw-r--r--src/common/server.c6
-rw-r--r--src/common/textevents.in4
-rw-r--r--src/fe-gtk/chanlist.c4
-rw-r--r--src/fe-gtk/search.c5
-rw-r--r--src/fe-gtk/servlistgui.c1
-rw-r--r--src/fe-gtk/setup.c2
10 files changed, 20 insertions, 44 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/dbus/example.c b/src/common/dbus/example.c
index b78bb004..ee1833d3 100644
--- a/src/common/dbus/example.c
+++ b/src/common/dbus/example.c
@@ -102,7 +102,9 @@ main (int argc, char **argv)
 	gchar *path;
 	GError *error = NULL;
 
+#if ! GLIB_CHECK_VERSION (2, 36, 0)
 	g_type_init ();
+#endif
 
 	connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
 	if (connection == NULL) {
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..c8e0ff64 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
 	{
@@ -3834,7 +3798,7 @@ const struct commands xc_cmds[] = {
 	{"NICK", cmd_nick, 0, 0, 1, N_("NICK <nickname>, sets your nick")},
 
 	{"NOTICE", cmd_notice, 1, 0, 1,
-	 N_("NOTICE <nick/channel> <message>, sends a notice. Notices are a type of message that should be auto reacted to")},
+	 N_("NOTICE <nick/channel> <message>, sends a notice")},
 	{"NOTIFY", cmd_notify, 0, 0, 1,
 	 N_("NOTIFY [-n network1[,network2,...]] [<nick>], displays your notify list or adds someone to it")},
 	{"OP", cmd_op, 1, 1, 1,
diff --git a/src/common/server.c b/src/common/server.c
index 6bcba087..1f4f626e 100644
--- a/src/common/server.c
+++ b/src/common/server.c
@@ -1762,7 +1762,11 @@ server_connect (server *serv, char *hostname, int port, int no_login)
 										serv, 0, (DWORD *)&pid));
 #else
 #ifdef LOOKUPD
-	rand();	/* CL: net_resolve calls rand() when LOOKUPD is set, so prepare a different seed for each child. This method giver a bigger variation in seed values than calling srand(time(0)) in the child itself. */
+	/* CL: net_resolve calls rand() when LOOKUPD is set, so prepare a different
+	 * seed for each child. This method gives a bigger variation in seed values
+	 * than calling srand(time(0)) in the child itself.
+	 */
+	rand();
 #endif
 	switch (pid = fork ())
 	{
diff --git a/src/common/textevents.in b/src/common/textevents.in
index 2c12cf01..3b0b676a 100644
--- a/src/common/textevents.in
+++ b/src/common/textevents.in
@@ -103,7 +103,7 @@ pevt_chanhop_help
 Channel INVITE
 XP_TE_CHANINVITE
 pevt_chaninvite_help
-%C22*%O$t%C26$1%C sets invite on %C18$2%O
+%C22*%O$t%C26$1%C sets invite exempt on %C18$2%O
 2
 
 Channel List
@@ -163,7 +163,7 @@ pevt_chanrmexempt_help
 Channel Remove Invite
 XP_TE_CHANRMINVITE
 pevt_chanrminvite_help
-%C22*%O$t%C26$1%O removes invite on %C18$2%O
+%C22*%O$t%C26$1%O removes invite exempt on %C18$2%O
 2
 
 Channel Remove Keyword
diff --git a/src/fe-gtk/chanlist.c b/src/fe-gtk/chanlist.c
index 47b9f1db..00c55b5f 100644
--- a/src/fe-gtk/chanlist.c
+++ b/src/fe-gtk/chanlist.c
@@ -532,6 +532,7 @@ chanlist_minusers (GtkSpinButton *wid, server *serv)
 {
 	serv->gui->chanlist_minusers = gtk_spin_button_get_value_as_int (wid);
 	prefs.hex_gui_chanlist_minusers = serv->gui->chanlist_minusers;
+	save_config();
 
 	if (serv->gui->chanlist_minusers < serv->gui->chanlist_minusers_downloaded)
 	{
@@ -553,6 +554,7 @@ chanlist_maxusers (GtkSpinButton *wid, server *serv)
 {
 	serv->gui->chanlist_maxusers = gtk_spin_button_get_value_as_int (wid);
 	prefs.hex_gui_chanlist_maxusers = serv->gui->chanlist_maxusers;
+	save_config();
 }
 
 static void
@@ -725,6 +727,7 @@ chanlist_opengui (server *serv, int do_refresh)
 		if (prefs.hex_gui_chanlist_minusers < 1 || prefs.hex_gui_chanlist_minusers > 999999)
 		{
 			prefs.hex_gui_chanlist_minusers = 5;
+			save_config();
 		}
 
 		serv->gui->chanlist_minusers = prefs.hex_gui_chanlist_minusers;
@@ -735,6 +738,7 @@ chanlist_opengui (server *serv, int do_refresh)
 		if (prefs.hex_gui_chanlist_maxusers < 1 || prefs.hex_gui_chanlist_maxusers > 999999)
 		{
 			prefs.hex_gui_chanlist_maxusers = 9999;
+			save_config();
 		}
 
 		serv->gui->chanlist_maxusers = prefs.hex_gui_chanlist_maxusers;
diff --git a/src/fe-gtk/search.c b/src/fe-gtk/search.c
index 49c30a14..44cbf3a0 100644
--- a/src/fe-gtk/search.c
+++ b/src/fe-gtk/search.c
@@ -26,6 +26,7 @@
 #include "../common/fe.h"
 #include "../common/util.h"
 #include "../common/hexchatc.h"
+#include "../common/cfgfiles.h"
 #include "gtkutil.h"
 #include "xtext.h"
 #include "maingui.h"
@@ -111,24 +112,28 @@ static void
 search_caseign_cb (GtkToggleButton * but, session * sess)
 {
 	prefs.hex_text_search_case_match = (but->active)? 1: 0;
+	save_config();
 }
 
 static void
 search_dirbwd_cb (GtkToggleButton * but, session * sess)
 {
 	prefs.hex_text_search_backward = (but->active)? 1: 0;
+	save_config();
 }
 
 static void
 search_regexp_cb (GtkToggleButton * but, session * sess)
 {
 	prefs.hex_text_search_regexp = (but->active)? 1: 0;
+	save_config();
 }
 
 static void
 search_highlight_cb (GtkToggleButton * but, session * sess)
 {
 	prefs.hex_text_search_highlight_all = (but->active)? 1: 0;
+	save_config();
 	search_search (sess, NULL);
 }
 
diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c
index 22fe68e4..8d480dc4 100644
--- a/src/fe-gtk/servlistgui.c
+++ b/src/fe-gtk/servlistgui.c
@@ -674,6 +674,7 @@ servlist_savegui (void)
 		sp[0] = 0;	/* spaces will break the login */
 	/* strcpy (prefs.hex_irc_real_name, GTK_ENTRY (entry_greal)->text); */
 	servlist_save ();
+	save_config (); /* For nicks stored in hexchat.conf */
 
 	return 0;
 }
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},
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-10 12:36:26 +0000