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

List:       kde-commits
Subject:    branches/work/kde4/kdelibs/dcop
From:       Mickael Marchand <marchand () kde ! org>
Date:       2005-06-13 19:51:30
Message-ID: 1118692290.016954.23927.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 425077 by marchand:

you missed that one Stephan ;)



 M  +2 -37     dcopserver.cpp  


--- branches/work/kde4/kdelibs/dcop/dcopserver.cpp #425076:425077
@@ -551,14 +551,10 @@
     char tempFile[PATH_MAX];
     char *ptr;
 
-<<<<<<< .working
-    qsnprintf (tempFile, PATH_MAX, "%s/%sXXXXXX", path, prefix);
-=======
 #ifdef Q_OS_WIN
     snprintf (tempFile, PATH_MAX, "%s\\%sXXXXXX", path, prefix);
 #else
     snprintf (tempFile, PATH_MAX, "%s/%sXXXXXX", path, prefix);
->>>>>>> .merge-rechts.r424790
 #endif
     ptr = static_cast<char *>(malloc(strlen(tempFile) + 1));
     if (ptr != NULL)
@@ -753,15 +749,9 @@
 //#ifdef DCOP_DEBUG
 if (opcode == DCOPSend)
 {
-<<<<<<< .working
 //   QByteArray obj = readQByteArray(obj);
    //QByteArray fun = readQByteArray(fun);
    qWarning("Sending %d bytes from %s to %s. DCOPSend", length, fromApp.data(), \
                toApp.data());//, fun.data());
-=======
-   QCString obj = readQCString(ds);
-   QCString fun = readQCString(ds);
-   qWarning("Sending %d bytes from %s to %s. DCOPSend %s", length, fromApp.data(), \
                toApp.data(), fun.data());
->>>>>>> .merge-rechts.r424790
 }
 //#endif
 		IceGetHeader( target->iceConn, majorOpcode, opcode,
@@ -785,15 +775,9 @@
 //#ifdef DCOP_DEBUG
 if (opcode == DCOPSend)
 {
-<<<<<<< .working
    //QByteArray obj = readQByteArray(obj);
    //QByteArray fun = readQByteArray(fun);
    qWarning("Sending %d bytes from %s to %s. DCOPSend ", length, fromApp.data(), \
                toApp.data());//, fun.data());
-=======
-   QCString obj = readQCString(ds);
-   QCString fun = readQCString(ds);
-   qWarning("Sending %d bytes from %s to %s. DCOPSend %s", length, fromApp.data(), \
                toApp.data(), fun.data());
->>>>>>> .merge-rechts.r424790
 }
 //#endif
 		// handle a multicast.
@@ -834,15 +818,9 @@
 //#ifdef DCOP_DEBUG
 if (opcode == DCOPCall)
 {
-<<<<<<< .working
    //QByteArray obj = readQByteArray(obj);
    //QByteArray fun = readQByteArray(fun);
    qWarning("Sending %d bytes from %s to %s. DCOPCall ", length, fromApp.data(), \
                toApp.data());//, fun.data());
-=======
-   QCString obj = readQCString(ds);
-   QCString fun = readQCString(ds);
-   qWarning("Sending %d bytes from %s to %s. DCOPCall %s", length, fromApp.data(), \
                toApp.data(), fun.data());
->>>>>>> .merge-rechts.r424790
 }
 //#endif
 		target->waitingForReply.append( iceConn );
@@ -1060,12 +1038,8 @@
 	    }
 	    fprintf(f, "\n%i\n", getpid());
 	    fclose(f);
-<<<<<<< .working
-	    if (QByteArray(getenv("DCOPAUTHORITY")).isEmpty())
-=======
 #ifndef Q_OS_WIN32
-	    if (QCString(getenv("DCOPAUTHORITY")).isEmpty())
->>>>>>> .merge-rechts.r424790
+	    if (QByteArray(getenv("DCOPAUTHORITY")).isEmpty())
 	    {
                 // Create a link named like the old-style (KDE 2.x) naming
                 QByteArray compatName = DCOPClient::dcopServerFileOld();
@@ -1753,12 +1727,8 @@
     // check if we are already running
     if (isRunning(DCOPClient::dcopServerFile()))
        return 0;
-<<<<<<< .working
-    if (QByteArray(getenv("DCOPAUTHORITY")).isEmpty() &&
-=======
 #ifndef Q_OS_WIN32
-    if (QCString(getenv("DCOPAUTHORITY")).isEmpty() &&
->>>>>>> .merge-rechts.r424790
+    if (QByteArray(getenv("DCOPAUTHORITY")).isEmpty() &&
         isRunning(DCOPClient::dcopServerFileOld()))
     {
        // Make symlink for compatibility
@@ -1837,17 +1807,12 @@
     IceSetIOErrorHandler (IoErrorHandler );
     DCOPServer *server = new DCOPServer(suicide); // this sets the_server
 
-<<<<<<< .working
-    QSocketNotifier DEATH(pipeOfDeath[0], QSocketNotifier::Read, 0);
-    server->connect(&DEATH, SIGNAL(activated(int)), SLOT(slotShutdown()));
-=======
 #ifdef Q_OS_WIN
 	SetConsoleCtrlHandler(DCOPServer::dcopServerConsoleProc,TRUE);
 #else
 	QSocketNotifier DEATH(pipeOfDeath[0], QSocketNotifier::Read, 0, 0);
 		server->connect(&DEATH, SIGNAL(activated(int)), SLOT(slotShutdown()));
 #endif
->>>>>>> .merge-rechts.r424790
 
     int ret = a.exec();
     delete server;


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