X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=pdf%2Fxpdf%2Fgpdf.cc;h=aa44c4eb83c86a32794b101fcd38331f256a05e9;hb=11c2610a62f60a0394c0eea0fede081d9fd678bd;hp=661d9ac43f8331f5ac8d55fb4b8d8854f2af1bdb;hpb=6d6a1a5cf8d99a12293b0f31669e8b017c3f73c9;p=evince.git

diff --git a/pdf/xpdf/gpdf.cc b/pdf/xpdf/gpdf.cc
index 661d9ac4..aa44c4eb 100644
--- a/pdf/xpdf/gpdf.cc
+++ b/pdf/xpdf/gpdf.cc
@@ -98,7 +98,7 @@ extern "C" {
     g_return_val_if_fail (container->view_widget == NULL, FALSE);
 
     comp = container_activate_component (
-	    container, "OAFIID:gpdf_component:892f2727-e2ec-423c-91ad-6f7b75fec6c8");
+	    container, "OAFIID:GNOME_XPDF_Embeddable");
 
     if (!comp || !(object = comp->server)) {
       gnome_error_dialog (_("Could not launch bonobo object."));
@@ -106,7 +106,7 @@ extern "C" {
     }
     
     CORBA_exception_init (&ev);
-    persist = Bonobo_Unknown_query_interface (
+    persist = Bonobo_Unknown_queryInterface (
       bonobo_object_corba_objref (BONOBO_OBJECT (object)),
       "IDL:Bonobo/PersistStream:1.0", &ev);
     
@@ -116,7 +116,7 @@ extern "C" {
       return FALSE;
     }
     
-    stream = bonobo_stream_fs_open (name, Bonobo_Storage_READ);
+    stream = bonobo_stream_open (BONOBO_IO_DRIVER_FS, name, Bonobo_Storage_READ, 0);
     
     if (stream == NULL) {
       char *err = g_strconcat (_("Could not open "), name, NULL);
@@ -290,7 +290,7 @@ extern "C" {
 static void
 container_dump_cmd (GtkWidget *widget, Container *container)
 {
-	bonobo_win_dump (BONOBO_WIN (container->app), "on demand");
+	bonobo_window_dump (BONOBO_WINDOW(container->app), "on demand");
 }
 
 static void
@@ -383,13 +383,6 @@ container_launch_component (BonoboClientSite    *client_site,
 		return NULL;
 	}
 
-	/*
-	 * The BonoboContainer object maintains a list of the
-	 * ClientSites which it manages.  Here we add the new
-	 * ClientSite to that list.
-	 */
-	bonobo_item_container_add (container, BONOBO_OBJECT (client_site));
-
 	return object_server;
 }
 
@@ -481,7 +474,7 @@ container_new (const char *fname)
 	
 	container = g_new0 (Container, 1);
 
-	container->app = bonobo_win_new ("pdf-viewer",
+	container->app = bonobo_window_new ("pdf-viewer",
 					 "GNOME PDF viewer");
 
 	gtk_drag_dest_set (container->app,
@@ -502,7 +495,7 @@ container_new (const char *fname)
 	container->slot = gtk_event_box_new ();
 	gtk_widget_show (container->slot);
 
-	bonobo_win_set_contents (BONOBO_WIN (container->app),
+	bonobo_window_set_contents (BONOBO_WINDOW(container->app),
 				 GTK_WIDGET (container->slot));
 	gtk_widget_show_all (container->slot);
 
@@ -511,7 +504,7 @@ container_new (const char *fname)
 			     GTK_SIGNAL_FUNC (container_destroy_cb), container);
 
 	ui_container = bonobo_ui_container_new ();
-	bonobo_ui_container_set_win (ui_container, BONOBO_WIN (container->app));
+	bonobo_ui_container_set_win (ui_container, BONOBO_WINDOW(container->app));
 
 	container->ui_component = bonobo_ui_component_new ("gpdf");
 	bonobo_ui_component_set_container (