# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1231213951 0
# Node ID 44ce467babaf2e343a3ee91809d891865e86e7c2
# Parent  6c6846d169d671bf5fea9ae73f82868bcc80478a
Fix the issue with the themes not showing up in the list.

N.B.: there are two calls to purple_theme_manager_init() in purple_core_init(). I'm guessing it should be initialized earlier rather than later (on the assumption that the sound/smiley stuff wants it available). The call to init the PurpleThemeManager? stuff should be before both the sound and smiley init.

refs #7760



committer: Gary Kramlich <grim@reaperworld.com>

diff -r 6c6846d169d6 -r 44ce467babaf libpurple/core.c
--- a/libpurple/core.c	Tue Jan 06 03:50:44 2009 +0000
+++ b/libpurple/core.c	Tue Jan 06 03:52:31 2009 +0000
@@ -175,7 +175,6 @@
 	purple_idle_init();
 	purple_smileys_init();
 	purple_theme_manager_init();
-	purple_theme_manager_refresh();
 	/*
 	 * Call this early on to try to auto-detect our IP address and
 	 * hopefully save some time later.
@@ -185,6 +184,9 @@
 	if (ops != NULL && ops->ui_init != NULL)
 		ops->ui_init();
 
+	/* The UI may have registered some theme types, so refresh them */
+	purple_theme_manager_refresh();
+
 	return TRUE;
 }
 
diff -r 6c6846d169d6 -r 44ce467babaf pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Tue Jan 06 03:50:44 2009 +0000
+++ b/pidgin/gtkprefs.c	Tue Jan 06 03:52:31 2009 +0000
@@ -2468,8 +2468,11 @@
 		gtk_window_present(GTK_WINDOW(prefs));
 		return;
 	}
-	
-	/* add everthing in the thmeme manager before the window is loaded */
+
+	/* Refresh the list of themes before showing the preferences window */
+	purple_theme_manager_refresh();
+
+	/* add everything in the theme manager before the window is loaded */
 	if (prefs_themes_unsorted) {
 		purple_theme_manager_for_each_theme(prefs_themes_sort);
 		prefs_themes_unsorted = FALSE;