Rename X-Tray to HexTray

6 files changed, 11 insertions, 11 deletions

diff --git a/src/common/util.c b/src/common/util.c
index 27f0aa40..74146b21 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1885,10 +1885,10 @@ portable_mode ()
 }
 
 int
-xtray_mode ()
+hextray_mode ()
 {
 #ifdef WIN32
-	if ((_access( "plugins/xtray.dll", 0 )) != -1)
+	if ((_access( "plugins/hextray.dll", 0 )) != -1)
 	{
 		return 1;
 	}
diff --git a/src/common/util.h b/src/common/util.h
index 82d74366..c2f1e118 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -58,6 +58,6 @@ guint32 str_ihash (const unsigned char *key);
 void safe_strcpy (char *dest, const char *src, int bytes_left);
 void canonalize_key (char *key);
 int portable_mode ();
-int xtray_mode ();
+int hextray_mode ();
 
 #endif
diff --git a/src/common/xchat.c b/src/common/xchat.c
index 1b9fd5a7..da33edbe 100644
--- a/src/common/xchat.c
+++ b/src/common/xchat.c
@@ -981,7 +981,7 @@ main (int argc, char *argv[])
 			 * only works correctly when X-Tray is used, but it's not a big deal
 			 * since you can only minimize XChat to tray via the taskbar if you
 			 * use X-Tray*/
-			if (xtray_mode ())
+			if (hextray_mode ())
 			{
 				/* FindWindow() doesn't support wildcards so we check all the open windows */
 				EnumWindows (enum_windows_impl, NULL);
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index 62a35746..c764e04a 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -1287,7 +1287,7 @@ mg_open_quit_dialog (gboolean minimize_button)
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1),
 										GTK_BUTTONBOX_END);
 
-	if (minimize_button && !xtray_mode ())
+	if (minimize_button && !hextray_mode ())
 	{
 		button = gtk_button_new_with_mnemonic (_("_Minimize to Tray"));
 		gtk_widget_show (button);
@@ -1586,7 +1586,7 @@ mg_create_alertmenu (session *sess, GtkWidget *menu)
 
 	mg_perchan_menu_item (_("Beep on _Message"), submenu, &sess->alert_beep, prefs.input_beep_chans);
 
-	if (!xtray_mode ())		/*disable this context menu item when xtray is loaded */
+	if (!hextray_mode ())		/*disable this context menu item when HexTray is loaded */
 	{
 		mg_perchan_menu_item (_("Blink Tray _Icon"), submenu, &sess->alert_tray, prefs.input_tray_chans);
 	}
diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c
index 145e5c95..0dcc8f7f 100644
--- a/src/fe-gtk/plugin-tray.c
+++ b/src/fe-gtk/plugin-tray.c
@@ -732,7 +732,7 @@ tray_apply_setup (void)
 	}
 	else
 	{
-		if (prefs.gui_tray && !xtray_mode ())
+		if (prefs.gui_tray && !hextray_mode ())
 			tray_init ();
 	}
 }
@@ -764,7 +764,7 @@ tray_plugin_init (xchat_plugin *plugin_handle, char **plugin_name,
 
 	xchat_hook_print (ph, "Focus Window", -1, tray_focus_cb, NULL);
 
-	if (prefs.gui_tray && !xtray_mode ())
+	if (prefs.gui_tray && !hextray_mode ())
 		tray_init ();
 
 	return 1;       /* return 1 for success */
diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index ffe9f4f0..c11bb474 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -376,7 +376,7 @@ static const setting alert_settings[] =
 	{ST_END, 0, 0, 0, 0, 0}
 };
 
-static const setting alert_settings_xtray[] =
+static const setting alert_settings_hextray[] =
 {
 	{ST_HEADER,	N_("Alerts"),0,0,0},
 
@@ -1802,9 +1802,9 @@ setup_create_pages (GtkWidget *box)
 	setup_add_page (cata[4], book, setup_create_page (tabs_settings));
 	setup_add_page (cata[5], book, setup_create_color_page ());
 
-	if (xtray_mode ())
+	if (hextray_mode ())
 	{
-		setup_add_page (cata[8], book, setup_create_page (alert_settings_xtray));
+		setup_add_page (cata[8], book, setup_create_page (alert_settings_hextray));
 	}
 	else
 	{