XQF/xqf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update status bar for redial

Browse Source 
git-svn-id: http://svn.code.sf.net/p/xqf/code/trunk@198 d2ac09be-c843-0410-8b1f-f8a84130e0ec
This commit is contained in:
Alex Burger 2002-10-01 14:28:52 +00:00 committed by alex_b
parent 7a5a664958
commit ea5533fff0
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xqf/ChangeLog
View File

@ -1,3 +1,6 @@
Oct 01, 2002: Alex Burger <alex@fragit_dot_net>
- Update status bar for redial
Oct 01, 2002: Ludwig Nussel <l-n@users.sourceforge.net> Oct 01, 2002: Ludwig Nussel <l-n@users.sourceforge.net>
- fix segfault because of format error and some cast warnings - fix segfault because of format error and some cast warnings
- use q3 parse and launch functions for SOF2 - use q3 parse and launch functions for SOF2

27
xqf/src/xqf.c
View File

@ -816,7 +816,10 @@ static void stat_lists_close_handler (struct stat_job *job, int killed) {
server_clist_build_filtered (cur_server_list, TRUE); server_clist_build_filtered (cur_server_list, TRUE);
} }
print_status (main_status_bar, _("Done.")); if(redialserver == 1)
print_status (main_status_bar, _("Waiting to redial server..."));
else
print_status (main_status_bar, _("Done."));
progress_bar_reset (main_progress_bar); progress_bar_reset (main_progress_bar);
@ -931,6 +934,9 @@ static void launch_close_handler (struct stat_job *job, int killed) {
server_clist_refresh_server (s); server_clist_refresh_server (s);
print_status (main_status_bar, _("Waiting to redial server..."));
progress_bar_reset (main_progress_bar);
return; return;
} }
else else
@ -946,11 +952,14 @@ static gboolean launch_redial(struct condef *con)
struct server *s; struct server *s;
s = con->s; s = con->s;
if(!s) return FALSE; // may not happen if(!s || redialserver == 0 ) // !s may not happen
{
print_status (main_status_bar, _("Done."));
progress_bar_reset (main_progress_bar);
if (redialserver == 0)
return FALSE; // stop redialing, we're done return FALSE; // stop redialing, we're done
}
stat_one_server(s); stat_one_server(s);
debug (1, "launch redial server name: s->name:%s",s->name); debug (1, "launch redial server name: s->name:%s",s->name);
@ -960,7 +969,10 @@ static gboolean launch_redial(struct condef *con)
//if (s->curplayers == 99) //if (s->curplayers == 99)
{ {
// server not busy! // server not busy!
redialserver = 0;
print_status (main_status_bar, _("Done."));
progress_bar_reset (main_progress_bar);
launch_close_handler_part2(con); launch_close_handler_part2(con);
return FALSE; // stop redialing, we're done return FALSE; // stop redialing, we're done
} }
@ -985,7 +997,7 @@ static void launch_close_handler_part2(struct condef *con)
char *launchargv[4]; char *launchargv[4];
int pid; int pid;
redialserver = 0; // Cancel any redialing
s = con->s; s = con->s;
props = properties (s); props = properties (s);
@ -1725,6 +1737,9 @@ static void cancelredial_callback (GtkWidget *widget, gpointer data) {
return; return;
redialserver = 0; redialserver = 0;
print_status (main_status_bar, _("Done."));
progress_bar_reset (main_progress_bar);
} }