/pidgin/main: 21aac0fb8dd0: facebook: fixed incorrect handling o...

Changeset: 21aac0fb8dd038cfef33d93756f2c563db219fbd
Author:	 James Geboski <[email protected]>
Date:	 2016-01-09 12:41 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/21aac0fb8dd0

Description:

facebook: fixed incorrect handling of unknown XMA types

This fixes an improper GError propagation, which not is only incorrect,
but also has no effect. This ends up leading to the unsupported XMA
message being ignored without any notice to the user.

diffstat:

 libpurple/protocols/facebook/api.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (15 lines):

diff --git a/libpurple/protocols/facebook/api.c b/libpurple/protocols/facebook/api.c
--- a/libpurple/protocols/facebook/api.c
+++ b/libpurple/protocols/facebook/api.c
@@ -1350,9 +1350,9 @@ fb_api_xma_parse(FbApi *api, const gchar
 	url = fb_json_values_next_str(values, NULL);
 
 	if ((str == NULL) || (url == NULL)) {
-		g_propagate_error(error, err);
+		text = g_strdup(_("<Unsupported Attachment>"));
 		g_object_unref(values);
-		return NULL;
+		return text;
 	}
 
 	if (purple_strequal(str, "ExternalUrl")) {

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits