# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1209260918 0
# Node ID 29cd77930050ad55ef4a79dfaf3781c738e170f0
# Parent  4040c4ee1f4487751ff2fa2f381665573a27deea# Parent  7291da73b054c336d9dddb90bb5f8a0859262df9
merge of '4b5bc8b4da1faf24168e7210c2282016455a2218'
     and '4de09c83277edb004b4f20c31b3016c4b2188ffa'

diff -r 4040c4ee1f44 -r 29cd77930050 autogen.sh
--- a/autogen.sh	Sat Apr 26 23:14:00 2008 +0000
+++ b/autogen.sh	Sun Apr 27 01:48:38 2008 +0000
@@ -111,7 +111,7 @@
 if [ -f ${ARGS_FILE} ] ; then
 	echo "found."
 	printf "%s" "sourcing ${ARGS_FILE}: "
-	. autogen.args
+	. ${ARGS_FILE}
 	echo "done."
 else
 	echo "not found."
diff -r 4040c4ee1f44 -r 29cd77930050 pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Sat Apr 26 23:14:00 2008 +0000
+++ b/pidgin/gtkmain.c	Sun Apr 27 01:48:38 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"