devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 9 Actions Packages Projects 1 Releases Wiki Activity

Chat room windows now created only after successful join

Browse Source
This commit is contained in:
James Booth
2014-04-21 00:37:04 +01:00
parent 9a55d8ad19
commit 2c15aba92a
17 changed files with 89 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/muc.c
View File

@@ -34,6 +34,7 @@ typedef struct _muc_room_t {
char *nick; // e.g. Some User
char *password;
char *subject;
gboolean autojoin;
gboolean pending_nick_change;
GHashTable *roster;
Autocomplete nick_ac;
@@ -126,7 +127,8 @@ muc_clear_invites(void)
* Join the chat room with the specified nickname
*/
void
muc_join_room(const char * const room, const char * const nick, const char * const password)
muc_join_room(const char * const room, const char * const nick,
const char * const password, gboolean autojoin)
{
if (rooms == NULL) {
rooms = g_hash_table_new_full(g_str_hash, g_str_equal, g_free,
@@ -149,6 +151,7 @@ muc_join_room(const char * const room, const char * const nick, const char * con
g_free, g_free);
new_room->roster_received = FALSE;
new_room->pending_nick_change = FALSE;
new_room->autojoin = autojoin;
g_hash_table_insert(rooms, strdup(room), new_room);
}
@@ -183,6 +186,22 @@ muc_room_is_active(const char * const room)
}
}
gboolean
muc_room_is_autojoin(const char * const room)
{
if (rooms != NULL) {
ChatRoom *chat_room = g_hash_table_lookup(rooms, room);
if (chat_room != NULL) {
return chat_room->autojoin;
} else {
return FALSE;
}
} else {
return FALSE;
}
}
char *
muc_get_old_nick(const char * const room, const char * const new_nick)
{
@@ -504,4 +523,4 @@ gint _compare_participants(PContact a, PContact b)
g_free(key_b);
return result;
}
}