rpms/openoffice.org/devel openoffice.org-1.9.121.rh127576.gnomeprintui.patch, 1.13, 1.14
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 11 16:50:33 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19435
Modified Files:
openoffice.org-1.9.121.rh127576.gnomeprintui.patch
Log Message:
that's just not going to fly, make it safe
openoffice.org-1.9.121.rh127576.gnomeprintui.patch:
configuration/ppds/SGENPRT.PS | 0
configuration/psprint.conf | 0
inc/jobset.hxx | 0
inc/print.hxx | 0
psprint/source/printer/cupsmgr.cxx | 19
psprint/source/printer/makefile.mk | 2
psprint/util/makefile.mk | 4
psprint_config/configuration/ppds/SGENPRT.PS | 3
psprint_config/configuration/psprint.conf | 2
source/dialogs/makefile.mk | 0
source/dialogs/printdlg.cxx | 0
source/gdi/jobset.cxx | 0
source/printer/cupsmgr.cxx | 0
svtools/source/dialogs/makefile.mk | 4
svtools/source/dialogs/printdlg.cxx | 525 ++++++++++++++++++++++++++-
svtools/util/makefile.mk | 8
util/makefile.mk | 0
vcl/inc/jobset.hxx | 1
vcl/inc/print.hxx | 1
vcl/source/gdi/jobset.cxx | 194 +++++++++
20 files changed, 758 insertions(+), 5 deletions(-)
Index: openoffice.org-1.9.121.rh127576.gnomeprintui.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.121.rh127576.gnomeprintui.patch,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openoffice.org-1.9.121.rh127576.gnomeprintui.patch 11 Apr 2006 16:11:19 -0000 1.13
+++ openoffice.org-1.9.121.rh127576.gnomeprintui.patch 11 Apr 2006 16:50:29 -0000 1.14
@@ -5,16 +5,32 @@
diff -u -p -u -r1.12 cupsmgr.cxx
--- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx 6 Jun 2005 16:07:42 -0000 1.12
+++ openoffice.org/psprint/source/printer/cupsmgr.cxx 25 Jul 2005 15:02:37 -0000
-@@ -406,6 +406,9 @@
+@@ -52,6 +52,16 @@
- void CUPSManager::runDests()
- {
-+ if( m_nDests && m_pDests )
-+ m_pCUPSWrapper->cupsFreeDests( m_nDests, (cups_dest_t*)m_pDests );
+ #include <algorithm>
+
++#define WE_ARE_LIBGNOMEPRINT_INTERNALS
++#include <libgnomeprint/private/gpa-utils.h>
++#include <libgnomeprint/gnome-print-config.h>
++#include <libgnomeprint/gnome-print.h>
++#include <libgnomeprint/private/gpa-printer.h>
++#include <libgnomeprint/private/gpa-key.h>
++#include <libgnomeprint/private/gpa-node.h>
++#include <libgnomeprint/private/gpa-state.h>
++#include <libgnomeprint/private/gpa-root.h>
+
+ namespace psp
+ {
+ class CUPSWrapper
+@@ -409,6 +419,8 @@
#if OSL_DEBUG_LEVEL > 1
fprintf( stderr, "starting cupsGetDests\n" );
#endif
++ if (!gpa_initialized())
++ gpa_init();
+ int nDests = 0;
+ cups_dest_t* pDests = NULL;
+ nDests = m_pCUPSWrapper->cupsGetDests( &pDests );
@@ -475,9 +487,10 @@ void CUPSManager::initialize()
// clear old stuff
@@ -38,16 +54,6 @@
}
#ifdef ENABLE_CUPS
-@@ -867,6 +870,9 @@
-
- if( bChanged )
-+ {
-+ if (!m_aDestThread) m_aDestThread = osl_createThread( runDestThread, this );
- initialize();
-+ }
-
- return bChanged;
- }
Index: inc/print.hxx
===================================================================
RCS file: /cvs/gsl/vcl/inc/print.hxx,v
@@ -554,6 +560,7 @@
+#if 1
+ static GPAList *pKnownPrinters;
++ gulong id = 0;
+ if (!pKnownPrinters)
+ {
+ if (!gpa_initialized())
@@ -746,8 +753,6 @@
+ OUString sOldPrinterName(pPrinter->GetName());
+ if (sNewPrinterName != sOldPrinterName)
+ {
-+ psp::PrinterInfoManager& rMgr = psp::PrinterInfoManager::get();
-+ rMgr.checkPrintersChanged();
+ USHORT nCount = Printer::GetQueueCount();
+ USHORT i = 0;
+ for (i = 0; i < nCount; ++i)
@@ -817,6 +822,7 @@
+ }
+
+ gtk_widget_destroy( pDialog );
++ if (id) g_signal_handler_disconnect (GPA_NODE(pKnownPrinters), id);
+ g_object_unref (pConfig);
+ g_object_unref (pJob);
+
@@ -947,3 +953,23 @@
*% --- For None Color or old PostScript(R) printers use following lines ---
*% *ColorDevice: False
+--- openoffice.org.orig/psprint/util/makefile.mk 2006-04-10 16:10:36.000000000 +0100
++++ openoffice.org/psprint/util/makefile.mk 2006-04-11 17:31:45.000000000 +0100
+@@ -89,5 +89,9 @@
+
+ # --- Targets ------------------------------------------------------------
+
++PKGCONFIG_MODULES=libgnomeprint-2.2
++.INCLUDE: pkg_config.mk
++
++SHL1STDLIBS+=$(PKGCONFIG_LIBS)
+
+ .INCLUDE : target.mk
+--- openoffice.org.orig/psprint/source/printer/makefile.mk 2006-04-10 16:10:35.000000000 +0100
++++ openoffice.org/psprint/source/printer/makefile.mk 2006-04-11 17:30:25.000000000 +0100
+@@ -75,3 +75,5 @@
+
+ $(SLO)$/cupsmgr.obj : $(INCCOM)$/rtsname.hxx
+
++PKGCONFIG_MODULES=libgnomeprint-2.2
++.INCLUDE: pkg_config.mk
More information about the fedora-cvs-commits
mailing list