diff options
| author | Mikhail Zabaluev <mikhail.zabaluev@nokia.com> | 2011-06-16 19:52:52 +0300 |
|---|---|---|
| committer | Mikhail Zabaluev <mikhail.zabaluev@nokia.com> | 2011-06-16 19:52:52 +0300 |
| commit | 3c4cd0e926209b1f7fbfe23467da78875022cb7f (patch) | |
| tree | 343501ac4faa7694ae3f2f677c749764bf5eee8e /src | |
| parent | 0af89bc46b75ed0dfefa968c127362f39e46cf30 (diff) | |
Correct namespacing for a generated enum type
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/sip-connection.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 7b37144..cf22c22 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -41,7 +41,7 @@ noinst_LTLIBRARIES = librakia-convenience.la glib-mkenums \ --fhead "#ifndef __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n#define __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name@_get_type (void);\n#define $(shell echo $* | tr [:lower:]- [:upper:]_ | sed 's/_.*//')_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define RAKIA_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ --ftail "G_END_DECLS\n\n#endif /* __$(shell echo $* | tr [:lower:]- [:upper:]_)_ENUM_TYPES_H__ */" \ $< > $@ || rm -f $@ diff --git a/src/sip-connection.c b/src/sip-connection.c index c611512..68a75f7 100644 --- a/src/sip-connection.c +++ b/src/sip-connection.c @@ -509,7 +509,7 @@ rakia_connection_class_init (RakiaConnectionClass *klass) param_spec = g_param_spec_enum ("keepalive-mechanism", "Keepalive mechanism", "Keepalive mechanism for SIP registration", - rakia_connection_keepalive_mechanism_get_type (), + RAKIA_TYPE_CONNECTION_KEEPALIVE_MECHANISM, RAKIA_CONNECTION_KEEPALIVE_AUTO, /*default value*/ G_PARAM_CONSTRUCT | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); INST_PROP(PROP_KEEPALIVE_MECHANISM); |