gzlauncher-cvs

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30524

Modified Files:
	queryServ.c 
Log Message:
Code cleanup


Index: queryServ.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/queryServ.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** queryServ.c	14 Jul 2004 14:16:39 -0000	1.2
--- queryServ.c	15 Jul 2004 02:10:33 -0000	1.3
***************
*** 141,254 ****
  	clear_data(msock);
  	gettimeofday(&start, NULL);
! 	if(recv_data(msock) > 0)
  	{
- 		gettimeofday(&end, NULL);
- 		res = read_int(msock);
- 		if(res != SERVER_CHALLENGE)
- 			puts("Server said something we do not understand!\n");
  		tmp = read_string(msock);
  		if(tmp)
! 			strncpy(current->name, tmp, sizeof(current->name));
! 		current->ping = ping_time(&start, &end);
! 		current->numPlayers = read_byte(msock);
! 		current->maxPlayers = read_byte(msock);
  		tmp = read_string(msock);
  		if(tmp)
! 			strncpy(current->mapName, tmp, sizeof(current->mapName));
! 		current->numWadFiles = read_byte(msock);
! 		for(i = 0; i < current->numWadFiles; i++)
  		{
! 			tmp = read_string(msock);
! 			if(tmp)
! 				strcpy(current->pwadName[i], tmp);
  		}
! 		current->gameType = read_byte(msock);
! 		tmp = read_string(msock);
! 		if(tmp)
! 			strcpy(current->game, tmp);
! 		tmp = read_string(msock);
! 		if(tmp)
! 			strcpy(current->iWad, tmp);
! 		current->skillLevel = read_byte(msock);
! 		tmp = read_string(msock);
! 		if(tmp)
! 			strcpy(current->url, tmp);
! 		tmp = read_string(msock);
! 		if(tmp)
! 			strcpy(current->email, tmp);
! 		current->dmflags = read_int(msock);
! 		current->dmflags2 = read_int(msock);
! 		read_byte(msock);
! 		current->players = NULL;
  		for(i = 0; i < current->numPlayers; i++)
  		{
! 			new_pl = malloc(sizeof(struct player));
! 			tmp = read_string(msock);
! 			if(tmp)
! 				strcpy(new_pl->name, tmp);
! 			new_pl->frags = read_short(msock);
! 			new_pl->ping = read_short(msock);
! 			new_pl->level = read_byte(msock);
! 			new_pl->time = read_short(msock);
! 			new_pl->team = -1; // Set this just in case we dont get it from server.
! 			new_pl->next = NULL;
! 			if(current->players == NULL)
! 			{
! 				current->players = new_pl;
! 				current_pl = current->players;
! 			}
! 			else
  			{
! 				current_pl->next = new_pl;
  				current_pl = current_pl->next;
- 				current_pl->next = NULL;
- 				new_pl = current_pl->next;
  			}
  		}
- 		current->version = read_short(msock);
  		if(read_int(msock) == 0x01020304)
  		{
! 			current->password = read_byte(msock);
! 			current->numPlaying = read_byte(msock);
! 			current->maxJoin = read_byte(msock);
! 			current->timeLimit = read_short(msock);
! 			current->timeLeft = read_short(msock);
! 			current->fragLimit = read_short(msock);
! 			current_pl = current->players;
! 			for(i = 0; i < current->numPlayers; i++)
! 			{
! 				if(current_pl != NULL)
! 				{
! 					current_pl->bot = read_byte(msock);
! 					current_pl->spectator = read_byte(msock);
! 					current_pl->team = read_byte(msock);
! 					if(current->gameType != 1 && current->gameType != 3)
! 						current_pl->team = -1;
! 					current_pl = current_pl->next;
! 				}
! 				else
! 					break;
! 			}
! 			current->maxTeams = read_byte(msock);
! 			current->teamScoreLimit = read_short(msock);
! 			current->teamDamage = read_float(msock);
! 			current->redScore = read_short(msock);
! 			current->blueScore = read_short(msock);
! 			current->greenScore = read_short(msock);
! 			current->goldScore = read_short(msock);
! 			for(i = 0; i < current->numWadFiles; i++)
! 			{
! 				current->pwadOptional[i] = read_byte(msock);
! 			}
  			if(read_int(msock) == 0x01020304)
  			{
! 				tmp = read_string(msock);
! 				if(tmp)
! 					strcpy(current->serverInfo, tmp);
! 				if(read_int(msock) == 0x01020304)
! 				{
! 					current->gravityValue = read_float(msock);
! 					current->airControl = read_float(msock);
! 				}
  			}
  		}
--- 141,253 ----
  	clear_data(msock);
  	gettimeofday(&start, NULL);
! 	if(recv_data(msock) <= 0)
! 		return -1;
! 	gettimeofday(&end, NULL);
! 	res = read_int(msock);
! 	if(res != SERVER_CHALLENGE)
! 		puts("Server said something we do not understand!\n");
! 	tmp = read_string(msock);
! 	if(tmp)
! 		strncpy(current->name, tmp, sizeof(current->name));
! 	current->ping = ping_time(&start, &end);
! 	current->numPlayers = read_byte(msock);
! 	current->maxPlayers = read_byte(msock);
! 	tmp = read_string(msock);
! 	if(tmp)
! 		strncpy(current->mapName, tmp, sizeof(current->mapName));
! 	current->numWadFiles = read_byte(msock);
! 	for(i = 0; i < current->numWadFiles; i++)
  	{
  		tmp = read_string(msock);
  		if(tmp)
! 			strcpy(current->pwadName[i], tmp);
! 	}
! 	current->gameType = read_byte(msock);
! 	tmp = read_string(msock);
! 	if(tmp)
! 		strcpy(current->game, tmp);
! 	tmp = read_string(msock);
! 	if(tmp)
! 		strcpy(current->iWad, tmp);
! 	current->skillLevel = read_byte(msock);
! 	tmp = read_string(msock);
! 	if(tmp)
! 		strcpy(current->url, tmp);
! 	tmp = read_string(msock);
! 	if(tmp)
! 		strcpy(current->email, tmp);
! 	current->dmflags = read_int(msock);
! 	current->dmflags2 = read_int(msock);
! 	read_byte(msock);
! 	current->players = NULL;
! 	for(i = 0; i < current->numPlayers; i++)
! 	{
! 		new_pl = malloc(sizeof(struct player));
  		tmp = read_string(msock);
  		if(tmp)
! 			strcpy(new_pl->name, tmp);
! 		new_pl->frags = read_short(msock);
! 		new_pl->ping = read_short(msock);
! 		new_pl->level = read_byte(msock);
! 		new_pl->time = read_short(msock);
! 		new_pl->team = -1; // Set this just in case we dont get it from server.
! 		new_pl->next = NULL;
! 		if(current->players == NULL)
  		{
! 			current->players = new_pl;
! 			current_pl = current->players;
  		}
! 		else
! 		{
! 			current_pl->next = new_pl;
! 			current_pl = current_pl->next;
! 			current_pl->next = NULL;
! 			new_pl = current_pl->next;
! 		}
! 	}
! 	current->version = read_short(msock);
! 	if(read_int(msock) == 0x01020304)
! 	{
! 		current->password = read_byte(msock);
! 		current->numPlaying = read_byte(msock);
! 		current->maxJoin = read_byte(msock);
! 		current->timeLimit = read_short(msock);
! 		current->timeLeft = read_short(msock);
! 		current->fragLimit = read_short(msock);
! 		current_pl = current->players;
  		for(i = 0; i < current->numPlayers; i++)
  		{
! 			if(current_pl != NULL)
  			{
! 				current_pl->bot = read_byte(msock);
! 				current_pl->spectator = read_byte(msock);
! 				current_pl->team = read_byte(msock);
! 				if(current->gameType != 1 && current->gameType != 3)
! 					current_pl->team = -1;
  				current_pl = current_pl->next;
  			}
+ 			else
+ 				break;
+ 		}
+ 		current->maxTeams = read_byte(msock);
+ 		current->teamScoreLimit = read_short(msock);
+ 		current->teamDamage = read_float(msock);
+ 		current->redScore = read_short(msock);
+ 		current->blueScore = read_short(msock);
+ 		current->greenScore = read_short(msock);
+ 		current->goldScore = read_short(msock);
+ 		for(i = 0; i < current->numWadFiles; i++)
+ 		{
+ 			current->pwadOptional[i] = read_byte(msock);
  		}
  		if(read_int(msock) == 0x01020304)
  		{
! 			tmp = read_string(msock);
! 			if(tmp)
! 				strcpy(current->serverInfo, tmp);
  			if(read_int(msock) == 0x01020304)
  			{
! 				current->gravityValue = read_float(msock);
! 				current->airControl = read_float(msock);
  			}
  		}
***************
*** 274,285 ****
  		return -1;
  	clear_data(msock);
! 	if(recv_data(msock) > 0)
! 	{
  		res = read_int(msock);
- 		if(res == MASTER_ERROR)
- 			res = read_int(msock);
- 	}
- 	else
- 		res = -1;
  	close_usock(msock);
  	return res;
--- 273,281 ----
  		return -1;
  	clear_data(msock);
! 	if(recv_data(msock) <= 0)
! 		return -1;
! 	res = read_int(msock);
! 	if(res == MASTER_ERROR)
  		res = read_int(msock);
  	close_usock(msock);
  	return res;
***************
*** 293,323 ****
  	struct usock *msock;
  
! 	if(msock = create_usock())
  	{
! 		if(!set_remote(msock, "zdaemon.ath.cx", 15300))
! 		{
! 			clear_data(msock);
! 			write_int(msock, PLAYER_LIST);
! 			if(!send_data(msock))
! 			{
! 				clear_data(msock);
! 				if(recv_data(msock) > 0)
! 				{
! 					res = read_int(msock);
! 					if(res == RET_PLAYER_LIST)
! 					{
! 						numPlayers = read_short(msock);
! 						for(i = 0; i < numPlayers; i++)
! 						{
! 							players[i] = read_string(msock);
! 						}
! 					}
! 					return numPlayers;
! 				}
! 			}
! 		}
! 		close_usock(msock);
  	}
! 	return -1;
  }
  
--- 289,313 ----
  	struct usock *msock;
  
! 	if(!(msock = create_usock()))
! 		return -1;
! 	if(set_remote(msock, "zdaemon.ath.cx", 15300))
! 		return -1;
! 	clear_data(msock);
! 	write_int(msock, PLAYER_LIST);
! 	if(send_data(msock))
! 		return -1;
! 	clear_data(msock);
! 	if(recv_data(msock) <= 0)
! 		return -1;
! 	res = read_int(msock);
! 	if(res != RET_PLAYER_LIST)
! 		return -1;
! 	numPlayers = read_short(msock);
! 	for(i = 0; i < numPlayers; i++)
  	{
! 		players[i] = read_string(msock);
  	}
! 	close_usock(msock);
! 	return numPlayers;
  }
  
***************
*** 379,402 ****
  	struct usock *msock;
  
! 	if(msock = create_usock())
! 	{
! 		if(!set_remote(msock, "zdaemon.ath.cx", 15300))
! 		{
! 			clear_data(msock);
! 			write_int(msock, UPDATE_PROFILE);
! 			write_string(msock, extraInfo);
! 			if(!send_data(msock))
! 			{
! 				clear_data(msock);
! 				if(recv_data(msock) > 0)
! 				{
! 					res = read_int(msock);
! 					if(res == ACCEPT_UPDATE_PROFILE)
! 						return 0;
! 				}
! 			}
! 		}
! 		close_usock(msock);
! 	}
! 	return -1;
  }
--- 369,387 ----
  	struct usock *msock;
  
