[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdelibs/dcop
From: Matthias Ettrich <ettrich () troll ! no>
Date: 2004-07-10 20:46:40
Message-ID: 20040710204640.06D3D16B1B () office ! kde ! org
[Download RAW message or body]
CVS commit by ettrich:
recommit the part of the previous patch that did not change the dummy major
opcode (that's the part that fixes a mem leak)
M +3 -41 dcopserver.cpp 1.170
--- kdelibs/dcop/dcopserver.cpp #1.169:1.170
@@ -881,28 +881,5 @@ static const IcePoVersionRec DUMMYVersio
};
-typedef struct DCOPServerConnStruct *DCOPServerConn;
-
-struct DCOPServerConnStruct
-{
- /*
- * We use ICE to esablish a connection with the client.
- */
-
- IceConn iceConn;
-
-
- /*
- * Major and minor versions of the XSMP.
- */
-
- int proto_major_version;
- int proto_minor_version;
-
-
- QCString clientId;
-};
-
-
-static Status DCOPServerProtocolSetupProc ( IceConn iceConn,
+static Status DCOPServerProtocolSetupProc ( IceConn /*iceConn*/,
int majorVersion, int minorVersion,
char* vendor, char* release,
@@ -910,6 +887,4 @@ static Status DCOPServerProtocolSetupPro
char **/*failureReasonRet*/)
{
- DCOPServerConn serverConn;
-
/*
* vendor/release are undefined for ProtocolSetup in DCOP
@@ -921,20 +896,7 @@ static Status DCOPServerProtocolSetupPro
free (release);
+ *clientDataRet = 0;
- /*
- * Allocate new DCOPServerConn.
- */
-
- serverConn = new DCOPServerConnStruct;
-
- serverConn->iceConn = iceConn;
- serverConn->proto_major_version = majorVersion;
- serverConn->proto_minor_version = minorVersion;
- //serverConn->clientId already initialized
-
- *clientDataRet = static_cast<IcePointer>(serverConn);
-
-
- return 1;
+ return (majorVersion == DCOPVersionMajor && minorVersion == DCOPVersionMinor);
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic