Mercurial > pidgin
diff libpurple/log.c @ 19920:0ed8a2a86a1b
explicit merge of 'fc49baf44017a8fd511c607b435668baf2a0f518'
and 'b50640e3caa45410064cc403c759c1b427800a1e'
to branch 'org.maemo.garage.pidgin.pidgin.dialog-transience'
| author | Gabriel Schulhof <nix@go-nix.ca> |
|---|---|
| date | Fri, 17 Aug 2007 22:10:43 +0000 |
| parents | 5b27ae2413b7 |
| children | 941965d6fd88 |
line wrap: on
line diff
--- a/libpurple/log.c Fri Aug 17 21:01:20 2007 +0000 +++ b/libpurple/log.c Fri Aug 17 22:10:43 2007 +0000 @@ -718,9 +718,9 @@ if (tmp < start) g_string_append_len(newmsg, tmp, start - tmp); - idstr = g_datalist_get_data(&attributes, "id"); + if ((idstr = g_datalist_get_data(&attributes, "id")) != NULL) + imgid = atoi(idstr); - imgid = atoi(idstr); if (imgid != 0) { FILE *image_file; @@ -735,6 +735,7 @@ if (image == NULL) { /* This should never happen. */ + /* This *does* happen for failed Direct-IMs -DAA */ g_string_free(newmsg, TRUE); g_return_val_if_reached((char *)msg); }