SOURCES: kde4-kdenetwork-freenx.patch - 4.1.64

[wolf]

Author: wolf                         Date: Sun Aug 31 14:29:28 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 4.1.64

---- Files affected:
SOURCES:
   kde4-kdenetwork-freenx.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/kde4-kdenetwork-freenx.patch
diff -u SOURCES/kde4-kdenetwork-freenx.patch:1.1 SOURCES/kde4-kdenetwork-freenx.patch:1.2
--- SOURCES/kde4-kdenetwork-freenx.patch:1.1	Sun Aug 10 19:36:40 2008
+++ SOURCES/kde4-kdenetwork-freenx.patch	Sun Aug 31 16:29:23 2008
@@ -1,23 +1,28 @@
 diff -Nru kdenetwork-4.1.61/krdc/CMakeLists.txt kdenetwork-4.1.61.new/krdc/CMakeLists.txt
---- kdenetwork-4.1.61/krdc/CMakeLists.txt	2008-08-07 17:22:17.000000000 +0200
-+++ kdenetwork-4.1.61.new/krdc/CMakeLists.txt	2008-08-09 23:28:16.023378750 +0200
+--- kdenetwork-4.1.61/krdc/CMakeLists.txt     2008-08-07 17:22:17.000000000 +0200
++++ kdenetwork-4.1.61.new/krdc/CMakeLists.txt 2008-08-09 23:28:16.023378750 +0200
 @@ -112,6 +112,6 @@
  install(FILES pointcursor.png pointcursormask.png DESTINATION ${DATA_INSTALL_DIR}/krdc/pics)
  
  if(LIBNXCL_FOUND)
 -   install(FILES nx/default.dsa.key DESTINATION ${DATA_INSTALL_DIR}/krdc)
-+	#install(FILES nx/default.dsa.key DESTINATION ${DATA_INSTALL_DIR}/krdc)
++   #install(FILES nx/default.dsa.key DESTINATION ${DATA_INSTALL_DIR}/krdc)
  endif(LIBNXCL_FOUND)
  
-diff -Nru kdenetwork-4.1.61/krdc/nx/nxclientthread.cpp kdenetwork-4.1.61.new/krdc/nx/nxclientthread.cpp
---- kdenetwork-4.1.61/krdc/nx/nxclientthread.cpp	2008-08-07 17:22:17.000000000 +0200
-+++ kdenetwork-4.1.61.new/krdc/nx/nxclientthread.cpp	2008-08-09 23:09:46.378030250 +0200
-@@ -170,7 +170,7 @@
+diff -ruN kdenetwork-4.1.64./krdc/nx/nxclientthread.cpp kdenetwork-4.1.64/krdc/nx/nxclientthread.cpp
+--- kdenetwork-4.1.64./krdc/nx/nxclientthread.cpp	2008-08-31 15:43:51.000000000 +0200
++++ kdenetwork-4.1.64/krdc/nx/nxclientthread.cpp	2008-08-31 15:48:51.858519360 +0200
+@@ -187,13 +187,6 @@
+             p->probeProcess();
          }
  
- 	if (!this->m_xid) {
--	    this->m_xid = m_nxClient.getXID();
-+	    //this->m_xid = m_nxClient.getXID();
- 
- 	    if(this->m_xid) 
- 	        emit hasXid(this->m_xid);
+-	if (!this->m_xid) {
+-	    this->m_xid = m_client.getXID();
+-
+-	    if (this->m_xid) 
+-	        emit hasXid(this->m_xid);
+-        }
+-
+         usleep (1000);
+     }
+ }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdenetwork-freenx.patch?r1=1.1&r2=1.2&f=u