*** kioslave/smb/kio_smb_browse.cpp.old	2009-07-20 03:42:14.000000000 +0900
--- kioslave/smb/kio_smb_browse.cpp	2009-07-15 02:12:19.000000000 +0900
***************
*** 39,44 ****
--- 39,47 ----
  
  #include "kio_smb.h"
  #include "kio_smb_internal.h"
+ #ifndef	ORIGINAL_CODE
+ #include <kremoteencoding.h>
+ #endif
  
  using namespace KIO;
  
***************
*** 330,339 ****
--- 333,350 ----
  
             // Set name
             QString udsName;
+ #ifdef	ORIGINAL_CODE
             QString dirpName = QString::fromUtf8( dirp->name );
+ #else
+            QString dirpName = remoteEncoding()->decode(dirp->name);
+ #endif
             // We cannot trust dirp->commentlen has it might be with or without the NUL character
             // See KDE bug #111430 and Samba bug #3030
+ #ifdef	ORIGINAL_CODE
             QString comment = QString::fromUtf8( dirp->comment );
+ #else
+            QString comment = remoteEncoding()->decode(dirp->comment);
+ #endif
             if ( dirp->smbc_type == SMBC_SERVER || dirp->smbc_type == SMBC_WORKGROUP ) {
                 udsName = dirpName.toLower();
                 udsName[0] = dirpName.at( 0 ).toUpper();
*** kioslave/smb/kio_smb_internal.cpp.old	2008-08-14 19:45:02.000000000 +0900
--- kioslave/smb/kio_smb_internal.cpp	2009-07-21 02:04:01.000000000 +0900
***************
*** 37,42 ****
--- 37,46 ----
  #include <kglobal.h>
  
  
+ #ifndef	ORIGINAL_CODE
+ #include "__localeconverter.h"
+ #endif
+ 
  //===========================================================================
  // SMBUrl Function Implementation
  //===========================================================================
***************
*** 84,90 ****
--- 88,99 ----
      if ( KUrl::url() == "smb:/" )
        m_surl = "smb://";
      else
+ #ifdef	ORIGINAL_CODE
        m_surl = KUrl::url( RemoveTrailingSlash ).toUtf8();
+ #else
+       m_surl = __urlLocaleConverter(KUrl::url( RemoveTrailingSlash ).toUtf8(), 
+  				    URL_CONV_FROMUTF8, "smb:/");
+ #endif 
      
      m_type = SMBURLTYPE_UNKNOWN;
      // update m_type
