[Libreoffice-commits] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                         |    2 -
 patches/dev300/gnome-vfs-authentication.diff |   32 ---------------------------
 2 files changed, 34 deletions(-)

New commits:
commit d303fb924a9eb93ae5315058dd50dd16f78b4226
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Oct 11 17:07:07 2010 +0300

    Merge gnome-vfs-authentication.diff into repo

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ee6b12a..f66f4e5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -433,8 +433,6 @@ gnome-vfs-locking-config_office.diff, i#91151, jholesov
 
 # FIXME dev300-m77 gnome-vfs-locking-ucb.diff, i#91151, jholesov # FIXME depends on webdav-locking.diff
 
-gnome-vfs-authentication.diff, bnc#465102, tml
-
 # Move gnome-vfs out of the startup sequence, load it only when needed
 # (up-stream does not like it, because it adds dependency to VCL in URE)
 # FIXME dev300-m77 gnome-vfs-late-init.diff, i#84137, jholesov # FIXME careful, double check that we haven't lost anything
diff --git a/patches/dev300/gnome-vfs-authentication.diff b/patches/dev300/gnome-vfs-authentication.diff
deleted file mode 100644
index 644729e..0000000
--- a/patches/dev300/gnome-vfs-authentication.diff
+++ /dev/null
@@ -1,32 +0,0 @@
----
- ucb/source/ucp/gvfs/gvfs_content.cxx |   14 +++++++++++---
- 1 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git ucb/source/ucp/gvfs/gvfs_content.cxx ucb/source/ucp/gvfs/gvfs_content.cxx
-index 121c693..9f7dccd 100644
---- ucb/source/ucp/gvfs/gvfs_content.cxx
-+++ ucb/source/ucp/gvfs/gvfs_content.cxx
-@@ -1645,9 +1645,17 @@ extern "C" {
-                     ucbhelper::InteractionSupplyAuthentication > & xSupp
-                     = xRequest->getAuthenticationSupplier();
- 
--                aUserName = xSupp->getUserName();
--                aDomain   = xSupp->getRealm();
--                aPassword = xSupp->getPassword();
-+        ::rtl::OUString aNewDomain, aNewUserName, aNewPassword;
-+
-+                aNewUserName = xSupp->getUserName();
-+        if (aNewUserName.getLength())
-+            aUserName = aNewUserName;
-+                aNewDomain   = xSupp->getRealm();
-+        if (aNewDomain.getLength())
-+            aDomain = aNewDomain;
-+                aNewPassword = xSupp->getPassword();
-+        if (aNewPassword.getLength())
-+            aPassword = aNewPassword;
- 
-                 {
-                     osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
--- 
-1.7.0.1
-