aboutsummaryrefslogtreecommitdiffstats
path: root/libemail-engine
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-01-10 23:30:24 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-01-11 00:20:32 +0800
commitb1ed35f70d09601717e32eb5c762f79908b0bcf8 (patch)
treec4fa0b5f5d0dc7dd8cb1a2c3931fd25d97d08b41 /libemail-engine
parent54442be416bcdb1c3632fb9211d335f9b5cb3397 (diff)
downloadgsoc2013-evolution-b1ed35f70d09601717e32eb5c762f79908b0bcf8.tar
gsoc2013-evolution-b1ed35f70d09601717e32eb5c762f79908b0bcf8.tar.gz
gsoc2013-evolution-b1ed35f70d09601717e32eb5c762f79908b0bcf8.tar.bz2
gsoc2013-evolution-b1ed35f70d09601717e32eb5c762f79908b0bcf8.tar.lz
gsoc2013-evolution-b1ed35f70d09601717e32eb5c762f79908b0bcf8.tar.xz
gsoc2013-evolution-b1ed35f70d09601717e32eb5c762f79908b0bcf8.tar.zst
gsoc2013-evolution-b1ed35f70d09601717e32eb5c762f79908b0bcf8.zip
Coding style and whitespace cleanup.
Diffstat (limited to 'libemail-engine')
-rw-r--r--libemail-engine/e-mail-session-utils.c2
-rw-r--r--libemail-engine/e-mail-session.c19
-rw-r--r--libemail-engine/mail-ops.c14
3 files changed, 19 insertions, 16 deletions
diff --git a/libemail-engine/e-mail-session-utils.c b/libemail-engine/e-mail-session-utils.c
index 94304cb6a9..60e5ebaa2f 100644
--- a/libemail-engine/e-mail-session-utils.c
+++ b/libemail-engine/e-mail-session-utils.c
@@ -578,7 +578,7 @@ mail_session_send_to_thread (GSimpleAsyncResult *simple,
if (did_connect) {
/* if the cancellable is cancelled, then the disconnect will not run,
- thus reset it to ensure the service will be properly disconnected */
+ * thus reset it to ensure the service will be properly disconnected */
if (cancellable)
g_cancellable_reset (cancellable);
diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
index b195238145..0c94962a7e 100644
--- a/libemail-engine/e-mail-session.c
+++ b/libemail-engine/e-mail-session.c
@@ -169,8 +169,8 @@ user_message_exec (struct _user_message_msg *m,
static void
user_message_response_cb (GObject *source,
- GAsyncResult *result,
- gpointer user_data)
+ GAsyncResult *result,
+ gpointer user_data)
{
struct _user_message_msg *m = user_data;
GError *local_error = NULL;
@@ -220,7 +220,8 @@ user_message_exec (struct _user_message_msg *m,
if (!m->prompter)
m->prompter = e_user_prompter_new ();
- e_user_prompter_prompt (m->prompter, type, "",
+ e_user_prompter_prompt (
+ m->prompter, type, "",
m->prompt, NULL, FALSE, m->button_captions, cancellable,
user_message_response_cb, m);
} else
@@ -1374,7 +1375,7 @@ mail_session_alert_user (CamelSession *session,
CamelSessionAlertType type,
const gchar *prompt,
GSList *button_captions,
- GCancellable *cancellable)
+ GCancellable *cancellable)
{
struct _user_message_msg *m;
gint result = -1;
@@ -1410,11 +1411,11 @@ mail_session_alert_user (CamelSession *session,
static CamelCertTrust
mail_session_trust_prompt (CamelSession *session,
- const gchar *host,
- const gchar *certificate,
- guint32 certificate_errors,
- const GSList *issuers,
- GCancellable *cancellable)
+ const gchar *host,
+ const gchar *certificate,
+ guint32 certificate_errors,
+ const GSList *issuers,
+ GCancellable *cancellable)
{
EUserPrompter *prompter;
ENamedParameters *parameters;
diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
index 24fc77253f..a01dc50301 100644
--- a/libemail-engine/mail-ops.c
+++ b/libemail-engine/mail-ops.c
@@ -147,11 +147,12 @@ em_filter_folder_element_exec (struct _filter_mail_msg *m,
if (g_error_matches (local_error, CAMEL_SERVICE_ERROR, CAMEL_SERVICE_ERROR_URL_INVALID) ||
g_error_matches (local_error, CAMEL_FOLDER_ERROR, CAMEL_FOLDER_ERROR_INVALID)) {
- g_set_error (error, local_error->domain, local_error->code,
+ g_set_error (
+ error, local_error->domain, local_error->code,
_("Failed to filter selected messages. One reason can be that folder "
- "location set in one or more filters is invalid. Please check your "
- "filters in Edit->Message Filters.\n"
- "Original error was: %s"), local_error->message);
+ "location set in one or more filters is invalid. Please check your "
+ "filters in Edit->Message Filters.\n"
+ "Original error was: %s"), local_error->message);
g_clear_error (&local_error);
} else if (local_error)
g_propagate_error (error, local_error);
@@ -749,7 +750,8 @@ mail_send_message (struct _send_queue_msg *m,
/* sending mail, filtering failed */
if (g_error_matches (local_error, CAMEL_SERVICE_ERROR, CAMEL_SERVICE_ERROR_URL_INVALID) ||
g_error_matches (local_error, CAMEL_FOLDER_ERROR, CAMEL_FOLDER_ERROR_INVALID)) {
- g_string_append_printf (err,
+ g_string_append_printf (
+ err,
_("Failed to apply outgoing filters. One reason can be that folder "
"location set in one or more filters is invalid. Please check your "
"filters in Edit->Message Filters.\n"
@@ -1354,7 +1356,7 @@ static MailMsgInfo sync_folder_info = {
void
mail_sync_folder (CamelFolder *folder,
- gboolean test_for_expunge,
+ gboolean test_for_expunge,
void (*done) (CamelFolder *folder,
gpointer data),
gpointer data)