diff options
| -rw-r--r-- | pdf/xpdf/.cvsignore | 2 | ||||
| -rw-r--r-- | pdf/xpdf/GNOME_PDF.oafinfo | 66 | ||||
| -rw-r--r-- | pdf/xpdf/Makefile.am | 57 | ||||
| -rw-r--r-- | pdf/xpdf/bonobo-application-x-pdf.h | 19 | ||||
| -rw-r--r-- | pdf/xpdf/gpdf-g-switch.h | 22 |
5 files changed, 54 insertions, 112 deletions
diff --git a/pdf/xpdf/.cvsignore b/pdf/xpdf/.cvsignore index 301a46b..1898fa0 100644 --- a/pdf/xpdf/.cvsignore +++ b/pdf/xpdf/.cvsignore @@ -1,5 +1,7 @@ .deps .libs +GNOME_PDF.server +GNOME_PDF.server.in Makefile Makefile.in bonobo-application-x-pdf diff --git a/pdf/xpdf/GNOME_PDF.oafinfo b/pdf/xpdf/GNOME_PDF.oafinfo deleted file mode 100644 index 59f1025..0000000 --- a/pdf/xpdf/GNOME_PDF.oafinfo +++ /dev/null @@ -1,66 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:GNOME_PDF_Factory" - type="exe" - location="gnome-pdf-viewer"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/GenericFactory:1.0"/> - </oaf_attribute> - - <oaf_attribute name="description" type="string" - value="Gnome PDF viewer factory"/> - <oaf_attribute name="name" type="string" - value="PDF document viewer factory"/> - -</oaf_server> - - <oaf_server iid="OAFIID:GNOME_PDF_Control" - type="factory" - location="OAFIID:GNOME_PDF_Factory"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:Bonobo/Control:1.0"/> - <item value="IDL:Bonobo/PersistStream:1.0"/> - <item value="IDL:Bonobo/Persist:1.0"/> - <item value="IDL:Bonobo/Unknown:1.0"/> - </oaf_attribute> - - <oaf_attribute name="description" type="string" value="Gnome PDF Viewer"/> - <oaf_attribute name="name" type="string" value="Gnome PDF Viewer"/> - <oaf_attribute name="bonobo:editable" type="boolean" value="false"/> - <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> - <item value="application/x-pdf"/> - <item value="application/pdf"/> - </oaf_attribute> - - <oaf_attribute name="nautilus:view_as_name" type="string" - value="PDF Document"/> - - </oaf_server> - -<oaf_server iid="OAFIID:GNOME_PDF_Embeddable" - type="factory" - location="OAFIID:GNOME_PDF_Factory"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:Bonobo/Embeddable:1.0"/> - <item value="IDL:Bonobo/Unknown:1.0"/> - <item value="IDL:Bonobo/PersistStream:1.0"/> - <item value="IDL:Bonobo/Persist:1.0"/> - </oaf_attribute> - - <oaf_attribute name="description" type="string" - value="Embeddable Gnome PDF document"/> - <oaf_attribute name="name" type="string" - value="Embeddable PDF document"/> - - <oaf_attribute name="bonobo:editable" type="boolean" value="true"/> - <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> - <item value="application/x-pdf"/> - <item value="application/pdf"/> - </oaf_attribute> - -</oaf_server> - -</oaf_info> diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am index 3155607..5366940 100644 --- a/pdf/xpdf/Makefile.am +++ b/pdf/xpdf/Makefile.am @@ -1,10 +1,9 @@ -INCLUDES = \ - -I$(top_srcdir)/goo \ - -I$(top_srcdir)/ltk \ - -DDATADIR=\""$(datadir)"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - $(EXTRA_GLIB_CFLAGS) \ +INCLUDES = \ + -I$(top_srcdir)/goo \ + -I$(top_srcdir)/ltk \ + -DDATADIR=\""$(datadir)"\" \ + -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ $(EXTRA_GNOME_CFLAGS) \ $(libpaper_CFLAGS) @@ -14,11 +13,12 @@ else gui = xpdf endif -bin_PROGRAMS = $(gui) gnome-pdf-viewer +bin_PROGRAMS = $(gui) # pdftops pdftotext # pdfinfo pdftopbm # pdfimages +libexec_PROGRAMS = gnome-pdf-viewer common_sources = \ Annot.cc \ @@ -106,13 +106,8 @@ gnome_pdf_viewer_SOURCES = \ GOutputDev.cc \ GOutputDev.h \ bonobo-application-x-pdf.cc \ - bonobo-application-x-pdf.h \ gpdf-control.cc \ gpdf-control.h \ - gpdf-embeddable.cc \ - gpdf-embeddable.h \ - gpdf-embeddable-view.cc \ - gpdf-embeddable-view.h \ gpdf-persist-stream.cc \ gpdf-persist-stream.h \ gpdf-util.h \ @@ -120,14 +115,14 @@ gnome_pdf_viewer_SOURCES = \ gtkgesture.h \ pdf-view.cc \ pdf-view.h +# gpdf-embeddable.cc \ +# gpdf-embeddable.h \ +# gpdf-embeddable-view.cc \ +# gpdf-embeddable-view.h \ gnome_pdf_viewer_LDADD = \ - ../goo/libgoo.a \ - $(GTK_LIBS) \ - $(GNOME_LIBDIR) \ + $(top_builddir)/goo/libgoo.a \ $(EXTRA_GNOME_LIBS) \ - $(EXTRA_GLIB_LIBS) \ - $(INTLLIBS) \ $(libpaper_LIBS) xpdf_SOURCES = \ @@ -139,7 +134,12 @@ xpdf_SOURCES = \ xpdf.cc xpdf_CFLAGS = $(X_CFLAGS) -xpdf_LDADD = ../goo/libgoo.a ../ltk/libltk.a -lXpm $(EXTRA_GNOME_LIBS) $(libpaper_CFLAGS) +xpdf_LDADD = \ + $(top_builddir)/goo/libgoo.a \ + $(top_builddir)/ltk/libltk.a \ + -lXpm \ + $(EXTRA_GNOME_LIBS) \ + $(libpaper_LIBS) #pdfimages_SOURCES = # $(common_sources) @@ -195,24 +195,27 @@ xpdf-ltk.h: xpdf.ltk stockdir = $(datadir)/pixmaps/gpdf -stock_DATA = stock-zoom-in.xpm stock-zoom-out.xpm \ - stock-zoom-fit.xpm stock-zoom-fit-wide.xpm \ - stock-zoom-fit-tall.xpm +stock_DATA = stock-zoom-fit-wide.xpm ltk = \ xpdf-flip.ltk \ xpdf-top.ltk \ xpdf.ltk -oafdir = $(datadir)/oaf -oaf_DATA = GNOME_PDF.oafinfo -XML_FILES = \ +server_in_files = GNOME_PDF.server.in.in + +serverdir = $(libdir)/bonobo/servers +server_DATA = $(server_in_files:.server.in.in=.server) +$(server_in_files:.server.in.in=.server.in): $(server_in_files) + sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ +@INTLTOOL_SERVER_RULE@ + +uidir = $(datadir)/gnome-2.0/ui +ui_DATA = \ bonobo-application-x-pdf-ui.xml \ gpdf-control-ui.xml -uidir = $(datadir)/gnome/ui -ui_DATA = $(XML_FILES) EXTRA_DIST = $(stock_DATA) $(ltk) \ - $(oaf_DATA) config.h $(XML_FILES) + $(server_in_files) config.h $(ui_DATA) diff --git a/pdf/xpdf/bonobo-application-x-pdf.h b/pdf/xpdf/bonobo-application-x-pdf.h deleted file mode 100644 index 66b4ee4..0000000 --- a/pdf/xpdf/bonobo-application-x-pdf.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef BONOBOAPPLICATIONXPDF_H -#define BONOBOAPPLICATIONXPDF_H - -/* - * This is only neccessary since the gpdf container is - * very tightly coupled to the component, for ergonomic reasons. - */ - -#define VERB_FIRST "FirstPage" -#define VERB_PREV "PrevPage" -#define VERB_NEXT "NextPage" -#define VERB_LAST "LastPage" - -#define VERB_Z_IN "ZoomIn" -#define VERB_Z_OUT "ZoomOut" -#define VERB_Z_FIT_WIDTH "ZoomFitWidth" -#define VERB_Z_FIT_HEIGHT "ZoomFitHeight" - -#endif /* BONOBOAPPLICATIONXPDF_H */ diff --git a/pdf/xpdf/gpdf-g-switch.h b/pdf/xpdf/gpdf-g-switch.h new file mode 100644 index 0000000..bc38800 --- /dev/null +++ b/pdf/xpdf/gpdf-g-switch.h @@ -0,0 +1,22 @@ +/* + * When including goo and glib headers in one file: + * + * #include "GList.h" + * #include "gpdf-g-switch.h" + * #include "glib.h" + * < more glib/gtk+/gnome headers > + * #include "gpdf-g-switch.h" + */ + + +#ifdef GPDF_GOO +# undef GString +# undef GList +# undef GDir +# undef GPDF_GOO +#else +# define GString G_String +# define GList G_List +# define GDir G_Dir +# define GPDF_GOO +#endif |