comparison 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
comparison
equal deleted inserted replaced
11170:0e9e2b923d09 11171:ebb02ea3c789
69 # define SN_API_NOT_YET_FROZEN 69 # define SN_API_NOT_YET_FROZEN
70 # include <libsn/sn-launchee.h> 70 # include <libsn/sn-launchee.h>
71 # include <gdk/gdkx.h> 71 # include <gdk/gdkx.h>
72 #endif 72 #endif
73 73
74 #ifdef HAVE_DBUS
75 # include "dbus-server.h"
76 #endif
77 74
78 75
79 #ifdef HAVE_STARTUP_NOTIFICATION 76 #ifdef HAVE_STARTUP_NOTIFICATION
80 static SnLauncheeContext *sn_context = NULL; 77 static SnLauncheeContext *sn_context = NULL;
81 static SnDisplay *sn_display = NULL; 78 static SnDisplay *sn_display = NULL;
613 610
614 gaim_debug_set_enabled(debug_enabled); 611 gaim_debug_set_enabled(debug_enabled);
615 612
616 #ifdef _WIN32 613 #ifdef _WIN32
617 wgaim_init(hint); 614 wgaim_init(hint);
618 #endif
619
620 #ifdef HAVE_DBUS
621 gaim_dbus_init();
622 #endif 615 #endif
623 616
624 gaim_core_set_ui_ops(gaim_gtk_core_get_ui_ops()); 617 gaim_core_set_ui_ops(gaim_gtk_core_get_ui_ops());
625 gaim_eventloop_set_ui_ops(gaim_gtk_eventloop_get_ui_ops()); 618 gaim_eventloop_set_ui_ops(gaim_gtk_eventloop_get_ui_ops());
626 619
724 gaim_debug_register_category("gtksound"); 717 gaim_debug_register_category("gtksound");
725 gaim_debug_register_category("prpl"); 718 gaim_debug_register_category("prpl");
726 gaim_debug_register_category("server"); 719 gaim_debug_register_category("server");
727 gaim_debug_register_category("stringref"); 720 gaim_debug_register_category("stringref");
728 721
729 #ifdef HAVE_DBUS
730 gaim_dbus_connect(gaim_dbus_object);
731 #endif
732
733 gtk_main(); 722 gtk_main();
734 723
735 #ifdef _WIN32 724 #ifdef _WIN32
736 wgaim_cleanup(); 725 wgaim_cleanup();
737 #endif 726 #endif