distribute gpdf-window-ui.xml

* shell/Makefile.am (EXTRA_DIST): distribute gpdf-window-ui.xml

* shell/gpdf-window-ui.xml: new file, based on xpdf/gpdf-ui.xml

* shell/gpdf.c (GPDF_IS_NON_NULL_WINDOW): add macro
(GW_RETURN_UNLESS_GW, GW_RETURN_VAL_UNLESS_GW): kill macros, use
GPDF_IS_NON_NULL_WINDOW with g_return_bla instead, this looks
more G'ish to me

* xpdf/.cvsignore: ignore gnome-pdf-viewer binary

* xpdf/Makefile.am (XML_FILES): don't distribute gpdf-ui.xml
(EXTRA_DIST): no ChangeLog here

* xpdf/gpdf-ui.xml: remove

* xpdf/gpdf-control-ui.xml: new file, based on
bonobo-application-x-pdf-ui.xml, half-hearted attempts to be
HIG-compliant

* xpdf/gpdf-control.cc (GPDF_IS_NON_NULL_CONTROL): add, use it
(gc_key_press_event): keyhandling mostly copied from embeddable
(verb_GoPagePrev_cb, verb_GoPageNext_cb, verb_GoPageFirst_cb)
(verb_GoPageLast_cb, gc_verbs []): add page verbs
(gc_set_ui_container, gc_unset_ui_container)
(gpdf_control_activate): install UI merging
(gc_set_zoom_items_visibility): only a dummy
(gpdf_control_construct): decompose into:
(gc_setup_persist, gc_setup_widgets): construct helpers

* xpdf/gpdf-embeddable-view.cc: use pdf_view_page_bla

* xpdf/gpdf-embeddable.h (bed_t): kill already unused typedef

* xpdf/pdf-view.h (pdf_view_page_prev, pdf_view_page_next)
(pdf_view_page_first, pdf_view_page_last): export

* xpdf/pdf-view.cc (first_page, last_page, next_page, prev_page):
static again
(pdf_view_page_prev, pdf_view_page_next, pdf_view_page_first)
(pdf_view_page_last): methods to be called by the control (and the
embeddable view) to do what their names say
(IS_NON_NULL_PDF_VIEW): like IS_PDF_VIEW with obvious extra check

1 files changed, 1 insertions, 0 deletions

diff --git a/pdf/xpdf/.cvsignore b/pdf/xpdf/.cvsignore
index 6635416..301a46b 100644
--- a/pdf/xpdf/.cvsignore
+++ b/pdf/xpdf/.cvsignore
@@ -3,6 +3,7 @@
 Makefile
 Makefile.in
 bonobo-application-x-pdf
+gnome-pdf-viewer
 gpdf 
 pdfimages
 pdfinfo