[svn] gpgme - r1276 - trunk/gpgme

[svn author marcus]

Author: marcus
Date: 2007-11-12 12:34:13 +0100 (Mon, 12 Nov 2007)
New Revision: 1276

Modified:
   trunk/gpgme/ChangeLog
   trunk/gpgme/kdpipeiodevice.cpp
Log:
2007-11-12  Marcus Brinkmann  <marcus at g10code.de>

	* kdpipeiodevice.cpp: New version from Frank Osterfeld.


Modified: trunk/gpgme/ChangeLog
===================================================================
--- trunk/gpgme/ChangeLog	2007-10-11 13:03:59 UTC (rev 1275)
+++ trunk/gpgme/ChangeLog	2007-11-12 11:34:13 UTC (rev 1276)
@@ -1,3 +1,7 @@
+2007-11-12  Marcus Brinkmann  <marcus at g10code.de>
+
+	* kdpipeiodevice.cpp: New version from Frank Osterfeld.
+
 2007-10-11  Marcus Brinkmann  <marcus at g10code.de>
 
 	* kdpipeiodevice.cpp: New version from Frank Osterfeld.

Modified: trunk/gpgme/kdpipeiodevice.cpp
===================================================================
--- trunk/gpgme/kdpipeiodevice.cpp	2007-10-11 13:03:59 UTC (rev 1275)
+++ trunk/gpgme/kdpipeiodevice.cpp	2007-11-12 11:34:13 UTC (rev 1276)
@@ -276,7 +276,7 @@
 bool KDPipeIODevice::open( Qt::HANDLE h, OpenMode mode ) { KDAB_CHECK_THIS;
 
 #ifdef Q_OS_WIN32
-    return d->doOpen( 0, h, mode );
+    return d->doOpen( -1, h, mode );
 #else
     Q_UNUSED( h );
     Q_UNUSED( mode );
@@ -341,12 +341,15 @@
 
 bool KDPipeIODevice::Private::doOpen( int fd_, Qt::HANDLE handle_, OpenMode mode_ ) {
 
-    if ( q->isOpen() || fd_ < 0 )
+    if ( q->isOpen() )
 	return false;
 
 #ifdef Q_OS_WIN32
     if ( !handle_ )
 	return false;
+#else
+    if ( fd_ < 0 )
+	return false;
 #endif
 
     if ( !(mode_ & ReadWrite) )
@@ -662,8 +665,10 @@
     waitAndDelete( d->reader );
 #undef waitAndDelete
 #ifdef Q_OS_WIN32
-    qDebug( "Closing handle" );
-    CloseHandle( d->handle );
+    if ( d->fd != -1 )
+        _close( d->fd );
+    else
+        CloseHandle( d->handle );
 #else
     ::close( d->fd );
 #endif