diff options
| author | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2008-11-22 00:13:41 +0800 |
|---|---|---|
| committer | xclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4> | 2008-11-22 00:13:41 +0800 |
| commit | ad67eb4aea7adee83cc177b169356aff24b72297 (patch) | |
| tree | 48d54aff88d28904b58e4d5cb0962a04e79630a0 /libempathy | |
| parent | 347c17f3491aedc3f17991754b622c341d829d85 (diff) | |
| download | gsoc2013-empathy-ad67eb4aea7adee83cc177b169356aff24b72297.tar gsoc2013-empathy-ad67eb4aea7adee83cc177b169356aff24b72297.tar.gz gsoc2013-empathy-ad67eb4aea7adee83cc177b169356aff24b72297.tar.bz2 gsoc2013-empathy-ad67eb4aea7adee83cc177b169356aff24b72297.tar.lz gsoc2013-empathy-ad67eb4aea7adee83cc177b169356aff24b72297.tar.xz gsoc2013-empathy-ad67eb4aea7adee83cc177b169356aff24b72297.tar.zst gsoc2013-empathy-ad67eb4aea7adee83cc177b169356aff24b72297.zip | |
Added empathy_init function to call emp_cli_init in main. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@1737 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'libempathy')
| -rw-r--r-- | libempathy/empathy-tp-call.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-utils.c | 8 | ||||
| -rw-r--r-- | libempathy/empathy-utils.h | 1 |
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 |