# HG changeset patch
# User Gabriel Schulhof <nix@go-nix.ca>
# Date 1180863638 0
# Node ID 6c9c1627586808a173baabbb089e0c6dd9d30e7b
# Parent  76066eb866111d6167a973e5a02db892fd5b621b
Aaaaaaaah!

diff -r 76066eb86611 -r 6c9c16275868 pidgin/gtkthemes.c
--- a/pidgin/gtkthemes.c	Sun Jun 03 09:18:09 2007 +0000
+++ b/pidgin/gtkthemes.c	Sun Jun 03 09:40:38 2007 +0000
@@ -198,8 +198,10 @@
 	/* Remove all elements whose data is NULL */
 	smiley_themes = g_slist_remove_all(smiley_themes, NULL);
 
-	if (!current_smiley_theme && smiley_themes)
-		current_smiley_theme = ((struct smiley_theme *)(g_slist_last(smiley_themes)->data));
+	if (!current_smiley_theme && smiley_themes) {
+		struct smiley_theme *smile = g_slist_last(smiley_themes)->data;
+		pidgin_themes_load_smiley_theme(smile->path, TRUE);
+	}
 }
 
 void pidgin_themes_load_smiley_theme(const char *file, gboolean load)
@@ -388,8 +390,10 @@
 		g_free(probedirs[l]);
 	}
 
-	if (!current_smiley_theme && smiley_themes)
-		current_smiley_theme = ((struct smiley_theme *)(smiley_themes->data));
+	if (!current_smiley_theme && smiley_themes) {
+		struct smiley_theme *smile = smiley_themes->data;
+		pidgin_themes_load_smiley_theme(smile->path, TRUE);
+	}
 }
 
 GSList *pidgin_themes_get_proto_smileys(const char *id) {
@@ -439,5 +443,4 @@
 		struct smiley_theme *smile = smiley_themes->data;
 		pidgin_themes_load_smiley_theme(smile->path, TRUE);
 	}
-
 }