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 /shell/test/e-test-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 'shell/test/e-test-shell-view.c')
| -rw-r--r-- | shell/test/e-test-shell-view.c | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/shell/test/e-test-shell-view.c b/shell/test/e-test-shell-view.c index a7326af687..f05abfff06 100644 --- a/shell/test/e-test-shell-view.c +++ b/shell/test/e-test-shell-view.c @@ -21,8 +21,8 @@ #include "e-test-shell-view.h" -#include <e-shell-content.h> -#include <e-shell-sidebar.h> +#include "shell/e-shell-content.h" +#include "shell/e-shell-sidebar.h" #define E_TEST_SHELL_VIEW_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ @@ -32,8 +32,8 @@ struct _ETestShellViewPrivate { EActivity *activity; }; -GType e_test_shell_view_type = 0; static gpointer parent_class; +static GType test_shell_view_type; static void test_shell_view_toggled (EShellView *shell_view) @@ -128,27 +128,28 @@ test_shell_view_init (ETestShellView *test_shell_view) } GType -e_test_shell_view_get_type (GTypeModule *type_module) +e_test_shell_view_get_type (void) { - if (e_test_shell_view_type == 0) { - const GTypeInfo type_info = { - sizeof (ETestShellViewClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) test_shell_view_class_init, - (GClassFinalizeFunc) NULL, - type_module, - sizeof (ETestShellView), - 0, /* n_preallocs */ - (GInstanceInitFunc) test_shell_view_init, - NULL /* value_table */ - }; - - e_test_shell_view_type = - g_type_module_register_type ( - type_module, E_TYPE_SHELL_VIEW, - "ETestShellView", &type_info, 0); - } + return test_shell_view_type; +} - return e_test_shell_view_type; +void +e_test_shell_view_register_type (GTypeModule *type_module) +{ + const GTypeInfo type_info = { + sizeof (ETestShellViewClass), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) test_shell_view_class_init, + (GClassFinalizeFunc) NULL, + type_module, + sizeof (ETestShellView), + 0, /* n_preallocs */ + (GInstanceInitFunc) test_shell_view_init, + NULL /* value_table */ + }; + + test_shell_view_type = g_type_module_register_type ( + type_module, E_TYPE_SHELL_VIEW, + "ETestShellView", &type_info, 0); } |