1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
diff --git a/libpurple/http.c b/libpurple/http.c
--- a/libpurple/http.c
+++ b/libpurple/http.c
@@ -546,11 +546,7 @@
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;
}
@@ -1223,10 +1219,8 @@
&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;
}
@@ -1511,10 +1505,8 @@
&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;
}
|
