| author | Rich Burridge <rich.burridge@oracle.com> |
| Mon, 16 Nov 2015 16:48:46 -0800 | |
| changeset 5091 | 81e5d6b75c3c |
| permissions | -rw-r--r-- |
|
5091
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
# date:2007-03-07 owner:elaine type:bug bugster:6524856 state:upstream |
|
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
# 15378767 SUNBT6524856 Gaim core dump when connect Google Talk account |
|
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
# |
|
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
# These changes are already present upstream. |
|
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
|
|
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
--- pidgin-2.7.0/libpurple/protocols/jabber/jabber.c.old 2010-05-13 15:27:49.161075628 +0800 |
|
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
+++ pidgin-2.7.0/libpurple/protocols/jabber/jabber.c 2010-05-13 15:28:04.942072953 +0800 |
|
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
@@ -168,6 +168,8 @@ |
|
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
} else {
|
|
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
PurpleConnectionError reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR; |
|
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
char *msg = jabber_parse_error(js, packet, &reason); |
|
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
+ if (!msg) |
|
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
+ return; |
|
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
purple_connection_error_reason(js->gc, reason, msg); |
|
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
g_free(msg); |
|
81e5d6b75c3c
22185024 Move pidgin from Desktop to Userland
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |