aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-01-19 10:24:06 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-01-19 12:48:48 +0800
commit59e6e599ba390b0aa720973ff297260d7d354b73 (patch)
tree42342a51edb84a0f08f3c2a49def3c60bc71d0fa
parent61ae36351b24cc676f60483d576706bf827f2987 (diff)
downloadgsoc2013-evolution-59e6e599ba390b0aa720973ff297260d7d354b73.tar.gz
gsoc2013-evolution-59e6e599ba390b0aa720973ff297260d7d354b73.tar.zst
gsoc2013-evolution-59e6e599ba390b0aa720973ff297260d7d354b73.zip
Coding style and whitespace cleanup.
-rw-r--r--calendar/alarm-notify/alarm-queue.c2
-rw-r--r--calendar/gui/e-cal-model-tasks.c4
-rw-r--r--calendar/gui/e-cal-model.c2
-rw-r--r--calendar/gui/e-task-table.c20
-rw-r--r--calendar/gui/print.c2
-rw-r--r--e-util/e-util.c8
-rw-r--r--filter/e-filter-rule.c4
-rw-r--r--libemail-engine/e-mail-session.c4
-rw-r--r--libemail-engine/e-mail-utils.c12
-rw-r--r--libemail-engine/mail-folder-cache.h15
-rw-r--r--libemail-utils/mail-mt.c11
-rw-r--r--libemail-utils/mail-mt.h5
-rw-r--r--mail/e-mail-backend.c26
-rw-r--r--mail/e-mail-ui-session.c21
-rw-r--r--mail/em-account-editor.c5
-rw-r--r--mail/em-composer-utils.c1
-rw-r--r--mail/em-format-html-print.c6
-rw-r--r--mail/em-format-html.c5
-rw-r--r--mail/em-utils.c164
-rw-r--r--mail/mail-vfolder.c6
-rw-r--r--mail/message-list.c2
-rw-r--r--modules/addressbook/e-book-shell-backend.c4
-rw-r--r--plugins/caldav/caldav-browse-server.c1
-rw-r--r--plugins/itip-formatter/itip-formatter.c22
24 files changed, 169 insertions, 183 deletions
diff --git a/calendar/alarm-notify/alarm-queue.c b/calendar/alarm-notify/alarm-queue.c
index f7597338a7..f30ce00af7 100644
--- a/calendar/alarm-notify/alarm-queue.c
+++ b/calendar/alarm-notify/alarm-queue.c
@@ -1054,7 +1054,7 @@ edit_component (ECalClient *cal_client,
static void
print_component (ECalClient *cal_client,
- ECalComponent *comp)
+ ECalComponent *comp)
{
print_comp (comp,
cal_client,
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index fdbcd379b4..f4f41cf81e 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -1236,7 +1236,7 @@ e_cal_model_tasks_get_highlight_due_today (ECalModelTasks *model)
void
e_cal_model_tasks_set_highlight_due_today (ECalModelTasks *model,
- gboolean highlight)
+ gboolean highlight)
{
g_return_if_fail (E_IS_CAL_MODEL_TASKS (model));
@@ -1279,7 +1279,7 @@ e_cal_model_tasks_get_highlight_overdue (ECalModelTasks *model)
void
e_cal_model_tasks_set_highlight_overdue (ECalModelTasks *model,
- gboolean highlight)
+ gboolean highlight)
{
g_return_if_fail (E_IS_CAL_MODEL_TASKS (model));
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 7344e87916..2255ec4b35 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -1058,7 +1058,7 @@ set_categories (ECalModelComponent *comp_data,
comp_data->priv->categories_str = NULL;
/* then set a new value; no need to populate categories_str,
- it'll be populated on demand (in the get_categories() function)
+ * it'll be populated on demand (in the get_categories() function)
*/
if (value && *value) {
prop = icalproperty_new_categories (value);
diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c
index 4efe8d0669..4b6d671af3 100644
--- a/calendar/gui/e-task-table.c
+++ b/calendar/gui/e-task-table.c
@@ -289,8 +289,8 @@ delete_selected_components (ETaskTable *task_table)
static void
task_table_queue_draw_cb (ECalModelTasks *tasks_model,
- GParamSpec *param,
- GtkWidget *task_table)
+ GParamSpec *param,
+ GtkWidget *task_table)
{
g_return_if_fail (task_table != NULL);
@@ -1677,10 +1677,10 @@ e_task_table_get_paste_target_list (ETaskTable *task_table)
static void
task_table_get_object_list_async (GList *clients_list,
- const gchar *sexp,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer callback_data)
+ const gchar *sexp,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer callback_data)
{
GList *l;
@@ -1695,8 +1695,8 @@ task_table_get_object_list_async (GList *clients_list,
static void
hide_completed_rows_ready (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+ GAsyncResult *result,
+ gpointer user_data)
{
ECalModel *model = user_data;
GSList *m, *objects;
@@ -1758,8 +1758,8 @@ hide_completed_rows_ready (GObject *source_object,
static void
show_completed_rows_ready (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+ GAsyncResult *result,
+ gpointer user_data)
{
ECalClient *client;
ECalModel *model = user_data;
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 1e991352e6..80bd508df0 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -207,7 +207,7 @@ struct pdinfo
gint end_minute_offset;
gint rows;
gint mins_per_row;
- guint8 cols_per_row[CALC_DAY_VIEW_ROWS(1)];
+ guint8 cols_per_row[CALC_DAY_VIEW_ROWS (1)];
gboolean use_24_hour_format;
icaltimezone *zone;
};
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 681ce7858b..80a61f73dc 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -657,10 +657,10 @@ e_radio_action_get_current_action (GtkRadioAction *radio_action)
**/
void
e_action_group_add_actions_localized (GtkActionGroup *action_group,
- const gchar *translation_domain,
- const GtkActionEntry *entries,
- guint n_entries,
- gpointer user_data)
+ const gchar *translation_domain,
+ const GtkActionEntry *entries,
+ guint n_entries,
+ gpointer user_data)
{
gint ii;
GtkAction *action;
diff --git a/filter/e-filter-rule.c b/filter/e-filter-rule.c
index 09172f89c7..288e7a8be1 100644
--- a/filter/e-filter-rule.c
+++ b/filter/e-filter-rule.c
@@ -646,8 +646,8 @@ filter_rule_copy (EFilterRule *dest,
static void
ensure_scrolled_width_cb (GtkAdjustment *adj,
- GParamSpec *param_spec,
- GtkScrolledWindow *scrolled_window)
+ GParamSpec *param_spec,
+ GtkScrolledWindow *scrolled_window)
{
gtk_scrolled_window_set_min_content_width (scrolled_window,
gtk_adjustment_get_upper (adj));
diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
index 012ad9ba7d..46ed515675 100644
--- a/libemail-engine/e-mail-session.c
+++ b/libemail-engine/e-mail-session.c
@@ -228,7 +228,7 @@ main_get_filter_driver (CamelSession *session,
GError **error)
{
CamelFilterDriver *driver;
- EMailSession *ms = (EMailSession *)session;
+ EMailSession *ms = (EMailSession *) session;
GSettings *settings;
settings = g_settings_new ("org.gnome.evolution.mail");
@@ -1460,7 +1460,6 @@ e_mail_session_class_init (EMailSessionClass *class)
G_TYPE_NONE, 1,
CAMEL_TYPE_STORE);
-
/**
* EMailSession::store-removed
* @session: the email session
@@ -1478,7 +1477,6 @@ e_mail_session_class_init (EMailSessionClass *class)
G_TYPE_NONE, 1,
CAMEL_TYPE_STORE);
-
}
static void
diff --git a/libemail-engine/e-mail-utils.c b/libemail-engine/e-mail-utils.c
index 05f5381147..246a4e1329 100644
--- a/libemail-engine/e-mail-utils.c
+++ b/libemail-engine/e-mail-utils.c
@@ -39,7 +39,6 @@
#include <libebook/e-book-client.h>
#include <libebook/e-book-query.h>
-
#include <glib/gi18n.h>
#include <gio/gio.h>
@@ -256,7 +255,6 @@ em_utils_folder_is_outbox (CamelFolder *folder)
/* ********************************************************************** */
-
/* runs sync, in main thread */
static gpointer
emu_addr_setup (gpointer user_data)
@@ -370,7 +368,6 @@ try_open_book_client (EBookClient *book_client,
return data.result && (!error || !*error);
}
-
#define NOT_FOUND_BOOK (GINT_TO_POINTER (1))
G_LOCK_DEFINE_STATIC (contact_cache);
@@ -778,7 +775,6 @@ emu_remove_from_mail_cache (const GSList *addresses)
g_object_unref (cia);
}
-
void
emu_remove_from_mail_cache_1 (const gchar *address)
{
@@ -1052,11 +1048,11 @@ em_utils_uids_free (GPtrArray *uids)
gboolean
em_utils_is_local_delivery_mbox_file (CamelURL *url)
{
- g_return_val_if_fail (url != NULL, FALSE);
+ g_return_val_if_fail (url != NULL, FALSE);
return g_str_equal (url->protocol, "mbox") &&
- (url->path != NULL) &&
- g_file_test (url->path, G_FILE_TEST_EXISTS) &&
- !g_file_test (url->path, G_FILE_TEST_IS_DIR);
+ (url->path != NULL) &&
+ g_file_test (url->path, G_FILE_TEST_EXISTS) &&
+ !g_file_test (url->path, G_FILE_TEST_IS_DIR);
}
diff --git a/libemail-engine/mail-folder-cache.h b/libemail-engine/mail-folder-cache.h
index b0d1d1bc49..5f464a6bd0 100644
--- a/libemail-engine/mail-folder-cache.h
+++ b/libemail-engine/mail-folder-cache.h
@@ -139,17 +139,16 @@ void mail_folder_cache_get_remote_folder_uris
(MailFolderCache *cache,
GQueue *out_queue);
void mail_folder_cache_service_added (MailFolderCache *cache,
- CamelService *service);
-void mail_folder_cache_service_removed
+ CamelService *service);
+void mail_folder_cache_service_removed
(MailFolderCache *cache,
- CamelService *service);
-void mail_folder_cache_service_enabled
+ CamelService *service);
+void mail_folder_cache_service_enabled
(MailFolderCache *cache,
- CamelService *service);
-void mail_folder_cache_service_disabled
+ CamelService *service);
+void mail_folder_cache_service_disabled
(MailFolderCache *cache,
- CamelService *service);
-
+ CamelService *service);
G_END_DECLS
diff --git a/libemail-utils/mail-mt.c b/libemail-utils/mail-mt.c
index e932bd6e93..cad4859cd1 100644
--- a/libemail-utils/mail-mt.c
+++ b/libemail-utils/mail-mt.c
@@ -74,13 +74,12 @@ mail_msg_cancelled (CamelOperation *operation,
mail_msg_cancel (GPOINTER_TO_UINT (user_data));
}
-
static gboolean
mail_msg_submit (CamelOperation *cancellable)
{
if (submit_acitivity)
- submit_acitivity ((GCancellable *)cancellable);
+ submit_acitivity ((GCancellable *) cancellable);
return FALSE;
}
@@ -97,7 +96,7 @@ mail_msg_new (MailMsgInfo *info)
msg->seq = mail_msg_seq++;
msg->cancellable = camel_operation_new ();
-
+
if (create_activity)
create_activity (msg->cancellable);
@@ -228,7 +227,7 @@ mail_msg_check_error (gpointer msg)
if (cancel_activity)
cancel_activity (m->cancellable);
return;
- }
+ }
/* XXX Hmm, no explanation of why this is needed. It looks like
* a lame hack and will be removed at some point, if only to
@@ -239,7 +238,7 @@ mail_msg_check_error (gpointer msg)
/* FIXME: Submit an error on the dbus */
if (alert_error) {
- char *what;
+ gchar *what;
if (m->info->desc && (what = m->info->desc (m))) {
alert_error (m->cancellable, what, m->error->message);
@@ -247,7 +246,7 @@ mail_msg_check_error (gpointer msg)
} else
alert_error (m->cancellable, NULL, m->error->message);
}
-}
+}
void
mail_msg_cancel (guint msgid)
diff --git a/libemail-utils/mail-mt.h b/libemail-utils/mail-mt.h
index 52da408f70..36865fe8e9 100644
--- a/libemail-utils/mail-mt.h
+++ b/libemail-utils/mail-mt.h
@@ -36,13 +36,12 @@ typedef void (*MailMsgDoneFunc) (MailMsg *msg);
typedef void (*MailMsgFreeFunc) (MailMsg *msg);
typedef void (*MailMsgDispatchFunc) (gpointer msg);
-
typedef void (*MailMsgCreateActivityFunc) (GCancellable *cancellable);
typedef void (*MailMsgSubmitActivityFunc) (GCancellable *cancellable);
typedef void (*MailMsgFreeActivityFunc) (GCancellable *cancellable);
typedef void (*MailMsgCompleteActivityFunc) (GCancellable *cancellable);
typedef void (*MailMsgCancelActivityFunc) (GCancellable *cancellable);
-typedef void (*MailMsgAlertErrorFunc) (GCancellable *cancellable, const char *what, const char *message);
+typedef void (*MailMsgAlertErrorFunc) (GCancellable *cancellable, const gchar *what, const gchar *message);
struct _MailMsg {
MailMsgInfo *info;
@@ -67,7 +66,7 @@ void mail_msg_register_activities (MailMsgCreateActivityFunc,
MailMsgSubmitActivityFunc,
MailMsgFreeActivityFunc,
MailMsgCompleteActivityFunc,
- MailMsgCancelActivityFunc,
+ MailMsgCancelActivityFunc,
MailMsgAlertErrorFunc);
gboolean mail_in_main_thread (void);
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 921b2d0efc..9e32b654d7 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -764,8 +764,8 @@ mail_backend_finalize (GObject *object)
static void
mail_backend_add_store (EMailSession *session,
- CamelStore *store,
- EMailBackend *backend)
+ CamelStore *store,
+ EMailBackend *backend)
{
EMFolderTreeModel *model;
@@ -775,8 +775,8 @@ mail_backend_add_store (EMailSession *session,
static void
mail_backend_remove_store (EMailSession *session,
- CamelStore *store,
- EMailBackend *backend)
+ CamelStore *store,
+ EMailBackend *backend)
{
EMFolderTreeModel *model;
@@ -789,7 +789,7 @@ mail_backend_remove_store (EMailSession *session,
#define GET_ACITIVITY(cancellable) \
g_object_get_data (G_OBJECT (cancellable), "e-activity")
-static void
+static void
mail_mt_create_activity (GCancellable *cancellable)
{
EActivity *activity;
@@ -817,7 +817,7 @@ mail_mt_submit_activity (GCancellable *cancellable)
}
-static void
+static void
mail_mt_free_activity (GCancellable *cancellable)
{
EActivity *activity = GET_ACITIVITY (cancellable);
@@ -826,7 +826,7 @@ mail_mt_free_activity (GCancellable *cancellable)
g_object_unref (activity);
}
-static void
+static void
mail_mt_complete_acitivity (GCancellable *cancellable)
{
EActivity *activity = GET_ACITIVITY (cancellable);
@@ -835,19 +835,19 @@ mail_mt_complete_acitivity (GCancellable *cancellable)
e_activity_set_state (activity, E_ACTIVITY_COMPLETED);
}
-static void
+static void
mail_mt_cancel_activity (GCancellable *cancellable)
{
EActivity *activity = GET_ACITIVITY (cancellable);
if (activity)
- e_activity_set_state (activity, E_ACTIVITY_CANCELLED);
+ e_activity_set_state (activity, E_ACTIVITY_CANCELLED);
}
-static void
+static void
mail_mt_alert_error (GCancellable *cancellable,
- const char *what,
- const char *message)
+ const gchar *what,
+ const gchar *message)
{
EShell *shell;
EShellView *shell_view;
@@ -910,7 +910,7 @@ mail_backend_constructed (GObject *object)
g_signal_connect (
priv->session, "flush-outbox",
- G_CALLBACK (mail_send), priv->session);
+ G_CALLBACK (mail_send), priv->session);
g_object_bind_property (
shell, "online",
diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c
index dcb2e25573..d0ddb05477 100644
--- a/mail/e-mail-ui-session.c
+++ b/mail/e-mail-ui-session.c
@@ -38,7 +38,6 @@
#include <gtk/gtk.h>
-
#ifdef HAVE_CANBERRA
#include <canberra-gtk.h>
#endif
@@ -93,7 +92,7 @@ struct _EMailUISessionPrivate {
enum {
PROP_0,
PROP_ACCOUNT_STORE,
- PROP_LABEL_STORE,
+ PROP_LABEL_STORE,
PROP_VFOLDER_STORE
};
@@ -128,7 +127,7 @@ struct _user_message_msg {
GSList *button_captions;
EFlag *done;
- gint result;
+ gint result;
guint ismain : 1;
};
@@ -243,7 +242,7 @@ user_message_exec (struct _user_message_msg *m,
}
/* when no shell-content found, which might not happen, but just in case,
- process the information alert like usual, through an EAlertDialog machinery
+ * process the information alert like usual, through an EAlertDialog machinery
*/
if (shell_content) {
e_alert_submit (E_ALERT_SINK (shell_content), error_type, m->prompt, NULL);
@@ -253,7 +252,7 @@ user_message_exec (struct _user_message_msg *m,
return;
}
}
-
+
/* Pull in the active window from the shell to get a parent window */
parent = e_shell_get_active_window (shell);
user_message_dialog = e_alert_dialog_new_for_args (
@@ -279,7 +278,6 @@ user_message_exec (struct _user_message_msg *m,
gtk_dialog_add_button (GTK_DIALOG (user_message_dialog), iter->data, index);
}
-
/* XXX This is a case where we need to be able to construct
* custom EAlerts without a predefined XML definition. */
if (m->ismain) {
@@ -293,7 +291,7 @@ user_message_exec (struct _user_message_msg *m,
if (g_slist_length (m->button_captions) <= 1)
user_data = NULL;
-
+
g_signal_connect (
user_message_dialog, "response",
G_CALLBACK (user_message_response), user_data);
@@ -492,7 +490,6 @@ mail_ui_session_dispose (GObject *object)
priv->label_store = NULL;
}
-
if (priv->vfolder_store != NULL) {
g_object_unref (priv->vfolder_store);
priv->vfolder_store = NULL;
@@ -621,7 +618,7 @@ mail_ui_session_constructed (GObject *object)
gulong handler_id;
session = E_MAIL_SESSION (object);
- uisession = E_MAIL_UI_SESSION(object);
+ uisession = E_MAIL_UI_SESSION (object);
uisession->priv = priv = E_MAIL_UI_SESSION_GET_PRIVATE (object);
priv->account_store = e_mail_account_store_new (session);
@@ -713,7 +710,7 @@ mail_ui_session_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
}
static void
@@ -737,7 +734,6 @@ mail_ui_session_get_property (GObject *object,
E_MAIL_UI_SESSION (object)));
return;
-
case PROP_VFOLDER_STORE:
g_value_set_object (
value,
@@ -802,7 +798,7 @@ e_mail_ui_session_class_init (EMailUISessionClass *class)
object_class = G_OBJECT_CLASS (class);
object_class->set_property = mail_ui_session_set_property;
- object_class->get_property = mail_ui_session_get_property;
+ object_class->get_property = mail_ui_session_get_property;
object_class->dispose = mail_ui_session_dispose;
object_class->constructed = mail_ui_session_constructed;
@@ -867,7 +863,6 @@ e_mail_ui_session_new (void)
NULL);
}
-
EMailAccountStore *
e_mail_ui_session_get_account_store (EMailUISession *session)
{
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 8b7f1600d6..ffcc637a84 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -273,7 +273,8 @@ static void emae_account_folder_changed (EMFolderSelectionButton *folder, EMAcco
G_DEFINE_TYPE (EMAccountEditor, em_account_editor, G_TYPE_OBJECT)
static void
-emae_config_gone_cb (gpointer pemae, GObject *pconfig)
+emae_config_gone_cb (gpointer pemae,
+ GObject *pconfig)
{
EMAccountEditor *emae = pemae;
struct _EMConfig *config = (struct _EMConfig *) pconfig;
@@ -5507,7 +5508,7 @@ emae_commit (EConfig *ec,
service = camel_session_get_service (
CAMEL_SESSION (session), account->uid);
- store = e_mail_ui_session_get_account_store (E_MAIL_UI_SESSION(session));
+ store = e_mail_ui_session_get_account_store (E_MAIL_UI_SESSION (session));
e_mail_account_store_set_default_service (store, service);
}
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 4d8e37d9a4..fdd3322a63 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -61,7 +61,6 @@
#include "em-event.h"
#include "mail-send-recv.h"
-
#ifdef G_OS_WIN32
#ifdef gmtime_r
#undef gmtime_r
diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c
index 04216900bc..97a7627c6d 100644
--- a/mail/em-format-html-print.c
+++ b/mail/em-format-html-print.c
@@ -224,14 +224,14 @@ em_format_html_print_message (EMFormatHTMLPrint *efhp,
if (efhp->async) {
g_signal_connect (
efhp, "complete", G_CALLBACK (emfhp_complete), efhp);
-
+
/* FIXME Not passing a GCancellable here. */
em_format_format_clone (
- (EMFormat *) efhp,
+ (EMFormat *) efhp,
folder, message_uid, message,
(EMFormat *) efhp->source, NULL);
} else {
- em_format_html_clone_sync (folder, message_uid, message, (EMFormatHTML *)efhp, (EMFormat *)efhp->source);
+ em_format_html_clone_sync (folder, message_uid, message, (EMFormatHTML *) efhp, (EMFormat *) efhp->source);
emfhp_complete (efhp);
}
}
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index a720d2cc9f..8e4769ecf2 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -332,7 +332,8 @@ static MailMsgInfo efh_format_info = {
};
static gboolean
-efh_format_helper (struct _format_msg *m, gboolean async)
+efh_format_helper (struct _format_msg *m,
+ gboolean async)
{
GtkHTMLStream *hstream;
EMFormatHTML *efh = m->format;
@@ -409,7 +410,7 @@ efh_format_helper (struct _format_msg *m, gboolean async)
if (async) {
mail_msg_unordered_push (m);
} else {
- efh_format_exec(m, NULL, NULL);
+ efh_format_exec (m, NULL, NULL);
}
}
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 247b47d967..c712431aa8 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -617,9 +617,9 @@ em_utils_write_messages_to_stream (CamelFolder *folder,
}
static gboolean
-em_utils_print_messages_to_file (CamelFolder *folder,
- const gchar * uid,
- const gchar *filename)
+em_utils_print_messages_to_file (CamelFolder *folder,
+ const gchar *uid,
+ const gchar *filename)
{
EMFormatHTMLPrint *efhp;
CamelMimeMessage *message;
@@ -884,11 +884,11 @@ em_utils_selection_get_uidlist (GtkSelectionData *selection_data,
}
static gchar *
-em_utils_build_export_filename (CamelFolder *folder,
- const gchar * uid,
- const gchar * exporttype,
- gint exportname,
- const gchar * tmpdir)
+em_utils_build_export_filename (CamelFolder *folder,
+ const gchar *uid,
+ const gchar *exporttype,
+ gint exportname,
+ const gchar *tmpdir)
{
CamelMessageInfo *info;
gchar *file, *tmpfile;
@@ -896,16 +896,16 @@ em_utils_build_export_filename (CamelFolder *folder,
gchar datetmp[15];
/* Try to get the drop filename from the message or folder */
- info = camel_folder_get_message_info(folder, uid);
+ info = camel_folder_get_message_info (folder, uid);
if (info) {
if (camel_message_info_subject (info)) {
time_t reftime;
reftime = camel_message_info_date_sent (info);
- if (exportname==DND_USE_DND_DATE) {
- reftime = time(NULL);
+ if (exportname == DND_USE_DND_DATE) {
+ reftime = time (NULL);
}
- ts = localtime(&reftime);
+ ts = localtime (&reftime);
strftime(datetmp, 15, "%Y%m%d%H%M%S", ts);
if (g_ascii_strcasecmp (exporttype, "pdf")==0)
@@ -914,11 +914,11 @@ em_utils_build_export_filename (CamelFolder *folder,
file = g_strdup_printf ("%s_%s", datetmp, camel_message_info_subject(info));
}
- camel_folder_free_message_info(folder, info);
+ camel_folder_free_message_info (folder, info);
} else {
time_t reftime;
- reftime = time(NULL);
- ts = localtime(&reftime);
+ reftime = time (NULL);
+ ts = localtime (&reftime);
strftime(datetmp, 15, "%Y%m%d%H%M%S", ts);
if (g_ascii_strcasecmp (exporttype, "pdf")==0)
file = g_strdup_printf ("%s_Untitled Message.pdf", datetmp);
@@ -927,11 +927,11 @@ em_utils_build_export_filename (CamelFolder *folder,
}
- e_filename_make_safe(file);
+ e_filename_make_safe (file);
- tmpfile = g_build_filename(tmpdir, file, NULL);
+ tmpfile = g_build_filename (tmpdir, file, NULL);
- g_free(file);
+ g_free (file);
return tmpfile;
}
@@ -951,17 +951,17 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
CamelFolder *folder,
GPtrArray *uids)
{
- gchar *tmpdir;
+ gchar *tmpdir;
gchar *uri;
- gint fd;
+ gint fd;
GConfClient *client;
gchar *exporttype;
gint exportname;
-
+
tmpdir = e_mkdtemp("drag-n-drop-XXXXXX");
- if (tmpdir == NULL)
- return;
-
+ if (tmpdir == NULL)
+ return;
+
client = gconf_client_get_default ();
exporttype = gconf_client_get_string (
client, "/apps/evolution/mail/save_file_format", NULL);
@@ -974,91 +974,91 @@ em_utils_selection_set_urilist (GtkSelectionData *data,
gchar * file = NULL;
CamelStream *fstream;
- if(uids->len>1) {
+ if (uids->len > 1) {
gchar * tmp = g_strdup_printf(_("Messages from %s"), camel_folder_get_display_name (folder));
- e_filename_make_safe(tmp);
- file = g_build_filename(tmpdir, tmp, NULL);
- g_free(tmp);
+ e_filename_make_safe (tmp);
+ file = g_build_filename (tmpdir, tmp, NULL);
+ g_free (tmp);
} else {
- file = em_utils_build_export_filename(folder, uids->pdata[0], exporttype, exportname, tmpdir);
- }
-
- g_free(tmpdir);
- fd = g_open(file, O_WRONLY | O_CREAT | O_EXCL | O_BINARY, 0666);
+ file = em_utils_build_export_filename (folder, uids->pdata[0], exporttype, exportname, tmpdir);
+ }
+
+ g_free (tmpdir);
+ fd = g_open (file, O_WRONLY | O_CREAT | O_EXCL | O_BINARY, 0666);
if (fd == -1) {
- g_free(file);
- g_free(exporttype);
+ g_free (file);
+ g_free (exporttype);
return;
- }
-
- uri = g_filename_to_uri(file, NULL, NULL);
- fstream = camel_stream_fs_new_with_fd(fd);
+ }
+
+ uri = g_filename_to_uri (file, NULL, NULL);
+ fstream = camel_stream_fs_new_with_fd (fd);
if (fstream) {
- if (em_utils_write_messages_to_stream(folder, uids, fstream) == 0) {
+ if (em_utils_write_messages_to_stream (folder, uids, fstream) == 0) {
GdkAtom type;
/* terminate with \r\n to be compliant with the spec */
gchar *uri_crlf = g_strconcat(uri, "\r\n", NULL);
type = gtk_selection_data_get_target (data);
- gtk_selection_data_set(data, type, 8, (guchar *) uri_crlf, strlen(uri_crlf));
- g_free(uri_crlf);
+ gtk_selection_data_set (data, type, 8, (guchar *) uri_crlf, strlen (uri_crlf));
+ g_free (uri_crlf);
}
g_object_unref (fstream);
} else
- close(fd);
-
- g_free(exporttype);
- g_free(file);
- g_free(uri);
+ close (fd);
+
+ g_free (exporttype);
+ g_free (file);
+ g_free (uri);
} else if(g_ascii_strcasecmp (exporttype, "pdf")==0) {
gchar ** filenames, **uris;
- gint i, uris_count=0;
+ gint i, uris_count = 0;
- filenames = g_new(gchar *, uids->len);
- uris = g_new(gchar *, uids->len + 1);
- for(i=0; i<uids->len; i++) {
- filenames[i] = em_utils_build_export_filename(folder, uids->pdata[i], exporttype, exportname, tmpdir);
+ filenames = g_new (gchar *, uids->len);
+ uris = g_new (gchar *, uids->len + 1);
+ for (i = 0; i < uids->len; i++) {
+ filenames[i] = em_utils_build_export_filename (folder, uids->pdata[i], exporttype, exportname, tmpdir);
/* validity test */
- fd = g_open(filenames[i], O_WRONLY | O_CREAT | O_EXCL | O_BINARY, 0666);
+ fd = g_open (filenames[i], O_WRONLY | O_CREAT | O_EXCL | O_BINARY, 0666);
if (fd == -1) {
gint j;
- for(j=0; j<=i; j++) {
- g_free(filenames[j]);
+ for (j = 0; j <= i; j++) {
+ g_free (filenames[j]);
}
- g_free(filenames);
- g_free(uris);
- g_free(tmpdir);
- g_free(exporttype);
+ g_free (filenames);
+ g_free (uris);
+ g_free (tmpdir);
+ g_free (exporttype);
return;
}
- close(fd);
+ close (fd);
/* export */
if (em_utils_print_messages_to_file (folder, uids->pdata[i], filenames[i])) {
/* terminate with \r\n to be compliant with the spec */
- uri = g_filename_to_uri(filenames[i], NULL, NULL);
+ uri = g_filename_to_uri (filenames[i], NULL, NULL);
uris[uris_count++] = g_strconcat(uri, "\r\n", NULL);
- g_free(uri);
+ g_free (uri);
}
- }
-
+ }
+
uris[uris_count] = NULL;
- gtk_selection_data_set_uris(data, uris);
-
- g_free(tmpdir);
- for(i=0; i<uids->len; i++) {
- g_free(filenames[i]);
- }
- g_free(filenames);
- for(i=0; i<uris_count; i++) {
- g_free(uris[i]);
+ gtk_selection_data_set_uris (data, uris);
+
+ g_free (tmpdir);
+ for (i = 0; i < uids->len; i++) {
+ g_free (filenames[i]);
+ }
+ g_free (filenames);
+ for (i = 0; i < uris_count; i++) {
+ g_free (uris[i]);
}
- g_free(uris);
- g_free(exporttype);
-
+ g_free (uris);
+ g_free (exporttype);
+
} else {
- g_free(tmpdir);
- g_free(exporttype);
+ g_free (tmpdir);
+ g_free (exporttype);
}
}
@@ -1346,8 +1346,8 @@ emu_restore_folder_tree_state (EMFolderTree *folder_tree)
static gboolean
check_prefix (const gchar *subject,
- const gchar *prefix,
- gint *skip_len)
+ const gchar *prefix,
+ gint *skip_len)
{
gint plen;
@@ -1375,8 +1375,8 @@ check_prefix (const gchar *subject,
gboolean
em_utils_is_re_in_subject (EShell *shell,
- const gchar *subject,
- gint *skip_len)
+ const gchar *subject,
+ gint *skip_len)
{
EShellSettings *shell_settings;
gchar *prefixes, **prefixes_strv;
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 4b10e829de..7d5b3c24e8 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -250,7 +250,7 @@ vfolder_adduri_exec (struct _adduri_msg *m,
}
/* always pick fresh folders - they are
- from CamelStore's folders bag anyway */
+ * from CamelStore's folders bag anyway */
folder = e_mail_session_uri_to_folder_sync (
m->session, m->uri, 0, cancellable, error);
@@ -691,7 +691,7 @@ rule_add_sources (EMailSession *session,
const gchar *uri = link->data;
/* always pick fresh folders - they are
- from CamelStore's folders bag anyway */
+ * from CamelStore's folders bag anyway */
if (mail_folder_cache_get_folder_from_uri (folder_cache, uri, NULL)) {
sources_uri = g_list_append (sources_uri, g_strdup (uri));
}
@@ -1023,7 +1023,7 @@ vfolder_load_storage (EMailBackend *backend)
config_dir = mail_session_get_config_dir ();
session = e_mail_backend_get_session (backend);
- vfolder_store = e_mail_ui_session_get_vfolder_store (E_MAIL_UI_SESSION(session));
+ vfolder_store = e_mail_ui_session_get_vfolder_store (E_MAIL_UI_SESSION (session));
g_signal_connect (
vfolder_store, "folder-deleted",
diff --git a/mail/message-list.c b/mail/message-list.c
index 405e9d08cd..82f6540b1a 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -4238,7 +4238,7 @@ message_list_count (MessageList *message_list)
static void
ml_getselcount_cb (gint model_row,
- gpointer user_data)
+ gpointer user_data)
{
struct ml_count_data *data = user_data;
diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c
index a07d500bfc..b717b090d3 100644
--- a/modules/addressbook/e-book-shell-backend.c
+++ b/modules/addressbook/e-book-shell-backend.c
@@ -133,11 +133,11 @@ book_shell_backend_ensure_sources (EShellBackend *shell_backend)
e_source_group_add_source (on_this_computer, source, -1);
e_source_set_property (source, "completion", "true");
g_object_unref (source);
- e_source_list_sync (priv->source_list, NULL);
+ e_source_list_sync (priv->source_list, NULL);
} else if (!e_source_get_property (personal, "name-changed")) {
/* Force the source name to the current locale. */
e_source_set_name (personal, name);
- e_source_list_sync (priv->source_list, NULL);
+ e_source_list_sync (priv->source_list, NULL);
}
g_object_unref (on_this_computer);
diff --git a/plugins/caldav/caldav-browse-server.c b/plugins/caldav/caldav-browse-server.c
index c9d09cea20..6737e3b006 100644
--- a/plugins/caldav/caldav-browse-server.c
+++ b/plugins/caldav/caldav-browse-server.c
@@ -1581,7 +1581,6 @@ caldav_browse_server (GtkWindow *parent,
gchar *url, *new_url = NULL;
SoupURI *soup_uri = NULL;
-
g_return_val_if_fail (server_url != NULL, NULL);
url = prepare_url (server_url, use_ssl);
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index d450dcfb80..21d24f6da9 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -1348,7 +1348,7 @@ get_uri_for_part (CamelMimePart *mime_part)
static void
update_item_progress_info (struct _itip_puri *pitip,
- const gchar *message)
+ const gchar *message)
{
if (pitip->update_item_progress_info_id) {
itip_view_remove_lower_info_item (ITIP_VIEW (pitip->view), pitip->update_item_progress_info_id);
@@ -1373,7 +1373,7 @@ update_item_progress_info (struct _itip_puri *pitip,
static void
finish_message_delete_with_rsvp (struct _itip_puri *pitip,
- ECalClient *client)
+ ECalClient *client)
{
gboolean save_schedules = e_cal_client_check_save_schedules (client);
@@ -1465,8 +1465,8 @@ finish_message_delete_with_rsvp (struct _itip_puri *pitip,
static void
receive_objects_ready_cb (GObject *ecalclient,
- GAsyncResult *result,
- gpointer user_data)
+ GAsyncResult *result,
+ gpointer user_data)
{
ECalClient *client = E_CAL_CLIENT (ecalclient);
ESource *source = e_client_get_source (E_CLIENT (client));
@@ -1833,8 +1833,8 @@ update_x (ECalComponent *pitip_comp,
static void
modify_object_cb (GObject *ecalclient,
- GAsyncResult *result,
- gpointer user_data)
+ GAsyncResult *result,
+ gpointer user_data)
{
ECalClient *client = E_CAL_CLIENT (ecalclient);
struct _itip_puri *pitip = user_data;
@@ -1862,7 +1862,7 @@ modify_object_cb (GObject *ecalclient,
static void
update_attendee_status_icalcomp (struct _itip_puri *pitip,
- icalcomponent *icalcomp)
+ icalcomponent *icalcomp)
{
ECalComponent *comp;
const gchar *uid = NULL;
@@ -1979,8 +1979,8 @@ update_attendee_status_icalcomp (struct _itip_puri *pitip,
static void
update_attendee_status_get_object_without_rid_cb (GObject *ecalclient,
- GAsyncResult *result,
- gpointer user_data)
+ GAsyncResult *result,
+ gpointer user_data)
{
ECalClient *client = E_CAL_CLIENT (ecalclient);
struct _itip_puri *pitip = user_data;
@@ -2008,8 +2008,8 @@ update_attendee_status_get_object_without_rid_cb (GObject *ecalclient,
static void
update_attendee_status_get_object_with_rid_cb (GObject *ecalclient,
- GAsyncResult *result,
- gpointer user_data)
+ GAsyncResult *result,
+ gpointer user_data)
{
ECalClient *client = E_CAL_CLIENT (ecalclient);
struct _itip_puri *pitip = user_data;