change (disabled) font embedding code

* xpdf/GPOutputDev.cc (getFontFaceEmbedded): change (disabled)
font embedding code

* shell/gpdf.c (gw_setup_window): set window title

* xpdf/GNOME_PDF.server.in.in, shell/gpdf.c: s/Gnome/GNOME/ in
strings

* xpdf/page-control.c, xpdf/gpdf-view.cc,
xpdf/gpdf-persist-stream.cc: use our own marshallers

* configure.in, xpdf/Makefile.am, xpdf/gpdf-marshal.list: check
for and use glib-genmarshal

* xpdf/.cvsignore: ignore generated marshallers

* xpdf/Makefile.am: clean up server.in, server files

* Makefile.am, gpdf.mime: remove gpdf.mime, application/pdf is
provided by gnome-vfs.mime

diff --git a/pdf/xpdf/.cvsignore b/pdf/xpdf/.cvsignore
index 1898fa03c99824e0fee8297fd3f70e310e30d635..6ebaacb4f4163e350d3f9f08eee753e5f29befd4 100644 (file)
--- a/pdf/xpdf/.cvsignore
+++ b/pdf/xpdf/.cvsignore
@@ -7,6 +7,8 @@ Makefile.in
 bonobo-application-x-pdf
 gnome-pdf-viewer
 gpdf 
+gpdf-marshal.c
+gpdf-marshal.h
 pdfimages
 pdfinfo
 pdftopbm

diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index cfebfdf04e2d72732e2c9a009f40de0ccdecad86..e37d6f32b1b4fd8e74065d3ae7ed1d83e73196d9 100644 (file)
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -14,6 +14,10 @@ else
 gui = xpdf
 endif
 
+BUILT_SOURCES =                        \
+       gpdf-marshal.c                  \
+       gpdf-marshal.h  
+
 bin_PROGRAMS =         $(gui)
 #      pdftops pdftotext       
 #      pdfinfo pdftopbm        
@@ -118,7 +122,8 @@ gnome_pdf_viewer_SOURCES =          \
        gtkgesture.c                    \
        gtkgesture.h                    \
        page-control.c                  \
-       page-control.h
+       page-control.h                  \
+       $(BUILT_SOURCES)
 
 # Font embedding hack for Gnome Print < 2.1.?2?
 #      gpdf-gnome-font.c               \
@@ -207,6 +212,12 @@ xpdf-ltk.h: xpdf.ltk
 #      zoomIn.xbm              
 #      zoomOut.xbm             
 
+gpdf-marshal.h: gpdf-marshal.list $(GLIB_GENMARSHAL)
+       $(GLIB_GENMARSHAL) $< --header --prefix=gpdf_marshal > $@
+
+gpdf-marshal.c: gpdf-marshal.list $(GLIB_GENMARSHAL)
+       echo "#include \"gpdf-marshal.h\"" > $@ && \
+       $(GLIB_GENMARSHAL) $< --body --prefix=gpdf_marshal >> $@
 
 stockdir = $(datadir)/pixmaps/gpdf
 stock_DATA = fitwidth.png
@@ -216,7 +227,6 @@ ltk =                       \
        xpdf-top.ltk    \
        xpdf.ltk
 
-
 server_in_files = GNOME_PDF.server.in.in
 
 serverdir = $(libdir)/bonobo/servers
@@ -230,5 +240,9 @@ ui_DATA =                           \
        bonobo-application-x-pdf-ui.xml \
        gpdf-control-ui.xml
 
-EXTRA_DIST = $(stock_DATA) $(ltk)      \
+CLEANFILES = $(server_DATA) $(BUILT_SOURCES)
+DISTCLEANFILES = $(server_in_files:.server.in.in=.server.in)
+
+EXTRA_DIST = $(stock_DATA)             \
+             gpdf-marshal.list         \
              $(server_in_files) config.h $(ui_DATA)