libpurple/conversationtypes.c

changeset 36109
2e4dd08b0131
parent 36108
69b4fce85ffa
child 36113
4c9faa80e58b
--- a/libpurple/conversationtypes.c	Thu Jun 12 18:45:07 2014 +0200
+++ b/libpurple/conversationtypes.c	Thu Jun 12 19:03:54 2014 +0200
@@ -55,8 +55,6 @@
 	char *nick;         /* Your nick in this chat.                   */
 	gboolean left;      /* We left the chat and kept the window open */
 	GHashTable *users;  /* Hash table of the users in the room.      */
-
-	gboolean is_finalizing;    /* The object is being destroyed. */
 };
 
 /* Chat Property enums */
@@ -1291,7 +1289,7 @@
 
 	priv->left = TRUE;
 
-	if (!priv->is_finalizing)
+	if (!g_object_get_data(G_OBJECT(chat), "is-finalizing"))
 		g_object_notify_by_pspec(G_OBJECT(chat), chat_properties[CHAT_PROP_LEFT]);
 
 	purple_conversation_update(PURPLE_CONVERSATION(chat), PURPLE_CONVERSATION_UPDATE_CHATLEFT);
@@ -1467,8 +1465,6 @@
 	PurpleConnection *gc = purple_conversation_get_connection(PURPLE_CONVERSATION(chat));
 	PurpleChatConversationPrivate *priv = PURPLE_CHAT_CONVERSATION_GET_PRIVATE(chat);
 
-	priv->is_finalizing = TRUE;
-
 	if (gc != NULL)
 	{
 		/* Still connected */

mercurial