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

List:       kde-commits
Subject:    branches/work/kdelibs4_snapshot/kdecore
From:       David Faure <faure () kde ! org>
Date:       2006-04-12 14:18:51
Message-ID: 1144851531.110378.11809.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 529081 by dfaure:

Fix build on Mac OS X but not using ksocks.h in the kcontrol module
(the problem was kde_socklen_t but Thiago suggested this solution, to avoid using ksocks.h altogether)


 M  +2 -0      branches/work/kdelibs4_snapshot/kdecore/ksocks.cpp  
 M  +2 -5      trunk/KDE/kdebase/konqueror/settings/kio/socks.cpp  
 M  +2 -0      trunk/KDE/kdelibs/kdecore/ksocks.cpp  


--- branches/work/kdelibs4_snapshot/kdecore/ksocks.cpp #529080:529081
@@ -238,6 +238,8 @@
 
 bool KSocks::activated() { return (_me != 0L); }
 
+// Function for the KControl module to test if the socks support works.
+KDECORE_EXPORT bool kdeHasSocks() { return KSocks::self()->hasSocks(); }
 
 KSocks::KSocks(KConfigBase *config) : _socksLib(0L), _st(0L) {
    _hasSocks = false;
--- trunk/KDE/kdebase/konqueror/settings/kio/socks.cpp #529080:529081
@@ -42,7 +42,6 @@
 
 #include "socks.h"
 #include "unistd.h"
-#include <ksocks.h>
 
 #include <kapplication.h>
 #include <klocale.h>
@@ -137,7 +136,8 @@
   save();   // we have to save before we can test!  Perhaps
             // it would be best to warn, though.
 
-  if (KSocks::self()->hasSocks()) {
+  KDECORE_EXPORT bool kdeHasSocks(); // defined in kdecore/ksocks.cpp
+  if (kdeHasSocks()) {
      KMessageBox::information(NULL,
                               i18n("Success: SOCKS was found and initialized."),
                               i18n("SOCKS Support"));
@@ -147,9 +147,6 @@
                                i18n("SOCKS could not be loaded."),
                                i18n("SOCKS Support"));
   }
-
-  KSocks::self()->die();
-
 }
 
 
--- trunk/KDE/kdelibs/kdecore/ksocks.cpp #529080:529081
@@ -238,6 +238,8 @@
 
 bool KSocks::activated() { return (_me != 0L); }
 
+// Function for the KControl module to test if the socks support works.
+KDECORE_EXPORT bool kdeHasSocks() { return KSocks::self()->hasSocks(); }
 
 KSocks::KSocks(KConfigBase *config) : _socksLib(0L), _st(0L) {
    _hasSocks = false;
[prev in list] [next in list] [prev in thread] [next in thread]