From: Michael Meeks <mmeeks@src.gnome.org>
Date: Mon, 23 Aug 1999 18:41:10 +0000 (+0000)
Subject: Works with cleaner Bonobo toolbar API.
X-Git-Tag: ChangeLog~9
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=de00c24f934328d7b9067c931db697a7172b768d;p=evince.git

Works with cleaner Bonobo toolbar API.
---

diff --git a/pdf/xpdf/ChangeLog b/pdf/xpdf/ChangeLog
index d9998c30..dbb1bccb 100644
--- a/pdf/xpdf/ChangeLog
+++ b/pdf/xpdf/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-23  Michael Meeks  <michael@imaginator.com>
+
+	* gpdf.cc (container_launch_component): Fix flags.
+	(container_create_toolbar): Fix for new Bonobo.
+
 1999-08-23  Michael Meeks  <michael@imaginator.com>
 
 	* Makefile.am: Added helper programs back in.
diff --git a/pdf/xpdf/bonobo-image-x-pdf.cc b/pdf/xpdf/bonobo-image-x-pdf.cc
index ac45e158..ca0dd664 100644
--- a/pdf/xpdf/bonobo-image-x-pdf.cc
+++ b/pdf/xpdf/bonobo-image-x-pdf.cc
@@ -478,15 +478,15 @@ view_create_menus (view_data_t *view_data)
 				     0, (GdkModifierType)0, page_first_cb, (gpointer)view_data);
   gnome_ui_handler_toolbar_new_item (uih, "/Prev",
 				     N_("Previous"), N_("View the previous page"), -1,
-				     GNOME_UI_HANDLER_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_FIRST,
+				     GNOME_UI_HANDLER_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_BACK,
 				     0, (GdkModifierType)0, page_prev_cb, (gpointer)view_data);
   gnome_ui_handler_toolbar_new_item (uih, "/Next",
 				     N_("Next"), N_("View the next page"), -1,
-				     GNOME_UI_HANDLER_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_FIRST,
+				     GNOME_UI_HANDLER_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_FORWARD,
 				     0, (GdkModifierType)0, page_next_cb, (gpointer)view_data);
   gnome_ui_handler_toolbar_new_item (uih, "/Last",
 				     N_("Last"), N_("View the last page"), -1,
-				     GNOME_UI_HANDLER_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_FIRST,
+				     GNOME_UI_HANDLER_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_LAST,
 				     0, (GdkModifierType)0, page_last_cb, (gpointer)view_data);
 }
 
diff --git a/pdf/xpdf/gpdf.cc b/pdf/xpdf/gpdf.cc
index ba956e43..e6192944 100644
--- a/pdf/xpdf/gpdf.cc
+++ b/pdf/xpdf/gpdf.cc
@@ -492,7 +492,7 @@ container_launch_component (GnomeClientSite *client_site,
 	 * Launch the component.
 	 */
 	object_server = gnome_object_activate_with_goad_id (
-		NULL, component_goad_id, 0, NULL);
+		NULL, component_goad_id, GOAD_ACTIVATE_SHLIB, NULL);
 
 	if (object_server == NULL)
 		return NULL;
@@ -612,7 +612,7 @@ container_create_toolbar (Container *container)
 	GnomeUIHandlerToolbarItem *toolbar;
 
 	gnome_ui_handler_create_toolbar (container->uih, "pdf");
-	toolbar = gnome_ui_handler_toolbar_parse_uiinfo_list (container->uih, container_toolbar);
+	toolbar = gnome_ui_handler_toolbar_parse_uiinfo_list_with_data (container_toolbar, container);
 	gnome_ui_handler_toolbar_add_list (container->uih, "/", toolbar);
 	gnome_ui_handler_toolbar_free_list (toolbar);
 }