X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=41fe6073030c4243baf3846df7708542854828cb;hb=0322239e8fd08ce70d12c09b6c2328e20e665c8c;hp=2541e5f0d4c888e85045e7bbddc425f4e69fb25f;hpb=0070a889409096ff23df3d819c38ec7110664ee5;p=modest

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 2541e5f..41fe607 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -2138,7 +2138,7 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
 		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
 		             MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS,
-			     _CS("ckdg_ib_folder_already_exists"));
+			     _CS_FOLDER_ALREADY_EXISTS);
 	}
 
 	/* Check parent */
@@ -2378,7 +2378,7 @@ new_name_valid_if_local_account (ModestMailOperationPrivate *priv,
 		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
 			     MODEST_MAIL_OPERATION_ERROR_FOLDER_EXISTS,
-			     _CS("ckdg_ib_folder_already_exists"));
+			     _CS_FOLDER_ALREADY_EXISTS);
 		return FALSE;
 	} else
 		return TRUE;
@@ -2468,7 +2468,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
 	priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 	g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
 		     MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
-		     error_msg);
+		     "%s", error_msg);
 
 	/* Call the user callback if exists */
 	if (user_callback)
@@ -2740,7 +2740,7 @@ get_msg_async_cb (TnyFolder *folder,
 		} else {
 			g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
 				     MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
-				     err->message);
+				     "%s", err->message);
 		}
 	} else if (finished && priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS) {
 		/* Set the success status before calling the user callback */
@@ -3295,7 +3295,7 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
 		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
 			     MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
-			     _CS("ckct_ib_unable_to_paste_here"));
+			     _CS_UNABLE_TO_PASTE_HERE);
 		/* Notify the queue */
 		modest_mail_operation_notify_end (self);
 		return;