# HG changeset patch
# User Will Thompson <will.thompson@collabora.co.uk>
# Date 1209212062 0
# Node ID 71e88e6a660823ed8297b0e191db5fbb8d852047
# Parent  fe546f9e3cbf079b3321b7636d289dfb52d60009# Parent  de58bebea31ab2127bc68f1d660168fa618f271c
merge of '8f0b34c54e38066959f87d35b0af2ca6ae0e853b'
     and 'dde5e18826606b5b71cef9ec3c4d490ebdc3c22f'

diff -r fe546f9e3cbf -r 71e88e6a6608 pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Sat Apr 26 12:04:52 2008 +0000
+++ b/pidgin/gtkmain.c	Sat Apr 26 12:14:22 2008 +0000
@@ -27,7 +27,7 @@
 #include "account.h"
 #include "conversation.h"
 #include "core.h"
-#include "dbus-server.h"
+#include "dbus-maybe.h"
 #include "debug.h"
 #include "eventloop.h"
 #include "ft.h"