modified version display.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@463 ee746299-78ed-0310-b773-934348b2243d

5 files changed, 37 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index c6413d2e..e92ca477 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-08-04
 
+	* src/about.c: modified version display.
+	* src/socket.c: added sock_init() and sock_cleanup().
+
+2005-08-04
+
 	* src/mh.c: use GTimer for measuring time.
 	* src/inc.[ch]
 	  src/recv.c
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 8a17186e..27f46fe1 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,10 @@
 2005-08-04
 
+	* src/about.c: バージョン表示を修正。
+	* src/socket.c: sock_init() と sock_cleanup() を追加。
+
+2005-08-04
+
 	* src/mh.c: 時間測定に GTimer を使用。
 	* src/inc.[ch]
 	  src/recv.c
diff --git a/src/about.c b/src/about.c
index 27d817c8..1bab06d7 100644
--- a/src/about.c
+++ b/src/about.c
@@ -111,15 +111,24 @@ static void about_create(void)
 #if HAVE_SYS_UTSNAME_H
 	uname(&utsbuf);
 	g_snprintf(buf, sizeof(buf),
-		   "GTK+ version %d.%d.%d\n"
+		   "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
 		   "Operating System: %s %s (%s)",
 		   gtk_major_version, gtk_minor_version, gtk_micro_version,
+		   glib_major_version, glib_minor_version, glib_micro_version,
 		   utsbuf.sysname, utsbuf.release, utsbuf.machine);
+#elif G_OS_WIN32
+	g_snprintf(buf, sizeof(buf),
+		   "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+		   "Operating System: %s",
+		   gtk_major_version, gtk_minor_version, gtk_micro_version,
+		   glib_major_version, glib_minor_version, glib_micro_version,
+		   "Win32");
 #else
 	g_snprintf(buf, sizeof(buf),
-		   "GTK+ version %d.%d.%d\n"
-		   "Operating System: Windoze",
-		   gtk_major_version, gtk_minor_version, gtk_micro_version);
+		   "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+		   "Operating System: unknown",
+		   gtk_major_version, gtk_minor_version, gtk_micro_version,
+		   glib_major_version, glib_minor_version, glib_micro_version);
 #endif
 
 	label = gtk_label_new(buf);
diff --git a/src/socket.c b/src/socket.c
index 8ac43493..499a46a4 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -146,6 +146,16 @@ static SockLookupData *sock_get_address_info_async
 static gint sock_get_address_info_async_cancel	(SockLookupData	*lookup_data);
 
 
+gint sock_init(void)
+{
+	return 0;
+}
+
+gint sock_cleanup(void)
+{
+	return 0;
+}
+
 gint sock_set_io_timeout(guint sec)
 {
 	io_timeout = sec;
diff --git a/src/socket.h b/src/socket.h
index 35447cbe..60ee30fc 100644
--- a/src/socket.h
+++ b/src/socket.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,6 +65,9 @@ struct _SockInfo
 	GIOCondition condition;
 };
 
+gint sock_init				(void);
+gint sock_cleanup			(void);
+
 gint sock_set_io_timeout		(guint sec);
 
 gint sock_set_nonblocking_mode		(SockInfo *sock, gboolean nonblock);