From: Michael Meeks <michael@helixcode.com>
Date: Sat, 7 Oct 2000 22:29:28 +0000 (+0000)
Subject: check for Bonobo >= 0.20
X-Git-Tag: BONOBO_BEFORE_API_RENAME~3
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=20a313181309084425a75c001145ea43c14d014a;p=evince.git

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.
---

diff --git a/pdf/xpdf/ChangeLog b/pdf/xpdf/ChangeLog
index 3a995b62..834dc5e8 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 92dd95e7..d8d0010b 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);