← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/irssi/oneiric

« back to all changes in this revision

Viewing changes to src/core/servers-reconnect.c

  • Committer: Bazaar Package Importer
  • Author(s): Andres Rodriguez
  • Date: 2009-05-05 15:50:50 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20090505155050-aoqlnpes7che9rtd
Tags: 0.8.13-1ubuntu1
https://launchpad.net/bugs/372411
* Merge from debian unstable (LP: #372411), remaining changes:
  - debian/patches: 03firsttimer_text
    + Adapt it so it tells you about connecting to irc.ubuntu.com and
      joining #ubuntu instead of irc.debian.org and #debian.
  - debian/patches: 90irc-ubuntu-com
* Fixed debian/patches/90irc-ubuntu-com for new irssi.conf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/servers-reconnect.c
203
203
#define server_should_reconnect(server) \
204
204
        ((server)->connection_lost && !(server)->no_reconnect && \
205
205
        ((server)->connrec->chatnet != NULL || \
206
 
                (!(server)->banned && !(server)->dns_error)))
 
206
                !(server)->banned))
207
207
 
208
208
#define sserver_connect_ok(rec, net) \
209
 
        (!(rec)->banned && !(rec)->dns_error && (rec)->chatnet != NULL && \
 
209
        (!(rec)->banned && (rec)->chatnet != NULL && \
210
210
        g_strcasecmp((rec)->chatnet, (net)) == 0)
211
211
 
212
212
static void sig_reconnect(SERVER_REC *server)
402
402
                return;
403
403
        }
404
404
 
405
 
        if (g_strcasecmp(tag, "all") == 0) {
 
405
        if (g_ascii_strcasecmp(tag, "all") == 0) {
406
406
                /* reconnect all servers in reconnect queue */
407
407
                reconnect_all();
408
408
                cmd_params_free(free_arg);
415
415
                        cmd_param_error(CMDERR_NOT_CONNECTED);
416
416
                rec = reconnects->data;
417
417
        } else {
418
 
                if (g_strncasecmp(data, "RECON-", 6) == 0)
 
418
                if (g_ascii_strncasecmp(data, "RECON-", 6) == 0)
419
419
                        data += 6;
420
420
 
421
421
                tagnum = atoi(tag);
439
439
{
440
440
        RECONNECT_REC *rec;
441
441
 
442
 
        if (g_strncasecmp(data, "RECON-", 6) != 0)
 
442
        if (g_ascii_strncasecmp(data, "RECON-", 6) != 0)
443
443
                return; /* handle only reconnection removing */
444
444
 
445
445
        rec = reconnect_find_tag(atoi(data+6));