[Telepathy-commits] [telepathy-gabble/master] Fix conflicts

[Sjoerd Simons]

20080724131602-93b9a-4e515d6049c3a8ae82a387b4ac61f06c9f1b4894.gz
---
 src/conn-presence.c  |    5 +----
 src/presence-cache.c |    1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/conn-presence.c b/src/conn-presence.c
index 29ab377..0a3520e 100644
--- a/src/conn-presence.c
+++ b/src/conn-presence.c
@@ -27,16 +27,13 @@
 #include <telepathy-glib/svc-connection.h>
 #include <telepathy-glib/util.h>
 
-#include "connection.h"
-#include "presence.h"
-#include "presence-cache.h"
-
 #define DEBUG_FLAG GABBLE_DEBUG_CONNECTION
 
 #include "connection.h"
 #include "debug.h"
 #include "presence-cache.h"
 #include "presence.h"
+#include "roster.h"
 
 static const TpPresenceStatusOptionalArgumentSpec gabble_status_arguments[] = {
   { "message",  "s", NULL, NULL },
diff --git a/src/presence-cache.c b/src/presence-cache.c
index 0ac6afe..eb13d16 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -31,6 +31,7 @@
 #define CAPABILITY_BUNDLE_ENOUGH_TRUST 5
 #define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
 
+#include <dbus/dbus-glib.h>
 #include <telepathy-glib/intset.h>
 
 #define DEBUG_FLAG GABBLE_DEBUG_PRESENCE
-- 
1.5.6.3