summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMikhail Zabaluev <mikhail.zabaluev@nokia.com>2011-09-05 11:01:37 +0300
committerMikhail Zabaluev <mikhail.zabaluev@nokia.com>2011-09-05 11:01:37 +0300
commit6acdc05cf49cd03a1ec8058eae5a4f2d043323e9 (patch)
treec50d90b0d852fd3686fe0944d20bef9dd338fbab /src
parentcf94024c49bc64ca31961cb5895249ce0dc57048 (diff)
parentcb9453be492f28cf7b12c53f10b639ee9c56ed0f (diff)
Merge branch 'master' into debug-lite
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/sip-connection.c2
-rw-r--r--src/telepathy-rakia.c2
3 files changed, 4 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);
diff --git a/src/telepathy-rakia.c b/src/telepathy-rakia.c
index f482562..45c952c 100644
--- a/src/telepathy-rakia.c
+++ b/src/telepathy-rakia.c
@@ -66,6 +66,8 @@ main (int argc, char** argv)
tp_debug_divert_messages (logfile_string);
+ tp_debug_divert_messages (logfile_string);
+
status = tp_run_connection_manager ("telepathy-rakia", VERSION,
construct_cm, argc, argv);