summaryrefslogtreecommitdiff
path: root/vcl/unx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-01-06 21:09:13 +0100
committerMichael Stahl <mstahl@redhat.com>2012-01-06 21:09:13 +0100
commit23dd856d3c70a63dd47ae2a09a75833267296432 (patch)
tree3ed426d983d5a46cc48dc1ee873ac5627b867f05 /vcl/unx
parent5106b38a9cc64677b3fa4a0aea7450560775e78e (diff)
parent7e5b321535977ccddc6703c0ad4e5d25af797654 (diff)
Merge branch 'feature/gbuild_extensions'
Conflicts: extensions/source/ole/servreg.cxx extensions/source/plugin/util/makefile.mk postprocess/packcomponents/makefile.mk postprocess/prj/build.lst tail_build/prj/build.lst
Diffstat (limited to 'vcl/unx')
-rw-r--r--vcl/unx/generic/printer/cupsmgr.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 381478deecc7..85c2e74b00b3 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -481,7 +481,7 @@ void CUPSManager::runDests()
// all* first
http_t* p_http;
if( (p_http=m_pCUPSWrapper->httpConnectEncrypt(
- m_pCUPSWrapper->cupsServer(),
+ m_pCUPSWrapper->cupsServer(),
m_pCUPSWrapper->ippPort(),
m_pCUPSWrapper->cupsEncryption())) != NULL )
{