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

List:       kde-commits
Subject:    playground/pim/kmobiletools/mobile-kioslaves/obex
From:       Marcin Przylucki <mpibox () gmail ! com>
Date:       2006-08-31 22:28:12
Message-ID: 1157063292.086408.6452.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 579363 by przylucki:

Changed a name



 M  +5 -5      Makefile.am  
 M  +15 -15    kio_obexprotocol.cpp   [UTF-8 ENCODING PROBLEMS]
 M  +3 -3      obex.protocol  
 A             obex2.protocol  


--- trunk/playground/pim/kmobiletools/mobile-kioslaves/obex/Makefile.am \
#579362:579363 @@ -4,14 +4,14 @@
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
 
-kde_module_LTLIBRARIES = kio_obex.la
+kde_module_LTLIBRARIES = kio_obex2.la
 
-kio_obex_la_SOURCES = kio_obexprotocol.cpp obeximpl.cpp obexwrapper.cpp 
+kio_obex2_la_SOURCES = kio_obexprotocol.cpp obeximpl.cpp obexwrapper.cpp 
 ##deviceIFace.stub
-kio_obex_la_LIBADD = -lkio -lbfb -lmulticobex -lbluetooth -lopenobex -lobexftp 
-kio_obex_la_LDFLAGS = -module -no-undefined -avoid-version $(all_libraries) \
$(KDE_PLUGIN) +kio_obex2_la_LIBADD = -lkio -lbfb -lmulticobex -lbluetooth -lopenobex \
-lobexftp  +kio_obex2_la_LDFLAGS = -module -no-undefined -avoid-version \
$(all_libraries) $(KDE_PLUGIN)  
-protocol_DATA = obex.protocol
+protocol_DATA = obex2.protocol
 protocoldir = $(kde_servicesdir)
 
 ##deviceIFace_DIR=$(top_srcdir)/kmobiletools/kmobiletools/libkmobiletools
--- trunk/playground/pim/kmobiletools/mobile-kioslaves/obex/kio_obexprotocol.cpp \
#579362:579363 @@ -36,7 +36,7 @@
 #include <netinet/in.h>
 #include <netdb.h>
 
-#include <kapplication.h>
+#include <kapplication.h>die Möglichkeit, Waldpilze zu exportieren. Sol
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kinstance.h>
@@ -53,7 +53,7 @@
 
 
 kio_obexProtocol::kio_obexProtocol(const QCString &pool_socket, const QCString \
                &app_socket)
-    : SlaveBase("kio_obex", pool_socket, app_socket)
+    : SlaveBase("kio_obex2", pool_socket, app_socket)
 {
     kdDebug() << "kio_obexProtocol::kio_obexProtocol()\n" << endl;
 
@@ -79,12 +79,12 @@
      * user = the transport, i.e. bt or bluetooth, or irda, usb, and so on...
     */
     OBEXImpl::transport transport=OBEXImpl::null;
-    if(user.contains( "bt") || user.contains( "bluetooth") ) \
                transport=OBEXImpl::Bluetooth;
-    if(user.contains( "irda") ) transport=OBEXImpl::IrDA;
-    if(user.contains( "inet") ) transport=OBEXImpl::Inet;
-    if(user.contains( "usb") ) transport=OBEXImpl::USB;
-    if(user.contains( "fd") ) transport=OBEXImpl::FD;
-    if(user.contains( "custom") ) transport=OBEXImpl::Custom;
+    if(host.contains( "bt") || user.contains( "bluetooth") ) \
transport=OBEXImpl::Bluetooth; +    if(host.contains( "irda") ) \
transport=OBEXImpl::IrDA; +    if(host.contains( "inet") ) transport=OBEXImpl::Inet;
+    if(host.contains( "usb") ) transport=OBEXImpl::USB;
+    if(host.contains( "fd") ) transport=OBEXImpl::FD;
+    if(host.contains( "custom") ) transport=OBEXImpl::Custom;
     if(transport==OBEXImpl::null) transport=OBEXImpl::Bluetooth; // backward \
compatibility with the kdebluetooth obex kioslave  m_impl.setHostConfig(bhost, port, \
transport);  }
@@ -127,7 +127,7 @@
     listEntry(entry, true);
 
     finished();
-    disconnectTimeout();
+    //disconnectTimeout();
 }
 
 
@@ -156,7 +156,7 @@
     statEntry( entry );
 
     finished();
-    disconnectTimeout();
+    //disconnectTimeout();
 }
 
 
@@ -197,7 +197,7 @@
     m_data.resetRawData( buffer, size );
     data(QByteArray());
     finished();
-    disconnectTimeout();
+    //disconnectTimeout();
 }
 
 
@@ -220,7 +220,7 @@
     kdDebug() << "SendData result code: " << ret << endl;
 
     finished();
-    disconnectTimeout();
+    //disconnectTimeout();
 }
 
 
@@ -231,7 +231,7 @@
 {
     kdDebug() << "Deleting " << url << "; is file? " << isfile << "; result: " << \
m_impl.wrapper()->deleteFile( url.path() ) << endl;  finished();
-    disconnectTimeout();
+    //disconnectTimeout();
 }
 
 
@@ -258,7 +258,7 @@
 {
     kdDebug() << "Makeing dir " << url << "; permissions " << permissions << "; \
result: " << m_impl.wrapper()->mkDir( url.path() ) << endl;  finished();
-    disconnectTimeout();
+    //disconnectTimeout();
 }
 
 
@@ -266,7 +266,7 @@
 {
 int kdemain(int argc, char **argv)
 {
-    KInstance instance( "kio_obex" );
+    KInstance instance( "kio_obex2" );
 
     kdDebug(7101) << "*** Starting kio_obex " << endl;
 
--- trunk/playground/pim/kmobiletools/mobile-kioslaves/obex/obex.protocol \
#579362:579363 @@ -1,6 +1,6 @@
 [Protocol]
-exec=kio_obex
-protocol=obex
+exec=kio_obex2
+protocol=obex2
 input=none
 output=filesystem
 listing=Name,Type,Size
@@ -12,7 +12,7 @@
 moving=false
 Icon=kmobiletools
 Class=:internet
-maxInstances=1
+maxInstances=0
 defaultMimetype=application/octet-stream
 determineMimetypeFromExtension=true
 


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