summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2010-01-22 13:57:49 +0000
committerJonny Lamb <jonny.lamb@collabora.co.uk>2010-01-22 13:57:49 +0000
commit5867ae9ba1a7e2a0292d9e84a96487f64d542b86 (patch)
tree6a1af72e084c0da8ba69e12313c977c1f0750e58 /server
parent04fc1f7d34b59735489c31b218c4d1f6a8de7771 (diff)
downloadtelepathy-mission-control-5867ae9ba1a7e2a0292d9e84a96487f64d542b86.tar.gz
mc-server: give NULL to the new default log handler now that tp-glib has been fixed
fd.o#23843 was fixed in telepathy-glib 0.7.37. MC already depends on 0.7.37, so this is just a matter of replacing the user_data workaround smcv added with the correct value of NULL. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'server')
-rw-r--r--server/mc-server.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/server/mc-server.c b/server/mc-server.c
index 5f046043..25ab21aa 100644
--- a/server/mc-server.c
+++ b/server/mc-server.c
@@ -61,11 +61,8 @@ main (int argc, char **argv)
/* Send all debug messages through the Telepathy infrastructure.
*
* Unlike CMs, we don't have "subdomains" within MC yet, so we don't want
- * to exclude any domains. However, telepathy-glib 0.7.36 doesn't handle
- * exclude=NULL correctly; use a dummy non-NULL argument until a release
- * fixes fd.o#23843. */
- g_log_set_default_handler (tp_debug_sender_log_handler,
- "<all the domains please>");
+ * to exclude any domains. */
+ g_log_set_default_handler (tp_debug_sender_log_handler, NULL);
mcd_debug_init ();
tp_debug_set_flags (g_getenv ("MC_TP_DEBUG"));