# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1265530931 0
# Node ID b066ad9bbcc3262aa3682e9dcdbae2752bbc0cb7
# Parent  b1df98334930d9a6fb21d1bf729c49c63fbeadc3
Don't try to save the edit dialog pointer to a NULL PurpleSmiley (aka, when
adding a new one).

diff -r b1df98334930 -r b066ad9bbcc3 pidgin/gtksmiley.c
--- a/pidgin/gtksmiley.c	Sun Feb 07 08:20:40 2010 +0000
+++ b/pidgin/gtksmiley.c	Sun Feb 07 08:22:11 2010 +0000
@@ -74,7 +74,8 @@
 static void
 pidgin_smiley_destroy(PidginSmiley *smiley)
 {
-	g_object_set_data(G_OBJECT(smiley->smiley), "edit-dialog", NULL);
+	if (smiley->smiley)
+		g_object_set_data(G_OBJECT(smiley->smiley), "edit-dialog", NULL);
 	gtk_widget_destroy(smiley->parent);
 	g_free(smiley->filename);
 	if (smiley->custom_pixbuf)
@@ -403,7 +404,8 @@
 			smiley ? GTK_STOCK_SAVE : GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT,
 			NULL);
 	s->parent = window;
-	g_object_set_data(G_OBJECT(smiley), "edit-dialog", window);
+	if (smiley)
+		g_object_set_data(G_OBJECT(smiley), "edit-dialog", window);
 
 	gtk_container_set_border_width(GTK_CONTAINER(window), PIDGIN_HIG_BORDER);