diff -r d8941580d87f -r a25653d60f9c src/gtkmain.c
--- a/src/gtkmain.c	Fri Jul 29 13:38:00 2005 +0000
+++ b/src/gtkmain.c	Sat Jul 30 00:23:21 2005 +0000
@@ -71,9 +71,6 @@
 # include <gdk/gdkx.h>
 #endif
 
-#ifdef HAVE_DBUS
-#  include "dbus-server.h"
-#endif
 
 
 #ifdef HAVE_STARTUP_NOTIFICATION
@@ -617,10 +614,6 @@
 	wgaim_init(hint);
 #endif
 
-#ifdef HAVE_DBUS
-	gaim_dbus_init();
-#endif
-
 	gaim_core_set_ui_ops(gaim_gtk_core_get_ui_ops());
 	gaim_eventloop_set_ui_ops(gaim_gtk_eventloop_get_ui_ops());
 
@@ -726,10 +719,6 @@
 	gaim_debug_register_category("server");
 	gaim_debug_register_category("stringref");
 
-#ifdef HAVE_DBUS
- 	gaim_dbus_connect(gaim_dbus_object); 
-#endif
-
 	gtk_main();
 
 #ifdef _WIN32