diff options
| author | Milan Crha <mcrha@redhat.com> | 2011-02-25 23:20:41 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2011-02-25 23:20:41 +0800 |
| commit | 1301cf02efdacd20fb5ce3e2554ae15b8f146e8a (patch) | |
| tree | 8d5f3985a82ec7d330af27ee0a29a79a2f0ecfa3 /mail/e-mail-display.c | |
| parent | 1a4be6c521d674c4a60e54203521e2721b81b921 (diff) | |
| download | gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.gz gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.bz2 gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.lz gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.xz gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.tar.zst gsoc2013-evolution-1301cf02efdacd20fb5ce3e2554ae15b8f146e8a.zip | |
Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly
Diffstat (limited to 'mail/e-mail-display.c')
| -rw-r--r-- | mail/e-mail-display.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c index ae340d9571..d13eca3bcf 100644 --- a/mail/e-mail-display.c +++ b/mail/e-mail-display.c @@ -29,10 +29,6 @@ #include "mail/em-composer-utils.h" #include "mail/em-utils.h" -#define E_MAIL_DISPLAY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), E_TYPE_MAIL_DISPLAY, EMailDisplayPrivate)) - struct _EMailDisplayPrivate { EMFormatHTML *formatter; }; @@ -172,7 +168,7 @@ mail_display_dispose (GObject *object) { EMailDisplayPrivate *priv; - priv = E_MAIL_DISPLAY_GET_PRIVATE (object); + priv = E_MAIL_DISPLAY (object)->priv; if (priv->formatter) { g_object_unref (priv->formatter); @@ -198,7 +194,7 @@ mail_display_style_set (GtkWidget *widget, { EMailDisplayPrivate *priv; - priv = E_MAIL_DISPLAY_GET_PRIVATE (widget); + priv = E_MAIL_DISPLAY (widget)->priv; /* Chain up to parent's style_set() method. */ GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style); @@ -213,7 +209,7 @@ mail_display_load_string (EWebView *web_view, { EMailDisplayPrivate *priv; - priv = E_MAIL_DISPLAY_GET_PRIVATE (web_view); + priv = E_MAIL_DISPLAY (web_view)->priv; g_return_if_fail (priv->formatter != NULL); if (em_format_busy (EM_FORMAT (priv->formatter))) @@ -238,7 +234,7 @@ mail_display_link_clicked (GtkHTML *html, { EMailDisplayPrivate *priv; - priv = E_MAIL_DISPLAY_GET_PRIVATE (html); + priv = E_MAIL_DISPLAY (html)->priv; g_return_if_fail (priv->formatter != NULL); if (g_str_has_prefix (uri, "##")) { @@ -345,7 +341,7 @@ mail_display_init (EMailDisplay *display) web_view = E_WEB_VIEW (display); - display->priv = E_MAIL_DISPLAY_GET_PRIVATE (display); + display->priv = G_TYPE_INSTANCE_GET_PRIVATE (display, E_TYPE_MAIL_DISPLAY, EMailDisplayPrivate); /* EWebView's action groups are added during its instance * initialization function (like what we're in now), so it |