Mercurial > pidgin

diff pidgin/gtkconv.c @ 32737:2efee7ca90be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some boring asserts when using the Default conversation theme.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 04 Mar 2012 03:49:49 +0000
parents 01741f87cc1e
children b37309823450
line wrap: on
line diff
--- a/pidgin/gtkconv.c	Sun Mar 04 03:32:07 2012 +0000
+++ b/pidgin/gtkconv.c	Sun Mar 04 03:49:49 2012 +0000
@@ -5714,7 +5714,8 @@
 private_gtkconv_new(PurpleConversation *conv, gboolean hidden)
 {
 	PidginConversation *gtkconv;
-	PurpleTheme *theme;
+	const char *theme_name;
+	PurpleTheme *theme = NULL;
 	PurpleConversationType conv_type = purple_conversation_get_type(conv);
 	GtkWidget *pane = NULL;
 	GtkWidget *tab_cont;
@@ -5740,7 +5741,9 @@
 #endif
 	gtkconv->unseen_state = PIDGIN_UNSEEN_NONE;
 	gtkconv->unseen_count = 0;
-	theme = purple_theme_manager_find_theme(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/theme"), "conversation");
+	theme_name = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/theme");
+	if (theme_name && *theme_name)
+		theme = purple_theme_manager_find_theme(theme_name, "conversation");
 	if (!theme)
 		theme = default_conv_theme;
 	gtkconv->theme = PIDGIN_CONV_THEME(g_object_ref(theme));