Skip to content

Commit

Permalink
VERSION: update to c9b74a765767
Browse files Browse the repository at this point in the history
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
dequis committed Nov 21, 2016
1 parent 067af3f commit 4bff146
Show file tree
Hide file tree
Showing 6 changed files with 1,122 additions and 18 deletions.
1 change: 0 additions & 1 deletion MANIFEST_PIDGIN
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ libpurple/protocols/facebook/util.c
libpurple/protocols/facebook/util.h
libpurple/purple-socket.c
libpurple/purple-socket.h
share/ca-certs/GTE_CyberTrust_Global_Root.pem
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
56d191003b34
c9b74a765767
28 changes: 12 additions & 16 deletions patches/02-glibcompat.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
diff -r 1852eb9052a0 libpurple/glibcompat.h
--- a/libpurple/glibcompat.h Fri Dec 25 15:20:41 2015 -0500
+++ b/libpurple/glibcompat.h Fri Dec 25 15:49:07 2015 -0500
@@ -61,6 +61,33 @@
return FALSE;
}

+#if !GLIB_CHECK_VERSION(2, 32, 0)
--- a/libpurple/glibcompat.h 2016-11-21 09:38:39.250858177 -0300
+++ b/libpurple/glibcompat.h 2016-11-21 09:39:44.789845560 -0300
@@ -66,6 +66,30 @@
/******************************************************************************
* g_assert_* macros
*****************************************************************************/
+
+#if !GLIB_CHECK_VERSION(2, 32, 0)
+static inline GByteArray * g_byte_array_new_take(guint8 *data, gsize len)
+{
+ GByteArray *array;
Expand All @@ -23,15 +22,12 @@ diff -r 1852eb9052a0 libpurple/glibcompat.h
+ g_queue_foreach(queue, (GFunc)free_func, NULL);
+ g_queue_free(queue);
+}
+#endif
+
+#if !GLIB_CHECK_VERSION(2, 30, 0)
+
+#define G_VALUE_INIT {0, {{0}}}
+#endif
+
+#endif /* < 2.30.0 */
+
+#endif /* < 2.32.0 */
+
#endif /* < 2.36.0 */


#if !GLIB_CHECK_VERSION(2, 38, 0)
#define g_assert_true(expr) G_STMT_START { \
if G_LIKELY (expr) ; else \
42 changes: 42 additions & 0 deletions patches/05-revert-http-callbacks.patch
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;
}
Loading

0 comments on commit 4bff146

Please sign in to comment.