From e9ff76429ec34a6671ce4e4165bf84da728475fb Mon Sep 17 00:00:00 2001 From: Miika Turkia Date: Wed, 1 May 2013 20:26:38 +0300 Subject: Do not display error message on cancel Do not display error message when user cancels upload to divelogs.de. Signed-off-by: Miika Turkia Signed-off-by: Dirk Hohndel --- divelist-gtk.c | 2 +- webservice.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/divelist-gtk.c b/divelist-gtk.c index 8bc836589..7b7fc3999 100644 --- a/divelist-gtk.c +++ b/divelist-gtk.c @@ -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; diff --git a/webservice.c b/webservice.c index c01b1a844..e582ad259 100644 --- a/webservice.c +++ b/webservice.c @@ -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); -- cgit v1.2.3-70-g09d2