diff options
| author |  Miika Turkia <miika.turkia@gmail.com> | 2013-05-01 20:26:38 +0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-05-02 08:31:03 -0700 |
| commit | e9ff76429ec34a6671ce4e4165bf84da728475fb (patch) | |
| tree | 49b45bc374e6b9009b4b988287c51c325941dd12 | |
| parent | 3b1c49e439edf06fb4206b2501c9d347421f8e81 (diff) | |
| download | subsurface-e9ff76429ec34a6671ce4e4165bf84da728475fb.tar.gz | |
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>
| -rw-r--r-- | divelist-gtk.c | 2 | ||||
| -rw-r--r-- | 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); |