diff options
Diffstat (limited to 'addressbook/gui/component/e-book-shell-backend.c')
| -rw-r--r-- | addressbook/gui/component/e-book-shell-backend.c | 67 |
1 files changed, 26 insertions, 41 deletions
diff --git a/addressbook/gui/component/e-book-shell-backend.c b/addressbook/gui/component/e-book-shell-backend.c index 3e104c39f3..fd86d57e2a 100644 --- a/addressbook/gui/component/e-book-shell-backend.c +++ b/addressbook/gui/component/e-book-shell-backend.c @@ -39,9 +39,9 @@ #include "addressbook/gui/contact-list-editor/e-contact-list-editor.h" #include "addressbook/importers/evolution-addressbook-importers.h" -#include <eab-config.h> -#include <addressbook-config.h> -#include <autocompletion-config.h> +#include "eab-config.h" +#include "addressbook-config.h" +#include "autocompletion-config.h" #include "e-book-shell-migrate.h" #include "e-book-shell-view.h" @@ -67,12 +67,8 @@ enum { PROP_SOURCE_LIST }; -/* Module Entry Points */ -void e_module_load (GTypeModule *type_module); -void e_module_unload (GTypeModule *type_module); - -GType e_book_shell_backend_type = 0; static gpointer parent_class; +static GType book_shell_backend_type; static void book_shell_backend_ensure_sources (EShellBackend *shell_backend) @@ -544,29 +540,30 @@ book_shell_backend_init (EBookShellBackend *book_shell_backend) } GType -e_book_shell_backend_get_type (GTypeModule *type_module) +e_book_shell_backend_get_type (void) { - if (e_book_shell_backend_type == 0) { - const GTypeInfo type_info = { - sizeof (EBookShellBackendClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) book_shell_backend_class_init, - (GClassFinalizeFunc) NULL, - NULL, /* class_data */ - sizeof (EBookShellBackend), - 0, /* n_preallocs */ - (GInstanceInitFunc) book_shell_backend_init, - NULL /* value_table */ - }; - - e_book_shell_backend_type = - g_type_module_register_type ( - type_module, E_TYPE_SHELL_BACKEND, - "EBookShellBackend", &type_info, 0); - } + return book_shell_backend_type; +} - return e_book_shell_backend_type; +void +e_book_shell_backend_register_type (GTypeModule *type_module) +{ + const GTypeInfo type_info = { + sizeof (EBookShellBackendClass), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) book_shell_backend_class_init, + (GClassFinalizeFunc) NULL, + NULL, /* class_data */ + sizeof (EBookShellBackend), + 0, /* n_preallocs */ + (GInstanceInitFunc) book_shell_backend_init, + NULL /* value_table */ + }; + + book_shell_backend_type = g_type_module_register_type ( + type_module, E_TYPE_SHELL_BACKEND, + "EBookShellBackend", &type_info, 0); } ESourceList * @@ -577,15 +574,3 @@ e_book_shell_backend_get_source_list (EBookShellBackend *book_shell_backend) return book_shell_backend->priv->source_list; } - -void -e_module_load (GTypeModule *type_module) -{ - e_book_shell_backend_get_type (type_module); - e_book_shell_view_get_type (type_module); -} - -void -e_module_unload (GTypeModule *type_module) -{ -} |