iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Even more rebranding

Browse Source
This commit is contained in:
Berke Viktor 2012-07-12 18:39:52 +02:00
parent fe67eba75e
commit ba664dc848
6 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config.h
View File

@ -6,11 +6,11 @@
#define USE_LIBSEXY #define USE_LIBSEXY
#define USE_IPV6 #define USE_IPV6
#define HAVE_ISO_CODES #define HAVE_ISO_CODES
#define PACKAGE_NAME "xchat" #define PACKAGE_NAME "hexchat"
#define PACKAGE_VERSION "1508-3" #define PACKAGE_VERSION "2.9.0"
#define XCHAT_RELEASE "2.8.8" #define XCHAT_REVISION "1508"
#define XCHATLIBDIR "." #define XCHATLIBDIR "."
#define XCHATSHAREDIR "." #define XCHATSHAREDIR "."
#define OLD_PERL #define OLD_PERL
#define GETTEXT_PACKAGE "xchat" #define GETTEXT_PACKAGE "hexchat"
#define PACKAGE_TARNAME "xchat-2.8.8" #define PACKAGE_TARNAME "hexchat-2.9.0"

28
plugins/upd/upd.c
View File

@ -27,7 +27,7 @@
static xchat_plugin *ph; /* plugin handle */ static xchat_plugin *ph; /* plugin handle */
static const char name[] = "Update Checker"; 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 const char version[] = "2.1";
static char* static char*
@ -43,7 +43,7 @@ check_version ()
} }
hFile = InternetOpenUrl (hINet, hFile = InternetOpenUrl (hINet,
"http://xchat-wdk.googlecode.com/git/version.txt?r=wdk", "https://raw.github.com/hexchat/hexchat/master/version.txt",
NULL, NULL,
0, 0,
INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_RELOAD, INTERNET_FLAG_NO_CACHE_WRITE | INTERNET_FLAG_RELOAD,
@ -98,8 +98,8 @@ check_version ()
} }
hConnect = InternetConnect (hOpen, hConnect = InternetConnect (hOpen,
TEXT ("xchat-wdk.googlecode.com"), TEXT ("raw.github.com"),
INTERNET_INVALID_PORT_NUMBER, INTERNET_DEFAULT_HTTPS_PORT,
NULL, NULL,
NULL, NULL,
INTERNET_SERVICE_HTTP, INTERNET_SERVICE_HTTP,
@ -113,11 +113,11 @@ check_version ()
hResource = HttpOpenRequest (hConnect, hResource = HttpOpenRequest (hConnect,
TEXT ("GET"), TEXT ("GET"),
TEXT ("/git/version.txt?r=wdk"), TEXT ("/hexchat/hexchat/master/version.txt"),
TEXT ("HTTP/1.0"), TEXT ("HTTP/1.0"),
NULL, NULL,
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); 0);
if (!hResource) if (!hResource)
{ {
@ -154,20 +154,20 @@ print_version ()
{ {
char *version = check_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) 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 else
{ {
#ifdef _WIN64 /* use this approach, the wProcessorArchitecture method always returns 0 (=x86) for some reason */ #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 #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 #endif
} }
@ -180,12 +180,12 @@ print_version_quiet (void *userdata)
char *version = check_version (); char *version = check_version ();
/* if it's not the current version AND not network error */ /* 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 */ #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 #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 #endif
/* print update url once, then stop the timer */ /* print update url once, then stop the timer */
return 0; return 0;

4
plugins/winsys/winsys.cpp
View File

@ -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 */ /* 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_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 (), getCpuArch (),
wmiOs, wmiOs,
wmiCpu, wmiCpu,
@ -375,7 +375,7 @@ printInfo (char *word[], char *word_eol[], void *user_data)
} }
else 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, " * OS: %s\n", wmiOs);
xchat_printf (ph, " * CPU: %s (%s)\n", wmiCpu, getCpuMhz ()); xchat_printf (ph, " * CPU: %s (%s)\n", wmiCpu, getCpuMhz ());
xchat_printf (ph, " * RAM: %s\n", getMemoryInfo ()); xchat_printf (ph, " * RAM: %s\n", getMemoryInfo ());

2
plugins/xtray/xtray.cpp
View File

@ -116,7 +116,7 @@ int xchat_plugin_init(xchat_plugin *plugin_handle, char **plugin_name, char **pl
/************************* Add our icon to the tray ************************************************************************/ /************************* Add our icon to the tray ************************************************************************/
/***************************************************************************************************************************/ /***************************************************************************************************************************/
char szVersion[64]; 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); AddIcon(g_hXchatWnd, 1, g_hIcons[0], szVersion, (NIF_ICON | NIF_MESSAGE | NIF_TIP), WM_TRAYMSG);
/***************************************************************************************************************************/ /***************************************************************************************************************************/

7
src/common/plugin.c
View File

@ -1010,20 +1010,13 @@ xchat_get_info (xchat_plugin *ph, const char *id)
return XCHATLIBDIR; return XCHATLIBDIR;
case 0x14f51cd8: /* version */ case 0x14f51cd8: /* version */
#ifdef WIN32
return XCHAT_RELEASE;
#else
return PACKAGE_VERSION; return PACKAGE_VERSION;
#endif
case 0xdd9b1abd: /* xchatdir */ case 0xdd9b1abd: /* xchatdir */
return get_xdir_utf8 (); return get_xdir_utf8 ();
case 0xe33f6c4a: /* xchatdirfs */ case 0xe33f6c4a: /* xchatdirfs */
return get_xdir_fs (); return get_xdir_fs ();
case 0x3d1e70d7: /* wdk_version */
return PACKAGE_VERSION;
} }
sess = ph->context; sess = ph->context;

2
src/fe-gtk/about.c
View File

@ -117,7 +117,7 @@ menu_about (GtkWidget * wid, gpointer sess)
"<span size=\"x-large\"><b>"DISPLAY_NAME" "PACKAGE_VERSION"</b></span>\n" "<span size=\"x-large\"><b>"DISPLAY_NAME" "PACKAGE_VERSION"</b></span>\n"
#ifdef WIN32 #ifdef WIN32
"%s%s%s" "%s%s%s"
"\n<b>XChat Release</b>: "XCHAT_RELEASE"\n\n" "\n<b>XChat Revision</b>: r"XCHAT_REVISION"\n\n"
"<b>OS</b>: %s\n" "<b>OS</b>: %s\n"
"<b>Charset</b>: %s " "<b>Charset</b>: %s "
"<b>GTK+</b>: %i.%i.%i\n" "<b>GTK+</b>: %i.%i.%i\n"