remove all references to old PdfView class (preferred_zoom_levels,

* xpdf/gpdf-control.cc: remove all references to old PdfView class
(preferred_zoom_levels, preferred_zoom_level_names): add more zoom
levels
(gc_zoom_level_from_index): kill
(gpdf_control_zoom_in, gpdf_control_zoom_out)
(gpdf_control_zoom_fit_width, gpdf_control_zoom_fit)
(gpdf_control_zoom_default, gc_zoomable_set_zoom_level_cb):
rewrite using GPdfView methods

* xpdf/gpdf-view.cc (gpdf_view_zoom_in, gpdf_view_zoom_fit)
(gpdf_view_zoom_fit_width): implement

* xpdf/gpdf-view.h: add zoom function prototypes

* xpdf/bonobo-application-x-pdf.cc (main):
* shell/gpdf.c (main): s/PACKAGE/GETTEXT_PACKAGE/ in *textdomain
functions

* xpdf/Makefile.am, goo/Makefile.am: fix distcheck

diff --git a/pdf/goo/Makefile.am b/pdf/goo/Makefile.am
index ef84b8aef67e75e36a62c0df48a9b08be9a2c258..24f89d897f8d83a0445e0d5f879ac28cdaa48c61 100644 (file)
--- a/pdf/goo/Makefile.am
+++ b/pdf/goo/Makefile.am
@@ -2,21 +2,29 @@ lib_LIBRARIES = libgoo.a
 
 libgoo_a_SOURCES =     \
        GHash.cc        \
+       GHash.h         \
        GList.cc        \
+       GList.h         \
        GString.cc      \
+       GString.h       \
        gmempp.cc       \
        gfile.cc        \
+       gfile.h         \
        gmem.c          \
+       gmem.h          \
+       gtypes.h        \
        parseargs.c     \
-       GString.h       \
+       parseargs.h     \
        gfile.h         \
        gmem.h          \
-       gtypes.h        \
        parseargs.h
 
 EXTRA_DIST =           \
+       vms_directory.c \
        vms_dirent.h    \
        vms_sys_dirent.h\
        vms_unix_time.h \
+       vms_unix_times.c\
+       vms_unlink.c    \
        makefile.w32    \
        vms_make.com
\ No newline at end of file

diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am
index 279065282645f901369ee00bdabd9c7f1923fe9d..98b90839d84f13485c753ccd42c9955dec70cbba 100644 (file)
--- a/pdf/xpdf/Makefile.am
+++ b/pdf/xpdf/Makefile.am
@@ -110,6 +110,7 @@ gnome_pdf_viewer_SOURCES =          \
        bonobo-application-x-pdf.cc     \
        gpdf-control.cc                 \
        gpdf-control.h                  \
+       gpdf-g-switch.h                 \
        gpdf-persist-stream.cc          \
        gpdf-persist-stream.h           \
        gpdf-util.h                     \