[empathy/next: 57/79] remove extensions/

[Simon McVittie <smcv src gnome org>]

commit 82af1714f84e0c399b7984d51d89a6118cf271ed
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Fri Feb 7 10:13:37 2014 +0100

    remove extensions/
    
    All the API have been merged into spec and tp-glib. \o/

 Makefile.am                              |    2 +-
 configure.ac                             |    1 -
 extensions/.gitignore                    |    2 -
 extensions/Makefile.am                   |  126 ------------------------------
 extensions/all.xml                       |   22 -----
 extensions/extensions-cli.c              |   32 --------
 extensions/extensions.c                  |    7 --
 extensions/extensions.h                  |   19 -----
 extensions/generic-types.xml             |  108 -------------------------
 extensions/misc.xml                      |    7 --
 libempathy-gtk/Makefile.am               |    1 -
 libempathy-gtk/empathy-log-window.c      |    1 -
 libempathy/Makefile.am                   |    2 -
 libempathy/empathy-server-sasl-handler.c |    1 -
 libempathy/empathy-utils.c               |    3 -
 src/Makefile.am                          |    3 -
 16 files changed, 1 insertions(+), 336 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ae9e4dc..f09d137 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-MY_SUBDIRS = tools extensions po data telepathy-account-widgets libempathy libempathy-gtk src help tests
+MY_SUBDIRS = tools po data telepathy-account-widgets libempathy libempathy-gtk src help tests
 GOA_SUBDIRS = goa-mc-plugin
 UOA_SUBDIRS = ubuntu-online-accounts
 
diff --git a/configure.ac b/configure.ac
index 914d292..2cb164f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -595,7 +595,6 @@ AC_CONFIG_FILES([
    data/empathy.desktop.in
    data/icons/Makefile
    data/themes/Makefile
-   extensions/Makefile
    po/Makefile.in
    libempathy/Makefile
    libempathy-gtk/Makefile
diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 8ea81d4..b425b33 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -3,7 +3,6 @@ include $(top_srcdir)/tools/flymake.mk
 AM_CPPFLAGS =                                           \
        $(ERROR_CFLAGS)                                 \
        -I$(top_srcdir)/libempathy                      \
-       -I$(top_srcdir)/extensions                      \
        -DDATADIR=\""$(datadir)"\"                      \
        -DPKGDATADIR=\""$(pkgdatadir)"\"                \
        -DGCR_API_SUBJECT_TO_CHANGE                     \
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 272bc0a..c1fecf9 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -45,7 +45,6 @@
 #include "empathy-ui-utils.h"
 #include "empathy-utils.h"
 #include "empathy-webkit-utils.h"
-#include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_OTHER
 #include "empathy-debug.h"
diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index b87b35b..15dc4d7 100644
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -2,7 +2,6 @@ include $(top_srcdir)/tools/flymake.mk
 
 AM_CPPFLAGS =                                           \
        $(ERROR_CFLAGS)                                 \
-       -I$(top_srcdir)/extensions                      \
        -I$(top_builddir)                               \
        -DDATADIR=\""$(datadir)"\"                      \
        -DLOCALEDIR=\""$(datadir)/locale"\"             \
@@ -106,7 +105,6 @@ libempathy_la_SOURCES = \
        $(NULL)
 
 libempathy_la_LIBADD =         \
-       $(top_builddir)/extensions/libemp-extensions.la \
        $(GCR_LIBS) \
        $(EMPATHY_LIBS) \
        $(TPAW_LIBS) \
diff --git a/libempathy/empathy-server-sasl-handler.c b/libempathy/empathy-server-sasl-handler.c
index 40be730..c7ae0e9 100644
--- a/libempathy/empathy-server-sasl-handler.c
+++ b/libempathy/empathy-server-sasl-handler.c
@@ -24,7 +24,6 @@
 #include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "empathy-sasl-mechanisms.h"
-#include "extensions.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_SASL
 #include "empathy-debug.h"
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 230fe55..e8140de 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -35,7 +35,6 @@
 #include <telepathy-glib/telepathy-glib-dbus.h>
 
 #include "empathy-client-factory.h"
-#include "extensions.h"
 
 #include <math.h>
 
@@ -96,8 +95,6 @@ empathy_init (void)
   empathy_debug_set_flags (g_getenv ("EMPATHY_DEBUG"));
   tp_debug_divert_messages (g_getenv ("EMPATHY_LOGFILE"));
 
-  emp_cli_init ();
-
   initialized = TRUE;
 
   factory = empathy_client_factory_dup ();
diff --git a/src/Makefile.am b/src/Makefile.am
index 8806ae4..5f26851 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -6,7 +6,6 @@ CPPFLAGS_COMMON =                                       \
        $(ERROR_CFLAGS)                                 \
        -I$(top_srcdir)/libempathy-gtk                  \
        -I$(top_srcdir)/libempathy                      \
-       -I$(top_srcdir)/extensions                      \
        -I$(top_builddir)/libempathy-gtk                \
        -I$(top_builddir)/libempathy                    \
        -DG_LOG_DOMAIN=\"empathy\"                      \
@@ -25,7 +24,6 @@ AM_CPPFLAGS =                                         \
 LDADD =                                                                \
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la        \
        $(top_builddir)/libempathy/libempathy.la                \
-       $(top_builddir)/extensions/libemp-extensions.la         \
        $(GCR_LIBS)                                             \
        $(EMPATHY_LIBS)                                         \
        $(TPAW_LIBS)                                            \
@@ -162,7 +160,6 @@ empathy_LDADD =                                                             \
        libempathy-accounts-common.la                                   \
         $(top_builddir)/libempathy-gtk/libempathy-gtk.la               \
         $(top_builddir)/libempathy/libempathy.la                       \
-        $(top_builddir)/extensions/libemp-extensions.la                        \
         $(EMPATHY_LIBS)                                                        \
         $(LIBCHAMPLAIN_LIBS)                                           \
        $(NULL)