From 1f1c76a5d8e4456d844bf19400aca68900e0e878 Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Wed, 11 Jul 2012 22:41:15 +0200 Subject: [PATCH] Initial rebranding in code --- plugins/xtray/callbacks.cpp | 2 +- plugins/xtray/xtray.cpp | 2 +- src/common/ctcp.c | 4 ++-- src/common/xchat.c | 6 +++--- src/fe-gtk/fe-gtk.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/xtray/callbacks.cpp b/plugins/xtray/callbacks.cpp index 1b7f452f..c7de9626 100644 --- a/plugins/xtray/callbacks.cpp +++ b/plugins/xtray/callbacks.cpp @@ -344,7 +344,7 @@ LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wparam, LPARAM lparam) if(msg == RegisterWindowMessage(_T("TaskbarCreated"))) { char szVersion[64]; - _snprintf(szVersion, 64, "XChat-WDK [%s]", xchat_get_info(ph, "version")); + _snprintf(szVersion, 64, "HexChat [%s]", xchat_get_info(ph, "version")); AddIcon(g_hXchatWnd, 1, g_hIcons[0], szVersion, (NIF_ICON | NIF_MESSAGE | NIF_TIP), WM_TRAYMSG); } } diff --git a/plugins/xtray/xtray.cpp b/plugins/xtray/xtray.cpp index ec5e34f8..b49c7ed7 100644 --- a/plugins/xtray/xtray.cpp +++ b/plugins/xtray/xtray.cpp @@ -116,7 +116,7 @@ int xchat_plugin_init(xchat_plugin *plugin_handle, char **plugin_name, char **pl /************************* Add our icon to the tray ************************************************************************/ /***************************************************************************************************************************/ char szVersion[64]; - _snprintf(szVersion, 64, "XChat-WDK %s", xchat_get_info(ph, "wdk_version")); + _snprintf(szVersion, 64, "HexChat %s", xchat_get_info(ph, "wdk_version")); AddIcon(g_hXchatWnd, 1, g_hIcons[0], szVersion, (NIF_ICON | NIF_MESSAGE | NIF_TIP), WM_TRAYMSG); /***************************************************************************************************************************/ diff --git a/src/common/ctcp.c b/src/common/ctcp.c index 36952db7..0bf2f465 100644 --- a/src/common/ctcp.c +++ b/src/common/ctcp.c @@ -138,10 +138,10 @@ ctcp_handle (session *sess, char *to, char *nick, char *ip, if (!g_ascii_strcasecmp (msg, "VERSION") && !prefs.hidever) { #ifdef WIN32 - snprintf (outbuf, sizeof (outbuf), "VERSION XChat-WDK "PACKAGE_VERSION" [x%d] / %s", + snprintf (outbuf, sizeof (outbuf), "VERSION HexChat "PACKAGE_VERSION" [x%d] / %s", get_cpu_arch (), get_cpu_str ()); #else - snprintf (outbuf, sizeof (outbuf), "VERSION XChat-WDK "PACKAGE_VERSION" %s", + snprintf (outbuf, sizeof (outbuf), "VERSION HexChat "PACKAGE_VERSION" %s", get_cpu_str ()); #endif serv->p_nctcp (serv, nick, outbuf); diff --git a/src/common/xchat.c b/src/common/xchat.c index 845f262b..0849e234 100644 --- a/src/common/xchat.c +++ b/src/common/xchat.c @@ -924,13 +924,13 @@ enum_windows_impl (HWND current_window, LPARAM lParam) } GetWindowText (current_window, window_name, 10); - if (stricmp (window_name, "xchat-wdk") == 0) + if (stricmp (window_name, "hexchat") == 0) { /* use a separate if block, this way we don't have to call GetWindowModuleFileName() for each hit */ ZeroMemory (&module_path, sizeof (module_path)); GetWindowModuleFileName (current_window, module_path, sizeof (module_path)); - if (strstr (module_path, "xchat.exe")) /* We've found it, stop */ + if (strstr (module_path, "hexchat.exe")) /* We've found it, stop */ { xchat_restore_window (current_window); return FALSE; @@ -972,7 +972,7 @@ main (int argc, char *argv[]) { DWORD error; - mutex = CreateMutex (NULL, TRUE, "Local\xchat"); + mutex = CreateMutex (NULL, TRUE, "Local\hexchat"); error = GetLastError (); if (error == ERROR_ALREADY_EXISTS || mutex == NULL) diff --git a/src/fe-gtk/fe-gtk.h b/src/fe-gtk/fe-gtk.h index 8fffb3cc..f4188a01 100644 --- a/src/fe-gtk/fe-gtk.h +++ b/src/fe-gtk/fe-gtk.h @@ -1,6 +1,6 @@ #include "../../config.h" -#define DISPLAY_NAME "XChat-WDK" +#define DISPLAY_NAME "HexChat" #ifndef WIN32 #include