deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-15 18:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

More polishing for the About dialog

Browse Source
This commit is contained in:
Berke Viktor
2012-10-28 00:05:40 +02:00
parent d892b3346e
commit fe1d958838
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/ctcp.c
View File

@@ -139,10 +139,10 @@ ctcp_handle (session *sess, char *to, char *nick, char *ip,
{
#ifdef WIN32
snprintf (outbuf, sizeof (outbuf), "VERSION HexChat "PACKAGE_VERSION" [x%d] / %s",
get_cpu_arch (), get_cpu_str ());
get_cpu_arch (), get_sys_str (1));
#else
snprintf (outbuf, sizeof (outbuf), "VERSION HexChat "PACKAGE_VERSION" / %s",
get_cpu_str ());
get_sys_str (1));
#endif
serv->p_nctcp (serv, nick, outbuf);
}

2
src/common/outbound.c
View File

@@ -3885,7 +3885,7 @@ auto_insert (char *dest, int destlen, unsigned char *src, char *word[],
case 'h':
utf = h; break;
case 'm':
utf = get_cpu_str (); break;
utf = get_sys_str (1); break;
case 'n':
utf = n; break;
case 's':

8
src/common/util.c
View File

@@ -674,7 +674,7 @@ get_cpu_arch (void)
}
char *
get_cpu_str (void)
get_sys_str (int with_cpu)
{
static char verbuf[64];
static char winver[20];
@@ -749,7 +749,7 @@ get_cpu_str (void)
}
mhz = get_mhz ();
if (mhz)
if (mhz && with_cpu)
{
double cpuspeed = ( mhz > 1000 ) ? mhz / 1000 : mhz;
const char *cpuspeedstr = ( mhz > 1000 ) ? "GHz" : "MHz";
@@ -766,7 +766,7 @@ get_cpu_str (void)
#else
char *
get_cpu_str (void)
get_sys_str (int with_cpu)
{
#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__)
double mhz;
@@ -784,7 +784,7 @@ get_cpu_str (void)
#if defined (USING_LINUX) || defined (USING_FREEBSD) || defined (__APPLE__)
get_cpu_info (&mhz, &cpus);
if (mhz)
if (mhz && with_cpu)
{
double cpuspeed = ( mhz > 1000 ) ? mhz / 1000 : mhz;
const char *cpuspeedstr = ( mhz > 1000 ) ? "GHz" : "MHz";

2
src/common/util.h
View File

@@ -31,7 +31,7 @@ int buf_get_line (char *, char **, int *, int len);
char *nocasestrstr (const char *text, const char *tofind);
char *country (char *);
void country_search (char *pattern, void *ud, void (*print)(void *, char *, ...));
char *get_cpu_str (void);
char *get_sys_str (int with_cpu);
int util_exec (const char *cmd);
int util_execv (char * const argv[]);
#define STRIP_COLOR 1