devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-20 23:46:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always update UI in event loop, removed updates from rest of code

Browse Source
This commit is contained in:
James Booth
2014-09-01 19:14:52 +01:00
parent c73c4b20ef
commit bc3c4e09a1
9 changed files with 13 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/server_events.c
View File

@@ -132,7 +132,6 @@ handle_lost_connection(void)
muc_clear_invites();
chat_sessions_clear();
ui_disconnected();
ui_current_page_off();
}
void
@@ -140,7 +139,6 @@ handle_failed_login(void)
{
cons_show_error("Login failed.");
log_info("Login failed");
ui_current_page_off();
}
void
@@ -148,28 +146,24 @@ handle_software_version_result(const char * const jid, const char * const prese
const char * const name, const char * const version, const char * const os)
{
cons_show_software_version(jid, presence, name, version, os);
ui_current_page_off();
}
void
handle_disco_info(const char *from, GSList *identities, GSList *features)
{
cons_show_disco_info(from, identities, features);
ui_current_page_off();
}
void
handle_room_list(GSList *rooms, const char *conference_node)
{
cons_show_room_list(rooms, conference_node);
ui_current_page_off();
}
void
handle_disco_items(GSList *items, const char *jid)
{
cons_show_disco_items(items, jid);
ui_current_page_off();
}
void
@@ -180,7 +174,6 @@ handle_room_invite(jabber_invite_t invite_type,
if (!muc_room_is_active(room) && !muc_invites_include(room)) {
cons_show_room_invite(invitor, room, reason);
muc_add_invite(room);
ui_current_page_off();
}
}
@@ -190,7 +183,6 @@ handle_room_broadcast(const char *const room_jid,
{
if (muc_get_roster_received(room_jid)) {
ui_room_broadcast(room_jid, message);
ui_current_page_off();
} else {
muc_add_pending_broadcast(room_jid, message);
}
@@ -202,7 +194,6 @@ handle_room_subject(const char * const room_jid, const char * const subject)
muc_set_subject(room_jid, subject);
if (muc_get_roster_received(room_jid)) {
ui_room_subject(room_jid, subject);
ui_current_page_off();
}
}
@@ -211,7 +202,6 @@ handle_room_history(const char * const room_jid, const char * const nick,
GTimeVal tv_stamp, const char * const message)
{
ui_room_history(room_jid, nick, tv_stamp, message);
ui_current_page_off();
}
void
@@ -231,7 +221,6 @@ void
handle_duck_result(const char * const result)
{
ui_duck_result(result);
ui_current_page_off();
}
void
@@ -332,14 +321,12 @@ void
handle_typing(char *from)
{
ui_contact_typing(from);
ui_current_page_off();
}
void
handle_gone(const char * const from)
{
ui_recipient_gone(from);
ui_current_page_off();
}
void
@@ -351,7 +338,6 @@ handle_subscription(const char *from, jabber_subscr_t type)
cons_show("Received authorization request from %s", from);
log_info("Received authorization request from %s", from);
ui_print_system_msg_from_recipient(from, "Authorization request, type '/sub allow' to accept or '/sub deny' to reject");
ui_current_page_off();
if (prefs_get_boolean(PREF_NOTIFY_SUB)) {
notify_subscription(from);
}
@@ -360,13 +346,11 @@ handle_subscription(const char *from, jabber_subscr_t type)
cons_show("Subscription received from %s", from);
log_info("Subscription received from %s", from);
ui_print_system_msg_from_recipient(from, "Subscribed");
ui_current_page_off();
break;
case PRESENCE_UNSUBSCRIBED:
cons_show("%s deleted subscription", from);
log_info("%s deleted subscription", from);
ui_print_system_msg_from_recipient(from, "Unsubscribed");
ui_current_page_off();
break;
default:
/* unknown type */
@@ -463,7 +447,6 @@ handle_room_nick_change(const char * const room,
const char * const nick)
{
ui_room_nick_change(room, nick);
ui_current_page_off();
}
void
@@ -482,7 +465,6 @@ handle_room_roster_complete(const char * const room)
char *subject = muc_get_subject(room);
if (subject != NULL) {
ui_room_subject(room, subject);
ui_current_page_off();
}
GList *pending_broadcasts = muc_get_pending_broadcasts(room);
@@ -492,7 +474,6 @@ handle_room_roster_complete(const char * const room)
ui_room_broadcast(room, curr->data);
curr = g_list_next(curr);
}
ui_current_page_off();
}
}
@@ -507,7 +488,6 @@ handle_room_member_presence(const char * const room,
char *muc_status_pref = prefs_get_string(PREF_STATUSES_MUC);
if (g_strcmp0(muc_status_pref, "all") == 0) {
ui_room_member_presence(room, nick, show, status);
ui_current_page_off();
}
prefs_free_string(muc_status_pref);
}
@@ -523,7 +503,6 @@ handle_room_member_online(const char * const room, const char * const nick,
char *muc_status_pref = prefs_get_string(PREF_STATUSES_MUC);
if (g_strcmp0(muc_status_pref, "none") != 0) {
ui_room_member_online(room, nick, show, status);
ui_current_page_off();
}
prefs_free_string(muc_status_pref);
}
@@ -537,7 +516,6 @@ handle_room_member_offline(const char * const room, const char * const nick,
char *muc_status_pref = prefs_get_string(PREF_STATUSES_MUC);
if (g_strcmp0(muc_status_pref, "none") != 0) {
ui_room_member_offline(room, nick);
ui_current_page_off();
}
prefs_free_string(muc_status_pref);
}
@@ -547,7 +525,6 @@ handle_room_member_nick_change(const char * const room,
const char * const old_nick, const char * const nick)
{
ui_room_member_nick_change(room, old_nick, nick);
ui_current_page_off();
}
void
@@ -555,7 +532,6 @@ handle_group_add(const char * const contact,
const char * const group)
{
ui_group_added(contact, group);
ui_current_page_off();
}
void
@@ -563,21 +539,18 @@ handle_group_remove(const char * const contact,
const char * const group)
{
ui_group_removed(contact, group);
ui_current_page_off();
}
void
handle_roster_remove(const char * const barejid)
{
ui_roster_remove(barejid);
ui_current_page_off();
}
void
handle_roster_add(const char * const barejid, const char * const name)
{
ui_roster_add(barejid, name);
ui_current_page_off();
}
void
@@ -585,7 +558,6 @@ handle_autoping_cancel(void)
{
prefs_set_autoping(0);
cons_show_error("Server ping not supported, autoping disabled.");
ui_current_page_off();
}
void