tBetter metaserver status reporting - vaccinewars - be a doctor and try to vacc… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 852f447fc36effb14f4c6d0ecf6717adfb8f4927 | |
parent 641ceb86f1622dde5ede23c7b61461820464615a | |
Author: Ben Webb <[email protected]> | |
Date: Tue, 9 Oct 2001 22:00:34 +0000 | |
Better metaserver status reporting | |
Diffstat: | |
M src/gtk_client.c | 12 +++++++++--- | |
1 file changed, 9 insertions(+), 3 deletions(-) | |
--- | |
diff --git a/src/gtk_client.c b/src/gtk_client.c | |
t@@ -1934,7 +1934,8 @@ static gboolean GetStartGamePlayerName(struct StartGameS… | |
#ifdef NETWORKING | |
static void SetStartGameStatus(struct StartGameStruct *widgets,gchar *msg) { | |
- gtk_label_set_text(GTK_LABEL(widgets->status),msg); | |
+ gtk_label_set_text(GTK_LABEL(widgets->status), | |
+ msg ? msg : _("Status: Waiting for user input")); | |
} | |
static void ConnectError(struct StartGameStruct *widgets,gboolean meta) { | |
t@@ -2075,7 +2076,11 @@ static void HandleMetaSock(gpointer data,gint socket, | |
_("Status: Obtaining server information from metaserver")); | |
} | |
if (!DoneOK && HandleHttpCompletion(widgets->MetaConn)) { | |
- ConnectError(widgets,TRUE); | |
+ if (IsHttpError(widgets->MetaConn)) { | |
+ ConnectError(widgets,TRUE); | |
+ } else { | |
+ SetStartGameStatus(widgets,NULL); | |
+ } | |
CloseHttpConnection(widgets->MetaConn); | |
widgets->MetaConn=NULL; | |
FillMetaServerList(widgets,TRUE); | |
t@@ -2353,7 +2358,7 @@ void NewGameDialog(void) { | |
gtk_box_pack_start(GTK_BOX(vbox),notebook,TRUE,TRUE,0); | |
/* Caption of status label in New Game dialog before anything has happened */ | |
- label=widgets.status=gtk_label_new(_("Status: Waiting for user input")); | |
+ label=widgets.status=gtk_label_new(""); | |
gtk_box_pack_start(GTK_BOX(vbox),label,FALSE,FALSE,0); | |
gtk_container_add(GTK_CONTAINER(widgets.dialog),vbox); | |
t@@ -2367,6 +2372,7 @@ void NewGameDialog(void) { | |
} | |
#endif | |
+ SetStartGameStatus(&widgets,NULL); | |
gtk_widget_show_all(widgets.dialog); | |
gtk_notebook_set_page(GTK_NOTEBOOK(notebook),NewGameType); | |
} |