diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-08-24 23:21:41 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-08-25 02:37:02 +0800 |
| commit | ecf3434da05b1f39f793c24b38bfd278e10b5786 (patch) | |
| tree | 485ed2399920ecb10dbee2b4db4c437c22574a20 /filter/e-filter-color.c | |
| parent | f1d2541c487fbf7433a1b9aad8e8982ef08b85f5 (diff) | |
| download | gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar.gz gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar.bz2 gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar.lz gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar.xz gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar.zst gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.zip | |
GObject boilerplate cleanup.
Prefer thread-safe G_DEFINE_TYPE and G_DEFINE_INTERFACE macros over
manual GType registration.
This is just a start... lots more to do.
Diffstat (limited to 'filter/e-filter-color.c')
| -rw-r--r-- | filter/e-filter-color.c | 39 |
1 files changed, 10 insertions, 29 deletions
diff --git a/filter/e-filter-color.c b/filter/e-filter-color.c index c4a36607cb..b181fe7c96 100644 --- a/filter/e-filter-color.c +++ b/filter/e-filter-color.c @@ -30,7 +30,10 @@ #include "e-filter-color.h" -static gpointer parent_class; +G_DEFINE_TYPE ( + EFilterColor, + e_filter_color, + E_TYPE_FILTER_ELEMENT) static void set_color (GtkColorButton *color_button, EFilterColor *fc) @@ -45,8 +48,9 @@ filter_color_eq (EFilterElement *element_a, EFilterColor *color_a = E_FILTER_COLOR (element_a); EFilterColor *color_b = E_FILTER_COLOR (element_b); - return E_FILTER_ELEMENT_CLASS (parent_class)->eq (element_a, element_b) - && gdk_color_equal (&color_a->color, &color_b->color); + return E_FILTER_ELEMENT_CLASS (e_filter_color_parent_class)-> + eq (element_a, element_b) && + gdk_color_equal (&color_a->color, &color_b->color); } static xmlNodePtr @@ -126,12 +130,10 @@ filter_color_format_sexp (EFilterElement *element, } static void -filter_color_class_init (EFilterColorClass *class) +e_filter_color_class_init (EFilterColorClass *class) { EFilterElementClass *filter_element_class; - parent_class = g_type_class_peek_parent (class); - filter_element_class = E_FILTER_ELEMENT_CLASS (class); filter_element_class->eq = filter_color_eq; filter_element_class->xml_encode = filter_color_xml_encode; @@ -140,30 +142,9 @@ filter_color_class_init (EFilterColorClass *class) filter_element_class->format_sexp = filter_color_format_sexp; } -GType -e_filter_color_get_type (void) +static void +e_filter_color_init (EFilterColor *filter) { - static GType type = 0; - - if (G_UNLIKELY (type == 0)) { - static const GTypeInfo type_info = { - sizeof (EFilterColorClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) filter_color_class_init, - (GClassFinalizeFunc) NULL, - NULL, /* class_data */ - sizeof (EFilterColor), - 0, /* n_preallocs */ - (GInstanceInitFunc) NULL, - NULL /* value_table */ - }; - - type = g_type_register_static ( - E_TYPE_FILTER_ELEMENT, "EFilterColor", &type_info, 0); - } - - return type; } /** |