Merge pull request #41 from ZoiteChat/master

HEXCHAT -> ZOITECHAT

src/common/cfgfiles.c

@@ -35,7 +35,7 @@
 #include <io.h>
 #else
 #include <unistd.h>
-#define HEXCHAT_DIR "zoitechat"
+#define ZOITECHAT_DIR "zoitechat"
 #endif
 
 #define DEF_FONT "Monospace 9"
@@ -305,7 +305,7 @@ get_xdir (void)
 	if (!xdir)
 	{
 #ifndef WIN32
-		xdir = g_build_filename (g_get_user_config_dir (), HEXCHAT_DIR, NULL);
+		xdir = g_build_filename (g_get_user_config_dir (), ZOITECHAT_DIR, NULL);
 #else
 		wchar_t* roaming_path_wide;
 		gchar* roaming_path;
@@ -936,7 +936,7 @@ make_config_dirs (void)
 	}
 	g_free (buf);
 
-	buf = g_build_filename (get_xdir (), HEXCHAT_SOUND_DIR, NULL);
+	buf = g_build_filename (get_xdir (), ZOITECHAT_SOUND_DIR, NULL);
 	if (g_mkdir (buf, 0700) != 0)
 	{
 		g_free (buf);

src/common/cfgfiles.h

@@ -19,8 +19,8 @@
 
 /* cfgfiles.h */
 
-#ifndef HEXCHAT_CFGFILES_H
-#define HEXCHAT_CFGFILES_H
+#ifndef ZOITECHAT_CFGFILES_H
+#define ZOITECHAT_CFGFILES_H
 
 #include "zoitechat.h"
 
@@ -82,6 +82,6 @@ struct prefs
 #define TYPE_INT 1
 #define TYPE_BOOL 2
 
-#define HEXCHAT_SOUND_DIR "sounds"
+#define ZOITECHAT_SOUND_DIR "sounds"
 
 #endif

src/common/chanopt.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_CHANOPT_H
-#define HEXCHAT_CHANOPT_H
+#ifndef ZOITECHAT_CHANOPT_H
+#define ZOITECHAT_CHANOPT_H
 
 int chanopt_command (session *sess, char *tbuf, char *word[], char *word_eol[]);
 gboolean chanopt_is_set (unsigned int global, guint8 per_chan_setting);

src/common/ctcp.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_CTCP_H
-#define HEXCHAT_CTCP_H
+#ifndef ZOITECHAT_CTCP_H
+#define ZOITECHAT_CTCP_H
 
 void ctcp_handle (session *sess, char *to, char *nick, char *ip, char *msg,
 						char *word[], char *word_eol[], int id,

src/common/dbus/dbus-plugin.c

@@ -1002,7 +1002,7 @@ open_context_cb (char *word[],
 	info->context = zoitechat_get_context (ph);
 	contexts = g_list_prepend (contexts, info);
 
-	return HEXCHAT_EAT_NONE;
+	return ZOITECHAT_EAT_NONE;
 }
 
 static int
@@ -1020,7 +1020,7 @@ close_context_cb (char *word[],
 		}
 	}
 
-	return HEXCHAT_EAT_NONE;
+	return ZOITECHAT_EAT_NONE;
 }
 
 static gboolean
@@ -1044,10 +1044,10 @@ unload_plugin_cb (char *word[], char *word_eol[], void *userdata)
 		g_signal_emit (obj, 
 			       signals[UNLOAD_SIGNAL],
 			       0);
-		return HEXCHAT_EAT_ALL;
+		return ZOITECHAT_EAT_ALL;
 	}
 	
-	return HEXCHAT_EAT_NONE;
+	return ZOITECHAT_EAT_NONE;
 }
 
 int
@@ -1071,17 +1071,17 @@ dbus_plugin_init (zoitechat_plugin *plugin_handle,
 						 g_object_unref);
 
 		zoitechat_hook_print (ph, "Open Context",
-				  HEXCHAT_PRI_NORM,
+				  ZOITECHAT_PRI_NORM,
 				  open_context_cb,
 				  NULL);
 
 		zoitechat_hook_print (ph, "Close Context",
-				  HEXCHAT_PRI_NORM,
+				  ZOITECHAT_PRI_NORM,
 				  close_context_cb,
 				  NULL);
 
 		zoitechat_hook_command (ph, "unload",
-				    HEXCHAT_PRI_HIGHEST,
+				    ZOITECHAT_PRI_HIGHEST,
 				    unload_plugin_cb, NULL, NULL);
 	}
 

src/common/dbus/dbus-plugin.h

@@ -19,8 +19,8 @@
  * xclaesse@gmail.com
  */
 
