about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-02-10 21:32:44 +0000
committerJames Booth <boothj5@gmail.com>2015-02-10 21:32:44 +0000
commit831be52366ad9fd2d7ae1b0ae40462969c764ae8 (patch)
tree5b0bac1804dc86a1f0f2e9f12e0c48845a273ab2
parent13297a151f0612516bcff643ff618bb28b64ddf1 (diff)
parent1e2ef973348a58b0ba58eb020cc91e4f41a1d10e (diff)
downloadprofani-tty-831be52366ad9fd2d7ae1b0ae40462969c764ae8.tar.gz
Merge branch 'master' into readline
-rw-r--r--src/command/commands.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/command/commands.c b/src/command/commands.c
index 3c1a0980..9e9191d4 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -3116,11 +3116,11 @@ cmd_tiny(gchar **args, struct cmd_help_t help)
 #endif
             } else if (win_type == WIN_PRIVATE) {
                 ProfPrivateWin *privatewin = wins_get_current_private();
-                message_send_private(tiny, privatewin->fulljid);
+                message_send_private(privatewin->fulljid, tiny);
                 ui_outgoing_private_msg("me", privatewin->fulljid, tiny);
             } else if (win_type == WIN_MUC) {
                 ProfMucWin *mucwin = wins_get_current_muc();
-                message_send_groupchat(tiny, mucwin->roomjid);
+                message_send_groupchat(mucwin->roomjid, tiny);
             }
             free(tiny);
         } else {
='n4' href='#n4'>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