Tue, 09 Mar 2010 19:09:37 +0000
jabber: And fix up the commands now to be per-plugin
| 7923 | 1 | /* |
| 15884 | 2 | * purple - Jabber Protocol Plugin |
| 7923 | 3 | * |
|
28322
ac8fec1d2234
Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents:
26565
diff
changeset
|
4 | * Purple is the legal property of its developers, whose names are too numerous |
|
ac8fec1d2234
Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents:
26565
diff
changeset
|
5 | * to list here. Please refer to the COPYRIGHT file distributed with this |
|
ac8fec1d2234
Remove specific copyright lines from the XMPP prpl.
Paul Aurich <darkrain42@pidgin.im>
parents:
26565
diff
changeset
|
6 | * source distribution. |
| 7923 | 7 | * |
| 8 | * This program is free software; you can redistribute it and/or modify | |
| 9 | * it under the terms of the GNU General Public License as published by | |
| 10 | * the Free Software Foundation; either version 2 of the License, or | |
| 11 | * (at your option) any later version. | |
| 12 | * | |
| 13 | * This program is distributed in the hope that it will be useful, | |
| 14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 16 | * GNU General Public License for more details. | |
| 17 | * | |
| 18 | * You should have received a copy of the GNU General Public License | |
| 19 | * along with this program; if not, write to the Free Software | |
|
19859
71d37b57eff2
The FSF changed its address a while ago; our files were out of date.
John Bailey <rekkanoryo@rekkanoryo.org>
parents:
19051
diff
changeset
|
20 | * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 7923 | 21 | * |
| 22 | */ | |
| 23 | #include "internal.h" | |
| 24 | #include "request.h" | |
| 25 | #include "server.h" | |
| 26 | ||
| 27 | #include "xdata.h" | |
| 28 | ||
| 29 | typedef enum { | |
| 30 | JABBER_X_DATA_IGNORE = 0, | |
| 31 | JABBER_X_DATA_TEXT_SINGLE, | |
| 32 | JABBER_X_DATA_TEXT_MULTI, | |
| 33 | JABBER_X_DATA_LIST_SINGLE, | |
| 34 | JABBER_X_DATA_LIST_MULTI, | |
| 8295 | 35 | JABBER_X_DATA_BOOLEAN, |
| 36 | JABBER_X_DATA_JID_SINGLE | |
| 7923 | 37 | } jabber_x_data_field_type; |
| 38 | ||
| 39 | struct jabber_x_data_data { | |
| 40 | GHashTable *fields; | |
| 41 | GSList *values; | |
|
17805
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
42 | jabber_x_data_action_cb cb; |
| 7923 | 43 | gpointer user_data; |
| 44 | JabberStream *js; | |
|
17805
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
45 | GList *actions; |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
46 | PurpleRequestFieldGroup *actiongroup; |
| 7923 | 47 | }; |
| 48 | ||
| 15884 | 49 | static void jabber_x_data_ok_cb(struct jabber_x_data_data *data, PurpleRequestFields *fields) { |
| 7923 | 50 | xmlnode *result = xmlnode_new("x"); |
|
17805
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
51 | jabber_x_data_action_cb cb = data->cb; |
| 7923 | 52 | gpointer user_data = data->user_data; |
| 53 | JabberStream *js = data->js; | |
| 54 | GList *groups, *flds; | |
|
17805
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
55 | char *actionhandle = NULL; |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
56 | gboolean hasActions = (data->actions != NULL); |
| 7923 | 57 | |
| 13808 | 58 | xmlnode_set_namespace(result, "jabber:x:data"); |
| 7923 | 59 | xmlnode_set_attrib(result, "type", "submit"); |
| 60 | ||
| 15884 | 61 | for(groups = purple_request_fields_get_groups(fields); groups; groups = groups->next) { |
|
17805
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
62 | if(groups->data == data->actiongroup) { |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
63 | for(flds = purple_request_field_group_get_fields(groups->data); flds; flds = flds->next) { |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
64 | PurpleRequestField *field = flds->data; |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
65 | const char *id = purple_request_field_get_id(field); |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
66 | int handleindex; |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
67 | if(strcmp(id, "libpurple:jabber:xdata:actions")) |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
68 | continue; |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
69 | handleindex = purple_request_field_choice_get_value(field); |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
70 | actionhandle = g_strdup(g_list_nth_data(data->actions, handleindex)); |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
71 | break; |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
72 | } |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
73 | continue; |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
74 | } |
| 15884 | 75 | for(flds = purple_request_field_group_get_fields(groups->data); flds; flds = flds->next) { |
| 7923 | 76 | xmlnode *fieldnode, *valuenode; |
| 15884 | 77 | PurpleRequestField *field = flds->data; |
| 78 | const char *id = purple_request_field_get_id(field); | |
| 7923 | 79 | jabber_x_data_field_type type = GPOINTER_TO_INT(g_hash_table_lookup(data->fields, id)); |
| 80 | ||
| 81 | switch(type) { | |
| 82 | case JABBER_X_DATA_TEXT_SINGLE: | |
| 8295 | 83 | case JABBER_X_DATA_JID_SINGLE: |
| 7923 | 84 | { |
| 15884 | 85 | const char *value = purple_request_field_string_get_value(field); |
|
16398
a895aca0a7ce
Ok I couldn't resist. For iChat and Adium buddies who are advertising
Mark Doliner <markdoliner@pidgin.im>
parents:
16136
diff
changeset
|
86 | if (value == NULL) |
|
a895aca0a7ce
Ok I couldn't resist. For iChat and Adium buddies who are advertising
Mark Doliner <markdoliner@pidgin.im>
parents:
16136
diff
changeset
|
87 | break; |
| 7923 | 88 | fieldnode = xmlnode_new_child(result, "field"); |
| 89 | xmlnode_set_attrib(fieldnode, "var", id); | |
| 90 | valuenode = xmlnode_new_child(fieldnode, "value"); | |
| 91 | if(value) | |
| 92 | xmlnode_insert_data(valuenode, value, -1); | |
| 93 | break; | |
| 94 | } | |
| 95 | case JABBER_X_DATA_TEXT_MULTI: | |
| 96 | { | |
| 97 | char **pieces, **p; | |
| 15884 | 98 | const char *value = purple_request_field_string_get_value(field); |
|
16398
a895aca0a7ce
Ok I couldn't resist. For iChat and Adium buddies who are advertising
Mark Doliner <markdoliner@pidgin.im>
parents:
16136
diff
changeset
|
99 | if (value == NULL) |
|
a895aca0a7ce
Ok I couldn't resist. For iChat and Adium buddies who are advertising
Mark Doliner <markdoliner@pidgin.im>
parents:
16136
diff
changeset
|
100 | break; |
| 7923 | 101 | fieldnode = xmlnode_new_child(result, "field"); |
| 102 | xmlnode_set_attrib(fieldnode, "var", id); | |
| 103 | ||
| 104 | pieces = g_strsplit(value, "\n", -1); | |
| 105 | for(p = pieces; *p != NULL; p++) { | |
| 106 | valuenode = xmlnode_new_child(fieldnode, "value"); | |
| 107 | xmlnode_insert_data(valuenode, *p, -1); | |
| 108 | } | |
| 109 | g_strfreev(pieces); | |
| 110 | } | |
| 111 | break; | |
| 112 | case JABBER_X_DATA_LIST_SINGLE: | |
| 113 | case JABBER_X_DATA_LIST_MULTI: | |
| 114 | { | |
|
18190
bcf28ef7e8ff
Re-fix the DBus list handling code by killing const GList* / const GSList*
Richard Laager <rlaager@pidgin.im>
parents:
16490
diff
changeset
|
115 | GList *selected = purple_request_field_list_get_selected(field); |
| 7923 | 116 | char *value; |
| 117 | fieldnode = xmlnode_new_child(result, "field"); | |
| 118 | xmlnode_set_attrib(fieldnode, "var", id); | |
| 119 | ||
| 120 | while(selected) { | |
| 15884 | 121 | value = purple_request_field_list_get_data(field, selected->data); |
| 7923 | 122 | valuenode = xmlnode_new_child(fieldnode, "value"); |
| 123 | if(value) | |
| 124 | xmlnode_insert_data(valuenode, value, -1); | |
| 125 | selected = selected->next; | |
| 126 | } | |
| 127 | } | |
| 128 | break; | |
| 129 | case JABBER_X_DATA_BOOLEAN: | |
| 130 | fieldnode = xmlnode_new_child(result, "field"); | |
| 131 | xmlnode_set_attrib(fieldnode, "var", id); | |
| 132 | valuenode = xmlnode_new_child(fieldnode, "value"); | |
| 15884 | 133 | if(purple_request_field_bool_get_value(field)) |
| 7923 | 134 | xmlnode_insert_data(valuenode, "1", -1); |
| 135 | else | |
| 136 | xmlnode_insert_data(valuenode, "0", -1); | |
| 137 | break; | |
| 138 | case JABBER_X_DATA_IGNORE: | |
| 139 | break; | |
| 140 | } | |
| 141 | } | |
| 142 | } | |
| 143 | ||
| 144 | g_hash_table_destroy(data->fields); | |
| 145 | while(data->values) { | |
| 146 | g_free(data->values->data); | |
| 147 | data->values = g_slist_delete_link(data->values, data->values); | |
| 148 | } | |
|
17805
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
149 | if (data->actions) { |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
150 | GList *action; |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
151 | for(action = data->actions; action; action = g_list_next(action)) { |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
152 | g_free(action->data); |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
153 | } |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
154 | g_list_free(data->actions); |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
155 | } |
| 7923 | 156 | g_free(data); |
| 157 | ||
|
26565
94071f2569f2
Fix a potential memleak by freeing this regardless of whether hasActions
Mark Doliner <markdoliner@pidgin.im>
parents:
26042
diff
changeset
|
158 | if (hasActions) |
|
17805
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
159 | cb(js, result, actionhandle, user_data); |
|
26565
94071f2569f2
Fix a potential memleak by freeing this regardless of whether hasActions
Mark Doliner <markdoliner@pidgin.im>
parents:
26042
diff
changeset
|
160 | else |
|
17805
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
161 | ((jabber_x_data_cb)cb)(js, result, user_data); |
|
26565
94071f2569f2
Fix a potential memleak by freeing this regardless of whether hasActions
Mark Doliner <markdoliner@pidgin.im>
parents:
26042
diff
changeset
|
162 | |
|
94071f2569f2
Fix a potential memleak by freeing this regardless of whether hasActions
Mark Doliner <markdoliner@pidgin.im>
parents:
26042
diff
changeset
|
163 | g_free(actionhandle); |
| 7923 | 164 | } |
| 165 | ||
| 15884 | 166 | static void jabber_x_data_cancel_cb(struct jabber_x_data_data *data, PurpleRequestFields *fields) { |
| 7923 | 167 | xmlnode *result = xmlnode_new("x"); |
|
17805
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
168 | jabber_x_data_action_cb cb = data->cb; |
| 7923 | 169 | gpointer user_data = data->user_data; |
| 170 | JabberStream *js = data->js; | |
|
17805
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
171 | gboolean hasActions = FALSE; |
| 7923 | 172 | g_hash_table_destroy(data->fields); |
| 173 | while(data->values) { | |
| 174 | g_free(data->values->data); | |
| 175 | data->values = g_slist_delete_link(data->values, data->values); | |
| 176 | } | |
|
17805
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
177 | if (data->actions) { |
|
19899
483c4f495a6c
Various warning fixes for the xmpp prpl.
Daniel Atallah <datallah@pidgin.im>
parents:
19897
diff
changeset
|
178 | GList *action; |
|
17805
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
179 | hasActions = TRUE; |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
180 | for(action = data->actions; action; action = g_list_next(action)) { |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
181 | g_free(action->data); |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
182 | } |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
183 | g_list_free(data->actions); |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
184 | } |
| 7923 | 185 | g_free(data); |
| 186 | ||
| 13808 | 187 | xmlnode_set_namespace(result, "jabber:x:data"); |
| 7923 | 188 | xmlnode_set_attrib(result, "type", "cancel"); |
| 189 | ||
|
17805
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
190 | if (hasActions) |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
191 | cb(js, result, NULL, user_data); |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
192 | else |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
193 | ((jabber_x_data_cb)cb)(js, result, user_data); |
| 7923 | 194 | } |
| 195 | ||
| 8396 | 196 | void *jabber_x_data_request(JabberStream *js, xmlnode *packet, jabber_x_data_cb cb, gpointer user_data) |
| 7923 | 197 | { |
|
17805
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
198 | return jabber_x_data_request_with_actions(js, packet, NULL, 0, (jabber_x_data_action_cb)cb, user_data); |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
199 | } |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
200 | |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
201 | void *jabber_x_data_request_with_actions(JabberStream *js, xmlnode *packet, GList *actions, int defaultaction, jabber_x_data_action_cb cb, gpointer user_data) |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
202 | { |
| 8396 | 203 | void *handle; |
| 7923 | 204 | xmlnode *fn, *x; |
| 15884 | 205 | PurpleRequestFields *fields; |
| 206 | PurpleRequestFieldGroup *group; | |
|
23493
e04778a3d29a
Kill the warning 'field' may be used uninitialized in this function
Stu Tomlinson <nosnilmot@pidgin.im>
parents:
23176
diff
changeset
|
207 | PurpleRequestField *field = NULL; |
| 7923 | 208 | |
| 209 | char *title = NULL; | |
| 210 | char *instructions = NULL; | |
| 211 | ||
| 212 | struct jabber_x_data_data *data = g_new0(struct jabber_x_data_data, 1); | |
| 213 | ||
| 214 | data->fields = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); | |
| 215 | data->user_data = user_data; | |
| 216 | data->cb = cb; | |
| 217 | data->js = js; | |
| 218 | ||
| 15884 | 219 | fields = purple_request_fields_new(); |
| 220 | group = purple_request_field_group_new(NULL); | |
| 221 | purple_request_fields_add_group(fields, group); | |
| 7923 | 222 | |
| 8135 | 223 | for(fn = xmlnode_get_child(packet, "field"); fn; fn = xmlnode_get_next_twin(fn)) { |
| 224 | xmlnode *valuenode; | |
| 225 | const char *type = xmlnode_get_attrib(fn, "type"); | |
| 226 | const char *label = xmlnode_get_attrib(fn, "label"); | |
| 227 | const char *var = xmlnode_get_attrib(fn, "var"); | |
| 228 | char *value = NULL; | |
| 229 | ||
| 230 | if(!type) | |
|
17837
a9c447447c06
XEP-0004 says that if no field type is specified, text-single should be assumed.
Andreas Monitzer <am@adiumx.com>
parents:
17805
diff
changeset
|
231 | type = "text-single"; |
| 8135 | 232 | |
| 233 | if(!var && strcmp(type, "fixed")) | |
| 234 | continue; | |
| 235 | if(!label) | |
| 236 | label = var; | |
| 237 | ||
| 238 | if(!strcmp(type, "text-private")) { | |
| 239 | if((valuenode = xmlnode_get_child(fn, "value"))) | |
| 240 | value = xmlnode_get_data(valuenode); | |
| 241 | ||
| 15884 | 242 | field = purple_request_field_string_new(var, label, |
| 8135 | 243 | value ? value : "", FALSE); |
| 15884 | 244 | purple_request_field_string_set_masked(field, TRUE); |
| 245 | purple_request_field_group_add_field(group, field); | |
| 8135 | 246 | |
| 247 | g_hash_table_replace(data->fields, g_strdup(var), GINT_TO_POINTER(JABBER_X_DATA_TEXT_SINGLE)); | |
| 248 | ||
|
16136
49ddb8f06d96
I noticed some places where we were doing the whole
Mark Doliner <markdoliner@pidgin.im>
parents:
15884
diff
changeset
|
249 | g_free(value); |
| 8135 | 250 | } else if(!strcmp(type, "text-multi") || !strcmp(type, "jid-multi")) { |
| 251 | GString *str = g_string_new(""); | |
| 252 | ||
| 253 | for(valuenode = xmlnode_get_child(fn, "value"); valuenode; | |
| 254 | valuenode = xmlnode_get_next_twin(valuenode)) { | |
| 255 | ||
| 256 | if(!(value = xmlnode_get_data(valuenode))) | |
| 257 | continue; | |
| 258 | ||
| 259 | g_string_append_printf(str, "%s\n", value); | |
| 260 | g_free(value); | |
| 261 | } | |
| 262 | ||
| 15884 | 263 | field = purple_request_field_string_new(var, label, |
| 8135 | 264 | str->str, TRUE); |
| 15884 | 265 | purple_request_field_group_add_field(group, field); |
| 7923 | 266 | |
| 8135 | 267 | g_hash_table_replace(data->fields, g_strdup(var), GINT_TO_POINTER(JABBER_X_DATA_TEXT_MULTI)); |
| 268 | ||
| 269 | g_string_free(str, TRUE); | |
| 270 | } else if(!strcmp(type, "list-single") || !strcmp(type, "list-multi")) { | |
| 271 | xmlnode *optnode; | |
| 272 | GList *selected = NULL; | |
| 273 | ||
| 15884 | 274 | field = purple_request_field_list_new(var, label); |
| 8135 | 275 | |
| 276 | if(!strcmp(type, "list-multi")) { | |
| 15884 | 277 | purple_request_field_list_set_multi_select(field, TRUE); |
| 8135 | 278 | g_hash_table_replace(data->fields, g_strdup(var), |
| 279 | GINT_TO_POINTER(JABBER_X_DATA_LIST_MULTI)); | |
| 280 | } else { | |
| 281 | g_hash_table_replace(data->fields, g_strdup(var), | |
| 282 | GINT_TO_POINTER(JABBER_X_DATA_LIST_SINGLE)); | |
| 283 | } | |
| 284 | ||
| 285 | for(valuenode = xmlnode_get_child(fn, "value"); valuenode; | |
| 286 | valuenode = xmlnode_get_next_twin(valuenode)) { | |
|
22664
d2e81c1408ae
If the default value of a list-single or list-multi data forms field is NULL
Etan Reisner <deryni@pidgin.im>
parents:
21653
diff
changeset
|
287 | char *data = xmlnode_get_data(valuenode); |
|
d2e81c1408ae
If the default value of a list-single or list-multi data forms field is NULL
Etan Reisner <deryni@pidgin.im>
parents:
21653
diff
changeset
|
288 | if (data != NULL) { |
|
d2e81c1408ae
If the default value of a list-single or list-multi data forms field is NULL
Etan Reisner <deryni@pidgin.im>
parents:
21653
diff
changeset
|
289 | selected = g_list_prepend(selected, data); |
|
d2e81c1408ae
If the default value of a list-single or list-multi data forms field is NULL
Etan Reisner <deryni@pidgin.im>
parents:
21653
diff
changeset
|
290 | } |
| 8135 | 291 | } |
| 7923 | 292 | |
| 8135 | 293 | for(optnode = xmlnode_get_child(fn, "option"); optnode; |
| 294 | optnode = xmlnode_get_next_twin(optnode)) { | |
| 295 | const char *lbl; | |
| 296 | ||
| 297 | if(!(valuenode = xmlnode_get_child(optnode, "value"))) | |
| 298 | continue; | |
| 299 | ||
| 300 | if(!(value = xmlnode_get_data(valuenode))) | |
| 301 | continue; | |
| 302 | ||
| 303 | if(!(lbl = xmlnode_get_attrib(optnode, "label"))) | |
|
19051
b932fc2e28cd
For XMPP multi-selection lists in generic data forms, the intent here
Mark Doliner <markdoliner@pidgin.im>
parents:
18190
diff
changeset
|
304 | lbl = value; |
| 8135 | 305 | |
| 306 | data->values = g_slist_prepend(data->values, value); | |
| 307 | ||
|
24900
a19d983918c2
Deprecate purple_request_field_list_add()
Richard Laager <rlaager@pidgin.im>
parents:
23493
diff
changeset
|
308 | purple_request_field_list_add_icon(field, lbl, NULL, value); |
| 8135 | 309 | if(g_list_find_custom(selected, value, (GCompareFunc)strcmp)) |
| 15884 | 310 | purple_request_field_list_add_selected(field, lbl); |
| 8135 | 311 | } |
| 15884 | 312 | purple_request_field_group_add_field(group, field); |
| 8135 | 313 | |
| 314 | while(selected) { | |
| 315 | g_free(selected->data); | |
| 316 | selected = g_list_delete_link(selected, selected); | |
| 317 | } | |
| 318 | ||
| 319 | } else if(!strcmp(type, "boolean")) { | |
| 320 | gboolean def = FALSE; | |
| 7923 | 321 | |
| 322 | if((valuenode = xmlnode_get_child(fn, "value"))) | |
| 323 | value = xmlnode_get_data(valuenode); | |
| 324 | ||
|
8390
13e1ff9b2850
[gaim-migrate @ 9119]
Mark Doliner <markdoliner@pidgin.im>
parents:
8385
diff
changeset
|
325 | if(value && (!g_ascii_strcasecmp(value, "yes") || |
|
13e1ff9b2850
[gaim-migrate @ 9119]
Mark Doliner <markdoliner@pidgin.im>
parents:
8385
diff
changeset
|
326 | !g_ascii_strcasecmp(value, "true") || !g_ascii_strcasecmp(value, "1"))) |
| 8135 | 327 | def = TRUE; |
| 7923 | 328 | |
| 15884 | 329 | field = purple_request_field_bool_new(var, label, def); |
| 330 | purple_request_field_group_add_field(group, field); | |
| 7923 | 331 | |
| 8135 | 332 | g_hash_table_replace(data->fields, g_strdup(var), GINT_TO_POINTER(JABBER_X_DATA_BOOLEAN)); |
| 7923 | 333 | |
|
16136
49ddb8f06d96
I noticed some places where we were doing the whole
Mark Doliner <markdoliner@pidgin.im>
parents:
15884
diff
changeset
|
334 | g_free(value); |
|
23176
90f6226370cb
applied changes from 069f197178d158cdd308687095c14d49d8eee0ed
Daniel Atallah <datallah@pidgin.im>
parents:
22664
diff
changeset
|
335 | } else if(!strcmp(type, "fixed")) { |
| 8135 | 336 | if((valuenode = xmlnode_get_child(fn, "value"))) |
| 337 | value = xmlnode_get_data(valuenode); | |
| 7923 | 338 | |
|
23176
90f6226370cb
applied changes from 069f197178d158cdd308687095c14d49d8eee0ed
Daniel Atallah <datallah@pidgin.im>
parents:
22664
diff
changeset
|
339 | if(value != NULL) { |
|
90f6226370cb
applied changes from 069f197178d158cdd308687095c14d49d8eee0ed
Daniel Atallah <datallah@pidgin.im>
parents:
22664
diff
changeset
|
340 | field = purple_request_field_label_new("", value); |
|
90f6226370cb
applied changes from 069f197178d158cdd308687095c14d49d8eee0ed
Daniel Atallah <datallah@pidgin.im>
parents:
22664
diff
changeset
|
341 | purple_request_field_group_add_field(group, field); |
| 7923 | 342 | |
|
23176
90f6226370cb
applied changes from 069f197178d158cdd308687095c14d49d8eee0ed
Daniel Atallah <datallah@pidgin.im>
parents:
22664
diff
changeset
|
343 | g_free(value); |
|
90f6226370cb
applied changes from 069f197178d158cdd308687095c14d49d8eee0ed
Daniel Atallah <datallah@pidgin.im>
parents:
22664
diff
changeset
|
344 | } |
| 8135 | 345 | } else if(!strcmp(type, "hidden")) { |
| 346 | if((valuenode = xmlnode_get_child(fn, "value"))) | |
| 347 | value = xmlnode_get_data(valuenode); | |
| 7923 | 348 | |
| 15884 | 349 | field = purple_request_field_string_new(var, "", value ? value : "", |
| 8135 | 350 | FALSE); |
| 15884 | 351 | purple_request_field_set_visible(field, FALSE); |
| 352 | purple_request_field_group_add_field(group, field); | |
| 7923 | 353 | |
| 8135 | 354 | g_hash_table_replace(data->fields, g_strdup(var), GINT_TO_POINTER(JABBER_X_DATA_TEXT_SINGLE)); |
| 7923 | 355 | |
|
16136
49ddb8f06d96
I noticed some places where we were doing the whole
Mark Doliner <markdoliner@pidgin.im>
parents:
15884
diff
changeset
|
356 | g_free(value); |
| 8135 | 357 | } else { /* text-single, jid-single, and the default */ |
| 358 | if((valuenode = xmlnode_get_child(fn, "value"))) | |
| 359 | value = xmlnode_get_data(valuenode); | |
| 7923 | 360 | |
| 15884 | 361 | field = purple_request_field_string_new(var, label, |
| 8135 | 362 | value ? value : "", FALSE); |
| 15884 | 363 | purple_request_field_group_add_field(group, field); |
| 7923 | 364 | |
| 8295 | 365 | if(!strcmp(type, "jid-single")) { |
| 15884 | 366 | purple_request_field_set_type_hint(field, "screenname"); |
| 8295 | 367 | g_hash_table_replace(data->fields, g_strdup(var), GINT_TO_POINTER(JABBER_X_DATA_JID_SINGLE)); |
| 368 | } else { | |
| 369 | g_hash_table_replace(data->fields, g_strdup(var), GINT_TO_POINTER(JABBER_X_DATA_TEXT_SINGLE)); | |
| 370 | } | |
| 7923 | 371 | |
|
16136
49ddb8f06d96
I noticed some places where we were doing the whole
Mark Doliner <markdoliner@pidgin.im>
parents:
15884
diff
changeset
|
372 | g_free(value); |
| 7923 | 373 | } |
|
19894
b273d0db2bdd
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <am@adiumx.com>
parents:
19203
diff
changeset
|
374 | |
|
b273d0db2bdd
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <am@adiumx.com>
parents:
19203
diff
changeset
|
375 | if(field && xmlnode_get_child(fn, "required")) |
|
b273d0db2bdd
Fixed code indenting, some spaces were still left and now replaced by tabs.
Andreas Monitzer <am@adiumx.com>
parents:
19203
diff
changeset
|
376 | purple_request_field_set_required(field,TRUE); |
| 7923 | 377 | } |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23493
diff
changeset
|
378 | |
|
17805
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
379 | if(actions != NULL) { |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
380 | PurpleRequestField *actionfield; |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
381 | GList *action; |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
382 | data->actiongroup = group = purple_request_field_group_new(_("Actions")); |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
383 | purple_request_fields_add_group(fields, group); |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
384 | actionfield = purple_request_field_choice_new("libpurple:jabber:xdata:actions", _("Select an action"), defaultaction); |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
385 | |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
386 | for(action = actions; action; action = g_list_next(action)) { |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
387 | JabberXDataAction *a = action->data; |
|
26042
4dabdb5fe213
Remove some extra trailing whitespace I noticed after merging mlundblad's
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23493
diff
changeset
|
388 | |
|
17805
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
389 | purple_request_field_choice_add(actionfield, a->name); |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
390 | data->actions = g_list_append(data->actions, g_strdup(a->handle)); |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
391 | } |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
392 | purple_request_field_set_required(actionfield,TRUE); |
|
5bd417a1c847
Implemented XEP-0050: Ad-Hoc Commands. Note that this XEP requires sending an initial command to the peer, which is not implemented in libpurple itself (since this requires a discovery browser or equivalent).
Andreas Monitzer <am@adiumx.com>
parents:
17774
diff
changeset
|
393 | purple_request_field_group_add_field(group, actionfield); |
| 7923 | 394 | } |
| 395 | ||
| 396 | if((x = xmlnode_get_child(packet, "title"))) | |
| 397 | title = xmlnode_get_data(x); | |
| 398 | ||
| 399 | if((x = xmlnode_get_child(packet, "instructions"))) | |
| 400 | instructions = xmlnode_get_data(x); | |
| 401 | ||
|
21653
621c47778132
merge of '73ae9aeda3c58fbf8437421da68d19d06f93e686'
Evan Schoenberg <evands@pidgin.im>
parents:
21233
diff
changeset
|
402 | handle = purple_request_fields(js->gc, title, title, instructions, fields, |
| 8396 | 403 | _("OK"), G_CALLBACK(jabber_x_data_ok_cb), |
|
16490
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
16398
diff
changeset
|
404 | _("Cancel"), G_CALLBACK(jabber_x_data_cancel_cb), |
|
68c22924d66b
Added account, who, and conversation parameters to the request API calls, and updated all code to match. I can't compile the Perl module, so I'd appreciate it if someone who knows it would verify that this doesn't break Perl.
Evan Schoenberg <evands@pidgin.im>
parents:
16398
diff
changeset
|
405 | purple_connection_get_account(js->gc), /* XXX Do we have a who here? */ NULL, NULL, |
|
21653
621c47778132
merge of '73ae9aeda3c58fbf8437421da68d19d06f93e686'
Evan Schoenberg <evands@pidgin.im>
parents:
21233
diff
changeset
|
406 | data); |
| 7923 | 407 | |
|
16136
49ddb8f06d96
I noticed some places where we were doing the whole
Mark Doliner <markdoliner@pidgin.im>
parents:
15884
diff
changeset
|
408 | g_free(title); |
|
49ddb8f06d96
I noticed some places where we were doing the whole
Mark Doliner <markdoliner@pidgin.im>
parents:
15884
diff
changeset
|
409 | g_free(instructions); |
| 7923 | 410 | |
| 8396 | 411 | return handle; |
| 7923 | 412 | } |
| 413 | ||
| 414 |