← Back to branch summary

~ubuntu-branches/debian/sid/freeciv/sid

« back to all changes in this revision

Viewing changes to client/gui-sdl/connectdlg.c

  • Committer: Bazaar Package Importer
  • Author(s): Clint Adams, Karl Goetz, Clint Adams
  • Date: 2010-02-23 22:09:02 UTC
  • mfrom: (7.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100223220902-s3spqi1x4e190y0t
http://bugs.debian.org/523772
http://bugs.debian.org/517787
[ Karl Goetz ]
* Remove civserver files in /etc/ggzd/ (Closes: 523772, 517787)
* Adding ${misc:Depends} to all binary packages (lintian warnings)

[ Clint Adams ]
* New upstream version.
  - Drop data_dsc_use_bindir.diff (binary pathnames have changed).

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/gui-sdl/connectdlg.c
32
32
#include "log.h"
33
33
 
34
34
/* client */
35
 
#include "civclient.h"
36
 
#include "clinet.h"
 
35
#include "client_main.h"
 
36
#include "clinet.h"             /* connect_to_server() */
37
37
#include "packhand.h"
38
38
#include "servers.h"
39
39
 
96
96
    if (connect_to_server(user_name, server_host, server_port,
97
97
                          errbuf, sizeof(errbuf)) != -1) {
98
98
    } else {
99
 
      append_output_window(errbuf);
 
99
      output_window_append(ftc_any, errbuf);
100
100
      real_update_meswin_dialog();
101
101
  
102
102
      /* button up */
161
161
static void server_scan_error(struct server_scan *scan,
162
162
                              const char *message)
163
163
{
164
 
  append_output_window(message);
 
164
  output_window_append(ftc_client, message);
165
165
  freelog(LOG_NORMAL, "%s", message);
166
166
 
167
167
  switch (server_scan_get_type(scan)) {
277
277
  
278
278
  if(!pServer_list) {
279
279
    if (lan_scan) {
280
 
      append_output_window(_("No LAN servers found")); 
 
280
      output_window_append(ftc_client, _("No LAN servers found")); 
281
281
    } else {
282
 
      append_output_window(_("No public servers found")); 
 
282
      output_window_append(ftc_client, _("No public servers found")); 
283
283
    }        
284
284
    real_update_meswin_dialog();
285
285
    set_client_page(PAGE_NETWORK);
341
341
 
342
342
  if(!count) {
343
343
    if (lan_scan) {
344
 
      append_output_window(_("No LAN servers found")); 
 
344
      output_window_append(ftc_client, _("No LAN servers found")); 
345
345
    } else {
346
 
      append_output_window(_("No public servers found")); 
347
 
    }        
 
346
      output_window_append(ftc_client, _("No public servers found"));
 
347
    }
348
348
    real_update_meswin_dialog();
349
349
    set_client_page(PAGE_NETWORK);
350
350
    return;
744
744
    
745
745
    flush_dirty();
746
746
    
747
 
    send_packet_authentication_reply(&aconnection, &reply);
 
747
    send_packet_authentication_reply(&client.conn, &reply);
748
748
  }
749
749
  return -1;
750
750
}
1102
1102
      struct packet_authentication_reply reply;
1103
1103
 
1104
1104
      sz_strlcpy(reply.password, password);
1105
 
      send_packet_authentication_reply(&aconnection, &reply);
 
1105
      send_packet_authentication_reply(&client.conn, &reply);
1106
1106
      return;
1107
1107
    } else {
1108
1108
      popup_user_passwd_dialog(message);