diff options
| author | Mike Buland <eichlan@xagasoft.com> | 2006-11-05 05:11:44 +0000 |
|---|---|---|
| committer | Mike Buland <eichlan@xagasoft.com> | 2006-11-05 05:11:44 +0000 |
| commit | 77375a7b64b0e264c7318220a59738e841a1c670 (patch) | |
| tree | 2e073289676aff02a5dcc31909e9cf7b9146d88e | |
| parent | e8ced8e902092d5ea0575a065cada2025506249d (diff) | |
| download | libbu++-77375a7b64b0e264c7318220a59738e841a1c670.tar.gz libbu++-77375a7b64b0e264c7318220a59738e841a1c670.tar.bz2 libbu++-77375a7b64b0e264c7318220a59738e841a1c670.tar.xz libbu++-77375a7b64b0e264c7318220a59738e841a1c670.zip | |
Cleaned up a couple of conflicts.
| -rw-r--r-- | src/connectionmanager.cpp | 1 | ||||
| -rw-r--r-- | src/connectionmonitor.cpp | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/connectionmanager.cpp b/src/connectionmanager.cpp index d806618..e44c5f4 100644 --- a/src/connectionmanager.cpp +++ b/src/connectionmanager.cpp | |||
| @@ -200,6 +200,7 @@ bool ConnectionManager::scanConnections( int nTimeout, bool bForceTimeout ) | |||
| 200 | if( (*i)->hasOutput() ) | 200 | if( (*i)->hasOutput() ) |
| 201 | { | 201 | { |
| 202 | (*i)->writeOutput(); | 202 | (*i)->writeOutput(); |
| 203 | printf("Wrote pending output.\n"); | ||
| 203 | } | 204 | } |
| 204 | if( (*i)->needDisconnect() && !(*i)->hasOutput() ) | 205 | if( (*i)->needDisconnect() && !(*i)->hasOutput() ) |
| 205 | { | 206 | { |
diff --git a/src/connectionmonitor.cpp b/src/connectionmonitor.cpp index 14e46f7..4f90ee6 100644 --- a/src/connectionmonitor.cpp +++ b/src/connectionmonitor.cpp | |||
| @@ -1,6 +1,10 @@ | |||
| 1 | #include "connectionmonitor.h" | 1 | #include "connectionmonitor.h" |
| 2 | 2 | ||
| 3 | ConnectionMonitor::ConnectionMonitor(){ | 3 | ConnectionMonitor::ConnectionMonitor() |
| 4 | { | ||
| 4 | } | 5 | } |
| 5 | ConnectionMonitor::~ConnectionMonitor(){ | 6 | |
| 7 | ConnectionMonitor::~ConnectionMonitor() | ||
| 8 | { | ||
| 6 | } | 9 | } |
| 10 | |||