-
Notifications
You must be signed in to change notification settings - Fork 88
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Relevant changes: https://bitbucket.org/pidgin/main/pull-requests/167 * fb_api_cb_contacts: Make all the other fields optional too * fb_http_urlcmp: more loose comparison, to avoid showing urls twice * Prevent disconnections on 509 errors, "Invalid attachment id" * Make $.hugePictureUrl.uri optional * Store sent message id in lastmid, to deduplicate echoed messages
- Loading branch information
Showing
6 changed files
with
1,122 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
56d191003b34 | ||
c9b74a765767 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
diff --git a/libpurple/http.c b/libpurple/http.c | ||
--- a/libpurple/http.c | ||
+++ b/libpurple/http.c | ||
@@ -486,11 +486,7 @@ purple_http_socket_connect_new_cb(GObjec | ||
cb_data = g_object_steal_data(source, "cb_data"); | ||
|
||
if (conn == NULL) { | ||
- if (!g_error_matches(error, | ||
- G_IO_ERROR, G_IO_ERROR_CANCELLED)) { | ||
- cb(hs, error->message, cb_data); | ||
- } | ||
- | ||
+ cb(hs, error->message, cb_data); | ||
g_clear_error(&error); | ||
return; | ||
} | ||
@@ -1162,10 +1158,8 @@ static gboolean _purple_http_recv_loopbo | ||
&error); | ||
got_anything = (len > 0); | ||
|
||
- if (len < 0 && (g_error_matches(error, | ||
- G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK) || | ||
- g_error_matches(error, | ||
- G_IO_ERROR, G_IO_ERROR_CANCELLED))) { | ||
+ if (len < 0 && g_error_matches(error, | ||
+ G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { | ||
g_clear_error(&error); | ||
return FALSE; | ||
} | ||
@@ -1450,10 +1444,8 @@ static gboolean _purple_http_send(GObjec | ||
&error); | ||
} | ||
|
||
- if (written < 0 && (g_error_matches(error, | ||
- G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK) || | ||
- g_error_matches(error, | ||
- G_IO_ERROR, G_IO_ERROR_CANCELLED))) { | ||
+ if (written < 0 && g_error_matches(error, | ||
+ G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK)) { | ||
g_clear_error(&error); | ||
return G_SOURCE_CONTINUE; | ||
} |
Oops, something went wrong.