diff options
| author | Michael Meeks <mmeeks@src.gnome.org> | 2000-02-28 21:05:11 (GMT) |
|---|---|---|
| committer | Michael Meeks <mmeeks@src.gnome.org> | 2000-02-28 21:05:11 (GMT) |
| commit | a263a6005e61b041fdb2d96611377ba89cce2364 (patch) | |
| tree | 09034f4a951c2993d9ba809c371328c4c3d56eb1 /pdf | |
| parent | c3d1dd25dcf509be82a92c5aeb544f08a5a604f4 (diff) | |
new bonobo bits; still broken ( wierdly )
Diffstat (limited to 'pdf')
| -rw-r--r-- | pdf/xpdf/ChangeLog | 7 | ||||
| -rw-r--r-- | pdf/xpdf/gpdf.cc | 16 |
2 files changed, 12 insertions, 11 deletions
diff --git a/pdf/xpdf/ChangeLog b/pdf/xpdf/ChangeLog index d5d39b9..0f47294 100644 --- 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 a053261..cd81494 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,18 +336,12 @@ 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. */ view_widget = bonobo_view_frame_get_wrapper (view_frame); @@ -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, |