! 	if(!(msock = create_usock()))
! 		return -1;
! 	if(set_remote(msock, "zdaemon.ath.cx", 15300))
! 	clear_data(msock);
! 	write_int(msock, UPDATE_PROFILE);
! 	write_string(msock, extraInfo);
! 	if(send_data(msock))
! 		return -1;
! 	clear_data(msock);
! 	if(recv_data(msock) <= 0)
! 		return -1;
! 	res = read_int(msock);
! 	if(res != ACCEPT_UPDATE_PROFILE)
! 		return -1;
! 	close_usock(msock);
! 	return 0;
  }

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27482/src

Modified Files:
	callbacks.c 
Log Message:
Remove unused variables and small code cleanup


Index: callbacks.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/callbacks.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** callbacks.c	13 Jul 2004 14:38:09 -0000	1.2
--- callbacks.c	15 Jul 2004 05:59:18 -0000	1.3
***************
*** 613,617 ****
  	char tmp[64];
  	char keyword[64];
- 	char command[128];
  	int argi = 0;
  	int i, status;
--- 613,616 ----
***************
*** 808,812 ****
  	GtkTreeModel *model;
  	GtkTreeIter iter;
- 	GtkTreeStore *store;
  	GtkTextBuffer *extraBuffer;
  	gchar *name;
--- 807,810 ----
***************
*** 882,888 ****
  	extraInfo = gtk_text_buffer_get_text(extraBuffer, &start, &end, FALSE);
  	if(!update_profile(extraInfo))
- 	{
  		display_success("Profile updated successfully.");
- 	}
  	else
  		display_error("Error updating profile. Please try again");
--- 880,884 ----

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5028

Modified Files:
	callbacks.c 
Log Message:
Fix call to set_statusbar_msg()


Index: callbacks.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/callbacks.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** callbacks.c	16 Jul 2004 19:43:41 -0000	1.4
--- callbacks.c	16 Jul 2004 21:18:41 -0000	1.5
***************
*** 446,450 ****
  				}
  				sprintf(statusText, "%d/%d Servers Queried", numQueried, numServers);
! 				set_statusbar_msg(GTK_WIDGET(button), &statusText);
  				gtk_tree_view_set_model(GTK_TREE_VIEW(slistTreeView), GTK_TREE_MODEL(store));
  				g_object_unref(store);
--- 446,450 ----
  				}
  				sprintf(statusText, "%d/%d Servers Queried", numQueried, numServers);
! 				set_statusbar_msg(GTK_WIDGET(button), statusText);
  				gtk_tree_view_set_model(GTK_TREE_VIEW(slistTreeView), GTK_TREE_MODEL(store));
  				g_object_unref(store);

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9593

Modified Files:
	callbacks.c 
Log Message:
GUI updated during master query allowing you to see the servers add to
the list as well as being able to scroll the list during query.


Index: callbacks.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/callbacks.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** callbacks.c	16 Jul 2004 21:18:41 -0000	1.5
--- callbacks.c	16 Jul 2004 21:50:36 -0000	1.6
***************
*** 405,409 ****
  			g_object_unref(store);
  		}
! 		free(addr);
  	}
  
--- 405,410 ----
  			g_object_unref(store);
  		}
! 		if(addr)
! 			free(addr);
  	}
  
***************
*** 433,436 ****
--- 434,438 ----
  				store = gtk_list_store_new(NUM_SL, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING,
  								G_TYPE_STRING, G_TYPE_STRING);
+ 				gtk_tree_view_set_model(GTK_TREE_VIEW(slistTreeView), GTK_TREE_MODEL(store));
  				current = serv;
  				int i = 0;
***************
*** 444,451 ****
  					}
  					current = current->next;
  				}
  				sprintf(statusText, "%d/%d Servers Queried", numQueried, numServers);
  				set_statusbar_msg(GTK_WIDGET(button), statusText);
- 				gtk_tree_view_set_model(GTK_TREE_VIEW(slistTreeView), GTK_TREE_MODEL(store));
  				g_object_unref(store);
  			}
--- 446,454 ----
  					}
  					current = current->next;
+ 					while(gtk_events_pending())
+ 						gtk_main_iteration();
  				}
  				sprintf(statusText, "%d/%d Servers Queried", numQueried, numServers);
  				set_statusbar_msg(GTK_WIDGET(button), statusText);
  				g_object_unref(store);
  			}

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20371

Modified Files:
	callbacks.c 
Log Message:
Fix random crash when updating server info (hopefully)


Index: callbacks.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/callbacks.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** callbacks.c	16 Jul 2004 22:35:37 -0000	1.7
--- callbacks.c	16 Jul 2004 22:48:18 -0000	1.8
***************
*** 379,384 ****
  	GtkTreeIter iter;
  	GtkListStore *store;
! 	gchar *port;
! 	char *addr;
  	struct server *current;
  	struct player *pl_current;
--- 379,384 ----
  	GtkTreeIter iter;
  	GtkListStore *store;
! 	gchar *port = NULL;
! 	char *addr = NULL;
  	struct server *current;
  	struct player *pl_current;
***************
*** 387,392 ****
  	{
  		gtk_tree_model_get(model, &iter, SL_ADDR, &port, -1);
! 		addr = (char *)strsep(&port, ":");
! 		if(serv)
  		{
  			current = serv;
--- 387,393 ----
  	{
  		gtk_tree_model_get(model, &iter, SL_ADDR, &port, -1);
! 		if(port)
! 			addr = (char *)strsep(&port, ":");
! 		if(serv && addr && port)
  		{
  			current = serv;

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16680

Modified Files:
	callbacks.c 
Log Message:
Display "Querying Servers" message on statusbar while querying


Index: callbacks.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/callbacks.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** callbacks.c	17 Jul 2004 01:48:45 -0000	1.9
--- callbacks.c	17 Jul 2004 01:59:35 -0000	1.10
***************
*** 439,442 ****
--- 439,443 ----
  			{
  				gtk_widget_show(progressbar);
+ 				set_statusbar_msg(GTK_WIDGET(button), "Querying Servers...");
  				store = gtk_list_store_new(NUM_SL, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING,
  								G_TYPE_STRING, G_TYPE_STRING);

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25146

Modified Files:
	callbacks.c 
Log Message:
Fix random crash when updating server info (got it this time)


Index: callbacks.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/callbacks.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** callbacks.c	17 Jul 2004 01:59:35 -0000	1.10
--- callbacks.c	18 Jul 2004 21:09:03 -0000	1.11
***************
*** 789,798 ****
  			res = query_server(msock, current);
  			if(!res && current->ip)
  				sprintf(newAddr, "%s:%d", current->ip, current->port);
! 			sprintf(players, "%2d/%2d", current->numPlayers, current->maxPlayers);
! 			gameType = get_gametype(current->gameType);
! 			gtk_list_store_set(GTK_LIST_STORE(model), &iter, SL_NAME, current->name, SL_ADDR, newAddr, SL_PLRS, players,
! 				SL_PING, current->ping, SL_MAP, current->mapName, SL_WAD, current->pwadName[0], SL_TYPE, gameType, -1);
! 			on_slTreeViewSelection_changed(selection, slistTreeView);
  			close_usock(msock);
  		}
--- 789,801 ----
  			res = query_server(msock, current);
  			if(!res && current->ip)
+ 			{
  				sprintf(newAddr, "%s:%d", current->ip, current->port);
! 				sprintf(players, "%2d/%2d", current->numPlayers, current->maxPlayers);
! 				gameType = get_gametype(current->gameType);
! 				gtk_list_store_set(GTK_LIST_STORE(model), &iter, SL_NAME, current->name, SL_ADDR, newAddr, SL_PLRS, players,
! 					SL_PING, current->ping, SL_MAP, current->mapName, SL_WAD, current->pwadName[0], SL_TYPE, 
! 					gameType, -1);
! 				on_slTreeViewSelection_changed(selection, slistTreeView);
! 			}
  			close_usock(msock);
  		}

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28552

Modified Files:
	callbacks.c 
Log Message:
Remove idiotic comparisons


Index: callbacks.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/callbacks.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** callbacks.c	18 Jul 2004 21:20:48 -0000	1.13
--- callbacks.c	18 Jul 2004 21:25:40 -0000	1.14
***************
*** 429,469 ****
  	if(msock = create_usock())
  	{
! 		if(msock > 0)
  		{
! 			if(!serv)
! 				serv = malloc(sizeof(struct server));
! 			serv = query_master(msock);
! 			if(serv)
  			{
! 				gtk_widget_show(progressbar);
! 				set_statusbar_msg(GTK_WIDGET(button), "Querying Servers...");
! 				store = gtk_list_store_new(NUM_SL, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING,
! 								G_TYPE_STRING, G_TYPE_STRING);
! 				gtk_tree_view_set_model(GTK_TREE_VIEW(slistTreeView), GTK_TREE_MODEL(store));
! 				current = serv;
! 				while(current != NULL)
  				{
! 					res = query_server(msock, current);
! 					if(!res && (current->numPlayers <= current->maxPlayers))
! 					{
! 						store = GTK_LIST_STORE(slistTreeView_append(store, current));
! 						numQueried++;
! 					}
! 					else
! 						numSkipped++;
! 					current = current->next;
! 					completed = (((double)numQueried + (double)numSkipped) / (double)numServers);
! 					gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar), completed);
! 					while(gtk_events_pending())
! 						gtk_main_iteration();
  				}
! 				gtk_widget_hide(progressbar);
! 				sprintf(statusText, "%d/%d Servers Queried", numQueried, numServers);
! 				set_statusbar_msg(GTK_WIDGET(button), statusText);
! 				g_object_unref(store);
  			}
  		}
- 		close_usock(msock);
  	}
  }
  
--- 429,466 ----
  	if(msock = create_usock())
  	{
! 		if(!serv)
! 			serv = malloc(sizeof(struct server));
! 		serv = query_master(msock);
! 		if(serv)
  		{
! 			gtk_widget_show(progressbar);
! 			set_statusbar_msg(GTK_WIDGET(button), "Querying Servers...");
! 			store = gtk_list_store_new(NUM_SL, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_STRING,
! 							G_TYPE_STRING, G_TYPE_STRING);
! 			gtk_tree_view_set_model(GTK_TREE_VIEW(slistTreeView), GTK_TREE_MODEL(store));
! 			current = serv;
! 			while(current != NULL)
  			{
! 				res = query_server(msock, current);
! 				if(!res && (current->numPlayers <= current->maxPlayers))
  				{
! 					store = GTK_LIST_STORE(slistTreeView_append(store, current));
! 					numQueried++;
  				}
! 				else
! 					numSkipped++;
! 				current = current->next;
! 				completed = (((double)numQueried + (double)numSkipped) / (double)numServers);
! 				gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar), completed);
! 				while(gtk_events_pending())
! 					gtk_main_iteration();
  			}
+ 			gtk_widget_hide(progressbar);
+ 			sprintf(statusText, "%d/%d Servers Queried", numQueried, numServers);
+ 			set_statusbar_msg(GTK_WIDGET(button), statusText);
+ 			g_object_unref(store);
  		}
  	}
+ 	close_usock(msock);
  }
  
***************
*** 774,778 ****
  	struct usock *msock;
  
! 	if((msock = create_usock()) > 0)
  	{
  		selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(slistTreeView));
--- 771,775 ----
  	struct usock *msock;
  
! 	if((msock = create_usock()))
  	{
  		selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(slistTreeView));

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9709

Modified Files:
	callbacks.c 
Log Message:
Display servers that timeout so the can be requeried


