aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--NEWS9
-rw-r--r--libsylph/socks.c6
3 files changed, 18 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b81b8de..73d31510 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
-2010-12-07
+2010-12-08
* version 3.1.0beta4
+2010-12-08
+
+ * libsylph/socks.c: win32: fixed compilation error.
+
2010-12-07
* libsylph/prefs_account.[ch]
diff --git a/NEWS b/NEWS
index b725925f..d94b1488 100644
--- a/NEWS
+++ b/NEWS
@@ -4,9 +4,10 @@ Changes of Sylpheed
* New features
- * Win32: The automatic import of Windows Address Book (WAB) file.
- * Win32: Automatic update of program and plug-ins was implemented.
* SOCKS4/SOCKS5 proxy support was added (per-account option).
+ * Win32: The automatic import of Windows Address Book (WAB) file on
+ initial startup was added.
+ * Win32: Automatic update of program and plug-ins was implemented.
* Improvements
@@ -14,6 +15,10 @@ Changes of Sylpheed
* New plug-in APIs for sending messages were added.
* The option 'Always mark as read when a message is opened' was added.
This will bring back the previous behavior.
+ * Win32: The installer now allows users to choose plug-ins to be
+ installed.
+ * Win32: The installer now remembers the previous install settings
+ on update.
* Bugfixes
diff --git a/libsylph/socks.c b/libsylph/socks.c
index 8c550658..b4746a15 100644
--- a/libsylph/socks.c
+++ b/libsylph/socks.c
@@ -23,6 +23,12 @@
#include <glib.h>
+#ifdef G_OS_WIN32
+# include <winsock2.h>
+# include <ws2tcpip.h>
+#endif
+
+#include "socket.h"
#include "socks.h"
#include "utils.h"