← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/fe-common/irc/fe-irc-server.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/fe-common/irc/fe-irc-server.c
109
109
                if (rec->use_ssl) {
110
110
                        g_string_append(str, "ssl, ");
111
111
                        if (rec->ssl_cert) {
112
 
                                g_string_sprintfa(str, "ssl_cert: %s, ", rec->ssl_cert);
 
112
                                g_string_append_printf(str, "ssl_cert: %s, ", rec->ssl_cert);
113
113
                                if (rec->ssl_pkey)
114
 
                                        g_string_sprintfa(str, "ssl_pkey: %s, ", rec->ssl_pkey);
 
114
                                        g_string_append_printf(str, "ssl_pkey: %s, ", rec->ssl_pkey);
115
115
                        }
116
116
                        if (rec->ssl_verify)
117
117
                                g_string_append(str, "ssl_verify, ");
118
118
                        if (rec->ssl_cafile)
119
 
                                g_string_sprintfa(str, "ssl_cafile: %s, ", rec->ssl_cafile);
 
119
                                g_string_append_printf(str, "ssl_cafile: %s, ", rec->ssl_cafile);
120
120
                        if (rec->ssl_capath)
121
 
                                g_string_sprintfa(str, "ssl_capath: %s, ", rec->ssl_capath);
 
121
                                g_string_append_printf(str, "ssl_capath: %s, ", rec->ssl_capath);
122
122
                        
123
123
                }
124
124
                if (rec->max_cmds_at_once > 0)
125
 
                        g_string_sprintfa(str, "cmdmax: %d, ", rec->max_cmds_at_once);
 
125
                        g_string_append_printf(str, "cmdmax: %d, ", rec->max_cmds_at_once);
126
126
                if (rec->cmd_queue_speed > 0)
127
 
                        g_string_sprintfa(str, "cmdspeed: %d, ", rec->cmd_queue_speed);
 
127
                        g_string_append_printf(str, "cmdspeed: %d, ", rec->cmd_queue_speed);
128
128
                if (rec->max_query_chans > 0)
129
 
                        g_string_sprintfa(str, "querychans: %d, ", rec->max_query_chans);
 
129
                        g_string_append_printf(str, "querychans: %d, ", rec->max_query_chans);
130
130
                if (rec->own_host != NULL)
131
 
                        g_string_sprintfa(str, "host: %s, ", rec->own_host);
 
131
                        g_string_append_printf(str, "host: %s, ", rec->own_host);
132
132
 
133
133
                if (str->len > 1) g_string_truncate(str, str->len-2);
134
134
                printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, IRCTXT_SETUPSERVER_LINE,