diff options
author | Michael Meeks <michael@helixcode.com> | 2000-12-21 01:13:13 (GMT) |
---|---|---|
committer | Michael Meeks <mmeeks@src.gnome.org> | 2000-12-21 01:13:13 (GMT) |
commit | 859f6f6582d603077cd089626623a3eb36348f07 (patch) | |
tree | 2e9746f8485055217b24a3637fff4842e69d138b /pdf | |
parent | db46d0ffc7e468e4e5cc41ac9544c190b38d9232 (diff) |
Kill mutex / thread init code, it screws gtk.
2000-12-21 Michael Meeks <michael@helixcode.com>
* bonobo-application-x-pdf.cc: Kill mutex / thread init code,
it screws gtk.
* gpdf.cc: update the IID naming scheme.
* bonobo-application-x-pdf.cc (init_bonobo_application_x_pdf_factory):
ditto. (init_server_factory): setup ORB properly.
* Makefile.am: De-goadize; update oafinfo fnames.
Diffstat (limited to 'pdf')
-rw-r--r-- | pdf/xpdf/ChangeLog | 12 | ||||
-rw-r--r-- | pdf/xpdf/GNOME_PDF.oafinfo | 6 | ||||
-rw-r--r-- | pdf/xpdf/GNOME_XPDF.oafinfo | 6 | ||||
-rw-r--r-- | pdf/xpdf/Makefile.am | 29 | ||||
-rw-r--r-- | pdf/xpdf/application-x-pdf.gnorba | 11 | ||||
-rw-r--r-- | pdf/xpdf/application-x-pdf.oafinfo | 45 | ||||
-rw-r--r-- | pdf/xpdf/gpdf.cc | 2 |
7 files changed, 27 insertions, 84 deletions
diff --git a/pdf/xpdf/ChangeLog b/pdf/xpdf/ChangeLog index 1f4132a..c507723 100644 --- a/pdf/xpdf/ChangeLog +++ b/pdf/xpdf/ChangeLog @@ -1,3 +1,15 @@ +2000-12-21 Michael Meeks <michael@helixcode.com> + + * bonobo-application-x-pdf.cc: Kill mutex / thread init code, + it screws gtk. + + * gpdf.cc: update the IID naming scheme. + + * bonobo-application-x-pdf.cc (init_bonobo_application_x_pdf_factory): + ditto. (init_server_factory): setup ORB properly. + + * Makefile.am: De-goadize; update oafinfo fnames. + 2000-11-16 Ramiro Estrugo <ramiro@eazel.com> * bonobo-application-x-pdf.cc: diff --git a/pdf/xpdf/GNOME_PDF.oafinfo b/pdf/xpdf/GNOME_PDF.oafinfo index e1ae3d9..0918a15 100644 --- a/pdf/xpdf/GNOME_PDF.oafinfo +++ b/pdf/xpdf/GNOME_PDF.oafinfo @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:gpdf_component_factory:5d6d2e89-b73a-4898-b24a-79b896926f12" +<oaf_server iid="OAFIID:GNOME_XPDF_ComponentFactory" type="exe" location="bonobo-application-x-pdf"> @@ -15,9 +15,9 @@ </oaf_server> -<oaf_server iid="OAFIID:gpdf_component:892f2727-e2ec-423c-91ad-6f7b75fec6c8" +<oaf_server iid="OAFIID:GNOME_XPDF_Embeddable" type="factory" - location="OAFIID:gpdf_component_factory:5d6d2e89-b73a-4898-b24a-79b896926f12"> + location="OAFIID:GNOME_XPDF_ComponentFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:Bonobo/Embeddable:1.0"/> diff --git a/pdf/xpdf/GNOME_XPDF.oafinfo b/pdf/xpdf/GNOME_XPDF.oafinfo index e1ae3d9..0918a15 100644 --- a/pdf/xpdf/GNOME_XPDF.oafinfo +++ b/pdf/xpdf/GNOME_XPDF.oafinfo @@ -1,6 +1,6 @@ <oaf_info> -<oaf_server iid="OAFIID:gpdf_component_factory:5d6d2e89-b73a-4898-b24a-79b896926f12" +<oaf_server iid="OAFIID:GNOME_XPDF_ComponentFactory" type="exe" location="bonobo-application-x-pdf"> @@ -15,9 +15,9 @@ </oaf_server> -<oaf_server iid="OAFIID:gpdf_component:892f2727-e2ec-423c-91ad-6f7b75fec6c8" +<oaf_server iid="OAFIID:GNOME_XPDF_Embeddable" type="factory" - location="OAFIID:gpdf_component_factory:5d6d2e89-b73a-4898-b24a-79b896926f12"> + location="OAFIID:GNOME_XPDF_ComponentFactory"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:Bonobo/Embeddable:1.0"/> diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am index faefcd9..b4ea2ed 100644 --- a/pdf/xpdf/Makefile.am +++ b/pdf/xpdf/Makefile.am @@ -1,10 +1,4 @@ -if USING_OAF -OBJECT_DIRECTORY_LIBS=$(OAF_LIBS) $(GNOMEUI_LIBS) -else -OBJECT_DIRECTORY_LIBS=$(GNOMEGNORBA_LIBS) -endif - INCLUDES = \ -I$(top_srcdir)/goo \ -I$(top_srcdir)/ltk \ @@ -18,7 +12,11 @@ else gui = xpdf endif -bin_PROGRAMS = pdftops pdftotext pdfinfo pdftopbm pdfimages $(gui) bonobo-application-x-pdf +bin_PROGRAMS = \ + pdftops pdftotext \ + pdfinfo pdftopbm \ + pdfimages $(gui) \ + bonobo-application-x-pdf common_sources = \ Array.cc \ @@ -77,7 +75,6 @@ gpdf_SOURCES = \ gpdf_LDADD = \ $(GTK_LIBS) \ $(GNOME_LIBDIR) \ - $(OBJECT_DIRECTORY_LIBS) \ $(EXTRA_GNOME_LIBS) \ $(INTLLIBS) @@ -96,7 +93,6 @@ bonobo_application_x_pdf_LDADD = \ ../goo/libgoo.a \ $(GTK_LIBS) \ $(GNOME_LIBDIR) \ - $(OBJECT_DIRECTORY_LIBS) \ $(EXTRA_GNOME_LIBS) \ $(EXTRA_GLIB_LIBS) \ $(INTLLIBS) @@ -169,17 +165,8 @@ ltk = \ xpdf-top.ltk \ xpdf.ltk -goaddir = $(sysconfdir)/CORBA/servers oafdir = $(datadir)/oaf - -if USING_OAF -oaf_DATA = $(OAF_FILES) -else -goad_DATA = $(GOAD_FILES) -endif - -GOAD_FILES = application-x-pdf.gnorba -OAF_FILES = application-x-pdf.oafinfo +oaf_DATA = GNOME_XPDF.oafinfo XML_FILES = \ gpdf-ui.xml \ @@ -188,7 +175,7 @@ XML_FILES = \ uidir = $(datadir)/gnome/ui ui_DATA = $(XML_FILES) -EXTRA_DIST = $(bitmaps) ChangeLog $(ltk) $(GOAD_FILES) \ - $(OAF_FILES) config.h $(XML_FILES) +EXTRA_DIST = $(bitmaps) ChangeLog $(ltk) \ + $(oaf_DATA) config.h $(XML_FILES) diff --git a/pdf/xpdf/application-x-pdf.gnorba b/pdf/xpdf/application-x-pdf.gnorba deleted file mode 100644 index 37fba19..0000000 --- a/pdf/xpdf/application-x-pdf.gnorba +++ /dev/null @@ -1,11 +0,0 @@ -[bonobo-object-factory:application-x-pdf] -type=exe -repo_id=IDL:Bonobo/EmbeddableFactory:1.0 IDL:Bonobo/GenericFactory:1.0 -description=application/x-pdf bonobo object factory -location_info=bonobo-application-x-pdf - -[bonobo-object:application-x-pdf] -type=factory -repo_id=IDL:BonoboObject/application-x-pdf:1.0 IDL:Bonobo/Embeddable:1.0 -description=application/x-pdf bonobo object -location_info=bonobo-object-factory:application-x-pdf diff --git a/pdf/xpdf/application-x-pdf.oafinfo b/pdf/xpdf/application-x-pdf.oafinfo deleted file mode 100644 index e1ae3d9..0000000 --- a/pdf/xpdf/application-x-pdf.oafinfo +++ /dev/null @@ -1,45 +0,0 @@ -<oaf_info> - -<oaf_server iid="OAFIID:gpdf_component_factory:5d6d2e89-b73a-4898-b24a-79b896926f12" - 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:gpdf_component:892f2727-e2ec-423c-91ad-6f7b75fec6c8" - type="factory" - location="OAFIID:gpdf_component_factory:5d6d2e89-b73a-4898-b24a-79b896926f12"> - - <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/gpdf.cc b/pdf/xpdf/gpdf.cc index ddcc655..e8744d2 100644 --- a/pdf/xpdf/gpdf.cc +++ b/pdf/xpdf/gpdf.cc @@ -98,7 +98,7 @@ extern "C" { g_return_val_if_fail (container->view_widget == NULL, FALSE); comp = container_activate_component ( - container, "OAFIID:gpdf_component:892f2727-e2ec-423c-91ad-6f7b75fec6c8"); + container, "OAFIID:GNOME_XPDF_Embeddable"); if (!comp || !(object = comp->server)) { gnome_error_dialog (_("Could not launch bonobo object.")); |