Mercurial > pidgin

changeset 22745:7c801c16bacc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '74190d6fbb138e095f84e71b0e0513240531437c' and 'aeea2d3844bffa0e26ef1d7545c2986d55d3a170'
author Evan Schoenberg <evan.s@dreskin.net>
date Sat, 26 Apr 2008 13:36:42 +0000
parents ec4592f34736 (current diff) 71e88e6a6608 (diff)
children 091941836747 7291da73b054
files
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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"