summaryrefslogtreecommitdiff
path: root/telepathy-glib/run.c
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2007-11-08 17:15:00 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2007-11-08 17:15:00 +0000
commit4ab3cbbfa5162a823815ee9adffe3ef785fdda12 (patch)
tree6a46a90707e9785271e504c7afc319a9c7639039 /telepathy-glib/run.c
parent64da8f978da12e8ecfa065d8c2f2de4f71efbf99 (diff)
downloadtelepathy-glib-4ab3cbbfa5162a823815ee9adffe3ef785fdda12.tar.gz
Add tp_debug_set_flags(), which doesn't accept the "persist" flag. Deprecate the related functions that did include the "persist" flag, and make the implementations more orthogonal.
20071108171500-53eee-dff8a1842466d84b2014831887eb963f85ba54b4.gz
Diffstat (limited to 'telepathy-glib/run.c')
-rw-r--r--telepathy-glib/run.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/telepathy-glib/run.c b/telepathy-glib/run.c
index d74f3d0fb..e5233900b 100644
--- a/telepathy-glib/run.c
+++ b/telepathy-glib/run.c
@@ -62,13 +62,7 @@ static guint timeout_id = 0;
static gboolean
kill_connection_manager (gpointer data)
{
-#ifdef ENABLE_DEBUG
- if (!_tp_debug_is_persistent ()
- && !_tp_debug_flag_is_set (TP_DEBUG_PERSIST)
- && !connections_exist)
-#else
- if (!connections_exist)
-#endif
+ if (!_TP_DEBUG_IS_PERSISTENT && !connections_exist)
{
g_debug ("no connections, and timed out");
g_object_unref (manager);