aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy.c
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2009-06-02 00:02:03 +0800
committerCosimo Cecchi <cosimoc@gnome.org>2009-06-02 00:02:03 +0800
commit17fec9762e1680828a73efb59f7ed155219763ac (patch)
treea1ebe2d3f0a050e98b1c81ecf9dcf0d727d4b8ec /src/empathy.c
parentf0c1f00b3562294709827d1463b3d605e0f09f40 (diff)
downloadgsoc2013-empathy-17fec9762e1680828a73efb59f7ed155219763ac.tar
gsoc2013-empathy-17fec9762e1680828a73efb59f7ed155219763ac.tar.gz
gsoc2013-empathy-17fec9762e1680828a73efb59f7ed155219763ac.tar.bz2
gsoc2013-empathy-17fec9762e1680828a73efb59f7ed155219763ac.tar.lz
gsoc2013-empathy-17fec9762e1680828a73efb59f7ed155219763ac.tar.xz
gsoc2013-empathy-17fec9762e1680828a73efb59f7ed155219763ac.tar.zst
gsoc2013-empathy-17fec9762e1680828a73efb59f7ed155219763ac.zip
Fix conflict after rebase
Diffstat (limited to 'src/empathy.c')
-rw-r--r--src/empathy.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/empathy.c b/src/empathy.c
index 0b22c72f1..d5be4df8d 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -636,7 +636,6 @@ main (int argc, char *argv[])
g_object_unref (log_manager);
g_object_unref (dispatcher);
g_object_unref (chatroom_manager);
- g_object_unref (ft_manager);
#if HAVE_GEOCLUE
g_object_unref (location_manager);
#endif