diff options
-rw-r--r-- | calendar/gui/dialogs/comp-editor.c | 24 | ||||
-rw-r--r-- | calendar/gui/e-meeting-store.c | 4 | ||||
-rw-r--r-- | calendar/gui/ea-week-view-cell.c | 14 | ||||
-rw-r--r-- | calendar/gui/itip-utils.c | 3 | ||||
-rw-r--r-- | e-util/e-attachment-store.c | 2 | ||||
-rw-r--r-- | em-format/e-mail-formatter-print.c | 2 | ||||
-rw-r--r-- | em-format/e-mail-formatter-text-html.c | 6 | ||||
-rw-r--r-- | em-format/e-mail-formatter.c | 8 | ||||
-rw-r--r-- | libemail-engine/e-mail-utils.c | 20 | ||||
-rw-r--r-- | mail/e-mail-account-store.c | 3 | ||||
-rw-r--r-- | mail/e-mail-backend.c | 2 | ||||
-rw-r--r-- | mail/e-mail-reader.c | 4 | ||||
-rw-r--r-- | mail/em-composer-utils.c | 6 | ||||
-rw-r--r-- | mail/message-list.c | 6 | ||||
-rw-r--r-- | modules/backup-restore/evolution-backup-tool.c | 2 | ||||
-rw-r--r-- | modules/calendar/e-cal-shell-backend.c | 4 | ||||
-rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 29 | ||||
-rw-r--r-- | modules/mail/e-mail-shell-view.c | 2 | ||||
-rw-r--r-- | modules/mail/em-mailer-prefs.c | 8 | ||||
-rw-r--r-- | modules/settings/e-settings-mail-formatter.c | 4 | ||||
-rw-r--r-- | plugins/publish-calendar/publish-format-fb.c | 4 | ||||
-rw-r--r-- | plugins/templates/templates.c | 2 |
22 files changed, 81 insertions, 78 deletions
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 7a566e85ac..dd58b86ce6 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -1061,19 +1061,19 @@ save_and_close_editor (CompEditor *editor, switch (source_type) { case (E_CAL_CLIENT_SOURCE_TYPE_TASKS): msg = g_strdup_printf ( - _("Unable to retrieve saved component from the task list, returned error was: %s"), - error->message); + _("Unable to retrieve saved component from the task list, returned error was: %s"), + error->message); break; case (E_CAL_CLIENT_SOURCE_TYPE_MEMOS): msg = g_strdup_printf ( - _("Unable to retrieve saved component from the memo list, returned error was: %s"), - error->message); + _("Unable to retrieve saved component from the memo list, returned error was: %s"), + error->message); break; case (E_CAL_CLIENT_SOURCE_TYPE_EVENTS): default: msg = g_strdup_printf ( - _("Unable to retrieve saved component from the calendar, returned error was: %s"), - error->message); + _("Unable to retrieve saved component from the calendar, returned error was: %s"), + error->message); break; } g_clear_error (&error); @@ -1081,16 +1081,16 @@ save_and_close_editor (CompEditor *editor, switch (source_type) { case (E_CAL_CLIENT_SOURCE_TYPE_TASKS): msg = g_strdup ( - _("Unable to retrieve saved component from the task list")); + _("Unable to retrieve saved component from the task list")); break; case (E_CAL_CLIENT_SOURCE_TYPE_MEMOS): msg = g_strdup ( - _("Unable to retrieve saved component from the memo list")); + _("Unable to retrieve saved component from the memo list")); break; case (E_CAL_CLIENT_SOURCE_TYPE_EVENTS): default: msg = g_strdup ( - _("Unable to retrieve saved component from the calendar")); + _("Unable to retrieve saved component from the calendar")); break; } } @@ -1111,16 +1111,16 @@ save_and_close_editor (CompEditor *editor, switch (source_type) { case (E_CAL_CLIENT_SOURCE_TYPE_TASKS): msg = g_strdup ( - _("Unable to update the editor with the retrieved component from the task list")); + _("Unable to update the editor with the retrieved component from the task list")); break; case (E_CAL_CLIENT_SOURCE_TYPE_MEMOS): msg = g_strdup ( - _("Unable to update the editor with the retrieved component from the memo list")); + _("Unable to update the editor with the retrieved component from the memo list")); break; case (E_CAL_CLIENT_SOURCE_TYPE_EVENTS): default: msg = g_strdup ( - _("Unable to update the editor with the retrieved component from the calendar")); + _("Unable to update the editor with the retrieved component from the calendar")); break; } e_notice (GTK_WINDOW (editor), GTK_MESSAGE_ERROR, "%s", msg); diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index 6abb1371b5..695188f6cd 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -1568,8 +1568,8 @@ freebusy_async (gpointer data) fbd->client, fbd->startt, fbd->endt, fbd->users, NULL, NULL); /* This is to workaround broken dispatch of "free-busy-data" signal, - introduced in 3.8.0. This code can be removed once the below bug is - properly fixed: https://bugzilla.gnome.org/show_bug.cgi?id=692361 + * introduced in 3.8.0. This code can be removed once the below bug is + * properly fixed: https://bugzilla.gnome.org/show_bug.cgi?id=692361 */ g_usleep (G_USEC_PER_SEC / 10); g_signal_handler_disconnect (fbd->client, sigid); diff --git a/calendar/gui/ea-week-view-cell.c b/calendar/gui/ea-week-view-cell.c index ff83c00da6..0f3133f512 100644 --- a/calendar/gui/ea-week-view-cell.c +++ b/calendar/gui/ea-week-view-cell.c @@ -70,8 +70,8 @@ e_week_view_cell_class_init (EWeekViewCellClass *class) EWeekViewCell * e_week_view_cell_new (EWeekView *week_view, - gint row, - gint column) + gint row, + gint column) { GObject *object; EWeekViewCell *cell; @@ -348,11 +348,11 @@ atk_component_interface_init (AtkComponentIface *iface) static void component_interface_get_extents (AtkComponent *component, - gint *x, - gint *y, - gint *width, - gint *height, - AtkCoordType coord_type) + gint *x, + gint *y, + gint *width, + gint *height, + AtkCoordType coord_type) { GObject *g_obj; AtkObject *atk_obj; diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 97e582a8db..0ae5b45e5e 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -774,7 +774,8 @@ comp_to_list (ESourceRegistry *registry, if (organizer.value && (!sender || g_ascii_strcasecmp ( itip_strip_mailto (organizer.value), sender) != 0)) { destination = e_destination_new (); - e_destination_set_email (destination, + e_destination_set_email ( + destination, itip_strip_mailto (organizer.value)); if (organizer.cn) e_destination_set_name (destination, organizer.cn); diff --git a/e-util/e-attachment-store.c b/e-util/e-attachment-store.c index a608c06f74..55bc795095 100644 --- a/e-util/e-attachment-store.c +++ b/e-util/e-attachment-store.c @@ -418,7 +418,7 @@ e_attachment_store_get_total_size (EAttachmentStore *store) static void update_preview_cb (GtkFileChooser *file_chooser, - gpointer data) + gpointer data) { GtkWidget *preview; gchar *filename = NULL; diff --git a/em-format/e-mail-formatter-print.c b/em-format/e-mail-formatter-print.c index 4d6487d526..b79af5ea1f 100644 --- a/em-format/e-mail-formatter-print.c +++ b/em-format/e-mail-formatter-print.c @@ -176,7 +176,7 @@ mail_formatter_print_run (EMailFormatter *formatter, static void mail_formatter_update_style (EMailFormatter *formatter, - GtkStateFlags state) + GtkStateFlags state) { EMailFormatterClass *formatter_class; diff --git a/em-format/e-mail-formatter-text-html.c b/em-format/e-mail-formatter-text-html.c index bef29a3acc..f730f1217b 100644 --- a/em-format/e-mail-formatter-text-html.c +++ b/em-format/e-mail-formatter-text-html.c @@ -319,9 +319,9 @@ emfe_text_html_format (EMailFormatterExtension *extension, NULL); /* HTML messages expect white background and black color for text. - If Evolution uses a dark theme, then the dark background with - a black text is hard to read, thus force white background color. - The HTML content can still overwrite both colors. + * If Evolution uses a dark theme, then the dark background with + * a black text is hard to read, thus force white background color. + * The HTML content can still overwrite both colors. */ str = g_strdup_printf ( "<div class=\"part-container-nostyle\">" diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c index 95eacaaed7..b28bce4942 100644 --- a/em-format/e-mail-formatter.c +++ b/em-format/e-mail-formatter.c @@ -467,7 +467,7 @@ mail_formatter_run (EMailFormatter *formatter, static void mail_formatter_update_style (EMailFormatter *formatter, - GtkStateFlags state) + GtkStateFlags state) { GtkStyleContext *style_context; GtkWidgetPath *widget_path; @@ -1164,7 +1164,7 @@ e_mail_formatter_set_color (EMailFormatter *formatter, void e_mail_formatter_update_style (EMailFormatter *formatter, - GtkStateFlags state) + GtkStateFlags state) { EMailFormatterClass *formatter_class; @@ -1546,8 +1546,8 @@ e_mail_formatter_add_header_struct (EMailFormatter *formatter, void e_mail_formatter_remove_header (EMailFormatter *formatter, - const gchar *name, - const gchar *value) + const gchar *name, + const gchar *value) { GList *iter = NULL; diff --git a/libemail-engine/e-mail-utils.c b/libemail-engine/e-mail-utils.c index c6aff21595..83f90fe4f8 100644 --- a/libemail-engine/e-mail-utils.c +++ b/libemail-engine/e-mail-utils.c @@ -485,11 +485,11 @@ mail_account_in_recipients (ESourceRegistry *registry, ESource * em_utils_guess_mail_account_with_recipients_and_sort (ESourceRegistry *registry, - CamelMimeMessage *message, - CamelFolder *folder, - const gchar *message_uid, - EMailUtilsSourtSourcesFunc sort_func, - gpointer sort_func_data) + CamelMimeMessage *message, + CamelFolder *folder, + const gchar *message_uid, + EMailUtilsSourtSourcesFunc sort_func, + gpointer sort_func_data) { ESource *source = NULL; GHashTable *recipients; @@ -583,11 +583,11 @@ exit: ESource * em_utils_guess_mail_identity_with_recipients_and_sort (ESourceRegistry *registry, - CamelMimeMessage *message, - CamelFolder *folder, - const gchar *message_uid, - EMailUtilsSourtSourcesFunc sort_func, - gpointer sort_func_data) + CamelMimeMessage *message, + CamelFolder *folder, + const gchar *message_uid, + EMailUtilsSourtSourcesFunc sort_func, + gpointer sort_func_data) { ESource *source; ESourceExtension *extension; diff --git a/mail/e-mail-account-store.c b/mail/e-mail-account-store.c index 7b4605b64d..b4880325f0 100644 --- a/mail/e-mail-account-store.c +++ b/mail/e-mail-account-store.c @@ -226,7 +226,8 @@ mail_account_store_service_notify_cb (CamelService *service, data->store = g_object_ref (store); data->service = g_object_ref (service); - g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, + g_idle_add_full ( + G_PRIORITY_DEFAULT_IDLE, mail_account_store_service_notify_idle_cb, data, service_notify_cb_data_free); diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c index efb3521b06..0ed85b34ad 100644 --- a/mail/e-mail-backend.c +++ b/mail/e-mail-backend.c @@ -157,7 +157,7 @@ mail_backend_prepare_for_offline_cb (EShell *shell, } /* Set the cancellable only here, because mail_cancel_all() would - cancel the just added CamelOperation as well. */ + * cancel the just added CamelOperation as well. */ if (e_shell_backend_is_started (E_SHELL_BACKEND (backend)) && !e_activity_get_cancellable (activity)) { GCancellable *cancellable; diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 97774c84d4..271b65ca08 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -2612,7 +2612,7 @@ mail_reader_key_press_event_cb (EMailReader *reader, GtkAction *action; const gchar *action_name; - if (!gtk_widget_has_focus (GTK_WIDGET (reader))) { + if (!gtk_widget_has_focus (GTK_WIDGET (reader))) { WebKitWebFrame *frame; WebKitDOMDocument *dom; WebKitDOMElement *element; @@ -2625,7 +2625,7 @@ mail_reader_key_press_event_cb (EMailReader *reader, if (frame) { dom = webkit_web_frame_get_dom_document (frame); /* intentionally used "static_cast" */ - element = webkit_dom_html_document_get_active_element ((WebKitDOMHTMLDocument*) dom); + element = webkit_dom_html_document_get_active_element ((WebKitDOMHTMLDocument *) dom); if (element) name = webkit_dom_node_get_node_name (WEBKIT_DOM_NODE (element)); diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index cf5039b9fd..5d6ba26c5f 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1986,8 +1986,8 @@ em_utils_forward_messages (EMailReader *reader, static gint compare_sources_with_uids_order_cb (gconstpointer a, - gconstpointer b, - gpointer user_data) + gconstpointer b, + gpointer user_data) { ESource *asource = (ESource *) a; ESource *bsource = (ESource *) b; @@ -2007,7 +2007,7 @@ compare_sources_with_uids_order_cb (gconstpointer a, static void sort_sources_by_ui (GList **psources, - gpointer user_data) + gpointer user_data) { EShell *shell = user_data; EShellBackend *shell_backend; diff --git a/mail/message-list.c b/mail/message-list.c index f94953f1d7..3356054b44 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -3216,7 +3216,7 @@ static void build_tree (MessageList *ml, CamelFolderThread *thread, CamelFolderChangeInfo *changes, - gboolean can_scroll_to_cursor) + gboolean can_scroll_to_cursor) { gint row = 0; ETreeModel *etm = ml->model; @@ -4258,7 +4258,7 @@ struct ml_sort_uids_data { static gint ml_sort_uids_cb (gconstpointer a, - gconstpointer b) + gconstpointer b) { struct ml_sort_uids_data * const *pdataA = a; struct ml_sort_uids_data * const *pdataB = b; @@ -4268,7 +4268,7 @@ ml_sort_uids_cb (gconstpointer a, void message_list_sort_uids (MessageList *message_list, - GPtrArray *uids) + GPtrArray *uids) { struct ml_sort_uids_data *data; GPtrArray *array; diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c index 10522c5f09..93a56bd672 100644 --- a/modules/backup-restore/evolution-backup-tool.c +++ b/modules/backup-restore/evolution-backup-tool.c @@ -157,7 +157,7 @@ strip_home_dir (const gchar *dir) static GString * replace_variables (const gchar *str, - gboolean remove_dir_sep) + gboolean remove_dir_sep) { GString *res = NULL, *use; const gchar *strip_datadir, *strip_configdir; diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c index 95ecf398e8..ab8ecd550f 100644 --- a/modules/calendar/e-cal-shell-backend.c +++ b/modules/calendar/e-cal-shell-backend.c @@ -362,8 +362,8 @@ cal_shell_backend_init_importers (void) static void populate_g_date (GDate *date, - time_t utc_time, - icaltimezone *zone) + time_t utc_time, + icaltimezone *zone) { struct icaltimetype icaltm; diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index 75fc61e161..f612d159b4 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -442,8 +442,8 @@ async_context_free (AsyncContext *context) static void mark_all_read_thread (GSimpleAsyncResult *simple, - GObject *object, - GCancellable *cancellable) + GObject *object, + GCancellable *cancellable) { AsyncContext *context; CamelStore *store; @@ -487,8 +487,8 @@ mark_all_read_thread (GSimpleAsyncResult *simple, static void mark_all_read_done_cb (GObject *source, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { GSimpleAsyncResult *simple; AsyncContext *context; @@ -520,7 +520,7 @@ mark_all_read_done_cb (GObject *source, static void mark_all_read_collect_folder_names (GQueue *folder_names, - CamelFolderInfo *folder_info) + CamelFolderInfo *folder_info) { while (folder_info != NULL) { if (folder_info->child != NULL) @@ -542,7 +542,7 @@ enum { static gint mark_all_read_prompt_user (EMailShellView *mail_shell_view, - gboolean with_subfolders) + gboolean with_subfolders) { EShellView *shell_view; EShellWindow *shell_window; @@ -572,8 +572,8 @@ mark_all_read_prompt_user (EMailShellView *mail_shell_view, static void mark_all_read_got_folder_info (GObject *source, - GAsyncResult *result, - gpointer user_data) + GAsyncResult *result, + gpointer user_data) { CamelStore *store = CAMEL_STORE (source); AsyncContext *context = user_data; @@ -608,7 +608,8 @@ mark_all_read_got_folder_info (GObject *source, g_return_if_fail (folder_info != NULL); - response = mark_all_read_prompt_user (context->mail_shell_view, + response = mark_all_read_prompt_user ( + context->mail_shell_view, context->can_subfolders && folder_info->child != NULL); if (response == MARK_ALL_READ_CURRENT_ONLY) @@ -643,9 +644,9 @@ mark_all_read_got_folder_info (GObject *source, static void e_mail_shell_view_actions_mark_all_read (EMailShellView *mail_shell_view, - CamelStore *store, - const gchar *folder_name, - gboolean can_subfolders) + CamelStore *store, + const gchar *folder_name, + gboolean can_subfolders) { EShellView *shell_view; EShellBackend *shell_backend; @@ -689,7 +690,7 @@ e_mail_shell_view_actions_mark_all_read (EMailShellView *mail_shell_view, static void action_mail_folder_mark_all_as_read_cb (GtkAction *action, - EMailShellView *mail_shell_view) + EMailShellView *mail_shell_view) { EMailShellContent *mail_shell_content; EMailReader *reader; @@ -717,7 +718,7 @@ action_mail_folder_mark_all_as_read_cb (GtkAction *action, static void action_mail_popup_folder_mark_all_as_read_cb (GtkAction *action, - EMailShellView *mail_shell_view) + EMailShellView *mail_shell_view) { EShellSidebar *shell_sidebar; EMFolderTree *folder_tree; diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index 14b3a83c22..ca4d01e266 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -767,7 +767,7 @@ has_unread_mail (GtkTreeModel *model, GtkTreeIter *parent, gboolean is_root, gboolean *has_unread_root, - gboolean *has_unread) + gboolean *has_unread) { guint unread = 0; GtkTreeIter iter, child; diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c index 3eedb6a816..a5f6e25678 100644 --- a/modules/mail/em-mailer-prefs.c +++ b/modules/mail/em-mailer-prefs.c @@ -147,8 +147,8 @@ mailer_prefs_map_seconds_to_milliseconds (const GValue *value, static gboolean mailer_prefs_map_string_to_rgba (GValue *value, - GVariant *variant, - gpointer user_data) + GVariant *variant, + gpointer user_data) { GdkRGBA rgba; const gchar *string; @@ -165,8 +165,8 @@ mailer_prefs_map_string_to_rgba (GValue *value, static GVariant * mailer_prefs_map_rgba_to_string (const GValue *value, - const GVariantType *expected_type, - gpointer user_data) + const GVariantType *expected_type, + gpointer user_data) { GVariant *variant; const GdkRGBA *rgba; diff --git a/modules/settings/e-settings-mail-formatter.c b/modules/settings/e-settings-mail-formatter.c index aa8c4325a1..ae53291874 100644 --- a/modules/settings/e-settings-mail-formatter.c +++ b/modules/settings/e-settings-mail-formatter.c @@ -52,8 +52,8 @@ settings_mail_formatter_get_extensible (ESettingsMailFormatter *extension) static gboolean settings_mail_formatter_map_string_to_rgba (GValue *value, - GVariant *variant, - gpointer user_data) + GVariant *variant, + gpointer user_data) { GdkRGBA rgba; const gchar *string; diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c index c062994720..28393040da 100644 --- a/plugins/publish-calendar/publish-format-fb.c +++ b/plugins/publish-calendar/publish-format-fb.c @@ -120,8 +120,8 @@ write_calendar (const gchar *uid, gboolean done = FALSE; /* This is to workaround broken dispatch of "free-busy-data" signal, - introduced in 3.8.0. This code can be removed once the below bug is - properly fixed: https://bugzilla.gnome.org/show_bug.cgi?id=692361 + * introduced in 3.8.0. This code can be removed once the below bug is + * properly fixed: https://bugzilla.gnome.org/show_bug.cgi?id=692361 */ while (!done) { g_usleep (G_USEC_PER_SEC / 10); diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index 2ef7453dfb..69fae43ee2 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -100,7 +100,7 @@ static gboolean plugin_enabled; static void disconnect_signals_on_dispose (gpointer object_with_signal, - GObject *signal_data) + GObject *signal_data) { g_signal_handlers_disconnect_by_data (object_with_signal, signal_data); } |