Removed server event delegation functions

This commit is contained in:
James Booth
2015-05-01 00:55:40 +01:00
parent e11e55e31a
commit 0118178080
8 changed files with 76 additions and 394 deletions

View File

@@ -41,6 +41,7 @@
#include "log.h"
#include "profanity.h"
#include "ui/ui.h"
#include "event/server_events.h"
#include "tools/autocomplete.h"
#include "xmpp/connection.h"
@@ -163,7 +164,7 @@ _group_add_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
{
if (userdata != NULL) {
GroupData *data = userdata;
sv_ev_group_add(data->name, data->group);
ui_group_added(data->name, data->group);
free(data->name);
free(data->group);
free(userdata);
@@ -210,7 +211,7 @@ _group_remove_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
{
if (userdata != NULL) {
GroupData *data = userdata;
sv_ev_group_remove(data->name, data->group);
ui_group_removed(data->name, data->group);
free(data->name);
free(data->group);
free(userdata);
@@ -257,10 +258,8 @@ _roster_set_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
if (name == NULL) {
name = barejid_lower;
}
roster_remove(name, barejid_lower);
sv_ev_roster_remove(barejid_lower);
ui_roster_remove(barejid_lower);
// otherwise update local roster
} else {
@@ -278,7 +277,7 @@ _roster_set_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza,
if (contact == NULL) {
gboolean added = roster_add(barejid_lower, name, groups, sub, pending_out);
if (added) {
sv_ev_roster_add(barejid_lower, name);
ui_roster_add(barejid_lower, name);
}
} else {
sv_ev_roster_update(barejid_lower, name, groups, sub, pending_out);