pidgin/pidgin

facebook: support all XMA messages
facebook
2015-08-10, James Geboski
fb0b92c3533e
Parents 53db47311bda
Children aecff282de76
facebook: support all XMA messages
--- a/libpurple/protocols/facebook/api.c Mon Aug 10 01:12:57 2015 -0400
+++ b/libpurple/protocols/facebook/api.c Mon Aug 10 01:43:41 2015 -0400
@@ -910,6 +910,7 @@
fb_api_message_parse_xma(FbApi *api, JsonNode *root, GError **error)
{
const gchar *str;
+ const gchar *url;
FbHttpParams *params;
FbJsonValues *values;
gchar *ret;
@@ -929,18 +930,16 @@
}
str = fb_json_values_next_str(values, NULL);
-
- if (!purple_strequal(str, "ExternalUrl")) {
- fb_util_debug_warning("Unknown XMA type %s", str);
- fb_json_values_free(values);
- return NULL;
+ url = fb_json_values_next_str(values, NULL);
+
+ if (purple_strequal(str, "ExternalUrl")) {
+ params = fb_http_params_new_parse(url, TRUE);
+ ret = fb_http_params_dup_str(params, "u", NULL);
+ fb_http_params_free(params);
+ } else {
+ ret = g_strdup(url);
}
- str = fb_json_values_next_str(values, NULL);
- params = fb_http_params_new_parse(str, TRUE);
- ret = fb_http_params_dup_str(params, "u", NULL);
- fb_http_params_free(params);
-
fb_json_values_free(values);
return ret;
}