From fe1d958838cce03179870397f372e723881f2c89 Mon Sep 17 00:00:00 2001
From: Berke Viktor <bviktor@hexchat.org>
Date: Sun, 28 Oct 2012 00:05:40 +0200
Subject: [PATCH] More polishing for the About dialog

---
 src/common/ctcp.c     | 4 ++--
 src/common/outbound.c | 2 +-
 src/common/util.c     | 8 ++++----
 src/common/util.h     | 2 +-
 src/fe-gtk/about.c    | 4 ++--
 src/fe-text/fe-text.c | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/common/ctcp.c b/src/common/ctcp.c
index f950a901..bbe4e1e5 100644
--- a/src/common/ctcp.c
+++ b/src/common/ctcp.c
@@ -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);
 	}
diff --git a/src/common/outbound.c b/src/common/outbound.c
index ed97886e..a587d499 100644
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -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':
diff --git a/src/common/util.c b/src/common/util.c
index 8f76cfc6..dcd4021f 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -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";
diff --git a/src/common/util.h b/src/common/util.h
index d2e8e84e..b4185676 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -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
diff --git a/src/fe-gtk/about.c b/src/fe-gtk/about.c
index 020df8ce..c576e900 100644
--- a/src/fe-gtk/about.c
+++ b/src/fe-gtk/about.c
@@ -122,18 +122,18 @@ menu_about (GtkWidget * wid, gpointer sess)
 	g_get_charset (&locale);
 	(snprintf) (buf, sizeof (buf),
 				"<b>Version</b>: "PACKAGE_VERSION"\n"
-				"<b>OS</b>: %s\n"
 				"<b>Compiled</b>: "__DATE__"\n"
 #ifdef WIN32
 				"<b>Portable Mode</b>: %s\n"
 				"<b>Build Type</b>: x%d\n"
 #endif
+				"<b>OS</b>: %s\n"
 				"<b>Charset</b>: %s",
-				get_cpu_str (),
 #ifdef WIN32
 				(portable_mode () ? "Yes" : "No"),
 				get_cpu_arch (),
 #endif
+				get_sys_str (0),
 				locale);
 
 	label_info = gtk_label_new (NULL);
diff --git a/src/fe-text/fe-text.c b/src/fe-text/fe-text.c
index 0eb68dce..19749a65 100644
--- a/src/fe-text/fe-text.c
+++ b/src/fe-text/fe-text.c
@@ -96,7 +96,7 @@ fe_new_window (struct session *sess, int focus)
 				" \017HexChat-Text \00310"PACKAGE_VERSION"\n"
 				" \017Running on \00310%s \017glib \00310%d.%d.%d\n"
 				" \017This binary compiled \00310"__DATE__"\017\n",
-				get_cpu_str(),
+				get_sys_str (1),
 				glib_major_version, glib_minor_version, glib_micro_version);
 	fe_print_text (sess, buf, 0);