From a263a6005e61b041fdb2d96611377ba89cce2364 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Mon, 28 Feb 2000 21:05:11 +0000 Subject: [PATCH] new bonobo bits; still broken ( wierdly ) --- pdf/xpdf/ChangeLog | 7 +++++++ pdf/xpdf/gpdf.cc | 16 +++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pdf/xpdf/ChangeLog b/pdf/xpdf/ChangeLog index d5d39b92..0f472944 100644 --- a/pdf/xpdf/ChangeLog +++ b/pdf/xpdf/ChangeLog @@ -1,3 +1,10 @@ +2000-02-28 Michael Meeks + + * 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 * Makefile.am: Fixed up lists of sources so that distcheck works. diff --git a/pdf/xpdf/gpdf.cc b/pdf/xpdf/gpdf.cc index a0532612..cd814948 100644 --- 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, -- 2.43.5