diff src/gtkmain.c @ 11171:ebb02ea3c789

[gaim-migrate @ 13272] Moved DBUS init call from gtkmain.c to core.c Reimplemented DBUS bindings mechamism to use low-level GLib bindings as described in my last blog entry. This way plugins can add new DBUS methods on the fly. Also wrote an example plugin that demonstrate how to do it. committer: Tailor Script <tailor@pidgin.im>
author Piotr Zielinski <zielaj>
date Sat, 30 Jul 2005 00:23:21 +0000
parents f54740547c95
children bb0d7b719af2
line wrap: on
line diff
--- 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