Index: callbacks.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/callbacks.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** callbacks.c	18 Jul 2004 21:25:40 -0000	1.14
--- callbacks.c	20 Jul 2004 06:55:58 -0000	1.15
***************
*** 443,451 ****
  			{
  				res = query_server(msock, current);
! 				if(!res && (current->numPlayers <= current->maxPlayers))
  				{
  					store = GTK_LIST_STORE(slistTreeView_append(store, current));
- 					numQueried++;
  				}
  				else
  					numSkipped++;
--- 443,452 ----
  			{
  				res = query_server(msock, current);
! 				if(current->numPlayers <= current->maxPlayers)
  				{
  					store = GTK_LIST_STORE(slistTreeView_append(store, current));
  				}
+ 				if(!res)
+ 					numQueried++;
  				else
  					numSkipped++;

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27111

Modified Files:
	callbacks.c 
Log Message:
Cleanup save config function.


Index: callbacks.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/callbacks.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** callbacks.c	20 Jul 2004 06:55:58 -0000	1.15
--- callbacks.c	29 Jul 2004 04:15:38 -0000	1.16
***************
*** 1036,1040 ****
  	char dir_name[64];
  	char config[64];
- 	char tmp[64];
  	FILE *fp;
  	DIR *dp;
--- 1036,1039 ----
***************
*** 1059,1068 ****
  	wadsDir = gtk_editable_get_chars(GTK_EDITABLE(wadsEntry), 0, -1);
  	extraParams = gtk_editable_get_chars(GTK_EDITABLE(paramsEntry), 0, -1);
! 	sprintf(tmp, "# ExecDir %s\n", execDir);
! 	fputs(tmp, fp);
! 	sprintf(tmp, "# WadDir %s\n", wadsDir);
! 	fputs(tmp, fp);
! 	sprintf(tmp, "# ExtraParams %s\n", extraParams);
! 	fputs(tmp, fp);
  	free(execDir);
  	free(wadsDir);
--- 1058,1064 ----
  	wadsDir = gtk_editable_get_chars(GTK_EDITABLE(wadsEntry), 0, -1);
  	extraParams = gtk_editable_get_chars(GTK_EDITABLE(paramsEntry), 0, -1);
! 	fprintf(fp, "# ExecDir %s\n", execDir);
! 	fprintf(fp, "# WadDir %s\n", wadsDir);
! 	fprintf(fp, "# ExtraParams %s\n", extraParams);
  	free(execDir);
  	free(wadsDir);

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32398

Modified Files:
	callbacks.c 
Log Message:
Fix small typo.


Index: callbacks.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/callbacks.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** callbacks.c	30 Jul 2004 04:58:15 -0000	1.17
--- callbacks.c	30 Jul 2004 05:02:10 -0000	1.18
***************
*** 443,447 ****
  			{
  				res = query_server(msock, current);
! 				if((current->numPlayers <= current->maxPlayers) && (current->numPlayers < MAX_PLRS))
  				{
  					store = GTK_LIST_STORE(slistTreeView_append(store, current));
--- 443,447 ----
  			{
  				res = query_server(msock, current);
! 				if((current->numPlayers <= current->maxPlayers) && (current->numPlayers <= MAX_PLRS))
  				{
  					store = GTK_LIST_STORE(slistTreeView_append(store, current));

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13570

Modified Files:
	callbacks.c 
Log Message:
Remove unused variable.


Index: callbacks.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/callbacks.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** callbacks.c	30 Jul 2004 05:02:10 -0000	1.18
--- callbacks.c	30 Jul 2004 16:53:46 -0000	1.19
***************
*** 636,640 ****
  	int i, status;
  	struct server *current;
- 	struct stat buf;
  
  	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(slistTreeView));
--- 636,639 ----

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15565

Modified Files:
	avatar.c 
Log Message:
Just makes more sence.


Index: avatar.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/avatar.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** avatar.c	13 Jul 2004 00:15:28 -0000	1.1.1.1
--- avatar.c	30 Jul 2004 17:04:55 -0000	1.2
***************
*** 54,64 ****
  	CURLcode res;
  	char addr[64];
! 	static int firstTime = 0;
  	struct imgFile imgfile = { "/tmp/image.jpg", NULL };
  
! 	if(!firstTime)
  	{
  		curl_global_init(CURL_GLOBAL_DEFAULT);
! 		firstTime = 1;
  	}
  	curl = curl_easy_init();
--- 54,64 ----
  	CURLcode res;
  	char addr[64];
! 	static int firstTime = 1;
  	struct imgFile imgfile = { "/tmp/image.jpg", NULL };
  
! 	if(firstTime)
  	{
  		curl_global_init(CURL_GLOBAL_DEFAULT);
! 		firstTime = 0;
  	}
  	curl = curl_easy_init();

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11636

Modified Files:
	utils.c 
Log Message:
Have you ever seen a capital period? Neither have I.


Index: utils.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/utils.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** utils.c	30 Jul 2004 22:02:22 -0000	1.4
--- utils.c	31 Jul 2004 07:59:46 -0000	1.5
***************
*** 160,164 ****
  		if((dp = readdir(dir)) != NULL)
  		{
! 			if(!(strcasecmp(dp->d_name, ".")) || !(strcasecmp(dp->d_name, "..")))
  				continue;
  			if(!(strcasecmp(dp->d_name, filename)))
--- 160,164 ----
  		if((dp = readdir(dir)) != NULL)
  		{
! 			if(!(strcmp(dp->d_name, ".")) || !(strcmp(dp->d_name, "..")))
  				continue;
  			if(!(strcasecmp(dp->d_name, filename)))

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22654

Modified Files:
	callbacks.c 
Log Message:
Implemented sorting on the server list (all columns can be sorted.)


Index: callbacks.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/callbacks.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** callbacks.c	30 Jul 2004 16:53:46 -0000	1.19
--- callbacks.c	9 Aug 2004 09:09:39 -0000	1.20
***************
*** 259,262 ****
--- 259,263 ----
  		gtk_tree_view_column_set_resizable(col, 1);
  		gtk_tree_view_column_set_min_width(col, colSize[i]);
+ 		gtk_tree_view_column_set_sort_column_id(col, i);
  	}
  	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
***************
*** 293,297 ****
  	gtk_tree_view_set_model(GTK_TREE_VIEW(widget), model);
  	g_object_unref(model);
- 	gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(widget), 1);
  	for(i = 0; i < 4; i++)
  	{
--- 294,297 ----
***************
*** 321,325 ****
  	gtk_tree_view_set_model(GTK_TREE_VIEW(widget), model);
  	g_object_unref(model);
- 	gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(widget), i);
  	for(i = 0; i < 2; i++)
  	{
--- 321,324 ----
***************
*** 823,827 ****
  	renderer = gtk_cell_renderer_text_new();
  	gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(widget), -1, "Name", renderer, "text", PS_NAME, NULL);
- 	gtk_tree_view_set_headers_clickable(GTK_TREE_VIEW(widget), 1);
  	col = gtk_tree_view_get_column(GTK_TREE_VIEW(widget), 0);
  	gtk_tree_view_column_set_resizable(col, 1);
--- 822,825 ----

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13912

Modified Files:
	queryServ.c 
Log Message:
Clean up queryServ.c a little.


Index: queryServ.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/queryServ.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** queryServ.c	18 Jul 2004 21:20:48 -0000	1.5
--- queryServ.c	16 Aug 2004 07:09:50 -0000	1.6
***************
*** 265,269 ****
--- 265,272 ----
  		return -1;
  	if(set_remote(msock, "zdaemon.ath.cx", 15300))
+ 	{
+ 		close_usock(msock);
  		return -1;
+ 	}
  	clear_data(msock);
  	write_int(msock, task);
***************
*** 272,279 ****
--- 275,288 ----
  	write_string(msock, password);
  	if(send_data(msock))
+ 	{
+ 		close_usock(msock);
  		return -1;
+ 	}
  	clear_data(msock);
  	if(recv_data(msock) <= 0)
+ 	{
+ 		close_usock(msock);
  		return -1;
+ 	}
  	res = read_int(msock);
  	if(res == MASTER_ERROR)
***************
*** 293,307 ****
--- 302,328 ----
  		return -1;
  	if(set_remote(msock, "zdaemon.ath.cx", 15300))
+ 	{
+ 		close_usock(msock);
  		return -1;
+ 	}
  	clear_data(msock);
  	write_int(msock, PLAYER_LIST);
  	if(send_data(msock))
+ 	{
+ 		close_usock(msock);
  		return -1;
+ 	}
  	clear_data(msock);
  	if(recv_data(msock) <= 0)
+ 	{
+ 		close_usock(msock);
  		return -1;
+ 	}
  	res = read_int(msock);
  	if(res != RET_PLAYER_LIST)
+ 	{
+ 		close_usock(msock);
  		return -1;
+ 	}
  	numPlayers = read_short(msock);
  	for(i = 0; i < numPlayers; i++)
***************
*** 320,366 ****
  	struct player_stats *pl_stats;
  
! 	if(msock = create_usock())
  	{
- 		if(!set_remote(msock, "zdaemon.ath.cx", 15300))
- 		{
- 			clear_data(msock);
- 			write_int(msock, PLAYER_INFO);
- 			write_string(msock, playerName);
- 			if(!send_data(msock))
- 			{
- 				clear_data(msock);
- 				if(recv_data(msock) > 0)
- 				{
- 					res = read_int(msock);
- 					if(res == RET_PLAYER_INFO)
- 					{
- 						pl_stats = malloc(sizeof(struct player_stats));
- 						tmp = read_string(msock);
- 						if(tmp)
- 							strcpy(pl_stats->name, tmp);
- 						tmp = read_string(msock);
- 						if(tmp)
- 							strcpy(pl_stats->extraInfo, tmp);
- 						pl_stats->rank = read_int(msock);
- 						pl_stats->highestRank = read_int(msock);
- 						pl_stats->level = read_int(msock);
- 						pl_stats->experience = read_int(msock);
- 						pl_stats->accountType = read_byte(msock);
- 						pl_stats->minLevel = read_int(msock);
- 						pl_stats->maxLevel = read_int(msock);
- 						pl_stats->avatarIndex = read_byte(msock);
- 						pl_stats->customIndex = read_int(msock);
- 					}
- 					else if(res == PLAYER_NOT_FOUND)
- 						return NULL;
- 					else
- 						return NULL;
- 				}
- 				return pl_stats;
- 			}
- 		}
  		close_usock(msock);
  	}
! 	return NULL;
  }
  
--- 341,392 ----
  	struct player_stats *pl_stats;
  
! 	if(!(msock = create_usock()))
! 		return NULL;
! 	if(set_remote(msock, "zdaemon.ath.cx", 15300))
  	{
  		close_usock(msock);
+ 		return NULL;
  	}
! 	clear_data(msock);
! 	write_int(msock, PLAYER_INFO);
! 	write_string(msock, playerName);
! 	if(send_data(msock))
! 	{
! 		close_usock(msock);
! 		return NULL;
! 	}
! 	clear_data(msock);
! 	if(recv_data(msock) <= 0)
! 	{
! 		close_usock(msock);
! 		return NULL;
! 	}
! 	res = read_int(msock);
! 	if(res == RET_PLAYER_INFO)
! 	{
! 		pl_stats = malloc(sizeof(struct player_stats));
! 		tmp = read_string(msock);
! 		if(tmp)
! 			strcpy(pl_stats->name, tmp);
! 		tmp = read_string(msock);
! 		if(tmp)
! 			strcpy(pl_stats->extraInfo, tmp);
! 		pl_stats->rank = read_int(msock);
! 		pl_stats->highestRank = read_int(msock);
! 		pl_stats->level = read_int(msock);
! 		pl_stats->experience = read_int(msock);
! 		pl_stats->accountType = read_byte(msock);
! 		pl_stats->minLevel = read_int(msock);
! 		pl_stats->maxLevel = read_int(msock);
! 		pl_stats->avatarIndex = read_byte(msock);
! 		pl_stats->customIndex = read_int(msock);
! 	}
! 	else
! 	{
! 		close_usock(msock);
! 		return NULL;
! 	}
! 	close_usock(msock);
! 	return pl_stats;
  }
  
***************
*** 373,387 ****
--- 399,426 ----
  		return -1;
  	if(set_remote(msock, "zdaemon.ath.cx", 15300))
+ 	{
+ 		close_usock(msock);
+ 		return -1;
+ 	}
  	clear_data(msock);
  	write_int(msock, UPDATE_PROFILE);
  	write_string(msock, extraInfo);
  	if(send_data(msock))
+ 	{
+ 		close_usock(msock);
  		return -1;
+ 	}
  	clear_data(msock);
  	if(recv_data(msock) <= 0)
+ 	{
+ 		close_usock(msock);
  		return -1;
+ 	}
  	res = read_int(msock);
  	if(res != ACCEPT_UPDATE_PROFILE)
+ 	{
+ 		close_usock(msock);
  		return -1;
+ 	}
  	close_usock(msock);
  	return 0;

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23603

Modified Files:
	callbacks.c 
Log Message:
Add message to statusbar when master cannot be reached.


Index: callbacks.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/callbacks.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** callbacks.c	15 Aug 2004 23:20:47 -0000	1.21
--- callbacks.c	11 Sep 2004 20:31:38 -0000	1.22
***************
*** 461,464 ****
--- 461,466 ----
  			g_object_unref(store);
  		}
+ 		else
+ 			set_statusbar_msg(GTK_WIDGET(button), "Master Unreachable");
  	}
  	close_usock(msock);

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10136/src

Modified Files:
	interface.c 
Log Message:
Added frd's icons.


Index: interface.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/interface.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** interface.c	17 Jul 2004 01:48:45 -0000	1.3
--- interface.c	20 Sep 2004 23:45:02 -0000	1.4
***************
*** 297,306 ****
    GtkWidget *hbox7;
    GtkWidget *launchButton;
!   GtkWidget *image1;
    GtkWidget *vseparator3;
    GtkWidget *qmasterButton;
!   GtkWidget *image2;
    GtkWidget *qServerButton;
!   GtkWidget *image3;
    GtkWidget *hbox28;
    GtkWidget *fixed11;
--- 297,306 ----
    GtkWidget *hbox7;
    GtkWidget *launchButton;
!   GtkWidget *image7;
    GtkWidget *vseparator3;
    GtkWidget *qmasterButton;
!   GtkWidget *image5;
    GtkWidget *qServerButton;
!   GtkWidget *image6;
    GtkWidget *hbox28;
    GtkWidget *fixed11;
***************
*** 448,461 ****
    gtk_widget_show (hbox7);
    gtk_box_pack_start (GTK_BOX (vbox7), hbox7, FALSE, TRUE, 0);
!   gtk_widget_set_size_request (hbox7, -1, 80);
  
    launchButton = gtk_button_new ();
    gtk_widget_show (launchButton);
    gtk_box_pack_start (GTK_BOX (hbox7), launchButton, FALSE, FALSE, 10);
!   gtk_widget_set_size_request (launchButton, 80, 80);
  
!   image1 = create_pixmap (mainWindow, "launch_icon.png");
!   gtk_widget_show (image1);
!   gtk_container_add (GTK_CONTAINER (launchButton), image1);
  
    vseparator3 = gtk_vseparator_new ();
--- 448,461 ----
    gtk_widget_show (hbox7);
    gtk_box_pack_start (GTK_BOX (vbox7), hbox7, FALSE, TRUE, 0);
!   gtk_widget_set_size_request (hbox7, -1, 56);
  
    launchButton = gtk_button_new ();
    gtk_widget_show (launchButton);
    gtk_box_pack_start (GTK_BOX (hbox7), launchButton, FALSE, FALSE, 10);
!   gtk_widget_set_size_request (launchButton, 90, -1);
  
!   image7 = create_pixmap (mainWindow, "1lg.bmp");
!   gtk_widget_show (image7);
!   gtk_container_add (GTK_CONTAINER (launchButton), image7);
  
    vseparator3 = gtk_vseparator_new ();
***************
*** 466,483 ****
    gtk_widget_show (qmasterButton);
    gtk_box_pack_start (GTK_BOX (hbox7), qmasterButton, FALSE, FALSE, 10);
!   gtk_widget_set_size_request (qmasterButton, 80, 80);
  
!   image2 = create_pixmap (mainWindow, "master_icon.png");
!   gtk_widget_show (image2);
!   gtk_container_add (GTK_CONTAINER (qmasterButton), image2);
  
    qServerButton = gtk_button_new ();
    gtk_widget_show (qServerButton);
    gtk_box_pack_start (GTK_BOX (hbox7), qServerButton, FALSE, FALSE, 10);
!   gtk_widget_set_size_request (qServerButton, 80, 80);
  
!   image3 = create_pixmap (mainWindow, "server_icon.png");
!   gtk_widget_show (image3);
!   gtk_container_add (GTK_CONTAINER (qServerButton), image3);
  
    hbox28 = gtk_hbox_new (FALSE, 0);
--- 466,483 ----
    gtk_widget_show (qmasterButton);
    gtk_box_pack_start (GTK_BOX (hbox7), qmasterButton, FALSE, FALSE, 10);
!   gtk_widget_set_size_request (qmasterButton, 90, -1);
  
!   image5 = create_pixmap (mainWindow, "1qm.bmp");
!   gtk_widget_show (image5);
!   gtk_container_add (GTK_CONTAINER (qmasterButton), image5);
  
    qServerButton = gtk_button_new ();
    gtk_widget_show (qServerButton);
    gtk_box_pack_start (GTK_BOX (hbox7), qServerButton, FALSE, FALSE, 10);
!   gtk_widget_set_size_request (qServerButton, 90, -1);
  
!   image6 = create_pixmap (mainWindow, "1rs.bmp");
!   gtk_widget_show (image6);
!   gtk_container_add (GTK_CONTAINER (qServerButton), image6);
  
    hbox28 = gtk_hbox_new (FALSE, 0);
***************
*** 501,505 ****
    progressbar1 = gtk_progress_bar_new ();
    gtk_widget_show (progressbar1);
!   gtk_box_pack_start (GTK_BOX (vbox37), progressbar1, FALSE, FALSE, 0);
  
    hseparator7 = gtk_hseparator_new ();
--- 501,506 ----
    progressbar1 = gtk_progress_bar_new ();
    gtk_widget_show (progressbar1);
!   gtk_fixed_put (GTK_FIXED (fixed10), progressbar1, 0, 32);
!   gtk_widget_set_size_request (progressbar1, 0, 0);
  
    hseparator7 = gtk_hseparator_new ();
***************
*** 953,962 ****
    GLADE_HOOKUP_OBJECT (mainWindow, hbox7, "hbox7");
    GLADE_HOOKUP_OBJECT (mainWindow, launchButton, "launchButton");
!   GLADE_HOOKUP_OBJECT (mainWindow, image1, "image1");
    GLADE_HOOKUP_OBJECT (mainWindow, vseparator3, "vseparator3");
    GLADE_HOOKUP_OBJECT (mainWindow, qmasterButton, "qmasterButton");
!   GLADE_HOOKUP_OBJECT (mainWindow, image2, "image2");
    GLADE_HOOKUP_OBJECT (mainWindow, qServerButton, "qServerButton");
!   GLADE_HOOKUP_OBJECT (mainWindow, image3, "image3");
    GLADE_HOOKUP_OBJECT (mainWindow, hbox28, "hbox28");
    GLADE_HOOKUP_OBJECT (mainWindow, fixed11, "fixed11");
--- 954,963 ----
    GLADE_HOOKUP_OBJECT (mainWindow, hbox7, "hbox7");
    GLADE_HOOKUP_OBJECT (mainWindow, launchButton, "launchButton");
!   GLADE_HOOKUP_OBJECT (mainWindow, image7, "image7");
    GLADE_HOOKUP_OBJECT (mainWindow, vseparator3, "vseparator3");
    GLADE_HOOKUP_OBJECT (mainWindow, qmasterButton, "qmasterButton");
!   GLADE_HOOKUP_OBJECT (mainWindow, image5, "image5");
    GLADE_HOOKUP_OBJECT (mainWindow, qServerButton, "qServerButton");
!   GLADE_HOOKUP_OBJECT (mainWindow, image6, "image6");
    GLADE_HOOKUP_OBJECT (mainWindow, hbox28, "hbox28");
    GLADE_HOOKUP_OBJECT (mainWindow, fixed11, "fixed11");

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26715/src

Modified Files:
	Makefile.am 
Log Message:
Adjusted for easier releases using "make dist-gzip"


Index: Makefile.am
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.am	13 Jul 2004 00:15:24 -0000	1.1.1.1
--- Makefile.am	15 Dec 2004 00:33:03 -0000	1.2
***************
*** 13,18 ****
  	interface.c interface.h \
  	callbacks.c callbacks.h \
! 	queryServ.c socket.c \
! 	utils.c avatar.c
  
  gzlauncher_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -lcurl
--- 13,21 ----
  	interface.c interface.h \
  	callbacks.c callbacks.h \
! 	queryServ.c queryServ.h \
! 	socket.c  socket.h \
! 	utils.c utils.h \
! 	avatar.c avatar.h \
! 	defines.h
  
  gzlauncher_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) -lcurl

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7779

