diff libpurple/core.c @ 25780:6ebabe0841a0

propagate from branch 'im.pidgin.pidgin' (head 06e4830f3567955e026f3d594afcc65a07d57b26) to branch 'im.pidgin.pidgin.next.minor' (head 22a0659074cef317fb0f96d98d9628d193dd224d)
author Gary Kramlich <grim@reaperworld.com>
date Thu, 30 Oct 2008 03:03:55 +0000
parents a29ae9a5c311 25af9b1994c8
children 1eacf60a73dd
line wrap: on
line diff
--- a/libpurple/core.c	Thu Oct 30 03:03:45 2008 +0000
+++ b/libpurple/core.c	Thu Oct 30 03:03:55 2008 +0000
@@ -46,10 +46,12 @@
 #include "signals.h"
 #include "smiley.h"
 #include "sound.h"
+#include "sound-theme-loader.h"
 #include "sslconn.h"
 #include "status.h"
 #include "stun.h"
 #include "util.h"
+#include "theme-manager.h"
 
 #ifdef HAVE_DBUS
 #  ifndef DBUS_API_SUBJECT_TO_CHANGE
@@ -143,6 +145,7 @@
 
 	purple_plugins_probe(G_MODULE_SUFFIX);
 
+	purple_theme_manager_init();
 	/* The buddy icon code uses the imgstore, so init it early. */
 	purple_imgstore_init();
 
@@ -171,7 +174,6 @@
 	purple_xfers_init();
 	purple_idle_init();
 	purple_smileys_init();
-
 	/*
 	 * Call this early on to try to auto-detect our IP address and
 	 * hopefully save some time later.
@@ -180,6 +182,8 @@
 
 	if (ops != NULL && ops->ui_init != NULL)
 		ops->ui_init();
+	
+	purple_theme_manager_refresh();
 
 	return TRUE;
 }
@@ -215,6 +219,7 @@
 	purple_status_uninit();
 	purple_prefs_uninit();
 	purple_sound_uninit();
+	purple_theme_manager_uninit();
 	purple_xfers_uninit();
 	purple_proxy_uninit();
 	purple_dnsquery_uninit();