aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libemail-engine/e-mail-session.c8
-rw-r--r--libemail-engine/mail-vfolder.c8
-rw-r--r--libemail-utils/em-filter-folder-element.c1
-rw-r--r--libemail-utils/em-vfolder-context.c2
-rw-r--r--libemail-utils/em-vfolder-rule.c3
-rw-r--r--libemail-utils/mail-mt.c2
-rw-r--r--libevolution-utils/Makefile.am24
-rw-r--r--libevolution-utils/e-alert-dialog.c1
-rw-r--r--libevolution-utils/evolution-util.c2
-rw-r--r--libevolution-utils/evolution-util.h3
-rw-r--r--mail/e-mail-backend.c2
-rw-r--r--mail/em-filter-editor-folder-element.c2
-rw-r--r--mail/em-format-html.c4
-rw-r--r--mail/em-vfolder-editor-context.c6
-rw-r--r--mail/em-vfolder-editor-rule.c4
-rw-r--r--modules/mail/e-mail-config-format-html.c8
16 files changed, 38 insertions, 42 deletions
diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
index 3bd38e69b6..193756f263 100644
--- a/libemail-engine/e-mail-session.c
+++ b/libemail-engine/e-mail-session.c
@@ -101,7 +101,7 @@ enum {
PROP_FOLDER_CACHE,
PROP_JUNK_FILTER_NAME,
PROP_LOCAL_STORE,
- PROP_VFOLDER_STORE
+ PROP_VFOLDER_STORE
};
static const gchar *local_folder_names[E_MAIL_NUM_LOCAL_FOLDERS] = {
@@ -631,7 +631,7 @@ mail_session_get_property (GObject *object,
value,
e_mail_session_get_vfolder_store (
E_MAIL_SESSION (object)));
- return;
+ return;
}
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -1419,7 +1419,7 @@ e_mail_session_class_init (EMailSessionClass *class)
{
GObjectClass *object_class;
CamelSessionClass *session_class;
-
+
g_type_class_add_private (class, sizeof (EMailSessionPrivate));
object_class = G_OBJECT_CLASS (class);
@@ -1488,7 +1488,7 @@ e_mail_session_class_init (EMailSessionClass *class)
"Built-in search folder store",
CAMEL_TYPE_STORE,
G_PARAM_READABLE |
- G_PARAM_STATIC_STRINGS));
+ G_PARAM_STATIC_STRINGS));
/**
* EMailSession::flush-outbox
diff --git a/libemail-engine/mail-vfolder.c b/libemail-engine/mail-vfolder.c
index 19828aecf9..aed9668c4c 100644
--- a/libemail-engine/mail-vfolder.c
+++ b/libemail-engine/mail-vfolder.c
@@ -697,7 +697,7 @@ static EMailSession *
get_session (CamelFolder *folder)
{
CamelStore *store;
-
+
store = camel_folder_get_parent_store (folder);
return (EMailSession *) camel_service_get_session (CAMEL_SERVICE (store));
@@ -713,7 +713,7 @@ rule_changed (EFilterRule *rule,
GList *sources_folder = NULL;
GString *query;
const gchar *full_name;
-
+
full_name = camel_folder_get_full_name (folder);
session = get_session (folder);
@@ -810,7 +810,7 @@ rule_changed (EFilterRule *rule,
static void
context_rule_added (ERuleContext *ctx,
EFilterRule *rule,
- EMailSession *session)
+ EMailSession *session)
{
CamelFolder *folder;
CamelService *service;
@@ -841,7 +841,7 @@ context_rule_added (ERuleContext *ctx,
static void
context_rule_removed (ERuleContext *ctx,
EFilterRule *rule,
- EMailSession *session)
+ EMailSession *session)
{
CamelService *service;
gpointer key, folder = NULL;
diff --git a/libemail-utils/em-filter-folder-element.c b/libemail-utils/em-filter-folder-element.c
index 26945579cb..8c4b62585f 100644
--- a/libemail-utils/em-filter-folder-element.c
+++ b/libemail-utils/em-filter-folder-element.c
@@ -48,7 +48,6 @@ G_DEFINE_TYPE (
em_filter_folder_element,
E_TYPE_FILTER_ELEMENT)
-
static void
filter_folder_element_finalize (GObject *object)
{
diff --git a/libemail-utils/em-vfolder-context.c b/libemail-utils/em-vfolder-context.c
index 9270514766..736d398e13 100644
--- a/libemail-utils/em-vfolder-context.c
+++ b/libemail-utils/em-vfolder-context.c
@@ -40,7 +40,7 @@
((obj), EM_TYPE_VFOLDER_CONTEXT, EMVFolderContextPrivate))
struct _EMVFolderContextPrivate {
- int foo;
+ gint placeholder;
};
enum {
diff --git a/libemail-utils/em-vfolder-rule.c b/libemail-utils/em-vfolder-rule.c
index 393ae5b92f..812202585e 100644
--- a/libemail-utils/em-vfolder-rule.c
+++ b/libemail-utils/em-vfolder-rule.c
@@ -46,7 +46,7 @@
((obj), EM_TYPE_VFOLDER_RULE, EMVFolderRulePrivate))
struct _EMVFolderRulePrivate {
- int foo;
+ gint placeholder;
};
static gint validate (EFilterRule *, EAlert **alert);
@@ -69,7 +69,6 @@ G_DEFINE_TYPE (
em_vfolder_rule,
E_TYPE_FILTER_RULE)
-
static void
vfolder_rule_finalize (GObject *object)
{
diff --git a/libemail-utils/mail-mt.c b/libemail-utils/mail-mt.c
index b25257e94f..ae73ae6b1f 100644
--- a/libemail-utils/mail-mt.c
+++ b/libemail-utils/mail-mt.c
@@ -59,7 +59,7 @@ mail_msg_register_activities (MailMsgCreateActivityFunc acreate,
MailMsgCompleteActivityFunc comp_act,
MailMsgCancelActivityFunc cancel_act,
MailMsgAlertErrorFunc ealert,
- MailMsgGetAlertSinkFunc ealertsink)
+ MailMsgGetAlertSinkFunc ealertsink)
{
/* XXX This is an utter hack to keep EActivity out
* of EDS and still let Evolution do EActivity. */
diff --git a/libevolution-utils/Makefile.am b/libevolution-utils/Makefile.am
index 617e9e3719..e785b8fc02 100644
--- a/libevolution-utils/Makefile.am
+++ b/libevolution-utils/Makefile.am
@@ -7,27 +7,27 @@ libevolution_utils_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir) \
-DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \
- -DEVOLUTION_UIDIR=\""$(uidir)"\" \
+ -DEVOLUTION_UIDIR=\""$(uidir)"\" \
$(EVOLUTION_DATA_SERVER_CFLAGS) \
$(GNOME_PLATFORM_CFLAGS) \
$(NULL)
libevolutionutilsincludedir = $(privincludedir)/libevolution-utils
libevolutionutilsinclude_HEADERS = \
- e-alert.h \
- e-alert-dialog.h \
- e-alert-sink.h \
- e-xml-utils.h \
- evolution-util.h \
+ e-alert.h \
+ e-alert-dialog.h \
+ e-alert-sink.h \
+ e-xml-utils.h \
+ evolution-util.h \
$(NULL)
libevolution_utils_la_SOURCES = \
- $(libevolutionutilsinclude_HEADERS) \
- e-alert.c \
- e-alert-dialog.c \
- e-alert-sink.c \
- e-xml-utils.c \
- evolution-util.c \
+ $(libevolutionutilsinclude_HEADERS) \
+ e-alert.c \
+ e-alert-dialog.c \
+ e-alert-sink.c \
+ e-xml-utils.c \
+ evolution-util.c \
$(NULL)
libevolution_utils_la_LDFLAGS = -avoid-version $(NO_UNDEFINED)
diff --git a/libevolution-utils/e-alert-dialog.c b/libevolution-utils/e-alert-dialog.c
index e5c2164089..75650902ae 100644
--- a/libevolution-utils/e-alert-dialog.c
+++ b/libevolution-utils/e-alert-dialog.c
@@ -29,7 +29,6 @@
#include "e-alert-dialog.h"
-
#define E_ALERT_DIALOG_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_ALERT_DIALOG, EAlertDialogPrivate))
diff --git a/libevolution-utils/evolution-util.c b/libevolution-utils/evolution-util.c
index e6c6e84290..97f21607c7 100644
--- a/libevolution-utils/evolution-util.c
+++ b/libevolution-utils/evolution-util.c
@@ -14,7 +14,7 @@
*
*
* Authors:
- Srinivasa Ragavan <sragavan@gnome.org>
+ * Srinivasa Ragavan <sragavan@gnome.org>
*
* Copyright (C) 2012 Intel Corporation (www.intel.com)
*
diff --git a/libevolution-utils/evolution-util.h b/libevolution-utils/evolution-util.h
index 9493453ed2..c927cbff1a 100644
--- a/libevolution-utils/evolution-util.h
+++ b/libevolution-utils/evolution-util.h
@@ -14,7 +14,7 @@
*
*
* Authors:
- Srinivasa Ragavan <sragavan@gnome.org>
+ * Srinivasa Ragavan <sragavan@gnome.org>
*
* Copyright (C) 2012 Intel Corporation (www.intel.com)
*
@@ -44,5 +44,4 @@ GtkWidget * e_builder_get_widget (GtkBuilder *builder,
void e_load_ui_builder_definition (GtkBuilder *builder,
const gchar *basename);
-
#endif /* EVOLUTION_UTIL_H */
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index cc095a39af..c350bd7b5d 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -929,7 +929,7 @@ mail_mt_get_alert_sink ()
shell_backend = e_shell_get_backend_by_name (
shell, "mail");
- return e_mail_backend_get_alert_sink (E_MAIL_BACKEND(shell_backend));
+ return e_mail_backend_get_alert_sink (E_MAIL_BACKEND (shell_backend));
}
static void
diff --git a/mail/em-filter-editor-folder-element.c b/mail/em-filter-editor-folder-element.c
index 5943ff18a9..f4ec559157 100644
--- a/mail/em-filter-editor-folder-element.c
+++ b/mail/em-filter-editor-folder-element.c
@@ -186,7 +186,7 @@ em_filter_editor_folder_element_class_init (EMFilterEditorFolderElementClass *cl
object_class = G_OBJECT_CLASS (class);
object_class->set_property = filter_editor_folder_element_set_property;
- object_class->get_property = filter_editor_folder_element_get_property;
+ object_class->get_property = filter_editor_folder_element_get_property;
object_class->dispose = filter_editor_folder_element_dispose;
object_class->finalize = filter_editor_folder_element_finalize;
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 74b7f0bda0..3c130e63d4 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -1105,7 +1105,7 @@ efh_init (EMFormatHTML *efh,
efh->show_icon = TRUE;
efh->state = EM_FORMAT_HTML_STATE_NONE;
- e_extensible_load_extensions (E_EXTENSIBLE (efh));
+ e_extensible_load_extensions (E_EXTENSIBLE (efh));
}
GType
@@ -1274,7 +1274,7 @@ em_format_html_set_mark_citations (EMFormatHTML *efh,
if (mark_citations)
efh->text_html_flags |=
CAMEL_MIME_FILTER_TOHTML_MARK_CITATION;
- else
+ else
efh->text_html_flags &=
~CAMEL_MIME_FILTER_TOHTML_MARK_CITATION;
diff --git a/mail/em-vfolder-editor-context.c b/mail/em-vfolder-editor-context.c
index 89e0048bba..b7c7a490da 100644
--- a/mail/em-vfolder-editor-context.c
+++ b/mail/em-vfolder-editor-context.c
@@ -41,7 +41,7 @@
((obj), EM_TYPE_VFOLDER_EDITOR_CONTEXT, EMVFolderEditorContextPrivate))
struct _EMVFolderEditorContextPrivate {
- EMailSession *session;
+ EMailSession *session;
};
enum {
@@ -161,7 +161,7 @@ em_vfolder_editor_context_class_init (EMVFolderEditorContextClass *class)
object_class = G_OBJECT_CLASS (class);
object_class->set_property = vfolder_editor_context_set_property;
- object_class->get_property = vfolder_editor_context_get_property;
+ object_class->get_property = vfolder_editor_context_get_property;
object_class->dispose = vfolder_editor_context_dispose;
rule_context_class = E_RULE_CONTEXT_CLASS (class);
@@ -176,7 +176,7 @@ em_vfolder_editor_context_class_init (EMVFolderEditorContextClass *class)
NULL,
E_TYPE_MAIL_SESSION,
G_PARAM_READWRITE |
- G_PARAM_CONSTRUCT_ONLY));
+ G_PARAM_CONSTRUCT_ONLY));
}
static void
diff --git a/mail/em-vfolder-editor-rule.c b/mail/em-vfolder-editor-rule.c
index 377bf1e23e..1ee69dd12a 100644
--- a/mail/em-vfolder-editor-rule.c
+++ b/mail/em-vfolder-editor-rule.c
@@ -53,7 +53,7 @@
((obj), EM_TYPE_VFOLDER_EDITOR_RULE, EMVFolderEditorRulePrivate))
struct _EMVFolderEditorRulePrivate {
- EMailSession *session;
+ EMailSession *session;
};
enum {
@@ -159,7 +159,7 @@ em_vfolder_editor_rule_class_init (EMVFolderEditorRuleClass *class)
object_class = G_OBJECT_CLASS (class);
object_class->set_property = vfolder_editor_rule_set_property;
- object_class->get_property = vfolder_editor_rule_get_property;
+ object_class->get_property = vfolder_editor_rule_get_property;
object_class->dispose = vfolder_editor_rule_dispose;
object_class->finalize = vfolder_editor_rule_finalize;
diff --git a/modules/mail/e-mail-config-format-html.c b/modules/mail/e-mail-config-format-html.c
index 6f0a1afc49..31ca88b744 100644
--- a/modules/mail/e-mail-config-format-html.c
+++ b/modules/mail/e-mail-config-format-html.c
@@ -51,10 +51,10 @@ mail_config_format_html_constructed (GObject *object)
e_binding_transform_string_to_color,
NULL, NULL, (GDestroyNotify) NULL);
- g_object_bind_property (
- shell_settings, "mail-mark-citations",
- extensible, "mark-citations",
- G_BINDING_SYNC_CREATE);
+ g_object_bind_property (
+ shell_settings, "mail-mark-citations",
+ extensible, "mark-citations",
+ G_BINDING_SYNC_CREATE);
g_object_bind_property (
shell_settings, "mail-image-loading-policy",
generated by cgit (git 2.34.1) at 2024-11-18 09:10:53 +0800