Re: [Freeciv-Dev] (PR#40256) Freeciv 2.1.4 bug

2008-06-05 Thread Daniel Markstedt

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40256 

On 6/5/08, Madeline Book [EMAIL PROTECTED] wrote:

  URL: http://bugs.freeciv.org/Ticket/Display.html?id=40256 


 The previous patch works but is a little inefficient
  in that it adds a useless call to get_server_scan_list
  before a new scan is actually started. So here is
  a slight variation that fixes this.



Excellent work Madeline. :)

Could you commit it to S2_1 before Saturday to it makes it into the
next maintenance release?

Thanks,
 ~Daniel



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] (PR#40256) Freeciv 2.1.4 bug

2008-06-05 Thread Madeline Book

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40256 

 [dmarks - Thu Jun 05 07:24:19 2008]:
 
 On 6/5/08, Madeline Book [EMAIL PROTECTED] wrote:
 
   URL: http://bugs.freeciv.org/Ticket/Display.html?id=40256 
 
 
  The previous patch works but is a little inefficient
   in that it adds a useless call to get_server_scan_list
   before a new scan is actually started. So here is
   a slight variation that fixes this.
 
 
 
 Excellent work Madeline. :)
 
 Could you commit it to S2_1 before Saturday to it makes it into the
 next maintenance release?

I will, once I finish converting my git repository to the
new svn url (sometime today I suppose). :I


--
難しいじゃありませんが、かなりの時間が掛かりますね。

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] (PR#40256) Freeciv 2.1.4 bug

2008-06-04 Thread James Hemming

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40256 

Hi,

I'm reporting a bug in Freeciv 2.1.4 compiled from source running on Ubuntu.

On the Connect to Network Game screen, the Refresh button does not appear to 
work and the server list isn't updated. Clicking Cancel and then clicking 
Connect to Network Game again results in a refreshed list of servers.



  __
Sent from Yahoo! Mail.
A Smarter Email http://uk.docs.yahoo.com/nowyoucan.html



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] (PR#40256) Freeciv 2.1.4 bug

2008-06-04 Thread Madeline Book

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40256 

 [EMAIL PROTECTED] - Wed Jun 04 13:31:11 2008]:
 
 Hi,
 
 I'm reporting a bug in Freeciv 2.1.4 compiled from source running on
Ubuntu.
 
 On the Connect to Network Game screen, the Refresh button does not
appear to work and the server list isn't updated. Clicking Cancel
and then clicking Connect to Network Game again results in a
refreshed list of servers.

I have confirmed that the refresh button does not appear
to do anything on S2_1 r14673. I'll investigate this and
see what I can find.


--
ちょっと怪しいのですね

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] (PR#40256) Freeciv 2.1.4 bug

2008-06-04 Thread Madeline Book

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40256 

The previous patch works but is a little inefficient
in that it adds a useless call to get_server_scan_list
before a new scan is actually started. So here is
a slight variation that fixes this.


--
少々お待ち下さい
diff --git a/client/gui-gtk-2.0/pages.c b/client/gui-gtk-2.0/pages.c
index f9aff6d..5883957 100644
--- a/client/gui-gtk-2.0/pages.c
+++ b/client/gui-gtk-2.0/pages.c
@@ -379,6 +379,10 @@ static void server_scan_error(struct server_scan *scan,
 **/
 static void update_network_lists(void)
 {
+  if (scan_timer != 0) {
+g_source_remove(scan_timer);
+  }
+
   if (!meta) {
 meta = server_scan_begin(SERVER_SCAN_GLOBAL, server_scan_error);
   }
@@ -387,11 +391,9 @@ static void update_network_lists(void)
 lan = server_scan_begin(SERVER_SCAN_LOCAL, server_scan_error);
   }
 
-  if (scan_timer == 0) { 
-scan_timer = g_timeout_add_full(G_PRIORITY_DEFAULT, 100,
-get_server_scan_list,
-NULL, get_server_scan_destroy);
-  }
+  scan_timer = g_timeout_add_full(G_PRIORITY_DEFAULT, 100,
+  get_server_scan_list,
+  NULL, get_server_scan_destroy);
 }
 
 /**
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev