From 88f423afea539bb7c1faa970d989d3e858d874f6 Mon Sep 17 00:00:00 2001 From: James Booth Date: Fri, 6 May 2016 00:53:03 +0100 Subject: Rename jabber_ functions --- src/event/client_events.c | 10 +++++----- src/event/server_events.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/event') diff --git a/src/event/client_events.c b/src/event/client_events.c index 1c715f03..a156fd62 100644 --- a/src/event/client_events.c +++ b/src/event/client_events.c @@ -55,7 +55,7 @@ jabber_conn_status_t cl_ev_connect_jid(const char *const jid, const char *const passwd, const char *const altdomain, const int port, const char *const tls_policy) { cons_show("Connecting as %s", jid); - return jabber_connect_with_details(jid, passwd, altdomain, port, tls_policy); + return session_connect_with_details(jid, passwd, altdomain, port, tls_policy); } jabber_conn_status_t @@ -65,18 +65,18 @@ cl_ev_connect_account(ProfAccount *account) cons_show("Connecting with account %s as %s", account->name, jid); free(jid); - return jabber_connect_with_account(account); + return session_connect_with_account(account); } void cl_ev_disconnect(void) { - const char *jid = jabber_get_fulljid(); + const char *jid = session_get_fulljid(); cons_show("%s logged out successfully.", jid); ui_disconnected(); ui_close_all_wins(); - jabber_disconnect(); + session_disconnect(); roster_destroy(); muc_invites_clear(); chat_sessions_clear(); @@ -92,7 +92,7 @@ cl_ev_presence_send(const resource_presence_t presence_type, const char *const m char *signed_status = NULL; #ifdef HAVE_LIBGPGME - char *account_name = jabber_get_account_name(); + char *account_name = session_get_account_name(); ProfAccount *account = accounts_get_account(account_name); if (account->pgp_keyid) { signed_status = p_gpg_sign(msg, account->pgp_keyid); diff --git a/src/event/server_events.c b/src/event/server_events.c index d3d57da2..5093f54a 100644 --- a/src/event/server_events.c +++ b/src/event/server_events.c @@ -105,7 +105,7 @@ sv_ev_roster_received(void) ui_show_roster(); } - char *account_name = jabber_get_account_name(); + char *account_name = session_get_account_name(); #ifdef HAVE_LIBGPGME // check pgp key valid if specified @@ -148,7 +148,7 @@ sv_ev_roster_received(void) cl_ev_presence_send(conn_presence, NULL, 0); } - const char *fulljid = jabber_get_fulljid(); + const char *fulljid = session_get_fulljid(); plugins_on_connect(account_name, fulljid); } @@ -238,7 +238,7 @@ void sv_ev_room_message(const char *const room_jid, const char *const nick, const char *const message) { if (prefs_get_boolean(PREF_GRLOG)) { - Jid *jid = jid_create(jabber_get_fulljid()); + Jid *jid = jid_create(session_get_fulljid()); groupchat_log_chat(jid->barejid, room_jid, nick, message); jid_destroy(jid); } -- cgit 1.4.1-2-gfad0 ree/tests/xmpp/mock_xmpp.c?id=f46d0541c633e0a4ff753a3fea12b83b2275eb4f'>tree) 
b27c5d0f ^


71577c1f ^


b27c5d0f ^



71577c1f ^



b27c5d0f ^


71577c1f ^

b27c5d0f ^

71577c1f ^


b27c5d0f ^


71577c1f ^

52f66fde ^

71577c1f ^


b27c5d0f ^


71577c1f ^

b27c5d0f ^

71577c1f ^

00a475cf ^

a2c0dab4 ^


39e0782d ^

a2c0dab4 ^




39e0782d ^

a2c0dab4 ^










6d6bc67d ^



52f66fde ^

6d6bc67d ^










3d7d070b ^



52f66fde ^

3d7d070b ^


92b85bb7 ^

d2662a6f ^

af51fa3c ^



d2662a6f ^


92b85bb7 ^

af51fa3c ^


9d957e5f ^

d2662a6f ^

a8ecbccc ^


9d957e5f ^

a8ecbccc ^


c0037608 ^







dd1ee18c ^








a578419d ^







bcafba2d ^






11c04d9f ^









a2c0dab4 ^












b27c5d0f ^

6d6bc67d ^






b27c5d0f ^

71577c1f ^

b27c5d0f ^


71577c1f ^

447d2358 ^

b27c5d0f ^

af51fa3c ^






a8ecbccc ^






dd1ee18c ^






a578419d ^






bcafba2d ^






11c04d9f ^






3d7d070b ^







b27c5d0f ^

71577c1f ^

b27c5d0f ^


71577c1f ^


b27c5d0f ^

6d6bc67d ^







b27c5d0f ^

71577c1f ^

b27c5d0f ^


71577c1f ^

a2c0dab4 ^


0ee6c7a6 ^


a2c0dab4 ^



0ee6c7a6 ^

f4d52f3d ^

0ee6c7a6 ^




a2c0dab4 ^









b6259190 ^

a2c0dab4 ^


















6d6bc67d ^








af51fa3c ^


92b85bb7 ^

d2662a6f ^

af51fa3c ^





f4d52f3d ^

af51fa3c ^

d2662a6f ^










92b85bb7 ^


af51fa3c ^

a8ecbccc ^


d2662a6f ^

a8ecbccc ^


9d957e5f ^


a8ecbccc ^

c0037608 ^








dd1ee18c ^







f4d52f3d ^

dd1ee18c ^




a578419d ^







bcafba2d ^






11c04d9f ^












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
73

74

75
76

77

78

79
80

81

82
83

84
85
86
87
88
89
90

91
92
93
94
95
96
97
98

99
100
101
102
103
104
105

106
107
108
109
110
111

112
113
114
115
116
117
118
119
120

121
122
123
124
125
126
127
128
129
130
131
132

133

134
135
136
137
138
139

140

141

142
143

144

145

146

147
148
149
150
151
152

153
154
155
156
157
158

159
160
161
162
163
164

165
166
167
168
169
170

171
172
173
174
175
176

177
178
179
180
181
182

183
184
185
186
187
188
189

190

191

192
193

194
195

196

197
198
199
200
201
202
203

204

205

206
207

208

209
210

211
212

213
214
215

216

217

218
219
220
221

222
223
224
225
226
227
228
229
230

231

232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249

250
251
252
253
254
255
256
257

258
259

260

261

262
263
264
265
266

267

268

269
270
271
272
273
274
275
276
277
278

279
280

281

282
283

284

285
286

287
288

289

290
291
292
293
294
295
296
297

298
299
300
301
302
303
304

305

306
307
308
309

310
311
312
313
314
315
316

317
318
319
320
321
322

323
324
325
326
327
328
329
330
331
332
333
334