From ba664dc84855d5db34b4adbbe2a0e4e300d84471 Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Thu, 12 Jul 2012 18:39:52 +0200 Subject: [PATCH] Even more rebranding --- config.h | 10 +++++----- plugins/upd/upd.c | 28 ++++++++++++++-------------- plugins/winsys/winsys.cpp | 4 ++-- plugins/xtray/xtray.cpp | 2 +- src/common/plugin.c | 7 ------- src/fe-gtk/about.c | 2 +- 6 files changed, 23 insertions(+), 30 deletions(-) diff --git a/config.h b/config.h index 94046550..f5948583 100644 --- a/config.h +++ b/config.h @@ -6,11 +6,11 @@ #define USE_LIBSEXY #define USE_IPV6 #define HAVE_ISO_CODES -#define PACKAGE_NAME "xchat" -#define PACKAGE_VERSION "1508-3" -#define XCHAT_RELEASE "2.8.8" +#define PACKAGE_NAME "hexchat" +#define PACKAGE_VERSION "2.9.0" +#define XCHAT_REVISION "1508" #define XCHATLIBDIR "." #define XCHATSHAREDIR "." #define OLD_PERL -#define GETTEXT_PACKAGE "xchat" -#define PACKAGE_TARNAME "xchat-2.8.8" +#define GETTEXT_PACKAGE "hexchat" +#define PACKAGE_TARNAME "hexchat-2.9.0" diff --git a/plugins/upd/upd.c b/plugins/upd/upd.c index 1659162c..da92f2e4 100644 --- a/plugins/upd/upd.c +++ b/plugins/upd/upd.c @@ -27,7 +27,7 @@ static xchat_plugin *ph; /* plugin handle */ static const char name[] = "Update Checker"; -static const char desc[] = "Check for XChat-WDK updates automatically"; +static const char desc[] = "Check for HexChat updates automatically"; static const char version[] = "2.1"; static char* @@ -43,7 +43,7 @@ check_version () } hFile = InternetOpenUrl (hINet, - "http://xchat-wdk.googlecode.com/git/version.txt?r=wdk", + "https://raw.github.com/hexchat/hexchat/master/version.txt", NULL, 0, INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_RELOAD, @@ -98,8 +98,8 @@ check_version () } hConnect = InternetConnect (hOpen, - TEXT ("xchat-wdk.googlecode.com"), - INTERNET_INVALID_PORT_NUMBER, + TEXT ("raw.github.com"), + INTERNET_DEFAULT_HTTPS_PORT, NULL, NULL, INTERNET_SERVICE_HTTP, @@ -113,11 +113,11 @@ check_version () hResource = HttpOpenRequest (hConnect, TEXT ("GET"), - TEXT ("/git/version.txt?r=wdk"), + TEXT ("/hexchat/hexchat/master/version.txt"), TEXT ("HTTP/1.0"), NULL, NULL, - INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_RELOAD | INTERNET_FLAG_NO_AUTH, + INTERNET_FLAG_SECURE | INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_RELOAD | INTERNET_FLAG_NO_AUTH, 0); if (!hResource) { @@ -154,20 +154,20 @@ print_version () { char *version = check_version (); - if (strcmp (version, xchat_get_info (ph, "wdk_version")) == 0) + if (strcmp (version, xchat_get_info (ph, "version")) == 0) { - xchat_printf (ph, "You have the latest version of XChat-WDK installed!\n"); + xchat_printf (ph, "You have the latest version of HexChat installed!\n"); } else if (strcmp (version, "Unknown") == 0) { - xchat_printf (ph, "Unable to check for XChat-WDK updates!\n"); + xchat_printf (ph, "Unable to check for HexChat updates!\n"); } else { #ifdef _WIN64 /* use this approach, the wProcessorArchitecture method always returns 0 (=x86) for some reason */ - xchat_printf (ph, "An XChat-WDK update is available! You can download it from here:\nhttp://xchat-wdk.googlecode.com/files/XChat-WDK%%20%s%%20x64.exe\n", version); + xchat_printf (ph, "A HexChat update is available! You can download it from here:\nhttp://xchat-wdk.googlecode.com/files/HexChat%%20%s%%20x64.exe\n", version); #else - xchat_printf (ph, "An XChat-WDK update is available! You can download it from here:\nhttp://xchat-wdk.googlecode.com/files/XChat-WDK%%20%s%%20x86.exe\n", version); + xchat_printf (ph, "A HexChat update is available! You can download it from here:\nhttp://xchat-wdk.googlecode.com/files/HexChat%%20%s%%20x86.exe\n", version); #endif } @@ -180,12 +180,12 @@ print_version_quiet (void *userdata) char *version = check_version (); /* if it's not the current version AND not network error */ - if (!(strcmp (version, xchat_get_info (ph, "wdk_version")) == 0) && !(strcmp (version, "Unknown") == 0)) + if (!(strcmp (version, xchat_get_info (ph, "version")) == 0) && !(strcmp (version, "Unknown") == 0)) { #ifdef _WIN64 /* use this approach, the wProcessorArchitecture method always returns 0 (=x86) for plugins for some reason */ - xchat_printf (ph, "An XChat-WDK update is available! You can download it from here:\nhttp://xchat-wdk.googlecode.com/files/XChat-WDK%%20%s%%20x64.exe\n", version); + xchat_printf (ph, "A HexChat update is available! You can download it from here:\nhttp://xchat-wdk.googlecode.com/files/HexChat%%20%s%%20x64.exe\n", version); #else - xchat_printf (ph, "An XChat-WDK update is available! You can download it from here:\nhttp://xchat-wdk.googlecode.com/files/XChat-WDK%%20%s%%20x86.exe\n", version); + xchat_printf (ph, "A HexChat update is available! You can download it from here:\nhttp://xchat-wdk.googlecode.com/files/HexChat%%20%s%%20x86.exe\n", version); #endif /* print update url once, then stop the timer */ return 0; diff --git a/plugins/winsys/winsys.cpp b/plugins/winsys/winsys.cpp index 456f1b0a..4ab1b3fd 100644 --- a/plugins/winsys/winsys.cpp +++ b/plugins/winsys/winsys.cpp @@ -365,7 +365,7 @@ printInfo (char *word[], char *word_eol[], void *user_data) { /* uptime will work correctly for up to 50 days, should be enough */ xchat_commandf (ph, "ME ** WinSys ** Client: HexChat %s (x%d) ** OS: %s ** CPU: %s (%s) ** RAM: %s ** VGA: %s ** Uptime: %.2f Hours **", - xchat_get_info (ph, "wdk_version"), + xchat_get_info (ph, "version"), getCpuArch (), wmiOs, wmiCpu, @@ -375,7 +375,7 @@ printInfo (char *word[], char *word_eol[], void *user_data) } else { - xchat_printf (ph, " * Client: HexChat %s (x%d)\n", xchat_get_info (ph, "wdk_version"), getCpuArch ()); + xchat_printf (ph, " * Client: HexChat %s (x%d)\n", xchat_get_info (ph, "version"), getCpuArch ()); xchat_printf (ph, " * OS: %s\n", wmiOs); xchat_printf (ph, " * CPU: %s (%s)\n", wmiCpu, getCpuMhz ()); xchat_printf (ph, " * RAM: %s\n", getMemoryInfo ()); diff --git a/plugins/xtray/xtray.cpp b/plugins/xtray/xtray.cpp index b49c7ed7..69303fc5 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, "HexChat %s", xchat_get_info(ph, "wdk_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/src/common/plugin.c b/src/common/plugin.c index 0a265d16..41293129 100644 --- a/src/common/plugin.c +++ b/src/common/plugin.c @@ -1010,20 +1010,13 @@ xchat_get_info (xchat_plugin *ph, const char *id) return XCHATLIBDIR; case 0x14f51cd8: /* version */ -#ifdef WIN32 - return XCHAT_RELEASE; -#else return PACKAGE_VERSION; -#endif case 0xdd9b1abd: /* xchatdir */ return get_xdir_utf8 (); case 0xe33f6c4a: /* xchatdirfs */ return get_xdir_fs (); - - case 0x3d1e70d7: /* wdk_version */ - return PACKAGE_VERSION; } sess = ph->context; diff --git a/src/fe-gtk/about.c b/src/fe-gtk/about.c index cf7e03c9..a150eb60 100644 --- a/src/fe-gtk/about.c +++ b/src/fe-gtk/about.c @@ -117,7 +117,7 @@ menu_about (GtkWidget * wid, gpointer sess) ""DISPLAY_NAME" "PACKAGE_VERSION"\n" #ifdef WIN32 "%s%s%s" - "\nXChat Release: "XCHAT_RELEASE"\n\n" + "\nXChat Revision: r"XCHAT_REVISION"\n\n" "OS: %s\n" "Charset: %s " "GTK+: %i.%i.%i\n"