# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1209217002 0
# Node ID 7c801c16baccd9098d1e74cc77b85dc22aebde22
# Parent  ec4592f34736a08698eacaaee5e1712c7f8c19a8# Parent  71e88e6a660823ed8297b0e191db5fbb8d852047
merge of '74190d6fbb138e095f84e71b0e0513240531437c'
     and 'aeea2d3844bffa0e26ef1d7545c2986d55d3a170'

diff -r ec4592f34736 -r 7c801c16bacc pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Sat Apr 26 12:12:28 2008 +0000
+++ b/pidgin/gtkmain.c	Sat Apr 26 13:36:42 2008 +0000
@@ -27,9 +27,7 @@
 #include "account.h"
 #include "conversation.h"
 #include "core.h"
-#ifdef HAVE_DBUS
-#  include "dbus-server.h"
-#endif
+#include "dbus-maybe.h"
 #include "debug.h"
 #include "eventloop.h"
 #include "ft.h"