diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-11-21 22:51:03 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-11-22 13:12:36 +0800 |
| commit | f9ffebc2f7a6fb285e686133dcccf17766c2ba79 (patch) | |
| tree | 3f569321ed8d54f2579c151d64600d1e3738590c /mail/e-mail-label-tree-view.c | |
| parent | 6f3b2df27f1bcd71880879bf8236663b72002086 (diff) | |
| download | gsoc2013-evolution-f9ffebc2f7a6fb285e686133dcccf17766c2ba79.tar gsoc2013-evolution-f9ffebc2f7a6fb285e686133dcccf17766c2ba79.tar.gz gsoc2013-evolution-f9ffebc2f7a6fb285e686133dcccf17766c2ba79.tar.bz2 gsoc2013-evolution-f9ffebc2f7a6fb285e686133dcccf17766c2ba79.tar.lz gsoc2013-evolution-f9ffebc2f7a6fb285e686133dcccf17766c2ba79.tar.xz gsoc2013-evolution-f9ffebc2f7a6fb285e686133dcccf17766c2ba79.tar.zst gsoc2013-evolution-f9ffebc2f7a6fb285e686133dcccf17766c2ba79.zip | |
Mail widget cleanups.
Diffstat (limited to 'mail/e-mail-label-tree-view.c')
| -rw-r--r-- | mail/e-mail-label-tree-view.c | 42 |
1 files changed, 8 insertions, 34 deletions
diff --git a/mail/e-mail-label-tree-view.c b/mail/e-mail-label-tree-view.c index e5a8e50832..62589b4028 100644 --- a/mail/e-mail-label-tree-view.c +++ b/mail/e-mail-label-tree-view.c @@ -28,11 +28,15 @@ #include <glib/gi18n.h> #include "e-mail-label-list-store.h" +#define E_MAIL_LABEL_TREE_VIEW_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE \ + ((obj), E_TYPE_MAIL_LABEL_TREE_VIEW, EMailLabelTreeViewPrivate)) + struct _EMailLabelTreeViewPrivate { gint placeholder; }; -static gpointer parent_class; +G_DEFINE_TYPE (EMailLabelTreeView, e_mail_label_tree_view, GTK_TYPE_TREE_VIEW) static void mail_label_tree_view_render_pixbuf (GtkTreeViewColumn *column, @@ -67,21 +71,18 @@ mail_label_tree_view_render_text (GtkTreeViewColumn *column, } static void -mail_label_tree_view_class_init (EMailLabelTreeViewClass *class) +e_mail_label_tree_view_class_init (EMailLabelTreeViewClass *class) { - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (EMailLabelTreeViewPrivate)); } static void -mail_label_tree_view_init (EMailLabelTreeView *tree_view) +e_mail_label_tree_view_init (EMailLabelTreeView *tree_view) { GtkTreeViewColumn *column; GtkCellRenderer *renderer; - tree_view->priv = G_TYPE_INSTANCE_GET_PRIVATE ( - tree_view, E_TYPE_MAIL_LABEL_TREE_VIEW, - EMailLabelTreeViewPrivate); + tree_view->priv = E_MAIL_LABEL_TREE_VIEW_GET_PRIVATE (tree_view); column = gtk_tree_view_column_new (); renderer = gtk_cell_renderer_pixbuf_new (); @@ -104,33 +105,6 @@ mail_label_tree_view_init (EMailLabelTreeView *tree_view) mail_label_tree_view_render_text, tree_view, NULL); } -GType -e_mail_label_tree_view_get_type (void) -{ - static GType type = 0; - - if (G_UNLIKELY (type == 0)) { - static const GTypeInfo type_info = { - sizeof (EMailLabelTreeViewClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) mail_label_tree_view_class_init, - (GClassFinalizeFunc) NULL, - NULL, /* class_data */ - sizeof (EMailLabelTreeView), - 0, /* n_preallocs */ - (GInstanceInitFunc) mail_label_tree_view_init, - NULL /* value_table */ - }; - - type = g_type_register_static ( - GTK_TYPE_TREE_VIEW, "EMailLabelTreeView", - &type_info, 0); - } - - return type; -} - GtkWidget * e_mail_label_tree_view_new (void) { |