diff options
| author | Marius Halden <marius.h@lden.org> | 2016-05-20 23:06:48 +0200 |
|---|---|---|
| committer | Marius Halden <marius.h@lden.org> | 2016-05-20 23:06:48 +0200 |
| commit | 912e63c99110d36b40286ffd43bee7c4cfa005ec (patch) | |
| tree | 454e77f06716cb76976d13818766304551d53512 | |
| parent | ab92b1252a74499969951d50697ee0dd61b28dae (diff) | |
| parent | 0877cf236761eaefcd61b8fd5722272ffe1f12c5 (diff) | |
| download | bitlbee-facebook-912e63c99110d36b40286ffd43bee7c4cfa005ec.tar.gz bitlbee-facebook-912e63c99110d36b40286ffd43bee7c4cfa005ec.tar.bz2 bitlbee-facebook-912e63c99110d36b40286ffd43bee7c4cfa005ec.tar.xz | |
Merge branch 'master' into track-messages
| -rw-r--r-- | facebook/facebook-api.c | 1 | ||||
| -rw-r--r-- | facebook/facebook-mqtt.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/facebook/facebook-api.c b/facebook/facebook-api.c index 3ddfa70..c8e5e30 100644 --- a/facebook/facebook-api.c +++ b/facebook/facebook-api.c @@ -2115,6 +2115,7 @@ fb_api_message_send(FbApi *api, FbApiMessage *msg) JsonBuilder *bldr; mid = FB_API_MSGID(g_get_real_time() / 1000, g_random_int()); + priv->lastmid = mid; if (msg->tid != 0) { tpfx = "tfbid_"; diff --git a/facebook/facebook-mqtt.c b/facebook/facebook-mqtt.c index 8549a1c..9610bbd 100644 --- a/facebook/facebook-mqtt.c +++ b/facebook/facebook-mqtt.c @@ -565,6 +565,9 @@ fb_mqtt_cb_open(gpointer data, gint error, gpointer ssl, gint fd; if ((ssl == NULL) || (error != SSL_OK)) { + /* Set this to null to avoid freeing it in fb_mqtt_close() */ + priv->ssl = NULL; + fb_mqtt_error(mqtt, FB_MQTT_ERROR_GENERAL, "Failed to connect"); return FALSE; } |