[Telepathy-commits] [telepathy-gabble/master] Resolve conflict with daf

[Simon McVittie]

20080721183002-53eee-019206d68a857e18961c396b252a0eff4602ee29.gz
---
 src/muc-channel.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/muc-channel.c b/src/muc-channel.c
index 884968c..040a5c5 100644
--- a/src/muc-channel.c
+++ b/src/muc-channel.c
@@ -22,10 +22,10 @@
 #include "config.h"
 #include "muc-channel.h"
 
-#include <dbus/dbus-glib.h>
 #include <stdio.h>
 #include <string.h>
 
+#include <dbus/dbus-glib.h>
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/debug-ansi.h>
 #include <telepathy-glib/errors.h>
@@ -35,9 +35,10 @@
 
 #include "extensions/extensions.h"
 
+#define DEBUG_FLAG GABBLE_DEBUG_MUC
+#include "connection.h"
 #include "debug.h"
 #include "disco.h"
-#include "connection.h"
 #include "error.h"
 #include "namespaces.h"
 #include "util.h"
-- 
1.5.6.3