pidgin.next.minor: 1e8b6403: Fix the issue with the themes not showin...

[grim at pidgin.im]

-----------------------------------------------------------------
Revision: 1e8b6403400015b82def768a98cd269fb8cc2cf2
Ancestor: 65a6cbe8469f96b691eebe7e4a5ff2d5b8d4eaa8
Author: paul at aurich.com
Date: 2009-01-06T03:52:31
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/1e8b6403400015b82def768a98cd269fb8cc2cf2

Modified files:
        libpurple/core.c pidgin/gtkprefs.c

ChangeLog: 

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



-------------- next part --------------
============================================================
--- libpurple/core.c	5c64ed7d4f06cbd8caac0d46b4906795272413e9
+++ libpurple/core.c	6436383fa92ca0f1eae942b3f1b91a29ae971119
@@ -175,7 +175,6 @@ purple_core_init(const char *ui)
 	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 @@ purple_core_init(const char *ui)
 	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;
 }
 
============================================================
--- pidgin/gtkprefs.c	7a342414e3eba379988baa23c7ab733146f6e769
+++ pidgin/gtkprefs.c	4007078156be2a4848a98dadbbd25cba3cce0b73
@@ -2468,8 +2468,11 @@ void pidgin_prefs_show(void)
 		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;