Works with cleaner Bonobo toolbar API.

[evince.git] / pdf / xpdf / gpdf.cc

diff --git a/pdf/xpdf/gpdf.cc b/pdf/xpdf/gpdf.cc
index 5fc249eb23d4c104fa1dc0602c57166a2c282aa8..e61929442b9ec59b35c82276f145b8082308b945 100644 (file)
--- a/pdf/xpdf/gpdf.cc
+++ b/pdf/xpdf/gpdf.cc
@@ -41,8 +41,6 @@ extern "C" {
 #include "Error.h"
 #include "config.h"
 
-#define UNTESTED 0
-
 poptContext ctx;
 gint  gpdf_debug=0;
 
@@ -494,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;
@@ -611,18 +609,12 @@ container_create_menus (Container *container)
 static void
 container_create_toolbar (Container *container)
 {
-       GnomeUIHandlerMenuItem *toolbar;
-
-#if UNTESTED > 0
-       gnome_ui_handler_create_menubar (container->uih);
+       GnomeUIHandlerToolbarItem *toolbar;
 
-       /*
-        * Create the basic menus out of UIInfo structures.
-        */
+       gnome_ui_handler_create_toolbar (container->uih, "pdf");
        toolbar = gnome_ui_handler_toolbar_parse_uiinfo_list_with_data (container_toolbar, container);
-       gnome_ui_handler_toolbar_add_list (container->uih, "/", menu_list);
-       gnome_ui_handler_toolbar_free_list (menu_list);
-#endif
+       gnome_ui_handler_toolbar_add_list (container->uih, "/", toolbar);
+       gnome_ui_handler_toolbar_free_list (toolbar);
 }
 
 static Container *