aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

room_chat: add occupants to room roster until roster received

Browse Source
This commit is contained in:
James Booth 2012-11-07 22:59:48 +00:00
parent 6cb9c853cb
commit c4c5668779
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/jabber.c
View File

@ -660,9 +660,12 @@ _room_presence_handler(const char * const jid)
// handle self presence (means room roster has been sent) // handle self presence (means room roster has been sent)
if (strcmp(room_get_nick_for_room(room), nick) == 0) { if (strcmp(room_get_nick_for_room(room), nick) == 0) {
room_set_roster_received(room);
prof_handle_room_roster_complete(room); prof_handle_room_roster_complete(room);
} else { } else {
room_add_to_roster(room, nick); if (!room_get_roster_received(room)) {
room_add_to_roster(room, nick);
}
} }
return 1; return 1;

24
src/room_chat.c
View File

@ -29,6 +29,7 @@ typedef struct _muc_room_t {
char *jid; char *jid;
char *nick; char *nick;
GSList *roster; GSList *roster;
gboolean roster_received;
} muc_room; } muc_room;
GHashTable *rooms = NULL; GHashTable *rooms = NULL;
@ -47,6 +48,7 @@ room_join(const char * const jid, const char * const nick)
new_room->jid = strdup(jid); new_room->jid = strdup(jid);
new_room->nick = strdup(nick); new_room->nick = strdup(nick);
new_room->roster = NULL; new_room->roster = NULL;
new_room->roster_received = FALSE;
g_hash_table_insert(rooms, strdup(jid), new_room); g_hash_table_insert(rooms, strdup(jid), new_room);
} }
@ -131,6 +133,28 @@ room_get_roster(const char * const jid)
} }
} }
void
room_set_roster_received(const char * const jid)
{
muc_room *room = g_hash_table_lookup(rooms, jid);
if (room != NULL) {
room->roster_received = TRUE;
}
}
gboolean
room_get_roster_received(const char * const jid)
{
muc_room *room = g_hash_table_lookup(rooms, jid);
if (room != NULL) {
return room->roster_received;
} else {
return FALSE;
}
}
static void static void
_room_free(muc_room *room) _room_free(muc_room *room)
{ {

2
src/room_chat.h
View File

@ -30,3 +30,5 @@ gboolean room_parse_room_jid(const char * const room_jid, char **room,
char **nick); char **nick);
void room_add_to_roster(const char * const jid, const char * const nick); void room_add_to_roster(const char * const jid, const char * const nick);
GSList * room_get_roster(const char * const jid); GSList * room_get_roster(const char * const jid);
void room_set_roster_received(const char * const jid);
gboolean room_get_roster_received(const char * const jid);