changeset 22744:ec4592f34736

merge of '8d455562b69f961763bbfc469954425260f22917' and '8f0b34c54e38066959f87d35b0af2ca6ae0e853b'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Sat, 26 Apr 2008 12:12:28 +0000
parents ac66a8c73845 (diff) fe546f9e3cbf (current diff)
children 7c801c16bacc 35c7cd1e4771
files
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkmain.c	Sat Apr 26 12:04:52 2008 +0000
+++ b/pidgin/gtkmain.c	Sat Apr 26 12:12:28 2008 +0000
@@ -27,7 +27,9 @@
 #include "account.h"
 #include "conversation.h"
 #include "core.h"
-#include "dbus-server.h"
+#ifdef HAVE_DBUS
+#  include "dbus-server.h"
+#endif
 #include "debug.h"
 #include "eventloop.h"
 #include "ft.h"