diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2012-06-03 04:52:01 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2012-06-03 04:52:01 +0800 |
| commit | ceea3a0a1feaa25b8022852b52b7dab1bdf5eb5d (patch) | |
| tree | 55a3020880ccdde5a4a53bb7649d4f3efc5e2de2 /mail | |
| parent | 184ec36d35db3c2e0377a1845390070a23a7cf64 (diff) | |
| download | gsoc2013-evolution-ceea3a0a1feaa25b8022852b52b7dab1bdf5eb5d.tar.gz gsoc2013-evolution-ceea3a0a1feaa25b8022852b52b7dab1bdf5eb5d.tar.zst gsoc2013-evolution-ceea3a0a1feaa25b8022852b52b7dab1bdf5eb5d.zip | |
Reduce diff noise with 'account-mgmt' branch.
One last time.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/e-mail-ui-session.c | 16 | ||||
| -rw-r--r-- | mail/e-mail-ui-session.h | 8 | ||||
| -rw-r--r-- | mail/em-format-html.c | 3 |
3 files changed, 14 insertions, 13 deletions
diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c index ee0b77cfe3..0a005ec9b1 100644 --- a/mail/e-mail-ui-session.c +++ b/mail/e-mail-ui-session.c @@ -826,6 +826,14 @@ e_mail_ui_session_get_account_store (EMailUISession *session) return session->priv->account_store; } +EMailLabelListStore * +e_mail_ui_session_get_label_store (EMailUISession *session) +{ + g_return_val_if_fail (E_IS_MAIL_UI_SESSION (session), NULL); + + return session->priv->label_store; +} + void e_mail_ui_session_add_activity (EMailUISession *session, EActivity *activity) @@ -836,11 +844,3 @@ e_mail_ui_session_add_activity (EMailUISession *session, g_signal_emit (session, signals[ACTIVITY_ADDED], 0, activity); } -EMailLabelListStore * -e_mail_ui_session_get_label_store (EMailUISession *session) -{ - g_return_val_if_fail (E_IS_MAIL_UI_SESSION (session), NULL); - - return session->priv->label_store; -} - diff --git a/mail/e-mail-ui-session.h b/mail/e-mail-ui-session.h index f6ef4b42d5..7efb472590 100644 --- a/mail/e-mail-ui-session.h +++ b/mail/e-mail-ui-session.h @@ -75,16 +75,16 @@ struct _EMailUISessionClass { }; -GType e_mail_ui_session_get_type (void); -EMailSession * e_mail_ui_session_new (void); +GType e_mail_ui_session_get_type (void); +EMailSession * e_mail_ui_session_new (void); EMailAccountStore * e_mail_ui_session_get_account_store (EMailUISession *session); -void e_mail_ui_session_add_activity (EMailUISession *session, - EActivity *activity); EMailLabelListStore * e_mail_ui_session_get_label_store (EMailUISession *session); +void e_mail_ui_session_add_activity (EMailUISession *session, + EActivity *activity); G_END_DECLS diff --git a/mail/em-format-html.c b/mail/em-format-html.c index aea13e910b..0c55ecec5f 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -2869,7 +2869,8 @@ efh_format_full_headers (EMFormatHTML *efh, cia = camel_internet_address_new (); camel_address_decode ((CamelAddress *) cia, (const gchar *) photo_name); - only_local_photo = em_format_html_get_only_local_photos (efh); + only_local_photo = + em_format_html_get_only_local_photos (efh); photopart = em_utils_contact_photo (cia, only_local_photo); if (photopart) { |