[gthumb] [uploaders] specify the file that caused the error.
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] [uploaders] specify the file that caused the error.
- Date: Fri, 9 Apr 2010 23:27:31 +0000 (UTC)
commit ec24824443b0235dc45277a0c1868329149e3496
Author: Paolo Bacchilega <paobac src gnome org>
Date: Fri Apr 9 22:15:09 2010 +0200
[uploaders] specify the file that caused the error.
extensions/facebook/facebook-service.c | 13 +++++++++++--
extensions/flicker/flickr-service.c | 13 +++++++++++--
extensions/picasaweb/picasa-web-service.c | 17 ++++++++++++++---
3 files changed, 36 insertions(+), 7 deletions(-)
---
diff --git a/extensions/facebook/facebook-service.c b/extensions/facebook/facebook-service.c
index aa97081..923e7ff 100644
--- a/extensions/facebook/facebook-service.c
+++ b/extensions/facebook/facebook-service.c
@@ -602,8 +602,17 @@ upload_photos_done (FacebookService *self,
g_simple_async_result_set_op_res_gpointer (result, self->priv->post_photos->ids, (GDestroyNotify) _g_string_list_free);
self->priv->post_photos->ids = NULL;
}
- else
+ else {
+ if (self->priv->post_photos->current != NULL) {
+ GthFileData *file_data = self->priv->post_photos->current->data;
+ char *msg;
+
+ msg = g_strdup_printf (_("Could not upload '%s': %s"), g_file_info_get_display_name (file_data->info), error->message);
+ g_free (error->message);
+ error->message = msg;
+ }
g_simple_async_result_set_from_error (result, error);
+ }
g_simple_async_result_complete_in_idle (result);
}
@@ -626,7 +635,7 @@ upload_photo_ready_cb (SoupSession *session,
if (msg->status_code != 200) {
GError *error;
- error = g_error_new (SOUP_HTTP_ERROR, msg->status_code, "%s", soup_status_get_phrase (msg->status_code));
+ error = g_error_new_literal (SOUP_HTTP_ERROR, msg->status_code, soup_status_get_phrase (msg->status_code));
upload_photos_done (self, error);
g_error_free (error);
diff --git a/extensions/flicker/flickr-service.c b/extensions/flicker/flickr-service.c
index 7376872..a5258c6 100644
--- a/extensions/flicker/flickr-service.c
+++ b/extensions/flicker/flickr-service.c
@@ -652,8 +652,17 @@ post_photos_done (FlickrService *self,
g_simple_async_result_set_op_res_gpointer (result, self->priv->post_photos->ids, (GDestroyNotify) _g_string_list_free);
self->priv->post_photos->ids = NULL;
}
- else
+ else {
+ if (self->priv->post_photos->current != NULL) {
+ GthFileData *file_data = self->priv->post_photos->current->data;
+ char *msg;
+
+ msg = g_strdup_printf (_("Could not upload '%s': %s"), g_file_info_get_display_name (file_data->info), error->message);
+ g_free (error->message);
+ error->message = msg;
+ }
g_simple_async_result_set_from_error (result, error);
+ }
g_simple_async_result_complete_in_idle (result);
}
@@ -676,7 +685,7 @@ post_photo_ready_cb (SoupSession *session,
if (msg->status_code != 200) {
GError *error;
- error = g_error_new (SOUP_HTTP_ERROR, msg->status_code, "%s", soup_status_get_phrase (msg->status_code));
+ error = g_error_new_literal (SOUP_HTTP_ERROR, msg->status_code, soup_status_get_phrase (msg->status_code));
post_photos_done (self, error);
g_error_free (error);
diff --git a/extensions/picasaweb/picasa-web-service.c b/extensions/picasaweb/picasa-web-service.c
index 9559152..8659119 100644
--- a/extensions/picasaweb/picasa-web-service.c
+++ b/extensions/picasaweb/picasa-web-service.c
@@ -375,10 +375,21 @@ post_photos_done (PicasaWebService *self,
GSimpleAsyncResult *result;
result = google_connection_get_result (self->priv->conn);
- if (error == NULL)
+ if (error == NULL) {
g_simple_async_result_set_op_res_gboolean (result, TRUE);
- else
+ }
+ else {
+ if (self->priv->post_photos->current != NULL) {
+ GthFileData *file_data = self->priv->post_photos->current->data;
+ char *msg;
+
+ msg = g_strdup_printf (_("Could not upload '%s': %s"), g_file_info_get_display_name (file_data->info), error->message);
+ g_free (error->message);
+ error->message = msg;
+ }
g_simple_async_result_set_from_error (result, error);
+ }
+
g_simple_async_result_complete_in_idle (result);
}
@@ -396,7 +407,7 @@ post_photo_ready_cb (SoupSession *session,
if (msg->status_code != 201) {
GError *error;
- error = g_error_new (SOUP_HTTP_ERROR, msg->status_code, "%s", soup_status_get_phrase (msg->status_code));
+ error = g_error_new_literal (SOUP_HTTP_ERROR, msg->status_code, soup_status_get_phrase (msg->status_code));
post_photos_done (self, error);
g_error_free (error);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]