-#ifndef HEXCHAT_DBUS_PLUGIN_H
-#define HEXCHAT_DBUS_PLUGIN_H
+#ifndef ZOITECHAT_DBUS_PLUGIN_H
+#define ZOITECHAT_DBUS_PLUGIN_H
 
 int	dbus_plugin_init	(zoitechat_plugin *plugin_handle,
 				 char **plugin_name,

src/common/dcc.h

@@ -22,8 +22,8 @@
 #include <time.h>						/* for time_t */
 #include "proto-irc.h"
 
-#ifndef HEXCHAT_DCC_H
-#define HEXCHAT_DCC_H
+#ifndef ZOITECHAT_DCC_H
+#define ZOITECHAT_DCC_H
 
 enum dcc_state {
 	STAT_QUEUED = 0,

src/common/fe.h

@@ -20,8 +20,8 @@
 #include "userlist.h"
 #include "dcc.h"
 
-#ifndef HEXCHAT_FE_H
-#define HEXCHAT_FE_H
+#ifndef ZOITECHAT_FE_H
+#define ZOITECHAT_FE_H
 
 /* for storage of /menu entries */
 typedef struct

src/common/history.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_HISTORY_H
-#define HEXCHAT_HISTORY_H
+#ifndef ZOITECHAT_HISTORY_H
+#define ZOITECHAT_HISTORY_H
 
 #define HISTORY_SIZE 100
 

src/common/ignore.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_IGNORE_H
-#define HEXCHAT_IGNORE_H
+#ifndef ZOITECHAT_IGNORE_H
+#define ZOITECHAT_IGNORE_H
 
 extern GSList *ignore_list;
 

src/common/inbound.h

@@ -19,8 +19,8 @@
 
 #include "proto-irc.h"
 
-#ifndef HEXCHAT_INBOUND_H
-#define HEXCHAT_INBOUND_H
+#ifndef ZOITECHAT_INBOUND_H
+#define ZOITECHAT_INBOUND_H
 
 void inbound_next_nick (session *sess, char *nick, int error,
 								const message_tags_data *tags_data);

src/common/inet.h

@@ -19,8 +19,8 @@
 
 /* include stuff for internet */
 
-#ifndef HEXCHAT_INET_H
-#define HEXCHAT_INET_H
+#ifndef ZOITECHAT_INET_H
+#define ZOITECHAT_INET_H
 
 #ifndef WIN32
 

src/common/modes.h

@@ -19,8 +19,8 @@
 
 #include "proto-irc.h"
 
-#ifndef HEXCHAT_MODES_H
-#define HEXCHAT_MODES_H
+#ifndef ZOITECHAT_MODES_H
+#define ZOITECHAT_MODES_H
 
 int is_channel (server *serv, char *chan);
 char get_nick_prefix (server *serv, unsigned int access);

src/common/network.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_NETWORK_H
-#define HEXCHAT_NETWORK_H
+#ifndef ZOITECHAT_NETWORK_H
+#define ZOITECHAT_NETWORK_H
 
 typedef struct netstore_
 {

src/common/notify.c

@@ -478,7 +478,7 @@ notify_markonline (server *serv, char *word[], const message_tags_data *tags_dat
 			   about 27 people */
 			if (i > PDIWORDS - 5)
 			{
-				/*fprintf (stderr, _("*** HEXCHAT WARNING: notify list too large.\n"));*/
+				/*fprintf (stderr, _("*** ZOITECHAT WARNING: notify list too large.\n"));*/
 				break;
 			}
 		}
@@ -515,7 +515,7 @@ notify_checklist_for_server (server *serv)
 				/* LAME: we can't send more than 512 bytes to the server, but     *
 				 * if we split it in two packets, our offline detection wouldn't  *
 				 work                                                           */
-				/*fprintf (stderr, _("*** HEXCHAT WARNING: notify list too large.\n"));*/
+				/*fprintf (stderr, _("*** ZOITECHAT WARNING: notify list too large.\n"));*/
 				break;
 			}
 		}

src/common/notify.h

@@ -19,8 +19,8 @@
 
 #include "proto-irc.h"
 
-#ifndef HEXCHAT_NOTIFY_H
-#define HEXCHAT_NOTIFY_H
+#ifndef ZOITECHAT_NOTIFY_H
+#define ZOITECHAT_NOTIFY_H
 
 struct notify
 {

src/common/outbound.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_OUTBOUND_H
-#define HEXCHAT_OUTBOUND_H
+#ifndef ZOITECHAT_OUTBOUND_H
+#define ZOITECHAT_OUTBOUND_H
 
 #include "zoitechat.h"
 

src/common/plugin-identd.c

@@ -73,7 +73,7 @@ identd_cleanup_response_cb (gpointer userdata)
 static int
 identd_command_cb (char *word[], char *word_eol[], void *userdata)
 {
-	g_return_val_if_fail (responses != NULL, HEXCHAT_EAT_ALL);
+	g_return_val_if_fail (responses != NULL, ZOITECHAT_EAT_ALL);
 
 	if (!g_strcmp0 (word[2], "reload"))
 	{
@@ -86,11 +86,11 @@ identd_command_cb (char *word[], char *word_eol[], void *userdata)
 		identd_start_server ();
 
 		if (service)
-			return HEXCHAT_EAT_ALL;
+			return ZOITECHAT_EAT_ALL;
 	}
 
 	if (service == NULL) /* If we are not running plugins can handle it */
-		return HEXCHAT_EAT_HEXCHAT;
+		return ZOITECHAT_EAT_ZOITECHAT;
 
 	if (word[2] && *word[2] && word[3] && *word[3])
 	{
@@ -108,7 +108,7 @@ identd_command_cb (char *word[], char *word_eol[], void *userdata)
 		zoitechat_command (ph, "HELP IDENTD");
 	}
 
-	return HEXCHAT_EAT_ALL;
+	return ZOITECHAT_EAT_ALL;
 }
 
 static void
@@ -258,7 +258,7 @@ identd_plugin_init (zoitechat_plugin *plugin_handle, char **plugin_name,
 
 
 	responses = g_hash_table_new_full (NULL, NULL, NULL, g_free);
-	zoitechat_hook_command (ph, "IDENTD", HEXCHAT_PRI_NORM, identd_command_cb,
+	zoitechat_hook_command (ph, "IDENTD", ZOITECHAT_PRI_NORM, identd_command_cb,
 						_("IDENTD <port> <username>"), NULL);
 
 	identd_start_server ();

src/common/plugin-identd.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_PLUGIN_IDENTD_H
-#define HEXCHAT_PLUGIN_IDENTD_H
+#ifndef ZOITECHAT_PLUGIN_IDENTD_H
+#define ZOITECHAT_PLUGIN_IDENTD_H
 
 int identd_plugin_init (zoitechat_plugin *plugin_handle, char **plugin_name,
 				char **plugin_desc, char **plugin_version, char *arg);

src/common/plugin-timer.c

@@ -171,7 +171,7 @@ timer_cb (char *word[], char *word_eol[], void *userdata)
 	if (!word[2][0])
 	{
 		timer_showlist ();
-		return HEXCHAT_EAT_HEXCHAT;
+		return ZOITECHAT_EAT_ZOITECHAT;
 	}
 
 	if (g_ascii_strcasecmp (word[2], "-quiet") == 0)
@@ -183,7 +183,7 @@ timer_cb (char *word[], char *word_eol[], void *userdata)
 	if (g_ascii_strcasecmp (word[2 + offset], "-delete") == 0)
 	{
 		timer_del_ref (atoi (word[3 + offset]), quiet);
-		return HEXCHAT_EAT_HEXCHAT;
+		return ZOITECHAT_EAT_ZOITECHAT;
 	}
 
 	if (g_ascii_strcasecmp (word[2 + offset], "-refnum") == 0)
@@ -206,7 +206,7 @@ timer_cb (char *word[], char *word_eol[], void *userdata)
 	else
 		timer_add (ref, (int) timeout * 1000, repeat, command);
 
-	return HEXCHAT_EAT_HEXCHAT;
+	return ZOITECHAT_EAT_ZOITECHAT;
 }
 
 int
@@ -225,7 +225,7 @@ zoitechat_plugin_init
 	*plugin_desc = "IrcII style /TIMER command";
 	*plugin_version = "";
 
-	zoitechat_hook_command (ph, "TIMER", HEXCHAT_PRI_NORM, timer_cb, _(HELP), 0);
+	zoitechat_hook_command (ph, "TIMER", ZOITECHAT_PRI_NORM, timer_cb, _(HELP), 0);
 
 	return 1;       /* return 1 for success */
 }

src/common/plugin-timer.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_PLUGIN_TIMER_H
-#define HEXCHAT_PLUGIN_TIMER_H
+#ifndef ZOITECHAT_PLUGIN_TIMER_H
+#define ZOITECHAT_PLUGIN_TIMER_H
 
 int timer_plugin_init (zoitechat_plugin *plugin_handle, char **plugin_name,
 				char **plugin_desc, char **plugin_version, char *arg);

src/common/plugin.c

@@ -466,11 +466,11 @@ plugin_get_libdir (void)
 {
 	const char *libdir;
 
-	libdir = g_getenv ("HEXCHAT_LIBDIR");
+	libdir = g_getenv ("ZOITECHAT_LIBDIR");
 	if (libdir && *libdir)
 		return libdir;
 	else
-		return HEXCHATLIBDIR;
+		return ZOITECHATLIBDIR;
 }
 
 void
@@ -608,14 +608,14 @@ plugin_hook_run (session *sess, char *name, char *word[], char *word_eol[],
 			break;
 		}
 
-		if ((ret & HEXCHAT_EAT_HEXCHAT) && (ret & HEXCHAT_EAT_PLUGIN))
+		if ((ret & ZOITECHAT_EAT_ZOITECHAT) && (ret & ZOITECHAT_EAT_PLUGIN))
 		{
 			eat = 1;
 			goto xit;
 		}
-		if (ret & HEXCHAT_EAT_PLUGIN)
+		if (ret & ZOITECHAT_EAT_PLUGIN)
 			goto xit;	/* stop running plugins */
-		if (ret & HEXCHAT_EAT_HEXCHAT)
+		if (ret & ZOITECHAT_EAT_ZOITECHAT)
 			eat = 1;	/* eventually we'll return 1, but continue running plugins */
 
 		list = next;
@@ -801,11 +801,11 @@ plugin_fd_cb (GIOChannel *source, GIOCondition condition, zoitechat_hook *hook)
 	typedef int (zoitechat_fd_cb2) (int fd, int flags, void *user_data, GIOChannel *);
 
 	if (condition & G_IO_IN)
-		flags |= HEXCHAT_FD_READ;
+		flags |= ZOITECHAT_FD_READ;
 	if (condition & G_IO_OUT)
-		flags |= HEXCHAT_FD_WRITE;
+		flags |= ZOITECHAT_FD_WRITE;
 	if (condition & G_IO_PRI)
-		flags |= HEXCHAT_FD_EXCEPTION;
+		flags |= ZOITECHAT_FD_EXCEPTION;
 
 	ret = ((zoitechat_fd_cb2 *)hook->callback) (hook->pri, flags, hook->userdata, source);
 

src/common/plugin.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_COMMONPLUGIN_H
-#define HEXCHAT_COMMONPLUGIN_H
+#ifndef ZOITECHAT_COMMONPLUGIN_H
+#define ZOITECHAT_COMMONPLUGIN_H
 
 #ifdef PLUGIN_C
 struct _zoitechat_plugin

src/common/proto-irc.h

@@ -20,8 +20,8 @@
 #include <time.h>
 #include "zoitechat.h"
 
-#ifndef HEXCHAT_PROTO_H
-#define HEXCHAT_PROTO_H
+#ifndef ZOITECHAT_PROTO_H
+#define ZOITECHAT_PROTO_H
 
 #define MESSAGE_TAGS_DATA_INIT			\
 	{									\

src/common/scram.h

@@ -15,8 +15,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#ifndef HEXCHAT_SCRAM_H
-#define HEXCHAT_SCRAM_H
+#ifndef ZOITECHAT_SCRAM_H
+#define ZOITECHAT_SCRAM_H
 
 #include "config.h"
 #ifdef USE_OPENSSL

src/common/server.c

@@ -396,7 +396,7 @@ server_read (GIOChannel *source, GIOCondition condition, server *serv)
 				serv->linebuf[serv->pos] = lbuf[i];
 				if (serv->pos >= (sizeof (serv->linebuf) - 1))
 					fprintf (stderr,
-								"*** HEXCHAT WARNING: Buffer overflow - non-compliant server!\n");
+								"*** ZOITECHAT WARNING: Buffer overflow - non-compliant server!\n");
 				else
 					serv->pos++;
 			}

src/common/server.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_SERVER_H
-#define HEXCHAT_SERVER_H
+#ifndef ZOITECHAT_SERVER_H
+#define ZOITECHAT_SERVER_H
 
 extern GSList *serv_list;
 

src/common/servlist.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_SERVLIST_H
-#define HEXCHAT_SERVLIST_H
+#ifndef ZOITECHAT_SERVLIST_H
+#define ZOITECHAT_SERVLIST_H
 
 typedef struct ircserver
 {

src/common/ssl.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_SSL_H
-#define HEXCHAT_SSL_H
+#ifndef ZOITECHAT_SSL_H
+#define ZOITECHAT_SSL_H
 
 struct cert_info {
     char subject[256];

src/common/sysinfo/sysinfo.h

@@ -1,5 +1,5 @@
-#ifndef HEXCHAT_SYSINFO_H
-#define HEXCHAT_SYSINFO_H
+#ifndef ZOITECHAT_SYSINFO_H
+#define ZOITECHAT_SYSINFO_H
 
 #include <glib.h>
 

src/common/text.c

@@ -2237,7 +2237,7 @@ sound_play (const char *file, gboolean quiet)
 	}
 	else
 	{
-		wavfile = g_build_filename (get_xdir (), HEXCHAT_SOUND_DIR, file, NULL);
+		wavfile = g_build_filename (get_xdir (), ZOITECHAT_SOUND_DIR, file, NULL);
 	}
 
 	if (g_access (wavfile, R_OK) == 0)

src/common/text.h

@@ -20,8 +20,8 @@
 #include <time.h>
 #include "textenums.h"
 
-#ifndef HEXCHAT_TEXT_H
-#define HEXCHAT_TEXT_H
+#ifndef ZOITECHAT_TEXT_H
+#define ZOITECHAT_TEXT_H
 
 /* timestamp is non-zero if we are using server-time */
 #define EMIT_SIGNAL_TIMESTAMP(i, sess, a, b, c, d, e, timestamp) \

src/common/tree.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_TREE_H
-#define HEXCHAT_TREE_H
+#ifndef ZOITECHAT_TREE_H
+#define ZOITECHAT_TREE_H
 
 #include <glib.h>
 

src/common/typedef.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_TYPEDEF_H
-#define HEXCHAT_TYPEDEF_H
+#ifndef ZOITECHAT_TYPEDEF_H
+#define ZOITECHAT_TYPEDEF_H
 
 #ifdef WIN32
 

src/common/url.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_URL_H
-#define HEXCHAT_URL_H
+#ifndef ZOITECHAT_URL_H
+#define ZOITECHAT_URL_H
 
 extern void *url_tree;
 

src/common/userlist.h

@@ -20,8 +20,8 @@
 #include <time.h>
 #include "proto-irc.h"
 
-#ifndef HEXCHAT_USERLIST_H
-#define HEXCHAT_USERLIST_H
+#ifndef ZOITECHAT_USERLIST_H
+#define ZOITECHAT_USERLIST_H
 
 struct User
 {

src/common/util.h

@@ -30,8 +30,8 @@
  *        --+ Dagmar d'Surreal
  */
 
-#ifndef HEXCHAT_UTIL_H
-#define HEXCHAT_UTIL_H
+#ifndef ZOITECHAT_UTIL_H
+#define ZOITECHAT_UTIL_H
 
 #define rfc_tolower(c) (rfc_tolowertab[(unsigned char)(c)])
 

src/common/zoitechat-plugin.h

@@ -18,26 +18,26 @@
  */
 
 /* You can distribute this header with your plugins for easy compilation */
-#ifndef HEXCHAT_PLUGIN_H
-#define HEXCHAT_PLUGIN_H
+#ifndef ZOITECHAT_PLUGIN_H
+#define ZOITECHAT_PLUGIN_H
 
 #include <time.h>
 
-#define HEXCHAT_PRI_HIGHEST	127
-#define HEXCHAT_PRI_HIGH		64
-#define HEXCHAT_PRI_NORM		0
-#define HEXCHAT_PRI_LOW		(-64)
-#define HEXCHAT_PRI_LOWEST	(-128)
+#define ZOITECHAT_PRI_HIGHEST	127
+#define ZOITECHAT_PRI_HIGH		64
+#define ZOITECHAT_PRI_NORM		0
+#define ZOITECHAT_PRI_LOW		(-64)
+#define ZOITECHAT_PRI_LOWEST	(-128)
 
-#define HEXCHAT_FD_READ		1
-#define HEXCHAT_FD_WRITE		2
-#define HEXCHAT_FD_EXCEPTION	4
-#define HEXCHAT_FD_NOTSOCKET	8
+#define ZOITECHAT_FD_READ		1
+#define ZOITECHAT_FD_WRITE		2
+#define ZOITECHAT_FD_EXCEPTION	4
+#define ZOITECHAT_FD_NOTSOCKET	8
 
-#define HEXCHAT_EAT_NONE		0	/* pass it on through! */
-#define HEXCHAT_EAT_HEXCHAT		1	/* don't let ZoiteChat see this event */
-#define HEXCHAT_EAT_PLUGIN	2	/* don't let other plugins see this event */
-#define HEXCHAT_EAT_ALL		(HEXCHAT_EAT_HEXCHAT|HEXCHAT_EAT_PLUGIN)	/* don't let anything see this event */
+#define ZOITECHAT_EAT_NONE		0	/* pass it on through! */
+#define ZOITECHAT_EAT_ZOITECHAT		1	/* don't let ZoiteChat see this event */
+#define ZOITECHAT_EAT_PLUGIN	2	/* don't let other plugins see this event */
+#define ZOITECHAT_EAT_ALL		(ZOITECHAT_EAT_ZOITECHAT|ZOITECHAT_EAT_PLUGIN)	/* don't let anything see this event */
 
 #ifdef __cplusplus
 extern "C" {
@@ -407,50 +407,50 @@ zoitechat_pluginpref_list (zoitechat_plugin *ph,
 		char *dest);
 
 #if !defined(PLUGIN_C) && (defined(WIN32) || defined(__CYGWIN__))
-#ifndef HEXCHAT_PLUGIN_HANDLE
-#define HEXCHAT_PLUGIN_HANDLE (ph)
+#ifndef ZOITECHAT_PLUGIN_HANDLE
+#define ZOITECHAT_PLUGIN_HANDLE (ph)
 #endif
-#define zoitechat_hook_command ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_hook_command)
-#define zoitechat_event_attrs_create ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_event_attrs_create)
-#define zoitechat_event_attrs_free ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_event_attrs_free)
-#define zoitechat_hook_server ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_hook_server)
-#define zoitechat_hook_server_attrs ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_hook_server_attrs)
-#define zoitechat_hook_print ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_hook_print)
-#define zoitechat_hook_print_attrs ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_hook_print_attrs)
-#define zoitechat_hook_timer ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_hook_timer)
-#define zoitechat_hook_fd ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_hook_fd)
-#define zoitechat_unhook ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_unhook)
-#define zoitechat_print ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_print)
-#define zoitechat_printf ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_printf)
-#define zoitechat_command ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_command)
-#define zoitechat_commandf ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_commandf)
-#define zoitechat_nickcmp ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_nickcmp)
-#define zoitechat_set_context ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_set_context)
-#define zoitechat_find_context ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_find_context)
-#define zoitechat_get_context ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_get_context)
-#define zoitechat_get_info ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_get_info)
-#define zoitechat_get_prefs ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_get_prefs)
-#define zoitechat_list_get ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_list_get)
-#define zoitechat_list_free ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_list_free)
-#define zoitechat_list_fields ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_list_fields)
-#define zoitechat_list_next ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_list_next)
-#define zoitechat_list_str ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_list_str)
-#define zoitechat_list_int ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_list_int)
-#define zoitechat_plugingui_add ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_plugingui_add)
-#define zoitechat_plugingui_remove ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_plugingui_remove)
-#define zoitechat_emit_print ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_emit_print)
-#define zoitechat_emit_print_attrs ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_emit_print_attrs)
-#define zoitechat_list_time ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_list_time)
-#define zoitechat_gettext ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_gettext)
-#define zoitechat_send_modes ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_send_modes)
-#define zoitechat_strip ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_strip)
-#define zoitechat_free ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_free)
-#define zoitechat_pluginpref_set_str ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_pluginpref_set_str)
-#define zoitechat_pluginpref_get_str ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_pluginpref_get_str)
-#define zoitechat_pluginpref_set_int ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_pluginpref_set_int)
-#define zoitechat_pluginpref_get_int ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_pluginpref_get_int)
-#define zoitechat_pluginpref_delete ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_pluginpref_delete)
-#define zoitechat_pluginpref_list ((HEXCHAT_PLUGIN_HANDLE)->zoitechat_pluginpref_list)
+#define zoitechat_hook_command ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_hook_command)
+#define zoitechat_event_attrs_create ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_event_attrs_create)
+#define zoitechat_event_attrs_free ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_event_attrs_free)
+#define zoitechat_hook_server ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_hook_server)
+#define zoitechat_hook_server_attrs ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_hook_server_attrs)
+#define zoitechat_hook_print ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_hook_print)
+#define zoitechat_hook_print_attrs ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_hook_print_attrs)
+#define zoitechat_hook_timer ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_hook_timer)
+#define zoitechat_hook_fd ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_hook_fd)
+#define zoitechat_unhook ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_unhook)
+#define zoitechat_print ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_print)
+#define zoitechat_printf ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_printf)
+#define zoitechat_command ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_command)
+#define zoitechat_commandf ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_commandf)
+#define zoitechat_nickcmp ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_nickcmp)
+#define zoitechat_set_context ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_set_context)
+#define zoitechat_find_context ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_find_context)
+#define zoitechat_get_context ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_get_context)
+#define zoitechat_get_info ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_get_info)
+#define zoitechat_get_prefs ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_get_prefs)
+#define zoitechat_list_get ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_list_get)
+#define zoitechat_list_free ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_list_free)
+#define zoitechat_list_fields ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_list_fields)
+#define zoitechat_list_next ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_list_next)
+#define zoitechat_list_str ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_list_str)
+#define zoitechat_list_int ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_list_int)
+#define zoitechat_plugingui_add ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_plugingui_add)
+#define zoitechat_plugingui_remove ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_plugingui_remove)
+#define zoitechat_emit_print ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_emit_print)
+#define zoitechat_emit_print_attrs ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_emit_print_attrs)
+#define zoitechat_list_time ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_list_time)
+#define zoitechat_gettext ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_gettext)
+#define zoitechat_send_modes ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_send_modes)
+#define zoitechat_strip ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_strip)
+#define zoitechat_free ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_free)
+#define zoitechat_pluginpref_set_str ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_pluginpref_set_str)
+#define zoitechat_pluginpref_get_str ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_pluginpref_get_str)
+#define zoitechat_pluginpref_set_int ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_pluginpref_set_int)
+#define zoitechat_pluginpref_get_int ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_pluginpref_get_int)
+#define zoitechat_pluginpref_delete ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_pluginpref_delete)
+#define zoitechat_pluginpref_list ((ZOITECHAT_PLUGIN_HANDLE)->zoitechat_pluginpref_list)
 #endif
 
 #ifdef __cplusplus

src/common/zoitechat.h

@@ -26,8 +26,8 @@
 
 #include <time.h>			/* need time_t */
 
-#ifndef HEXCHAT_H
-#define HEXCHAT_H
+#ifndef ZOITECHAT_H
+#define ZOITECHAT_H
 
 gboolean zoitechat_theme_path_from_arg (const char *arg, char **path_out);
 gboolean zoitechat_import_theme (const char *path, GError **error);

src/common/zoitechatc.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_C_H
-#define HEXCHAT_C_H
+#ifndef ZOITECHAT_C_H
+#define ZOITECHAT_C_H
 
 extern struct zoitechatprefs prefs;
 

src/fe-gtk/ascii.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_ASCII_H
-#define HEXCHAT_ASCII_H
+#ifndef ZOITECHAT_ASCII_H
+#define ZOITECHAT_ASCII_H
 
 void ascii_open (void);
 

src/fe-gtk/banlist.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_BANLIST_H
-#define HEXCHAT_BANLIST_H
+#ifndef ZOITECHAT_BANLIST_H
+#define ZOITECHAT_BANLIST_H
 
 #include "../common/zoitechat.h"
 void banlist_opengui (session *sess);
@@ -72,4 +72,4 @@ typedef struct mode_info_s {
 	void (*tester)(banlist_info *, int);	/* Function returns true to set bit into checkable */
 } mode_info;
 
-#endif /* HEXCHAT_BANLIST_H */
+#endif /* ZOITECHAT_BANLIST_H */

src/fe-gtk/chanlist.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_CHANLIST_H
-#define HEXCHAT_CHANLIST_H
+#ifndef ZOITECHAT_CHANLIST_H
+#define ZOITECHAT_CHANLIST_H
 
 void chanlist_opengui (server *serv, int do_refresh);
 

src/fe-gtk/chanview-tree.c

@@ -98,11 +98,11 @@ cv_tree_init (chanview *cv)
 	int wid1, wid2;
 	static const GtkTargetEntry dnd_src_target[] =
 	{
-		{"HEXCHAT_CHANVIEW", GTK_TARGET_SAME_APP, 75 }
+		{"ZOITECHAT_CHANVIEW", GTK_TARGET_SAME_APP, 75 }
 	};
 	static const GtkTargetEntry dnd_dest_target[] =
 	{
-		{"HEXCHAT_USERLIST", GTK_TARGET_SAME_APP, 75 }
+		{"ZOITECHAT_USERLIST", GTK_TARGET_SAME_APP, 75 }
 	};
 
 	win = gtk_scrolled_window_new (0, 0);

src/fe-gtk/chanview.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_CHANVIEW_H
-#define HEXCHAT_CHANVIEW_H
+#ifndef ZOITECHAT_CHANVIEW_H
+#define ZOITECHAT_CHANVIEW_H
 
 typedef struct _chanview chanview;
 typedef struct _chan chan;

src/fe-gtk/custom-list.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_CUSTOM_LIST_H
-#define HEXCHAT_CUSTOM_LIST_H
+#ifndef ZOITECHAT_CUSTOM_LIST_H
+#define ZOITECHAT_CUSTOM_LIST_H
 
 #include <gtk/gtk.h>
 
@@ -103,4 +103,4 @@ void custom_list_append (CustomList *, chanlistrow *);
 void custom_list_resort (CustomList *);
 void custom_list_clear (CustomList *);
 
-#endif /* HEXCHAT_CUSTOM_LIST_H */
+#endif /* ZOITECHAT_CUSTOM_LIST_H */

src/fe-gtk/editlist.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_EDITLIST_H
-#define HEXCHAT_EDITLIST_H
+#ifndef ZOITECHAT_EDITLIST_H
+#define ZOITECHAT_EDITLIST_H
 
 void editlist_gui_open (char *title1, char *title2, GSList * list, char *title, char *wmclass, char *file, char *help);
 

src/fe-gtk/fe-gtk.c

@@ -539,7 +539,7 @@ log_handler (const gchar   *log_domain,
 {
 	session *sess;
 
-	/* if (getenv ("HEXCHAT_WARNING_IGNORE")) this gets ignored sometimes, so simply just disable all warnings */
+	/* if (getenv ("ZOITECHAT_WARNING_IGNORE")) this gets ignored sometimes, so simply just disable all warnings */
 		return;
 
 	sess = find_dialog (serv_list->data, "(warnings)");
@@ -547,7 +547,7 @@ log_handler (const gchar   *log_domain,
 		sess = new_ircwindow (serv_list->data, "(warnings)", SESS_DIALOG, 0);
 
 	PrintTextf (sess, "%s\t%s\n", log_domain, message);
-	if (getenv ("HEXCHAT_WARNING_ABORT"))
+	if (getenv ("ZOITECHAT_WARNING_ABORT"))
 		abort ();
 }
 

src/fe-gtk/fe-gtk.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_FE_GTK_H
-#define HEXCHAT_FE_GTK_H
+#ifndef ZOITECHAT_FE_GTK_H
+#define ZOITECHAT_FE_GTK_H
 
 #include "config.h"
 

src/fe-gtk/fkeys.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_FKEYS_H
-#define HEXCHAT_FKEYS_H
+#ifndef ZOITECHAT_FKEYS_H
+#define ZOITECHAT_FKEYS_H
 
 /* These are cp'ed from history.c --AGL */
 #define STATE_SHIFT		GDK_SHIFT_MASK

src/fe-gtk/gtkutil.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_GTKUTIL_H
-#define HEXCHAT_GTKUTIL_H
+#ifndef ZOITECHAT_GTKUTIL_H
+#define ZOITECHAT_GTKUTIL_H
 
 #include <gtk/gtk.h>
 #include "../common/fe.h"

src/fe-gtk/joind.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_JOIND_H
-#define HEXCHAT_JOIND_H
+#ifndef ZOITECHAT_JOIND_H
+#define ZOITECHAT_JOIND_H
 
 void joind_open (server *serv);
 void joind_close (server *serv);

src/fe-gtk/maingui.c

@@ -2563,8 +2563,8 @@ mg_create_textarea (session *sess, GtkWidget *box)
         };
         static const GtkTargetEntry dnd_dest_targets[] =
         {
-                {"HEXCHAT_CHANVIEW", GTK_TARGET_SAME_APP, 75 },
-                {"HEXCHAT_USERLIST", GTK_TARGET_SAME_APP, 75 }
+                {"ZOITECHAT_CHANVIEW", GTK_TARGET_SAME_APP, 75 },
+                {"ZOITECHAT_USERLIST", GTK_TARGET_SAME_APP, 75 }
         };
 
         vbox = mg_box_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
@@ -4332,7 +4332,7 @@ mg_is_gui_target (GdkDragContext *context)
         target_name = gdk_atom_name (gdk_drag_context_list_targets (context)->data);
         if (target_name)
         {
-                /* if it's not HEXCHAT_CHANVIEW or HEXCHAT_USERLIST */
+                /* if it's not ZOITECHAT_CHANVIEW or ZOITECHAT_USERLIST */
                 /* we should ignore it. */
                 if (target_name[0] != 'H')
                 {

src/fe-gtk/maingui.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_MAINGUI_H
-#define HEXCHAT_MAINGUI_H
+#ifndef ZOITECHAT_MAINGUI_H
+#define ZOITECHAT_MAINGUI_H
 
 extern GtkStyle *input_style;
 extern GtkWidget *parent_window;

src/fe-gtk/menu.c

@@ -1889,7 +1889,7 @@ menu_about (GtkWidget *wid, gpointer sess)
 #endif
 
 static struct mymenu mymenu[] = {
-	{N_("_ZoiteChat"), 0, 0, M_NEWMENU, MENU_ID_HEXCHAT, 0, 1},
+	{N_("_ZoiteChat"), 0, 0, M_NEWMENU, MENU_ID_ZOITECHAT, 0, 1},
 	{N_("Network Li_st"), menu_open_server_list, (char *)&pix_book, M_MENUPIX, 0, 0, 1, GDK_KEY_s},
 	{0, 0, 0, M_SEP, 0, 0, 0},
 
@@ -2550,7 +2550,7 @@ menu_create_main (void *accel_group, int bar, int away, int toplevel,
 			/* record the English name for /menu */
 			g_object_set_data (G_OBJECT (menu_item), "name", mymenu[i].text);
 #ifdef HAVE_GTK_MAC /* Added to app menu, see below */
-			if (!bar || mymenu[i].id != MENU_ID_HEXCHAT)		
+			if (!bar || mymenu[i].id != MENU_ID_ZOITECHAT)		
 #endif
 				gtk_menu_shell_append (GTK_MENU_SHELL (menu_bar), menu_item);
 			gtk_widget_show (menu_item);
@@ -2656,7 +2656,7 @@ togitem:
 
 #ifdef HAVE_GTK_MAC
 		/* We want ZoiteChat to be the app menu, not including Quit or ZoiteChat itself */
-		if (bar && item && i <= CLOSE_OFFSET + 1 && mymenu[i].id != MENU_ID_HEXCHAT)
+		if (bar && item && i <= CLOSE_OFFSET + 1 && mymenu[i].id != MENU_ID_ZOITECHAT)
 		{
 			if (!submenu || mymenu[i].type == M_MENUSUB)
 				gtkosx_application_insert_app_menu_item (osx_app, item, appmenu_offset++);

src/fe-gtk/menu.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_MENU_H
-#define HEXCHAT_MENU_H
+#ifndef ZOITECHAT_MENU_H
+#define ZOITECHAT_MENU_H
 
 GtkWidget *menu_create_main (void *accel_group, int bar, int away, int toplevel, GtkWidget **menu_widgets);
 void menu_urlmenu (GdkEventButton * event, char *url);
@@ -62,9 +62,9 @@ void menu_set_fullscreen (session_gui *gui, int fullscreen);
 #define MENU_ID_JOIN 11
 #define MENU_ID_USERMENU 12
 #define MENU_ID_FULLSCREEN 13
-#define MENU_ID_HEXCHAT 14
+#define MENU_ID_ZOITECHAT 14
 
-#if (MENU_ID_NUM < MENU_ID_HEXCHAT)
+#if (MENU_ID_NUM < MENU_ID_ZOITECHAT)
 #error MENU_ID_NUM is set wrong
 #endif
 

src/fe-gtk/notifications/notification-backend.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_PLUGIN_NOTIFICATION_BACKEND_H
-#define HEXCHAT_PLUGIN_NOTIFICATION_BACKEND_H
+#ifndef ZOITECHAT_PLUGIN_NOTIFICATION_BACKEND_H
+#define ZOITECHAT_PLUGIN_NOTIFICATION_BACKEND_H
 
 int notification_backend_supported (void);
 void notification_backend_show (const char *title, const char *text);

src/fe-gtk/notifications/notification-windows.c

@@ -47,7 +47,7 @@ notification_backend_init (const char **error)
 	/* Temporarily suppress the "DLL could not be loaded" dialog box before trying to load hcnotifications-winrt.dll */
 	original_error_mode = GetErrorMode ();
 	SetErrorMode(SEM_FAILCRITICALERRORS);
-	module = module_load (HEXCHATLIBDIR "\\hcnotifications-winrt.dll");
+	module = module_load (ZOITECHATLIBDIR "\\hcnotifications-winrt.dll");
 	SetErrorMode (original_error_mode);
 
 	if (module == NULL)

src/fe-gtk/notifygui.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_NOTIFYGUI_H
-#define HEXCHAT_NOTIFYGUI_H
+#ifndef ZOITECHAT_NOTIFYGUI_H
+#define ZOITECHAT_NOTIFYGUI_H
 
 void notify_gui_update (void);
 void notify_opengui (void);

src/fe-gtk/palette.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_PALETTE_H
-#define HEXCHAT_PALETTE_H
+#ifndef ZOITECHAT_PALETTE_H
+#define ZOITECHAT_PALETTE_H
 
 #include <stddef.h>
 

src/fe-gtk/pixmaps.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_PIXMAPS_H
-#define HEXCHAT_PIXMAPS_H
+#ifndef ZOITECHAT_PIXMAPS_H
+#define ZOITECHAT_PIXMAPS_H
 
 #include <cairo.h>
 

src/fe-gtk/plugin-notification.c

@@ -113,7 +113,7 @@ incoming_hilight_cb (char *word[], gpointer userdata)
 	{
 		show_notificationf (word[2], _("Highlighted message from: %s (%s)"), word[1], zoitechat_get_info (ph, "channel"));
 	}
-	return HEXCHAT_EAT_NONE;
+	return ZOITECHAT_EAT_NONE;
 }
 
 static int
@@ -139,7 +139,7 @@ incoming_message_cb (char *word[], gpointer userdata)
 	if (alert) {
 		show_notificationf(word[2], _("Channel message from: %s (%s)"), word[1], zoitechat_get_info(ph, "channel"));
 	}
-	return HEXCHAT_EAT_NONE;
+	return ZOITECHAT_EAT_NONE;
 }
 
 static int
@@ -189,7 +189,7 @@ incoming_priv_cb (char *word[], gpointer userdata)
 		else
 			show_notificationf (word[2], _("Private message from: %s (%s)"), word[1], network);
 	}
-	return HEXCHAT_EAT_NONE;
+	return ZOITECHAT_EAT_NONE;
 }
 
 static int
@@ -199,10 +199,10 @@ tray_cmd_cb (char *word[], char *word_eol[], gpointer userdata)
 	{
 		if (should_alert ())
 			show_notification (word[3], word_eol[4]);
-		return HEXCHAT_EAT_ALL;
+		return ZOITECHAT_EAT_ALL;
 	}
 
-	return HEXCHAT_EAT_NONE;
+	return ZOITECHAT_EAT_NONE;
 }
 
 int
@@ -222,24 +222,24 @@ notification_plugin_init (zoitechat_plugin *plugin_handle, char **plugin_name, c
 		return 0;
 	}
 
-	zoitechat_hook_print (ph, "Channel Msg Hilight", HEXCHAT_PRI_LOWEST, incoming_hilight_cb, NULL);
-	zoitechat_hook_print (ph, "Channel Action Hilight", HEXCHAT_PRI_LOWEST, incoming_hilight_cb, NULL);
+	zoitechat_hook_print (ph, "Channel Msg Hilight", ZOITECHAT_PRI_LOWEST, incoming_hilight_cb, NULL);
+	zoitechat_hook_print (ph, "Channel Action Hilight", ZOITECHAT_PRI_LOWEST, incoming_hilight_cb, NULL);
 
-	zoitechat_hook_print (ph, "Channel Message", HEXCHAT_PRI_LOWEST, incoming_message_cb, NULL);
-	zoitechat_hook_print (ph, "Channel Action", HEXCHAT_PRI_LOWEST, incoming_message_cb, NULL);
-	zoitechat_hook_print (ph, "Channel Notice", HEXCHAT_PRI_LOWEST, incoming_message_cb, NULL);
+	zoitechat_hook_print (ph, "Channel Message", ZOITECHAT_PRI_LOWEST, incoming_message_cb, NULL);
+	zoitechat_hook_print (ph, "Channel Action", ZOITECHAT_PRI_LOWEST, incoming_message_cb, NULL);
+	zoitechat_hook_print (ph, "Channel Notice", ZOITECHAT_PRI_LOWEST, incoming_message_cb, NULL);
 
-	zoitechat_hook_print (ph, "Private Message", HEXCHAT_PRI_LOWEST, incoming_priv_cb, NULL);
-	zoitechat_hook_print (ph, "Private Message to Dialog", HEXCHAT_PRI_LOWEST, incoming_priv_cb, NULL);
-	zoitechat_hook_print (ph, "Private Action", HEXCHAT_PRI_LOWEST, incoming_priv_cb, NULL);
-	zoitechat_hook_print (ph, "Private Action to Dialog", HEXCHAT_PRI_LOWEST, incoming_priv_cb, NULL);
+	zoitechat_hook_print (ph, "Private Message", ZOITECHAT_PRI_LOWEST, incoming_priv_cb, NULL);
+	zoitechat_hook_print (ph, "Private Message to Dialog", ZOITECHAT_PRI_LOWEST, incoming_priv_cb, NULL);
+	zoitechat_hook_print (ph, "Private Action", ZOITECHAT_PRI_LOWEST, incoming_priv_cb, NULL);
+	zoitechat_hook_print (ph, "Private Action to Dialog", ZOITECHAT_PRI_LOWEST, incoming_priv_cb, NULL);
 
 	/* Special events treated as priv */
-	zoitechat_hook_print (ph, "Notice", HEXCHAT_PRI_LOWEST, incoming_priv_cb, GINT_TO_POINTER (1));
-	zoitechat_hook_print (ph, "Invited", HEXCHAT_PRI_LOWEST, incoming_priv_cb, GINT_TO_POINTER (2));
-	zoitechat_hook_print (ph, "DCC Offer", HEXCHAT_PRI_LOWEST, incoming_priv_cb, GINT_TO_POINTER (3));
+	zoitechat_hook_print (ph, "Notice", ZOITECHAT_PRI_LOWEST, incoming_priv_cb, GINT_TO_POINTER (1));
+	zoitechat_hook_print (ph, "Invited", ZOITECHAT_PRI_LOWEST, incoming_priv_cb, GINT_TO_POINTER (2));
+	zoitechat_hook_print (ph, "DCC Offer", ZOITECHAT_PRI_LOWEST, incoming_priv_cb, GINT_TO_POINTER (3));
 
-	zoitechat_hook_command (ph, "TRAY", HEXCHAT_PRI_HIGH, tray_cmd_cb, NULL, NULL);
+	zoitechat_hook_command (ph, "TRAY", ZOITECHAT_PRI_HIGH, tray_cmd_cb, NULL, NULL);
 	
 	return 1;
 }

src/fe-gtk/plugin-notification.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_PLUGIN_NOTIFICATION_H
-#define HEXCHAT_PLUGIN_NOTIFICATION_H
+#ifndef ZOITECHAT_PLUGIN_NOTIFICATION_H
+#define ZOITECHAT_PLUGIN_NOTIFICATION_H
 
 int notification_plugin_init (void *, char **, char **, char **, char *);
 int notification_plugin_deinit (void *);

src/fe-gtk/plugin-tray.c

@@ -622,7 +622,7 @@ static int
 tray_hilight_cb (char *word[], void *userdata)
 {
 	/*if (tray_status == TS_HIGHLIGHT)
-		return HEXCHAT_EAT_NONE;*/
+		return ZOITECHAT_EAT_NONE;*/
 
 	if (prefs.hex_input_tray_hilight)
 	{
@@ -639,14 +639,14 @@ tray_hilight_cb (char *word[], void *userdata)
 								_(DISPLAY_NAME));
 	}
 
-	return HEXCHAT_EAT_NONE;
+	return ZOITECHAT_EAT_NONE;
 }
 
 static int
 tray_message_cb (char *word[], void *userdata)
 {
 	if (/*tray_status == TS_MESSAGE ||*/ tray_status == TS_HIGHLIGHT)
-		return HEXCHAT_EAT_NONE;
+		return ZOITECHAT_EAT_NONE;
 		
 	if (prefs.hex_input_tray_chans)
 	{
@@ -660,7 +660,7 @@ tray_message_cb (char *word[], void *userdata)
 			tray_set_tipf (_("%u channel messages. - %s"), tray_pub_count, _(DISPLAY_NAME));
 	}
 
-	return HEXCHAT_EAT_NONE;
+	return ZOITECHAT_EAT_NONE;
 }
 
 static void
@@ -694,7 +694,7 @@ tray_priv_cb (char *word[], void *userdata)
 {
 	tray_priv (word[1], word[2]);
 
-	return HEXCHAT_EAT_NONE;
+	return ZOITECHAT_EAT_NONE;
 }
 
 static int
@@ -703,7 +703,7 @@ tray_invited_cb (char *word[], void *userdata)
 	if (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1)
 		tray_priv (word[2], "Invited");
 
-	return HEXCHAT_EAT_NONE;
+	return ZOITECHAT_EAT_NONE;
 }
 
 static int
@@ -712,7 +712,7 @@ tray_dcc_cb (char *word[], void *userdata)
 	const char *network;
 
 /*	if (tray_status == TS_FILEOFFER)
-		return HEXCHAT_EAT_NONE;*/
+		return ZOITECHAT_EAT_NONE;*/
 
 	network = zoitechat_get_info (ph, "network");
 	if (!network)
@@ -731,7 +731,7 @@ tray_dcc_cb (char *word[], void *userdata)
 								tray_file_count, word[1], network, _(DISPLAY_NAME));
 	}
 
