projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Partially fixes NB#123740. Export the modest_mail_operation_get_account call in order...
[modest]
/
src
/
modest-mail-operation-queue.c
diff --git
a/src/modest-mail-operation-queue.c
b/src/modest-mail-operation-queue.c
index
92edee1
..
22bbd53
100644
(file)
--- a/
src/modest-mail-operation-queue.c
+++ b/
src/modest-mail-operation-queue.c
@@
-342,7
+342,7
@@
modest_mail_operation_queue_remove (ModestMailOperationQueue *self,
modest_mail_operation_execute_error_handler (mail_op);
} else {
if (status == MODEST_MAIL_OPERATION_STATUS_CANCELED)
modest_mail_operation_execute_error_handler (mail_op);
} else {
if (status == MODEST_MAIL_OPERATION_STATUS_CANCELED)
- g_warning ("%s: operation canceled \n", __FUNCTION__);
+ g_debug ("%s: operation canceled \n", __FUNCTION__);
else
g_warning ("%s: possible error in a mail operation " \
"implementation. The status is not successful " \
else
g_warning ("%s: possible error in a mail operation " \
"implementation. The status is not successful " \
@@
-493,7
+493,9
@@
modest_mail_operation_queue_get_by_source (ModestMailOperationQueue *self,
static void
accumulate_mail_op_strings (ModestMailOperation *op, gchar **str)
{
static void
accumulate_mail_op_strings (ModestMailOperation *op, gchar **str)
{
- *str = g_strdup_printf ("%s\n%s", *str, modest_mail_operation_to_string (op));
+ gchar *mail_op_to_str = modest_mail_operation_to_string (op);
+ *str = g_strdup_printf ("%s\n%s", *str, mail_op_to_str);
+ g_free (mail_op_to_str);
}
}
@@
-511,8
+513,10
@@
modest_mail_operation_queue_to_string (ModestMailOperationQueue *self)
len = g_queue_get_length (priv->op_queue);
str = g_strdup_printf ("mail operation queue (%02d)\n-------------------------", len);
if (len == 0) {
len = g_queue_get_length (priv->op_queue);
str = g_strdup_printf ("mail operation queue (%02d)\n-------------------------", len);
if (len == 0) {
- g_free (str);
- str = g_strdup_printf ("%s\n%s", str, "<empty>");
+ gchar *copy;
+ copy = str;
+ str = g_strdup_printf ("%s\n%s", copy, "<empty>");
+ g_free (copy);
} else {
g_mutex_lock (priv->queue_lock);
g_queue_foreach (priv->op_queue, (GFunc)accumulate_mail_op_strings, &str);
} else {
g_mutex_lock (priv->queue_lock);
g_queue_foreach (priv->op_queue, (GFunc)accumulate_mail_op_strings, &str);