[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/dcop
From:       Waldo Bastian <bastian () kde ! org>
Date:       2004-07-06 8:40:00
Message-ID: 20040706084000.B8BED1E47 () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

It took a few years but we finally figured the ICE majors out.
Patch by Matthias Ettrich


  M +0 -11     dcopclient.cpp   1.179
  M +3 -56     dcopserver.cpp   1.168


--- kdelibs/dcop/dcopclient.cpp  #1.178:1.179
@@ -705,15 +705,4 @@ bool DCOPClient::attachInternal( bool re
         detach();
 
-    extern int _kde_IceLastMajorOpcode; // from libICE
-    if (_kde_IceLastMajorOpcode < 1 )
-        IceRegisterForProtocolSetup(const_cast<char *>("DUMMY"),
-                                    const_cast<char *>("DUMMY"),
-                                    const_cast<char *>("DUMMY"),
-                                    1, DCOPClientVersions,
-                                    DCOPAuthCount, const_cast<char **>(DCOPAuthNames),
-                                    DCOPClientAuthProcs, 0);
-    if (_kde_IceLastMajorOpcode < 1 )
-        qWarning("DCOPClient Error: incorrect major opcode!");
-
     if ((d->majorOpcode = IceRegisterForProtocolSetup(const_cast<char *>("DCOP"),
                                                       const_cast<char *>(DCOPVendorString),

--- kdelibs/dcop/dcopserver.cpp  #1.167:1.168
@@ -877,32 +877,5 @@ static const IcePaVersionRec DCOPServerV
 };
 
-static const IcePoVersionRec DUMMYVersions[] = {
-    { DCOPVersionMajor, DCOPVersionMinor, 0 }
-};
-
-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 +883,4 @@ static Status DCOPServerProtocolSetupPro
                                             char **/*failureReasonRet*/)
 {
-    DCOPServerConn serverConn;
-
     /*
      * vendor/release are undefined for ProtocolSetup in DCOP
@@ -921,20 +892,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);
 }
 
@@ -960,15 +918,4 @@ DCOPServer::DCOPServer(bool _suicide)
     dcopSignals = new DCOPSignals;
 
-    extern int _kde_IceLastMajorOpcode; // from libICE
-    if (_kde_IceLastMajorOpcode < 1 )
-        IceRegisterForProtocolSetup(const_cast<char *>("DUMMY"),
-                                    const_cast<char *>("DUMMY"),
-                                    const_cast<char *>("DUMMY"),
-                                    1, const_cast<IcePoVersionRec *>(DUMMYVersions),
-                                    DCOPAuthCount, const_cast<char **>(DCOPAuthNames),
-                                    DCOPClientAuthProcs, 0);
-    if (_kde_IceLastMajorOpcode < 1 )
-        qWarning("DCOPServer Error: incorrect major opcode!");
-
     the_server = this;
     if (( majorOpcode = IceRegisterForProtocolReply (const_cast<char *>("DCOP"),


[prev in list] [next in list] [prev in thread] [next in thread]