summary refs log tree commit diff stats
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/cfgfiles.c8
-rw-r--r--src/common/ctcp.c2
-rw-r--r--src/common/dbus/dbus-client.c2
-rw-r--r--src/common/dbus/dbus-client.h2
-rw-r--r--src/common/dbus/dbus-plugin.c2
-rw-r--r--src/common/dbus/dbus-plugin.h2
-rw-r--r--src/common/dbus/example.c2
-rw-r--r--src/common/dcc.c2
-rw-r--r--src/common/fe.h2
-rw-r--r--src/common/hexchat.c3
-rw-r--r--src/common/hexchat.h2
-rw-r--r--src/common/history.c2
-rw-r--r--src/common/ignore.c2
-rw-r--r--src/common/inbound.c2
-rw-r--r--src/common/modes.c2
-rw-r--r--src/common/msproxy.c2
-rw-r--r--src/common/msproxy.h2
-rw-r--r--src/common/network.c2
-rw-r--r--src/common/notify.c2
-rw-r--r--src/common/outbound.c2
-rw-r--r--src/common/plugin.c2
-rw-r--r--src/common/proto-irc.c2
-rw-r--r--src/common/server.c2
-rw-r--r--src/common/servlist.c11
-rw-r--r--src/common/ssl.c2
-rw-r--r--src/common/text.c4
-rw-r--r--src/common/textevents.in6
-rw-r--r--src/common/url.c2
-rw-r--r--src/common/userlist.c2
-rw-r--r--src/common/util.c2
30 files changed, 47 insertions, 35 deletions
diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c
index b51fb1d2..fd037525 100644
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <fcntl.h>
@@ -330,7 +330,7 @@ get_xdir (void)
 			xdir = g_strdup_printf ("%s\\" "HexChat", out);
 		}
 #else
-		xdir = g_strdup_printf ("%s/.config/" HEXCHAT_DIR, g_get_home_dir ());
+		xdir = g_strdup_printf ("%s/" HEXCHAT_DIR, g_get_user_config_dir ());
 #endif
 	}
 
@@ -460,6 +460,8 @@ const struct prefs vars[] =
 	{"gui_throttlemeter", P_OFFINT (hex_gui_throttlemeter), TYPE_INT},
 	{"gui_topicbar", P_OFFINT (hex_gui_topicbar), TYPE_BOOL},
 	{"gui_tray", P_OFFINT (hex_gui_tray), TYPE_BOOL},
+	{"gui_tray_away", P_OFFINT (hex_gui_tray_away), TYPE_BOOL},
+	{"gui_tray_blink", P_OFFINT (hex_gui_tray_blink), TYPE_BOOL},
 	{"gui_tray_close", P_OFFINT (hex_gui_tray_close), TYPE_BOOL},
 	{"gui_tray_minimize", P_OFFINT (hex_gui_tray_minimize), TYPE_BOOL},
 	{"gui_tray_quiet", P_OFFINT (hex_gui_tray_quiet), TYPE_BOOL},
@@ -668,6 +670,7 @@ load_config (void)
 	prefs.hex_gui_tab_sort = 1;
 	prefs.hex_gui_topicbar = 1;
 	prefs.hex_gui_tray = 1;
+	prefs.hex_gui_tray_blink = 1;
 	prefs.hex_gui_ulist_count = 1;
 	prefs.hex_gui_ulist_icons = 1;
 	prefs.hex_gui_ulist_resizable = 1;
@@ -679,6 +682,7 @@ load_config (void)
 	prefs.hex_input_tray_hilight = 1;
 	prefs.hex_input_tray_priv = 1;
 	/* prefs.hex_irc_who_join = 1; prevent kicks and bans caused by overwhelming who'ing after reconnects */
+	prefs.hex_irc_whois_front = 1;
 	prefs.hex_net_auto_reconnect = 1;
 	prefs.hex_net_throttle = 1;
 	prefs.hex_stamp_log = 1;
diff --git a/src/common/ctcp.c b/src/common/ctcp.c
index bbe4e1e5..d02355cf 100644
--- a/src/common/ctcp.c
+++ b/src/common/ctcp.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <stdio.h>
diff --git a/src/common/dbus/dbus-client.c b/src/common/dbus/dbus-client.c
index 6ea8e45a..cc2fd087 100644
--- a/src/common/dbus/dbus-client.c
+++ b/src/common/dbus/dbus-client.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  * Claessens Xavier
  * xclaesse@gmail.com
diff --git a/src/common/dbus/dbus-client.h b/src/common/dbus/dbus-client.h
index 0cd4336c..1ca5713e 100644
--- a/src/common/dbus/dbus-client.h
+++ b/src/common/dbus/dbus-client.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  * Claessens Xavier
  * xclaesse@gmail.com
