deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-16 18:50:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix initial autojoins and some erroneous copies/frees

Browse Source
This commit is contained in:
Berke Viktor
2013-05-14 16:40:32 +02:00
parent 7cdfeff204
commit a435e8648f
6 changed files with 131 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/common/proto-irc.c
View File

@@ -118,6 +118,7 @@ irc_join (server *serv, char *channel, char *key)
tcp_sendf (serv, "JOIN %s\r\n", channel);
}
#if 0//FIXME remove when finished porting
static void
irc_join_list_flush (server *serv, GString *c, GString *k)
{
@@ -231,6 +232,60 @@ irc_join_list (server *serv, GSList *channels, GSList *keys)
}
irc_join_list_flush (serv, c, k);
#endif
static void
irc_join_list_flush (server *serv)
{
/* FIXME implement flushing for too long favorites lists */
}
static void
irc_join_list (server *serv, GSList *favorites)
{
int first_item = 1;
favchannel *fav;
char *chanstr;
char *keystr;
GString *chanlist = g_string_new (NULL);
GString *keylist = g_string_new (NULL);
GSList *favlist;
favlist = favorites;
while (favlist)
{
fav = favlist->data;
if (!first_item)
{
g_string_append_c (chanlist, ','); /* add separators but only if it's not the 1st element */
g_string_append_c (keylist, ',');
}
g_string_append (chanlist, fav->name);
if (fav->key)
{
g_string_append (keylist, fav->key);
}
else
{
g_string_append_c (keylist, 'x'); /* 'x' filler for keyless channels */
}
first_item = 0;
favlist = favlist->next;
}
chanstr = g_string_free (chanlist, FALSE); /* convert our strings to char arrays */
keystr = g_string_free (keylist, FALSE);
tcp_sendf (serv, "JOIN %s %s\r\n", chanstr, keystr); /* send the actual command */
g_free (chanstr); /* cleanup */
g_free (keystr);
g_slist_free (favlist);
}
static void