diff options
Diffstat (limited to 'libnautilus/nautilus-view-frame.c')
| -rw-r--r-- | libnautilus/nautilus-view-frame.c | 631 |
1 files changed, 303 insertions, 328 deletions
diff --git a/libnautilus/nautilus-view-frame.c b/libnautilus/nautilus-view-frame.c index 69f741b44..51e2de983 100644 --- a/libnautilus/nautilus-view-frame.c +++ b/libnautilus/nautilus-view-frame.c @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ /* * libnautilus: A library for nautilus view implementations. @@ -39,79 +39,78 @@ #include <libnautilus/nautilus-undo-manager.h> enum { - NOTIFY_LOCATION_CHANGE, - NOTIFY_SELECTION_CHANGE, - LOAD_STATE, - SAVE_STATE, - SHOW_PROPERTIES, - STOP_LOCATION_CHANGE, - LAST_SIGNAL + NOTIFY_LOCATION_CHANGE, + NOTIFY_SELECTION_CHANGE, + LOAD_STATE, + SAVE_STATE, + SHOW_PROPERTIES, + STOP_LOCATION_CHANGE, + LAST_SIGNAL }; enum { - ARG_0, - ARG_CONTROL + ARG_0, + ARG_CONTROL }; -static guint nautilus_view_frame_signals[LAST_SIGNAL]; +static guint signals[LAST_SIGNAL]; typedef struct { - POA_Nautilus_View servant; - gpointer bonobo_object; - - NautilusViewFrame *view; + POA_Nautilus_View servant; + gpointer bonobo_object; + + NautilusView *view; } impl_POA_Nautilus_View; -void nautilus_view_frame_real_set_bonobo_control (NautilusViewFrame *view, - BonoboObject *bonobo_control); +void nautilus_view_real_set_bonobo_control (NautilusView *view, + BonoboControl *bonobo_control); static void -impl_Nautilus_View_save_state(impl_POA_Nautilus_View * servant, - CORBA_char * config_path, - CORBA_Environment * ev); +impl_Nautilus_View_save_state (impl_POA_Nautilus_View * servant, + CORBA_char * config_path, + CORBA_Environment * ev); static void -impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant, - CORBA_char * config_path, - CORBA_Environment * ev); +impl_Nautilus_View_load_state (impl_POA_Nautilus_View * servant, + CORBA_char * config_path, + CORBA_Environment * ev); static void -impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant, - Nautilus_NavigationInfo * navinfo, - CORBA_Environment * ev); +impl_Nautilus_View_notify_location_change (impl_POA_Nautilus_View * servant, + Nautilus_NavigationInfo * navinfo, + CORBA_Environment * ev); static void -impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant, - CORBA_Environment * ev); +impl_Nautilus_View_stop_location_change (impl_POA_Nautilus_View * servant, + CORBA_Environment * ev); static void -impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant, - Nautilus_SelectionInfo * selinfo, - CORBA_Environment * ev); +impl_Nautilus_View_notify_selection_change (impl_POA_Nautilus_View * servant, + Nautilus_SelectionInfo * selinfo, + CORBA_Environment * ev); static void -impl_Nautilus_View_show_properties(impl_POA_Nautilus_View * servant, - CORBA_Environment * ev); +impl_Nautilus_View_show_properties (impl_POA_Nautilus_View * servant, + CORBA_Environment * ev); POA_Nautilus_View__epv libnautilus_Nautilus_View_epv = { - NULL, /* _private */ - (gpointer) & impl_Nautilus_View_save_state, - (gpointer) & impl_Nautilus_View_load_state, - (gpointer) & impl_Nautilus_View_notify_location_change, - (gpointer) & impl_Nautilus_View_stop_location_change, - (gpointer) & impl_Nautilus_View_notify_selection_change, - (gpointer) & impl_Nautilus_View_show_properties + NULL, /* _private */ + (gpointer) & impl_Nautilus_View_save_state, + (gpointer) & impl_Nautilus_View_load_state, + (gpointer) & impl_Nautilus_View_notify_location_change, + (gpointer) & impl_Nautilus_View_stop_location_change, + (gpointer) & impl_Nautilus_View_notify_selection_change, + (gpointer) & impl_Nautilus_View_show_properties }; -static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL }; - +static PortableServer_ServantBase__epv base_epv; static POA_Nautilus_View__vepv impl_Nautilus_View_vepv = { - &base_epv, - NULL, - &libnautilus_Nautilus_View_epv + &base_epv, + NULL, + &libnautilus_Nautilus_View_epv }; static void @@ -119,7 +118,7 @@ impl_Nautilus_View_save_state(impl_POA_Nautilus_View * servant, CORBA_char * config_path, CORBA_Environment * ev) { - gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[SAVE_STATE], config_path); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[SAVE_STATE], config_path); } static void @@ -127,7 +126,7 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant, CORBA_char * config_path, CORBA_Environment * ev) { - gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[LOAD_STATE], config_path); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[LOAD_STATE], config_path); } static void @@ -135,14 +134,14 @@ impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant, Nautilus_NavigationInfo * navinfo, CORBA_Environment * ev) { - gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[NOTIFY_LOCATION_CHANGE], navinfo); } static void impl_Nautilus_View_show_properties(impl_POA_Nautilus_View * servant, CORBA_Environment * ev) { - gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[SHOW_PROPERTIES]); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[SHOW_PROPERTIES]); } static void @@ -150,359 +149,347 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant, Nautilus_SelectionInfo * selinfo, CORBA_Environment * ev) { - gtk_signal_emit (GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE], selinfo); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[NOTIFY_SELECTION_CHANGE], selinfo); } static void impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant, CORBA_Environment * ev) { - gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[STOP_LOCATION_CHANGE]); + gtk_signal_emit (GTK_OBJECT (servant->view), signals[STOP_LOCATION_CHANGE]); } static void impl_Nautilus_View__destroy(BonoboObject *obj, impl_POA_Nautilus_View *servant) { - PortableServer_ObjectId *objid; - CORBA_Environment ev; - void (*servant_destroy_func) (PortableServer_Servant servant, CORBA_Environment *ev); - - CORBA_exception_init(&ev); - - servant_destroy_func = NAUTILUS_VIEW_FRAME_CLASS (GTK_OBJECT (servant->view)->klass)->servant_destroy_func; - objid = PortableServer_POA_servant_to_id (bonobo_poa (), servant, &ev); - PortableServer_POA_deactivate_object (bonobo_poa (), objid, &ev); - CORBA_free (objid); - obj->servant = NULL; - - servant_destroy_func ((PortableServer_Servant) servant, &ev); - g_free (servant); - CORBA_exception_free(&ev); + PortableServer_ObjectId *objid; + CORBA_Environment ev; + void (*servant_destroy_func) (PortableServer_Servant servant, CORBA_Environment *ev); + + CORBA_exception_init(&ev); + + servant_destroy_func = NAUTILUS_VIEW_CLASS (GTK_OBJECT (servant->view)->klass)->servant_destroy_func; + objid = PortableServer_POA_servant_to_id (bonobo_poa (), servant, &ev); + PortableServer_POA_deactivate_object (bonobo_poa (), objid, &ev); + CORBA_free (objid); + obj->servant = NULL; + + servant_destroy_func ((PortableServer_Servant) servant, &ev); + g_free (servant); + CORBA_exception_free(&ev); } static Nautilus_ViewFrame -impl_Nautilus_View__create(NautilusViewFrame *view, CORBA_Environment * ev) +impl_Nautilus_View__create(NautilusView *view, CORBA_Environment * ev) { - Nautilus_ViewFrame 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); - - 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->Bonobo_Unknown_epv) - newservant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); - servant_init_func ((PortableServer_Servant) newservant, ev); - - newservant->view = view; - - retval = bonobo_object_activate_servant (BONOBO_OBJECT (view), newservant); - - gtk_signal_connect (GTK_OBJECT (view), "destroy", GTK_SIGNAL_FUNC (impl_Nautilus_View__destroy), newservant); - - return retval; + Nautilus_ViewFrame retval; + + impl_POA_Nautilus_View *newservant; + void (*servant_init_func) (PortableServer_Servant servant, CORBA_Environment *ev); + NautilusViewClass *view_class = NAUTILUS_VIEW_CLASS (GTK_OBJECT(view)->klass); + + 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->Bonobo_Unknown_epv) + newservant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); + servant_init_func ((PortableServer_Servant) newservant, ev); + + newservant->view = view; + + retval = bonobo_object_activate_servant (BONOBO_OBJECT (view), newservant); + + gtk_signal_connect (GTK_OBJECT (view), "destroy", + GTK_SIGNAL_FUNC (impl_Nautilus_View__destroy), newservant); + + return retval; } -static void nautilus_view_frame_initialize (NautilusViewFrame *view); -static void nautilus_view_frame_destroy (NautilusViewFrame *view); -static void nautilus_view_frame_initialize_class (NautilusViewFrameClass *klass); -static void nautilus_view_frame_set_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); -static void nautilus_view_frame_get_arg (GtkObject *object, - GtkArg *arg, - guint arg_id); - -NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusViewFrame, nautilus_view_frame, BONOBO_OBJECT_TYPE) +static void nautilus_view_initialize (NautilusView *view); +static void nautilus_view_destroy (NautilusView *view); +static void nautilus_view_initialize_class (NautilusViewClass *klass); +static void nautilus_view_set_arg (GtkObject *object, + GtkArg *arg, + guint arg_id); +static void nautilus_view_get_arg (GtkObject *object, + GtkArg *arg, + guint arg_id); +NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusView, nautilus_view, BONOBO_OBJECT_TYPE) static void -nautilus_view_frame_initialize_class (NautilusViewFrameClass *klass) +nautilus_view_initialize_class (NautilusViewClass *klass) { - GtkObjectClass *object_class; - - object_class = (GtkObjectClass*) klass; - object_class->destroy = (void (*)(GtkObject*))nautilus_view_frame_destroy; - object_class->set_arg = nautilus_view_frame_set_arg; - object_class->get_arg = nautilus_view_frame_get_arg; - - klass->parent_class = gtk_type_class (gtk_type_parent (object_class->type)); - klass->servant_init_func = POA_Nautilus_View__init; - klass->servant_destroy_func = POA_Nautilus_View__fini; - klass->vepv = &impl_Nautilus_View_vepv; - - nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE] = - gtk_signal_new("notify_location_change", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change), - gtk_marshal_NONE__BOXED, - GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); - nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE] = - gtk_signal_new("notify_selection_change", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change), - gtk_marshal_NONE__BOXED, - GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); - nautilus_view_frame_signals[LOAD_STATE] = - gtk_signal_new("load_state", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, load_state), - gtk_marshal_NONE__STRING, - GTK_TYPE_NONE, 1, GTK_TYPE_STRING); - nautilus_view_frame_signals[SAVE_STATE] = - gtk_signal_new("save_state", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, save_state), - gtk_marshal_NONE__STRING, - GTK_TYPE_NONE, 1, GTK_TYPE_STRING); - nautilus_view_frame_signals[SHOW_PROPERTIES] = - gtk_signal_new("show_properties", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, show_properties), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - nautilus_view_frame_signals[STOP_LOCATION_CHANGE] = - gtk_signal_new("stop_location_change", - GTK_RUN_LAST, - object_class->type, - GTK_SIGNAL_OFFSET (NautilusViewFrameClass, stop_location_change), - gtk_marshal_NONE__NONE, - GTK_TYPE_NONE, 0); - gtk_object_class_add_signals (object_class, nautilus_view_frame_signals, LAST_SIGNAL); - - gtk_object_add_arg_type ("NautilusViewFrame::bonobo_control", - GTK_TYPE_OBJECT, - GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT | GTK_ARG_CONSTRUCT_ONLY, - ARG_CONTROL); + GtkObjectClass *object_class; + + object_class = (GtkObjectClass*) klass; + object_class->destroy = (void (*)(GtkObject*))nautilus_view_destroy; + object_class->set_arg = nautilus_view_set_arg; + object_class->get_arg = nautilus_view_get_arg; + + klass->parent_class = gtk_type_class (gtk_type_parent (object_class->type)); + klass->servant_init_func = POA_Nautilus_View__init; + klass->servant_destroy_func = POA_Nautilus_View__fini; + klass->vepv = &impl_Nautilus_View_vepv; + + signals[NOTIFY_LOCATION_CHANGE] = + gtk_signal_new("notify_location_change", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, notify_location_change), + gtk_marshal_NONE__BOXED, + GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); + signals[NOTIFY_SELECTION_CHANGE] = + gtk_signal_new("notify_selection_change", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, notify_selection_change), + gtk_marshal_NONE__BOXED, + GTK_TYPE_NONE, 1, GTK_TYPE_BOXED); + signals[LOAD_STATE] = + gtk_signal_new("load_state", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, load_state), + gtk_marshal_NONE__STRING, + GTK_TYPE_NONE, 1, GTK_TYPE_STRING); + signals[SAVE_STATE] = + gtk_signal_new("save_state", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, save_state), + gtk_marshal_NONE__STRING, + GTK_TYPE_NONE, 1, GTK_TYPE_STRING); + signals[SHOW_PROPERTIES] = + gtk_signal_new("show_properties", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, show_properties), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0); + signals[STOP_LOCATION_CHANGE] = + gtk_signal_new("stop_location_change", + GTK_RUN_LAST, + object_class->type, + GTK_SIGNAL_OFFSET (NautilusViewClass, stop_location_change), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, 0); + gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); + + gtk_object_add_arg_type ("NautilusView::bonobo_control", + GTK_TYPE_OBJECT, + GTK_ARG_READWRITE | GTK_ARG_CONSTRUCT | GTK_ARG_CONSTRUCT_ONLY, + ARG_CONTROL); } static void -nautilus_view_frame_set_arg (GtkObject *object, - GtkArg *arg, - guint arg_id) +nautilus_view_set_arg (GtkObject *object, + GtkArg *arg, + guint arg_id) { - switch(arg_id) { - case ARG_CONTROL: - nautilus_view_frame_real_set_bonobo_control (NAUTILUS_VIEW_FRAME (object), - (BonoboObject *)GTK_VALUE_OBJECT(*arg)); - } + switch(arg_id) { + case ARG_CONTROL: + nautilus_view_real_set_bonobo_control (NAUTILUS_VIEW (object), + BONOBO_CONTROL (GTK_VALUE_OBJECT (*arg))); + } } static void -nautilus_view_frame_get_arg (GtkObject *object, - GtkArg *arg, - guint arg_id) +nautilus_view_get_arg (GtkObject *object, + GtkArg *arg, + guint arg_id) { - NautilusViewFrame *view; - - view = NAUTILUS_VIEW_FRAME (object); - - switch(arg_id) { - case ARG_CONTROL: - GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (nautilus_view_frame_get_bonobo_control (NAUTILUS_VIEW_FRAME (object))); - } + NautilusView *view; + + view = NAUTILUS_VIEW (object); + + switch(arg_id) { + case ARG_CONTROL: + GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (nautilus_view_get_bonobo_control (NAUTILUS_VIEW (object))); + } } static void -nautilus_view_frame_initialize (NautilusViewFrame *view) +nautilus_view_initialize (NautilusView *view) { CORBA_Environment ev; - - CORBA_exception_init(&ev); - - view->private = g_new0 (NautilusViewFramePrivate, 1); + CORBA_exception_init (&ev); + + view->details = g_new0 (NautilusViewDetails, 1); + bonobo_object_construct (BONOBO_OBJECT (view), impl_Nautilus_View__create (view, &ev)); - - nautilus_undo_setup_bonobo_control (BONOBO_OBJECT (view)); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } -NautilusViewFrame * -nautilus_view_frame_new (GtkWidget *widget) +NautilusView * +nautilus_view_new (GtkWidget *widget) { - BonoboObject *control; - - control = BONOBO_OBJECT (bonobo_control_new (widget)); - - return nautilus_view_frame_new_from_bonobo_control (control); + BonoboControl *control; + + control = bonobo_control_new (widget); + return nautilus_view_new_from_bonobo_control (control); } -NautilusViewFrame * -nautilus_view_frame_new_from_bonobo_control (BonoboObject *bonobo_control) +NautilusView * +nautilus_view_new_from_bonobo_control (BonoboControl *bonobo_control) { - NautilusViewFrame *view_frame; - - view_frame = NAUTILUS_VIEW_FRAME (gtk_object_new (NAUTILUS_TYPE_VIEW_FRAME, - "bonobo_control", bonobo_control, - NULL)); - - return view_frame; + NautilusView *view; + + view = NAUTILUS_VIEW (gtk_object_new (NAUTILUS_TYPE_VIEW, + "bonobo_control", bonobo_control, + NULL)); + return view; } static void -nautilus_view_frame_destroy (NautilusViewFrame *view) +nautilus_view_destroy (NautilusView *view) { - NautilusViewFrameClass *klass; - - klass = NAUTILUS_VIEW_FRAME_CLASS (GTK_OBJECT (view)->klass); - - g_free (view->private); - - NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, GTK_OBJECT (view)); + NautilusViewClass *klass; + + klass = NAUTILUS_VIEW_CLASS (GTK_OBJECT (view)->klass); + + g_free (view->details); + + NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, GTK_OBJECT (view)); } gboolean -nautilus_view_frame_ensure_view_frame (NautilusViewFrame *view) +nautilus_view_ensure_view_frame (NautilusView *view) { CORBA_Environment ev; - - g_assert (view != NULL); - g_assert (NAUTILUS_IS_VIEW_FRAME (view)); - + + g_assert (NAUTILUS_IS_VIEW (view)); + CORBA_exception_init (&ev); - - if (CORBA_Object_is_nil (view->private->view_frame, &ev)) { - view->private->view_frame = Bonobo_Unknown_query_interface + + if (CORBA_Object_is_nil (view->details->view_frame, &ev)) { + view->details->view_frame = Bonobo_Unknown_query_interface (bonobo_control_get_control_frame - (BONOBO_CONTROL (nautilus_view_frame_get_bonobo_control (view))), - "IDL:Nautilus/ViewFrame:1.0", &ev); - - if (ev._major != CORBA_NO_EXCEPTION) { - view->private->view_frame = CORBA_OBJECT_NIL; + (nautilus_view_get_bonobo_control (view)), + "IDL:Nautilus/ViewFrame:1.0", &ev); + if (ev._major != CORBA_NO_EXCEPTION) { + view->details->view_frame = CORBA_OBJECT_NIL; } } - if (CORBA_Object_is_nil (view->private->view_frame, &ev)) { - CORBA_exception_free (&ev); - - return FALSE; - } else { - + if (CORBA_Object_is_nil (view->details->view_frame, &ev)) { + CORBA_exception_free (&ev); + return FALSE; + } else { CORBA_exception_free (&ev); return TRUE; } } void -nautilus_view_frame_request_location_change (NautilusViewFrame *view, - Nautilus_NavigationRequestInfo *loc) +nautilus_view_request_location_change (NautilusView *view, + Nautilus_NavigationRequestInfo *loc) { - CORBA_Environment ev; - - g_return_if_fail (view != NULL); - g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); - - CORBA_exception_init (&ev); - - if (nautilus_view_frame_ensure_view_frame (view)) { - Nautilus_ViewFrame_request_location_change(view->private->view_frame, loc, &ev); - if(ev._major != CORBA_NO_EXCEPTION) - { - CORBA_Object_release(view->private->view_frame, &ev); - view->private->view_frame = CORBA_OBJECT_NIL; - } - } - - CORBA_exception_free(&ev); + CORBA_Environment ev; + + g_return_if_fail (view != NULL); + g_return_if_fail (NAUTILUS_IS_VIEW (view)); + + CORBA_exception_init (&ev); + + if (nautilus_view_ensure_view_frame (view)) { + Nautilus_ViewFrame_request_location_change(view->details->view_frame, loc, &ev); + if(ev._major != CORBA_NO_EXCEPTION) { + CORBA_Object_release(view->details->view_frame, &ev); + view->details->view_frame = CORBA_OBJECT_NIL; + } + } + + CORBA_exception_free(&ev); } void -nautilus_view_frame_request_selection_change (NautilusViewFrame *view, - Nautilus_SelectionRequestInfo *loc) +nautilus_view_request_selection_change (NautilusView *view, + Nautilus_SelectionRequestInfo *loc) { - CORBA_Environment ev; - - g_return_if_fail (view != NULL); - g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); - - CORBA_exception_init(&ev); - - if (nautilus_view_frame_ensure_view_frame (view)) { - Nautilus_ViewFrame_request_selection_change(view->private->view_frame, loc, &ev); - if(ev._major != CORBA_NO_EXCEPTION) - { - CORBA_Object_release(view->private->view_frame, &ev); - view->private->view_frame = CORBA_OBJECT_NIL; - } - } - - CORBA_exception_free(&ev); + CORBA_Environment ev; + + g_return_if_fail (view != NULL); + g_return_if_fail (NAUTILUS_IS_VIEW (view)); + + CORBA_exception_init(&ev); + + if (nautilus_view_ensure_view_frame (view)) { + Nautilus_ViewFrame_request_selection_change(view->details->view_frame, loc, &ev); + if(ev._major != CORBA_NO_EXCEPTION) { + CORBA_Object_release(view->details->view_frame, &ev); + view->details->view_frame = CORBA_OBJECT_NIL; + } + } + + CORBA_exception_free(&ev); } void -nautilus_view_frame_request_status_change (NautilusViewFrame *view, - Nautilus_StatusRequestInfo *loc) +nautilus_view_request_status_change (NautilusView *view, + Nautilus_StatusRequestInfo *loc) { - CORBA_Environment ev; - - g_return_if_fail (view != NULL); - g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); - - CORBA_exception_init(&ev); - - if (nautilus_view_frame_ensure_view_frame (view)) { - Nautilus_ViewFrame_request_status_change(view->private->view_frame, loc, &ev); - if(ev._major != CORBA_NO_EXCEPTION) - { - CORBA_Object_release(view->private->view_frame, &ev); - view->private->view_frame = CORBA_OBJECT_NIL; - } - } - - CORBA_exception_free(&ev); + CORBA_Environment ev; + + g_return_if_fail (view != NULL); + g_return_if_fail (NAUTILUS_IS_VIEW (view)); + + CORBA_exception_init(&ev); + + if (nautilus_view_ensure_view_frame (view)) { + Nautilus_ViewFrame_request_status_change(view->details->view_frame, loc, &ev); + if(ev._major != CORBA_NO_EXCEPTION) { + CORBA_Object_release(view->details->view_frame, &ev); + view->details->view_frame = CORBA_OBJECT_NIL; + } + } + + CORBA_exception_free(&ev); } void -nautilus_view_frame_request_progress_change(NautilusViewFrame *view, - Nautilus_ProgressRequestInfo *loc) +nautilus_view_request_progress_change(NautilusView *view, + Nautilus_ProgressRequestInfo *loc) { - CORBA_Environment ev; - - g_return_if_fail (view != NULL); - g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); - - CORBA_exception_init(&ev); - - if (nautilus_view_frame_ensure_view_frame (view)) { - Nautilus_ViewFrame_request_progress_change(view->private->view_frame, loc, &ev); - if(ev._major != CORBA_NO_EXCEPTION) - { - CORBA_Object_release(view->private->view_frame, &ev); - view->private->view_frame = CORBA_OBJECT_NIL; - } - } - - CORBA_exception_free(&ev); + CORBA_Environment ev; + + g_return_if_fail (view != NULL); + g_return_if_fail (NAUTILUS_IS_VIEW (view)); + + CORBA_exception_init(&ev); + + if (nautilus_view_ensure_view_frame (view)) { + Nautilus_ViewFrame_request_progress_change(view->details->view_frame, loc, &ev); + if(ev._major != CORBA_NO_EXCEPTION) { + CORBA_Object_release(view->details->view_frame, &ev); + view->details->view_frame = CORBA_OBJECT_NIL; + } + } + + CORBA_exception_free(&ev); } -BonoboObject * -nautilus_view_frame_get_bonobo_control (NautilusViewFrame *view) +BonoboControl * +nautilus_view_get_bonobo_control (NautilusView *view) { - return view->private->control; + return view->details->control; } CORBA_Object -nautilus_view_frame_get_main_window (NautilusViewFrame *view) +nautilus_view_get_main_window (NautilusView *view) { CORBA_Environment ev; Nautilus_ViewWindow window; CORBA_exception_init (&ev); - if (nautilus_view_frame_ensure_view_frame (view)) { - window = Nautilus_ViewFrame__get_main_window (view->private->view_frame, &ev); + if (nautilus_view_ensure_view_frame (view)) { + window = Nautilus_ViewFrame__get_main_window (view->details->view_frame, &ev); } else { window = NULL; } @@ -512,23 +499,11 @@ nautilus_view_frame_get_main_window (NautilusViewFrame *view) return window; } - void -nautilus_view_frame_real_set_bonobo_control (NautilusViewFrame *view, - BonoboObject *bonobo_control) +nautilus_view_real_set_bonobo_control (NautilusView *view, + BonoboControl *bonobo_control) { - CORBA_Environment ev; - - CORBA_exception_init(&ev); - - /* FIXME bugzilla.eazel.com 682: - * what if this fails? Create a new control, or bomb somehow? - */ - view->private->control = bonobo_object_query_local_interface (bonobo_control, "IDL:Bonobo/Control:1.0"); - bonobo_object_unref (view->private->control); /* we don't want this spare ref */ - - bonobo_object_add_interface (BONOBO_OBJECT (view), view->private->control); - - CORBA_exception_free(&ev); + view->details->control = bonobo_control; + bonobo_object_add_interface (BONOBO_OBJECT (view), BONOBO_OBJECT (view->details->control)); + nautilus_undo_setup_bonobo_control (bonobo_control); } - |