Modified Files:
	callbacks.c 
Log Message:
Display total query time.


Index: callbacks.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/callbacks.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** callbacks.c	5 Jan 2005 01:20:05 -0000	1.25
--- callbacks.c	5 Jan 2005 07:45:39 -0000	1.26
***************
*** 450,453 ****
--- 450,454 ----
  	extern int numServers;
  	char statusText[32];
+ 	struct timeval start, end;
  	SERVER *current = NULL;
  	pthread_t threads[MAX_NUM_THREADS];
***************
*** 472,475 ****
--- 473,477 ----
  		pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
  		current = serv;
+ 		gettimeofday(&start, NULL);
  		while(current != NULL || currentNumQueries)
  		{
***************
*** 511,517 ****
          gtk_main_iteration();
  		}
  		pthread_attr_destroy(&attr);
  		gtk_widget_hide(progressbar);
! 		sprintf(statusText, "%d/%d Servers Queried", numQueried, numServers);
  		set_statusbar_msg(GTK_WIDGET(button), statusText);
  		g_object_unref(store);
--- 513,525 ----
          gtk_main_iteration();
  		}
+ 		gettimeofday(&end, NULL);
  		pthread_attr_destroy(&attr);
  		gtk_widget_hide(progressbar);
!     if(end.tv_usec < start.tv_usec)
!     {
!       end.tv_sec--;
!       end.tv_usec += 1000000;
!     }
! 		sprintf(statusText, "%d/%d Servers Queried in %d.%d seconds", numQueried, numServers, (end.tv_sec - start.tv_sec), ((end.tv_usec - start.tv_usec) / 1000));
  		set_statusbar_msg(GTK_WIDGET(button), statusText);
  		g_object_unref(store);

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8486

Modified Files:
	queryServ.c 
Log Message:
Fix server ping time.


Index: queryServ.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/queryServ.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** queryServ.c	5 Jan 2005 01:20:05 -0000	1.9
--- queryServ.c	5 Jan 2005 07:48:24 -0000	1.10
***************
*** 33,38 ****
  	if(end->tv_usec < start->tv_usec)
  	{
! 		start->tv_sec--;
! 		start->tv_usec += 1000000;
  	}
  	return (end->tv_sec - start->tv_sec) * 1000 +
--- 33,38 ----
  	if(end->tv_usec < start->tv_usec)
  	{
! 		end->tv_sec--;
! 		end->tv_usec += 1000000;
  	}
  	return (end->tv_sec - start->tv_sec) * 1000 +

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24577/src

Modified Files:
	interface.c 
Log Message:
Added desktop icon by t8.