-	return HEXCHAT_EAT_NONE;
+	return ZOITECHAT_EAT_NONE;
 }
 
 static int
@@ -739,7 +739,7 @@ tray_focus_cb (char *word[], void *userdata)
 {
 	tray_stop_flash ();
 	tray_reset_counts ();
-	return HEXCHAT_EAT_NONE;
+	return ZOITECHAT_EAT_NONE;
 }
 
 static void

src/fe-gtk/plugin-tray.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_PLUGIN_TRAY_H
-#define HEXCHAT_PLUGIN_TRAY_H
+#ifndef ZOITECHAT_PLUGIN_TRAY_H
+#define ZOITECHAT_PLUGIN_TRAY_H
 
 int tray_plugin_init (void *, char **, char **, char **, char *);
 int tray_plugin_deinit (void *);

src/fe-gtk/plugingui.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_PLUGINGUI_H
-#define HEXCHAT_PLUGINGUI_H
+#ifndef ZOITECHAT_PLUGINGUI_H
+#define ZOITECHAT_PLUGINGUI_H
 
 void plugingui_open (void);
 void plugingui_load (void);

src/fe-gtk/rawlog.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_RAWLOG_H
-#define HEXCHAT_RAWLOG_H
+#ifndef ZOITECHAT_RAWLOG_H
+#define ZOITECHAT_RAWLOG_H
 
 void open_rawlog (server *serv);
 

