about summary refs log tree commit diff stats
path: root/src/xmpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/xmpp')
-rw-r--r--src/xmpp/bookmark.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/xmpp/bookmark.c b/src/xmpp/bookmark.c
index 88b452f2..d4371dc5 100644
--- a/src/xmpp/bookmark.c
+++ b/src/xmpp/bookmark.c
@@ -294,22 +294,7 @@ _bookmark_result_id_handler(xmpp_stanza_t *const stanza, void *const userdata)
         g_hash_table_insert(bookmarks, strdup(barejid), bookmark);
 
         if (autojoin_val) {
-            Jid *room_jid;
-
-            char *account_name = session_get_account_name();
-            ProfAccount *account = accounts_get_account(account_name);
-            if (nick == NULL) {
-                nick = account->muc_nick;
-            }
-
-            log_debug("Autojoin %s with nick=%s", barejid, nick);
-            room_jid = jid_create_from_bare_and_resource(barejid, nick);
-            if (!muc_active(room_jid->barejid)) {
-                presence_join_room(barejid, nick, password);
-                muc_join(barejid, nick, password, TRUE);
-            }
-            jid_destroy(room_jid);
-            account_free(account);
+            sv_ev_bookmark_autojoin(bookmark);
         }
 
         child = xmpp_stanza_get_next(child);
mmit/src/roster_list.h?id=db973457d0b3548f767f9849ce8ca7816dcbd36e'>db973457 ^
107fdd35 ^

ed228ebb ^
107fdd35 ^
4c6cfcdc ^

107fdd35 ^

4c6cfcdc ^

15d0f679 ^
4e429fe7 ^
c3d2a7e9 ^
107fdd35 ^

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72