From: Michael Meeks <mmeeks@src.gnome.org>
Date: Sun, 22 Aug 1999 22:54:36 +0000 (+0000)
Subject: Fixes to work with latest bonobo.
X-Git-Tag: ChangeLog~14
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=6091292b5aead4bde60bd17dac218b9256012424;p=evince.git

Fixes to work with latest bonobo.
---

diff --git a/pdf/xpdf/bonobo-image-x-pdf.cc b/pdf/xpdf/bonobo-image-x-pdf.cc
index 2881532e..8d49a335 100644
--- a/pdf/xpdf/bonobo-image-x-pdf.cc
+++ b/pdf/xpdf/bonobo-image-x-pdf.cc
@@ -456,6 +456,18 @@ view_create_menus (view_data_t *view_data)
 				     N_("First"), N_("View the first page"), -1,
 				     GNOME_UI_HANDLER_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_FIRST,
 				     0, (GdkModifierType)0, page_first_cb, (gpointer)view_data);
+  gnome_ui_handler_toolbar_new_item (uih, "/Prev", GNOME_UI_HANDLER_MENU_ITEM,
+				     N_("Previous"), N_("View the previous page"), -1,
+				     GNOME_UI_HANDLER_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_FIRST,
+				     0, (GdkModifierType)0, page_prev_cb, (gpointer)view_data);
+  gnome_ui_handler_toolbar_new_item (uih, "/Next", GNOME_UI_HANDLER_MENU_ITEM,
+				     N_("Next"), N_("View the next page"), -1,
+				     GNOME_UI_HANDLER_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_FIRST,
+				     0, (GdkModifierType)0, page_next_cb, (gpointer)view_data);
+  gnome_ui_handler_toolbar_new_item (uih, "/Last", GNOME_UI_HANDLER_MENU_ITEM,
+				     N_("Last"), N_("View the last page"), -1,
+				     GNOME_UI_HANDLER_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_FIRST,
+				     0, (GdkModifierType)0, page_last_cb, (gpointer)view_data);
 #endif
 				 
 }
@@ -770,8 +782,8 @@ main (int argc, char *argv [])
   
   gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
   gtk_widget_set_default_visual (gdk_rgb_get_visual ());
-  bonobo_activate ();
-  gtk_main ();
+
+  bonobo_main ();
   
   CORBA_exception_free (&ev);
   
diff --git a/pdf/xpdf/gpdf.cc b/pdf/xpdf/gpdf.cc
index d7e91347..633ab234 100644
--- a/pdf/xpdf/gpdf.cc
+++ b/pdf/xpdf/gpdf.cc
@@ -424,7 +424,7 @@ container_set_view (Container *container, Component *component)
 	/*
 	 * Create the remote view and the local ViewFrame.
 	 */
-	view_frame = gnome_client_site_embeddable_new_view (component->client_site);
+	view_frame = gnome_client_site_new_view (component->client_site);
 	component->view_frame = view_frame;
 
 	/*
@@ -690,6 +690,7 @@ main (int argc, char **argv)
 
   if (bonobo_init (orb, NULL, NULL) == FALSE)
     g_error (_("Could not initialize Bonobo!\n"));
+  bonobo_activate ();
 
   view_files = poptGetArgs (ctx);
 
@@ -704,8 +705,8 @@ main (int argc, char **argv)
   
   poptFreeContext (ctx);
 
-  bonobo_activate ();  
   gtk_main ();
 	
   return 0;
 }
+