diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-11 01:18:28 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-11 01:18:28 +0800 |
| commit | 5eb12906c4242a576ad6fac4d229f096d3aab17a (patch) | |
| tree | 7c09011257167be9c0f456a7c19c21298469ea82 /mail/e-mail-shell-view.c | |
| parent | 92e942499bffca812dcbc229f6c88ebb640e403a (diff) | |
| download | gsoc2013-evolution-5eb12906c4242a576ad6fac4d229f096d3aab17a.tar gsoc2013-evolution-5eb12906c4242a576ad6fac4d229f096d3aab17a.tar.gz gsoc2013-evolution-5eb12906c4242a576ad6fac4d229f096d3aab17a.tar.bz2 gsoc2013-evolution-5eb12906c4242a576ad6fac4d229f096d3aab17a.tar.lz gsoc2013-evolution-5eb12906c4242a576ad6fac4d229f096d3aab17a.tar.xz gsoc2013-evolution-5eb12906c4242a576ad6fac4d229f096d3aab17a.tar.zst gsoc2013-evolution-5eb12906c4242a576ad6fac4d229f096d3aab17a.zip | |
Use the proper idiom for loading types in a GTypeModule.
Also, combine calendar, memo, and task backends into a single module,
similar to how it worked under Bonobo.
Diffstat (limited to 'mail/e-mail-shell-view.c')
| -rw-r--r-- | mail/e-mail-shell-view.c | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/mail/e-mail-shell-view.c b/mail/e-mail-shell-view.c index 6f4e6f9b88..f58d1f6288 100644 --- a/mail/e-mail-shell-view.c +++ b/mail/e-mail-shell-view.c @@ -21,8 +21,8 @@ #include "e-mail-shell-view-private.h" -GType e_mail_shell_view_type = 0; static gpointer parent_class; +static GType mail_shell_view_type; static void mail_shell_view_dispose (GObject *object) @@ -233,27 +233,28 @@ mail_shell_view_init (EMailShellView *mail_shell_view, } GType -e_mail_shell_view_get_type (GTypeModule *type_module) +e_mail_shell_view_get_type (void) { - if (e_mail_shell_view_type == 0) { - const GTypeInfo type_info = { - sizeof (EMailShellViewClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) mail_shell_view_class_init, - (GClassFinalizeFunc) NULL, - NULL, /* class_data */ - sizeof (EMailShellView), - 0, /* n_preallocs */ - (GInstanceInitFunc) mail_shell_view_init, - NULL /* value_table */ - }; - - e_mail_shell_view_type = - g_type_module_register_type ( - type_module, E_TYPE_SHELL_VIEW, - "EMailShellView", &type_info, 0); - } + return mail_shell_view_type; +} - return e_mail_shell_view_type; +void +e_mail_shell_view_register_type (GTypeModule *type_module) +{ + const GTypeInfo type_info = { + sizeof (EMailShellViewClass), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) mail_shell_view_class_init, + (GClassFinalizeFunc) NULL, + NULL, /* class_data */ + sizeof (EMailShellView), + 0, /* n_preallocs */ + (GInstanceInitFunc) mail_shell_view_init, + NULL /* value_table */ + }; + + mail_shell_view_type = g_type_module_register_type ( + type_module, E_TYPE_SHELL_VIEW, + "EMailShellView", &type_info, 0); } |