From f167fdd55d68586c4b590e11f28997d4ee906579 Mon Sep 17 00:00:00 2001 From: James Booth Date: Thu, 8 Nov 2012 23:44:09 +0000 Subject: Use stanza module to create groupchat messages --- src/jabber.c | 25 ++++--------------------- src/stanza.c | 2 +- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/src/jabber.c b/src/jabber.c index dd86a6e5..9f33bcbd 100644 --- a/src/jabber.c +++ b/src/jabber.c @@ -167,28 +167,11 @@ jabber_send(const char * const msg, const char * const recipient) void jabber_send_groupchat(const char * const msg, const char * const recipient) { - char *encoded_xml = encode_xml(msg); + xmpp_stanza_t *message = stanza_create_message(jabber_conn.ctx, recipient, + "groupchat", msg, NULL); - xmpp_stanza_t *reply, *body, *text; - - reply = xmpp_stanza_new(jabber_conn.ctx); - xmpp_stanza_set_name(reply, "message"); - xmpp_stanza_set_type(reply, "groupchat"); - xmpp_stanza_set_attribute(reply, "to", recipient); - - body = xmpp_stanza_new(jabber_conn.ctx); - xmpp_stanza_set_name(body, "body"); - - text = xmpp_stanza_new(jabber_conn.ctx); - xmpp_stanza_set_text(text, encoded_xml); - - xmpp_stanza_add_child(body, text); - xmpp_stanza_add_child(reply, body); - - xmpp_send(jabber_conn.conn, reply); - xmpp_stanza_release(reply); - - free(encoded_xml); + xmpp_send(jabber_conn.conn, message); + xmpp_stanza_release(message); } void diff --git a/src/stanza.c b/src/stanza.c index 2faab652..5cb09d3e 100644 --- a/src/stanza.c +++ b/src/stanza.c @@ -54,7 +54,7 @@ stanza_create_message(xmpp_ctx_t *ctx, const char * const recipient, msg = xmpp_stanza_new(ctx); xmpp_stanza_set_name(msg, "message"); - xmpp_stanza_set_type(msg, "chat"); + xmpp_stanza_set_type(msg, type); xmpp_stanza_set_attribute(msg, "to", recipient); body = xmpp_stanza_new(ctx); -- cgit 1.4.1-2-gfad0 id' value='430b2eaa0d3f8638f3442b3dca26d6bf4a4891cb'/>
path: root/themes/shade
blob: 980b7e7f89017c61a1d733fe50eb28e220a5d6f2 (plain) (tree) 
6dabbbd5 ^



6dabbbd5 ^


30b5f112 ^











6dabbbd5 ^

fcf4d143 ^

6dabbbd5 ^




30b5f112 ^


6dabbbd5 ^

30b5f112 ^









6dabbbd5 ^






30b5f112 ^

71679a31 ^


6dabbbd5 ^



6dabbbd5 ^

30b5f112 ^

2f82f50a ^

86c1c388 ^

1a3dc91e ^

30b5f112 ^

6dabbbd5 ^

30b5f112 ^

fbc30231 ^


















cd2458c0 ^


0ae975c2 ^


b21edfaa ^

cd2458c0 ^

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