diff --git a/src/common/dbus/dbus-plugin.c b/src/common/dbus/dbus-plugin.c
index b62bfda5..2467c845 100644
--- a/src/common/dbus/dbus-plugin.c
+++ b/src/common/dbus/dbus-plugin.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  * Claessens Xavier
  * xclaesse@gmail.com
diff --git a/src/common/dbus/dbus-plugin.h b/src/common/dbus/dbus-plugin.h
index 05619d40..a28d16fb 100644
--- a/src/common/dbus/dbus-plugin.h
+++ b/src/common/dbus/dbus-plugin.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  * Claessens Xavier
  * xclaesse@gmail.com
diff --git a/src/common/dbus/example.c b/src/common/dbus/example.c
index 1eebdfcf..b78bb004 100644
--- a/src/common/dbus/example.c
+++ b/src/common/dbus/example.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  * Claessens Xavier
  * xclaesse@gmail.com
diff --git a/src/common/dcc.c b/src/common/dcc.c
index 58e04749..d404b617 100644
--- a/src/common/dcc.c
+++ b/src/common/dcc.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  * Wayne Conrad, 3 Apr 1999: Color-coded DCC file transfer status windows
  * Bernhard Valenti <bernhard.valenti@gmx.net> 2000-11-21: Fixed DCC send behind nat
diff --git a/src/common/fe.h b/src/common/fe.h
index f1f3b484..4903ef0e 100644
--- a/src/common/fe.h
+++ b/src/common/fe.h
@@ -97,7 +97,7 @@ void fe_set_title (struct session *sess);
 void fe_set_nonchannel (struct session *sess, int state);
 void fe_set_nick (struct server *serv, char *newnick);
 void fe_ignore_update (int level);
-void fe_beep (void);
+void fe_beep (session *sess);
 void fe_lastlog (session *sess, session *lastlog_sess, char *sstr, gtk_xtext_search_flags flags);
 void fe_set_lag (server *serv, int lag);
 void fe_set_throttle (server *serv);
diff --git a/src/common/hexchat.c b/src/common/hexchat.c
index 4a3e7a47..57e3fc86 100644
--- a/src/common/hexchat.c
+++ b/src/common/hexchat.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <stdio.h>
@@ -713,6 +713,7 @@ static char defaultconf_commands[] =
 	"NAME VER\n"			"CMD ctcp %2 VERSION\n\n"\
 	"NAME VERSION\n"		"CMD ctcp %2 VERSION\n\n"\
 	"NAME WALLOPS\n"		"CMD quote WALLOPS :&2\n\n"\
+        "NAME WI\n"                     "CMD quote WHOIS %2\n\n"\
 	"NAME WII\n"			"CMD quote WHOIS %2 %2\n\n";
 
 static char defaultconf_urlhandlers[] =
diff --git a/src/common/hexchat.h b/src/common/hexchat.h
index b242ae87..dfd2fd5a 100644
--- a/src/common/hexchat.h
+++ b/src/common/hexchat.h
@@ -152,6 +152,8 @@ struct hexchatprefs
 	unsigned int hex_gui_tab_utils;
 	unsigned int hex_gui_topicbar;
 	unsigned int hex_gui_tray;
+	unsigned int hex_gui_tray_away;
+	unsigned int hex_gui_tray_blink;
 	unsigned int hex_gui_tray_close;
 	unsigned int hex_gui_tray_minimize;
 	unsigned int hex_gui_tray_quiet;
diff --git a/src/common/history.c b/src/common/history.c
index 1cd6b508..1acd3327 100644
--- a/src/common/history.c
+++ b/src/common/history.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <string.h>
diff --git a/src/common/ignore.c b/src/common/ignore.c
index 49b95c3b..cc357828 100644
--- a/src/common/ignore.c
+++ b/src/common/ignore.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <stdlib.h>
diff --git a/src/common/inbound.c b/src/common/inbound.c
index 9d21e25a..54e5bff0 100644
--- a/src/common/inbound.c
+++ b/src/common/inbound.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <string.h>
diff --git a/src/common/modes.c b/src/common/modes.c
index b84b2b84..6caa46b9 100644
--- a/src/common/modes.c
+++ b/src/common/modes.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <string.h>
diff --git a/src/common/msproxy.c b/src/common/msproxy.c
index 9febe8d0..294c208d 100644
--- a/src/common/msproxy.c
+++ b/src/common/msproxy.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  * MS Proxy (ISA server) support is (c) 2006 Pavel Fedin <sonic_amiga@rambler.ru>
  * based on Dante source code
diff --git a/src/common/msproxy.h b/src/common/msproxy.h
index 9dce4e2e..9fb312ad 100644
--- a/src/common/msproxy.h
+++ b/src/common/msproxy.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  * MS Proxy (ISA server) support is (c) 2006 Pavel Fedin <sonic_amiga@rambler.ru>
  * based on Dante source code
