diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2008-11-22 00:16:06 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-11-22 00:16:06 +0800 |
| commit | 2aa329dcb7773bef4ee2b593147b48a83b7658f8 (patch) | |
| tree | 82ca425c6ca1a53098cc9d32f048bd5cbdc0bf51 | |
| parent | 03c63ba1f0dbdac7a30ac025e3c02ce40cff7cc5 (diff) | |
| download | gsoc2013-empathy-2aa329dcb7773bef4ee2b593147b48a83b7658f8.tar gsoc2013-empathy-2aa329dcb7773bef4ee2b593147b48a83b7658f8.tar.gz gsoc2013-empathy-2aa329dcb7773bef4ee2b593147b48a83b7658f8.tar.bz2 gsoc2013-empathy-2aa329dcb7773bef4ee2b593147b48a83b7658f8.tar.lz gsoc2013-empathy-2aa329dcb7773bef4ee2b593147b48a83b7658f8.tar.xz gsoc2013-empathy-2aa329dcb7773bef4ee2b593147b48a83b7658f8.tar.zst gsoc2013-empathy-2aa329dcb7773bef4ee2b593147b48a83b7658f8.zip | |
Removed empathy_init in favour of calling emp_cli_init directly. (Jonny Lamb)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1773
| -rw-r--r-- | libempathy/empathy-utils.c | 6 | ||||
| -rw-r--r-- | libempathy/empathy-utils.h | 3 | ||||
| -rw-r--r-- | src/empathy.c | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index e1c7244fd..c0cba4d73 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -881,9 +881,3 @@ empathy_send_file (EmpathyContact *contact, return file; } -void -empathy_init (void) -{ - emp_cli_init (); -} - diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h index fe2acfee5..2d4734feb 100644 --- a/libempathy/empathy-utils.h +++ b/libempathy/empathy-utils.h @@ -133,9 +133,6 @@ EmpathyFile * empathy_send_file (EmpathyContact *contact, EmpathyFile *empathy_send_file (EmpathyContact *contact, GFile *file); -/* General */ -void empathy_init (void); - G_END_DECLS #endif /* __EMPATHY_UTILS_H__ */ diff --git a/src/empathy.c b/src/empathy.c index 9bc98ff11..0f8cce404 100644 --- a/src/empathy.c +++ b/src/empathy.c @@ -45,6 +45,8 @@ #include <libempathy-gtk/empathy-conf.h> +#include <extensions/extensions.h> + #include "empathy-accounts-dialog.h" #include "empathy-main-window.h" #include "empathy-status-icon.h" @@ -449,7 +451,7 @@ main (int argc, char *argv[]) g_warning ("Cannot create the 'empathy' bacon connection."); } - empathy_init (); + emp_cli_init (); /* Setting up MC */ mc = empathy_mission_control_new (); |