aboutsummaryrefslogtreecommitdiffstats
path: root/mail/e-mail-display.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-06-24 19:31:28 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-06-25 08:31:42 +0800
commitf960fd2dff5358f0e13eba7041d35855bf48c22e (patch)
tree92859c8ba093fa15a3bd7b888332d6e61a704a51 /mail/e-mail-display.c
parent88db20f3e9ff38296c031671de963ae665fd8143 (diff)
downloadgsoc2013-evolution-f960fd2dff5358f0e13eba7041d35855bf48c22e.tar
gsoc2013-evolution-f960fd2dff5358f0e13eba7041d35855bf48c22e.tar.gz
gsoc2013-evolution-f960fd2dff5358f0e13eba7041d35855bf48c22e.tar.bz2
gsoc2013-evolution-f960fd2dff5358f0e13eba7041d35855bf48c22e.tar.lz
gsoc2013-evolution-f960fd2dff5358f0e13eba7041d35855bf48c22e.tar.xz
gsoc2013-evolution-f960fd2dff5358f0e13eba7041d35855bf48c22e.tar.zst
gsoc2013-evolution-f960fd2dff5358f0e13eba7041d35855bf48c22e.zip
Reduce usage of g_type_class_peek_parent().
G_DEFINE_TYPE macros define a static "parent_class" variable.
Diffstat (limited to 'mail/e-mail-display.c')
-rw-r--r--mail/e-mail-display.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index aafdcf49ec..3a06deacd5 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -83,8 +83,6 @@ enum {
PROP_HEADERS_COLLAPSED,
};
-static gpointer parent_class;
-
static CamelDataCache *emd_global_http_cache = 0;
static const gchar *ui =
@@ -174,7 +172,8 @@ mail_display_update_actions (EWebView *web_view,
GtkAction *action;
/* Chain up first! */
- E_WEB_VIEW_CLASS (parent_class)->update_actions (web_view, event);
+ E_WEB_VIEW_CLASS (e_mail_display_parent_class)->
+ update_actions (web_view, event);
hit_test = webkit_web_view_get_hit_test_result (
WEBKIT_WEB_VIEW (web_view), event);
@@ -318,14 +317,14 @@ mail_display_dispose (GObject *object)
}
/* Chain up to parent's dispose() method. */
- G_OBJECT_CLASS (parent_class)->dispose (object);
+ G_OBJECT_CLASS (e_mail_display_parent_class)->dispose (object);
}
static void
mail_display_realize (GtkWidget *widget)
{
/* Chain up to parent's realize() method. */
- GTK_WIDGET_CLASS (parent_class)->realize (widget);
+ GTK_WIDGET_CLASS (e_mail_display_parent_class)->realize (widget);
mail_display_update_formatter_colors (E_MAIL_DISPLAY (widget));
}
@@ -339,7 +338,8 @@ mail_display_style_set (GtkWidget *widget,
mail_display_update_formatter_colors (display);
/* Chain up to parent's style_set() method. */
- GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style);
+ GTK_WIDGET_CLASS (e_mail_display_parent_class)->
+ style_set (widget, previous_style);
}
static gboolean
@@ -1355,7 +1355,6 @@ e_mail_display_class_init (EMailDisplayClass *class)
EWebViewClass *web_view_class;
GtkWidgetClass *widget_class;
- parent_class = g_type_class_peek_parent (class);
g_type_class_add_private (class, sizeof (EMailDisplayPrivate));
object_class = G_OBJECT_CLASS (class);