diff --git a/src/common/network.c b/src/common/network.c
index f8722433..c3390b31 100644
--- a/src/common/network.c
+++ b/src/common/network.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 /* ipv4 and ipv6 networking functions with a common interface */
diff --git a/src/common/notify.c b/src/common/notify.c
index 5646fda7..849220ca 100644
--- a/src/common/notify.c
+++ b/src/common/notify.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <stdio.h>
diff --git a/src/common/outbound.c b/src/common/outbound.c
index 05910df9..a8a65d6a 100644
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #define _GNU_SOURCE	/* for memrchr */
diff --git a/src/common/plugin.c b/src/common/plugin.c
index ade7fce4..d38085c5 100644
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <stdlib.h>
diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c
index 2e12d0e5..18015607 100644
--- a/src/common/proto-irc.c
+++ b/src/common/proto-irc.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 /* IRC RFC1459(+commonly used extensions) protocol implementation */
diff --git a/src/common/server.c b/src/common/server.c
index 3e694c43..1fd04422 100644
--- a/src/common/server.c
+++ b/src/common/server.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  *
  * MS Proxy (ISA server) support is (c) 2006 Pavel Fedin <sonic_amiga@rambler.ru>
  * based on Dante source code
diff --git a/src/common/servlist.c b/src/common/servlist.c
index c42c371d..e77c0409 100644
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <stdlib.h>
@@ -246,7 +246,7 @@ static const struct defaultserver def[] =
 	{0,			"irc.ggn.net"},
 	{0,			"irc.vendetta.com"},
 
-	{"freenode",	0,	"#hexchat"},
+	{"freenode",	0},
 #ifdef USE_OPENSSL
 	{0,				"irc.freenode.net/+6697"},
 #endif
@@ -264,6 +264,9 @@ static const struct defaultserver def[] =
 /*	{0,			"sprynet.us.galaxynet.org"},
 	{0,			"atlanta.ga.us.galaxynet.org"},*/
 
+	{"GameSurge",	0},
+	{0,			"irc.gamesurge.net"},
+	
 /*	{"GamesNET",	0},
 	{0,				"irc.gamesnet.net"},
 	{0,				"irc.us.gamesnet.net"},
@@ -321,7 +324,6 @@ static const struct defaultserver def[] =
 	{0,			"tonsberg.no.eu.irclink.net"},
 
 	{"IRCNet",		0},
-	{0,				"irc.ircnet.com"},
 	{0,				"irc.stealth.net/6668"},
 	{0,				"ircnet.demon.co.uk"},
 /*	{0,				"ircnet.hinet.hr"},*/
@@ -382,6 +384,9 @@ static const struct defaultserver def[] =
 	{"MIXXnet",		0},
 	{0,			"irc.mixxnet.net"},
 
+	{"Moznet",		0},
+	{0,			"irc.mozilla.org"},
+
 	{"NeverNET",	0},
 	{0,			"irc.nevernet.net"},
 	{0,			"imagine.nevernet.net"},
diff --git a/src/common/ssl.c b/src/common/ssl.c
index 830b3d83..75a81250 100644
--- a/src/common/ssl.c
+++ b/src/common/ssl.c
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include "inet.h"				  /* make it first to avoid macro redefinitions */
diff --git a/src/common/text.c b/src/common/text.c
index 0b8f9d0b..a89fd511 100644
--- a/src/common/text.c
+++ b/src/common/text.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <stdlib.h>
@@ -2253,7 +2253,7 @@ sound_beep (session *sess)
 		sound_play_event (XP_TE_BEEP);
 	else
 		/* system beep */
-		fe_beep ();
+		fe_beep (sess);
 }
 
 static char *
diff --git a/src/common/textevents.in b/src/common/textevents.in
index 827900ff..69d42526 100644
--- a/src/common/textevents.in
+++ b/src/common/textevents.in
@@ -67,7 +67,7 @@ pevt_chanban_help
 Channel Creation
 XP_TE_CHANDATE
 pevt_chandate_help
-%C22*%O$tChannel %C22$1%O created
+%C22*%O$tChannel %C22$1%O created on %C24$2%O
 2
 
 Channel DeHalfOp
@@ -589,13 +589,13 @@ n0
 Part
 XP_TE_PART
 pevt_part_help
-%C24*$t$1 has left
+%C24*$t$1 ($2) has left
 3
 
 Part with Reason
 XP_TE_PARTREASON
 pevt_partreason_help
-%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)
+%C24*$t$1 ($2) has left ($4)
 4
 
 Ping Reply
diff --git a/src/common/url.c b/src/common/url.c
index 52e37daa..c5335859 100644
--- a/src/common/url.c
+++ b/src/common/url.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <stdio.h>
diff --git a/src/common/userlist.c b/src/common/userlist.c
index 061e8d95..f6a091a4 100644
--- a/src/common/userlist.c
+++ b/src/common/userlist.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #include <stdio.h>
diff --git a/src/common/util.c b/src/common/util.c
index e1ef3e62..55cb530a 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
 #define WANTSOCKET
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-10 08:50:48 +0000