Mercurial > pidgin.yaz

changeset 22726:71e88e6a6608

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '8f0b34c54e38066959f87d35b0af2ca6ae0e853b' and 'dde5e18826606b5b71cef9ec3c4d490ebdc3c22f'
author Will Thompson <will.thompson@collabora.co.uk>
date Sat, 26 Apr 2008 12:14:22 +0000
parents fe546f9e3cbf (current diff) de58bebea31a (diff)
children 7c801c16bacc
files
diffstat 1 files changed, 1 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: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"