new bonobo bits; still broken ( wierdly )

diff --git a/pdf/xpdf/ChangeLog b/pdf/xpdf/ChangeLog
index d5d39b92a080435110f9e7be8bd5ad2af3f44601..0f472944bb6545f44634e9c27a7366fb579e7944 100644 (file)
--- a/pdf/xpdf/ChangeLog
+++ b/pdf/xpdf/ChangeLog
@@ -1,3 +1,10 @@
+2000-02-28  Michael Meeks  <michael@helixcode.com>
+
+       * bonobo-application-x-pdf.cc (view_factory): kill spurious UI
+       handler creation.
+
+       * gpdf.cc (container_set_view): update to new bonobo api.
+
 2000-02-25  NotZed  <NotZed@HelixCode.com>
 
        * Makefile.am: Fixed up lists of sources so that distcheck works.

diff --git a/pdf/xpdf/gpdf.cc b/pdf/xpdf/gpdf.cc
index a05326123f78c80144ef6f4e6c12d4b3d2e7fbcf..cd8149482ee0da873bc281f6fdea4976cd99cd1e 100644 (file)
--- a/pdf/xpdf/gpdf.cc
+++ b/pdf/xpdf/gpdf.cc
@@ -124,7 +124,7 @@ extern "C" {
     
     if (ev._major != CORBA_NO_EXCEPTION ||
        persist == CORBA_OBJECT_NIL) {
-      gnome_error_dialog ("Panic: component is well broken.");
+      gnome_error_dialog ("Panic: component doesn't implement PersistStream.");
       return FALSE;
     }
     
@@ -336,17 +336,11 @@ container_set_view (Container *container, Component *component)
        /*
         * Create the remote view and the local ViewFrame.
         */
-       view_frame = bonobo_client_site_new_view (component->client_site);
+       view_frame = bonobo_client_site_new_view (component->client_site,
+                                                 bonobo_object_corba_objref (BONOBO_OBJECT (
+                                                         container->uih)));
        component->view_frame = view_frame;
 
-       /*
-        * Set the BonoboUIHandler for this ViewFrame.  That way, the
-        * embedded component can get access to our UIHandler server
-        * so that it can merge menu and toolbar items when it gets
-        * activated.
-        */
-       bonobo_view_frame_set_ui_handler (view_frame, container->uih);
-
        /*
         * Embed the view frame into the application.
         */
@@ -621,7 +615,7 @@ container_new (const char *fname)
        container = g_new0 (Container, 1);
 
        container->app = gnome_app_new ("pdf-viewer",
-                                        "GNOME PDF viewer");
+                                       "GNOME PDF viewer");
 
        gtk_drag_dest_set (container->app,
                           GTK_DEST_DEFAULT_ALL,