From: Michael Meeks Date: Thu, 21 Dec 2000 01:13:13 +0000 (+0000) Subject: Kill mutex / thread init code, it screws gtk. X-Git-Tag: GPDF_FOR_GNOME_1_4~25 X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=859f6f6582d603077cd089626623a3eb36348f07;p=evince.git Kill mutex / thread init code, it screws gtk. 2000-12-21 Michael Meeks * 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. --- diff --git a/pdf/xpdf/ChangeLog b/pdf/xpdf/ChangeLog index 1f4132ae..c5077231 100644 --- a/pdf/xpdf/ChangeLog +++ b/pdf/xpdf/ChangeLog @@ -1,3 +1,15 @@ +2000-12-21 Michael Meeks + + * 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 * bonobo-application-x-pdf.cc: diff --git a/pdf/xpdf/GNOME_PDF.oafinfo b/pdf/xpdf/GNOME_PDF.oafinfo index e1ae3d9d..0918a158 100644 --- a/pdf/xpdf/GNOME_PDF.oafinfo +++ b/pdf/xpdf/GNOME_PDF.oafinfo @@ -1,6 +1,6 @@ - @@ -15,9 +15,9 @@ - + location="OAFIID:GNOME_XPDF_ComponentFactory"> diff --git a/pdf/xpdf/GNOME_XPDF.oafinfo b/pdf/xpdf/GNOME_XPDF.oafinfo index e1ae3d9d..0918a158 100644 --- a/pdf/xpdf/GNOME_XPDF.oafinfo +++ b/pdf/xpdf/GNOME_XPDF.oafinfo @@ -1,6 +1,6 @@ - @@ -15,9 +15,9 @@ - + location="OAFIID:GNOME_XPDF_ComponentFactory"> diff --git a/pdf/xpdf/Makefile.am b/pdf/xpdf/Makefile.am index faefcd9f..b4ea2eda 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 37fba19d..00000000 --- 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 e1ae3d9d..00000000 --- a/pdf/xpdf/application-x-pdf.oafinfo +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pdf/xpdf/gpdf.cc b/pdf/xpdf/gpdf.cc index ddcc655b..e8744d2e 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."));