[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx

[Caolán McNamara]

 vcl/unx/generic/printer/cupsmgr.cxx |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 41e96311290a85f190dc4838de6a9bc24fa96e9a
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 22 10:52:19 2016 +0000

    Resolves: rhbz#1257635 after httpConnectEncrypt use cupsGetDests2
    
    sometimes after calling httpConnectEncrypt + httpClose and then
    calling cupsGetDests we get no printers found. Using
    cupsGetDests2 with the return of httpConnectEncrypt consistently
    provides results.
    
    Change-Id: I7ea5b11fbaabbd7ca73e5c94d0757ebdea8445ad
    (cherry picked from commit 6b86edae5c1eee51ee754b8013d463497bb75f65)
    Reviewed-on: https://gerrit.libreoffice.org/21716
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 20a27c2..8da8031 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -220,10 +220,7 @@ void CUPSManager::runDests()
              ippPort(),
              cupsEncryption())) != NULL )
     {
-        // neat, cups is up, clean up the canary
-        httpClose(p_http);
-
-        int nDests = cupsGetDests( &pDests );
+        int nDests = cupsGetDests2(p_http,  &pDests);
         SAL_INFO("vcl.unx.print", "came out of cupsGetDests");
 
         osl::MutexGuard aGuard( m_aCUPSMutex );
@@ -231,6 +228,8 @@ void CUPSManager::runDests()
         m_pDests = pDests;
         m_bNewDests = true;
         SAL_INFO("vcl.unx.print", "finished cupsGetDests");
+
+        httpClose(p_http);
     }
 }