diff options
47 files changed, 10 insertions, 270 deletions
diff --git a/.gitignore b/.gitignore index 2ede58eb3..664c0825a 100644 --- a/.gitignore +++ b/.gitignore @@ -51,9 +51,6 @@ core /lib/gibber/gibber-signals-marshal.c /lib/gibber/gibber-signals-marshal.h /lib/gibber/gibber-signals-marshal.list -lib/loudmouth/loudmouth-signals-marshal.c -lib/loudmouth/loudmouth-signals-marshal.h -lib/loudmouth/loudmouth-signals-marshal.list /ltmain.sh /m4/gtk-doc.m4 /m4/libtool.m4 diff --git a/Android.mk b/Android.mk index 969f88506..0d98d0ee9 100644 --- a/Android.mk +++ b/Android.mk @@ -7,7 +7,6 @@ TELEPATHY_GABBLE_BUILT_SOURCES := \ gabble/telepathy-gabble-uninstalled.pc \ src/Android.mk \ lib/gibber/Android.mk \ - lib/loudmouth/Android.mk \ extensions/Android.mk telepathy-gabble-configure-real: @@ -37,5 +36,4 @@ CONFIGURE_TARGETS += telepathy-gabble-configure #include all the subdirs... -include $(TELEPATHY_GABBLE_TOP)/src/Android.mk -include $(TELEPATHY_GABBLE_TOP)/lib/gibber/Android.mk --include $(TELEPATHY_GABBLE_TOP)/lib/loudmouth/Android.mk -include $(TELEPATHY_GABBLE_TOP)/extensions/Android.mk diff --git a/configure.ac b/configure.ac index 3e8d53812..8eeb1ca18 100644 --- a/configure.ac +++ b/configure.ac @@ -412,7 +412,6 @@ AC_OUTPUT( Makefile \ lib/Makefile \ lib/ext/Makefile \ lib/gibber/Makefile \ - lib/loudmouth/Makefile \ plugins/Makefile \ gabble/Makefile \ gabble/telepathy-gabble-uninstalled.pc \ diff --git a/lib/Makefile.am b/lib/Makefile.am index 620e572da..9755d06b8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1 +1 @@ -SUBDIRS=ext gibber loudmouth +SUBDIRS=ext gibber diff --git a/lib/loudmouth/Makefile.am b/lib/loudmouth/Makefile.am deleted file mode 100644 index e255bad42..000000000 --- a/lib/loudmouth/Makefile.am +++ /dev/null @@ -1,71 +0,0 @@ -noinst_LTLIBRARIES = libloudmouth.la - -BUILT_SOURCES = \ - loudmouth-signals-marshal.list \ - loudmouth-signals-marshal.h \ - loudmouth-signals-marshal.c - -OUR_SOURCES = \ - loudmouth.h \ - lm-types.h \ - lm-message-handler.c \ - lm-message-handler.h \ - lm-connection.c \ - lm-connection.h - -libloudmouth_la_SOURCES = $(OUR_SOURCES) $(BUILT_SOURCES) -libloudmouth_la_LIBADD = @WOCKY_LIBS@ -# filter out any -flags as we only need to include .a and .la files here: -# this is necessary because: -# @@ substitutions are filtered out by automake when constructing *_DEPENDENCIES -# *_LIBADD contains the link flags, dynamic libs and static libs we want -# *_DEPENDENCIES _MUST NOT_ contain the link flags and dynamic libs -# *_DEPENDENCIES _SHOULD_ contain static libs so we rebuild when they change -libloudmouth_la_DEPENDENCIES = \ - $(filter-out -%, $(libloudmouth_la_LIBADD)) - -# Coding style checks -check_c_sources = \ - $(OUR_SOURCES) - -include $(top_srcdir)/tools/check-coding-style.mk -check-local: check-coding-style - -CLEANFILES=$(BUILT_SOURCES) -dist-hook: - $(shell for x in $(BUILT_SOURCES); do rm -f $(distdir)/$$x ; done) - -loudmouth-signals-marshal.list: $(OUR_SOURCES) Makefile.am - $(AM_V_GEN)( cd $(srcdir) && \ - sed -n -e 's/.*_loudmouth_signals_marshal_\([[:upper:][:digit:]]*__[[:upper:][:digit:]_]*\).*/\1/p' \ - $(OUR_SOURCES) ) \ - | sed -e 's/__/:/' -e 'y/_/,/' | sort -u > $@.tmp - @if cmp -s $@.tmp $@; then \ - rm $@.tmp; \ - touch $@; \ - else \ - mv $@.tmp $@; \ - fi - -%-signals-marshal.h: %-signals-marshal.list Makefile.am - $(AM_V_GEN)glib-genmarshal --header --prefix=_$(subst -,_,$*)_signals_marshal $< > $@ - -%-signals-marshal.c: %-signals-marshal.list Makefile.am - $(AM_V_GEN){ echo '#include "$*-signals-marshal.h"' && \ - glib-genmarshal --body --prefix=_$(subst -,_,$*)_signals_marshal $< ; \ - } > $@ - - -AM_CFLAGS = $(ERROR_CFLAGS) $(GCOV_CFLAGS) @GLIB_CFLAGS@ @WOCKY_CFLAGS@ - -AM_LDFLAGS = $(GCOV_LIBS) @GLIB_LIBS@ @WOCKY_LIBS@ - -Android.mk: Makefile.am $(BUILT_SOURCES) - androgenizer -:PROJECT telepathy-gabble -:STATIC loudmouth -:TAGS eng debug \ - -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libloudmouth_la_SOURCES) \ - -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CFLAGS) \ - -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \ - -:LDFLAGS $(libloudmouth_la_LIBADD) \ - > $@ diff --git a/lib/loudmouth/lm-connection.c b/lib/loudmouth/lm-connection.c deleted file mode 100644 index 1146514cc..000000000 --- a/lib/loudmouth/lm-connection.c +++ /dev/null @@ -1,21 +0,0 @@ -/* - * lm-connection.c - Loudmouth-Wocky compatibility layer - * Copyright (C) 2009 Collabora Ltd. - * @author Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "lm-connection.h" diff --git a/lib/loudmouth/lm-connection.h b/lib/loudmouth/lm-connection.h deleted file mode 100644 index bd412d633..000000000 --- a/lib/loudmouth/lm-connection.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * lm-connection.h - Loudmouth-Wocky compatibility layer - * Copyright (C) 2009 Collabora Ltd. - * @author Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef __LM_CONNECTION_H__ -#define __LM_CONNECTION_H__ - -#include <wocky/wocky-stanza.h> -#include <wocky/wocky-porter.h> - -#include "lm-types.h" -#include "lm-message-handler.h" - -G_BEGIN_DECLS - -G_END_DECLS - -#endif /* #ifndef __LM_CONNECTION_H__ */ diff --git a/lib/loudmouth/lm-message-handler.c b/lib/loudmouth/lm-message-handler.c deleted file mode 100644 index 8cb62084b..000000000 --- a/lib/loudmouth/lm-message-handler.c +++ /dev/null @@ -1,21 +0,0 @@ -/* - * lm-message-handler.c - Loudmouth-Wocky compatibility layer - * Copyright (C) 2009 Collabora Ltd. - * @author Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "lm-message-handler.h" diff --git a/lib/loudmouth/lm-message-handler.h b/lib/loudmouth/lm-message-handler.h deleted file mode 100644 index 61bfd1c72..000000000 --- a/lib/loudmouth/lm-message-handler.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * lm-message-handler.h - Loudmouth-Wocky compatibility layer - * Copyright (C) 2009 Collabora Ltd. - * @author Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef __LM_MESSAGE_HANDLER_H__ -#define __LM_MESSAGE_HANDLER_H__ - -#include <wocky/wocky-stanza.h> - -#include "lm-types.h" -#include "lm-connection.h" - -G_BEGIN_DECLS - -G_END_DECLS - -#endif /* #ifndef __LM_MESSAGE_HANDLER_H__ */ diff --git a/lib/loudmouth/lm-types.h b/lib/loudmouth/lm-types.h deleted file mode 100644 index f2599c590..000000000 --- a/lib/loudmouth/lm-types.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __LM_TYPES_H__ -#define __LM_TYPES_H__ - -#include <wocky/wocky-porter.h> - -G_BEGIN_DECLS - -G_END_DECLS - -#endif /* #ifndef __LM_TYPES_H__ */ diff --git a/lib/loudmouth/loudmouth.h b/lib/loudmouth/loudmouth.h deleted file mode 100644 index ea05b303f..000000000 --- a/lib/loudmouth/loudmouth.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * loudmouth.h - Loudmouth-Wocky compatibility layer - * Copyright (C) 2009 Collabora Ltd. - * @author Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef __LOUDMOUTH_H__ -#define __LOUDMOUTH_H__ - -#include <loudmouth/lm-connection.h> -#include <loudmouth/lm-message-handler.h> - -#endif /* #ifndef __LOUDMOUTH_H__ */ diff --git a/src/Makefile.am b/src/Makefile.am index b3d140e5e..ffcd3d62d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -212,7 +212,6 @@ enumtype_sources = \ libgabble_convenience_la_LIBADD = \ $(top_builddir)/extensions/libgabble-extensions.la \ $(top_builddir)/lib/gibber/libgibber.la \ - $(top_builddir)/lib/loudmouth/libloudmouth.la \ $(top_builddir)/lib/ext/telepathy-yell/telepathy-yell/libtelepathy-yell.la \ $(ALL_LIBS) diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c index 37f411765..16901e523 100644 --- a/src/bytestream-factory.c +++ b/src/bytestream-factory.c @@ -25,7 +25,6 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#include <loudmouth/loudmouth.h> #include <wocky/wocky-utils.h> #include <telepathy-glib/interfaces.h> diff --git a/src/bytestream-factory.h b/src/bytestream-factory.h index 059b591b1..7a86cd4f8 100644 --- a/src/bytestream-factory.h +++ b/src/bytestream-factory.h @@ -21,8 +21,6 @@ #define __BYTESTREAM_FACTORY_H__ #include <glib-object.h> -#include <loudmouth/loudmouth.h> - #include <telepathy-glib/base-connection.h> #include "types.h" #include "bytestream-iface.h" diff --git a/src/bytestream-ibb.c b/src/bytestream-ibb.c index 8bff2ec20..f99d1439b 100644 --- a/src/bytestream-ibb.c +++ b/src/bytestream-ibb.c @@ -24,7 +24,6 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#include <loudmouth/loudmouth.h> #include <telepathy-glib/interfaces.h> #define DEBUG_FLAG GABBLE_DEBUG_BYTESTREAM diff --git a/src/bytestream-ibb.h b/src/bytestream-ibb.h index bc1f57a5f..2c4a7defe 100644 --- a/src/bytestream-ibb.h +++ b/src/bytestream-ibb.h @@ -21,8 +21,7 @@ #define __GABBLE_BYTESTREAM_IBB_H__ #include <glib-object.h> -#include <loudmouth/loudmouth.h> - +#include <wocky/wocky-stanza.h> #include <telepathy-glib/base-connection.h> G_BEGIN_DECLS diff --git a/src/bytestream-iface.h b/src/bytestream-iface.h index 67b55e3f9..5d68122f5 100644 --- a/src/bytestream-iface.h +++ b/src/bytestream-iface.h @@ -21,7 +21,7 @@ #define __GABBLE_BYTESTREAM_IFACE_H__ #include <glib-object.h> -#include <loudmouth/loudmouth.h> +#include <wocky/wocky-node.h> G_BEGIN_DECLS diff --git a/src/bytestream-muc.c b/src/bytestream-muc.c index b2fd67bd6..f0c05cc31 100644 --- a/src/bytestream-muc.c +++ b/src/bytestream-muc.c @@ -24,7 +24,6 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#include <loudmouth/loudmouth.h> #include <telepathy-glib/interfaces.h> #define DEBUG_FLAG GABBLE_DEBUG_BYTESTREAM diff --git a/src/bytestream-muc.h b/src/bytestream-muc.h index ffc21e6b2..295e3e23d 100644 --- a/src/bytestream-muc.h +++ b/src/bytestream-muc.h @@ -21,8 +21,7 @@ #define __GABBLE_BYTESTREAM_MUC_H__ #include <glib-object.h> -#include <loudmouth/loudmouth.h> - +#include <wocky/wocky-stanza.h> #include <telepathy-glib/base-connection.h> G_BEGIN_DECLS diff --git a/src/bytestream-multiple.c b/src/bytestream-multiple.c index a687abb67..dbaa9ee4b 100644 --- a/src/bytestream-multiple.c +++ b/src/bytestream-multiple.c @@ -22,7 +22,6 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#include <loudmouth/loudmouth.h> #include <telepathy-glib/interfaces.h> #define DEBUG_FLAG GABBLE_DEBUG_BYTESTREAM diff --git a/src/bytestream-multiple.h b/src/bytestream-multiple.h index 97531ec2e..2b445438c 100644 --- a/src/bytestream-multiple.h +++ b/src/bytestream-multiple.h @@ -23,9 +23,6 @@ #include <stdlib.h> #include <glib-object.h> -#include <loudmouth/loudmouth.h> - -#include <telepathy-glib/base-connection.h> #include "bytestream-iface.h" diff --git a/src/bytestream-socks5.h b/src/bytestream-socks5.h index ffcbcba22..9728f2f87 100644 --- a/src/bytestream-socks5.h +++ b/src/bytestream-socks5.h @@ -23,8 +23,7 @@ #include <stdlib.h> #include <glib-object.h> -#include <loudmouth/loudmouth.h> - +#include <wocky/wocky-stanza.h> #include <telepathy-glib/base-connection.h> G_BEGIN_DECLS diff --git a/src/caps-hash.h b/src/caps-hash.h index e931b95b1..b36ea03e9 100644 --- a/src/caps-hash.h +++ b/src/caps-hash.h @@ -21,8 +21,6 @@ #ifndef __CAPS_HASH_H__ #define __CAPS_HASH_H__ -#include <loudmouth/loudmouth.h> - #include "connection.h" #include "gabble/caps-hash.h" diff --git a/src/conn-avatars.c b/src/conn-avatars.c index 9ec2e941f..3a12ce290 100644 --- a/src/conn-avatars.c +++ b/src/conn-avatars.c @@ -24,8 +24,6 @@ #include <string.h> -#include <loudmouth/loudmouth.h> - #include <telepathy-glib/svc-connection.h> #include <telepathy-glib/interfaces.h> #include <telepathy-glib/contacts-mixin.h> diff --git a/src/connection.c b/src/connection.c index b1f56f264..692f23e76 100644 --- a/src/connection.c +++ b/src/connection.c @@ -27,7 +27,6 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> #include <glib-object.h> -#include <loudmouth/loudmouth.h> #include <wocky/wocky-connector.h> #include <wocky/wocky-disco-identity.h> #include <wocky/wocky-tls-handler.h> diff --git a/src/connection.h b/src/connection.h index 0003911b9..f1fcf3ecd 100644 --- a/src/connection.h +++ b/src/connection.h @@ -25,7 +25,6 @@ #include <dbus/dbus-glib.h> #include <glib-object.h> -#include <loudmouth/loudmouth.h> #include <telepathy-glib/base-connection.h> #include <telepathy-glib/contacts-mixin.h> #include <telepathy-glib/presence-mixin.h> diff --git a/src/debug.h b/src/debug.h index 0d6b56002..02cfe8525 100644 --- a/src/debug.h +++ b/src/debug.h @@ -5,7 +5,6 @@ #include <glib.h> #include <wocky/wocky-stanza.h> -#include <loudmouth/loudmouth.h> G_BEGIN_DECLS diff --git a/src/disco.h b/src/disco.h index a5dd6f483..50a4c2c15 100644 --- a/src/disco.h +++ b/src/disco.h @@ -25,7 +25,7 @@ #define __GABBLE_DISCO_H__ #include <glib-object.h> -#include <loudmouth/loudmouth.h> +#include <wocky/wocky-node.h> #include "types.h" diff --git a/src/ft-channel.c b/src/ft-channel.c index 3555fe157..b39c2b9e7 100644 --- a/src/ft-channel.c +++ b/src/ft-channel.c @@ -37,8 +37,6 @@ #define DEBUG_FLAG GABBLE_DEBUG_FT #include "debug.h" -#include <loudmouth/loudmouth.h> - #include <gibber/gibber-listener.h> #include <gibber/gibber-transport.h> #include <gibber/gibber-unix-transport.h> /* just for the feature-test */ diff --git a/src/im-channel.c b/src/im-channel.c index 8627df9b1..d294c3a04 100644 --- a/src/im-channel.c +++ b/src/im-channel.c @@ -24,7 +24,6 @@ #include <string.h> #include <dbus/dbus-glib.h> -#include <loudmouth/loudmouth.h> #include <telepathy-glib/dbus.h> #include <telepathy-glib/enums.h> #include <telepathy-glib/errors.h> diff --git a/src/jingle-share.c b/src/jingle-share.c index 8dd568cd3..f0f356305 100644 --- a/src/jingle-share.c +++ b/src/jingle-share.c @@ -28,7 +28,6 @@ #include <string.h> #include <glib.h> -#include <loudmouth/loudmouth.h> #define DEBUG_FLAG GABBLE_DEBUG_SHARE diff --git a/src/jingle-share.h b/src/jingle-share.h index 5444743c0..1a4ac64d8 100644 --- a/src/jingle-share.h +++ b/src/jingle-share.h @@ -21,7 +21,6 @@ #define __JINGLE_SHARE_H__ #include <glib-object.h> -#include <loudmouth/loudmouth.h> #include "types.h" #include "jingle-content.h" diff --git a/src/media-factory.c b/src/media-factory.c index 4eb902c12..f0be05564 100644 --- a/src/media-factory.c +++ b/src/media-factory.c @@ -25,7 +25,6 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#include <loudmouth/loudmouth.h> #include <telepathy-glib/channel-manager.h> #include <telepathy-glib/dbus.h> #include <telepathy-glib/interfaces.h> diff --git a/src/message-util.c b/src/message-util.c index d31dd6a19..d43756272 100644 --- a/src/message-util.c +++ b/src/message-util.c @@ -27,7 +27,6 @@ #include <string.h> #include <time.h> -#include <loudmouth/loudmouth.h> #include <telepathy-glib/dbus.h> #include <wocky/wocky-utils.h> diff --git a/src/message-util.h b/src/message-util.h index 45f0d657b..1c857886d 100644 --- a/src/message-util.h +++ b/src/message-util.h @@ -23,7 +23,6 @@ #include <telepathy-glib/message-mixin.h> -#include <loudmouth/loudmouth.h> #include <wocky/wocky.h> #include <wocky/wocky-xmpp-error.h> diff --git a/src/muc-channel.h b/src/muc-channel.h index ca8ce2296..6662512a5 100644 --- a/src/muc-channel.h +++ b/src/muc-channel.h @@ -25,7 +25,6 @@ #include <glib-object.h> #include <gio/gio.h> -#include <loudmouth/loudmouth.h> #include <telepathy-glib/base-channel.h> #include <telepathy-glib/dbus-properties-mixin.h> #include <telepathy-glib/group-mixin.h> diff --git a/src/muc-factory.h b/src/muc-factory.h index e8d680b03..a18359638 100644 --- a/src/muc-factory.h +++ b/src/muc-factory.h @@ -21,6 +21,7 @@ #define __MUC_FACTORY_H__ #include <glib-object.h> +#include <wocky/wocky-stanza.h> #include "bytestream-iface.h" #include "types.h" diff --git a/src/private-tubes-factory.c b/src/private-tubes-factory.c index c3fbc59e2..f4f183460 100644 --- a/src/private-tubes-factory.c +++ b/src/private-tubes-factory.c @@ -25,7 +25,6 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#include <loudmouth/loudmouth.h> #include <telepathy-glib/channel-manager.h> #include <telepathy-glib/dbus.h> #include <telepathy-glib/exportable-channel.h> diff --git a/src/private-tubes-factory.h b/src/private-tubes-factory.h index e08b56e91..d9895199d 100644 --- a/src/private-tubes-factory.h +++ b/src/private-tubes-factory.h @@ -21,7 +21,6 @@ #define __PRIVATE_TUBES_FACTORY_H__ #include <glib-object.h> -#include <loudmouth/loudmouth.h> #include <telepathy-glib/base-connection.h> #include "connection.h" diff --git a/src/request-pipeline.h b/src/request-pipeline.h index 1aef56c80..dcc8a311e 100644 --- a/src/request-pipeline.h +++ b/src/request-pipeline.h @@ -22,8 +22,7 @@ #define __GABBLE_REQUEST_PIPELINE_H__ #include <glib-object.h> -#include <loudmouth/loudmouth.h> - +#include <wocky/wocky-stanza.h> #include "types.h" G_BEGIN_DECLS diff --git a/src/roomlist-manager.c b/src/roomlist-manager.c index e3cb09a4a..6f8d499ea 100644 --- a/src/roomlist-manager.c +++ b/src/roomlist-manager.c @@ -25,7 +25,6 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#include <loudmouth/loudmouth.h> #include <telepathy-glib/channel-manager.h> #include <telepathy-glib/dbus.h> #include <telepathy-glib/interfaces.h> diff --git a/src/search-channel.c b/src/search-channel.c index 618c0dca4..2e6f71d5d 100644 --- a/src/search-channel.c +++ b/src/search-channel.c @@ -30,7 +30,6 @@ #include <telepathy-glib/util.h> #include <wocky/wocky-utils.h> -#include <loudmouth/loudmouth.h> #define DEBUG_FLAG GABBLE_DEBUG_SEARCH #include <gabble/error.h> diff --git a/src/tube-dbus.c b/src/tube-dbus.c index eada9103a..601756a21 100644 --- a/src/tube-dbus.c +++ b/src/tube-dbus.c @@ -26,7 +26,6 @@ #include <glib/gstdio.h> #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-lowlevel.h> -#include <loudmouth/loudmouth.h> #include <wocky/wocky-utils.h> #include <telepathy-glib/channel-iface.h> #include <telepathy-glib/dbus.h> diff --git a/src/tube-stream.c b/src/tube-stream.c index 61995aea6..ab9f5c55c 100644 --- a/src/tube-stream.c +++ b/src/tube-stream.c @@ -31,7 +31,6 @@ #endif #include <glib/gstdio.h> -#include <loudmouth/loudmouth.h> #include <telepathy-glib/channel-iface.h> #include <telepathy-glib/dbus.h> #include <telepathy-glib/exportable-channel.h> diff --git a/src/tubes-channel.h b/src/tubes-channel.h index fb59b9c52..4bda0b886 100644 --- a/src/tubes-channel.h +++ b/src/tubes-channel.h @@ -21,8 +21,7 @@ #define __GABBLE_TUBES_CHANNEL_H__ #include <glib-object.h> -#include <loudmouth/loudmouth.h> - +#include <wocky/wocky-stanza.h> #include <telepathy-glib/base-connection.h> #include <telepathy-glib/exportable-channel.h> diff --git a/src/util.h b/src/util.h index 1b51194cc..3f4310dc5 100644 --- a/src/util.h +++ b/src/util.h @@ -27,7 +27,6 @@ #include <glib.h> #include <telepathy-glib/handle-repo.h> #include <telepathy-glib/util.h> -#include <loudmouth/loudmouth.h> #include <wocky/wocky-bare-contact.h> #include "jingle-factory.h" diff --git a/src/vcard-manager.h b/src/vcard-manager.h index 35d63fb34..7ae7521af 100644 --- a/src/vcard-manager.h +++ b/src/vcard-manager.h @@ -23,7 +23,7 @@ #define __GABBLE_VCARD_MANAGER_H__ #include <glib-object.h> -#include <loudmouth/loudmouth.h> +#include <wocky/wocky-node.h> #include "types.h" |