Index: interface.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/interface.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** interface.c	5 Jan 2005 01:20:05 -0000	1.6
--- interface.c	16 Mar 2005 23:36:20 -0000	1.7
***************
*** 31,34 ****
--- 31,35 ----
  {
    GtkWidget *loginDialog;
+   GdkPixbuf *loginDialog_icon_pixbuf;
    GtkWidget *dialog_vbox1;
    GtkWidget *vbox1;
***************
*** 51,54 ****
--- 52,61 ----
    gtk_window_set_position (GTK_WINDOW (loginDialog), GTK_WIN_POS_CENTER);
    gtk_window_set_default_size (GTK_WINDOW (loginDialog), 363, 212);
+   loginDialog_icon_pixbuf = create_pixbuf ("zdaemon.png");
+   if (loginDialog_icon_pixbuf)
+     {
+       gtk_window_set_icon (GTK_WINDOW (loginDialog), loginDialog_icon_pixbuf);
+       gdk_pixbuf_unref (loginDialog_icon_pixbuf);
+     }
    gtk_window_set_type_hint (GTK_WINDOW (loginDialog), GDK_WINDOW_TYPE_HINT_DIALOG);
  
***************
*** 156,159 ****
--- 163,167 ----
  {
    GtkWidget *errorDialog;
+   GdkPixbuf *errorDialog_icon_pixbuf;
    GtkWidget *dialog_vbox2;
    GtkWidget *vbox2;
***************
*** 168,171 ****
--- 176,185 ----
    gtk_window_set_position (GTK_WINDOW (errorDialog), GTK_WIN_POS_CENTER);
    gtk_window_set_modal (GTK_WINDOW (errorDialog), TRUE);
+   errorDialog_icon_pixbuf = create_pixbuf ("zdaemon.png");
+   if (errorDialog_icon_pixbuf)
+     {
+       gtk_window_set_icon (GTK_WINDOW (errorDialog), errorDialog_icon_pixbuf);
+       gdk_pixbuf_unref (errorDialog_icon_pixbuf);
+     }
    gtk_window_set_type_hint (GTK_WINDOW (errorDialog), GDK_WINDOW_TYPE_HINT_DIALOG);
  
***************
*** 221,224 ****
--- 235,239 ----
  {
    GtkWidget *successDialog;
+   GdkPixbuf *successDialog_icon_pixbuf;
    GtkWidget *vbox4;
    GtkWidget *vbox5;
***************
*** 233,236 ****
--- 248,257 ----
    gtk_window_set_position (GTK_WINDOW (successDialog), GTK_WIN_POS_CENTER);
    gtk_window_set_modal (GTK_WINDOW (successDialog), TRUE);
+   successDialog_icon_pixbuf = create_pixbuf ("zdaemon.png");
+   if (successDialog_icon_pixbuf)
+     {
+       gtk_window_set_icon (GTK_WINDOW (successDialog), successDialog_icon_pixbuf);
+       gdk_pixbuf_unref (successDialog_icon_pixbuf);
+     }
    gtk_window_set_type_hint (GTK_WINDOW (successDialog), GDK_WINDOW_TYPE_HINT_DIALOG);
  
***************
*** 286,289 ****
--- 307,311 ----
  {
    GtkWidget *mainWindow;
+   GdkPixbuf *mainWindow_icon_pixbuf;
    GtkWidget *vbox6;
    GtkWidget *menubar1;
***************
*** 406,409 ****
--- 428,437 ----
    gtk_window_set_title (GTK_WINDOW (mainWindow), _("GZLauncher"));
    gtk_window_set_position (GTK_WINDOW (mainWindow), GTK_WIN_POS_CENTER);
+   mainWindow_icon_pixbuf = create_pixbuf ("zdaemon.png");
+   if (mainWindow_icon_pixbuf)
+     {
+       gtk_window_set_icon (GTK_WINDOW (mainWindow), mainWindow_icon_pixbuf);
+       gdk_pixbuf_unref (mainWindow_icon_pixbuf);
+     }
  
    vbox6 = gtk_vbox_new (FALSE, 0);
***************
*** 1063,1066 ****
--- 1091,1095 ----
  {
    GtkWidget *prefDialog;
+   GdkPixbuf *prefDialog_icon_pixbuf;
    GtkWidget *dialog_vbox3;
    GtkWidget *vbox34;
***************
*** 1096,1099 ****
--- 1125,1134 ----
    gtk_window_set_position (GTK_WINDOW (prefDialog), GTK_WIN_POS_CENTER);
    gtk_window_set_resizable (GTK_WINDOW (prefDialog), FALSE);
+   prefDialog_icon_pixbuf = create_pixbuf ("zdaemon.png");
+   if (prefDialog_icon_pixbuf)
+     {
+       gtk_window_set_icon (GTK_WINDOW (prefDialog), prefDialog_icon_pixbuf);
+       gdk_pixbuf_unref (prefDialog_icon_pixbuf);
+     }
    gtk_window_set_type_hint (GTK_WINDOW (prefDialog), GDK_WINDOW_TYPE_HINT_DIALOG);
  
***************
*** 1265,1268 ****
--- 1300,1304 ----
  {
    GtkWidget *execFileSel;
+   GdkPixbuf *execFileSel_icon_pixbuf;
    GtkWidget *execBrowseOk;
    GtkWidget *execBrowseCancel;
***************
*** 1271,1274 ****
--- 1307,1316 ----
    gtk_container_set_border_width (GTK_CONTAINER (execFileSel), 10);
    gtk_window_set_position (GTK_WINDOW (execFileSel), GTK_WIN_POS_CENTER);
+   execFileSel_icon_pixbuf = create_pixbuf ("zdaemon.png");
+   if (execFileSel_icon_pixbuf)
+     {
+       gtk_window_set_icon (GTK_WINDOW (execFileSel), execFileSel_icon_pixbuf);
+       gdk_pixbuf_unref (execFileSel_icon_pixbuf);
+     }
    gtk_window_set_type_hint (GTK_WINDOW (execFileSel), GDK_WINDOW_TYPE_HINT_DIALOG);
    gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (execFileSel));
***************
*** 1304,1307 ****
--- 1346,1350 ----
  {
    GtkWidget *wadsFileSel;
+   GdkPixbuf *wadsFileSel_icon_pixbuf;
    GtkWidget *wadsBrowseOk;
    GtkWidget *wadsBrowseCancel;
***************
*** 1310,1313 ****
--- 1353,1362 ----
    gtk_container_set_border_width (GTK_CONTAINER (wadsFileSel), 10);
    gtk_window_set_position (GTK_WINDOW (wadsFileSel), GTK_WIN_POS_CENTER);
+   wadsFileSel_icon_pixbuf = create_pixbuf ("zdaemon.png");
+   if (wadsFileSel_icon_pixbuf)
+     {
+       gtk_window_set_icon (GTK_WINDOW (wadsFileSel), wadsFileSel_icon_pixbuf);
+       gdk_pixbuf_unref (wadsFileSel_icon_pixbuf);
+     }
    gtk_window_set_type_hint (GTK_WINDOW (wadsFileSel), GDK_WINDOW_TYPE_HINT_DIALOG);
    gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (wadsFileSel));

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28776/src

Modified Files:
	interface.c 
Log Message:
Adjusted stats interface to include experience section within stats frame.


Index: interface.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/interface.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** interface.c	16 Mar 2005 23:36:20 -0000	1.7
--- interface.c	17 Mar 2005 02:31:01 -0000	1.8
***************
*** 361,383 ****
    GtkWidget *frame2;
    GtkWidget *hbox17;
!   GtkWidget *vbox25;
!   GtkWidget *label36;
    GtkWidget *psLevelEntry;
!   GtkWidget *vseparator11;
!   GtkWidget *vbox26;
!   GtkWidget *label37;
    GtkWidget *psRankEntry;
!   GtkWidget *vseparator12;
!   GtkWidget *vbox27;
!   GtkWidget *label38;
    GtkWidget *psHRankEntry;
!   GtkWidget *label35;
!   GtkWidget *hbox26;
!   GtkWidget *vbox35;
!   GtkWidget *label46;
    GtkWidget *psExpEntry;
!   GtkWidget *hbox27;
!   GtkWidget *vseparator19;
!   GtkWidget *fixed9;
    GtkWidget *pstatsLabel;
    GtkWidget *vbox28;
--- 361,385 ----
    GtkWidget *frame2;
    GtkWidget *hbox17;
!   GtkWidget *vbox39;
!   GtkWidget *hbox31;
!   GtkWidget *vbox40;
!   GtkWidget *label50;
    GtkWidget *psLevelEntry;
!   GtkWidget *vseparator19;
!   GtkWidget *vbox41;
!   GtkWidget *label51;
    GtkWidget *psRankEntry;
!   GtkWidget *vseparator20;
!   GtkWidget *vbox42;
!   GtkWidget *label52;
    GtkWidget *psHRankEntry;
!   GtkWidget *hseparator15;
!   GtkWidget *hbox32;
!   GtkWidget *vbox43;
!   GtkWidget *label53;
    GtkWidget *psExpEntry;
!   GtkWidget *vseparator21;
!   GtkWidget *fixed16;
!   GtkWidget *label35;
    GtkWidget *pstatsLabel;
    GtkWidget *vbox28;
***************
*** 394,417 ****
    GtkWidget *label39;
    GtkWidget *frame4;
!   GtkWidget *hbox19;
!   GtkWidget *vbox30;
!   GtkWidget *label40;
    GtkWidget *prLevelEntry;
!   GtkWidget *vseparator14;
!   GtkWidget *vbox31;
!   GtkWidget *label41;
    GtkWidget *prRankEntry;
!   GtkWidget *vseparator15;
!   GtkWidget *vbox32;
!   GtkWidget *label42;
    GtkWidget *prHRankEntry;
    GtkWidget *label43;
    GtkWidget *vbox33;
-   GtkWidget *hbox25;
-   GtkWidget *vbox36;
-   GtkWidget *label47;
-   GtkWidget *prExpEntry;
-   GtkWidget *vseparator17;
-   GtkWidget *fixed8;
    GtkWidget *hseparator14;
    GtkWidget *hbox20;
--- 396,421 ----
    GtkWidget *label39;
    GtkWidget *frame4;
!   GtkWidget *vbox44;
!   GtkWidget *hbox33;
!   GtkWidget *vbox45;
!   GtkWidget *label54;
    GtkWidget *prLevelEntry;
!   GtkWidget *vseparator22;
!   GtkWidget *vbox46;
!   GtkWidget *label55;
    GtkWidget *prRankEntry;
!   GtkWidget *vseparator23;
!   GtkWidget *vbox47;
!   GtkWidget *label56;
    GtkWidget *prHRankEntry;
+   GtkWidget *hseparator16;
+   GtkWidget *hbox34;
+   GtkWidget *vbox48;
+   GtkWidget *label57;
+   GtkWidget *prExpEntry;
+   GtkWidget *vseparator24;
+   GtkWidget *fixed17;
    GtkWidget *label43;
    GtkWidget *vbox33;
    GtkWidget *hseparator14;
    GtkWidget *hbox20;
***************
*** 670,754 ****
    gtk_container_add (GTK_CONTAINER (frame2), hbox17);
  
!   vbox25 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox25);
!   gtk_box_pack_start (GTK_BOX (hbox17), vbox25, TRUE, TRUE, 0);
  
!   label36 = gtk_label_new (_("Level"));
!   gtk_widget_show (label36);
!   gtk_box_pack_start (GTK_BOX (vbox25), label36, TRUE, FALSE, 0);
  
    psLevelEntry = gtk_entry_new ();
    gtk_widget_show (psLevelEntry);
!   gtk_box_pack_start (GTK_BOX (vbox25), psLevelEntry, TRUE, FALSE, 0);
    gtk_editable_set_editable (GTK_EDITABLE (psLevelEntry), FALSE);
  
!   vseparator11 = gtk_vseparator_new ();
!   gtk_widget_show (vseparator11);
!   gtk_box_pack_start (GTK_BOX (hbox17), vseparator11, TRUE, TRUE, 0);
  
!   vbox26 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox26);
!   gtk_box_pack_start (GTK_BOX (hbox17), vbox26, TRUE, TRUE, 0);
  
!   label37 = gtk_label_new (_("Rank"));
!   gtk_widget_show (label37);
!   gtk_box_pack_start (GTK_BOX (vbox26), label37, TRUE, FALSE, 0);
  
    psRankEntry = gtk_entry_new ();
    gtk_widget_show (psRankEntry);
!   gtk_box_pack_start (GTK_BOX (vbox26), psRankEntry, TRUE, FALSE, 0);
    gtk_editable_set_editable (GTK_EDITABLE (psRankEntry), FALSE);
  
!   vseparator12 = gtk_vseparator_new ();
!   gtk_widget_show (vseparator12);
!   gtk_box_pack_start (GTK_BOX (hbox17), vseparator12, TRUE, TRUE, 0);
  
!   vbox27 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox27);
!   gtk_box_pack_start (GTK_BOX (hbox17), vbox27, TRUE, TRUE, 0);
  
!   label38 = gtk_label_new (_("Highest Rank"));
!   gtk_widget_show (label38);
!   gtk_box_pack_start (GTK_BOX (vbox27), label38, TRUE, FALSE, 0);
  
    psHRankEntry = gtk_entry_new ();
    gtk_widget_show (psHRankEntry);
!   gtk_box_pack_start (GTK_BOX (vbox27), psHRankEntry, TRUE, FALSE, 0);
    gtk_editable_set_editable (GTK_EDITABLE (psHRankEntry), FALSE);
  
!   label35 = gtk_label_new (_("Stats"));
!   gtk_widget_show (label35);
!   gtk_frame_set_label_widget (GTK_FRAME (frame2), label35);
  
!   hbox26 = gtk_hbox_new (FALSE, 0);
!   gtk_widget_show (hbox26);
!   gtk_box_pack_start (GTK_BOX (vbox23), hbox26, TRUE, TRUE, 0);
  
!   vbox35 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox35);
!   gtk_box_pack_start (GTK_BOX (hbox26), vbox35, TRUE, TRUE, 0);
!   gtk_widget_set_size_request (vbox35, -1, 66);
  
!   label46 = gtk_label_new (_("Experience"));
!   gtk_widget_show (label46);
!   gtk_box_pack_start (GTK_BOX (vbox35), label46, TRUE, FALSE, 0);
  
    psExpEntry = gtk_entry_new ();
    gtk_widget_show (psExpEntry);
!   gtk_box_pack_start (GTK_BOX (vbox35), psExpEntry, TRUE, FALSE, 0);
    gtk_editable_set_editable (GTK_EDITABLE (psExpEntry), FALSE);
  
!   hbox27 = gtk_hbox_new (FALSE, 0);
!   gtk_widget_show (hbox27);
!   gtk_box_pack_start (GTK_BOX (hbox26), hbox27, TRUE, TRUE, 0);
  
!   vseparator19 = gtk_vseparator_new ();
!   gtk_widget_show (vseparator19);
!   gtk_box_pack_start (GTK_BOX (hbox27), vseparator19, TRUE, TRUE, 0);
  
!   fixed9 = gtk_fixed_new ();
!   gtk_widget_show (fixed9);
!   gtk_box_pack_start (GTK_BOX (hbox27), fixed9, TRUE, TRUE, 0);
!   gtk_widget_set_size_request (fixed9, 351, -1);
  
    pstatsLabel = gtk_label_new (_("Player Stats"));
--- 674,765 ----
    gtk_container_add (GTK_CONTAINER (frame2), hbox17);
  
!   vbox39 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox39);
!   gtk_box_pack_start (GTK_BOX (hbox17), vbox39, TRUE, TRUE, 0);
  
