summaryrefslogtreecommitdiff
path: root/src/salut.c
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2008-04-21 13:03:33 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2008-04-21 13:03:33 +0000
commit7aea6b5ce4246b70983e93cff3454a3a627a32c1 (patch)
tree2db5b5dca79ab6ae95b6edffda5845863eb3b2ce /src/salut.c
parentbdafc09c8d55a67e445158779b99d98699864bf5 (diff)
downloadtelepathy-salut-7aea6b5ce4246b70983e93cff3454a3a627a32c1.tar.gz
Add a hard dependency on telepathy-glib 0.6.1 and avoid using #ifdef for tp_debug_set_flags
20080421130333-53eee-01c0cf70c09ca45cf4721d0b258ac39e026e29e1.gz
Diffstat (limited to 'src/salut.c')
-rw-r--r--src/salut.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/salut.c b/src/salut.c
index 6f1597fa..2fb6627c 100644
--- a/src/salut.c
+++ b/src/salut.c
@@ -23,15 +23,7 @@ main(int argc, char **argv) {
debug_set_flags_from_env();
if (g_getenv ("SALUT_PERSIST"))
- {
-#ifdef HAVE_TP_DEBUG_SET_FLAGS
- /* tp-glib >= 0.6.1: persist is no longer a flag in quite the same way */
- tp_debug_set_persistent (TRUE);
-#else
- /* tp-glib < 0.6.1: persist is a flag, of sorts */
- tp_debug_set_flags_from_string ("persist");
-#endif
- }
+ tp_debug_set_persistent (TRUE);
return tp_run_connection_manager("telepathy-salut", VERSION,
salut_create_connection_manager,