Commit a2fcfc01 authored by Nat Friedman's avatar Nat Friedman

Updated for new Bonobo identifier names.

parent d7a81fef
......@@ -3,10 +3,10 @@
/*** App-specific servant structures ***/
typedef struct {
POA_GNOME_GenericFactory servant;
POA_Bonobo_GenericFactory servant;
PortableServer_POA poa;
} impl_POA_GNOME_GenericFactory;
} impl_POA_Bonobo_GenericFactory;
typedef struct {
POA_GNOME_Table servant;
......@@ -31,15 +31,15 @@ typedef struct {
} impl_POA_GNOME_GnumericFactory;
/*** Implementation stub prototypes ***/
static void impl_GNOME_GenericFactory__destroy(impl_POA_GNOME_GenericFactory * servant,
static void impl_Bonobo_GenericFactory__destroy(impl_POA_Bonobo_GenericFactory * servant,
CORBA_Environment * ev);
CORBA_Object
impl_GNOME_GenericFactory_new(impl_POA_GNOME_GenericFactory * servant,
impl_Bonobo_GenericFactory_new(impl_POA_Bonobo_GenericFactory * servant,
CORBA_Environment * ev);
CORBA_Object
impl_GNOME_GenericFactory_new_args(impl_POA_GNOME_GenericFactory * servant,
impl_Bonobo_GenericFactory_new_args(impl_POA_Bonobo_GenericFactory * servant,
CORBA_char * argument,
CORBA_Environment * ev);
......@@ -127,18 +127,18 @@ impl_GNOME_GnumericFactory_create_object(impl_POA_GNOME_GnumericFactory * servan
CORBA_Environment * ev);
/*** epv structures ***/
static PortableServer_ServantBase__epv impl_GNOME_GenericFactory_base_epv =
static PortableServer_ServantBase__epv impl_Bonobo_GenericFactory_base_epv =
{
NULL, /* _private data */
(gpointer) & impl_GNOME_GenericFactory__destroy, /* finalize routine */
(gpointer) & impl_Bonobo_GenericFactory__destroy, /* finalize routine */
NULL, /* default_POA routine */
};
static POA_GNOME_GenericFactory__epv impl_GNOME_GenericFactory_epv =
static POA_Bonobo_GenericFactory__epv impl_Bonobo_GenericFactory_epv =
{
NULL, /* _private */
(gpointer) & impl_GNOME_GenericFactory_new,
(gpointer) & impl_Bonobo_GenericFactory_new,
(gpointer) & impl_GNOME_GenericFactory_new_args,
(gpointer) & impl_Bonobo_GenericFactory_new_args,
};
......@@ -210,7 +210,7 @@ static POA_GNOME_GnumericFactory__epv impl_GNOME_GnumericFactory_epv =
{
NULL, /* _private */
};
static POA_GNOME_GenericFactory__epv impl_GNOME_GnumericFactory_GNOME_GenericFactory_epv =
static POA_Bonobo_GenericFactory__epv impl_GNOME_GnumericFactory_Bonobo_GenericFactory_epv =
{
NULL, /* _private */
(gpointer) & impl_GNOME_GnumericFactory_supports,
......@@ -218,10 +218,10 @@ static POA_GNOME_GenericFactory__epv impl_GNOME_GnumericFactory_GNOME_GenericFac
};
/*** vepv structures ***/
static POA_GNOME_GenericFactory__vepv impl_GNOME_GenericFactory_vepv =
static POA_Bonobo_GenericFactory__vepv impl_Bonobo_GenericFactory_vepv =
{
&impl_GNOME_GenericFactory_base_epv,
&impl_GNOME_GenericFactory_epv,
&impl_Bonobo_GenericFactory_base_epv,
&impl_Bonobo_GenericFactory_epv,
};
static POA_GNOME_Table__vepv impl_GNOME_Table_vepv =
......@@ -246,22 +246,22 @@ static POA_GNOME_Gnumeric__vepv impl_GNOME_Gnumeric_vepv =
static POA_GNOME_GnumericFactory__vepv impl_GNOME_GnumericFactory_vepv =
{
&impl_GNOME_GnumericFactory_base_epv,
&impl_GNOME_GnumericFactory_GNOME_GenericFactory_epv,
&impl_GNOME_GnumericFactory_Bonobo_GenericFactory_epv,
&impl_GNOME_GnumericFactory_epv,
};
/*** Stub implementations ***/
static GNOME_GenericFactory
impl_GNOME_GenericFactory__create(PortableServer_POA poa, CORBA_Environment * ev)
static Bonobo_GenericFactory
impl_Bonobo_GenericFactory__create(PortableServer_POA poa, CORBA_Environment * ev)
{
GNOME_GenericFactory retval;
impl_POA_GNOME_GenericFactory *newservant;
Bonobo_GenericFactory retval;
impl_POA_Bonobo_GenericFactory *newservant;
PortableServer_ObjectId *objid;
newservant = g_new0(impl_POA_GNOME_GenericFactory, 1);
newservant->servant.vepv = &impl_GNOME_GenericFactory_vepv;
newservant = g_new0(impl_POA_Bonobo_GenericFactory, 1);
newservant->servant.vepv = &impl_Bonobo_GenericFactory_vepv;
newservant->poa = poa;
POA_GNOME_GenericFactory__init((PortableServer_Servant) newservant, ev);
POA_Bonobo_GenericFactory__init((PortableServer_Servant) newservant, ev);
objid = PortableServer_POA_activate_object(poa, newservant, ev);
CORBA_free(objid);
retval = PortableServer_POA_servant_to_reference(poa, newservant, ev);
......@@ -271,15 +271,15 @@ impl_GNOME_GenericFactory__create(PortableServer_POA poa, CORBA_Environment * ev
/* You shouldn't call this routine directly without first deactivating the servant... */
static void
impl_GNOME_GenericFactory__destroy(impl_POA_GNOME_GenericFactory * servant, CORBA_Environment * ev)
impl_Bonobo_GenericFactory__destroy(impl_POA_Bonobo_GenericFactory * servant, CORBA_Environment * ev)
{
POA_GNOME_GenericFactory__fini((PortableServer_Servant) servant, ev);
POA_Bonobo_GenericFactory__fini((PortableServer_Servant) servant, ev);
g_free(servant);
}
CORBA_Object
impl_GNOME_GenericFactory_new(impl_POA_GNOME_GenericFactory * servant,
impl_Bonobo_GenericFactory_new(impl_POA_Bonobo_GenericFactory * servant,
CORBA_Environment * ev)
{
CORBA_Object retval;
......@@ -288,7 +288,7 @@ impl_GNOME_GenericFactory_new(impl_POA_GNOME_GenericFactory * servant,
}
CORBA_Object
impl_GNOME_GenericFactory_new_args(impl_POA_GNOME_GenericFactory * servant,
impl_Bonobo_GenericFactory_new_args(impl_POA_Bonobo_GenericFactory * servant,
CORBA_char * argument,
CORBA_Environment * ev)
{
......
#include <bonobo.idl>
#include <Bonobo.idl>
module GNOME {
module Gnumeric {
......@@ -215,7 +215,7 @@ module GNOME {
double row_height (in long row);
};
interface Workbook : GNOME::Unknown {
interface Workbook : Bonobo::Unknown {
exception NameExists {};
Sheet sheet_new (in string name) raises (NameExists);
......@@ -256,11 +256,11 @@ module GNOME {
//
// Interfaces for embedding Gnumeric with Bonobo
//
interface WorkbookFactory : GNOME::GenericFactory {
interface WorkbookFactory : Bonobo::GenericFactory {
Workbook read (in string filename);
};
interface Grid : GNOME::Embeddable {
interface Grid : Bonobo::Embeddable {
Sheet get_sheet ();
void set_header_visibility (in boolean cols, in boolean rows);
......@@ -271,11 +271,11 @@ module GNOME {
// Interfaces for accessing value sets from linear arrays.
// Mainly used for graphics.
//
interface VectorNotify : GNOME::Unknown {
interface VectorNotify : Bonobo::Unknown {
void changed (in short low, in short high);
};
interface Vector : GNOME::Unknown {
interface Vector : Bonobo::Unknown {
exception OutOfRange {};
exception Failed {};
......
......@@ -9,7 +9,7 @@
#include <config.h>
#include <gnome.h>
#include <libgnorba/gnorba.h>
#include <bonobo/gnome-bonobo.h>
#include <bonobo.h>
#include "sheet.h"
#include "main.h"
#include "embeddable-grid.h"
......
......@@ -28,7 +28,7 @@ static WorkbookFactoryServant workbook_factory_servant;
static GNOME_Gnumeric_WorkbookFactory gnumeric_workbook_factory;
static PortableServer_ServantBase__epv gnumeric_workbook_factory_base_epv;
static POA_GNOME_GenericFactory__epv gnumeric_workbook_generic_factory_epv;
static POA_Bonobo_GenericFactory__epv gnumeric_workbook_generic_factory_epv;
static POA_GNOME_Gnumeric_WorkbookFactory__epv gnumeric_workbook_factory_epv;
static POA_GNOME_Gnumeric_WorkbookFactory__vepv gnumeric_workbook_factory_vepv;
......@@ -75,7 +75,7 @@ WorkbookFactory_create_object (PortableServer_Servant servant,
if (strcmp (goad_id, "IDL:GNOME:Gnumeric:Workbook:1.0") != 0){
if (strcmp (goad_id, "GOADID:GNOME:Gnumeric:Workbook:1.0") != 0){
CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
ex_GNOME_GenericFactory_CannotActivate,
ex_Bonobo_GenericFactory_CannotActivate,
NULL);
return CORBA_OBJECT_NIL;
}
......@@ -104,7 +104,7 @@ GNOME_Gnumeric_WorkbookFactory__create (PortableServer_POA poa, CORBA_Environmen
gnumeric_workbook_factory_vepv.GNOME_Gnumeric_WorkbookFactory_epv =
&gnumeric_workbook_factory_epv;
gnumeric_workbook_factory_vepv.GNOME_GenericFactory_epv =
gnumeric_workbook_factory_vepv.Bonobo_GenericFactory_epv =
&gnumeric_workbook_generic_factory_epv;
gnumeric_workbook_factory_vepv._base_epv =
&gnumeric_workbook_factory_base_epv;
......
......@@ -7,7 +7,7 @@
#include <config.h>
#include <libgnorba/gnome-factory.h>
#include <gnome.h>
#include <bonobo/gnome-object.h>
#include <bonobo/bonobo-object.h>
#include "sheet.h"
#include "gnumeric.h"
#include "Gnumeric.h"
......@@ -186,8 +186,8 @@ Workbook_corba_class_init ()
gnome_gnumeric_workbook_vepv.GNOME_Gnumeric_Workbook_epv =
&gnome_gnumeric_workbook_epv;
gnome_gnumeric_workbook_vepv.GNOME_Unknown_epv =
gnome_object_get_epv ();
gnome_gnumeric_workbook_vepv.Bonobo_Unknown_epv =
bonobo_object_get_epv ();
gnome_gnumeric_workbook_epv.sheet_new = Workbook_sheet_new;
gnome_gnumeric_workbook_epv.sheet_lookup = Workbook_sheet_lookup;
......
......@@ -11,8 +11,8 @@
*
*/
#include <config.h>
#include <bonobo/gnome-embeddable.h>
#include <bonobo/gnome-embeddable-factory.h>
#include <bonobo/bonobo-embeddable.h>
#include <bonobo/bonobo-embeddable-factory.h>
#include "Gnumeric.h"
#include "sheet.h"
#include "embeddable-grid.h"
......@@ -23,12 +23,12 @@
POA_GNOME_Gnumeric_Grid__epv embeddable_grid_epv;
POA_GNOME_Gnumeric_Grid__vepv embeddable_grid_vepv;
static GnomeEmbeddableFactory *gnome_embeddable_grid_factory;
static BonoboEmbeddableFactory *bonobo_embeddable_grid_factory;
static inline EmbeddableGrid *
embeddable_grid_from_servant (PortableServer_Servant servant)
{
return EMBEDDABLE_GRID (gnome_object_from_servant (servant));
return EMBEDDABLE_GRID (bonobo_object_from_servant (servant));
}
static GNOME_Gnumeric_Sheet
......@@ -83,17 +83,17 @@ Grid_get_header_visibility (PortableServer_Servant servant,
*row_headers_visible = eg->show_row_title;
}
static GnomeView *
embeddable_grid_view_factory (GnomeEmbeddable *embeddable,
const GNOME_ViewFrame view_frame,
static BonoboView *
embeddable_grid_view_factory (BonoboEmbeddable *embeddable,
const Bonobo_ViewFrame view_frame,
void *data)
{
GnomeView *view;
BonoboView *view;
EmbeddableGrid *eg = EMBEDDABLE_GRID (embeddable);
view = grid_view_new (eg);
return GNOME_VIEW (view);
return BONOBO_VIEW (view);
}
static void
......@@ -102,8 +102,8 @@ init_embeddable_grid_corba_class (void)
/*
* vepv
*/
embeddable_grid_vepv.GNOME_Unknown_epv = gnome_object_get_epv ();
embeddable_grid_vepv.GNOME_Embeddable_epv = gnome_embeddable_get_epv ();
embeddable_grid_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();
embeddable_grid_vepv.Bonobo_Embeddable_epv = bonobo_embeddable_get_epv ();
embeddable_grid_vepv.GNOME_Gnumeric_Grid_epv = &embeddable_grid_epv;
/*
......@@ -126,12 +126,12 @@ embeddable_grid_init (GtkObject *object)
}
static CORBA_Object
create_embeddable_grid (GnomeObject *object)
create_embeddable_grid (BonoboObject *object)
{
POA_GNOME_Gnumeric_Grid *servant;
CORBA_Environment ev;
servant = (POA_GNOME_Gnumeric_Grid *) g_new0 (GnomeObjectServant, 1);
servant = (POA_GNOME_Gnumeric_Grid *) g_new0 (BonoboObjectServant, 1);
servant->vepv = &embeddable_grid_vepv;
CORBA_exception_init (&ev);
......@@ -143,7 +143,7 @@ create_embeddable_grid (GnomeObject *object)
}
CORBA_exception_free (&ev);
return gnome_object_activate_servant (object, servant);
return bonobo_object_activate_servant (object, servant);
}
static void
......@@ -174,15 +174,15 @@ embeddable_grid_new_anon (void)
embeddable_grid = gtk_type_new (EMBEDDABLE_GRID_TYPE);
embeddable_grid_init_anon (embeddable_grid);
corba_embeddable_grid = create_embeddable_grid (GNOME_OBJECT (embeddable_grid));
corba_embeddable_grid = create_embeddable_grid (BONOBO_OBJECT (embeddable_grid));
if (corba_embeddable_grid == CORBA_OBJECT_NIL){
gtk_object_destroy (GTK_OBJECT (embeddable_grid));
return NULL;
}
gnome_embeddable_construct (
GNOME_EMBEDDABLE (embeddable_grid), corba_embeddable_grid,
bonobo_embeddable_construct (
BONOBO_EMBEDDABLE (embeddable_grid), corba_embeddable_grid,
embeddable_grid_view_factory, NULL);
return embeddable_grid;
......@@ -195,7 +195,7 @@ embeddable_grid_new (Workbook *wb, Sheet *sheet)
GNOME_Gnumeric_Grid corba_embeddable_grid;
embeddable_grid = gtk_type_new (EMBEDDABLE_GRID_TYPE);
corba_embeddable_grid = create_embeddable_grid (GNOME_OBJECT (embeddable_grid));
corba_embeddable_grid = create_embeddable_grid (BONOBO_OBJECT (embeddable_grid));
if (corba_embeddable_grid == CORBA_OBJECT_NIL){
gtk_object_destroy (GTK_OBJECT (embeddable_grid));
......@@ -208,17 +208,17 @@ embeddable_grid_new (Workbook *wb, Sheet *sheet)
/*
* We keep a handle to the Workbook
*/
gnome_object_ref (GNOME_OBJECT (embeddable_grid->workbook));
bonobo_object_ref (BONOBO_OBJECT (embeddable_grid->workbook));
gnome_embeddable_construct (
GNOME_EMBEDDABLE (embeddable_grid), corba_embeddable_grid,
bonobo_embeddable_construct (
BONOBO_EMBEDDABLE (embeddable_grid), corba_embeddable_grid,
embeddable_grid_view_factory, NULL);
return embeddable_grid;
}
static GnomeObject *
embeddable_grid_factory (GnomeEmbeddableFactory *This, void *data)
static BonoboObject *
embeddable_grid_factory (BonoboEmbeddableFactory *This, void *data)
{
EmbeddableGrid *embeddable_grid;
......@@ -231,7 +231,7 @@ embeddable_grid_factory (GnomeEmbeddableFactory *This, void *data)
* Populate verb list here.
*/
return GNOME_OBJECT (embeddable_grid);
return BONOBO_OBJECT (embeddable_grid);
}
GtkType
......@@ -250,7 +250,7 @@ embeddable_grid_get_type (void)
NULL, /* reserved 2 */
(GtkClassInitFunc) NULL
};
type = gtk_type_unique (gnome_embeddable_get_type (), &info);
type = gtk_type_unique (bonobo_embeddable_get_type (), &info);
}
return type;
......@@ -259,7 +259,7 @@ embeddable_grid_get_type (void)
void
EmbeddableGridFactory_init (void)
{
gnome_embeddable_grid_factory = gnome_embeddable_factory_new (
bonobo_embeddable_grid_factory = bonobo_embeddable_factory_new (
"GNOME:Gnumeric:GridFactory:1.0",
embeddable_grid_factory, NULL);
}
......@@ -279,7 +279,7 @@ grid_view_get_type (void)
sizeof (GridViewClass),
NULL, NULL, NULL, NULL, NULL
};
type = gtk_type_unique (gnome_view_get_type (), &info);
type = gtk_type_unique (bonobo_view_get_type (), &info);
}
return type;
......@@ -308,18 +308,18 @@ grid_view_activate (GridView *grid_view)
/* gtk_signal_emit_by_name (GTK_OBJECT (grid_view->view.plug), "set_focus",
grid_view->sheet_view->sheet_view);*/
gnome_view_activate_notify (GNOME_VIEW (grid_view), TRUE);
bonobo_view_activate_notify (BONOBO_VIEW (grid_view), TRUE);
}
GnomeView *
BonoboView *
grid_view_new (EmbeddableGrid *eg)
{
GridView *grid_view = NULL;
GNOME_View corba_grid_view;
Bonobo_View corba_grid_view;
grid_view = gtk_type_new (GRID_VIEW_TYPE);
corba_grid_view = gnome_view_corba_object_create (GNOME_OBJECT (grid_view));
corba_grid_view = bonobo_view_corba_object_create (BONOBO_OBJECT (grid_view));
if (corba_grid_view == CORBA_OBJECT_NIL){
gtk_object_destroy (GTK_OBJECT (corba_grid_view));
return NULL;
......@@ -329,18 +329,18 @@ grid_view_new (EmbeddableGrid *eg)
grid_view->sheet_view = sheet_new_sheet_view (eg->sheet);
gtk_widget_show (GTK_WIDGET (grid_view->sheet_view));
g_warning ("FIXME: view_construct API changed");
/* gnome_view_construct (
GNOME_VIEW (grid_view), corba_grid_view,
/* bonobo_view_construct (
BONOBO_VIEW (grid_view), corba_grid_view,
GTK_WIDGET (grid_view->sheet_view));*/
eg->views = g_list_prepend (eg->views, grid_view);
gtk_signal_connect (GTK_OBJECT (grid_view), "destroy",
GTK_SIGNAL_FUNC (grid_view_destroy), NULL);
gtk_signal_connect (GTK_OBJECT (grid_view), "view_activate",
gtk_signal_connect (GTK_OBJECT (grid_view), "activate",
GTK_SIGNAL_FUNC (grid_view_activate), NULL);
return GNOME_VIEW (grid_view);
return BONOBO_VIEW (grid_view);
}
void
......
#ifndef GNUMERIC_EMBEDDABLE_GRID_H
#define GNUMERIC_EMBEDDABLE_GRID_H
#include <bonobo/gnome-embeddable.h>
#include <bonobo/bonobo-embeddable.h>
#define EMBEDDABLE_GRID_TYPE (embeddable_grid_get_type ())
#define EMBEDDABLE_GRID(o) (GTK_CHECK_CAST ((o), EMBEDDABLE_GRID_TYPE, EmbeddableGrid))
......@@ -10,13 +10,13 @@
#define IS_EMBEDDABLE_GRID_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), EMBEDDABLE_GRID_TYPE))
/*
* The GnomeEmbeddable object
* The BonoboEmbeddable object
*/
struct _EmbeddableGrid;
typedef struct _EmbeddableGrid EmbeddableGrid;
struct _EmbeddableGrid {
GnomeEmbeddable embeddable;
BonoboEmbeddable embeddable;
/* The associated workbook */
Workbook *workbook;
......@@ -32,7 +32,7 @@ struct _EmbeddableGrid {
};
typedef struct {
GnomeEmbeddableClass parent_class;
BonoboEmbeddableClass parent_class;
} EmbeddableGridClass;
GtkType embeddable_grid_get_type (void);
......@@ -48,7 +48,7 @@ void embeddable_grid_set_header_visibility (EmbeddableGrid *eg,
gboolean row_headers_visible);
/*
* The GnomeView object
* The BonoboView object
*/
#define GRID_VIEW_TYPE (grid_view_get_type ())
#define GRID_VIEW(o) (GTK_CHECK_CAST ((o), GRID_VIEW_TYPE, GridView))
......@@ -60,17 +60,17 @@ struct _GridView;
typedef struct _GridView GridView;
struct _GridView {
GnomeView view;
BonoboView view;
SheetView *sheet_view;
EmbeddableGrid *embeddable;
};
typedef struct {
GnomeView parent_class;
BonoboView parent_class;
} GridViewClass;
GtkType grid_view_get_type (void);
GnomeView *grid_view_new (EmbeddableGrid *container);
BonoboView *grid_view_new (EmbeddableGrid *container);
#endif /* GNUMERIC_EMBEDDABLE_GRID_H */
......@@ -201,7 +201,7 @@ workbook_try_read (const char *filename, char **msg)
result = workbook_load_from (wb, filename);
if (result != NULL) {
#ifdef ENABLE_BONOBO
gnome_object_destroy (GNOME_OBJECT (wb));
bonobo_object_destroy (BONOBO_OBJECT (wb));
#else
gtk_object_destroy (GTK_OBJECT (wb));
#endif
......@@ -335,7 +335,7 @@ workbook_import (Workbook *parent, const char *filename)
error = fo->open (wb, filename);
if (error != NULL) {
#ifdef ENABLE_BONOBO
gnome_object_destroy (GNOME_OBJECT (wb));
bonobo_object_destroy (BONOBO_OBJECT (wb));
#else
gtk_object_destroy (GTK_OBJECT (wb));
#endif
......
......@@ -891,7 +891,7 @@ gnumeric_sheet_drag_data_get (GtkWidget *widget,
guint time)
{
#ifdef ENABLE_BONOBO
GnomeMoniker *moniker;
BonoboMoniker *moniker;
Sheet *sheet = GNUMERIC_SHEET (widget)->sheet_view->sheet;
Workbook *wb = sheet->workbook;
char *s;
......@@ -901,15 +901,15 @@ gnumeric_sheet_drag_data_get (GtkWidget *widget,
if (wb->filename == NULL)
return;
moniker = gnome_moniker_new ();
gnome_moniker_set_server (
moniker = bonobo_moniker_new ();
bonobo_moniker_set_server (
moniker,
"IDL:GNOME:Gnumeric:Workbook:1.0",
wb->filename);
gnome_moniker_append_item_name (
bonobo_moniker_append_item_name (
moniker, "Sheet1");
s = gnome_moniker_get_as_string (moniker);
s = bonobo_moniker_get_as_string (moniker);
gtk_object_destroy (GTK_OBJECT (moniker));
gtk_selection_data_set (selection_data, selection_data->target, 8, s, strlen (s)+1);
......
......@@ -891,7 +891,7 @@ gnumeric_sheet_drag_data_get (GtkWidget *widget,
guint time)
{
#ifdef ENABLE_BONOBO
GnomeMoniker *moniker;
BonoboMoniker *moniker;
Sheet *sheet = GNUMERIC_SHEET (widget)->sheet_view->sheet;
Workbook *wb = sheet->workbook;
char *s;
......@@ -901,15 +901,15 @@ gnumeric_sheet_drag_data_get (GtkWidget *widget,
if (wb->filename == NULL)
return;
moniker = gnome_moniker_new ();
gnome_moniker_set_server (
moniker = bonobo_moniker_new ();
bonobo_moniker_set_server (
moniker,
"IDL:GNOME:Gnumeric:Workbook:1.0",
wb->filename);
gnome_moniker_append_item_name (
bonobo_moniker_append_item_name (
moniker, "Sheet1");
s = gnome_moniker_get_as_string (moniker);
s = bonobo_moniker_get_as_string (moniker);
gtk_object_destroy (GTK_OBJECT (moniker));
gtk_selection_data_set (selection_data, selection_data->target, 8, s, strlen (s)+1);
......
......@@ -157,7 +157,7 @@ gnumeric_main (void *closure, int argc, char *argv [])
if (opened_workbook) {
#ifdef ENABLE_BONOBO
gnome_object_unref (GNOME_OBJECT (new_book));
bonobo_object_unref (BONOBO_OBJECT (new_book));
#else
gtk_object_unref (GTK_OBJECT (new_book));
#endif
......
......@@ -157,7 +157,7 @@ gnumeric_main (void *closure, int argc, char *argv [])
if (opened_workbook) {
#ifdef ENABLE_BONOBO
gnome_object_unref (GNOME_OBJECT (new_book));
bonobo_object_unref (BONOBO_OBJECT (new_book));
#else
gtk_object_unref (GTK_OBJECT (new_book));
#endif
......
......@@ -875,7 +875,7 @@ sheet_view_adjust_preferences (SheetView *sheet_view)
#if 0
#ifdef ENABLE_BONOBO
void
sheet_view_insert_object (SheetView *sheet_view, GnomeObjectClient *object)
sheet_view_insert_object (SheetView *sheet_view, BonoboObjectClient *object)
{
/* GtkWidget *view;*/
......
......@@ -13,7 +13,7 @@
*
* Perhaps we should relay "realize" and get from the Bonobo
* versions both the GnomeCanvasItem to use for the gnumeric
* display and the GnomeViewFrame that logically "controls" this
* display and the BonoboViewFrame that logically "controls" this
* to keep track of the view frames.
*/
#include <config.h>
......@@ -24,10 +24,10 @@
#include "gnumeric.h"
#include "gnumeric-util.h"
#include "sheet-object-bonobo.h"
#include <bonobo/gnome-container.h>
#include <bonobo/gnome-view-frame.h>
#include <bonobo/gnome-client-site.h>
#include <bonobo/gnome-embeddable.h>
#include <bonobo/bonobo-container.h>
#include <bonobo/bonobo-view-frame.h>
#include <bonobo/bonobo-client-site.h>
#include <bonobo/bonobo-embeddable.h>
static SheetObject *sheet_object_bonobo_parent_class;
......@@ -39,7 +39,7 @@ sheet_object_bonobo_destroy (GtkObject *object)
SheetObjectBonobo *sob = SHEET_OBJECT_BONOBO (object);
if (sob->client_site)
gnome_object_destroy (GNOME_OBJECT (sob->client_site));
bonobo_object_destroy (BONOBO_OBJECT (sob->client_site));
sob->client_site = NULL;
......@@ -86,13 +86,13 @@ gboolean
sheet_object_bonobo_load_from_file (SheetObjectBonobo *sob, const char *fname)
{
CORBA_Environment ev;
GNOME_PersistFile pf;
GNOME_PersistStream ps;
Bonobo_PersistFile pf;
Bonobo_PersistStream ps;
CORBA_exception_init (&ev);