!   hbox31 = gtk_hbox_new (FALSE, 0);
!   gtk_widget_show (hbox31);
!   gtk_box_pack_start (GTK_BOX (vbox39), hbox31, TRUE, TRUE, 0);
! 
!   vbox40 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox40);
!   gtk_box_pack_start (GTK_BOX (hbox31), vbox40, TRUE, TRUE, 0);
! 
!   label50 = gtk_label_new (_("Level"));
!   gtk_widget_show (label50);
!   gtk_box_pack_start (GTK_BOX (vbox40), label50, TRUE, FALSE, 0);
  
    psLevelEntry = gtk_entry_new ();
    gtk_widget_show (psLevelEntry);
!   gtk_box_pack_start (GTK_BOX (vbox40), psLevelEntry, TRUE, FALSE, 0);
    gtk_editable_set_editable (GTK_EDITABLE (psLevelEntry), FALSE);
  
!   vseparator19 = gtk_vseparator_new ();
!   gtk_widget_show (vseparator19);
!   gtk_box_pack_start (GTK_BOX (hbox31), vseparator19, TRUE, TRUE, 0);
  
!   vbox41 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox41);
!   gtk_box_pack_start (GTK_BOX (hbox31), vbox41, TRUE, TRUE, 0);
  
!   label51 = gtk_label_new (_("Rank"));
!   gtk_widget_show (label51);
!   gtk_box_pack_start (GTK_BOX (vbox41), label51, TRUE, FALSE, 0);
  
    psRankEntry = gtk_entry_new ();
    gtk_widget_show (psRankEntry);
!   gtk_box_pack_start (GTK_BOX (vbox41), psRankEntry, TRUE, FALSE, 0);
    gtk_editable_set_editable (GTK_EDITABLE (psRankEntry), FALSE);
  
!   vseparator20 = gtk_vseparator_new ();
!   gtk_widget_show (vseparator20);
!   gtk_box_pack_start (GTK_BOX (hbox31), vseparator20, TRUE, TRUE, 0);
  
!   vbox42 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox42);
!   gtk_box_pack_start (GTK_BOX (hbox31), vbox42, TRUE, TRUE, 0);
  
!   label52 = gtk_label_new (_("Highest Rank"));
!   gtk_widget_show (label52);
!   gtk_box_pack_start (GTK_BOX (vbox42), label52, TRUE, FALSE, 0);
  
    psHRankEntry = gtk_entry_new ();
    gtk_widget_show (psHRankEntry);
!   gtk_box_pack_start (GTK_BOX (vbox42), psHRankEntry, TRUE, FALSE, 0);
    gtk_editable_set_editable (GTK_EDITABLE (psHRankEntry), FALSE);
  
!   hseparator15 = gtk_hseparator_new ();
!   gtk_widget_show (hseparator15);
!   gtk_box_pack_start (GTK_BOX (vbox39), hseparator15, FALSE, TRUE, 0);
  
!   hbox32 = gtk_hbox_new (FALSE, 0);
!   gtk_widget_show (hbox32);
!   gtk_box_pack_start (GTK_BOX (vbox39), hbox32, TRUE, TRUE, 0);
  
!   vbox43 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox43);
!   gtk_box_pack_start (GTK_BOX (hbox32), vbox43, TRUE, TRUE, 0);
  
!   label53 = gtk_label_new (_("Experience"));
!   gtk_widget_show (label53);
!   gtk_box_pack_start (GTK_BOX (vbox43), label53, TRUE, FALSE, 0);
  
    psExpEntry = gtk_entry_new ();
    gtk_widget_show (psExpEntry);
!   gtk_box_pack_start (GTK_BOX (vbox43), psExpEntry, TRUE, FALSE, 0);
    gtk_editable_set_editable (GTK_EDITABLE (psExpEntry), FALSE);
  
!   vseparator21 = gtk_vseparator_new ();
!   gtk_widget_show (vseparator21);
!   gtk_box_pack_start (GTK_BOX (hbox32), vseparator21, TRUE, TRUE, 0);
  
!   fixed16 = gtk_fixed_new ();
!   gtk_widget_show (fixed16);
!   gtk_box_pack_start (GTK_BOX (hbox32), fixed16, TRUE, TRUE, 0);
!   gtk_widget_set_size_request (fixed16, 344, -1);
  
!   label35 = gtk_label_new (_("Stats"));
!   gtk_widget_show (label35);
!   gtk_frame_set_label_widget (GTK_FRAME (frame2), label35);
  
    pstatsLabel = gtk_label_new (_("Player Stats"));
***************
*** 812,900 ****
    gtk_widget_show (frame4);
    gtk_box_pack_start (GTK_BOX (vbox28), frame4, TRUE, TRUE, 0);
  
!   hbox19 = gtk_hbox_new (FALSE, 0);
!   gtk_widget_show (hbox19);
!   gtk_container_add (GTK_CONTAINER (frame4), hbox19);
  
!   vbox30 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox30);
!   gtk_box_pack_start (GTK_BOX (hbox19), vbox30, TRUE, TRUE, 0);
  
!   label40 = gtk_label_new (_("Level"));
!   gtk_widget_show (label40);
!   gtk_box_pack_start (GTK_BOX (vbox30), label40, TRUE, FALSE, 0);
  
    prLevelEntry = gtk_entry_new ();
    gtk_widget_show (prLevelEntry);
!   gtk_box_pack_start (GTK_BOX (vbox30), prLevelEntry, TRUE, FALSE, 0);
    gtk_editable_set_editable (GTK_EDITABLE (prLevelEntry), FALSE);
  
!   vseparator14 = gtk_vseparator_new ();
!   gtk_widget_show (vseparator14);
!   gtk_box_pack_start (GTK_BOX (hbox19), vseparator14, TRUE, TRUE, 0);
  
!   vbox31 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox31);
!   gtk_box_pack_start (GTK_BOX (hbox19), vbox31, TRUE, TRUE, 0);
  
!   label41 = gtk_label_new (_("Rank"));
!   gtk_widget_show (label41);
!   gtk_box_pack_start (GTK_BOX (vbox31), label41, TRUE, FALSE, 0);
  
    prRankEntry = gtk_entry_new ();
    gtk_widget_show (prRankEntry);
!   gtk_box_pack_start (GTK_BOX (vbox31), prRankEntry, TRUE, FALSE, 0);
    gtk_editable_set_editable (GTK_EDITABLE (prRankEntry), FALSE);
  
!   vseparator15 = gtk_vseparator_new ();
!   gtk_widget_show (vseparator15);
!   gtk_box_pack_start (GTK_BOX (hbox19), vseparator15, TRUE, TRUE, 0);
  
!   vbox32 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox32);
!   gtk_box_pack_start (GTK_BOX (hbox19), vbox32, TRUE, TRUE, 0);
  
!   label42 = gtk_label_new (_("Highest Rank"));
!   gtk_widget_show (label42);
!   gtk_box_pack_start (GTK_BOX (vbox32), label42, TRUE, FALSE, 0);
  
    prHRankEntry = gtk_entry_new ();
    gtk_widget_show (prHRankEntry);
!   gtk_box_pack_start (GTK_BOX (vbox32), prHRankEntry, TRUE, FALSE, 0);
!   gtk_editable_set_editable (GTK_EDITABLE (prHRankEntry), FALSE);
! 
!   label43 = gtk_label_new (_("Stats"));
!   gtk_widget_show (label43);
!   gtk_frame_set_label_widget (GTK_FRAME (frame4), label43);
  
!   vbox33 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox33);
!   gtk_box_pack_start (GTK_BOX (vbox28), vbox33, TRUE, TRUE, 0);
  
!   hbox25 = gtk_hbox_new (FALSE, 0);
!   gtk_widget_show (hbox25);
!   gtk_box_pack_start (GTK_BOX (vbox33), hbox25, TRUE, TRUE, 0);
  
!   vbox36 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox36);
!   gtk_box_pack_start (GTK_BOX (hbox25), vbox36, TRUE, TRUE, 0);
  
