aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/em-utils.c10
-rw-r--r--mail/em-utils.h8
2 files changed, 12 insertions, 6 deletions
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 3bb4b9f647..fc6568d1ea 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -1305,7 +1305,7 @@ em_utils_message_to_html (CamelSession *session,
gtk_widget_get_style (GTK_WIDGET (window)),
gtk_widget_get_state (GTK_WIDGET (window)));
- if (!parts_list) {
+ if (parts_list == NULL) {
GSettings *settings;
gchar *charset;
@@ -1356,7 +1356,7 @@ em_utils_message_to_html (CamelSession *session,
while (!g_queue_is_empty (&queue))
e_mail_part_unref (g_queue_pop_head (&queue));
- if (validity_found)
+ if (validity_found != NULL)
*validity_found = is_validity_found;
e_mail_formatter_format_sync (
@@ -1364,14 +1364,14 @@ em_utils_message_to_html (CamelSession *session,
E_MAIL_FORMATTER_MODE_PRINTING, NULL);
g_object_unref (formatter);
- if (hidden_text_html_part)
+ if (hidden_text_html_part != NULL)
hidden_text_html_part->is_hidden = TRUE;
g_object_unref (parts_list);
- if (parser)
+ if (parser != NULL)
g_object_unref (parser);
- if (append && *append)
+ if (append != NULL && *append != '\0')
camel_stream_write_string (mem, append, NULL, NULL);
camel_stream_write (mem, "", 1, NULL, NULL);
diff --git a/mail/em-utils.h b/mail/em-utils.h
index db286eb55b..1fe83077a1 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -66,7 +66,13 @@ void em_utils_selection_get_urilist (GtkSelectionData *data, CamelFolder *folder
EProxy * em_utils_get_proxy (void);
/* FIXME: should this have an override charset? */
-gchar *em_utils_message_to_html (CamelSession *session, CamelMimeMessage *msg, const gchar *credits, guint32 flags, struct _EMailPartList *parts_list, const gchar *append, guint32 *validity_found);
+gchar * em_utils_message_to_html (CamelSession *session,
+ CamelMimeMessage *msg,
+ const gchar *credits,
+ guint32 flags,
+ struct _EMailPartList *parts_list,
+ const gchar *append,
+ guint32 *validity_found);
void em_utils_empty_trash (GtkWidget *parent,
EMailSession *session);