diff options
author | Carlos Garcia Campos <carlosgc@gnome.org> | 2009-01-24 18:10:21 (GMT) |
---|---|---|
committer | Carlos Garcia Campos <carlosgc@src.gnome.org> | 2009-01-24 18:10:21 (GMT) |
commit | 95395e6b0e5e174a43931605043dba668232d331 (patch) | |
tree | 58784f0993e60ac24c4abb745204648f4089e7e2 | |
parent | 6b4040a40a13ea4f6b63768eb7a40a2ee3ab00b3 (diff) |
Add EV_DEFINE_BOXED_TYPE macro to define boxed types. See bug #568228.
2009-01-24 Carlos Garcia Campos <carlosgc@gnome.org>
* libdocument/ev-document.[ch]:
Add EV_DEFINE_BOXED_TYPE macro to define boxed types. See bug
#568228.
svn path=/trunk/; revision=3378
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | libdocument/ev-document.c | 11 | ||||
-rw-r--r-- | libdocument/ev-document.h | 20 |
3 files changed, 29 insertions, 11 deletions
@@ -1,3 +1,10 @@ +2009-01-24 Carlos Garcia Campos <carlosgc@gnome.org> + + * libdocument/ev-document.[ch]: + + Add EV_DEFINE_BOXED_TYPE macro to define boxed types. See bug + #568228. + 2009-01-24 Nickolay V. Shmyrev <nshmyrev@yandex.ru> * cut-n-paste/toolbar-editor/egg-editable-toolbar.c @@ -19,7 +26,7 @@ respecting umask and any setgid bit on the directory. Uses the new G_FILE_COPY_TARGET_DEFAULT_PERMS flag in glib 2.19.0, if available. Bug #568593. - + 2009-01-21 Christian Persch <chpe@gnome.org> * configure.ac: diff --git a/libdocument/ev-document.c b/libdocument/ev-document.c index 1ca362e..163f2e2 100644 --- a/libdocument/ev-document.c +++ b/libdocument/ev-document.c @@ -244,16 +244,7 @@ ev_document_render (EvDocument *document, } /* EvDocumentInfo */ -GType -ev_document_info_get_type (void) -{ - static GType type = 0; - if (type == 0) - type = g_boxed_type_register_static ("EvDocumentInfo", - (GBoxedCopyFunc)ev_document_info_copy, - (GBoxedFreeFunc)ev_document_info_free); - return type; -} +EV_DEFINE_BOXED_TYPE (EvDocumentInfo, ev_document_info, ev_document_info_copy, ev_document_info_free) EvDocumentInfo * ev_document_info_copy (EvDocumentInfo *info) diff --git a/libdocument/ev-document.h b/libdocument/ev-document.h index 367d6e6..e07e3a2 100644 --- a/libdocument/ev-document.h +++ b/libdocument/ev-document.h @@ -216,6 +216,26 @@ register_evince_backend (GTypeModule *module) \ #define EV_BACKEND_REGISTER(BackendName, backend_name) \ EV_BACKEND_REGISTER_WITH_CODE(BackendName, backend_name, ;) +/* + * A convenience macro for boxed type implementations, which defines a + * type_name_get_type() function registering the boxed type. + */ +#define EV_DEFINE_BOXED_TYPE(TypeName, type_name, copy_func, free_func) \ +GType \ +type_name##_get_type (void) \ +{ \ + static volatile gsize g_define_type_id__volatile = 0; \ + if (g_once_init_enter (&g_define_type_id__volatile)) { \ + GType g_define_type_id = \ + g_boxed_type_register_static (g_intern_static_string (#TypeName), \ + (GBoxedCopyFunc) copy_func, \ + (GBoxedFreeFunc) free_func); \ + g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \ + } \ + return g_define_type_id__volatile; \ +} + + G_END_DECLS #endif /* EV_DOCUMENT_H */ |