!   label47 = gtk_label_new (_("Experience"));
!   gtk_widget_show (label47);
!   gtk_box_pack_start (GTK_BOX (vbox36), label47, TRUE, FALSE, 0);
  
    prExpEntry = gtk_entry_new ();
    gtk_widget_show (prExpEntry);
!   gtk_box_pack_start (GTK_BOX (vbox36), prExpEntry, TRUE, FALSE, 0);
!   gtk_editable_set_editable (GTK_EDITABLE (prExpEntry), FALSE);
  
!   vseparator17 = gtk_vseparator_new ();
!   gtk_widget_show (vseparator17);
!   gtk_box_pack_start (GTK_BOX (hbox25), vseparator17, TRUE, TRUE, 0);
  
!   fixed8 = gtk_fixed_new ();
!   gtk_widget_show (fixed8);
!   gtk_box_pack_start (GTK_BOX (hbox25), fixed8, TRUE, TRUE, 0);
!   gtk_widget_set_size_request (fixed8, 449, 56);
  
    hseparator14 = gtk_hseparator_new ();
--- 823,918 ----
    gtk_widget_show (frame4);
    gtk_box_pack_start (GTK_BOX (vbox28), frame4, TRUE, TRUE, 0);
+   gtk_widget_set_size_request (frame4, -1, 172);
  
!   vbox44 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox44);
!   gtk_container_add (GTK_CONTAINER (frame4), vbox44);
  
!   hbox33 = gtk_hbox_new (FALSE, 0);
!   gtk_widget_show (hbox33);
!   gtk_box_pack_start (GTK_BOX (vbox44), hbox33, TRUE, TRUE, 0);
  
!   vbox45 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox45);
!   gtk_box_pack_start (GTK_BOX (hbox33), vbox45, TRUE, TRUE, 0);
! 
!   label54 = gtk_label_new (_("Level"));
!   gtk_widget_show (label54);
!   gtk_box_pack_start (GTK_BOX (vbox45), label54, TRUE, FALSE, 0);
  
    prLevelEntry = gtk_entry_new ();
    gtk_widget_show (prLevelEntry);
!   gtk_box_pack_start (GTK_BOX (vbox45), prLevelEntry, TRUE, FALSE, 0);
    gtk_editable_set_editable (GTK_EDITABLE (prLevelEntry), FALSE);
  
!   vseparator22 = gtk_vseparator_new ();
!   gtk_widget_show (vseparator22);
!   gtk_box_pack_start (GTK_BOX (hbox33), vseparator22, TRUE, TRUE, 0);
  
!   vbox46 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox46);
!   gtk_box_pack_start (GTK_BOX (hbox33), vbox46, TRUE, TRUE, 0);
  
!   label55 = gtk_label_new (_("Rank"));
!   gtk_widget_show (label55);
!   gtk_box_pack_start (GTK_BOX (vbox46), label55, TRUE, FALSE, 0);
  
    prRankEntry = gtk_entry_new ();
    gtk_widget_show (prRankEntry);
!   gtk_box_pack_start (GTK_BOX (vbox46), prRankEntry, TRUE, FALSE, 0);
    gtk_editable_set_editable (GTK_EDITABLE (prRankEntry), FALSE);
  
!   vseparator23 = gtk_vseparator_new ();
!   gtk_widget_show (vseparator23);
!   gtk_box_pack_start (GTK_BOX (hbox33), vseparator23, TRUE, TRUE, 0);
  
!   vbox47 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox47);
!   gtk_box_pack_start (GTK_BOX (hbox33), vbox47, TRUE, TRUE, 0);
  
!   label56 = gtk_label_new (_("Highest Rank"));
!   gtk_widget_show (label56);
!   gtk_box_pack_start (GTK_BOX (vbox47), label56, TRUE, FALSE, 0);
  
    prHRankEntry = gtk_entry_new ();
    gtk_widget_show (prHRankEntry);
!   gtk_box_pack_start (GTK_BOX (vbox47), prHRankEntry, TRUE, FALSE, 0);
  
!   hseparator16 = gtk_hseparator_new ();
!   gtk_widget_show (hseparator16);
!   gtk_box_pack_start (GTK_BOX (vbox44), hseparator16, FALSE, TRUE, 0);
  
!   hbox34 = gtk_hbox_new (FALSE, 0);
!   gtk_widget_show (hbox34);
!   gtk_box_pack_start (GTK_BOX (vbox44), hbox34, TRUE, TRUE, 0);
  
!   vbox48 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox48);
!   gtk_box_pack_start (GTK_BOX (hbox34), vbox48, TRUE, TRUE, 0);
  
!   label57 = gtk_label_new (_("Experience"));
!   gtk_widget_show (label57);
!   gtk_box_pack_start (GTK_BOX (vbox48), label57, TRUE, FALSE, 0);
  
    prExpEntry = gtk_entry_new ();
    gtk_widget_show (prExpEntry);
!   gtk_box_pack_start (GTK_BOX (vbox48), prExpEntry, TRUE, FALSE, 0);
  
!   vseparator24 = gtk_vseparator_new ();
!   gtk_widget_show (vseparator24);
!   gtk_box_pack_start (GTK_BOX (hbox34), vseparator24, TRUE, TRUE, 0);
  
!   fixed17 = gtk_fixed_new ();
!   gtk_widget_show (fixed17);
!   gtk_box_pack_start (GTK_BOX (hbox34), fixed17, TRUE, TRUE, 0);
!   gtk_widget_set_size_request (fixed17, 450, -1);
! 
!   label43 = gtk_label_new (_("Stats"));
!   gtk_widget_show (label43);
!   gtk_frame_set_label_widget (GTK_FRAME (frame4), label43);
! 
!   vbox33 = gtk_vbox_new (FALSE, 0);
!   gtk_widget_show (vbox33);
!   gtk_box_pack_start (GTK_BOX (vbox28), vbox33, TRUE, TRUE, 0);
  
    hseparator14 = gtk_hseparator_new ();
***************
*** 1022,1044 ****
    GLADE_HOOKUP_OBJECT (mainWindow, frame2, "frame2");
    GLADE_HOOKUP_OBJECT (mainWindow, hbox17, "hbox17");
!   GLADE_HOOKUP_OBJECT (mainWindow, vbox25, "vbox25");
!   GLADE_HOOKUP_OBJECT (mainWindow, label36, "label36");
    GLADE_HOOKUP_OBJECT (mainWindow, psLevelEntry, "psLevelEntry");
!   GLADE_HOOKUP_OBJECT (mainWindow, vseparator11, "vseparator11");
!   GLADE_HOOKUP_OBJECT (mainWindow, vbox26, "vbox26");
!   GLADE_HOOKUP_OBJECT (mainWindow, label37, "label37");
    GLADE_HOOKUP_OBJECT (mainWindow, psRankEntry, "psRankEntry");
!   GLADE_HOOKUP_OBJECT (mainWindow, vseparator12, "vseparator12");
!   GLADE_HOOKUP_OBJECT (mainWindow, vbox27, "vbox27");
!   GLADE_HOOKUP_OBJECT (mainWindow, label38, "label38");
    GLADE_HOOKUP_OBJECT (mainWindow, psHRankEntry, "psHRankEntry");
!   GLADE_HOOKUP_OBJECT (mainWindow, label35, "label35");
!   GLADE_HOOKUP_OBJECT (mainWindow, hbox26, "hbox26");
!   GLADE_HOOKUP_OBJECT (mainWindow, vbox35, "vbox35");
!   GLADE_HOOKUP_OBJECT (mainWindow, label46, "label46");
    GLADE_HOOKUP_OBJECT (mainWindow, psExpEntry, "psExpEntry");
!   GLADE_HOOKUP_OBJECT (mainWindow, hbox27, "hbox27");
!   GLADE_HOOKUP_OBJECT (mainWindow, vseparator19, "vseparator19");
!   GLADE_HOOKUP_OBJECT (mainWindow, fixed9, "fixed9");
    GLADE_HOOKUP_OBJECT (mainWindow, pstatsLabel, "pstatsLabel");
    GLADE_HOOKUP_OBJECT (mainWindow, vbox28, "vbox28");
--- 1040,1064 ----
    GLADE_HOOKUP_OBJECT (mainWindow, frame2, "frame2");
    GLADE_HOOKUP_OBJECT (mainWindow, hbox17, "hbox17");
!   GLADE_HOOKUP_OBJECT (mainWindow, vbox39, "vbox39");
!   GLADE_HOOKUP_OBJECT (mainWindow, hbox31, "hbox31");
!   GLADE_HOOKUP_OBJECT (mainWindow, vbox40, "vbox40");
!   GLADE_HOOKUP_OBJECT (mainWindow, label50, "label50");
    GLADE_HOOKUP_OBJECT (mainWindow, psLevelEntry, "psLevelEntry");
!   GLADE_HOOKUP_OBJECT (mainWindow, vseparator19, "vseparator19");
!   GLADE_HOOKUP_OBJECT (mainWindow, vbox41, "vbox41");
!   GLADE_HOOKUP_OBJECT (mainWindow, label51, "label51");
    GLADE_HOOKUP_OBJECT (mainWindow, psRankEntry, "psRankEntry");
!   GLADE_HOOKUP_OBJECT (mainWindow, vseparator20, "vseparator20");
!   GLADE_HOOKUP_OBJECT (mainWindow, vbox42, "vbox42");
!   GLADE_HOOKUP_OBJECT (mainWindow, label52, "label52");
    GLADE_HOOKUP_OBJECT (mainWindow, psHRankEntry, "psHRankEntry");
!   GLADE_HOOKUP_OBJECT (mainWindow, hseparator15, "hseparator15");
!   GLADE_HOOKUP_OBJECT (mainWindow, hbox32, "hbox32");
!   GLADE_HOOKUP_OBJECT (mainWindow, vbox43, "vbox43");
!   GLADE_HOOKUP_OBJECT (mainWindow, label53, "label53");
    GLADE_HOOKUP_OBJECT (mainWindow, psExpEntry, "psExpEntry");
!   GLADE_HOOKUP_OBJECT (mainWindow, vseparator21, "vseparator21");
!   GLADE_HOOKUP_OBJECT (mainWindow, fixed16, "fixed16");
!   GLADE_HOOKUP_OBJECT (mainWindow, label35, "label35");
    GLADE_HOOKUP_OBJECT (mainWindow, pstatsLabel, "pstatsLabel");
    GLADE_HOOKUP_OBJECT (mainWindow, vbox28, "vbox28");
***************
*** 1055,1078 ****
    GLADE_HOOKUP_OBJECT (mainWindow, label39, "label39");
    GLADE_HOOKUP_OBJECT (mainWindow, frame4, "frame4");
!   GLADE_HOOKUP_OBJECT (mainWindow, hbox19, "hbox19");
!   GLADE_HOOKUP_OBJECT (mainWindow, vbox30, "vbox30");
!   GLADE_HOOKUP_OBJECT (mainWindow, label40, "label40");
    GLADE_HOOKUP_OBJECT (mainWindow, prLevelEntry, "prLevelEntry");
!   GLADE_HOOKUP_OBJECT (mainWindow, vseparator14, "vseparator14");
!   GLADE_HOOKUP_OBJECT (mainWindow, vbox31, "vbox31");
!   GLADE_HOOKUP_OBJECT (mainWindow, label41, "label41");
    GLADE_HOOKUP_OBJECT (mainWindow, prRankEntry, "prRankEntry");
!   GLADE_HOOKUP_OBJECT (mainWindow, vseparator15, "vseparator15");
!   GLADE_HOOKUP_OBJECT (mainWindow, vbox32, "vbox32");
!   GLADE_HOOKUP_OBJECT (mainWindow, label42, "label42");
    GLADE_HOOKUP_OBJECT (mainWindow, prHRankEntry, "prHRankEntry");
    GLADE_HOOKUP_OBJECT (mainWindow, label43, "label43");
    GLADE_HOOKUP_OBJECT (mainWindow, vbox33, "vbox33");
