@@ -1233,7 +1233,7 @@ rng_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) /* msn_switchboard_add_user(swboard, cmd->params[4]); */ if (!msn_switchboard_connect(swboard, host, port)) - msn_switchboard_destroy(swboard); + msn_switchboard_close(swboard); g_free(host); } notification.c @@ -129,7 +129,7 @@ close_cb (PecanNode *conn, pecan_error ("connection error: (SB)"); } - msn_switchboard_destroy (swboard); + msn_switchboard_close (swboard); } /************************************************************************** @@ -279,12 +279,6 @@ msn_switchboard_unref (MsnSwitchBoard *swboard) } void -msn_switchboard_destroy (MsnSwitchBoard *swboard) -{ - msn_switchboard_unref (swboard); -} - -void msn_switchboard_set_auth_key(MsnSwitchBoard *swboard, const char *key) { g_return_if_fail(swboard); @@ -826,7 +820,7 @@ bye_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) if (swboard->conv == NULL) { /* This is a helper switchboard */ - msn_switchboard_destroy(swboard); + msn_switchboard_close(swboard); } else if ((swboard->current_users > 1) || (purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT)) @@ -835,12 +829,12 @@ bye_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) purple_conv_chat_remove_user(PURPLE_CONV_CHAT(swboard->conv), user, NULL); swboard->current_users--; if (swboard->current_users == 0) - msn_switchboard_destroy(swboard); + msn_switchboard_close(swboard); } else { /* This is a switchboard used for a im session */ - msn_switchboard_destroy(swboard); + msn_switchboard_close(swboard); } } @@ -885,8 +879,11 @@ joi_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd) if (!session->http_method) send_clientcaps(swboard); - if (swboard->closed) + if (swboard->to_close) + { msn_switchboard_close(swboard); + msn_switchboard_unref(swboard); + } } static void @@ -1280,7 +1277,7 @@ got_swboard(MsnCmdProc *cmdproc, MsnCommand *cmd) msn_parse_socket(cmd->params[2], &host, &port); if (!msn_switchboard_connect(swboard, host, port)) - msn_switchboard_destroy(swboard); + msn_switchboard_close(swboard); g_free(host); } @@ -1331,11 +1328,23 @@ msn_switchboard_close(MsnSwitchBoard *swboard) { g_return_if_fail(swboard); + if (swboard->closed) + return; + + swboard->closed = TRUE; swboard->conv = NULL; + /* Don't let a write error destroy the switchboard before we do. */ + msn_switchboard_ref(swboard); + + if (swboard->chat_id) + g_hash_table_remove (swboard->session->chats, GINT_TO_POINTER (swboard->chat_id)); + else + g_hash_table_remove (swboard->session->conversations, swboard->im_user); + if (swboard->error != MSN_SB_ERROR_NONE) { - msn_switchboard_destroy(swboard); + msn_switchboard_unref(swboard); } else if (g_queue_is_empty(swboard->msg_queue) || !swboard->session->connected) @@ -1343,16 +1352,15 @@ msn_switchboard_close(MsnSwitchBoard *swboard) MsnCmdProc *cmdproc; cmdproc = swboard->cmdproc; - /* Don't let a write error destroy the switchboard before we do. */ - msn_switchboard_ref(swboard); msn_cmdproc_send_quick(cmdproc, "OUT", NULL, NULL); - msn_switchboard_destroy(swboard); msn_switchboard_unref(swboard); } else { - swboard->closed = TRUE; + /* Messages are still pending */ + /* Destroy the switchboard when they are sent. */ + swboard->to_close = TRUE; } } switchboard.c @@ -87,8 +87,9 @@ struct MsnSwitchBoard switchboard. */ gboolean ready; /**< A flag that states if this switchboard is ready to be used. */ - gboolean closed; /**< A flag that states if the switchboard has - been closed by the user. */ + gboolean closed; /**< The switchboard has been closed. */ + gboolean to_close; /**< The switchboard should be closed after sending the + queued messages. */ int current_users; int total_users; switchboard.h 55c931a2ef733aed4ce264d382781b341e326304 Felipe Contreras felipe.contreras@gmail.com http://github.com/felipec/msn-pecan/commit/7a54d5b60806a9d42500987f345ba8760788edd7 7a54d5b60806a9d42500987f345ba8760788edd7 2008-06-29T13:13:59-07:00 2008-06-24T22:45:58-07:00 Switchboard close fixes. b2aa19b5d3425b5531f152b4e7d2d5b0cde76fff Felipe Contreras felipe.contreras@gmail.com