diff options
| author | Michael Meeks <michael@helixcode.com> | 2000-10-07 22:29:28 (GMT) |
|---|---|---|
| committer | Michael Meeks <mmeeks@src.gnome.org> | 2000-10-07 22:29:28 (GMT) |
| commit | 20a313181309084425a75c001145ea43c14d014a (patch) | |
| tree | 17d58c4ddea67a8ed1832658d163ed401a889b13 /pdf | |
| parent | 4f4c0d6ecf069fdabb4a8d0be8bb6654789084c9 (diff) | |
check for Bonobo >= 0.20
2000-10-07 Michael Meeks <michael@helixcode.com>
* configure.in: check for Bonobo >= 0.20
2000-10-07 Michael Meeks <michael@helixcode.com>
* gpdf.cc (main): cut out stale gnorba fat.
* bonobo-application-x-pdf.cc (init_server_factory),
(init_bonobo_application_x_pdf_factory): ditto.
* bonobo-application-x-pdf.cc (embeddable_factory): remove the
sizeable interface.
Diffstat (limited to 'pdf')
| -rw-r--r-- | pdf/xpdf/ChangeLog | 10 | ||||
| -rw-r--r-- | pdf/xpdf/gpdf.cc | 20 |
2 files changed, 12 insertions, 18 deletions
diff --git a/pdf/xpdf/ChangeLog b/pdf/xpdf/ChangeLog index 3a995b6..834dc5e 100644 --- a/pdf/xpdf/ChangeLog +++ b/pdf/xpdf/ChangeLog @@ -1,3 +1,13 @@ +2000-10-07 Michael Meeks <michael@helixcode.com> + + * gpdf.cc (main): cut out stale gnorba fat. + + * bonobo-application-x-pdf.cc (init_server_factory), + (init_bonobo_application_x_pdf_factory): ditto. + + * bonobo-application-x-pdf.cc (embeddable_factory): remove the + sizeable interface. + 2000-10-04 Michael Meeks <michael@helixcode.com> * bonobo-application-x-pdf.cc (view_create_menus): upd. diff --git a/pdf/xpdf/gpdf.cc b/pdf/xpdf/gpdf.cc index 92dd95e..d8d0010 100644 --- a/pdf/xpdf/gpdf.cc +++ b/pdf/xpdf/gpdf.cc @@ -12,11 +12,7 @@ extern "C" { #define GString G_String #include <gnome.h> -#if USING_OAF #include <liboaf/liboaf.h> -#else -#include <libgnorba/gnorba.h> -#endif #include <gdk/gdkprivate.h> #include <gdk/gdkx.h> @@ -116,12 +112,9 @@ extern "C" { g_return_val_if_fail (container != NULL, FALSE); g_return_val_if_fail (container->view_widget == NULL, FALSE); -#if USING_OAF - comp = container_activate_component (container, "OAFIID:gpdf_component:892f2727-e2ec-423c-91ad-6f7b75fec6c8"); + comp = container_activate_component ( + container, "OAFIID:gpdf_component:892f2727-e2ec-423c-91ad-6f7b75fec6c8"); -#else - comp = container_activate_component (container, "bonobo-object:application-x-pdf"); -#endif if (!comp || !(object = comp->server)) { gnome_error_dialog (_("Could not launch bonobo object.")); return FALSE; @@ -590,20 +583,11 @@ main (int argc, char **argv) CORBA_exception_init (&ev); -#if USING_OAF gnomelib_register_popt_table (oaf_popt_options, "OAF"); gnome_init_with_popt_table("PDFViewer", "0.0.1", argc, argv, gpdf_popt_options, 0, &ctx); orb = oaf_init (argc, argv); -#else - gnome_CORBA_init_with_popt_table ("PDFViewer", "0.0.1", - &argc, argv, - gpdf_popt_options, 0, &ctx, - GNORBA_INIT_SERVER_FUNC, &ev); - - orb = gnome_CORBA_ORB (); -#endif CORBA_exception_free (&ev); |