-   GLADE_HOOKUP_OBJECT (mainWindow, hbox25, "hbox25");
-   GLADE_HOOKUP_OBJECT (mainWindow, vbox36, "vbox36");
-   GLADE_HOOKUP_OBJECT (mainWindow, label47, "label47");
-   GLADE_HOOKUP_OBJECT (mainWindow, prExpEntry, "prExpEntry");
-   GLADE_HOOKUP_OBJECT (mainWindow, vseparator17, "vseparator17");
-   GLADE_HOOKUP_OBJECT (mainWindow, fixed8, "fixed8");
    GLADE_HOOKUP_OBJECT (mainWindow, hseparator14, "hseparator14");
    GLADE_HOOKUP_OBJECT (mainWindow, hbox20, "hbox20");
--- 1075,1100 ----
    GLADE_HOOKUP_OBJECT (mainWindow, label39, "label39");
    GLADE_HOOKUP_OBJECT (mainWindow, frame4, "frame4");
!   GLADE_HOOKUP_OBJECT (mainWindow, vbox44, "vbox44");
!   GLADE_HOOKUP_OBJECT (mainWindow, hbox33, "hbox33");
!   GLADE_HOOKUP_OBJECT (mainWindow, vbox45, "vbox45");
!   GLADE_HOOKUP_OBJECT (mainWindow, label54, "label54");
    GLADE_HOOKUP_OBJECT (mainWindow, prLevelEntry, "prLevelEntry");
!   GLADE_HOOKUP_OBJECT (mainWindow, vseparator22, "vseparator22");
!   GLADE_HOOKUP_OBJECT (mainWindow, vbox46, "vbox46");
!   GLADE_HOOKUP_OBJECT (mainWindow, label55, "label55");
    GLADE_HOOKUP_OBJECT (mainWindow, prRankEntry, "prRankEntry");
!   GLADE_HOOKUP_OBJECT (mainWindow, vseparator23, "vseparator23");
!   GLADE_HOOKUP_OBJECT (mainWindow, vbox47, "vbox47");
!   GLADE_HOOKUP_OBJECT (mainWindow, label56, "label56");
    GLADE_HOOKUP_OBJECT (mainWindow, prHRankEntry, "prHRankEntry");
+   GLADE_HOOKUP_OBJECT (mainWindow, hseparator16, "hseparator16");
+   GLADE_HOOKUP_OBJECT (mainWindow, hbox34, "hbox34");
+   GLADE_HOOKUP_OBJECT (mainWindow, vbox48, "vbox48");
+   GLADE_HOOKUP_OBJECT (mainWindow, label57, "label57");
+   GLADE_HOOKUP_OBJECT (mainWindow, prExpEntry, "prExpEntry");
+   GLADE_HOOKUP_OBJECT (mainWindow, vseparator24, "vseparator24");
+   GLADE_HOOKUP_OBJECT (mainWindow, fixed17, "fixed17");
    GLADE_HOOKUP_OBJECT (mainWindow, label43, "label43");
    GLADE_HOOKUP_OBJECT (mainWindow, vbox33, "vbox33");
    GLADE_HOOKUP_OBJECT (mainWindow, hseparator14, "hseparator14");
    GLADE_HOOKUP_OBJECT (mainWindow, hbox20, "hbox20");

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31178

Modified Files:
	callbacks.c 
Log Message:
Fix tab format.


Index: callbacks.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/callbacks.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** callbacks.c	16 Mar 2005 23:46:17 -0000	1.27
--- callbacks.c	17 Mar 2005 02:43:16 -0000	1.28
***************
*** 413,417 ****
  void *pthread_query_server(void *data)
  {
!   SERVER *current = data;
  
  	query_server((SERVER *)current);
--- 413,417 ----
  void *pthread_query_server(void *data)
  {
! 	SERVER *current = data;
  
  	query_server((SERVER *)current);
***************
*** 421,425 ****
  int check_current_queries()
  {
!   SERVER *current = NULL;
  	int count = 0;
  
--- 421,425 ----
  int check_current_queries()
  {
! 	SERVER *current = NULL;
  	int count = 0;
  
***************
*** 427,435 ****
  	while(current != NULL)
  	{
!     if(current->updating)
!       count++;
  		current = current->next;
  	}
!   return count;
  }
  
--- 427,435 ----
  	while(current != NULL)
  	{
! 		if(current->updating)
! 		count++;
  		current = current->next;
  	}
! 	return count;
  }
  
***************
*** 456,460 ****
  
  	if(!serv)
!     serv = (SERVER *)malloc(sizeof(SERVER));
  	serv = query_master();
  	if(serv)
--- 456,460 ----
  
  	if(!serv)
! 		serv = (SERVER *)malloc(sizeof(SERVER));
  	serv = query_master();
  	if(serv)
***************
*** 466,473 ****
  		gtk_tree_view_set_model(GTK_TREE_VIEW(slistTreeView), GTK_TREE_MODEL(store));
  		if(!(get_option_string("MaxSimQueries")))
!       maxSimQueries = 5;
  		else
!       maxSimQueries = atoi(get_option_string("MaxSimQueries"));
!     pthread_attr_init(&attr);
  		pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
  		current = serv;
--- 466,473 ----
  		gtk_tree_view_set_model(GTK_TREE_VIEW(slistTreeView), GTK_TREE_MODEL(store));
  		if(!(get_option_string("MaxSimQueries")))
! 			maxSimQueries = 5;
  		else
! 			maxSimQueries = atoi(get_option_string("MaxSimQueries"));
! 		pthread_attr_init(&attr);
  		pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
  		current = serv;
***************
*** 475,485 ****
  		while(current != NULL || currentNumQueries)
  		{
!       for(i = currentNumQueries; i < maxSimQueries && current != NULL; i++, count++)
  			{
!         current->updating = 1;
!         res = pthread_create(&threads[i], &attr, pthread_query_server, (void *)current);
  				if(res)
  				{
!           perror("pthread_create");
  					current->updating = 0;
  				}
--- 475,485 ----
  		while(current != NULL || currentNumQueries)
  		{
! 			for(i = currentNumQueries; i < maxSimQueries && current != NULL; i++, count++)
  			{
! 				current->updating = 1;
! 				res = pthread_create(&threads[i], &attr, pthread_query_server, (void *)current);
  				if(res)
  				{
! 					perror("pthread_create");
  					current->updating = 0;
  				}
***************
*** 488,501 ****
  			if((currentNumQueries = check_current_queries()) < maxSimQueries)
  			{
!         current = serv;
  				while(current != NULL)
!         {
!           if(!current->updated)
  					{
!             current = current->next;
!             continue;
  					}
  					if((current->numPlayers <= current->maxPlayers) && (current->numPlayers <= MAX_PLRS))
!             store = GTK_LIST_STORE(slistTreeView_append(store, current));
  					numQueried++;
  					current->updated = 0;
--- 488,501 ----
  			if((currentNumQueries = check_current_queries()) < maxSimQueries)
  			{
! 				current = serv;
  				while(current != NULL)
! 				{
! 					if(!current->updated)
  					{
! 						current = current->next;
! 						continue;
  					}
  					if((current->numPlayers <= current->maxPlayers) && (current->numPlayers <= MAX_PLRS))
! 						store = GTK_LIST_STORE(slistTreeView_append(store, current));
  					numQueried++;
  					current->updated = 0;
***************
*** 504,523 ****
  			}
  			else
!         continue;
  			gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar), ((double)count / (double)numServers));
!       current = serv;
  			for(i = 0; i < count && current != NULL; i++)
!         current = current->next;
  			while(gtk_events_pending())
!         gtk_main_iteration();
  		}
  		gettimeofday(&end, NULL);
  		pthread_attr_destroy(&attr);
  		gtk_widget_hide(progressbar);
!     if(end.tv_usec < start.tv_usec)
!     {
!       end.tv_sec--;
!       end.tv_usec += 1000000;
!     }
  		sprintf(statusText, "%d/%d Servers Queried in %ld.%ld seconds", numQueried, numServers, (end.tv_sec - start.tv_sec), ((end.tv_usec - start.tv_usec) / 1000));
  		set_statusbar_msg(GTK_WIDGET(button), statusText);
--- 504,523 ----
  			}
  			else
! 				continue;
  			gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progressbar), ((double)count / (double)numServers));
! 			current = serv;
  			for(i = 0; i < count && current != NULL; i++)
! 				current = current->next;
  			while(gtk_events_pending())
! 				gtk_main_iteration();
  		}
  		gettimeofday(&end, NULL);
  		pthread_attr_destroy(&attr);
  		gtk_widget_hide(progressbar);
! 		if(end.tv_usec < start.tv_usec)
! 		{
! 			end.tv_sec--;
! 			end.tv_usec += 1000000;
! 		}
  		sprintf(statusText, "%d/%d Servers Queried in %ld.%ld seconds", numQueried, numServers, (end.tv_sec - start.tv_sec), ((end.tv_usec - start.tv_usec) / 1000));
  		set_statusbar_msg(GTK_WIDGET(button), statusText);
***************
*** 527,531 ****
  		set_statusbar_msg(GTK_WIDGET(button), "Master Unreachable");
  	while(gtk_events_pending())
!     gtk_main_iteration();
  }
  
--- 527,531 ----
  		set_statusbar_msg(GTK_WIDGET(button), "Master Unreachable");
  	while(gtk_events_pending())
! 		gtk_main_iteration();
  }
  
***************
*** 707,716 ****
  		if(!(exec_dir = get_option_string("ExecDir")))
  		{
!       display_error("You need to set your preferences.\n");
  			return;
  		}
  		if(!(pwad_dir = get_option_string("WadDir")))
  		{
!       display_error("You need to set your preferences.\n");
  			return;
  		}
--- 707,716 ----
  		if(!(exec_dir = get_option_string("ExecDir")))
  		{
! 			display_error("You need to set your preferences.\n");
  			return;
  		}
  		if(!(pwad_dir = get_option_string("WadDir")))
  		{
! 			display_error("You need to set your preferences.\n");
  			return;
  		}
***************
*** 1215,1221 ****
  	int maxNumQueries = 0;
  
!   execDir = get_option_string("ExecDir");
!   wadsDir = get_option_string("WadDir");
!   extraParams = get_option_string("ExtraParams");
  	if(get_option_string("MaxSimQueries"))
      maxNumQueries = atoi(get_option_string("MaxSimQueries"));
--- 1215,1221 ----
  	int maxNumQueries = 0;
  
! 	execDir = get_option_string("ExecDir");
! 	wadsDir = get_option_string("WadDir");
! 	extraParams = get_option_string("ExtraParams");
  	if(get_option_string("MaxSimQueries"))
      maxNumQueries = atoi(get_option_string("MaxSimQueries"));

[Gzlauncher-cvs] gzlauncher/src s

[mwoodj <mw...@us...>]

Update of /cvsroot/gzlauncher/gzlauncher/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7963/src

Modified Files:
	interface.c 
Log Message:
Fix first directory lookup button in preferences window.


Index: interface.c
===================================================================
RCS file: /cvsroot/gzlauncher/gzlauncher/src/interface.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** interface.c	17 Mar 2005 02:31:01 -0000	1.8
--- interface.c	21 Mar 2005 07:01:34 -0000	1.9
***************
*** 1183,1187 ****
    gtk_widget_show (execBrowse);
    gtk_box_pack_start (GTK_BOX (hbox21), execBrowse, FALSE, FALSE, 0);
-   gtk_widget_set_size_request (execBrowse, -1, 0);
  
    fixed4 = gtk_fixed_new ();
--- 1183,1186 ----