diff options
author | Michael Vetter <jubalh@iodoru.org> | 2023-05-11 08:45:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-11 08:45:46 +0200 |
commit | ea35a4ceb03a975b4c1dabc5eb71510162dbe25f (patch) | |
tree | 15c2735f04b414a1a8426499302f90fb9408a6f3 /src/event/server_events.c | |
parent | 7f3fca2bd081a729d425184f7a0484025862257e (diff) | |
parent | 209a8f4bf5b2db2ca54f727d29e625228bccd170 (diff) | |
download | profani-tty-ea35a4ceb03a975b4c1dabc5eb71510162dbe25f.tar.gz |
Merge branch 'master' into cleanup/gchar-char
Diffstat (limited to 'src/event/server_events.c')
-rw-r--r-- | src/event/server_events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/event/server_events.c b/src/event/server_events.c index 01002a1e..c10f69c3 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -1332,8 +1332,8 @@ sv_ev_bookmark_autojoin(Bookmark* bookmark) log_debug("Autojoin %s with nick=%s", bookmark->barejid, nick); if (!muc_active(bookmark->barejid)) { - presence_join_room(bookmark->barejid, nick, bookmark->password); muc_join(bookmark->barejid, nick, bookmark->password, TRUE); + presence_join_room(bookmark->barejid, nick, bookmark->password); iq_room_affiliation_list(bookmark->barejid, "member", false); iq_room_affiliation_list(bookmark->barejid, "admin", false); iq_room_affiliation_list(bookmark->barejid, "owner", false); |