diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-09-14 11:31:50 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-09-17 10:46:27 +0100 |
commit | 68ffb332f5717f9ef6af11497372becddaac7ef0 (patch) | |
tree | 0b391b9749805a7a002ecb0b5a522eac20f538de /vcl/inc/cupsmgr.hxx | |
parent | c20ba023c738c0c76a07c94cb43c0a6d06f12374 (diff) |
nothing propagates HAVE_CUPS_H so cups is always disabled
regression from 22f2e5f286d55cd5c1ead07fb82cd78027abf490
so, lets follow the same pattern as else where and fixup
ENABLE_CUPS to be TRUE when enabled and lets just link
against cups and not do the dlopen dance
Change-Id: I3cff1bd98a7474c403d7ff66183e76e26e407de8
Diffstat (limited to 'vcl/inc/cupsmgr.hxx')
-rw-r--r-- | vcl/inc/cupsmgr.hxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx index b76e8ef99289..f3cee199b8c5 100644 --- a/vcl/inc/cupsmgr.hxx +++ b/vcl/inc/cupsmgr.hxx @@ -37,7 +37,6 @@ namespace psp { -class CUPSWrapper; class PPDParser; struct FPtrHash @@ -48,7 +47,6 @@ struct FPtrHash class CUPSManager : public PrinterInfoManager { - CUPSWrapper* m_pCUPSWrapper; boost::unordered_map< FILE*, rtl::OString, FPtrHash > m_aSpoolFiles; int m_nDests; void* m_pDests; @@ -66,13 +64,17 @@ class CUPSManager : public PrinterInfoManager osl::Mutex m_aCUPSMutex; oslThread m_aDestThread; - CUPSManager( CUPSWrapper* ); + osl::Mutex m_aGetPPDMutex; + bool m_bPPDThreadRunning; + + CUPSManager(); virtual ~CUPSManager(); virtual void initialize(); void getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner, int& rNumOptions, void** rOptions ) const; void runDests(); + OString threadedCupsGetPPD(const char* pPrinter); public: // public for stub static void runDestThread(void* pMgr); |