comparison src/core.c @ 13955:2d6f7ac4b6f2

[gaim-migrate @ 16503] Get rid of an assertion failure when trying to load our D-BUS example plugin if the D-BUS subsystem is not initialized for whatever reason. Not only that, the plugin gracefully fails to load and prints an error message. These error messages could be improved. If you're familiar with how D-BUS works then go for it. Also, do we need to be uninitializing any of the D-BUS stuff? committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 17 Jul 2006 05:50:28 +0000
parents ff06120eaf1e
children 8bda65b88e49
comparison
equal deleted inserted replaced
13954:3cd388613624 13955:2d6f7ac4b6f2
97 97
98 #ifdef HAVE_DBUS 98 #ifdef HAVE_DBUS
99 gaim_dbus_init(); 99 gaim_dbus_init();
100 #endif 100 #endif
101 101
102
103 /* Initialize all static protocols. */ 102 /* Initialize all static protocols. */
104 static_proto_init(); 103 static_proto_init();
105 104
106 /* Since plugins get probed so early we should probably initialize their 105 /* Since plugins get probed so early we should probably initialize their
107 * subsystem right away too. 106 * subsystem right away too.
191 gaim_sound_uninit(); 190 gaim_sound_uninit();
192 191
193 gaim_plugins_uninit(); 192 gaim_plugins_uninit();
194 gaim_signals_uninit(); 193 gaim_signals_uninit();
195 194
195 #ifdef HAVE_DBUS
196 gaim_dbus_uninit();
197 #endif
198
196 if (core->ui != NULL) { 199 if (core->ui != NULL) {
197 g_free(core->ui); 200 g_free(core->ui);
198 core->ui = NULL; 201 core->ui = NULL;
199 } 202 }
200 203