Mercurial > pidgin
changeset 22751:29cd77930050
merge of '4b5bc8b4da1faf24168e7210c2282016455a2218'
and '4de09c83277edb004b4f20c31b3016c4b2188ffa'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sun, 27 Apr 2008 01:48:38 +0000 |
| parents | 4040c4ee1f44 (current diff) 7291da73b054 (diff) |
| children | 3b14215d2ca4 2f4b10ee752b |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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."
--- 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"