aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/e-mail-notebook-view.c3
-rw-r--r--mail/em-filter-rule.c12
-rw-r--r--mail/em-format-hook.c20
-rw-r--r--mail/mail-mt.h4
4 files changed, 27 insertions, 12 deletions
diff --git a/mail/e-mail-notebook-view.c b/mail/e-mail-notebook-view.c
index 1bab909ef2..3d8ae70f8f 100644
--- a/mail/e-mail-notebook-view.c
+++ b/mail/e-mail-notebook-view.c
@@ -1107,7 +1107,8 @@ mail_notebook_view_set_folder (EMailReader *reader,
priv->tab_picker)),
FALSE);
- tab = (EMailTab *)e_mail_tab_new_full (camel_folder_get_full_name (folder), NULL, 1);
+ tab = (EMailTab *) e_mail_tab_new_full (
+ camel_folder_get_full_name (folder), NULL, 1);
g_object_set_data ((GObject *)tab, "page", priv->current_view);
g_object_set_data ((GObject *)priv->current_view, "page", tab);
g_object_set_data ((GObject *)priv->current_view, "tab", tab);
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index 47faf57c91..5a3f3adaf6 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -581,11 +581,13 @@ get_widget (EFilterRule *fr, ERuleContext *rc)
hadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0 ,1.0, 1.0);
vadj = gtk_adjustment_new (0.0, 0.0, 1.0, 1.0 ,1.0, 1.0);
- scrolledwindow = gtk_scrolled_window_new (GTK_ADJUSTMENT (hadj), GTK_ADJUSTMENT (vadj));
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
- gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), parts);
+ scrolledwindow = gtk_scrolled_window_new (
+ GTK_ADJUSTMENT (hadj), GTK_ADJUSTMENT (vadj));
+ gtk_scrolled_window_set_policy (
+ GTK_SCROLLED_WINDOW (scrolledwindow),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_add_with_viewport (
+ GTK_SCROLLED_WINDOW (scrolledwindow), parts);
gtk_box_pack_start (GTK_BOX (inframe), scrolledwindow, TRUE, TRUE, 0);
diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c
index c8a8c903a1..66fa0944cd 100644
--- a/mail/em-format-hook.c
+++ b/mail/em-format-hook.c
@@ -261,18 +261,28 @@ em_format_hook_get_type (void)
if (!type) {
static const GTypeInfo info = {
- sizeof (EMFormatHookClass), NULL, NULL, (GClassInitFunc) emfh_class_init, NULL, NULL,
- sizeof (EMFormatHook), 0, (GInstanceInitFunc) NULL,
+ sizeof (EMFormatHookClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) emfh_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL, /* class_data */
+ sizeof (EMFormatHook),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) NULL,
+ NULL /* value_table */
};
- emfh_parent_class = g_type_class_ref (e_plugin_hook_get_type ());
- type = g_type_register_static(e_plugin_hook_get_type(), "EMFormatHook", &info, 0);
+ emfh_parent_class = g_type_class_ref (E_TYPE_PLUGIN_HOOK);
+ type = g_type_register_static (
+ E_TYPE_PLUGIN_HOOK, "EMFormatHook", &info, 0);
}
return type;
}
-void em_format_hook_register_type (GType type)
+void
+em_format_hook_register_type (GType type)
{
EMFormatClass *klass;
diff --git a/mail/mail-mt.h b/mail/mail-mt.h
index 57b79ed5a4..7a9efb94e4 100644
--- a/mail/mail-mt.h
+++ b/mail/mail-mt.h
@@ -85,7 +85,9 @@ gchar *mail_get_password (CamelService *service, const gchar *prompt,
void mail_mt_set_backend (gchar *backend);
-/* Call a function in the gui thread, wait for it to return, type is the marshaller to use */
+/* Call a function in the GUI thread, wait for it to return, type is
+ * the marshaller to use. FIXME This thing is horrible, please put
+ * it out of its misery. */
typedef enum {
MAIL_CALL_p_p,
MAIL_CALL_p_pp,