ooo-build r11791 - in trunk: . patches/src680

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Mon Mar  3 22:28:50 2008
New Revision: 11791
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11791&view=rev

Log:
2008-03-03  Jan Holesovsky  <kendy suse cz>

        * patches/src680/webdav-locking-can-have-username.diff: Pre-fill
          username (and password) in the authentication dialog.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/webdav-locking-can-have-username.diff

Modified: trunk/patches/src680/webdav-locking-can-have-username.diff
==============================================================================
--- trunk/patches/src680/webdav-locking-can-have-username.diff	(original)
+++ trunk/patches/src680/webdav-locking-can-have-username.diff	Mon Mar  3 22:28:50 2008
@@ -46,3 +46,50 @@
            true, true },
          { "", "", 0, false, false, false, false, false, false, false, false },
          { "", "", 0, false, false, false, false, false, false, true, false }
+diff --git ucb/source/ucp/webdav/NeonSession.cxx ucb/source/ucp/webdav/NeonSession.cxx
+index 3f99123..cb5845c 100644
+--- ucb/source/ucp/webdav/NeonSession.cxx
++++ ucb/source/ucp/webdav/NeonSession.cxx
+@@ -365,11 +365,10 @@ extern "C" int NeonSession_NeonAuth( void *       inUserData,
+ 
+         try
+         {
+-            NeonUri uri( theSession->getRequestEnvironment().m_aRequestURI );
+-            rtl::OUString aUserInfo( uri.GetUserInfo() );
++            rtl::OUString aUserInfo( theSession->getUserInfo() );
+             if ( aUserInfo.getLength() )
+             {
+-                sal_Int32 nPos = aUserInfo.indexOf( '@' );
++                sal_Int32 nPos = aUserInfo.indexOf( ':' );
+                 if ( nPos == -1 )
+                 {
+                     theUserName = aUserInfo;
+@@ -648,6 +647,7 @@ NeonSession::NeonSession(
+     m_aScheme    = theUri.GetScheme();
+     m_aHostName  = theUri.GetHost();
+     m_nPort      = theUri.GetPort();
++    m_aUserInfo  = theUri.GetUserInfo();
+ 
+ //   Init();
+ }
+diff --git ucb/source/ucp/webdav/NeonSession.hxx ucb/source/ucp/webdav/NeonSession.hxx
+index 7099da1..5a62a81 100644
+--- ucb/source/ucp/webdav/NeonSession.hxx
++++ ucb/source/ucp/webdav/NeonSession.hxx
+@@ -71,6 +71,7 @@ class NeonSession : public DAVSession
+         rtl::OUString     m_aScheme;
+         rtl::OUString     m_aHostName;
+         rtl::OUString     m_aProxyName;
++        rtl::OUString     m_aUserInfo;
+         sal_Int32         m_nPort;
+         sal_Int32         m_nProxyPort;
+         HttpSession *     m_pHttpSession;
+@@ -105,6 +106,8 @@ class NeonSession : public DAVSession
+         const DAVRequestEnvironment & getRequestEnvironment() const
+         { return m_aEnv; }
+ 
++        const rtl::OUString & getUserInfo() const { return m_aUserInfo; }
++
+         virtual void
+         OPTIONS( const ::rtl::OUString &  inPath,
+                  DAVCapabilities & outCapabilities,