diff options
| author | Milan Crha <mcrha@redhat.com> | 2013-04-12 15:50:06 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2013-04-12 15:50:06 +0800 |
| commit | 1c5f6313c58187ce7682058057b63e14ae6f70e5 (patch) | |
| tree | b32502d72fe77f9e42e47b89df5e9034b92b9546 /shell | |
| parent | 765a50d3df2d53b73b149fc2646f46722add7635 (diff) | |
| download | gsoc2013-evolution-1c5f6313c58187ce7682058057b63e14ae6f70e5.tar gsoc2013-evolution-1c5f6313c58187ce7682058057b63e14ae6f70e5.tar.gz gsoc2013-evolution-1c5f6313c58187ce7682058057b63e14ae6f70e5.tar.bz2 gsoc2013-evolution-1c5f6313c58187ce7682058057b63e14ae6f70e5.tar.lz gsoc2013-evolution-1c5f6313c58187ce7682058057b63e14ae6f70e5.tar.xz gsoc2013-evolution-1c5f6313c58187ce7682058057b63e14ae6f70e5.tar.zst gsoc2013-evolution-1c5f6313c58187ce7682058057b63e14ae6f70e5.zip | |
Bug #681837 - Make enum type registration thread safe
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Makefile.am | 15 | ||||
| -rw-r--r-- | shell/e-shell-enumtypes.c.template | 38 | ||||
| -rw-r--r-- | shell/e-shell-enumtypes.h.template | 27 |
3 files changed, 9 insertions, 71 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 355ec69fad..d36547e609 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -8,11 +8,16 @@ eshellincludedir = $(privincludedir)/shell ENUM_TYPES = e-shell.h -e-shell-enumtypes.h: e-shell-enumtypes.h.template $(ENUM_TYPES) - $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template e-shell-enumtypes.h.template $(ENUM_TYPES)) > $@ +e-shell-enumtypes.h: $(top_srcdir)/enumtypes.h.template $(ENUM_TYPES) + $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.h.template \ + --fhead "#ifndef E_SHELL_ENUMTYPES_H\n#define E_SHELL_ENUMTYPES_H\n" \ + --ftail "#endif /* E_SHELL_ENUMTYPES_H */\n" \ + $(ENUM_TYPES)) > $@ -e-shell-enumtypes.c: e-shell-enumtypes.c.template $(ENUM_TYPES) - $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template e-shell-enumtypes.c.template $(ENUM_TYPES)) > $@ +e-shell-enumtypes.c: $(top_srcdir)/enumtypes.c.template $(ENUM_TYPES) + $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template $(top_srcdir)/enumtypes.c.template \ + --fhead "#include \"e-shell-enumtypes.h\"" \ + $(ENUM_TYPES)) > $@ ENUM_GENERATED = e-shell-enumtypes.h e-shell-enumtypes.c @@ -165,8 +170,6 @@ errordir = $(privdatadir)/errors EXTRA_DIST = \ evo-version.h.in \ - e-shell-enumtypes.h.template \ - e-shell-enumtypes.c.template \ shell.error.xml \ evolution-icon.rc \ evolution.ico \ diff --git a/shell/e-shell-enumtypes.c.template b/shell/e-shell-enumtypes.c.template deleted file mode 100644 index 4d30900611..0000000000 --- a/shell/e-shell-enumtypes.c.template +++ /dev/null @@ -1,38 +0,0 @@ -/*** BEGIN file-header ***/ -#include "e-shell-enumtypes.h" - -/*** END file-header ***/ - -/*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ -#include "@filename@" - -/*** END file-production ***/ - -/*** BEGIN value-header ***/ -GType -@enum_name@_get_type (void) -{ - static GType the_type = 0; - - if (the_type == 0) { - static const G@Type@Value values[] = { -/*** END value-header ***/ - -/*** BEGIN value-production ***/ - { @VALUENAME@, - "@VALUENAME@", - "@valuenick@" }, -/*** END value-production ***/ - -/*** BEGIN value-tail ***/ - { 0, NULL, NULL } - }; - the_type = g_@type@_register_static ( - g_intern_static_string ("@EnumName@"), - values); - } - return the_type; -} - -/*** END value-tail ***/ diff --git a/shell/e-shell-enumtypes.h.template b/shell/e-shell-enumtypes.h.template deleted file mode 100644 index 76ff677384..0000000000 --- a/shell/e-shell-enumtypes.h.template +++ /dev/null @@ -1,27 +0,0 @@ -/*** BEGIN file-header ***/ -#ifndef E_SHELL_ENUMTYPES_H -#define E_SHELL_ENUMTYPES_H - -#include <glib-object.h> - -G_BEGIN_DECLS - -/*** END file-header ***/ - -/*** BEGIN file-production ***/ -/* Enumerations from "@filename@" */ - -/*** END file-production ***/ - -/*** BEGIN enumeration-production ***/ -#define E_TYPE_@ENUMSHORT@ (@enum_name@_get_type()) -GType @enum_name@_get_type (void) G_GNUC_CONST; - -/*** END enumeration-production ***/ - -/*** BEGIN file-tail ***/ -G_END_DECLS - -#endif /* E_SHELL_ENUMTYPES_H */ -/*** END file-tail ***/ - |