Mercurial > pidgin
diff src/gtkmain.c @ 11080:f54740547c95
[gaim-migrate @ 13092]
All gaim signals are automatically relayed to dbus.
committer: Tailor Script <tailor@pidgin.im>
| author | Piotr Zielinski <zielaj> |
|---|---|
| date | Sun, 10 Jul 2005 02:29:52 +0000 |
| parents | 2eca9ed49469 |
| children | ebb02ea3c789 |
line wrap: on
line diff
--- a/src/gtkmain.c Sat Jul 09 20:27:57 2005 +0000 +++ b/src/gtkmain.c Sun Jul 10 02:29:52 2005 +0000 @@ -494,6 +494,7 @@ textdomain(PACKAGE); #endif + #if HAVE_SIGNAL_H /* Let's not violate any PLA's!!!! */ /* jseymour: whatever the fsck that means */ @@ -617,8 +618,7 @@ #endif #ifdef HAVE_DBUS - /* start dbus pointer registration system */ - gaim_dbus_init_ids(); + gaim_dbus_init(); #endif gaim_core_set_ui_ops(gaim_gtk_core_get_ui_ops()); @@ -727,8 +727,7 @@ gaim_debug_register_category("stringref"); #ifdef HAVE_DBUS - /* Starting DBUS */ - dbus_server_init(); + gaim_dbus_connect(gaim_dbus_object); #endif gtk_main();