iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix sending notify list to correct networks

Browse Source 
Fixes #1015
This commit is contained in:
TingPing 2014-06-08 01:31:31 -04:00
parent e21e184141
commit 540eac0542
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/common/notify.c
View File

@ -410,32 +410,50 @@ void
notify_send_watches (server * serv) notify_send_watches (server * serv)
{ {
struct notify *notify; struct notify *notify;
const int format_len = serv->supports_monitor ? 1 : 2; /* just , for monitor or + and space for watch */
GSList *list; GSList *list;
GSList *point; GSList *point;
int len; GSList *send_list = NULL;
int len = 0;
len = 0; /* Only get the list for this network */
point = list = notify_list; list = notify_list;
while (list) while (list)
{ {
notify = list->data; notify = list->data;
if (notify_do_network (notify, serv)) if (notify_do_network (notify, serv))
{ {
len += strlen (notify->name) + serv->supports_monitor ? 1 : 2; /* just , for monitor or + and space for watch */; send_list = g_slist_append (send_list, notify);
if (len > 500)
{
notify_flush_watches (serv, point, list);
len = strlen (notify->name) + serv->supports_monitor ? 1 : 2;
point = list;
}
} }
list = list->next; list = list->next;
} }
if (point) /* Now send that list in batches */
point = list = send_list;
while (list)
{
notify = list->data;
len += strlen (notify->name) + format_len;
if (len > 500)
{
/* Too long send existing list */
notify_flush_watches (serv, point, list);
len = strlen (notify->name) + format_len;
point = list; /* We left off here */
}
list = g_slist_next (list);
}
if (len) /* We had leftovers under 500, send them all */
{
notify_flush_watches (serv, point, NULL); notify_flush_watches (serv, point, NULL);
}
g_slist_free (send_list);
} }
/* called when receiving a ISON 303 - should this func go? */ /* called when receiving a ISON 303 - should this func go? */