tFix for proper shutdown of graphical server - vaccinewars - be a doctor and try to vaccinate the world
HTML git clone git://src.adamsgaard.dk/vaccinewars
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit d24cffd2fc68fbbff1b5bb82700e108b4f9d3e81
DIR parent 19ae1233f9890b07e39fe9b5468a2e0a814967e7
HTML Author: Ben Webb <ben@salilab.org>
Date: Sun, 17 Jun 2001 21:16:23 +0000
Fix for proper shutdown of graphical server
Diffstat:
M src/dopewars.c | 2 +-
M src/serverside.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
DIR diff --git a/src/dopewars.c b/src/dopewars.c
t@@ -1751,7 +1751,7 @@ GString *GetLogString(GLogLevelFlags log_level,const gchar *message) {
#ifndef CYGWIN
-#ifdef NETWORKING
+#if NETWORKING && !GUI_SERVER
static void ServerLogMessage(const gchar *log_domain,GLogLevelFlags log_level,
const gchar *message,gpointer user_data) {
GString *text;
DIR diff --git a/src/serverside.c b/src/serverside.c
t@@ -614,6 +614,8 @@ void StartServer() {
struct sigaction sact;
#endif
+ InitNetworkBuffer(&MetaNetBuf,'\n','\r');
+
Scanner=g_scanner_new(&ScannerConfig);
Scanner->input_name="(stdin)";
CreatePidFile();
t@@ -807,8 +809,6 @@ void ServerLoop() {
gboolean EndOfLine,DoneOK,ReadingHeaders;
gchar *buf;
- InitNetworkBuffer(&MetaNetBuf,'\n','\r');
-
StartServer();
ReadingHeaders=TRUE;