Author: mrowe
Date: 2004-07-31 02:27:24 +1200 (Sat, 31 Jul 2004)
New Revision: 209
Modified:
branches/libmsn-3.1.x/msn/notificationserver.cpp
Log:
Merge [207] to 3.1.x branch.
Modified: branches/libmsn-3.1.x/msn/notificationserver.cpp
===================================================================
--- branches/libmsn-3.1.x/msn/notificationserver.cpp 2004-07-30 14:26:02 UTC
(rev 208)
+++ branches/libmsn-3.1.x/msn/notificationserver.cpp 2004-07-30 14:27:24 UTC
(rev 209)
@@ -509,7 +509,6 @@
void NotificationServerConnection::disconnect()
{
assert(connectionStatus != NS_DISCONNECTED);
- ext::closingConnection(this);
std::list<SwitchboardServerConnection *> list =
_switchboardConnections;
std::list<SwitchboardServerConnection *>::iterator i = list.begin();
@@ -517,8 +516,9 @@
{
delete *i;
}
+ connectionStatus = NS_DISCONNECTED;
+ ext::closingConnection(this);
Connection::disconnect();
- connectionStatus = NS_DISCONNECTED;
}
void NotificationServerConnection::disconnectForTransfer()
@@ -635,6 +635,7 @@
info = NULL;
this->removeCallback(trid);
ext::gotBuddyListInfo(this, NULL);
+ connectionStatus = NS_CONNECTED;
return;
}
else
-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com
|