src/fe-gtk/servlistgui.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_SERVLISTGUI_H
-#define HEXCHAT_SERVLISTGUI_H
+#ifndef ZOITECHAT_SERVLISTGUI_H
+#define ZOITECHAT_SERVLISTGUI_H
 
 void servlist_autojoinedit (ircnet *net, char *channel, gboolean add);
 

src/fe-gtk/setup.c

@@ -2268,7 +2268,7 @@ setup_snd_filereq_cb (GtkWidget *entry, char *file)
                         /* Use just the filename if the given sound file is in the default <config>/sounds directory.
                          * We're comparing absolute paths so this won't work in portable mode which uses a relative path.
                          */
-                        if (!strcmp (g_path_get_dirname (file), g_build_filename (get_xdir (), HEXCHAT_SOUND_DIR, NULL)))
+                        if (!strcmp (g_path_get_dirname (file), g_build_filename (get_xdir (), ZOITECHAT_SOUND_DIR, NULL)))
                         {
                                 gtk_entry_set_text (GTK_ENTRY (entry), g_path_get_basename (file));
                         }
@@ -2283,7 +2283,7 @@ setup_snd_filereq_cb (GtkWidget *entry, char *file)
 static void
 setup_snd_browse_cb (GtkWidget *button, GtkEntry *entry)
 {
-        char *sounds_dir = g_build_filename (get_xdir (), HEXCHAT_SOUND_DIR, NULL);
+        char *sounds_dir = g_build_filename (get_xdir (), ZOITECHAT_SOUND_DIR, NULL);
         char *filter = NULL;
         int filter_type;
 #ifdef WIN32 /* win32 only supports wav, others could support anything */

src/fe-gtk/setup.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_SETUP_H
-#define HEXCHAT_SETUP_H
+#ifndef ZOITECHAT_SETUP_H
+#define ZOITECHAT_SETUP_H
 
 void setup_apply_real (int new_pix, int do_ulist, int do_layout, int do_identd);
 

src/fe-gtk/textgui.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_TEXTGUI_H
-#define HEXCHAT_TEXTGUI_H
+#ifndef ZOITECHAT_TEXTGUI_H
+#define ZOITECHAT_TEXTGUI_H
 
 void PrintTextRaw (void *xtbuf, unsigned char *text, int indent, time_t stamp);
 void pevent_dialog_show (void);

src/fe-gtk/urlgrab.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_URLGRAB_H
-#define HEXCHAT_URLGRAB_H
+#ifndef ZOITECHAT_URLGRAB_H
+#define ZOITECHAT_URLGRAB_H
 
 void url_opengui (void);
 

src/fe-gtk/userlistgui.c

@@ -666,11 +666,11 @@ userlist_create (GtkWidget *box)
 	static const GtkTargetEntry dnd_dest_targets[] =
 	{
 		{"text/uri-list", 0, 1},
-		{"HEXCHAT_CHANVIEW", GTK_TARGET_SAME_APP, 75 }
+		{"ZOITECHAT_CHANVIEW", GTK_TARGET_SAME_APP, 75 }
 	};
 	static const GtkTargetEntry dnd_src_target[] =
 	{
-		{"HEXCHAT_USERLIST", GTK_TARGET_SAME_APP, 75 }
+		{"ZOITECHAT_USERLIST", GTK_TARGET_SAME_APP, 75 }
 	};
 
 	sw = gtk_scrolled_window_new (NULL, NULL);

src/fe-gtk/userlistgui.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_USERLISTGUI_H
-#define HEXCHAT_USERLISTGUI_H
+#ifndef ZOITECHAT_USERLISTGUI_H
+#define ZOITECHAT_USERLISTGUI_H
 
 void userlist_set_value (GtkWidget *treeview, gfloat val);
 gfloat userlist_get_value (GtkWidget *treeview);

src/fe-gtk/xtext-color.h

@@ -6,8 +6,8 @@
  * (at your option) any later version.
  */
 
-#ifndef HEXCHAT_XTEXT_COLOR_H
-#define HEXCHAT_XTEXT_COLOR_H
+#ifndef ZOITECHAT_XTEXT_COLOR_H
+#define ZOITECHAT_XTEXT_COLOR_H
 
 typedef struct
 {

src/fe-gtk/xtext.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#ifndef HEXCHAT_XTEXT_H
-#define HEXCHAT_XTEXT_H
+#ifndef ZOITECHAT_XTEXT_H
+#define ZOITECHAT_XTEXT_H
 
 #include <gtk/gtk.h>
 #include <cairo.h>

src/fe-text/fe-text.c

@@ -523,7 +523,7 @@ fe_args (int argc, char *argv[])
 		}
 		g_free (exe);
 #else
-		printf ("%s\n", HEXCHATLIBDIR);
+		printf ("%s\n", ZOITECHATLIBDIR);
 #endif
 #endif
 		return 0;