Do not display error message on cancel

Do not display error message when user cancels upload to divelogs.de.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2013-05-01 20:26:38 +03:00 committed by Dirk Hohndel
parent 3b1c49e439
commit e9ff76429e
2 changed files with 2 additions and 2 deletions

View file

@ -1487,7 +1487,7 @@ static void upload_dives_divelogs(const gboolean selected)
* And at least the dialog is customized to indicate
* error or success.
*/
if (strstr(error, "failed"))
if (error && strstr(error, "failed"))
type = GTK_MESSAGE_ERROR;
else
type = GTK_MESSAGE_INFO;

View file

@ -374,7 +374,7 @@ int divelogde_upload(char *fn, char **error)
if (readfile(fn, &mem) < 0)
return ret;
if (!divelogde_dialog(&user, &pass))
return ret;
return TRUE;
sbuf = soup_buffer_new(SOUP_MEMORY_STATIC, mem.buffer, mem.size);
session = soup_session_async_new();
multipart = soup_multipart_new(SOUP_FORM_MIME_TYPE_MULTIPART);