aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-12-01 10:53:20 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-02-20 23:04:25 +0800
commit23f5773903d64a554d977ae7d0ebbaca73528f1f (patch)
tree104e1a59da8bf96b004bce204b79f47bbe0a6d13 /composer
parent49bc4c2d765ee1780c23fdc9f42152850dabb220 (diff)
downloadgsoc2013-evolution-23f5773903d64a554d977ae7d0ebbaca73528f1f.tar
gsoc2013-evolution-23f5773903d64a554d977ae7d0ebbaca73528f1f.tar.gz
gsoc2013-evolution-23f5773903d64a554d977ae7d0ebbaca73528f1f.tar.bz2
gsoc2013-evolution-23f5773903d64a554d977ae7d0ebbaca73528f1f.tar.lz
gsoc2013-evolution-23f5773903d64a554d977ae7d0ebbaca73528f1f.tar.xz
gsoc2013-evolution-23f5773903d64a554d977ae7d0ebbaca73528f1f.tar.zst
gsoc2013-evolution-23f5773903d64a554d977ae7d0ebbaca73528f1f.zip
Coding style and whitespace cleanup.
Diffstat (limited to 'composer')
-rw-r--r--composer/e-composer-header-table.c4
-rw-r--r--composer/e-composer-header.c4
-rw-r--r--composer/e-msg-composer.c9
3 files changed, 11 insertions, 6 deletions
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index 2479eebab7..f2a9356a90 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -34,6 +34,10 @@
#include "e-composer-post-header.h"
#include "e-composer-text-header.h"
+#define E_COMPOSER_HEADER_TABLE_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), E_TYPE_COMPOSER_HEADER_TABLE, EComposerHeaderTablePrivate))
+
#define HEADER_TOOLTIP_TO \
_("Enter the recipients of the message")
#define HEADER_TOOLTIP_CC \
diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c
index ebfe564dcb..c92b069113 100644
--- a/composer/e-composer-header.c
+++ b/composer/e-composer-header.c
@@ -47,6 +47,10 @@ struct _EComposerHeaderPrivate {
guint visible : 1;
};
+#define E_COMPOSER_HEADER_GET_PRIVATE(obj) \
+ (G_TYPE_INSTANCE_GET_PRIVATE \
+ ((obj), E_TYPE_COMPOSER_HEADER, EComposerHeaderPrivate))
+
enum {
PROP_0,
PROP_BUTTON,
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 6a48950912..9f32d8cabe 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1394,7 +1394,7 @@ is_top_signature (EMsgComposer *composer)
{
EShell *shell;
EShellSettings *shell_settings;
- EMsgComposerPrivate *priv = composer->priv;
+ EMsgComposerPrivate *priv = E_MSG_COMPOSER_GET_PRIVATE (composer);
g_return_val_if_fail (priv != NULL, FALSE);
@@ -2540,12 +2540,9 @@ e_msg_composer_alert_sink_init (EAlertSinkInterface *interface)
static void
e_msg_composer_init (EMsgComposer *composer)
{
- composer->priv = G_TYPE_INSTANCE_GET_PRIVATE (
- composer, E_TYPE_MSG_COMPOSER, EMsgComposerPrivate);
+ composer->priv = E_MSG_COMPOSER_GET_PRIVATE (composer);
}
-/* Callbacks. */
-
/**
* e_msg_composer_new:
* @shell: an #EShell
@@ -3082,7 +3079,7 @@ e_msg_composer_new_with_message (EShell *shell,
}
composer = e_msg_composer_new (shell);
- priv = composer->priv;
+ priv = E_MSG_COMPOSER_GET_PRIVATE (composer);
table = e_msg_composer_get_header_table (composer);
if (postto) {