pidgin: f20957d5: Don't try to save the edit dialog pointe...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: f20957d56134588805ec2fad2d6dbc5f0bb79075
Ancestor: ca0e34111f35e3a4ede57e1fc43a0daec1693d13
Author: qulogic at pidgin.im
Date: 2010-02-07T08:22:11
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f20957d56134588805ec2fad2d6dbc5f0bb79075

Modified files:
        pidgin/gtksmiley.c

ChangeLog: 

Don't try to save the edit dialog pointer to a NULL PurpleSmiley (aka, when
adding a new one).

-------------- next part --------------
============================================================
--- pidgin/gtksmiley.c	7b5e77b9228944de6eec5bf7a7ce38b500ec3e55
+++ pidgin/gtksmiley.c	d0ad1d27dfcee20a6fd54a29c74d9b73136be3de
@@ -74,7 +74,8 @@ pidgin_smiley_destroy(PidginSmiley *smil
 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 @@ pidgin_smiley_edit(GtkWidget *widget, Pu
 			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);