aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2008-11-22 00:13:41 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-11-22 00:13:41 +0800
commitcad875337faec4386962ed41a0efd15b720e73d4 (patch)
tree48d54aff88d28904b58e4d5cb0962a04e79630a0 /libempathy
parentc5cd21667001a01e62f60b05953091310cc09f65 (diff)
downloadgsoc2013-empathy-cad875337faec4386962ed41a0efd15b720e73d4.tar
gsoc2013-empathy-cad875337faec4386962ed41a0efd15b720e73d4.tar.gz
gsoc2013-empathy-cad875337faec4386962ed41a0efd15b720e73d4.tar.bz2
gsoc2013-empathy-cad875337faec4386962ed41a0efd15b720e73d4.tar.lz
gsoc2013-empathy-cad875337faec4386962ed41a0efd15b720e73d4.tar.xz
gsoc2013-empathy-cad875337faec4386962ed41a0efd15b720e73d4.tar.zst
gsoc2013-empathy-cad875337faec4386962ed41a0efd15b720e73d4.zip
Added empathy_init function to call emp_cli_init in main. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk> svn path=/trunk/; revision=1737
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-tp-call.c2
-rw-r--r--libempathy/empathy-utils.c8
-rw-r--r--libempathy/empathy-utils.h1
3 files changed, 9 insertions, 2 deletions
diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c
index 6c90f49d8..7703aeffb 100644
--- a/libempathy/empathy-tp-call.c
+++ b/libempathy/empathy-tp-call.c
@@ -589,8 +589,6 @@ empathy_tp_call_class_init (EmpathyTpCallClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- emp_cli_init ();
-
object_class->constructor = tp_call_constructor;
object_class->finalize = tp_call_finalize;
object_class->set_property = tp_call_set_property;
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index b5bdb9ff7..934fc9e2c 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -37,6 +37,8 @@
#include <telepathy-glib/channel.h>
#include <telepathy-glib/dbus.h>
+#include <extensions/extensions.h>
+
#include "empathy-utils.h"
#include "empathy-contact-factory.h"
#include "empathy-contact-manager.h"
@@ -774,3 +776,9 @@ empathy_connection_request_channel (TpConnection *connection,
weak_object);
}
+void
+empathy_init (void)
+{
+ emp_cli_init ();
+}
+
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index a320c6246..afde4d3a7 100644
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -122,6 +122,7 @@ void empathy_connection_request_channel (TpConnection *proxy,
gpointer user_data,
GDestroyNotify destroy,
GObject *weak_object);
+void empathy_init (void);
G_END_DECLS