diff -r b25a7bbe7272 -r c4c7c4852390 pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Mon Mar 17 02:12:31 2008 +0000
+++ b/pidgin/gtkmain.c	Tue Mar 18 00:48:33 2008 +0000
@@ -61,6 +61,7 @@
 #include "gtkroomlist.h"
 #include "gtksavedstatuses.h"
 #include "gtksession.h"
+#include "gtksmiley.h"
 #include "gtksound.h"
 #include "gtkthemes.h"
 #include "gtkutils.h"
@@ -293,6 +294,7 @@
 	pidgin_roomlist_init();
 	pidgin_log_init();
 	pidgin_docklet_init();
+	pidgin_smileys_init();
 }
 
 static GHashTable *ui_info = NULL;
@@ -309,6 +311,7 @@
 	pidgin_plugins_save();
 
 	/* Uninit */
+	pidgin_smileys_uninit();
 	pidgin_conversations_uninit();
 	pidgin_status_uninit();
 	pidgin_docklet_uninit();