diff options
67 files changed, 657 insertions, 621 deletions
diff --git a/ChangeLog-20000414 b/ChangeLog-20000414 index 4089f70f3..8189337ef 100644 --- a/ChangeLog-20000414 +++ b/ChangeLog-20000414 @@ -1,3 +1,26 @@ +2000-01-26 Maciej Stachowiak <mjs@eazel.com> + + * components/help/hyperbola-main.c, + components/help/hyperbola-nav-tree.c, + components/history/ntl-history-view.c, components/html/main.c, + components/html/ntl-web-browser.c, + components/websearch/ntl-web-search.c, idl/nautilus.idl, + libnautilus/gnome-icon-container.c, + libnautilus/gnome-progressive-loader.c, + libnautilus/gnome-progressive-loader.h, libnautilus/libnautilus.h, + libnautilus/ntl-content-view-frame.c, + libnautilus/ntl-meta-view-frame.c, libnautilus/ntl-view-frame.c, + libnautilus/ntl-view-frame.h, src/nautilus.h, + src/ntl-index-panel.c, src/ntl-view-bonobo-control.c, + src/ntl-view-bonobo-subdoc.c, src/ntl-view-frame-svr.c, + src/ntl-view-nautilus.c, src/ntl-view-private.h, src/ntl-view.c, + src/ntl-view.h, src/ntl-window.c, src/ntl-window.h, + src/file-manager/dfos-corba.h, src/file-manager/dfos-xfer.c, + src/file-manager/dfos-xfer.h, src/file-manager/fm-main.c: Build + with the recent Bonobo global renaming, and Havoc's changes. A + patch from Kjartan Maraas <kmaraas@online.no> and scripts from Nat + Friedman <nat@helixcode.com> were a very helpful starting point. + 2000-01-26 Havoc Pennington <hp@pobox.com> * src/nautilus-gconf.h, src/nautilus-gconf.c: Trivial files I'd diff --git a/components/help/hyperbola-main.c b/components/help/hyperbola-main.c index 6560aaf91..01b30b45a 100644 --- a/components/help/hyperbola-main.c +++ b/components/help/hyperbola-main.c @@ -1,9 +1,10 @@ #include "config.h" #include <libnautilus/libnautilus.h> +#include <libgnorba/gnorba.h> /* In hyperbola-nav-tree.c */ -extern GnomeObject *hyperbola_navigation_tree_new(void); +extern BonoboObject *hyperbola_navigation_tree_new(void); static int object_count = 0; @@ -16,10 +17,10 @@ do_destroy(GtkObject *obj) gtk_main_quit(); } -static GnomeObject * -make_obj(GnomeGenericFactory *Factory, const char *goad_id, void *closure) +static BonoboObject * +make_obj(BonoboGenericFactory *Factory, const char *goad_id, void *closure) { - GnomeObject *retval = NULL; + BonoboObject *retval = NULL; if(!strcmp(goad_id, "hyperbola_navigation_tree")) retval = hyperbola_navigation_tree_new(); @@ -35,7 +36,7 @@ make_obj(GnomeGenericFactory *Factory, const char *goad_id, void *closure) int main(int argc, char *argv[]) { - GnomeGenericFactory *factory; + BonoboGenericFactory *factory; CORBA_ORB orb; CORBA_Environment ev; @@ -44,7 +45,7 @@ int main(int argc, char *argv[]) GNORBA_INIT_SERVER_FUNC, &ev); bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL); - factory = gnome_generic_factory_new_multi("hyperbola_factory", make_obj, NULL); + factory = bonobo_generic_factory_new_multi("hyperbola_factory", make_obj, NULL); do { bonobo_main(); diff --git a/components/help/hyperbola-nav-tree.c b/components/help/hyperbola-nav-tree.c index a0444c424..498276070 100644 --- a/components/help/hyperbola-nav-tree.c +++ b/components/help/hyperbola-nav-tree.c @@ -13,7 +13,7 @@ typedef struct { /* Temporary prototypes until hyperbola-nav-tree.h compiles. */ GtkType hyperbola_navigation_tree_get_type(void); -GnomeObject *hyperbola_navigation_tree_new(void); +BonoboObject *hyperbola_navigation_tree_new(void); static void hyperbola_navigation_tree_select_row(GtkCTree *ctree, GtkCTreeNode *node, @@ -63,7 +63,7 @@ ctree_populate(HyperbolaNavigationTree *view) g_tree_traverse(view->doc_tree->children, ctree_populate_subnode, G_IN_ORDER, &subpi); } -GnomeObject * +BonoboObject * hyperbola_navigation_tree_new(void) { static const char *titles[] = {"Document Tree"}; @@ -98,7 +98,7 @@ hyperbola_navigation_tree_new(void) gtk_widget_show(view->ctree); gtk_widget_show(wtmp); - return nautilus_view_frame_get_gnome_object(view->view_frame); + return nautilus_view_frame_get_bonobo_object(view->view_frame); } static void diff --git a/components/history/nautilus-history-view.c b/components/history/nautilus-history-view.c index c393705b4..e345b9617 100644 --- a/components/history/nautilus-history-view.c +++ b/components/history/nautilus-history-view.c @@ -28,6 +28,8 @@ #include "config.h" #include <libnautilus/libnautilus.h> +#include <libgnome/gnome-i18n.h> +#include <libgnorba/gnorba.h> typedef struct { NautilusViewFrame *view; @@ -36,7 +38,7 @@ typedef struct { gint notify_count, last_row; - GnomeUIHandler *uih; + BonoboUIHandler *uih; } HistoryView; static void @@ -134,10 +136,10 @@ do_destroy(GtkObject *obj) gtk_main_quit(); } -static GnomeObject * make_obj(GnomeGenericFactory *Factory, const char *goad_id, gpointer closure) +static BonoboObject * make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure) { GtkWidget *frame, *clist, *wtmp; - GnomeObject *ctl; + BonoboObject *ctl; char *col_titles[1]; HistoryView *hview; @@ -149,7 +151,7 @@ static GnomeObject * make_obj(GnomeGenericFactory *Factory, const char *goad_id, gtk_signal_connect(GTK_OBJECT(frame), "destroy", do_destroy, NULL); object_count++; - ctl = nautilus_view_frame_get_gnome_object(NAUTILUS_VIEW_FRAME(frame)); + ctl = nautilus_view_frame_get_bonobo_object(NAUTILUS_VIEW_FRAME(frame)); /* create interface */ col_titles[0] = _("Path"); @@ -179,18 +181,18 @@ static GnomeObject * make_obj(GnomeGenericFactory *Factory, const char *goad_id, #if 0 { - GNOME_UIHandler remote_uih; + Bonobo_UIHandler remote_uih; GnomeUIInfo history_menu[] = { GNOMEUIINFO_MENU_NEW_ITEM("_New", "Testing", NULL, NULL), GNOMEUIINFO_END }; - remote_uih = gnome_control_get_remote_ui_handler(GNOME_CONTROL(ctl)); - hview->uih = gnome_ui_handler_new(); - gnome_ui_handler_set_container(hview->uih, remote_uih); + remote_uih = bonobo_control_get_remote_ui_handler(BONOBO_CONTROL(ctl)); + hview->uih = bonobo_ui_handler_new(); + bonobo_ui_handler_set_container(hview->uih, remote_uih); - gnome_ui_handler_menu_add_tree(hview->uih, "/History", - gnome_ui_handler_menu_parse_uiinfo_tree(history_menu)); + bonobo_ui_handler_menu_add_tree(hview->uih, "/History", + bonobo_ui_handler_menu_parse_uiinfo_tree(history_menu)); } #endif @@ -199,7 +201,7 @@ static GnomeObject * make_obj(GnomeGenericFactory *Factory, const char *goad_id, int main(int argc, char *argv[]) { - GnomeGenericFactory *factory; + BonoboGenericFactory *factory; CORBA_ORB orb; CORBA_Environment ev; @@ -208,7 +210,7 @@ int main(int argc, char *argv[]) GNORBA_INIT_SERVER_FUNC, &ev); bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL); - factory = gnome_generic_factory_new_multi("ntl_history_view_factory", make_obj, NULL); + factory = bonobo_generic_factory_new_multi("ntl_history_view_factory", make_obj, NULL); do { bonobo_main(); diff --git a/components/history/ntl-history-view.c b/components/history/ntl-history-view.c index c393705b4..e345b9617 100644 --- a/components/history/ntl-history-view.c +++ b/components/history/ntl-history-view.c @@ -28,6 +28,8 @@ #include "config.h" #include <libnautilus/libnautilus.h> +#include <libgnome/gnome-i18n.h> +#include <libgnorba/gnorba.h> typedef struct { NautilusViewFrame *view; @@ -36,7 +38,7 @@ typedef struct { gint notify_count, last_row; - GnomeUIHandler *uih; + BonoboUIHandler *uih; } HistoryView; static void @@ -134,10 +136,10 @@ do_destroy(GtkObject *obj) gtk_main_quit(); } -static GnomeObject * make_obj(GnomeGenericFactory *Factory, const char *goad_id, gpointer closure) +static BonoboObject * make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure) { GtkWidget *frame, *clist, *wtmp; - GnomeObject *ctl; + BonoboObject *ctl; char *col_titles[1]; HistoryView *hview; @@ -149,7 +151,7 @@ static GnomeObject * make_obj(GnomeGenericFactory *Factory, const char *goad_id, gtk_signal_connect(GTK_OBJECT(frame), "destroy", do_destroy, NULL); object_count++; - ctl = nautilus_view_frame_get_gnome_object(NAUTILUS_VIEW_FRAME(frame)); + ctl = nautilus_view_frame_get_bonobo_object(NAUTILUS_VIEW_FRAME(frame)); /* create interface */ col_titles[0] = _("Path"); @@ -179,18 +181,18 @@ static GnomeObject * make_obj(GnomeGenericFactory *Factory, const char *goad_id, #if 0 { - GNOME_UIHandler remote_uih; + Bonobo_UIHandler remote_uih; GnomeUIInfo history_menu[] = { GNOMEUIINFO_MENU_NEW_ITEM("_New", "Testing", NULL, NULL), GNOMEUIINFO_END }; - remote_uih = gnome_control_get_remote_ui_handler(GNOME_CONTROL(ctl)); - hview->uih = gnome_ui_handler_new(); - gnome_ui_handler_set_container(hview->uih, remote_uih); + remote_uih = bonobo_control_get_remote_ui_handler(BONOBO_CONTROL(ctl)); + hview->uih = bonobo_ui_handler_new(); + bonobo_ui_handler_set_container(hview->uih, remote_uih); - gnome_ui_handler_menu_add_tree(hview->uih, "/History", - gnome_ui_handler_menu_parse_uiinfo_tree(history_menu)); + bonobo_ui_handler_menu_add_tree(hview->uih, "/History", + bonobo_ui_handler_menu_parse_uiinfo_tree(history_menu)); } #endif @@ -199,7 +201,7 @@ static GnomeObject * make_obj(GnomeGenericFactory *Factory, const char *goad_id, int main(int argc, char *argv[]) { - GnomeGenericFactory *factory; + BonoboGenericFactory *factory; CORBA_ORB orb; CORBA_Environment ev; @@ -208,7 +210,7 @@ int main(int argc, char *argv[]) GNORBA_INIT_SERVER_FUNC, &ev); bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL); - factory = gnome_generic_factory_new_multi("ntl_history_view_factory", make_obj, NULL); + factory = bonobo_generic_factory_new_multi("ntl_history_view_factory", make_obj, NULL); do { bonobo_main(); diff --git a/components/html/main.c b/components/html/main.c index ba6619f71..a959931aa 100644 --- a/components/html/main.c +++ b/components/html/main.c @@ -26,16 +26,16 @@ #endif #include <gnome.h> -#include <bonobo/gnome-bonobo.h> +#include <bonobo.h> #include <gtkhtml/gtkhtml.h> #include <libnautilus/gnome-progressive-loader.h> -/* Per-GnomeEmbeddable data. */ +/* Per-BonoboEmbeddable data. */ struct _EmbeddableData { /* The embeddable object. */ - GnomeEmbeddable *embeddable; + BonoboEmbeddable *embeddable; /* The HTML widget. */ GtkHTML *html; @@ -45,7 +45,7 @@ struct _EmbeddableData { /* The progressive data sink object used to feed our baby with juicy HTML. */ - GnomeProgressiveDataSink *pdsink; + BonoboProgressiveDataSink *pdsink; /* The GtkHTML stream associated with the HTML widget. Data is passed to it through the ProgressiveDataSink interface. */ @@ -56,12 +56,12 @@ struct _EmbeddableData { }; typedef struct _EmbeddableData EmbeddableData; -/* Per-GnomeView data. */ +/* Per-BonoboView data. */ struct _ViewData { - /* The GnomeView itself. */ - GnomeView *view; + /* The BonoboView itself. */ + BonoboView *view; - /* Data for the corresponding GnomeEmbeddable. */ + /* Data for the corresponding BonoboEmbeddable. */ EmbeddableData *embeddable_data; }; typedef struct _ViewData ViewData; @@ -71,13 +71,13 @@ typedef struct _ViewData ViewData; static guint num_running_objects = 0; /* Our embeddable factory object. */ -static GnomeEmbeddableFactory *embeddable_factory_object = NULL; +static BonoboEmbeddableFactory *embeddable_factory_object = NULL; /* ProgressiveDataSink callbacks for the main HTML widget. */ static gint -pdsink_start (GnomeProgressiveDataSink *pdsink, +pdsink_start (BonoboProgressiveDataSink *pdsink, gpointer data) { EmbeddableData *embeddable_data; @@ -100,7 +100,7 @@ pdsink_start (GnomeProgressiveDataSink *pdsink, } static gint -pdsink_end (GnomeProgressiveDataSink *pdsink, +pdsink_end (BonoboProgressiveDataSink *pdsink, gpointer data) { @@ -119,8 +119,8 @@ pdsink_end (GnomeProgressiveDataSink *pdsink, } static gint -pdsink_add_data (GnomeProgressiveDataSink *pdsink, - const GNOME_ProgressiveDataSink_iobuf *iobuf, +pdsink_add_data (BonoboProgressiveDataSink *pdsink, + const Bonobo_ProgressiveDataSink_iobuf *iobuf, gpointer data) { EmbeddableData *embeddable_data; @@ -145,7 +145,7 @@ pdsink_add_data (GnomeProgressiveDataSink *pdsink, } static gint -pdsink_set_size (GnomeProgressiveDataSink *pdsink, +pdsink_set_size (BonoboProgressiveDataSink *pdsink, const CORBA_long count, gpointer data) { @@ -165,12 +165,12 @@ pdsink_set_size (GnomeProgressiveDataSink *pdsink, struct _ReqPDSinkData { GtkHTML *html; GtkHTMLStreamHandle stream; - GnomeProgressiveDataSink *pdsink; + BonoboProgressiveDataSink *pdsink; }; typedef struct _ReqPDSinkData ReqPDSinkData; static gint -req_pdsink_start (GnomeProgressiveDataSink *pdsink, +req_pdsink_start (BonoboProgressiveDataSink *pdsink, gpointer data) { ReqPDSinkData *pdsink_data; @@ -188,7 +188,7 @@ req_pdsink_start (GnomeProgressiveDataSink *pdsink, } static gint -req_pdsink_end (GnomeProgressiveDataSink *pdsink, +req_pdsink_end (BonoboProgressiveDataSink *pdsink, gpointer data) { ReqPDSinkData *pdsink_data; @@ -200,15 +200,15 @@ req_pdsink_end (GnomeProgressiveDataSink *pdsink, pdsink_data->stream, GTK_HTML_STREAM_OK); - gnome_object_unref (GNOME_OBJECT (pdsink_data->pdsink)); + bonobo_object_unref (BONOBO_OBJECT (pdsink_data->pdsink)); g_free (pdsink_data); return 0; } static gint -req_pdsink_add_data (GnomeProgressiveDataSink *pdsink, - const GNOME_ProgressiveDataSink_iobuf *iobuf, +req_pdsink_add_data (BonoboProgressiveDataSink *pdsink, + const Bonobo_ProgressiveDataSink_iobuf *iobuf, gpointer data) { ReqPDSinkData *pdsink_data; @@ -230,7 +230,7 @@ req_pdsink_add_data (GnomeProgressiveDataSink *pdsink, } static gint -req_pdsink_set_size (GnomeProgressiveDataSink *pdsink, +req_pdsink_set_size (BonoboProgressiveDataSink *pdsink, const CORBA_long count, gpointer data) { @@ -254,15 +254,15 @@ url_requested_cb (GtkHTML *html, gpointer data) { EmbeddableData *embeddable_data; - GNOME_ClientSite client_site; - GNOME_ProgressiveLoader loader; - GnomeProgressiveDataSink *pdsink; + Bonobo_ClientSite client_site; + Bonobo_ProgressiveLoader loader; + BonoboProgressiveDataSink *pdsink; ReqPDSinkData *req_pdsink_data; - GNOME_ProgressiveDataSink corba_pdsink; + Bonobo_ProgressiveDataSink corba_pdsink; CORBA_Environment ev; /* We are requested an extra URL. So we request a - GnomeProgressiveDataSink interface to our container and feed data + BonoboProgressiveDataSink interface to our container and feed data from it. */ embeddable_data = (EmbeddableData *) data; @@ -273,40 +273,40 @@ url_requested_cb (GtkHTML *html, /* FIXME cache the result. */ g_warning ("query_interface on the ClientSite."); - loader = GNOME_Unknown_query_interface + loader = Bonobo_Unknown_query_interface (client_site, "IDL:GNOME/ProgressiveLoader:1.0", &ev); if (ev._major != CORBA_NO_EXCEPTION) { - g_warning ("Cannot query GNOME::ProgressiveLoader on the GNOME::ClientSite."); + g_warning ("Cannot query Bonobo::ProgressiveLoader on the Bonobo::ClientSite."); CORBA_exception_free (&ev); return; } if (loader == CORBA_OBJECT_NIL) { - g_warning ("Our client site does not support GNOME::ProgressiveLoader!"); + g_warning ("Our client site does not support Bonobo::ProgressiveLoader!"); CORBA_exception_free (&ev); return; } req_pdsink_data = g_new (ReqPDSinkData, 1); - pdsink = gnome_progressive_data_sink_new (req_pdsink_start, + pdsink = bonobo_progressive_data_sink_new (req_pdsink_start, req_pdsink_end, req_pdsink_add_data, req_pdsink_set_size, req_pdsink_data); if (pdsink == NULL) { - g_warning ("Cannot create GNOME::ProgressiveDataSink interface for extra requested URL."); + g_warning ("Cannot create Bonobo::ProgressiveDataSink interface for extra requested URL."); g_free (req_pdsink_data); CORBA_exception_free (&ev); return; } - corba_pdsink = GNOME_OBJECT (pdsink)->corba_objref; + corba_pdsink = BONOBO_OBJECT (pdsink)->corba_objref; /* Please send mail to sopwith@redhat.com for this evil cast. :-) */ - GNOME_ProgressiveLoader_load (loader, (CORBA_char *) url, corba_pdsink, &ev); + Bonobo_ProgressiveLoader_load (loader, (CORBA_char *) url, corba_pdsink, &ev); if (ev._major != CORBA_NO_EXCEPTION) { - g_warning ("Cannot start client site progressive loading on the GNOME::ProgressiveDatasink interface."); + g_warning ("Cannot start client site progressive loading on the Bonobo::ProgressiveDatasink interface."); g_free (req_pdsink_data); CORBA_exception_free (&ev); return; @@ -351,10 +351,10 @@ connect_gtk_html_signals (GtkHTML *html, } -/* GnomeView callbacks. */ +/* BonoboView callbacks. */ static void -view_size_query_cb (GnomeView *view, +view_size_query_cb (BonoboView *view, int *desired_width, int *desired_height, ViewData *view_data) @@ -369,24 +369,24 @@ view_size_query_cb (GnomeView *view, } static void -view_activate_cb (GnomeView *view, +view_activate_cb (BonoboView *view, gboolean activate, ViewData *data) { - gnome_view_activate_notify (view, activate); + bonobo_view_activate_notify (view, activate); } static void -view_system_exception_cb (GnomeView *view, +view_system_exception_cb (BonoboView *view, CORBA_Object corba_object, CORBA_Environment *ev, gpointer data) { - gnome_object_destroy (GNOME_OBJECT (view)); + bonobo_object_destroy (BONOBO_OBJECT (view)); } static void -view_destroy_cb (GnomeView *view, +view_destroy_cb (BonoboView *view, ViewData *view_data) { view_data->embeddable_data->view_count--; @@ -394,28 +394,28 @@ view_destroy_cb (GnomeView *view, } -/* GnomeView factory. */ +/* BonoboView factory. */ -static GnomeView * -view_factory (GnomeEmbeddable *embeddable, - const GNOME_ViewFrame view_frame, +static BonoboView * +view_factory (BonoboEmbeddable *embeddable, + const Bonobo_ViewFrame view_frame, EmbeddableData *embeddable_data) { ViewData *view_data; - GnomeView *view; + BonoboView *view; view_data = g_new0 (ViewData, 1); - /* Create the GnomeView object. */ - view = gnome_view_new (embeddable_data->scrolled_window); + /* Create the BonoboView object. */ + view = bonobo_view_new (embeddable_data->scrolled_window); gtk_object_set_data (GTK_OBJECT (view), "view_data", view_data); - gnome_view_set_view_frame (view, view_frame); + bonobo_view_set_view_frame (view, view_frame); gtk_signal_connect (GTK_OBJECT (view), "size_query", GTK_SIGNAL_FUNC (view_size_query_cb), view_data); - gtk_signal_connect (GTK_OBJECT (view), "view_activate", + gtk_signal_connect (GTK_OBJECT (view), "activate", GTK_SIGNAL_FUNC (view_activate_cb), view_data); gtk_signal_connect (GTK_OBJECT (view), "system_exception", @@ -433,10 +433,10 @@ view_factory (GnomeEmbeddable *embeddable, } -/* GnomeEmbeddable callbacks. */ +/* BonoboEmbeddable callbacks. */ static void -embeddable_destroy_cb (GnomeEmbeddable *embeddable, +embeddable_destroy_cb (BonoboEmbeddable *embeddable, EmbeddableData *embeddable_data) { num_running_objects--; @@ -444,12 +444,12 @@ embeddable_destroy_cb (GnomeEmbeddable *embeddable, return; if (embeddable_data->pdsink != NULL) - gnome_object_unref (GNOME_OBJECT (embeddable_data->pdsink)); + bonobo_object_unref (BONOBO_OBJECT (embeddable_data->pdsink)); if (embeddable_data->html != NULL) gtk_widget_destroy (GTK_WIDGET (embeddable_data->html)); - gnome_object_unref (GNOME_OBJECT (embeddable_factory_object)); + bonobo_object_unref (BONOBO_OBJECT (embeddable_factory_object)); g_free (embeddable_data); @@ -457,23 +457,23 @@ embeddable_destroy_cb (GnomeEmbeddable *embeddable, } static void -embeddable_system_exception_cb (GnomeEmbeddable *embeddable, +embeddable_system_exception_cb (BonoboEmbeddable *embeddable, CORBA_Object corba_object, CORBA_Environment *ev, gpointer data) { - gnome_object_destroy (GNOME_OBJECT (embeddable)); + bonobo_object_destroy (BONOBO_OBJECT (embeddable)); } -/* GnomeEmbeddable factory. */ +/* BonoboEmbeddable factory. */ -static GnomeObject * -embeddable_factory (GnomeEmbeddableFactory *this, +static BonoboObject * +embeddable_factory (BonoboEmbeddableFactory *this, void *data) { - GnomeEmbeddable *embeddable; - GnomeProgressiveDataSink *pdsink; + BonoboEmbeddable *embeddable; + BonoboProgressiveDataSink *pdsink; EmbeddableData *embeddable_data; GtkWidget *html; GtkWidget *scrolled_window; @@ -489,17 +489,17 @@ embeddable_factory (GnomeEmbeddableFactory *this, gtk_widget_show (html); gtk_widget_show (scrolled_window); - embeddable = gnome_embeddable_new (GNOME_VIEW_FACTORY (view_factory), + embeddable = bonobo_embeddable_new (BONOBO_VIEW_FACTORY (view_factory), embeddable_data); - pdsink = gnome_progressive_data_sink_new (pdsink_start, + pdsink = bonobo_progressive_data_sink_new (pdsink_start, pdsink_end, pdsink_add_data, pdsink_set_size, embeddable_data); - gnome_object_add_interface (GNOME_OBJECT (embeddable), - GNOME_OBJECT (pdsink)); + bonobo_object_add_interface (BONOBO_OBJECT (embeddable), + BONOBO_OBJECT (pdsink)); num_running_objects++; @@ -518,16 +518,16 @@ embeddable_factory (GnomeEmbeddableFactory *this, embeddable_data->html_stream = NULL; embeddable_data->view_count = 0; - return GNOME_OBJECT (embeddable); + return BONOBO_OBJECT (embeddable); } /* Main. */ -static GnomeEmbeddableFactory * +static BonoboEmbeddableFactory * init_html_factory (void) { - return gnome_embeddable_factory_new + return bonobo_embeddable_factory_new ("embeddable-factory:explorer-html-component", embeddable_factory, NULL); } diff --git a/components/html/ntl-web-browser.c b/components/html/ntl-web-browser.c index 1b1d408f7..f4f06ee6a 100644 --- a/components/html/ntl-web-browser.c +++ b/components/html/ntl-web-browser.c @@ -24,6 +24,7 @@ #include <gnome.h> #include <libnautilus/libnautilus.h> #include <gtkhtml/gtkhtml.h> +#include <libgnorba/gnorba.h> extern GtkHTMLStreamHandle gtk_html_stream_ref(GtkHTMLStreamHandle handle); extern void gtk_html_stream_unref(GtkHTMLStreamHandle handle); @@ -449,8 +450,8 @@ browser_do_destroy(GtkObject *obj) gtk_main_quit(); } -static GnomeObject * -make_obj(GnomeGenericFactory *Factory, const char *goad_id, void *closure) +static BonoboObject * +make_obj(BonoboGenericFactory *Factory, const char *goad_id, void *closure) { BrowserInfo *bi; GtkWidget *wtmp; @@ -484,12 +485,12 @@ make_obj(GnomeGenericFactory *Factory, const char *goad_id, void *closure) gtk_widget_show(wtmp); gtk_widget_show(GTK_WIDGET(bi->view_frame)); - return nautilus_view_frame_get_gnome_object(bi->view_frame); + return nautilus_view_frame_get_bonobo_object(bi->view_frame); } int main(int argc, char *argv[]) { - GnomeGenericFactory *factory; + BonoboGenericFactory *factory; CORBA_ORB orb; CORBA_Environment ev; @@ -501,7 +502,7 @@ int main(int argc, char *argv[]) HTNet_addAfter(request_terminator, NULL, NULL, HT_ALL, HT_FILTER_LAST); bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL); - factory = gnome_generic_factory_new_multi("ntl_web_browser_factory", make_obj, NULL); + factory = bonobo_generic_factory_new_multi("ntl_web_browser_factory", make_obj, NULL); do { bonobo_main(); diff --git a/components/websearch/ntl-web-search.c b/components/websearch/ntl-web-search.c index dec4feff7..9f2f9bbb3 100644 --- a/components/websearch/ntl-web-search.c +++ b/components/websearch/ntl-web-search.c @@ -45,7 +45,7 @@ typedef struct { EngineInfo *last_sel; - GnomeUIHandler *uih; + BonoboUIHandler *uih; } WebSearchView; static int object_count = 0; @@ -160,11 +160,11 @@ web_search_populate_engines(WebSearchView *hview) } } -static GnomeObject * -make_obj(GnomeGenericFactory *Factory, const char *goad_id, gpointer closure) +static BonoboObject * +make_obj(BonoboGenericFactory *Factory, const char *goad_id, gpointer closure) { GtkWidget *frame, *vbox; - GnomeObject *ctl; + BonoboObject *ctl; WebSearchView *hview; g_return_val_if_fail(!strcmp(goad_id, "ntl_websearch_view"), NULL); @@ -174,7 +174,7 @@ make_obj(GnomeGenericFactory *Factory, const char *goad_id, gpointer closure) gtk_signal_connect(GTK_OBJECT(frame), "destroy", do_destroy, NULL); object_count++; - ctl = nautilus_view_frame_get_gnome_object(NAUTILUS_VIEW_FRAME(frame)); + ctl = nautilus_view_frame_get_bonobo_object(NAUTILUS_VIEW_FRAME(frame)); vbox = gtk_vbox_new(FALSE, GNOME_PAD); gtk_container_add(GTK_CONTAINER(frame), vbox); @@ -229,7 +229,7 @@ make_obj(GnomeGenericFactory *Factory, const char *goad_id, gpointer closure) int main(int argc, char *argv[]) { - GnomeGenericFactory *factory; + BonoboGenericFactory *factory; CORBA_ORB orb; CORBA_Environment ev; @@ -238,7 +238,7 @@ int main(int argc, char *argv[]) GNORBA_INIT_SERVER_FUNC, &ev); bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL); - factory = gnome_generic_factory_new_multi("ntl_websearch_view_factory", make_obj, NULL); + factory = bonobo_generic_factory_new_multi("ntl_websearch_view_factory", make_obj, NULL); do { bonobo_main(); diff --git a/idl/nautilus.idl b/idl/nautilus.idl index 0ccf9d167..369c6f6d4 100644 --- a/idl/nautilus.idl +++ b/idl/nautilus.idl @@ -1,4 +1,4 @@ -#include <gnome-unknown.idl> +#include <Bonobo.idl> module Nautilus { enum TruthValue { V_UNKNOWN, V_FALSE, V_TRUE }; @@ -36,7 +36,7 @@ module Nautilus { double amount; }; - interface View : ::GNOME::Unknown { + interface View : ::Bonobo::Unknown { void save_state(in string config_path); void load_state(in string config_path); oneway void notify_location_change(in NavigationInfo navinfo); @@ -56,7 +56,7 @@ module Nautilus { interface ViewWindow; - interface ViewFrame : ::GNOME::Unknown { + interface ViewFrame : ::Bonobo::Unknown { readonly attribute ViewWindow main_window; oneway void request_status_change(in StatusRequestInfo statinfo); oneway void request_location_change(in NavigationRequestInfo navinfo); @@ -70,6 +70,6 @@ module Nautilus { interface ContentViewFrame : ViewFrame { }; - interface ViewWindow : ::GNOME::Unknown { + interface ViewWindow : ::Bonobo::Unknown { }; }; diff --git a/libnautilus-extensions/gnome-icon-container.c b/libnautilus-extensions/gnome-icon-container.c index 075e0ccb9..2258b88f1 100644 --- a/libnautilus-extensions/gnome-icon-container.c +++ b/libnautilus-extensions/gnome-icon-container.c @@ -2656,7 +2656,7 @@ gnome_icon_container_select_all (GnomeIconContainer *container) /** * gnome_icon_container_select_list_unselect_others: * @container: An icon container widget. - * @list: A list of GnomeContainerIcons. + * @list: A list of BonoboContainerIcons. * * Select only the icons in the list, deselect all others. **/ diff --git a/libnautilus-extensions/gnome-progressive-loader.c b/libnautilus-extensions/gnome-progressive-loader.c index 35d76f902..259214211 100644 --- a/libnautilus-extensions/gnome-progressive-loader.c +++ b/libnautilus-extensions/gnome-progressive-loader.c @@ -32,52 +32,52 @@ #include "gnome-progressive-loader.h" -static GnomeObjectClass *parent_class = NULL; +static BonoboObjectClass *parent_class = NULL; -POA_GNOME_ProgressiveLoader__epv gnome_progressive_loader_epv; -POA_GNOME_ProgressiveLoader__vepv gnome_progressive_loader_vepv; +POA_Bonobo_ProgressiveLoader__epv bonobo_progressive_loader_epv; +POA_Bonobo_ProgressiveLoader__vepv bonobo_progressive_loader_vepv; static void impl_load (PortableServer_Servant servant, const CORBA_char *uri, - GNOME_ProgressiveDataSink pdsink, + Bonobo_ProgressiveDataSink pdsink, CORBA_Environment *ev) { - GnomeObject *object; - GnomeProgressiveLoader *loader; + BonoboObject *object; + BonoboProgressiveLoader *loader; GnomeVFSResult result; - GNOME_ProgressiveLoader_Error *exception; + Bonobo_ProgressiveLoader_Error *exception; - object = gnome_object_from_servant (servant); - loader = GNOME_PROGRESSIVE_LOADER (object); + object = bonobo_object_from_servant (servant); + loader = BONOBO_PROGRESSIVE_LOADER (object); result = (* loader->load_fn) (loader, uri, pdsink); if (result == GNOME_VFS_OK) return; - exception = g_new (GNOME_ProgressiveLoader_Error, 1); + exception = g_new (Bonobo_ProgressiveLoader_Error, 1); exception->vfs_result = result; CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_GNOME_ProgressiveLoader_Error, + ex_Bonobo_ProgressiveLoader_Error, exception); } -static GNOME_ProgressiveLoader -create_GNOME_ProgressiveLoader (GnomeObject *object) +static Bonobo_ProgressiveLoader +create_Bonobo_ProgressiveLoader (BonoboObject *object) { - POA_GNOME_ProgressiveLoader *servant; + POA_Bonobo_ProgressiveLoader *servant; CORBA_Environment ev; - servant = (POA_GNOME_ProgressiveLoader *) g_new (GnomeObjectServant, 1); - servant->vepv = &gnome_progressive_loader_vepv; + servant = (POA_Bonobo_ProgressiveLoader *) g_new (BonoboObjectServant, 1); + servant->vepv = &bonobo_progressive_loader_vepv; CORBA_exception_init (&ev); - POA_GNOME_ProgressiveLoader__init ((PortableServer_Servant) servant, + POA_Bonobo_ProgressiveLoader__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION){ g_free (servant); @@ -86,7 +86,7 @@ create_GNOME_ProgressiveLoader (GnomeObject *object) } CORBA_exception_free (&ev); - return (GNOME_ProgressiveLoader) gnome_object_activate_servant + return (Bonobo_ProgressiveLoader) bonobo_object_activate_servant (object, servant); } @@ -96,9 +96,9 @@ create_GNOME_ProgressiveLoader (GnomeObject *object) static void destroy (GtkObject *object) { - GnomeProgressiveLoader *loader; + BonoboProgressiveLoader *loader; - loader = GNOME_PROGRESSIVE_LOADER (object); + loader = BONOBO_PROGRESSIVE_LOADER (object); /* Nothing special. */ @@ -110,18 +110,18 @@ destroy (GtkObject *object) static void corba_class_init (void) { - gnome_progressive_loader_epv.load = impl_load; + bonobo_progressive_loader_epv.load = impl_load; - gnome_progressive_loader_vepv.GNOME_ProgressiveLoader_epv - = &gnome_progressive_loader_epv; + bonobo_progressive_loader_vepv.Bonobo_ProgressiveLoader_epv + = &bonobo_progressive_loader_epv; } static void -class_init (GnomeProgressiveLoaderClass *class) +class_init (BonoboProgressiveLoaderClass *class) { GtkObjectClass *object_class; - parent_class = gtk_type_class (gnome_object_get_type ()); + parent_class = gtk_type_class (bonobo_object_get_type ()); object_class = GTK_OBJECT_CLASS (class); object_class->destroy = destroy; @@ -130,21 +130,21 @@ class_init (GnomeProgressiveLoaderClass *class) } static void -init (GnomeProgressiveLoader *progressive_loader) +init (BonoboProgressiveLoader *progressive_loader) { } GtkType -gnome_progressive_loader_get_type (void) +bonobo_progressive_loader_get_type (void) { static GtkType type = 0; if (type == 0) { static const GtkTypeInfo info = { "IDL:GNOME/ProgressiveLoader:1.0", - sizeof (GnomeProgressiveLoader), - sizeof (GnomeProgressiveLoaderClass), + sizeof (BonoboProgressiveLoader), + sizeof (BonoboProgressiveLoaderClass), (GtkClassInitFunc) class_init, (GtkObjectInitFunc) init, /* reserved_1 */ NULL, @@ -152,26 +152,26 @@ gnome_progressive_loader_get_type (void) (GtkClassInitFunc) NULL, }; - type = gtk_type_unique (gnome_object_get_type (), &info); + type = gtk_type_unique (bonobo_object_get_type (), &info); } return type; } gboolean -gnome_progressive_loader_construct (GnomeProgressiveLoader *loader, - GNOME_ProgressiveLoader corba_loader, - GnomeProgressiveLoaderLoadFn load_fn) +bonobo_progressive_loader_construct (BonoboProgressiveLoader *loader, + Bonobo_ProgressiveLoader corba_loader, + BonoboProgressiveLoaderLoadFn load_fn) { g_return_val_if_fail (loader != NULL, FALSE); - g_return_val_if_fail (GNOME_IS_PROGRESSIVE_LOADER (loader), FALSE); + g_return_val_if_fail (BONOBO_IS_PROGRESSIVE_LOADER (loader), FALSE); g_return_val_if_fail (corba_loader != CORBA_OBJECT_NIL, FALSE); g_return_val_if_fail (load_fn != NULL, FALSE); - gnome_object_construct (GNOME_OBJECT (loader), corba_loader); + bonobo_object_construct (BONOBO_OBJECT (loader), corba_loader); if (corba_loader == CORBA_OBJECT_NIL) { - corba_loader = create_GNOME_ProgressiveLoader (GNOME_OBJECT (loader)); + corba_loader = create_Bonobo_ProgressiveLoader (BONOBO_OBJECT (loader)); if (corba_loader == CORBA_OBJECT_NIL) return FALSE; } @@ -181,16 +181,16 @@ gnome_progressive_loader_construct (GnomeProgressiveLoader *loader, return TRUE; } -GnomeProgressiveLoader * -gnome_progressive_loader_new (GnomeProgressiveLoaderLoadFn load_fn) +BonoboProgressiveLoader * +bonobo_progressive_loader_new (BonoboProgressiveLoaderLoadFn load_fn) { - GnomeProgressiveLoader *loader; + BonoboProgressiveLoader *loader; g_return_val_if_fail (load_fn != NULL, NULL); - loader = gtk_type_new (gnome_progressive_loader_get_type ()); + loader = gtk_type_new (bonobo_progressive_loader_get_type ()); - if (! gnome_progressive_loader_construct (loader, CORBA_OBJECT_NIL, + if (! bonobo_progressive_loader_construct (loader, CORBA_OBJECT_NIL, load_fn)) { gtk_object_destroy (GTK_OBJECT (loader)); return NULL; diff --git a/libnautilus-extensions/gnome-progressive-loader.h b/libnautilus-extensions/gnome-progressive-loader.h index f18960e51..4493319b6 100644 --- a/libnautilus-extensions/gnome-progressive-loader.h +++ b/libnautilus-extensions/gnome-progressive-loader.h @@ -23,14 +23,14 @@ /* FIXME this is just a quick hack. */ -#ifndef __GNOME_PROGRESSIVE_LOADER_H__ -#define __GNOME_PROGRESSIVE_LOADER_H__ +#ifndef __BONOBO_PROGRESSIVE_LOADER_H__ +#define __BONOBO_PROGRESSIVE_LOADER_H__ #include <gnome.h> -#include <bonobo/gnome-bonobo.h> +#include <bonobo.h> #include <libgnomevfs/gnome-vfs.h> -#include "GNOME_ProgressiveLoader.h" +#include "Bonobo_ProgressiveLoader.h" #ifdef __cplusplus extern "C" { @@ -38,47 +38,47 @@ extern "C" { #endif /* __cplusplus */ #define GNOME_TYPE_PROGRESSIVE_LOADER \ - (gnome_progressive_loader_get_type ()) -#define GNOME_PROGRESSIVE_LOADER(obj) \ - (GTK_CHECK_CAST ((obj), GNOME_TYPE_PROGRESSIVE_LOADER, GnomeProgressiveLoader)) -#define GNOME_PROGRESSIVE_LOADER_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PROGRESSIVE_LOADER, GnomeProgressiveLoaderClass)) -#define GNOME_IS_PROGRESSIVE_LOADER(obj) \ + (bonobo_progressive_loader_get_type ()) +#define BONOBO_PROGRESSIVE_LOADER(obj) \ + (GTK_CHECK_CAST ((obj), GNOME_TYPE_PROGRESSIVE_LOADER, BonoboProgressiveLoader)) +#define BONOBO_PROGRESSIVE_LOADER_CLASS(klass) \ + (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PROGRESSIVE_LOADER, BonoboProgressiveLoaderClass)) +#define BONOBO_IS_PROGRESSIVE_LOADER(obj) \ (GTK_CHECK_TYPE ((obj), GNOME_TYPE_PROGRESSIVE_LOADER)) -#define GNOME_IS_PROGRESSIVE_LOADER_CLASS(klass) \ +#define BONOBO_IS_PROGRESSIVE_LOADER_CLASS(klass) \ (GTK_CHECK_CLASS_TYPE ((obj), GNOME_TYPE_PROGRESSIVE_LOADER)) -typedef struct _GnomeProgressiveLoader GnomeProgressiveLoader; -typedef struct _GnomeProgressiveLoaderClass GnomeProgressiveLoaderClass; +typedef struct _BonoboProgressiveLoader BonoboProgressiveLoader; +typedef struct _BonoboProgressiveLoaderClass BonoboProgressiveLoaderClass; -typedef GnomeVFSResult (* GnomeProgressiveLoaderLoadFn) - (GnomeProgressiveLoader *progressive_loader, +typedef GnomeVFSResult (* BonoboProgressiveLoaderLoadFn) + (BonoboProgressiveLoader *progressive_loader, const gchar *uri, - GNOME_ProgressiveDataSink pdsink); + Bonobo_ProgressiveDataSink pdsink); -struct _GnomeProgressiveLoader { - GnomeObject parent; +struct _BonoboProgressiveLoader { + BonoboObject parent; - GnomeProgressiveLoaderLoadFn load_fn; + BonoboProgressiveLoaderLoadFn load_fn; }; -struct _GnomeProgressiveLoaderClass { - GnomeObjectClass parent_class; +struct _BonoboProgressiveLoaderClass { + BonoboObjectClass parent_class; }; -GtkType gnome_progressive_loader_get_type (void); -GnomeProgressiveLoader *gnome_progressive_loader_new (GnomeProgressiveLoaderLoadFn fn); -gboolean gnome_progressive_loader_construct (GnomeProgressiveLoader *loader, - GNOME_ProgressiveLoader corba_loader, - GnomeProgressiveLoaderLoadFn load_fn); +GtkType bonobo_progressive_loader_get_type (void); +BonoboProgressiveLoader *bonobo_progressive_loader_new (BonoboProgressiveLoaderLoadFn fn); +gboolean bonobo_progressive_loader_construct (BonoboProgressiveLoader *loader, + Bonobo_ProgressiveLoader corba_loader, + BonoboProgressiveLoaderLoadFn load_fn); -extern POA_GNOME_ProgressiveLoader__epv gnome_progressive_loader_epv; +extern POA_Bonobo_ProgressiveLoader__epv bonobo_progressive_loader_epv; #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __GNOME_PROGRESSIVE_LOADER_H__ */ +#endif /* __BONOBO_PROGRESSIVE_LOADER_H__ */ diff --git a/libnautilus-extensions/libnautilus.h b/libnautilus-extensions/libnautilus.h index 36397b521..332d2d414 100644 --- a/libnautilus-extensions/libnautilus.h +++ b/libnautilus-extensions/libnautilus.h @@ -29,7 +29,7 @@ #ifndef LIBNAUTILUS_H #define LIBNAUTILUS_H -#include <bonobo/gnome-bonobo.h> +#include <bonobo.h> #include <libnautilus/nautilus.h> #include <libnautilus/nautilus-alloc.h> #include <libnautilus/nautilus-directory.h> diff --git a/libnautilus-extensions/nautilus-file-operations.c b/libnautilus-extensions/nautilus-file-operations.c index dd77a042c..68230253f 100644 --- a/libnautilus-extensions/nautilus-file-operations.c +++ b/libnautilus-extensions/nautilus-file-operations.c @@ -1,5 +1,5 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* xfer.c - GNOME::Desktop::FileOperationService transfer service. +/* xfer.c - Bonobo::Desktop::FileOperationService transfer service. Copyright (C) 1999, 2000 Free Software Foundation diff --git a/libnautilus-extensions/nautilus-file-operations.h b/libnautilus-extensions/nautilus-file-operations.h index 3acae74e7..c6c262328 100644 --- a/libnautilus-extensions/nautilus-file-operations.h +++ b/libnautilus-extensions/nautilus-file-operations.h @@ -1,5 +1,5 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* xfer.h - GNOME::Desktop::FileOperationService transfer service. +/* xfer.h - Bonobo::Desktop::FileOperationService transfer service. Copyright (C) 1999, 2000 Free Software Foundation diff --git a/libnautilus-private/gnome-icon-container.c b/libnautilus-private/gnome-icon-container.c index 075e0ccb9..2258b88f1 100644 --- a/libnautilus-private/gnome-icon-container.c +++ b/libnautilus-private/gnome-icon-container.c @@ -2656,7 +2656,7 @@ gnome_icon_container_select_all (GnomeIconContainer *container) /** * gnome_icon_container_select_list_unselect_others: * @container: An icon container widget. - * @list: A list of GnomeContainerIcons. + * @list: A list of BonoboContainerIcons. * * Select only the icons in the list, deselect all others. **/ diff --git a/libnautilus-private/gnome-progressive-loader.c b/libnautilus-private/gnome-progressive-loader.c index 35d76f902..259214211 100644 --- a/libnautilus-private/gnome-progressive-loader.c +++ b/libnautilus-private/gnome-progressive-loader.c @@ -32,52 +32,52 @@ #include "gnome-progressive-loader.h" -static GnomeObjectClass *parent_class = NULL; +static BonoboObjectClass *parent_class = NULL; -POA_GNOME_ProgressiveLoader__epv gnome_progressive_loader_epv; -POA_GNOME_ProgressiveLoader__vepv gnome_progressive_loader_vepv; +POA_Bonobo_ProgressiveLoader__epv bonobo_progressive_loader_epv; +POA_Bonobo_ProgressiveLoader__vepv bonobo_progressive_loader_vepv; static void impl_load (PortableServer_Servant servant, const CORBA_char *uri, - GNOME_ProgressiveDataSink pdsink, + Bonobo_ProgressiveDataSink pdsink, CORBA_Environment *ev) { - GnomeObject *object; - GnomeProgressiveLoader *loader; + BonoboObject *object; + BonoboProgressiveLoader *loader; GnomeVFSResult result; - GNOME_ProgressiveLoader_Error *exception; + Bonobo_ProgressiveLoader_Error *exception; - object = gnome_object_from_servant (servant); - loader = GNOME_PROGRESSIVE_LOADER (object); + object = bonobo_object_from_servant (servant); + loader = BONOBO_PROGRESSIVE_LOADER (object); result = (* loader->load_fn) (loader, uri, pdsink); if (result == GNOME_VFS_OK) return; - exception = g_new (GNOME_ProgressiveLoader_Error, 1); + exception = g_new (Bonobo_ProgressiveLoader_Error, 1); exception->vfs_result = result; CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_GNOME_ProgressiveLoader_Error, + ex_Bonobo_ProgressiveLoader_Error, exception); } -static GNOME_ProgressiveLoader -create_GNOME_ProgressiveLoader (GnomeObject *object) +static Bonobo_ProgressiveLoader +create_Bonobo_ProgressiveLoader (BonoboObject *object) { - POA_GNOME_ProgressiveLoader *servant; + POA_Bonobo_ProgressiveLoader *servant; CORBA_Environment ev; - servant = (POA_GNOME_ProgressiveLoader *) g_new (GnomeObjectServant, 1); - servant->vepv = &gnome_progressive_loader_vepv; + servant = (POA_Bonobo_ProgressiveLoader *) g_new (BonoboObjectServant, 1); + servant->vepv = &bonobo_progressive_loader_vepv; CORBA_exception_init (&ev); - POA_GNOME_ProgressiveLoader__init ((PortableServer_Servant) servant, + POA_Bonobo_ProgressiveLoader__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION){ g_free (servant); @@ -86,7 +86,7 @@ create_GNOME_ProgressiveLoader (GnomeObject *object) } CORBA_exception_free (&ev); - return (GNOME_ProgressiveLoader) gnome_object_activate_servant + return (Bonobo_ProgressiveLoader) bonobo_object_activate_servant (object, servant); } @@ -96,9 +96,9 @@ create_GNOME_ProgressiveLoader (GnomeObject *object) static void destroy (GtkObject *object) { - GnomeProgressiveLoader *loader; + BonoboProgressiveLoader *loader; - loader = GNOME_PROGRESSIVE_LOADER (object); + loader = BONOBO_PROGRESSIVE_LOADER (object); /* Nothing special. */ @@ -110,18 +110,18 @@ destroy (GtkObject *object) static void corba_class_init (void) { - gnome_progressive_loader_epv.load = impl_load; + bonobo_progressive_loader_epv.load = impl_load; - gnome_progressive_loader_vepv.GNOME_ProgressiveLoader_epv - = &gnome_progressive_loader_epv; + bonobo_progressive_loader_vepv.Bonobo_ProgressiveLoader_epv + = &bonobo_progressive_loader_epv; } static void -class_init (GnomeProgressiveLoaderClass *class) +class_init (BonoboProgressiveLoaderClass *class) { GtkObjectClass *object_class; - parent_class = gtk_type_class (gnome_object_get_type ()); + parent_class = gtk_type_class (bonobo_object_get_type ()); object_class = GTK_OBJECT_CLASS (class); object_class->destroy = destroy; @@ -130,21 +130,21 @@ class_init (GnomeProgressiveLoaderClass *class) } static void -init (GnomeProgressiveLoader *progressive_loader) +init (BonoboProgressiveLoader *progressive_loader) { } GtkType -gnome_progressive_loader_get_type (void) +bonobo_progressive_loader_get_type (void) { static GtkType type = 0; if (type == 0) { static const GtkTypeInfo info = { "IDL:GNOME/ProgressiveLoader:1.0", - sizeof (GnomeProgressiveLoader), - sizeof (GnomeProgressiveLoaderClass), + sizeof (BonoboProgressiveLoader), + sizeof (BonoboProgressiveLoaderClass), (GtkClassInitFunc) class_init, (GtkObjectInitFunc) init, /* reserved_1 */ NULL, @@ -152,26 +152,26 @@ gnome_progressive_loader_get_type (void) (GtkClassInitFunc) NULL, }; - type = gtk_type_unique (gnome_object_get_type (), &info); + type = gtk_type_unique (bonobo_object_get_type (), &info); } return type; } gboolean -gnome_progressive_loader_construct (GnomeProgressiveLoader *loader, - GNOME_ProgressiveLoader corba_loader, - GnomeProgressiveLoaderLoadFn load_fn) +bonobo_progressive_loader_construct (BonoboProgressiveLoader *loader, + Bonobo_ProgressiveLoader corba_loader, + BonoboProgressiveLoaderLoadFn load_fn) { g_return_val_if_fail (loader != NULL, FALSE); - g_return_val_if_fail (GNOME_IS_PROGRESSIVE_LOADER (loader), FALSE); + g_return_val_if_fail (BONOBO_IS_PROGRESSIVE_LOADER (loader), FALSE); g_return_val_if_fail (corba_loader != CORBA_OBJECT_NIL, FALSE); g_return_val_if_fail (load_fn != NULL, FALSE); - gnome_object_construct (GNOME_OBJECT (loader), corba_loader); + bonobo_object_construct (BONOBO_OBJECT (loader), corba_loader); if (corba_loader == CORBA_OBJECT_NIL) { - corba_loader = create_GNOME_ProgressiveLoader (GNOME_OBJECT (loader)); + corba_loader = create_Bonobo_ProgressiveLoader (BONOBO_OBJECT (loader)); if (corba_loader == CORBA_OBJECT_NIL) return FALSE; } @@ -181,16 +181,16 @@ gnome_progressive_loader_construct (GnomeProgressiveLoader *loader, return TRUE; } -GnomeProgressiveLoader * -gnome_progressive_loader_new (GnomeProgressiveLoaderLoadFn load_fn) +BonoboProgressiveLoader * +bonobo_progressive_loader_new (BonoboProgressiveLoaderLoadFn load_fn) { - GnomeProgressiveLoader *loader; + BonoboProgressiveLoader *loader; g_return_val_if_fail (load_fn != NULL, NULL); - loader = gtk_type_new (gnome_progressive_loader_get_type ()); + loader = gtk_type_new (bonobo_progressive_loader_get_type ()); - if (! gnome_progressive_loader_construct (loader, CORBA_OBJECT_NIL, + if (! bonobo_progressive_loader_construct (loader, CORBA_OBJECT_NIL, load_fn)) { gtk_object_destroy (GTK_OBJECT (loader)); return NULL; diff --git a/libnautilus-private/gnome-progressive-loader.h b/libnautilus-private/gnome-progressive-loader.h index f18960e51..4493319b6 100644 --- a/libnautilus-private/gnome-progressive-loader.h +++ b/libnautilus-private/gnome-progressive-loader.h @@ -23,14 +23,14 @@ /* FIXME this is just a quick hack. */ -#ifndef __GNOME_PROGRESSIVE_LOADER_H__ -#define __GNOME_PROGRESSIVE_LOADER_H__ +#ifndef __BONOBO_PROGRESSIVE_LOADER_H__ +#define __BONOBO_PROGRESSIVE_LOADER_H__ #include <gnome.h> -#include <bonobo/gnome-bonobo.h> +#include <bonobo.h> #include <libgnomevfs/gnome-vfs.h> -#include "GNOME_ProgressiveLoader.h" +#include "Bonobo_ProgressiveLoader.h" #ifdef __cplusplus extern "C" { @@ -38,47 +38,47 @@ extern "C" { #endif /* __cplusplus */ #define GNOME_TYPE_PROGRESSIVE_LOADER \ - (gnome_progressive_loader_get_type ()) -#define GNOME_PROGRESSIVE_LOADER(obj) \ - (GTK_CHECK_CAST ((obj), GNOME_TYPE_PROGRESSIVE_LOADER, GnomeProgressiveLoader)) -#define GNOME_PROGRESSIVE_LOADER_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PROGRESSIVE_LOADER, GnomeProgressiveLoaderClass)) -#define GNOME_IS_PROGRESSIVE_LOADER(obj) \ + (bonobo_progressive_loader_get_type ()) +#define BONOBO_PROGRESSIVE_LOADER(obj) \ + (GTK_CHECK_CAST ((obj), GNOME_TYPE_PROGRESSIVE_LOADER, BonoboProgressiveLoader)) +#define BONOBO_PROGRESSIVE_LOADER_CLASS(klass) \ + (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PROGRESSIVE_LOADER, BonoboProgressiveLoaderClass)) +#define BONOBO_IS_PROGRESSIVE_LOADER(obj) \ (GTK_CHECK_TYPE ((obj), GNOME_TYPE_PROGRESSIVE_LOADER)) -#define GNOME_IS_PROGRESSIVE_LOADER_CLASS(klass) \ +#define BONOBO_IS_PROGRESSIVE_LOADER_CLASS(klass) \ (GTK_CHECK_CLASS_TYPE ((obj), GNOME_TYPE_PROGRESSIVE_LOADER)) -typedef struct _GnomeProgressiveLoader GnomeProgressiveLoader; -typedef struct _GnomeProgressiveLoaderClass GnomeProgressiveLoaderClass; +typedef struct _BonoboProgressiveLoader BonoboProgressiveLoader; +typedef struct _BonoboProgressiveLoaderClass BonoboProgressiveLoaderClass; -typedef GnomeVFSResult (* GnomeProgressiveLoaderLoadFn) - (GnomeProgressiveLoader *progressive_loader, +typedef GnomeVFSResult (* BonoboProgressiveLoaderLoadFn) + (BonoboProgressiveLoader *progressive_loader, const gchar *uri, - GNOME_ProgressiveDataSink pdsink); + Bonobo_ProgressiveDataSink pdsink); -struct _GnomeProgressiveLoader { - GnomeObject parent; +struct _BonoboProgressiveLoader { + BonoboObject parent; - GnomeProgressiveLoaderLoadFn load_fn; + BonoboProgressiveLoaderLoadFn load_fn; }; -struct _GnomeProgressiveLoaderClass { - GnomeObjectClass parent_class; +struct _BonoboProgressiveLoaderClass { + BonoboObjectClass parent_class; }; -GtkType gnome_progressive_loader_get_type (void); -GnomeProgressiveLoader *gnome_progressive_loader_new (GnomeProgressiveLoaderLoadFn fn); -gboolean gnome_progressive_loader_construct (GnomeProgressiveLoader *loader, - GNOME_ProgressiveLoader corba_loader, - GnomeProgressiveLoaderLoadFn load_fn); +GtkType bonobo_progressive_loader_get_type (void); +BonoboProgressiveLoader *bonobo_progressive_loader_new (BonoboProgressiveLoaderLoadFn fn); +gboolean bonobo_progressive_loader_construct (BonoboProgressiveLoader *loader, + Bonobo_ProgressiveLoader corba_loader, + BonoboProgressiveLoaderLoadFn load_fn); -extern POA_GNOME_ProgressiveLoader__epv gnome_progressive_loader_epv; +extern POA_Bonobo_ProgressiveLoader__epv bonobo_progressive_loader_epv; #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __GNOME_PROGRESSIVE_LOADER_H__ */ +#endif /* __BONOBO_PROGRESSIVE_LOADER_H__ */ diff --git a/libnautilus-private/libnautilus.h b/libnautilus-private/libnautilus.h index 36397b521..332d2d414 100644 --- a/libnautilus-private/libnautilus.h +++ b/libnautilus-private/libnautilus.h @@ -29,7 +29,7 @@ #ifndef LIBNAUTILUS_H #define LIBNAUTILUS_H -#include <bonobo/gnome-bonobo.h> +#include <bonobo.h> #include <libnautilus/nautilus.h> #include <libnautilus/nautilus-alloc.h> #include <libnautilus/nautilus-directory.h> diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index dd77a042c..68230253f 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -1,5 +1,5 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* xfer.c - GNOME::Desktop::FileOperationService transfer service. +/* xfer.c - Bonobo::Desktop::FileOperationService transfer service. Copyright (C) 1999, 2000 Free Software Foundation diff --git a/libnautilus-private/nautilus-file-operations.h b/libnautilus-private/nautilus-file-operations.h index 3acae74e7..c6c262328 100644 --- a/libnautilus-private/nautilus-file-operations.h +++ b/libnautilus-private/nautilus-file-operations.h @@ -1,5 +1,5 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* xfer.h - GNOME::Desktop::FileOperationService transfer service. +/* xfer.h - Bonobo::Desktop::FileOperationService transfer service. Copyright (C) 1999, 2000 Free Software Foundation diff --git a/libnautilus/gnome-icon-container.c b/libnautilus/gnome-icon-container.c index 075e0ccb9..2258b88f1 100644 --- a/libnautilus/gnome-icon-container.c +++ b/libnautilus/gnome-icon-container.c @@ -2656,7 +2656,7 @@ gnome_icon_container_select_all (GnomeIconContainer *container) /** * gnome_icon_container_select_list_unselect_others: * @container: An icon container widget. - * @list: A list of GnomeContainerIcons. + * @list: A list of BonoboContainerIcons. * * Select only the icons in the list, deselect all others. **/ diff --git a/libnautilus/gnome-progressive-loader.c b/libnautilus/gnome-progressive-loader.c index 35d76f902..259214211 100644 --- a/libnautilus/gnome-progressive-loader.c +++ b/libnautilus/gnome-progressive-loader.c @@ -32,52 +32,52 @@ #include "gnome-progressive-loader.h" -static GnomeObjectClass *parent_class = NULL; +static BonoboObjectClass *parent_class = NULL; -POA_GNOME_ProgressiveLoader__epv gnome_progressive_loader_epv; -POA_GNOME_ProgressiveLoader__vepv gnome_progressive_loader_vepv; +POA_Bonobo_ProgressiveLoader__epv bonobo_progressive_loader_epv; +POA_Bonobo_ProgressiveLoader__vepv bonobo_progressive_loader_vepv; static void impl_load (PortableServer_Servant servant, const CORBA_char *uri, - GNOME_ProgressiveDataSink pdsink, + Bonobo_ProgressiveDataSink pdsink, CORBA_Environment *ev) { - GnomeObject *object; - GnomeProgressiveLoader *loader; + BonoboObject *object; + BonoboProgressiveLoader *loader; GnomeVFSResult result; - GNOME_ProgressiveLoader_Error *exception; + Bonobo_ProgressiveLoader_Error *exception; - object = gnome_object_from_servant (servant); - loader = GNOME_PROGRESSIVE_LOADER (object); + object = bonobo_object_from_servant (servant); + loader = BONOBO_PROGRESSIVE_LOADER (object); result = (* loader->load_fn) (loader, uri, pdsink); if (result == GNOME_VFS_OK) return; - exception = g_new (GNOME_ProgressiveLoader_Error, 1); + exception = g_new (Bonobo_ProgressiveLoader_Error, 1); exception->vfs_result = result; CORBA_exception_set (ev, CORBA_USER_EXCEPTION, - ex_GNOME_ProgressiveLoader_Error, + ex_Bonobo_ProgressiveLoader_Error, exception); } -static GNOME_ProgressiveLoader -create_GNOME_ProgressiveLoader (GnomeObject *object) +static Bonobo_ProgressiveLoader +create_Bonobo_ProgressiveLoader (BonoboObject *object) { - POA_GNOME_ProgressiveLoader *servant; + POA_Bonobo_ProgressiveLoader *servant; CORBA_Environment ev; - servant = (POA_GNOME_ProgressiveLoader *) g_new (GnomeObjectServant, 1); - servant->vepv = &gnome_progressive_loader_vepv; + servant = (POA_Bonobo_ProgressiveLoader *) g_new (BonoboObjectServant, 1); + servant->vepv = &bonobo_progressive_loader_vepv; CORBA_exception_init (&ev); - POA_GNOME_ProgressiveLoader__init ((PortableServer_Servant) servant, + POA_Bonobo_ProgressiveLoader__init ((PortableServer_Servant) servant, &ev); if (ev._major != CORBA_NO_EXCEPTION){ g_free (servant); @@ -86,7 +86,7 @@ create_GNOME_ProgressiveLoader (GnomeObject *object) } CORBA_exception_free (&ev); - return (GNOME_ProgressiveLoader) gnome_object_activate_servant + return (Bonobo_ProgressiveLoader) bonobo_object_activate_servant (object, servant); } @@ -96,9 +96,9 @@ create_GNOME_ProgressiveLoader (GnomeObject *object) static void destroy (GtkObject *object) { - GnomeProgressiveLoader *loader; + BonoboProgressiveLoader *loader; - loader = GNOME_PROGRESSIVE_LOADER (object); + loader = BONOBO_PROGRESSIVE_LOADER (object); /* Nothing special. */ @@ -110,18 +110,18 @@ destroy (GtkObject *object) static void corba_class_init (void) { - gnome_progressive_loader_epv.load = impl_load; + bonobo_progressive_loader_epv.load = impl_load; - gnome_progressive_loader_vepv.GNOME_ProgressiveLoader_epv - = &gnome_progressive_loader_epv; + bonobo_progressive_loader_vepv.Bonobo_ProgressiveLoader_epv + = &bonobo_progressive_loader_epv; } static void -class_init (GnomeProgressiveLoaderClass *class) +class_init (BonoboProgressiveLoaderClass *class) { GtkObjectClass *object_class; - parent_class = gtk_type_class (gnome_object_get_type ()); + parent_class = gtk_type_class (bonobo_object_get_type ()); object_class = GTK_OBJECT_CLASS (class); object_class->destroy = destroy; @@ -130,21 +130,21 @@ class_init (GnomeProgressiveLoaderClass *class) } static void -init (GnomeProgressiveLoader *progressive_loader) +init (BonoboProgressiveLoader *progressive_loader) { } GtkType -gnome_progressive_loader_get_type (void) +bonobo_progressive_loader_get_type (void) { static GtkType type = 0; if (type == 0) { static const GtkTypeInfo info = { "IDL:GNOME/ProgressiveLoader:1.0", - sizeof (GnomeProgressiveLoader), - sizeof (GnomeProgressiveLoaderClass), + sizeof (BonoboProgressiveLoader), + sizeof (BonoboProgressiveLoaderClass), (GtkClassInitFunc) class_init, (GtkObjectInitFunc) init, /* reserved_1 */ NULL, @@ -152,26 +152,26 @@ gnome_progressive_loader_get_type (void) (GtkClassInitFunc) NULL, }; - type = gtk_type_unique (gnome_object_get_type (), &info); + type = gtk_type_unique (bonobo_object_get_type (), &info); } return type; } gboolean -gnome_progressive_loader_construct (GnomeProgressiveLoader *loader, - GNOME_ProgressiveLoader corba_loader, - GnomeProgressiveLoaderLoadFn load_fn) +bonobo_progressive_loader_construct (BonoboProgressiveLoader *loader, + Bonobo_ProgressiveLoader corba_loader, + BonoboProgressiveLoaderLoadFn load_fn) { g_return_val_if_fail (loader != NULL, FALSE); - g_return_val_if_fail (GNOME_IS_PROGRESSIVE_LOADER (loader), FALSE); + g_return_val_if_fail (BONOBO_IS_PROGRESSIVE_LOADER (loader), FALSE); g_return_val_if_fail (corba_loader != CORBA_OBJECT_NIL, FALSE); g_return_val_if_fail (load_fn != NULL, FALSE); - gnome_object_construct (GNOME_OBJECT (loader), corba_loader); + bonobo_object_construct (BONOBO_OBJECT (loader), corba_loader); if (corba_loader == CORBA_OBJECT_NIL) { - corba_loader = create_GNOME_ProgressiveLoader (GNOME_OBJECT (loader)); + corba_loader = create_Bonobo_ProgressiveLoader (BONOBO_OBJECT (loader)); if (corba_loader == CORBA_OBJECT_NIL) return FALSE; } @@ -181,16 +181,16 @@ gnome_progressive_loader_construct (GnomeProgressiveLoader *loader, return TRUE; } -GnomeProgressiveLoader * -gnome_progressive_loader_new (GnomeProgressiveLoaderLoadFn load_fn) +BonoboProgressiveLoader * +bonobo_progressive_loader_new (BonoboProgressiveLoaderLoadFn load_fn) { - GnomeProgressiveLoader *loader; + BonoboProgressiveLoader *loader; g_return_val_if_fail (load_fn != NULL, NULL); - loader = gtk_type_new (gnome_progressive_loader_get_type ()); + loader = gtk_type_new (bonobo_progressive_loader_get_type ()); - if (! gnome_progressive_loader_construct (loader, CORBA_OBJECT_NIL, + if (! bonobo_progressive_loader_construct (loader, CORBA_OBJECT_NIL, load_fn)) { gtk_object_destroy (GTK_OBJECT (loader)); return NULL; diff --git a/libnautilus/gnome-progressive-loader.h b/libnautilus/gnome-progressive-loader.h index f18960e51..4493319b6 100644 --- a/libnautilus/gnome-progressive-loader.h +++ b/libnautilus/gnome-progressive-loader.h @@ -23,14 +23,14 @@ /* FIXME this is just a quick hack. */ -#ifndef __GNOME_PROGRESSIVE_LOADER_H__ -#define __GNOME_PROGRESSIVE_LOADER_H__ +#ifndef __BONOBO_PROGRESSIVE_LOADER_H__ +#define __BONOBO_PROGRESSIVE_LOADER_H__ #include <gnome.h> -#include <bonobo/gnome-bonobo.h> +#include <bonobo.h> #include <libgnomevfs/gnome-vfs.h> -#include "GNOME_ProgressiveLoader.h" +#include "Bonobo_ProgressiveLoader.h" #ifdef __cplusplus extern "C" { @@ -38,47 +38,47 @@ extern "C" { #endif /* __cplusplus */ #define GNOME_TYPE_PROGRESSIVE_LOADER \ - (gnome_progressive_loader_get_type ()) -#define GNOME_PROGRESSIVE_LOADER(obj) \ - (GTK_CHECK_CAST ((obj), GNOME_TYPE_PROGRESSIVE_LOADER, GnomeProgressiveLoader)) -#define GNOME_PROGRESSIVE_LOADER_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PROGRESSIVE_LOADER, GnomeProgressiveLoaderClass)) -#define GNOME_IS_PROGRESSIVE_LOADER(obj) \ + (bonobo_progressive_loader_get_type ()) +#define BONOBO_PROGRESSIVE_LOADER(obj) \ + (GTK_CHECK_CAST ((obj), GNOME_TYPE_PROGRESSIVE_LOADER, BonoboProgressiveLoader)) +#define BONOBO_PROGRESSIVE_LOADER_CLASS(klass) \ + (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_PROGRESSIVE_LOADER, BonoboProgressiveLoaderClass)) +#define BONOBO_IS_PROGRESSIVE_LOADER(obj) \ (GTK_CHECK_TYPE ((obj), GNOME_TYPE_PROGRESSIVE_LOADER)) -#define GNOME_IS_PROGRESSIVE_LOADER_CLASS(klass) \ +#define BONOBO_IS_PROGRESSIVE_LOADER_CLASS(klass) \ (GTK_CHECK_CLASS_TYPE ((obj), GNOME_TYPE_PROGRESSIVE_LOADER)) -typedef struct _GnomeProgressiveLoader GnomeProgressiveLoader; -typedef struct _GnomeProgressiveLoaderClass GnomeProgressiveLoaderClass; +typedef struct _BonoboProgressiveLoader BonoboProgressiveLoader; +typedef struct _BonoboProgressiveLoaderClass BonoboProgressiveLoaderClass; -typedef GnomeVFSResult (* GnomeProgressiveLoaderLoadFn) - (GnomeProgressiveLoader *progressive_loader, +typedef GnomeVFSResult (* BonoboProgressiveLoaderLoadFn) + (BonoboProgressiveLoader *progressive_loader, const gchar *uri, - GNOME_ProgressiveDataSink pdsink); + Bonobo_ProgressiveDataSink pdsink); -struct _GnomeProgressiveLoader { - GnomeObject parent; +struct _BonoboProgressiveLoader { + BonoboObject parent; - GnomeProgressiveLoaderLoadFn load_fn; + BonoboProgressiveLoaderLoadFn load_fn; }; -struct _GnomeProgressiveLoaderClass { - GnomeObjectClass parent_class; +struct _BonoboProgressiveLoaderClass { + BonoboObjectClass parent_class; }; -GtkType gnome_progressive_loader_get_type (void); -GnomeProgressiveLoader *gnome_progressive_loader_new (GnomeProgressiveLoaderLoadFn fn); -gboolean gnome_progressive_loader_construct (GnomeProgressiveLoader *loader, - GNOME_ProgressiveLoader corba_loader, - GnomeProgressiveLoaderLoadFn load_fn); +GtkType bonobo_progressive_loader_get_type (void); +BonoboProgressiveLoader *bonobo_progressive_loader_new (BonoboProgressiveLoaderLoadFn fn); +gboolean bonobo_progressive_loader_construct (BonoboProgressiveLoader *loader, + Bonobo_ProgressiveLoader corba_loader, + BonoboProgressiveLoaderLoadFn load_fn); -extern POA_GNOME_ProgressiveLoader__epv gnome_progressive_loader_epv; +extern POA_Bonobo_ProgressiveLoader__epv bonobo_progressive_loader_epv; #ifdef __cplusplus } #endif /* __cplusplus */ -#endif /* __GNOME_PROGRESSIVE_LOADER_H__ */ +#endif /* __BONOBO_PROGRESSIVE_LOADER_H__ */ diff --git a/libnautilus/libnautilus.h b/libnautilus/libnautilus.h index 36397b521..332d2d414 100644 --- a/libnautilus/libnautilus.h +++ b/libnautilus/libnautilus.h @@ -29,7 +29,7 @@ #ifndef LIBNAUTILUS_H #define LIBNAUTILUS_H -#include <bonobo/gnome-bonobo.h> +#include <bonobo.h> #include <libnautilus/nautilus.h> #include <libnautilus/nautilus-alloc.h> #include <libnautilus/nautilus-directory.h> diff --git a/libnautilus/nautilus-content-view-frame.c b/libnautilus/nautilus-content-view-frame.c index bf2078545..defd93ce2 100644 --- a/libnautilus/nautilus-content-view-frame.c +++ b/libnautilus/nautilus-content-view-frame.c @@ -31,7 +31,7 @@ typedef struct { POA_Nautilus_View servant; - gpointer gnome_object; + gpointer bonobo_object; NautilusContentViewFrame *view; } impl_POA_Nautilus_ContentView; diff --git a/libnautilus/nautilus-meta-view-frame.c b/libnautilus/nautilus-meta-view-frame.c index e13100e3e..733e50d96 100644 --- a/libnautilus/nautilus-meta-view-frame.c +++ b/libnautilus/nautilus-meta-view-frame.c @@ -26,10 +26,12 @@ /* ntl-meta-view-frame.c: Implementation for object that represents a nautilus meta view implementation. */ #include "libnautilus.h" +#include <libgnome/gnome-i18n.h> +#include <bonobo/bonobo-property-bag.h> typedef struct { POA_Nautilus_View servant; - gpointer gnome_object; + gpointer bonobo_object; NautilusMetaViewFrame *view; } impl_POA_Nautilus_MetaView; @@ -108,18 +110,18 @@ nautilus_meta_view_frame_class_init (NautilusMetaViewFrameClass *klass) void nautilus_meta_view_frame_set_label(NautilusMetaViewFrame *mvc, const char *label) { - GnomeObject *ctl; - GnomePropertyBag *bag; + BonoboObject *ctl; + BonoboPropertyBag *bag; - ctl = nautilus_view_frame_get_gnome_object(NAUTILUS_VIEW_FRAME(mvc)); - bag = gnome_control_get_property_bag(GNOME_CONTROL(ctl)); + ctl = nautilus_view_frame_get_bonobo_object(NAUTILUS_VIEW_FRAME(mvc)); + bag = bonobo_control_get_property_bag(BONOBO_CONTROL(ctl)); if(!bag) { - bag = gnome_property_bag_new(); - gnome_control_set_property_bag(GNOME_CONTROL(ctl), bag); + bag = bonobo_property_bag_new(); + bonobo_control_set_property_bag(BONOBO_CONTROL(ctl), bag); } - gnome_property_bag_add(bag, "label", "string", + bonobo_property_bag_add(bag, "label", "string", g_strdup(label), g_strdup(label), - _("Label"), GNOME_PROPERTY_READ_ONLY); + _("Label"), BONOBO_PROPERTY_READ_ONLY); } diff --git a/libnautilus/nautilus-view-frame.c b/libnautilus/nautilus-view-frame.c index ce7d7d947..67fb8a4cf 100644 --- a/libnautilus/nautilus-view-frame.c +++ b/libnautilus/nautilus-view-frame.c @@ -46,7 +46,7 @@ static guint nautilus_view_frame_signals[LAST_SIGNAL]; typedef struct { POA_Nautilus_View servant; - gpointer gnome_object; + gpointer bonobo_object; NautilusViewFrame *view; } impl_POA_Nautilus_View; @@ -147,7 +147,7 @@ impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant, static void -impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant) +impl_Nautilus_View__destroy(BonoboObject *obj, impl_POA_Nautilus_View *servant) { PortableServer_ObjectId *objid; CORBA_Environment ev; @@ -166,10 +166,10 @@ impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant) CORBA_exception_free(&ev); } -static GnomeObject * +static BonoboObject * impl_Nautilus_View__create(NautilusViewFrame *view, CORBA_Environment * ev) { - GnomeObject *retval; + BonoboObject *retval; impl_POA_Nautilus_View *newservant; void (*servant_init_func)(PortableServer_Servant servant, CORBA_Environment *ev); NautilusViewFrameClass *view_class = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass); @@ -177,13 +177,13 @@ impl_Nautilus_View__create(NautilusViewFrame *view, CORBA_Environment * ev) servant_init_func = view_class->servant_init_func; newservant = g_new0(impl_POA_Nautilus_View, 1); newservant->servant.vepv = view_class->vepv; - if(!newservant->servant.vepv->GNOME_Unknown_epv) - newservant->servant.vepv->GNOME_Unknown_epv = gnome_object_get_epv(); + if(!newservant->servant.vepv->Bonobo_Unknown_epv) + newservant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv(); servant_init_func((PortableServer_Servant) newservant, ev); newservant->view = view; - retval = gnome_object_new_from_servant(newservant); + retval = bonobo_object_new_from_servant(newservant); gtk_signal_connect(GTK_OBJECT(retval), "destroy", GTK_SIGNAL_FUNC(impl_Nautilus_View__destroy), newservant); @@ -336,11 +336,11 @@ nautilus_view_frame_init (NautilusViewFrame *view) CORBA_Environment ev; GTK_WIDGET_SET_FLAGS (view, GTK_NO_WINDOW); - view->control = GNOME_OBJECT(gnome_control_new(GTK_WIDGET(view))); + view->control = BONOBO_OBJECT(bonobo_control_new(GTK_WIDGET(view))); CORBA_exception_init(&ev); view->view_server = impl_Nautilus_View__create(view, &ev); - gnome_object_add_interface(view->control, view->view_server); + bonobo_object_add_interface(view->control, view->view_server); CORBA_exception_free(&ev); } @@ -349,8 +349,8 @@ nautilus_view_frame_destroy (NautilusViewFrame *view) { NautilusViewFrameClass *klass = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass); - gnome_object_destroy(view->view_server); - gnome_object_destroy(view->control); + bonobo_object_destroy(view->view_server); + bonobo_object_destroy(view->control); if(((GtkObjectClass *)klass->parent_class)->destroy) ((GtkObjectClass *)klass->parent_class)->destroy((GtkObject *)view); @@ -367,7 +367,7 @@ nautilus_view_frame_request_location_change(NautilusViewFrame *view, CORBA_exception_init(&ev); if(CORBA_Object_is_nil(view->view_frame, &ev)) - view->view_frame = GNOME_Unknown_query_interface(gnome_control_get_control_frame(GNOME_CONTROL(view->control)), + view->view_frame = Bonobo_Unknown_query_interface(bonobo_control_get_control_frame(BONOBO_CONTROL(view->control)), "IDL:Nautilus/ViewFrame:1.0", &ev); if(ev._major != CORBA_NO_EXCEPTION) view->view_frame = CORBA_OBJECT_NIL; @@ -395,7 +395,7 @@ nautilus_view_frame_request_selection_change (NautilusViewFrame *vi CORBA_exception_init(&ev); if(CORBA_Object_is_nil(view->view_frame, &ev)) - view->view_frame = GNOME_Unknown_query_interface(gnome_control_get_control_frame(GNOME_CONTROL(view->control)), + view->view_frame = Bonobo_Unknown_query_interface(bonobo_control_get_control_frame(BONOBO_CONTROL(view->control)), "IDL:Nautilus/ViewFrame:1.0", &ev); if(ev._major != CORBA_NO_EXCEPTION) view->view_frame = CORBA_OBJECT_NIL; @@ -423,7 +423,7 @@ nautilus_view_frame_request_status_change (NautilusViewFrame *view, CORBA_exception_init(&ev); if(CORBA_Object_is_nil(view->view_frame, &ev)) - view->view_frame = GNOME_Unknown_query_interface(gnome_control_get_control_frame(GNOME_CONTROL(view->control)), + view->view_frame = Bonobo_Unknown_query_interface(bonobo_control_get_control_frame(BONOBO_CONTROL(view->control)), "IDL:Nautilus/ViewFrame:1.0", &ev); if(ev._major != CORBA_NO_EXCEPTION) view->view_frame = CORBA_OBJECT_NIL; @@ -451,7 +451,7 @@ nautilus_view_frame_request_progress_change(NautilusViewFrame *view, CORBA_exception_init(&ev); if(CORBA_Object_is_nil(view->view_frame, &ev)) - view->view_frame = GNOME_Unknown_query_interface(gnome_control_get_control_frame(GNOME_CONTROL(view->control)), + view->view_frame = Bonobo_Unknown_query_interface(bonobo_control_get_control_frame(BONOBO_CONTROL(view->control)), "IDL:Nautilus/ViewFrame:1.0", &ev); if(ev._major != CORBA_NO_EXCEPTION) view->view_frame = CORBA_OBJECT_NIL; @@ -504,8 +504,8 @@ nautilus_view_frame_size_allocate (GtkWidget *widget, gtk_widget_size_allocate (bin->child, &child_allocation); } -GnomeObject * -nautilus_view_frame_get_gnome_object (NautilusViewFrame *view) +BonoboObject * +nautilus_view_frame_get_bonobo_object (NautilusViewFrame *view) { return view->control; } diff --git a/libnautilus/nautilus-view-frame.h b/libnautilus/nautilus-view-frame.h index 6f73f5da1..47b747e50 100644 --- a/libnautilus/nautilus-view-frame.h +++ b/libnautilus/nautilus-view-frame.h @@ -32,7 +32,7 @@ #include <gtk/gtkbin.h> #include <libnautilus/nautilus.h> -#include <bonobo/gnome-object.h> +#include <bonobo/bonobo-object.h> #ifdef __cplusplus extern "C" { @@ -71,7 +71,7 @@ struct _NautilusViewFrame GtkWidget *main_window; - GnomeObject *control, *view_server; + BonoboObject *control, *view_server; Nautilus_ViewFrame view_frame; }; @@ -84,7 +84,7 @@ void nautilus_view_frame_request_status_change (NautilusViewFrame Nautilus_StatusRequestInfo *loc); void nautilus_view_frame_request_progress_change (NautilusViewFrame *view, Nautilus_ProgressRequestInfo *loc); -GnomeObject *nautilus_view_frame_get_gnome_object (NautilusViewFrame *view); +BonoboObject *nautilus_view_frame_get_bonobo_object (NautilusViewFrame *view); #ifdef __cplusplus } diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c index ce7d7d947..67fb8a4cf 100644 --- a/libnautilus/nautilus-view.c +++ b/libnautilus/nautilus-view.c @@ -46,7 +46,7 @@ static guint nautilus_view_frame_signals[LAST_SIGNAL]; typedef struct { POA_Nautilus_View servant; - gpointer gnome_object; + gpointer bonobo_object; NautilusViewFrame *view; } impl_POA_Nautilus_View; @@ -147,7 +147,7 @@ impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant, static void -impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant) +impl_Nautilus_View__destroy(BonoboObject *obj, impl_POA_Nautilus_View *servant) { PortableServer_ObjectId *objid; CORBA_Environment ev; @@ -166,10 +166,10 @@ impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant) CORBA_exception_free(&ev); } -static GnomeObject * +static BonoboObject * impl_Nautilus_View__create(NautilusViewFrame *view, CORBA_Environment * ev) { - GnomeObject *retval; + BonoboObject *retval; impl_POA_Nautilus_View *newservant; void (*servant_init_func)(PortableServer_Servant servant, CORBA_Environment *ev); NautilusViewFrameClass *view_class = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass); @@ -177,13 +177,13 @@ impl_Nautilus_View__create(NautilusViewFrame *view, CORBA_Environment * ev) servant_init_func = view_class->servant_init_func; newservant = g_new0(impl_POA_Nautilus_View, 1); newservant->servant.vepv = view_class->vepv; - if(!newservant->servant.vepv->GNOME_Unknown_epv) - newservant->servant.vepv->GNOME_Unknown_epv = gnome_object_get_epv(); + if(!newservant->servant.vepv->Bonobo_Unknown_epv) + newservant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv(); servant_init_func((PortableServer_Servant) newservant, ev); newservant->view = view; - retval = gnome_object_new_from_servant(newservant); + retval = bonobo_object_new_from_servant(newservant); gtk_signal_connect(GTK_OBJECT(retval), "destroy", GTK_SIGNAL_FUNC(impl_Nautilus_View__destroy), newservant); @@ -336,11 +336,11 @@ nautilus_view_frame_init (NautilusViewFrame *view) CORBA_Environment ev; GTK_WIDGET_SET_FLAGS (view, GTK_NO_WINDOW); - view->control = GNOME_OBJECT(gnome_control_new(GTK_WIDGET(view))); + view->control = BONOBO_OBJECT(bonobo_control_new(GTK_WIDGET(view))); CORBA_exception_init(&ev); view->view_server = impl_Nautilus_View__create(view, &ev); - gnome_object_add_interface(view->control, view->view_server); + bonobo_object_add_interface(view->control, view->view_server); CORBA_exception_free(&ev); } @@ -349,8 +349,8 @@ nautilus_view_frame_destroy (NautilusViewFrame *view) { NautilusViewFrameClass *klass = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass); - gnome_object_destroy(view->view_server); - gnome_object_destroy(view->control); + bonobo_object_destroy(view->view_server); + bonobo_object_destroy(view->control); if(((GtkObjectClass *)klass->parent_class)->destroy) ((GtkObjectClass *)klass->parent_class)->destroy((GtkObject *)view); @@ -367,7 +367,7 @@ nautilus_view_frame_request_location_change(NautilusViewFrame *view, CORBA_exception_init(&ev); if(CORBA_Object_is_nil(view->view_frame, &ev)) - view->view_frame = GNOME_Unknown_query_interface(gnome_control_get_control_frame(GNOME_CONTROL(view->control)), + view->view_frame = Bonobo_Unknown_query_interface(bonobo_control_get_control_frame(BONOBO_CONTROL(view->control)), "IDL:Nautilus/ViewFrame:1.0", &ev); if(ev._major != CORBA_NO_EXCEPTION) view->view_frame = CORBA_OBJECT_NIL; @@ -395,7 +395,7 @@ nautilus_view_frame_request_selection_change (NautilusViewFrame *vi CORBA_exception_init(&ev); if(CORBA_Object_is_nil(view->view_frame, &ev)) - view->view_frame = GNOME_Unknown_query_interface(gnome_control_get_control_frame(GNOME_CONTROL(view->control)), + view->view_frame = Bonobo_Unknown_query_interface(bonobo_control_get_control_frame(BONOBO_CONTROL(view->control)), "IDL:Nautilus/ViewFrame:1.0", &ev); if(ev._major != CORBA_NO_EXCEPTION) view->view_frame = CORBA_OBJECT_NIL; @@ -423,7 +423,7 @@ nautilus_view_frame_request_status_change (NautilusViewFrame *view, CORBA_exception_init(&ev); if(CORBA_Object_is_nil(view->view_frame, &ev)) - view->view_frame = GNOME_Unknown_query_interface(gnome_control_get_control_frame(GNOME_CONTROL(view->control)), + view->view_frame = Bonobo_Unknown_query_interface(bonobo_control_get_control_frame(BONOBO_CONTROL(view->control)), "IDL:Nautilus/ViewFrame:1.0", &ev); if(ev._major != CORBA_NO_EXCEPTION) view->view_frame = CORBA_OBJECT_NIL; @@ -451,7 +451,7 @@ nautilus_view_frame_request_progress_change(NautilusViewFrame *view, CORBA_exception_init(&ev); if(CORBA_Object_is_nil(view->view_frame, &ev)) - view->view_frame = GNOME_Unknown_query_interface(gnome_control_get_control_frame(GNOME_CONTROL(view->control)), + view->view_frame = Bonobo_Unknown_query_interface(bonobo_control_get_control_frame(BONOBO_CONTROL(view->control)), "IDL:Nautilus/ViewFrame:1.0", &ev); if(ev._major != CORBA_NO_EXCEPTION) view->view_frame = CORBA_OBJECT_NIL; @@ -504,8 +504,8 @@ nautilus_view_frame_size_allocate (GtkWidget *widget, gtk_widget_size_allocate (bin->child, &child_allocation); } -GnomeObject * -nautilus_view_frame_get_gnome_object (NautilusViewFrame *view) +BonoboObject * +nautilus_view_frame_get_bonobo_object (NautilusViewFrame *view) { return view->control; } diff --git a/libnautilus/nautilus-view.h b/libnautilus/nautilus-view.h index 6f73f5da1..47b747e50 100644 --- a/libnautilus/nautilus-view.h +++ b/libnautilus/nautilus-view.h @@ -32,7 +32,7 @@ #include <gtk/gtkbin.h> #include <libnautilus/nautilus.h> -#include <bonobo/gnome-object.h> +#include <bonobo/bonobo-object.h> #ifdef __cplusplus extern "C" { @@ -71,7 +71,7 @@ struct _NautilusViewFrame GtkWidget *main_window; - GnomeObject *control, *view_server; + BonoboObject *control, *view_server; Nautilus_ViewFrame view_frame; }; @@ -84,7 +84,7 @@ void nautilus_view_frame_request_status_change (NautilusViewFrame Nautilus_StatusRequestInfo *loc); void nautilus_view_frame_request_progress_change (NautilusViewFrame *view, Nautilus_ProgressRequestInfo *loc); -GnomeObject *nautilus_view_frame_get_gnome_object (NautilusViewFrame *view); +BonoboObject *nautilus_view_frame_get_bonobo_object (NautilusViewFrame *view); #ifdef __cplusplus } diff --git a/libnautilus/ntl-content-view-frame.c b/libnautilus/ntl-content-view-frame.c index bf2078545..defd93ce2 100644 --- a/libnautilus/ntl-content-view-frame.c +++ b/libnautilus/ntl-content-view-frame.c @@ -31,7 +31,7 @@ typedef struct { POA_Nautilus_View servant; - gpointer gnome_object; + gpointer bonobo_object; NautilusContentViewFrame *view; } impl_POA_Nautilus_ContentView; diff --git a/libnautilus/ntl-meta-view-frame.c b/libnautilus/ntl-meta-view-frame.c index e13100e3e..733e50d96 100644 --- a/libnautilus/ntl-meta-view-frame.c +++ b/libnautilus/ntl-meta-view-frame.c @@ -26,10 +26,12 @@ /* ntl-meta-view-frame.c: Implementation for object that represents a nautilus meta view implementation. */ #include "libnautilus.h" +#include <libgnome/gnome-i18n.h> +#include <bonobo/bonobo-property-bag.h> typedef struct { POA_Nautilus_View servant; - gpointer gnome_object; + gpointer bonobo_object; NautilusMetaViewFrame *view; } impl_POA_Nautilus_MetaView; @@ -108,18 +110,18 @@ nautilus_meta_view_frame_class_init (NautilusMetaViewFrameClass *klass) void nautilus_meta_view_frame_set_label(NautilusMetaViewFrame *mvc, const char *label) { - GnomeObject *ctl; - GnomePropertyBag *bag; + BonoboObject *ctl; + BonoboPropertyBag *bag; - ctl = nautilus_view_frame_get_gnome_object(NAUTILUS_VIEW_FRAME(mvc)); - bag = gnome_control_get_property_bag(GNOME_CONTROL(ctl)); + ctl = nautilus_view_frame_get_bonobo_object(NAUTILUS_VIEW_FRAME(mvc)); + bag = bonobo_control_get_property_bag(BONOBO_CONTROL(ctl)); if(!bag) { - bag = gnome_property_bag_new(); - gnome_control_set_property_bag(GNOME_CONTROL(ctl), bag); + bag = bonobo_property_bag_new(); + bonobo_control_set_property_bag(BONOBO_CONTROL(ctl), bag); } - gnome_property_bag_add(bag, "label", "string", + bonobo_property_bag_add(bag, "label", "string", g_strdup(label), g_strdup(label), - _("Label"), GNOME_PROPERTY_READ_ONLY); + _("Label"), BONOBO_PROPERTY_READ_ONLY); } diff --git a/libnautilus/ntl-view-frame.c b/libnautilus/ntl-view-frame.c index ce7d7d947..67fb8a4cf 100644 --- a/libnautilus/ntl-view-frame.c +++ b/libnautilus/ntl-view-frame.c @@ -46,7 +46,7 @@ static guint nautilus_view_frame_signals[LAST_SIGNAL]; typedef struct { POA_Nautilus_View servant; - gpointer gnome_object; + gpointer bonobo_object; NautilusViewFrame *view; } impl_POA_Nautilus_View; @@ -147,7 +147,7 @@ impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant, static void -impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant) +impl_Nautilus_View__destroy(BonoboObject *obj, impl_POA_Nautilus_View *servant) { PortableServer_ObjectId *objid; CORBA_Environment ev; @@ -166,10 +166,10 @@ impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant) CORBA_exception_free(&ev); } -static GnomeObject * +static BonoboObject * impl_Nautilus_View__create(NautilusViewFrame *view, CORBA_Environment * ev) { - GnomeObject *retval; + BonoboObject *retval; impl_POA_Nautilus_View *newservant; void (*servant_init_func)(PortableServer_Servant servant, CORBA_Environment *ev); NautilusViewFrameClass *view_class = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass); @@ -177,13 +177,13 @@ impl_Nautilus_View__create(NautilusViewFrame *view, CORBA_Environment * ev) servant_init_func = view_class->servant_init_func; newservant = g_new0(impl_POA_Nautilus_View, 1); newservant->servant.vepv = view_class->vepv; - if(!newservant->servant.vepv->GNOME_Unknown_epv) - newservant->servant.vepv->GNOME_Unknown_epv = gnome_object_get_epv(); + if(!newservant->servant.vepv->Bonobo_Unknown_epv) + newservant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv(); servant_init_func((PortableServer_Servant) newservant, ev); newservant->view = view; - retval = gnome_object_new_from_servant(newservant); + retval = bonobo_object_new_from_servant(newservant); gtk_signal_connect(GTK_OBJECT(retval), "destroy", GTK_SIGNAL_FUNC(impl_Nautilus_View__destroy), newservant); @@ -336,11 +336,11 @@ nautilus_view_frame_init (NautilusViewFrame *view) CORBA_Environment ev; GTK_WIDGET_SET_FLAGS (view, GTK_NO_WINDOW); - view->control = GNOME_OBJECT(gnome_control_new(GTK_WIDGET(view))); + view->control = BONOBO_OBJECT(bonobo_control_new(GTK_WIDGET(view))); CORBA_exception_init(&ev); view->view_server = impl_Nautilus_View__create(view, &ev); - gnome_object_add_interface(view->control, view->view_server); + bonobo_object_add_interface(view->control, view->view_server); CORBA_exception_free(&ev); } @@ -349,8 +349,8 @@ nautilus_view_frame_destroy (NautilusViewFrame *view) { NautilusViewFrameClass *klass = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass); - gnome_object_destroy(view->view_server); - gnome_object_destroy(view->control); + bonobo_object_destroy(view->view_server); + bonobo_object_destroy(view->control); if(((GtkObjectClass *)klass->parent_class)->destroy) ((GtkObjectClass *)klass->parent_class)->destroy((GtkObject *)view); @@ -367,7 +367,7 @@ nautilus_view_frame_request_location_change(NautilusViewFrame *view, CORBA_exception_init(&ev); if(CORBA_Object_is_nil(view->view_frame, &ev)) - view->view_frame = GNOME_Unknown_query_interface(gnome_control_get_control_frame(GNOME_CONTROL(view->control)), + view->view_frame = Bonobo_Unknown_query_interface(bonobo_control_get_control_frame(BONOBO_CONTROL(view->control)), "IDL:Nautilus/ViewFrame:1.0", &ev); if(ev._major != CORBA_NO_EXCEPTION) view->view_frame = CORBA_OBJECT_NIL; @@ -395,7 +395,7 @@ nautilus_view_frame_request_selection_change (NautilusViewFrame *vi CORBA_exception_init(&ev); if(CORBA_Object_is_nil(view->view_frame, &ev)) - view->view_frame = GNOME_Unknown_query_interface(gnome_control_get_control_frame(GNOME_CONTROL(view->control)), + view->view_frame = Bonobo_Unknown_query_interface(bonobo_control_get_control_frame(BONOBO_CONTROL(view->control)), "IDL:Nautilus/ViewFrame:1.0", &ev); if(ev._major != CORBA_NO_EXCEPTION) view->view_frame = CORBA_OBJECT_NIL; @@ -423,7 +423,7 @@ nautilus_view_frame_request_status_change (NautilusViewFrame *view, CORBA_exception_init(&ev); if(CORBA_Object_is_nil(view->view_frame, &ev)) - view->view_frame = GNOME_Unknown_query_interface(gnome_control_get_control_frame(GNOME_CONTROL(view->control)), + view->view_frame = Bonobo_Unknown_query_interface(bonobo_control_get_control_frame(BONOBO_CONTROL(view->control)), "IDL:Nautilus/ViewFrame:1.0", &ev); if(ev._major != CORBA_NO_EXCEPTION) view->view_frame = CORBA_OBJECT_NIL; @@ -451,7 +451,7 @@ nautilus_view_frame_request_progress_change(NautilusViewFrame *view, CORBA_exception_init(&ev); if(CORBA_Object_is_nil(view->view_frame, &ev)) - view->view_frame = GNOME_Unknown_query_interface(gnome_control_get_control_frame(GNOME_CONTROL(view->control)), + view->view_frame = Bonobo_Unknown_query_interface(bonobo_control_get_control_frame(BONOBO_CONTROL(view->control)), "IDL:Nautilus/ViewFrame:1.0", &ev); if(ev._major != CORBA_NO_EXCEPTION) view->view_frame = CORBA_OBJECT_NIL; @@ -504,8 +504,8 @@ nautilus_view_frame_size_allocate (GtkWidget *widget, gtk_widget_size_allocate (bin->child, &child_allocation); } -GnomeObject * -nautilus_view_frame_get_gnome_object (NautilusViewFrame *view) +BonoboObject * +nautilus_view_frame_get_bonobo_object (NautilusViewFrame *view) { return view->control; } diff --git a/libnautilus/ntl-view-frame.h b/libnautilus/ntl-view-frame.h index 6f73f5da1..47b747e50 100644 --- a/libnautilus/ntl-view-frame.h +++ b/libnautilus/ntl-view-frame.h @@ -32,7 +32,7 @@ #include <gtk/gtkbin.h> #include <libnautilus/nautilus.h> -#include <bonobo/gnome-object.h> +#include <bonobo/bonobo-object.h> #ifdef __cplusplus extern "C" { @@ -71,7 +71,7 @@ struct _NautilusViewFrame GtkWidget *main_window; - GnomeObject *control, *view_server; + BonoboObject *control, *view_server; Nautilus_ViewFrame view_frame; }; @@ -84,7 +84,7 @@ void nautilus_view_frame_request_status_change (NautilusViewFrame Nautilus_StatusRequestInfo *loc); void nautilus_view_frame_request_progress_change (NautilusViewFrame *view, Nautilus_ProgressRequestInfo *loc); -GnomeObject *nautilus_view_frame_get_gnome_object (NautilusViewFrame *view); +BonoboObject *nautilus_view_frame_get_bonobo_object (NautilusViewFrame *view); #ifdef __cplusplus } diff --git a/src/file-manager/dfos-corba.h b/src/file-manager/dfos-corba.h index a9035a1be..8e3cd4be3 100644 --- a/src/file-manager/dfos-corba.h +++ b/src/file-manager/dfos-corba.h @@ -1,5 +1,5 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* dfos-corba.h - Implementation of the GNOME::Desktop::FileOperationService +/* dfos-corba.h - Implementation of the Bonobo::Desktop::FileOperationService CORBA server. Copyright (C) 1999, 2000 Free Software Foundation diff --git a/src/file-manager/dfos-xfer.c b/src/file-manager/dfos-xfer.c index dd77a042c..68230253f 100644 --- a/src/file-manager/dfos-xfer.c +++ b/src/file-manager/dfos-xfer.c @@ -1,5 +1,5 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* xfer.c - GNOME::Desktop::FileOperationService transfer service. +/* xfer.c - Bonobo::Desktop::FileOperationService transfer service. Copyright (C) 1999, 2000 Free Software Foundation diff --git a/src/file-manager/dfos-xfer.h b/src/file-manager/dfos-xfer.h index 3acae74e7..c6c262328 100644 --- a/src/file-manager/dfos-xfer.h +++ b/src/file-manager/dfos-xfer.h @@ -1,5 +1,5 @@ /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ -/* xfer.h - GNOME::Desktop::FileOperationService transfer service. +/* xfer.h - Bonobo::Desktop::FileOperationService transfer service. Copyright (C) 1999, 2000 Free Software Foundation diff --git a/src/file-manager/fm-main.c b/src/file-manager/fm-main.c index 79703e312..b624ade90 100644 --- a/src/file-manager/fm-main.c +++ b/src/file-manager/fm-main.c @@ -31,9 +31,9 @@ #include "fm-directory-view-list.h" #include <libnautilus/nautilus-debug.h> #include <libgnorba/gnorba.h> -#include <bonobo/gnome-object.h> -#include <bonobo/gnome-generic-factory.h> -#include <bonobo/gnome-main.h> +#include <bonobo/bonobo-object.h> +#include <bonobo/bonobo-generic-factory.h> +#include <bonobo/bonobo-main.h> #include <libgnomevfs/gnome-vfs-init.h> static int object_count = 0; @@ -46,8 +46,8 @@ do_destroy (GtkObject *obj) gtk_main_quit(); } -static GnomeObject * -make_obj (GnomeGenericFactory *Factory, const char *goad_id, gpointer closure) +static BonoboObject * +make_obj (BonoboGenericFactory *Factory, const char *goad_id, gpointer closure) { FMDirectoryView *dir_view; NautilusContentViewFrame *view_frame; @@ -64,22 +64,22 @@ make_obj (GnomeGenericFactory *Factory, const char *goad_id, gpointer closure) view_frame = fm_directory_view_get_view_frame (dir_view); - if (GNOME_IS_OBJECT (view_frame)) - return GNOME_OBJECT (view_frame); + if (BONOBO_IS_OBJECT (view_frame)) + return BONOBO_OBJECT (view_frame); gtk_signal_connect (GTK_OBJECT (view_frame), "destroy", do_destroy, NULL); gtk_widget_show (GTK_WIDGET (view_frame)); object_count++; - return nautilus_view_frame_get_gnome_object (NAUTILUS_VIEW_FRAME (view_frame)); + return nautilus_view_frame_get_bonobo_object (NAUTILUS_VIEW_FRAME (view_frame)); } int main(int argc, char *argv[]) { CORBA_Environment ev; CORBA_ORB orb; - GnomeGenericFactory *factory; + BonoboGenericFactory *factory; CORBA_exception_init(&ev); @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) g_thread_init (NULL); gnome_vfs_init (); - factory = gnome_generic_factory_new_multi("ntl_file_manager_factory", make_obj, NULL); + factory = bonobo_generic_factory_new_multi("ntl_file_manager_factory", make_obj, NULL); do bonobo_main(); diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c index f717203de..6b96064c3 100644 --- a/src/nautilus-information-panel.c +++ b/src/nautilus-information-panel.c @@ -36,6 +36,7 @@ #include <libnautilus/nautilus-directory.h> #include <libnautilus/nautilus-gtk-macros.h> #include <libnautilus/nautilus-string.h> +#include <gnome.h> #define ARRAY_LENGTH(array) \ (sizeof (array) / sizeof ((array)[0])) diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c index f674c4664..7a1640a8e 100644 --- a/src/nautilus-navigation-window.c +++ b/src/nautilus-navigation-window.c @@ -45,7 +45,7 @@ static GnomeAppClass *parent_class = NULL; /* Stuff for handling the CORBA interface */ typedef struct { POA_Nautilus_ViewWindow servant; - gpointer gnome_object; + gpointer bonobo_object; NautilusWindow *window; } impl_POA_Nautilus_ViewWindow; @@ -66,7 +66,7 @@ static POA_Nautilus_ViewWindow__vepv impl_Nautilus_ViewWindow_vepv = static void -impl_Nautilus_ViewWindow__destroy(GnomeObject *obj, impl_POA_Nautilus_ViewWindow *servant) +impl_Nautilus_ViewWindow__destroy(BonoboObject *obj, impl_POA_Nautilus_ViewWindow *servant) { PortableServer_ObjectId *objid; CORBA_Environment ev; @@ -84,10 +84,10 @@ impl_Nautilus_ViewWindow__destroy(GnomeObject *obj, impl_POA_Nautilus_ViewWindow CORBA_exception_free(&ev); } -static GnomeObject * +static BonoboObject * impl_Nautilus_ViewWindow__create(NautilusWindow *window) { - GnomeObject *retval; + BonoboObject *retval; impl_POA_Nautilus_ViewWindow *newservant; CORBA_Environment ev; @@ -98,7 +98,7 @@ impl_Nautilus_ViewWindow__create(NautilusWindow *window) newservant->window = window; POA_Nautilus_ViewWindow__init((PortableServer_Servant) newservant, &ev); - retval = gnome_object_new_from_servant(newservant); + retval = bonobo_object_new_from_servant(newservant); gtk_signal_connect(GTK_OBJECT(retval), "destroy", GTK_SIGNAL_FUNC(impl_Nautilus_ViewWindow__destroy), newservant); CORBA_exception_free(&ev); @@ -354,7 +354,7 @@ nautilus_window_class_init (NautilusWindowClass *klass) GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CONTENT_VIEW); - impl_Nautilus_ViewWindow_vepv.GNOME_Unknown_epv = gnome_object_get_epv(); + impl_Nautilus_ViewWindow_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv(); widget_class->realize = nautilus_window_realize; } @@ -486,9 +486,9 @@ nautilus_window_constructed(NautilusWindow *window) /* CORBA stuff */ window->ntl_viewwindow = impl_Nautilus_ViewWindow__create(window); - window->uih = gnome_ui_handler_new(); - gnome_ui_handler_set_app(window->uih, app); - gnome_ui_handler_set_statusbar(window->uih, statusbar); + window->uih = bonobo_ui_handler_new(); + bonobo_ui_handler_set_app(window->uih, app); + bonobo_ui_handler_set_statusbar(window->uih, statusbar); /* set up menu bar */ gnome_app_create_menus_with_data(app, main_menu, window); @@ -765,7 +765,7 @@ nautilus_window_get_requested_uri (NautilusWindow *window) return window->ni == NULL ? NULL : window->ni->requested_uri; } -GnomeUIHandler * +BonoboUIHandler * nautilus_window_get_uih(NautilusWindow *window) { return window->uih; diff --git a/src/nautilus-navigation-window.h b/src/nautilus-navigation-window.h index bf2e76bfb..46bf61907 100644 --- a/src/nautilus-navigation-window.h +++ b/src/nautilus-navigation-window.h @@ -62,8 +62,8 @@ struct _NautilusWindow { guint statusbar_ctx, statusbar_clear_id; /** CORBA-related elements **/ - GnomeObject *ntl_viewwindow; - GnomeUIHandler *uih; + BonoboObject *ntl_viewwindow; + BonoboUIHandler *uih; /** State information **/ @@ -110,7 +110,7 @@ void nautilus_window_goto_uri(NautilusWindow *window, const char *uri); void nautilus_window_display_error(NautilusWindow *window, const char *error_msg); const char *nautilus_window_get_requested_uri(NautilusWindow *window); -GnomeUIHandler *nautilus_window_get_uih(NautilusWindow *window); +BonoboUIHandler *nautilus_window_get_uih(NautilusWindow *window); void nautilus_window_allow_back (NautilusWindow *window, gboolean allow); void nautilus_window_allow_forward (NautilusWindow *window, gboolean allow); diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c index f674c4664..7a1640a8e 100644 --- a/src/nautilus-object-window.c +++ b/src/nautilus-object-window.c @@ -45,7 +45,7 @@ static GnomeAppClass *parent_class = NULL; /* Stuff for handling the CORBA interface */ typedef struct { POA_Nautilus_ViewWindow servant; - gpointer gnome_object; + gpointer bonobo_object; NautilusWindow *window; } impl_POA_Nautilus_ViewWindow; @@ -66,7 +66,7 @@ static POA_Nautilus_ViewWindow__vepv impl_Nautilus_ViewWindow_vepv = static void -impl_Nautilus_ViewWindow__destroy(GnomeObject *obj, impl_POA_Nautilus_ViewWindow *servant) +impl_Nautilus_ViewWindow__destroy(BonoboObject *obj, impl_POA_Nautilus_ViewWindow *servant) { PortableServer_ObjectId *objid; CORBA_Environment ev; @@ -84,10 +84,10 @@ impl_Nautilus_ViewWindow__destroy(GnomeObject *obj, impl_POA_Nautilus_ViewWindow CORBA_exception_free(&ev); } -static GnomeObject * +static BonoboObject * impl_Nautilus_ViewWindow__create(NautilusWindow *window) { - GnomeObject *retval; + BonoboObject *retval; impl_POA_Nautilus_ViewWindow *newservant; CORBA_Environment ev; @@ -98,7 +98,7 @@ impl_Nautilus_ViewWindow__create(NautilusWindow *window) newservant->window = window; POA_Nautilus_ViewWindow__init((PortableServer_Servant) newservant, &ev); - retval = gnome_object_new_from_servant(newservant); + retval = bonobo_object_new_from_servant(newservant); gtk_signal_connect(GTK_OBJECT(retval), "destroy", GTK_SIGNAL_FUNC(impl_Nautilus_ViewWindow__destroy), newservant); CORBA_exception_free(&ev); @@ -354,7 +354,7 @@ nautilus_window_class_init (NautilusWindowClass *klass) GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CONTENT_VIEW); - impl_Nautilus_ViewWindow_vepv.GNOME_Unknown_epv = gnome_object_get_epv(); + impl_Nautilus_ViewWindow_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv(); widget_class->realize = nautilus_window_realize; } @@ -486,9 +486,9 @@ nautilus_window_constructed(NautilusWindow *window) /* CORBA stuff */ window->ntl_viewwindow = impl_Nautilus_ViewWindow__create(window); - window->uih = gnome_ui_handler_new(); - gnome_ui_handler_set_app(window->uih, app); - gnome_ui_handler_set_statusbar(window->uih, statusbar); + window->uih = bonobo_ui_handler_new(); + bonobo_ui_handler_set_app(window->uih, app); + bonobo_ui_handler_set_statusbar(window->uih, statusbar); /* set up menu bar */ gnome_app_create_menus_with_data(app, main_menu, window); @@ -765,7 +765,7 @@ nautilus_window_get_requested_uri (NautilusWindow *window) return window->ni == NULL ? NULL : window->ni->requested_uri; } -GnomeUIHandler * +BonoboUIHandler * nautilus_window_get_uih(NautilusWindow *window) { return window->uih; diff --git a/src/nautilus-object-window.h b/src/nautilus-object-window.h index bf2e76bfb..46bf61907 100644 --- a/src/nautilus-object-window.h +++ b/src/nautilus-object-window.h @@ -62,8 +62,8 @@ struct _NautilusWindow { guint statusbar_ctx, statusbar_clear_id; /** CORBA-related elements **/ - GnomeObject *ntl_viewwindow; - GnomeUIHandler *uih; + BonoboObject *ntl_viewwindow; + BonoboUIHandler *uih; /** State information **/ @@ -110,7 +110,7 @@ void nautilus_window_goto_uri(NautilusWindow *window, const char *uri); void nautilus_window_display_error(NautilusWindow *window, const char *error_msg); const char *nautilus_window_get_requested_uri(NautilusWindow *window); -GnomeUIHandler *nautilus_window_get_uih(NautilusWindow *window); +BonoboUIHandler *nautilus_window_get_uih(NautilusWindow *window); void nautilus_window_allow_back (NautilusWindow *window, gboolean allow); void nautilus_window_allow_forward (NautilusWindow *window, gboolean allow); diff --git a/src/nautilus-sidebar.c b/src/nautilus-sidebar.c index f717203de..6b96064c3 100644 --- a/src/nautilus-sidebar.c +++ b/src/nautilus-sidebar.c @@ -36,6 +36,7 @@ #include <libnautilus/nautilus-directory.h> #include <libnautilus/nautilus-gtk-macros.h> #include <libnautilus/nautilus-string.h> +#include <gnome.h> #define ARRAY_LENGTH(array) \ (sizeof (array) / sizeof ((array)[0])) diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c index f674c4664..7a1640a8e 100644 --- a/src/nautilus-spatial-window.c +++ b/src/nautilus-spatial-window.c @@ -45,7 +45,7 @@ static GnomeAppClass *parent_class = NULL; /* Stuff for handling the CORBA interface */ typedef struct { POA_Nautilus_ViewWindow servant; - gpointer gnome_object; + gpointer bonobo_object; NautilusWindow *window; } impl_POA_Nautilus_ViewWindow; @@ -66,7 +66,7 @@ static POA_Nautilus_ViewWindow__vepv impl_Nautilus_ViewWindow_vepv = static void -impl_Nautilus_ViewWindow__destroy(GnomeObject *obj, impl_POA_Nautilus_ViewWindow *servant) +impl_Nautilus_ViewWindow__destroy(BonoboObject *obj, impl_POA_Nautilus_ViewWindow *servant) { PortableServer_ObjectId *objid; CORBA_Environment ev; @@ -84,10 +84,10 @@ impl_Nautilus_ViewWindow__destroy(GnomeObject *obj, impl_POA_Nautilus_ViewWindow CORBA_exception_free(&ev); } -static GnomeObject * +static BonoboObject * impl_Nautilus_ViewWindow__create(NautilusWindow *window) { - GnomeObject *retval; + BonoboObject *retval; impl_POA_Nautilus_ViewWindow *newservant; CORBA_Environment ev; @@ -98,7 +98,7 @@ impl_Nautilus_ViewWindow__create(NautilusWindow *window) newservant->window = window; POA_Nautilus_ViewWindow__init((PortableServer_Servant) newservant, &ev); - retval = gnome_object_new_from_servant(newservant); + retval = bonobo_object_new_from_servant(newservant); gtk_signal_connect(GTK_OBJECT(retval), "destroy", GTK_SIGNAL_FUNC(impl_Nautilus_ViewWindow__destroy), newservant); CORBA_exception_free(&ev); @@ -354,7 +354,7 @@ nautilus_window_class_init (NautilusWindowClass *klass) GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CONTENT_VIEW); - impl_Nautilus_ViewWindow_vepv.GNOME_Unknown_epv = gnome_object_get_epv(); + impl_Nautilus_ViewWindow_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv(); widget_class->realize = nautilus_window_realize; } @@ -486,9 +486,9 @@ nautilus_window_constructed(NautilusWindow *window) /* CORBA stuff */ window->ntl_viewwindow = impl_Nautilus_ViewWindow__create(window); - window->uih = gnome_ui_handler_new(); - gnome_ui_handler_set_app(window->uih, app); - gnome_ui_handler_set_statusbar(window->uih, statusbar); + window->uih = bonobo_ui_handler_new(); + bonobo_ui_handler_set_app(window->uih, app); + bonobo_ui_handler_set_statusbar(window->uih, statusbar); /* set up menu bar */ gnome_app_create_menus_with_data(app, main_menu, window); @@ -765,7 +765,7 @@ nautilus_window_get_requested_uri (NautilusWindow *window) return window->ni == NULL ? NULL : window->ni->requested_uri; } -GnomeUIHandler * +BonoboUIHandler * nautilus_window_get_uih(NautilusWindow *window) { return window->uih; diff --git a/src/nautilus-spatial-window.h b/src/nautilus-spatial-window.h index bf2e76bfb..46bf61907 100644 --- a/src/nautilus-spatial-window.h +++ b/src/nautilus-spatial-window.h @@ -62,8 +62,8 @@ struct _NautilusWindow { guint statusbar_ctx, statusbar_clear_id; /** CORBA-related elements **/ - GnomeObject *ntl_viewwindow; - GnomeUIHandler *uih; + BonoboObject *ntl_viewwindow; + BonoboUIHandler *uih; /** State information **/ @@ -110,7 +110,7 @@ void nautilus_window_goto_uri(NautilusWindow *window, const char *uri); void nautilus_window_display_error(NautilusWindow *window, const char *error_msg); const char *nautilus_window_get_requested_uri(NautilusWindow *window); -GnomeUIHandler *nautilus_window_get_uih(NautilusWindow *window); +BonoboUIHandler *nautilus_window_get_uih(NautilusWindow *window); void nautilus_window_allow_back (NautilusWindow *window, gboolean allow); void nautilus_window_allow_forward (NautilusWindow *window, gboolean allow); diff --git a/src/nautilus-view-frame-bonobo-control.c b/src/nautilus-view-frame-bonobo-control.c index a6b732100..07af8a512 100644 --- a/src/nautilus-view-frame-bonobo-control.c +++ b/src/nautilus-view-frame-bonobo-control.c @@ -30,7 +30,7 @@ #include "ntl-view-private.h" typedef struct { - GnomeObject *control_frame; + BonoboObject *control_frame; } BonoboControlInfo; static void @@ -41,7 +41,7 @@ destroy_bonobo_control_view(NautilusView *view, CORBA_Environment *ev) } static void -nautilus_view_activate_uri(GnomeControlFrame *frame, const char *uri, gboolean relative, NautilusView *view) +nautilus_view_activate_uri(BonoboControlFrame *frame, const char *uri, gboolean relative, NautilusView *view) { Nautilus_NavigationRequestInfo nri; g_assert(!relative); @@ -58,14 +58,14 @@ bonobo_control_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Envir view->component_data = bci = g_new0(BonoboControlInfo, 1); - bci->control_frame = GNOME_OBJECT(gnome_control_frame_new()); - gnome_object_add_interface(GNOME_OBJECT(bci->control_frame), view->view_frame); + bci->control_frame = BONOBO_OBJECT(bonobo_control_frame_new()); + bonobo_object_add_interface(BONOBO_OBJECT(bci->control_frame), view->view_frame); - gnome_control_frame_set_ui_handler(GNOME_CONTROL_FRAME(bci->control_frame), + bonobo_control_frame_set_ui_handler(BONOBO_CONTROL_FRAME(bci->control_frame), nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window))); - gnome_control_frame_bind_to_control(GNOME_CONTROL_FRAME(bci->control_frame), obj); + bonobo_control_frame_bind_to_control(BONOBO_CONTROL_FRAME(bci->control_frame), obj); - view->client_widget = gnome_control_frame_get_widget(GNOME_CONTROL_FRAME(bci->control_frame)); + view->client_widget = bonobo_control_frame_get_widget(BONOBO_CONTROL_FRAME(bci->control_frame)); gtk_signal_connect(GTK_OBJECT(bci->control_frame), "activate_uri", GTK_SIGNAL_FUNC(nautilus_view_activate_uri), view); diff --git a/src/nautilus-view-frame-bonobo-embeddable.c b/src/nautilus-view-frame-bonobo-embeddable.c index d9d12b4d0..1f8378d41 100644 --- a/src/nautilus-view-frame-bonobo-embeddable.c +++ b/src/nautilus-view-frame-bonobo-embeddable.c @@ -30,7 +30,7 @@ #include "ntl-view-private.h" typedef struct { - GnomeObject *container, *client_site, *view_frame; + BonoboObject *container, *client_site, *view_frame; } BonoboSubdocInfo; static void @@ -44,26 +44,26 @@ destroy_bonobo_subdoc_view(NautilusView *view, CORBA_Environment *ev) static void bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev) { - GNOME_PersistFile persist; - persist = gnome_object_client_query_interface(view->client_object, "IDL:GNOME/PersistFile:1.0", + Bonobo_PersistFile persist; + persist = bonobo_object_client_query_interface(view->client_object, "IDL:GNOME/PersistFile:1.0", NULL); if(!CORBA_Object_is_nil(persist, ev)) { - GNOME_PersistFile_load(persist, real_nav_ctx->actual_uri, ev); - GNOME_Unknown_unref(persist, ev); + Bonobo_PersistFile_load(persist, real_nav_ctx->actual_uri, ev); + Bonobo_Unknown_unref(persist, ev); CORBA_Object_release(persist, ev); } - else if((persist = gnome_object_client_query_interface(view->client_object, "IDL:GNOME/PersistStream:1.0", + else if((persist = bonobo_object_client_query_interface(view->client_object, "IDL:GNOME/PersistStream:1.0", NULL)) && !CORBA_Object_is_nil(persist, ev)) { - GnomeStream *stream; + BonoboStream *stream; - stream = gnome_stream_fs_open(real_nav_ctx->actual_uri, GNOME_Storage_READ); - GNOME_PersistStream_load (persist, - (GNOME_Stream) gnome_object_corba_objref (GNOME_OBJECT (stream)), + stream = bonobo_stream_fs_open(real_nav_ctx->actual_uri, Bonobo_Storage_READ); + Bonobo_PersistStream_load (persist, + (Bonobo_Stream) bonobo_object_corba_objref (BONOBO_OBJECT (stream)), ev); - GNOME_Unknown_unref(persist, ev); + Bonobo_Unknown_unref(persist, ev); CORBA_Object_release(persist, ev); } } @@ -75,21 +75,21 @@ bonobo_subdoc_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro view->component_data = bsi = g_new0(BonoboSubdocInfo, 1); - bsi->container = GNOME_OBJECT(gnome_container_new()); - gnome_object_add_interface(GNOME_OBJECT(bsi->container), view->view_frame); + bsi->container = BONOBO_OBJECT(bonobo_container_new()); + bonobo_object_add_interface(BONOBO_OBJECT(bsi->container), view->view_frame); bsi->client_site = - GNOME_OBJECT(gnome_client_site_new(GNOME_CONTAINER(bsi->container))); - gnome_client_site_bind_embeddable(GNOME_CLIENT_SITE(bsi->client_site), view->client_object); - gnome_container_add(GNOME_CONTAINER(bsi->container), bsi->client_site); + BONOBO_OBJECT(bonobo_client_site_new(BONOBO_CONTAINER(bsi->container))); + bonobo_client_site_bind_embeddable(BONOBO_CLIENT_SITE(bsi->client_site), view->client_object); + bonobo_container_add(BONOBO_CONTAINER(bsi->container), bsi->client_site); - bsi->view_frame = GNOME_OBJECT(gnome_client_site_new_view(GNOME_CLIENT_SITE(bsi->client_site))); - gnome_control_frame_set_ui_handler(GNOME_CONTROL_FRAME(bsi->view_frame), + bsi->view_frame = BONOBO_OBJECT(bonobo_client_site_new_view(BONOBO_CLIENT_SITE(bsi->client_site))); + bonobo_control_frame_set_ui_handler(BONOBO_CONTROL_FRAME(bsi->view_frame), nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window))); g_assert(bsi->view_frame); - view->client_widget = gnome_view_frame_get_wrapper(GNOME_VIEW_FRAME(bsi->view_frame)); + view->client_widget = bonobo_view_frame_get_wrapper(BONOBO_VIEW_FRAME(bsi->view_frame)); return TRUE; } diff --git a/src/nautilus-view-frame-corba.c b/src/nautilus-view-frame-corba.c index ae9883c26..6895faade 100644 --- a/src/nautilus-view-frame-corba.c +++ b/src/nautilus-view-frame-corba.c @@ -31,7 +31,7 @@ typedef struct { POA_Nautilus_ViewFrame servant; - gpointer gnome_object; + gpointer bonobo_object; NautilusView *view; } impl_POA_Nautilus_ViewFrame; @@ -77,7 +77,7 @@ POA_Nautilus_ViewFrame__vepv impl_Nautilus_ViewFrame_vepv = }; static void -impl_Nautilus_ViewFrame__destroy(GnomeObject *obj, impl_POA_Nautilus_ViewFrame *servant) +impl_Nautilus_ViewFrame__destroy(BonoboObject *obj, impl_POA_Nautilus_ViewFrame *servant) { PortableServer_ObjectId *objid; CORBA_Environment ev; @@ -99,10 +99,10 @@ impl_Nautilus_ViewFrame__destroy(GnomeObject *obj, impl_POA_Nautilus_ViewFrame * CORBA_exception_free(&ev); } -GnomeObject * +BonoboObject * impl_Nautilus_ViewFrame__create(NautilusView *view, CORBA_Environment * ev) { - GnomeObject *retval; + BonoboObject *retval; impl_POA_Nautilus_ViewFrame *newservant; NautilusViewClass *klass; void (*servant_init_func)(PortableServer_Servant, CORBA_Environment *); @@ -110,13 +110,13 @@ impl_Nautilus_ViewFrame__create(NautilusView *view, CORBA_Environment * ev) klass = NAUTILUS_VIEW_CLASS(GTK_OBJECT(view)->klass); newservant = g_new0(impl_POA_Nautilus_ViewFrame, 1); newservant->servant.vepv = klass->vepv; - if(!newservant->servant.vepv->GNOME_Unknown_epv) - newservant->servant.vepv->GNOME_Unknown_epv = gnome_object_get_epv(); + if(!newservant->servant.vepv->Bonobo_Unknown_epv) + newservant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv(); newservant->view = view; servant_init_func = klass->servant_init_func; servant_init_func((PortableServer_Servant) newservant, ev); - retval = gnome_object_new_from_servant(newservant); + retval = bonobo_object_new_from_servant(newservant); gtk_signal_connect(GTK_OBJECT(retval), "destroy", GTK_SIGNAL_FUNC(impl_Nautilus_ViewFrame__destroy), newservant); @@ -127,7 +127,7 @@ static Nautilus_ViewWindow impl_Nautilus_ViewFrame__get_main_window(impl_POA_Nautilus_ViewFrame *servant, CORBA_Environment *ev) { - return CORBA_Object_duplicate(gnome_object_corba_objref(NAUTILUS_WINDOW(servant->view->main_window)->ntl_viewwindow), ev); + return CORBA_Object_duplicate(bonobo_object_corba_objref(NAUTILUS_WINDOW(servant->view->main_window)->ntl_viewwindow), ev); } static void diff --git a/src/nautilus-view-frame-nautilus-view.c b/src/nautilus-view-frame-nautilus-view.c index c54006b6c..5874c5437 100644 --- a/src/nautilus-view-frame-nautilus-view.c +++ b/src/nautilus-view-frame-nautilus-view.c @@ -30,19 +30,19 @@ #include "ntl-view-private.h" typedef struct { - GnomeObject *control_frame; + BonoboObject *control_frame; CORBA_Object view_client; } NautilusViewInfo; static gboolean nautilus_view_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev) { - GNOME_Control control; + Bonobo_Control control; NautilusViewInfo *nvi; nvi = view->component_data = g_new0(NautilusViewInfo, 1); - control = GNOME_Unknown_query_interface(obj, "IDL:GNOME/Control:1.0", ev); + control = Bonobo_Unknown_query_interface(obj, "IDL:GNOME/Control:1.0", ev); if(ev->_major != CORBA_NO_EXCEPTION) control = CORBA_OBJECT_NIL; @@ -50,17 +50,17 @@ nautilus_view_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro goto out; nvi->view_client = CORBA_Object_duplicate(obj, ev); - GNOME_Unknown_ref(nvi->view_client, ev); + Bonobo_Unknown_ref(nvi->view_client, ev); - nvi->control_frame = GNOME_OBJECT(gnome_control_frame_new()); - gnome_object_add_interface(GNOME_OBJECT(nvi->control_frame), view->view_frame); + nvi->control_frame = BONOBO_OBJECT(bonobo_control_frame_new()); + bonobo_object_add_interface(BONOBO_OBJECT(nvi->control_frame), view->view_frame); - gnome_control_frame_set_ui_handler(GNOME_CONTROL_FRAME(nvi->control_frame), + bonobo_control_frame_set_ui_handler(BONOBO_CONTROL_FRAME(nvi->control_frame), nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window))); - gnome_control_frame_bind_to_control(GNOME_CONTROL_FRAME(nvi->control_frame), control); - view->client_widget = gnome_control_frame_get_widget(GNOME_CONTROL_FRAME(nvi->control_frame)); + bonobo_control_frame_bind_to_control(BONOBO_CONTROL_FRAME(nvi->control_frame), control); + view->client_widget = bonobo_control_frame_get_widget(BONOBO_CONTROL_FRAME(nvi->control_frame)); - GNOME_Unknown_unref(control, ev); + Bonobo_Unknown_unref(control, ev); CORBA_Object_release(control, ev); return TRUE; @@ -145,22 +145,22 @@ static char * nv_get_label(NautilusView *view, CORBA_Environment *ev) { NautilusViewInfo *nvi = view->component_data; - GnomePropertyBagClient *bc; - GNOME_Property prop; + BonoboPropertyBagClient *bc; + Bonobo_Property prop; char *retval = NULL; CORBA_any *anyval; - GnomeControlFrame *control_frame; + BonoboControlFrame *control_frame; - control_frame = GNOME_CONTROL_FRAME(nvi->control_frame); - bc = gnome_control_frame_get_control_property_bag(control_frame); + control_frame = BONOBO_CONTROL_FRAME(nvi->control_frame); + bc = bonobo_control_frame_get_control_property_bag(control_frame); g_return_val_if_fail(bc, NULL); - prop = gnome_property_bag_client_get_property(bc, "label"); + prop = bonobo_property_bag_client_get_property(bc, "label"); if(CORBA_Object_is_nil(prop, ev)) return NULL; - anyval = GNOME_Property_get_value(prop, ev); + anyval = Bonobo_Property_get_value(prop, ev); if(ev->_major == CORBA_NO_EXCEPTION && CORBA_TypeCode_equal(anyval->_type, TC_string, ev)) { retval = g_strdup(*(CORBA_char **)anyval->_value); diff --git a/src/nautilus-view-frame-private.h b/src/nautilus-view-frame-private.h index 7daebd2ef..d1e18ae4d 100644 --- a/src/nautilus-view-frame-private.h +++ b/src/nautilus-view-frame-private.h @@ -30,7 +30,7 @@ #include "nautilus.h" extern POA_Nautilus_ViewFrame__vepv impl_Nautilus_ViewFrame_vepv; -GnomeObject *impl_Nautilus_ViewFrame__create(NautilusView *view, CORBA_Environment * ev); +BonoboObject *impl_Nautilus_ViewFrame__create(NautilusView *view, CORBA_Environment * ev); void nautilus_view_request_location_change(NautilusView *view, Nautilus_NavigationRequestInfo *loc); diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c index 93ae89a6c..4b5613aae 100644 --- a/src/nautilus-view-frame.c +++ b/src/nautilus-view-frame.c @@ -219,7 +219,7 @@ nautilus_view_destroy_client(NautilusView *view) g_free(view->iid); view->iid = NULL; - gnome_object_destroy(GNOME_OBJECT(view->client_object)); view->client_object = NULL; + bonobo_object_destroy(BONOBO_OBJECT(view->client_object)); view->client_object = NULL; gtk_container_remove(GTK_CONTAINER(view), view->client_widget); view->client_widget = NULL; @@ -231,7 +231,7 @@ nautilus_view_destroy_client(NautilusView *view) CORBA_exception_free(&ev); } - gnome_object_destroy(view->view_frame); view->view_frame = NULL; + bonobo_object_destroy(view->view_frame); view->view_frame = NULL; view->component_class = NULL; view->component_data = NULL; @@ -354,7 +354,7 @@ nautilus_view_load_client(NautilusView *view, const char *iid) nautilus_view_destroy_client(view); - view->client_object = gnome_object_activate(iid, 0); + view->client_object = bonobo_object_activate(iid, 0); if(!view->client_object) return FALSE; @@ -364,7 +364,7 @@ nautilus_view_load_client(NautilusView *view, const char *iid) for(i = 0; component_types[i] && !view->component_class; i++) { - obj = GNOME_Unknown_query_interface(gnome_object_corba_objref(GNOME_OBJECT(view->client_object)), + obj = Bonobo_Unknown_query_interface(bonobo_object_corba_objref(BONOBO_OBJECT(view->client_object)), component_types[i]->primary_repoid, &ev); if(ev._major != CORBA_NO_EXCEPTION) obj = CORBA_OBJECT_NIL; @@ -375,7 +375,7 @@ nautilus_view_load_client(NautilusView *view, const char *iid) if(component_types[i]->try_load(view, obj, &ev)) view->component_class = component_types[i]; - GNOME_Unknown_unref(obj, &ev); + Bonobo_Unknown_unref(obj, &ev); CORBA_Object_release(obj, &ev); if (view->component_class) @@ -528,13 +528,13 @@ nautilus_view_get_iid(NautilusView *view) CORBA_Object nautilus_view_get_client_objref(NautilusView *view) { - return view?gnome_object_corba_objref(GNOME_OBJECT(view->client_object)):NULL; + return view?bonobo_object_corba_objref(BONOBO_OBJECT(view->client_object)):NULL; } CORBA_Object nautilus_view_get_objref(NautilusView *view) { - return view?gnome_object_corba_objref(view->view_frame):NULL; + return view?bonobo_object_corba_objref(view->view_frame):NULL; } @@ -577,7 +577,7 @@ check_object(NautilusView *view) view->checking++; - if(CORBA_Object_non_existent(gnome_object_corba_objref(GNOME_OBJECT(view->client_object)), &ev)) + if(CORBA_Object_non_existent(bonobo_object_corba_objref(BONOBO_OBJECT(view->client_object)), &ev)) { view->timer_id = 0; gtk_object_destroy(GTK_OBJECT(view)); diff --git a/src/nautilus-view-frame.h b/src/nautilus-view-frame.h index fa62ca835..f75972933 100644 --- a/src/nautilus-view-frame.h +++ b/src/nautilus-view-frame.h @@ -33,7 +33,7 @@ #include <gtk/gtkwidget.h> #include <gtk/gtkbin.h> #include "ntl-types.h" -#include <bonobo/gnome-bonobo.h> +#include <bonobo.h> #ifdef __cplusplus extern "C" { @@ -83,10 +83,10 @@ struct _NautilusView char *iid; - GnomeObjectClient *client_object; + BonoboObjectClient *client_object; GtkWidget *client_widget; - GnomeObject *view_frame; + BonoboObject *view_frame; NautilusViewComponentType *component_class; gpointer component_data; @@ -102,7 +102,7 @@ gboolean nautilus_view_load_client (NautilusView *view const char * iid); const char *nautilus_view_get_iid (NautilusView *view); CORBA_Object nautilus_view_get_client_objref (NautilusView *view); -GnomeObject *nautilus_view_get_control_frame (NautilusView *view); +BonoboObject *nautilus_view_get_control_frame (NautilusView *view); CORBA_Object nautilus_view_get_objref (NautilusView *view); /* These functions correspond to methods of the Nautilus:View CORBAinterface */ diff --git a/src/nautilus-window.c b/src/nautilus-window.c index f674c4664..7a1640a8e 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -45,7 +45,7 @@ static GnomeAppClass *parent_class = NULL; /* Stuff for handling the CORBA interface */ typedef struct { POA_Nautilus_ViewWindow servant; - gpointer gnome_object; + gpointer bonobo_object; NautilusWindow *window; } impl_POA_Nautilus_ViewWindow; @@ -66,7 +66,7 @@ static POA_Nautilus_ViewWindow__vepv impl_Nautilus_ViewWindow_vepv = static void -impl_Nautilus_ViewWindow__destroy(GnomeObject *obj, impl_POA_Nautilus_ViewWindow *servant) +impl_Nautilus_ViewWindow__destroy(BonoboObject *obj, impl_POA_Nautilus_ViewWindow *servant) { PortableServer_ObjectId *objid; CORBA_Environment ev; @@ -84,10 +84,10 @@ impl_Nautilus_ViewWindow__destroy(GnomeObject *obj, impl_POA_Nautilus_ViewWindow CORBA_exception_free(&ev); } -static GnomeObject * +static BonoboObject * impl_Nautilus_ViewWindow__create(NautilusWindow *window) { - GnomeObject *retval; + BonoboObject *retval; impl_POA_Nautilus_ViewWindow *newservant; CORBA_Environment ev; @@ -98,7 +98,7 @@ impl_Nautilus_ViewWindow__create(NautilusWindow *window) newservant->window = window; POA_Nautilus_ViewWindow__init((PortableServer_Servant) newservant, &ev); - retval = gnome_object_new_from_servant(newservant); + retval = bonobo_object_new_from_servant(newservant); gtk_signal_connect(GTK_OBJECT(retval), "destroy", GTK_SIGNAL_FUNC(impl_Nautilus_ViewWindow__destroy), newservant); CORBA_exception_free(&ev); @@ -354,7 +354,7 @@ nautilus_window_class_init (NautilusWindowClass *klass) GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CONTENT_VIEW); - impl_Nautilus_ViewWindow_vepv.GNOME_Unknown_epv = gnome_object_get_epv(); + impl_Nautilus_ViewWindow_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv(); widget_class->realize = nautilus_window_realize; } @@ -486,9 +486,9 @@ nautilus_window_constructed(NautilusWindow *window) /* CORBA stuff */ window->ntl_viewwindow = impl_Nautilus_ViewWindow__create(window); - window->uih = gnome_ui_handler_new(); - gnome_ui_handler_set_app(window->uih, app); - gnome_ui_handler_set_statusbar(window->uih, statusbar); + window->uih = bonobo_ui_handler_new(); + bonobo_ui_handler_set_app(window->uih, app); + bonobo_ui_handler_set_statusbar(window->uih, statusbar); /* set up menu bar */ gnome_app_create_menus_with_data(app, main_menu, window); @@ -765,7 +765,7 @@ nautilus_window_get_requested_uri (NautilusWindow *window) return window->ni == NULL ? NULL : window->ni->requested_uri; } -GnomeUIHandler * +BonoboUIHandler * nautilus_window_get_uih(NautilusWindow *window) { return window->uih; diff --git a/src/nautilus-window.h b/src/nautilus-window.h index bf2e76bfb..46bf61907 100644 --- a/src/nautilus-window.h +++ b/src/nautilus-window.h @@ -62,8 +62,8 @@ struct _NautilusWindow { guint statusbar_ctx, statusbar_clear_id; /** CORBA-related elements **/ - GnomeObject *ntl_viewwindow; - GnomeUIHandler *uih; + BonoboObject *ntl_viewwindow; + BonoboUIHandler *uih; /** State information **/ @@ -110,7 +110,7 @@ void nautilus_window_goto_uri(NautilusWindow *window, const char *uri); void nautilus_window_display_error(NautilusWindow *window, const char *error_msg); const char *nautilus_window_get_requested_uri(NautilusWindow *window); -GnomeUIHandler *nautilus_window_get_uih(NautilusWindow *window); +BonoboUIHandler *nautilus_window_get_uih(NautilusWindow *window); void nautilus_window_allow_back (NautilusWindow *window, gboolean allow); void nautilus_window_allow_forward (NautilusWindow *window, gboolean allow); diff --git a/src/nautilus.h b/src/nautilus.h index defa4ee42..c51fb49b5 100644 --- a/src/nautilus.h +++ b/src/nautilus.h @@ -5,7 +5,7 @@ #include <gnome.h> #include <libgnorba/gnorba.h> -#include <bonobo/gnome-bonobo.h> +#include <bonobo.h> #include "ntl-types.h" #include "ntl-prefs.h" diff --git a/src/ntl-index-panel.c b/src/ntl-index-panel.c index f717203de..6b96064c3 100644 --- a/src/ntl-index-panel.c +++ b/src/ntl-index-panel.c @@ -36,6 +36,7 @@ #include <libnautilus/nautilus-directory.h> #include <libnautilus/nautilus-gtk-macros.h> #include <libnautilus/nautilus-string.h> +#include <gnome.h> #define ARRAY_LENGTH(array) \ (sizeof (array) / sizeof ((array)[0])) diff --git a/src/ntl-view-bonobo-control.c b/src/ntl-view-bonobo-control.c index a6b732100..07af8a512 100644 --- a/src/ntl-view-bonobo-control.c +++ b/src/ntl-view-bonobo-control.c @@ -30,7 +30,7 @@ #include "ntl-view-private.h" typedef struct { - GnomeObject *control_frame; + BonoboObject *control_frame; } BonoboControlInfo; static void @@ -41,7 +41,7 @@ destroy_bonobo_control_view(NautilusView *view, CORBA_Environment *ev) } static void -nautilus_view_activate_uri(GnomeControlFrame *frame, const char *uri, gboolean relative, NautilusView *view) +nautilus_view_activate_uri(BonoboControlFrame *frame, const char *uri, gboolean relative, NautilusView *view) { Nautilus_NavigationRequestInfo nri; g_assert(!relative); @@ -58,14 +58,14 @@ bonobo_control_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Envir view->component_data = bci = g_new0(BonoboControlInfo, 1); - bci->control_frame = GNOME_OBJECT(gnome_control_frame_new()); - gnome_object_add_interface(GNOME_OBJECT(bci->control_frame), view->view_frame); + bci->control_frame = BONOBO_OBJECT(bonobo_control_frame_new()); + bonobo_object_add_interface(BONOBO_OBJECT(bci->control_frame), view->view_frame); - gnome_control_frame_set_ui_handler(GNOME_CONTROL_FRAME(bci->control_frame), + bonobo_control_frame_set_ui_handler(BONOBO_CONTROL_FRAME(bci->control_frame), nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window))); - gnome_control_frame_bind_to_control(GNOME_CONTROL_FRAME(bci->control_frame), obj); + bonobo_control_frame_bind_to_control(BONOBO_CONTROL_FRAME(bci->control_frame), obj); - view->client_widget = gnome_control_frame_get_widget(GNOME_CONTROL_FRAME(bci->control_frame)); + view->client_widget = bonobo_control_frame_get_widget(BONOBO_CONTROL_FRAME(bci->control_frame)); gtk_signal_connect(GTK_OBJECT(bci->control_frame), "activate_uri", GTK_SIGNAL_FUNC(nautilus_view_activate_uri), view); diff --git a/src/ntl-view-bonobo-subdoc.c b/src/ntl-view-bonobo-subdoc.c index d9d12b4d0..1f8378d41 100644 --- a/src/ntl-view-bonobo-subdoc.c +++ b/src/ntl-view-bonobo-subdoc.c @@ -30,7 +30,7 @@ #include "ntl-view-private.h" typedef struct { - GnomeObject *container, *client_site, *view_frame; + BonoboObject *container, *client_site, *view_frame; } BonoboSubdocInfo; static void @@ -44,26 +44,26 @@ destroy_bonobo_subdoc_view(NautilusView *view, CORBA_Environment *ev) static void bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev) { - GNOME_PersistFile persist; - persist = gnome_object_client_query_interface(view->client_object, "IDL:GNOME/PersistFile:1.0", + Bonobo_PersistFile persist; + persist = bonobo_object_client_query_interface(view->client_object, "IDL:GNOME/PersistFile:1.0", NULL); if(!CORBA_Object_is_nil(persist, ev)) { - GNOME_PersistFile_load(persist, real_nav_ctx->actual_uri, ev); - GNOME_Unknown_unref(persist, ev); + Bonobo_PersistFile_load(persist, real_nav_ctx->actual_uri, ev); + Bonobo_Unknown_unref(persist, ev); CORBA_Object_release(persist, ev); } - else if((persist = gnome_object_client_query_interface(view->client_object, "IDL:GNOME/PersistStream:1.0", + else if((persist = bonobo_object_client_query_interface(view->client_object, "IDL:GNOME/PersistStream:1.0", NULL)) && !CORBA_Object_is_nil(persist, ev)) { - GnomeStream *stream; + BonoboStream *stream; - stream = gnome_stream_fs_open(real_nav_ctx->actual_uri, GNOME_Storage_READ); - GNOME_PersistStream_load (persist, - (GNOME_Stream) gnome_object_corba_objref (GNOME_OBJECT (stream)), + stream = bonobo_stream_fs_open(real_nav_ctx->actual_uri, Bonobo_Storage_READ); + Bonobo_PersistStream_load (persist, + (Bonobo_Stream) bonobo_object_corba_objref (BONOBO_OBJECT (stream)), ev); - GNOME_Unknown_unref(persist, ev); + Bonobo_Unknown_unref(persist, ev); CORBA_Object_release(persist, ev); } } @@ -75,21 +75,21 @@ bonobo_subdoc_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro view->component_data = bsi = g_new0(BonoboSubdocInfo, 1); - bsi->container = GNOME_OBJECT(gnome_container_new()); - gnome_object_add_interface(GNOME_OBJECT(bsi->container), view->view_frame); + bsi->container = BONOBO_OBJECT(bonobo_container_new()); + bonobo_object_add_interface(BONOBO_OBJECT(bsi->container), view->view_frame); bsi->client_site = - GNOME_OBJECT(gnome_client_site_new(GNOME_CONTAINER(bsi->container))); - gnome_client_site_bind_embeddable(GNOME_CLIENT_SITE(bsi->client_site), view->client_object); - gnome_container_add(GNOME_CONTAINER(bsi->container), bsi->client_site); + BONOBO_OBJECT(bonobo_client_site_new(BONOBO_CONTAINER(bsi->container))); + bonobo_client_site_bind_embeddable(BONOBO_CLIENT_SITE(bsi->client_site), view->client_object); + bonobo_container_add(BONOBO_CONTAINER(bsi->container), bsi->client_site); - bsi->view_frame = GNOME_OBJECT(gnome_client_site_new_view(GNOME_CLIENT_SITE(bsi->client_site))); - gnome_control_frame_set_ui_handler(GNOME_CONTROL_FRAME(bsi->view_frame), + bsi->view_frame = BONOBO_OBJECT(bonobo_client_site_new_view(BONOBO_CLIENT_SITE(bsi->client_site))); + bonobo_control_frame_set_ui_handler(BONOBO_CONTROL_FRAME(bsi->view_frame), nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window))); g_assert(bsi->view_frame); - view->client_widget = gnome_view_frame_get_wrapper(GNOME_VIEW_FRAME(bsi->view_frame)); + view->client_widget = bonobo_view_frame_get_wrapper(BONOBO_VIEW_FRAME(bsi->view_frame)); return TRUE; } diff --git a/src/ntl-view-frame-svr.c b/src/ntl-view-frame-svr.c index ae9883c26..6895faade 100644 --- a/src/ntl-view-frame-svr.c +++ b/src/ntl-view-frame-svr.c @@ -31,7 +31,7 @@ typedef struct { POA_Nautilus_ViewFrame servant; - gpointer gnome_object; + gpointer bonobo_object; NautilusView *view; } impl_POA_Nautilus_ViewFrame; @@ -77,7 +77,7 @@ POA_Nautilus_ViewFrame__vepv impl_Nautilus_ViewFrame_vepv = }; static void -impl_Nautilus_ViewFrame__destroy(GnomeObject *obj, impl_POA_Nautilus_ViewFrame *servant) +impl_Nautilus_ViewFrame__destroy(BonoboObject *obj, impl_POA_Nautilus_ViewFrame *servant) { PortableServer_ObjectId *objid; CORBA_Environment ev; @@ -99,10 +99,10 @@ impl_Nautilus_ViewFrame__destroy(GnomeObject *obj, impl_POA_Nautilus_ViewFrame * CORBA_exception_free(&ev); } -GnomeObject * +BonoboObject * impl_Nautilus_ViewFrame__create(NautilusView *view, CORBA_Environment * ev) { - GnomeObject *retval; + BonoboObject *retval; impl_POA_Nautilus_ViewFrame *newservant; NautilusViewClass *klass; void (*servant_init_func)(PortableServer_Servant, CORBA_Environment *); @@ -110,13 +110,13 @@ impl_Nautilus_ViewFrame__create(NautilusView *view, CORBA_Environment * ev) klass = NAUTILUS_VIEW_CLASS(GTK_OBJECT(view)->klass); newservant = g_new0(impl_POA_Nautilus_ViewFrame, 1); newservant->servant.vepv = klass->vepv; - if(!newservant->servant.vepv->GNOME_Unknown_epv) - newservant->servant.vepv->GNOME_Unknown_epv = gnome_object_get_epv(); + if(!newservant->servant.vepv->Bonobo_Unknown_epv) + newservant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv(); newservant->view = view; servant_init_func = klass->servant_init_func; servant_init_func((PortableServer_Servant) newservant, ev); - retval = gnome_object_new_from_servant(newservant); + retval = bonobo_object_new_from_servant(newservant); gtk_signal_connect(GTK_OBJECT(retval), "destroy", GTK_SIGNAL_FUNC(impl_Nautilus_ViewFrame__destroy), newservant); @@ -127,7 +127,7 @@ static Nautilus_ViewWindow impl_Nautilus_ViewFrame__get_main_window(impl_POA_Nautilus_ViewFrame *servant, CORBA_Environment *ev) { - return CORBA_Object_duplicate(gnome_object_corba_objref(NAUTILUS_WINDOW(servant->view->main_window)->ntl_viewwindow), ev); + return CORBA_Object_duplicate(bonobo_object_corba_objref(NAUTILUS_WINDOW(servant->view->main_window)->ntl_viewwindow), ev); } static void diff --git a/src/ntl-view-nautilus.c b/src/ntl-view-nautilus.c index c54006b6c..5874c5437 100644 --- a/src/ntl-view-nautilus.c +++ b/src/ntl-view-nautilus.c @@ -30,19 +30,19 @@ #include "ntl-view-private.h" typedef struct { - GnomeObject *control_frame; + BonoboObject *control_frame; CORBA_Object view_client; } NautilusViewInfo; static gboolean nautilus_view_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev) { - GNOME_Control control; + Bonobo_Control control; NautilusViewInfo *nvi; nvi = view->component_data = g_new0(NautilusViewInfo, 1); - control = GNOME_Unknown_query_interface(obj, "IDL:GNOME/Control:1.0", ev); + control = Bonobo_Unknown_query_interface(obj, "IDL:GNOME/Control:1.0", ev); if(ev->_major != CORBA_NO_EXCEPTION) control = CORBA_OBJECT_NIL; @@ -50,17 +50,17 @@ nautilus_view_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro goto out; nvi->view_client = CORBA_Object_duplicate(obj, ev); - GNOME_Unknown_ref(nvi->view_client, ev); + Bonobo_Unknown_ref(nvi->view_client, ev); - nvi->control_frame = GNOME_OBJECT(gnome_control_frame_new()); - gnome_object_add_interface(GNOME_OBJECT(nvi->control_frame), view->view_frame); + nvi->control_frame = BONOBO_OBJECT(bonobo_control_frame_new()); + bonobo_object_add_interface(BONOBO_OBJECT(nvi->control_frame), view->view_frame); - gnome_control_frame_set_ui_handler(GNOME_CONTROL_FRAME(nvi->control_frame), + bonobo_control_frame_set_ui_handler(BONOBO_CONTROL_FRAME(nvi->control_frame), nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window))); - gnome_control_frame_bind_to_control(GNOME_CONTROL_FRAME(nvi->control_frame), control); - view->client_widget = gnome_control_frame_get_widget(GNOME_CONTROL_FRAME(nvi->control_frame)); + bonobo_control_frame_bind_to_control(BONOBO_CONTROL_FRAME(nvi->control_frame), control); + view->client_widget = bonobo_control_frame_get_widget(BONOBO_CONTROL_FRAME(nvi->control_frame)); - GNOME_Unknown_unref(control, ev); + Bonobo_Unknown_unref(control, ev); CORBA_Object_release(control, ev); return TRUE; @@ -145,22 +145,22 @@ static char * nv_get_label(NautilusView *view, CORBA_Environment *ev) { NautilusViewInfo *nvi = view->component_data; - GnomePropertyBagClient *bc; - GNOME_Property prop; + BonoboPropertyBagClient *bc; + Bonobo_Property prop; char *retval = NULL; CORBA_any *anyval; - GnomeControlFrame *control_frame; + BonoboControlFrame *control_frame; - control_frame = GNOME_CONTROL_FRAME(nvi->control_frame); - bc = gnome_control_frame_get_control_property_bag(control_frame); + control_frame = BONOBO_CONTROL_FRAME(nvi->control_frame); + bc = bonobo_control_frame_get_control_property_bag(control_frame); g_return_val_if_fail(bc, NULL); - prop = gnome_property_bag_client_get_property(bc, "label"); + prop = bonobo_property_bag_client_get_property(bc, "label"); if(CORBA_Object_is_nil(prop, ev)) return NULL; - anyval = GNOME_Property_get_value(prop, ev); + anyval = Bonobo_Property_get_value(prop, ev); if(ev->_major == CORBA_NO_EXCEPTION && CORBA_TypeCode_equal(anyval->_type, TC_string, ev)) { retval = g_strdup(*(CORBA_char **)anyval->_value); diff --git a/src/ntl-view-private.h b/src/ntl-view-private.h index 7daebd2ef..d1e18ae4d 100644 --- a/src/ntl-view-private.h +++ b/src/ntl-view-private.h @@ -30,7 +30,7 @@ #include "nautilus.h" extern POA_Nautilus_ViewFrame__vepv impl_Nautilus_ViewFrame_vepv; -GnomeObject *impl_Nautilus_ViewFrame__create(NautilusView *view, CORBA_Environment * ev); +BonoboObject *impl_Nautilus_ViewFrame__create(NautilusView *view, CORBA_Environment * ev); void nautilus_view_request_location_change(NautilusView *view, Nautilus_NavigationRequestInfo *loc); diff --git a/src/ntl-view.c b/src/ntl-view.c index 93ae89a6c..4b5613aae 100644 --- a/src/ntl-view.c +++ b/src/ntl-view.c @@ -219,7 +219,7 @@ nautilus_view_destroy_client(NautilusView *view) g_free(view->iid); view->iid = NULL; - gnome_object_destroy(GNOME_OBJECT(view->client_object)); view->client_object = NULL; + bonobo_object_destroy(BONOBO_OBJECT(view->client_object)); view->client_object = NULL; gtk_container_remove(GTK_CONTAINER(view), view->client_widget); view->client_widget = NULL; @@ -231,7 +231,7 @@ nautilus_view_destroy_client(NautilusView *view) CORBA_exception_free(&ev); } - gnome_object_destroy(view->view_frame); view->view_frame = NULL; + bonobo_object_destroy(view->view_frame); view->view_frame = NULL; view->component_class = NULL; view->component_data = NULL; @@ -354,7 +354,7 @@ nautilus_view_load_client(NautilusView *view, const char *iid) nautilus_view_destroy_client(view); - view->client_object = gnome_object_activate(iid, 0); + view->client_object = bonobo_object_activate(iid, 0); if(!view->client_object) return FALSE; @@ -364,7 +364,7 @@ nautilus_view_load_client(NautilusView *view, const char *iid) for(i = 0; component_types[i] && !view->component_class; i++) { - obj = GNOME_Unknown_query_interface(gnome_object_corba_objref(GNOME_OBJECT(view->client_object)), + obj = Bonobo_Unknown_query_interface(bonobo_object_corba_objref(BONOBO_OBJECT(view->client_object)), component_types[i]->primary_repoid, &ev); if(ev._major != CORBA_NO_EXCEPTION) obj = CORBA_OBJECT_NIL; @@ -375,7 +375,7 @@ nautilus_view_load_client(NautilusView *view, const char *iid) if(component_types[i]->try_load(view, obj, &ev)) view->component_class = component_types[i]; - GNOME_Unknown_unref(obj, &ev); + Bonobo_Unknown_unref(obj, &ev); CORBA_Object_release(obj, &ev); if (view->component_class) @@ -528,13 +528,13 @@ nautilus_view_get_iid(NautilusView *view) CORBA_Object nautilus_view_get_client_objref(NautilusView *view) { - return view?gnome_object_corba_objref(GNOME_OBJECT(view->client_object)):NULL; + return view?bonobo_object_corba_objref(BONOBO_OBJECT(view->client_object)):NULL; } CORBA_Object nautilus_view_get_objref(NautilusView *view) { - return view?gnome_object_corba_objref(view->view_frame):NULL; + return view?bonobo_object_corba_objref(view->view_frame):NULL; } @@ -577,7 +577,7 @@ check_object(NautilusView *view) view->checking++; - if(CORBA_Object_non_existent(gnome_object_corba_objref(GNOME_OBJECT(view->client_object)), &ev)) + if(CORBA_Object_non_existent(bonobo_object_corba_objref(BONOBO_OBJECT(view->client_object)), &ev)) { view->timer_id = 0; gtk_object_destroy(GTK_OBJECT(view)); diff --git a/src/ntl-view.h b/src/ntl-view.h index fa62ca835..f75972933 100644 --- a/src/ntl-view.h +++ b/src/ntl-view.h @@ -33,7 +33,7 @@ #include <gtk/gtkwidget.h> #include <gtk/gtkbin.h> #include "ntl-types.h" -#include <bonobo/gnome-bonobo.h> +#include <bonobo.h> #ifdef __cplusplus extern "C" { @@ -83,10 +83,10 @@ struct _NautilusView char *iid; - GnomeObjectClient *client_object; + BonoboObjectClient *client_object; GtkWidget *client_widget; - GnomeObject *view_frame; + BonoboObject *view_frame; NautilusViewComponentType *component_class; gpointer component_data; @@ -102,7 +102,7 @@ gboolean nautilus_view_load_client (NautilusView *view const char * iid); const char *nautilus_view_get_iid (NautilusView *view); CORBA_Object nautilus_view_get_client_objref (NautilusView *view); -GnomeObject *nautilus_view_get_control_frame (NautilusView *view); +BonoboObject *nautilus_view_get_control_frame (NautilusView *view); CORBA_Object nautilus_view_get_objref (NautilusView *view); /* These functions correspond to methods of the Nautilus:View CORBAinterface */ diff --git a/src/ntl-window.c b/src/ntl-window.c index f674c4664..7a1640a8e 100644 --- a/src/ntl-window.c +++ b/src/ntl-window.c @@ -45,7 +45,7 @@ static GnomeAppClass *parent_class = NULL; /* Stuff for handling the CORBA interface */ typedef struct { POA_Nautilus_ViewWindow servant; - gpointer gnome_object; + gpointer bonobo_object; NautilusWindow *window; } impl_POA_Nautilus_ViewWindow; @@ -66,7 +66,7 @@ static POA_Nautilus_ViewWindow__vepv impl_Nautilus_ViewWindow_vepv = static void -impl_Nautilus_ViewWindow__destroy(GnomeObject *obj, impl_POA_Nautilus_ViewWindow *servant) +impl_Nautilus_ViewWindow__destroy(BonoboObject *obj, impl_POA_Nautilus_ViewWindow *servant) { PortableServer_ObjectId *objid; CORBA_Environment ev; @@ -84,10 +84,10 @@ impl_Nautilus_ViewWindow__destroy(GnomeObject *obj, impl_POA_Nautilus_ViewWindow CORBA_exception_free(&ev); } -static GnomeObject * +static BonoboObject * impl_Nautilus_ViewWindow__create(NautilusWindow *window) { - GnomeObject *retval; + BonoboObject *retval; impl_POA_Nautilus_ViewWindow *newservant; CORBA_Environment ev; @@ -98,7 +98,7 @@ impl_Nautilus_ViewWindow__create(NautilusWindow *window) newservant->window = window; POA_Nautilus_ViewWindow__init((PortableServer_Servant) newservant, &ev); - retval = gnome_object_new_from_servant(newservant); + retval = bonobo_object_new_from_servant(newservant); gtk_signal_connect(GTK_OBJECT(retval), "destroy", GTK_SIGNAL_FUNC(impl_Nautilus_ViewWindow__destroy), newservant); CORBA_exception_free(&ev); @@ -354,7 +354,7 @@ nautilus_window_class_init (NautilusWindowClass *klass) GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CONTENT_VIEW); - impl_Nautilus_ViewWindow_vepv.GNOME_Unknown_epv = gnome_object_get_epv(); + impl_Nautilus_ViewWindow_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv(); widget_class->realize = nautilus_window_realize; } @@ -486,9 +486,9 @@ nautilus_window_constructed(NautilusWindow *window) /* CORBA stuff */ window->ntl_viewwindow = impl_Nautilus_ViewWindow__create(window); - window->uih = gnome_ui_handler_new(); - gnome_ui_handler_set_app(window->uih, app); - gnome_ui_handler_set_statusbar(window->uih, statusbar); + window->uih = bonobo_ui_handler_new(); + bonobo_ui_handler_set_app(window->uih, app); + bonobo_ui_handler_set_statusbar(window->uih, statusbar); /* set up menu bar */ gnome_app_create_menus_with_data(app, main_menu, window); @@ -765,7 +765,7 @@ nautilus_window_get_requested_uri (NautilusWindow *window) return window->ni == NULL ? NULL : window->ni->requested_uri; } -GnomeUIHandler * +BonoboUIHandler * nautilus_window_get_uih(NautilusWindow *window) { return window->uih; diff --git a/src/ntl-window.h b/src/ntl-window.h index bf2e76bfb..46bf61907 100644 --- a/src/ntl-window.h +++ b/src/ntl-window.h @@ -62,8 +62,8 @@ struct _NautilusWindow { guint statusbar_ctx, statusbar_clear_id; /** CORBA-related elements **/ - GnomeObject *ntl_viewwindow; - GnomeUIHandler *uih; + BonoboObject *ntl_viewwindow; + BonoboUIHandler *uih; /** State information **/ @@ -110,7 +110,7 @@ void nautilus_window_goto_uri(NautilusWindow *window, const char *uri); void nautilus_window_display_error(NautilusWindow *window, const char *error_msg); const char *nautilus_window_get_requested_uri(NautilusWindow *window); -GnomeUIHandler *nautilus_window_get_uih(NautilusWindow *window); +BonoboUIHandler *nautilus_window_get_uih(NautilusWindow *window); void nautilus_window_allow_back (NautilusWindow *window, gboolean allow); void nautilus_window_allow_forward (NautilusWindow *window, gboolean allow); |