diff options
author | Martin Kretzschmar <mkretzschmar@src.gnome.org> | 2002-10-02 21:21:11 (GMT) |
---|---|---|
committer | Martin Kretzschmar <mkretzschmar@src.gnome.org> | 2002-10-02 21:21:11 (GMT) |
commit | 28efc982987afde802230593bb6ae54c7ab8b87f (patch) | |
tree | 6ffe364f1d715d87574c8db63f122708baeee0bb /pdf/xpdf | |
parent | 4b00949a4ac2bb998bc636338709a3a16e30de57 (diff) |
factory file name is gnome-pdf-viewer,
* xpdf/Makefile.am: factory file name is gnome-pdf-viewer,
s/GNOME_XPDF.oafinfo/GNOME_PDF.oafinfo/
* xpdf/GNOME_PDF.oafinfo: s/XPDF/PDF/g, the factory file name
is now gnome-pdf-viewer, add oaf_server entry for the control
* xpdf/bonobo-application-x-pdf.cc (gpdf_factory): multi factory
function, replaces embeddable_factory, creates controls, too
* xpdf/gpdf-control.cc, xpdf/gpdf-control.h: new files, first code
for PDF viewer bonobo control.
* shell/gpdf.c: handle priv field in GPdfWindow, add code for using
a control instead of an embeddable (use it when USE_CONTROL != 0)
* shell/gpdf-window.h (GPdfWindow): add priv field, kill app field
(struct _Component) is private, moved back to gpdf.c
* configure.in: PACKAGE and VERSION are set by AM_INIT_AUTOMAKE,
kill explicit assignments
* xpdf/GNOME_XPDF.oafinfo: remove
Diffstat (limited to 'pdf/xpdf')
-rw-r--r-- | pdf/xpdf/GNOME_PDF.oafinfo | 41 | ||||
-rw-r--r-- | pdf/xpdf/GNOME_XPDF.oafinfo | 45 | ||||
-rw-r--r-- | pdf/xpdf/Makefile.am | 12 |
3 files changed, 37 insertions, 61 deletions
diff --git a/pdf/xpdf/GNOME_PDF.oafinfo b/pdf/xpdf/GNOME_PDF.oafinfo index 0918a15..59f1025 100644 --- a/pdf/xpdf/GNOME_PDF.oafinfo +++ b/pdf/xpdf/GNOME_PDF.oafinfo @@ -1,23 +1,47 @@ <oaf_info> -<oaf_server iid="OAFIID:GNOME_XPDF_ComponentFactory" +<oaf_server iid="OAFIID:GNOME_PDF_Factory" type="exe" - location="bonobo-application-x-pdf"> + 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="application/x-pdf bonobo object factory"/> + value="Gnome PDF viewer factory"/> <oaf_attribute name="name" type="string" value="PDF document viewer factory"/> </oaf_server> -<oaf_server iid="OAFIID:GNOME_XPDF_Embeddable" + <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_XPDF_ComponentFactory"> + location="OAFIID:GNOME_PDF_Factory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:Bonobo/Embeddable:1.0"/> @@ -27,9 +51,9 @@ </oaf_attribute> <oaf_attribute name="description" type="string" - value="application/x-pdf bonobo object"/> + value="Embeddable Gnome PDF document"/> <oaf_attribute name="name" type="string" - value="PDF document viewer"/> + value="Embeddable PDF document"/> <oaf_attribute name="bonobo:editable" type="boolean" value="true"/> <oaf_attribute name="bonobo:supported_mime_types" type="stringv"> @@ -37,9 +61,6 @@ <item value="application/pdf"/> </oaf_attribute> - <oaf_attribute name="nautilus:view_as_name" type="string" - value="PDF Document"/> - </oaf_server> </oaf_info> diff --git a/pdf/xpdf/GNOME_XPDF.oafinfo b/pdf/xpdf/GNOME_XPDF.oafinfo deleted file mode 100644 index 0918a15..0000000 --- a/pdf/xpdf/GNOME_XPDF.oafinfo +++ /dev/null @@ -1,45 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:GNOME_XPDF_ComponentFactory" - type="exe" - location="bonobo-application-x-pdf"> - - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/GenericFactory:1.0"/> - </oaf_attribute> - - <oaf_attribute name="description" type="string" - value="application/x-pdf bonobo object factory"/> - <oaf_attribute name="name" type="string" - value="PDF document viewer factory"/> - -</oaf_server> - -<oaf_server iid="OAFIID:GNOME_XPDF_Embeddable" - type="factory" - location="OAFIID:GNOME_XPDF_ComponentFactory"> - - <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="application/x-pdf bonobo object"/> - <oaf_attribute name="name" type="string" - value="PDF document viewer"/> - - <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_attribute name="nautilus:view_as_name" type="string" - value="PDF Document"/> - -</oaf_server> - -</oaf_info> diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am index 549810e..5965b87 100644 --- a/pdf/xpdf/Makefile.am +++ b/pdf/xpdf/Makefile.am @@ -14,7 +14,7 @@ else gui = xpdf endif -bin_PROGRAMS = $(gui) bonobo-application-x-pdf +bin_PROGRAMS = $(gui) gnome-pdf-viewer # pdftops pdftotext # pdfinfo pdftopbm # pdfimages @@ -99,7 +99,7 @@ common_sources = \ XRef.cc \ XRef.h -bonobo_application_x_pdf_SOURCES = \ +gnome_pdf_viewer_SOURCES = \ $(common_sources) \ BonoboStream.h \ BonoboStream.cc \ @@ -107,6 +107,8 @@ bonobo_application_x_pdf_SOURCES = \ 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 \ @@ -119,7 +121,7 @@ bonobo_application_x_pdf_SOURCES = \ pdf-view.cc \ pdf-view.h -bonobo_application_x_pdf_LDADD = \ +gnome_pdf_viewer_LDADD = \ ../goo/libgoo.a \ $(GTK_LIBS) \ $(GNOME_LIBDIR) \ @@ -203,7 +205,7 @@ ltk = \ xpdf.ltk oafdir = $(datadir)/oaf -oaf_DATA = GNOME_XPDF.oafinfo +oaf_DATA = GNOME_PDF.oafinfo XML_FILES = \ gpdf-ui.xml \ @@ -214,5 +216,3 @@ ui_DATA = $(XML_FILES) EXTRA_DIST = $(stock_DATA) ChangeLog $(ltk) \ $(oaf_DATA) config.h $(XML_FILES) - - |