← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/irc/core/channel-rejoin.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/irc/core/channel-rejoin.c
215
215
                }
216
216
 
217
217
                rec->joining = TRUE;
218
 
                g_string_sprintfa(channels, "%s,", rec->channel);
 
218
                g_string_append_printf(channels, "%s,", rec->channel);
219
219
                if (rec->key == NULL)
220
220
                        g_string_append(keys, "x,");
221
221
                else {
222
 
                        g_string_sprintfa(keys, "%s,", rec->key);
 
222
                        g_string_append_printf(keys, "%s,", rec->key);
223
223
                        use_keys = TRUE;
224
224
                }
225
225
        }
228
228
                g_string_truncate(channels, channels->len-1);
229
229
                g_string_truncate(keys, keys->len-1);
230
230
 
231
 
                if (use_keys) g_string_sprintfa(channels, " %s", keys->str);
 
231
                if (use_keys) g_string_append_printf(channels, " %s", keys->str);
232
232
                server->channels_join(SERVER(server), channels->str, TRUE);
233
233
        }
234
234