diff options
48 files changed, 589 insertions, 667 deletions
@@ -1,3 +1,61 @@ +2000-05-24 Darin Adler <darin@eazel.com> + + * HACKING: Moved to make clear that popt must build first. + + * RENAMING: Added some new file renamings. + + * src/nautilus-zoomable-frame-svr.c: + * src/nautilus.h: [removed] + * src/ntl-app.c: + * src/ntl-main.c: + * src/ntl-meta-view.c: + * src/ntl-types.h: [removed] + * src/ntl-uri-map.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-window-msgs.c: + * src/ntl-window-state.c: + * src/ntl-window.c: + Got rid of "nautilus.h" and "ntl-types.h". + + * libnautilus/nautilus-undo-context.c: + (impl_Nautilus_Undo_Context__destroy), + (impl_Nautilus_Undo_Context__create), + (impl_Nautilus_Undo_Context__get_undo_manager), + (nautilus_undo_context_new), (nautilus_undo_context_initialize), + (destroy): + * libnautilus/nautilus-undo-manager.c: + (impl_Nautilus_Undo_Manager__destroy), + (impl_Nautilus_Undo_Manager__create), + (impl_Nautilus_Undo_Manager__append), + (impl_Nautilus_Undo_Manager__forget), + (impl_Nautilus_Undo_Manager__undo), (nautilus_undo_manager_new), + (nautilus_undo_manager_initialize), + (nautilus_undo_manager_initialize_class), + (nautilus_undo_manager_undo), (nautilus_undo_manager_redo), + (nautilus_undo_manager_add_transaction), + (nautilus_undo_manager_unregister_object), + (nautilus_undo_manager_can_undo), (nautilus_undo_manager_can_redo), + (destroy), (nautilus_undo_manager_enable_redo), + (nautilus_undo_manager_set_queue_depth), (free_undo_manager_list): + Various code cleanups. Specifically, get rid of unused + bonobo_object and rename gtk_object to bonobo_object. + Get rid of some yucky function pointer casts. + + * src/ntl-app.c: (nautilus_app_init): + Got rid of bogus extra ref. + + * libnautilus-extensions/nautilus-program-chooser.c: + (nautilus_program_chooser_new): Reindent part just to annoy John. + * libnautilus-extensions/nautilus-program-choosing.c: + (nautilus_launch_application): Newline at end of file (ugh). + + * src/ntl-index-panel.c: (add_command_buttons): Format tweaking. + 2000-05-24 Eskil Heyn Olsen <eskil@eazel.om> * configure.in: @@ -25,9 +83,8 @@ 2000-05-24 J Shane Culpepper <pepper@eazel.com> - *nautilus-installer/nautilus-installer.c - *nautilus-installer/Makefile - + * nautilus-installer/nautilus-installer.c: + * nautilus-installer/Makefile: Removed the duplicate helixcode files from the installer. Temporarily added 4 duplicate functions to the installer until I get libtrilobite statically linked in. @@ -102,22 +159,22 @@ * libnautilus/nautilus-undo-context.c: (impl_Nautilus_Undo_Context__get_undo_manager): - Added call to CORBA_Object_duplicate(). This - fixed an explosive bug. + Added call to CORBA_Object_duplicate(). This fixed an explosive + bug. * libnautilus/nautilus-undo-manager.c: * libnautilus/nautilus-undo-manager.h: (nautilus_undo_manager_stash_global_undo), (nautilus_undo_manager_get_global_undo): - New functions to save application global instance of Nautilus_Undo_Manager + New functions to save application global instance of + Nautilus_Undo_Manager * src/ntl-app.c: (nautilus_app_init): Add call to nautilus_undo_manager_stash_global_undo. * src/ntl-view.c: (nautilus_view_frame_load_client): - Coonected Nautilus_Undo_Context interface to view frame. - + Connected Nautilus_Undo_Context interface to view frame. 2000-05-23 Ramiro Estrugo <ramiro@eazel.com> @@ -16,6 +16,7 @@ Nautilus currently requires the following modules from GNOME CVS module branch configure options ------ ------ ----------------- + popt: <need 1.5, but not from GNOME CVS, see below> glib: glib-1-2 gtk+: gtk-1-2 imlib: HEAD @@ -34,7 +35,6 @@ Nautilus currently requires the following modules from GNOME CVS gtkhtml: HEAD eog: HEAD --enable-oaf=yes xpdf: HEAD - popt: <need 1.5, but not from GNOME CVS, see below> Other modules for Red Hat users: @@ -1,58 +1,67 @@ -We put plans for renaming in here so we can think about them for a while. -Note that when we rename a class, it usually involves renaming some files too. ---- +We put plans for renaming in here so we can think about them for a +while. Note that when we rename a class, it usually involves renaming +some functions and files too. +---------- +file names +---------- +components/history/ntl-history-view.c -> components/history/nautilus-history-view.c +components/notes/ntl-notes.c -> components/notes/nautilus-notes.c +libnautilus/nautilus-content-view-frame.c -> libnautilus/nautilus-content-view.c +libnautilus/nautilus-content-view-frame.h -> libnautilus/nautilus-content-view.h +libnautilus/nautilus-meta-view-frame.c -> libnautilus/nautilus-meta-view.c +libnautilus/nautilus-meta-view-frame.h -> libnautilus/nautilus-meta-view.h +libnautilus/nautilus-view-frame.c -> libnautilus/nautilus-view.c +libnautilus/nautilus-view-frame.h -> libnautilus/nautilus-view.h +src/nautilus-index-tabs.c -> src/nautilus-sidebar-tabs.c +src/nautilus-index-tabs.h -> src/nautilus-sidebar-tabs.h +src/nautilus-index-title.c -> src/nautilus-sidebar-title.c +src/nautilus-index-title.h -> src/nautilus-sidebar-title.h +src/nautilus-zoomable-frame-svr.c -> src/nautilus-zoomable-frame-corba.c src/ntl-app.c -> src/nautilus-application.c src/ntl-app.h -> src/nautilus-application.h src/ntl-content-view.c -> src/nautilus-content-view-frame.c src/ntl-content-view.h -> src/nautilus-content-view-frame.h +src/ntl-index-panel.c -> src/nautilus-sidebar.c +src/ntl-index-panel.h -> src/nautilus-sidebar.h src/ntl-main.c -> src/nautilus-main.c src/ntl-meta-view.c -> src/nautilus-meta-view-frame.c src/ntl-meta-view.h -> src/nautilus-meta-view-frame.h +src/ntl-miniicon.c -> libnautilus-extensions/nautilus-mini-icon.c +src/ntl-miniicon.h -> libnautilus-extensions/nautilus-mini-icon.h +src/ntl-uri-map.c -> src/nautilus-applicable-views.c +src/ntl-uri-map.h -> src/nautilus-applicable-views.h src/ntl-view-bonobo-control.c -> src/nautilus-view-frame-bonobo-control.c src/ntl-view-bonobo-subdoc.c -> src/nautilus-view-frame-bonobo-embeddable.c +src/ntl-view-frame-svr.c -> src/nautilus-view-frame-corba.c +src/ntl-view-nautilus.c -> src/nautilus-view-frame-nautilus-view.c src/ntl-view-private.h -> src/nautilus-view-frame-private.h src/ntl-view.c -> src/nautilus-view-frame.c src/ntl-view.h -> src/nautilus-view-frame.h +src/ntl-window-msgs.c -> src/nautilus-window-manage-views.c +src/ntl-window-msgs.h -> src/nautilus-window-manage-views.h src/ntl-window-private.h -> src/nautilus-window-private.h src/ntl-window-state.c -> src/nautilus-window-state.c src/ntl-window-state.h -> src/nautilus-window-state.h src/ntl-window.c -> src/nautilus-window.c src/ntl-window.h -> src/nautilus-window.h -libnautilus/nautilus-content-view-frame.c -> libnautilus/nautilus-content-view.c -libnautilus/nautilus-content-view-frame.h -> libnautilus/nautilus-content-view.h -libnautilus/nautilus-meta-view-frame.c -> libnautilus/nautilus-meta-view.c -libnautilus/nautilus-meta-view-frame.h -> libnautilus/nautilus-meta-view.h -libnautilus/nautilus-view-frame.c -> libnautilus/nautilus-view.c -libnautilus/nautilus-view-frame.h -> libnautilus/nautilus-view.h -src/ntl-view-nautilus.c -> src/nautilus-view-frame-nautilus-view.c -src/ntl-index-panel.c -> nautilus-sidebar.c -src/ntl-index-panel.h -> nautilus-sidebar.h -src/ntl-miniicon.c -> libnautilus-extensions/nautilus-mini-icon.c -src/ntl-miniicon.h -> libnautilus-extensions/nautilus-mini-icon.h - -src/ntl-types.h -> (delete this file) - -src/ntl-uri-map.c -> nautilus-applicable-views.c -src/ntl-uri-map.h -> nautilus-applicable-views.h -src/ntl-window-msgs.c -> nautilus-window-manage-views.c -src/ntl-window-msgs.h -> nautilus-window-manage-views.h - -ntl* -> nautilus* - -GtkScrollFrame -> NautilusScrollFrame - -*_cb -> *_callback +components/html/ntl-web-browser.c -> ? +components/websearch/ntl-web-search.c -> ? +---------------------------- +classes and other data types +---------------------------- *IndexPanel* -> *Sidebar* *MetaView* -> *SidebarPanel* - - +GtkScrollFrame -> NautilusScrollFrame NavigationRequestInfo -> NavigationRequest NavigationInfo -> Location - SelectionInfo -> Selection SelectionRequestInfo -> SelectionRequest - StatusRequestInfo -> Status (or StatusRequest) + +-------------- +function names +-------------- +*_cb -> *_callback diff --git a/libnautilus-extensions/nautilus-program-chooser.c b/libnautilus-extensions/nautilus-program-chooser.c index 095447182..9eb27cf70 100644 --- a/libnautilus-extensions/nautilus-program-chooser.c +++ b/libnautilus-extensions/nautilus-program-chooser.c @@ -48,18 +48,18 @@ nautilus_program_chooser_new (NautilusProgramChooserType type, file_name = nautilus_file_get_name (file); switch (type) { - case NAUTILUS_PROGRAM_CHOOSER_APPLICATIONS: - title = _("Nautilus: Choose an application"); - prompt = g_strdup_printf (_("Choose an application with which to open \"%s\"\n\n(Doesn't do anything yet)"), file_name); - break; - case NAUTILUS_PROGRAM_CHOOSER_COMPONENTS: - default: - title = _("Nautilus: Choose a viewer"); - prompt = g_strdup_printf (_("Choose a viewer with which to display \"%s\"\n\n(Doesn't do anything yet)"), file_name); - break; + case NAUTILUS_PROGRAM_CHOOSER_APPLICATIONS: + title = _("Nautilus: Choose an application"); + prompt = g_strdup_printf (_("Choose an application with which to open \"%s\"\n\n(Doesn't do anything yet)"), file_name); + break; + case NAUTILUS_PROGRAM_CHOOSER_COMPONENTS: + default: + title = _("Nautilus: Choose a viewer"); + prompt = g_strdup_printf (_("Choose a viewer with which to display \"%s\"\n\n(Doesn't do anything yet)"), file_name); + break; } g_free (file_name); - + window = gnome_dialog_new (title, GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, @@ -77,4 +77,4 @@ nautilus_program_chooser_new (NautilusProgramChooserType type, gnome_dialog_set_close (GNOME_DIALOG (window), TRUE); return GNOME_DIALOG (window); -}
\ No newline at end of file +} diff --git a/libnautilus-extensions/nautilus-program-choosing.c b/libnautilus-extensions/nautilus-program-choosing.c index fc5ae7a26..98b8688f8 100644 --- a/libnautilus-extensions/nautilus-program-choosing.c +++ b/libnautilus-extensions/nautilus-program-choosing.c @@ -190,4 +190,4 @@ nautilus_launch_application (const char *command_string, const char *uri) execlp (command_string, command_string, uri_parameter, NULL); exit (0); } -}
\ No newline at end of file +} diff --git a/libnautilus-extensions/nautilus-undo-context.c b/libnautilus-extensions/nautilus-undo-context.c index 0527fbf49..583704226 100644 --- a/libnautilus-extensions/nautilus-undo-context.c +++ b/libnautilus-extensions/nautilus-undo-context.c @@ -36,30 +36,27 @@ typedef struct { POA_Nautilus_Undo_Context servant; - gpointer bonobo_object; - - NautilusUndoContext *gtk_object; + NautilusUndoContext *bonobo_object; } impl_POA_Nautilus_Undo_Context; /* GtkObject */ -static void nautilus_undo_context_initialize_class (NautilusUndoContextClass *class); -static void nautilus_undo_context_initialize (NautilusUndoContext *item); -static void destroy (GtkObject *object); +static void nautilus_undo_context_initialize_class (NautilusUndoContextClass *class); +static void nautilus_undo_context_initialize (NautilusUndoContext *item); +static void destroy (GtkObject *object); /* CORBA/Bonobo */ -static Nautilus_Undo_Manager impl_Nautilus_Undo_Context__get_undo_manager (impl_POA_Nautilus_Undo_Context *servant, - CORBA_Environment *ev); +static Nautilus_Undo_Manager impl_Nautilus_Undo_Context__get_undo_manager (PortableServer_Servant servant, + CORBA_Environment *ev); NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusUndoContext, nautilus_undo_context, BONOBO_OBJECT_TYPE) POA_Nautilus_Undo_Context__epv libnautilus_Nautilus_Undo_Context_epv = { - NULL, /* _private */ - (gpointer) &impl_Nautilus_Undo_Context__get_undo_manager, + NULL, /* _private */ + &impl_Nautilus_Undo_Context__get_undo_manager, }; -static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL }; - +static PortableServer_ServantBase__epv base_epv; static POA_Nautilus_Undo_Context__vepv impl_Nautilus_Undo_Context_vepv = { &base_epv, @@ -74,17 +71,20 @@ impl_Nautilus_Undo_Context__destroy (BonoboObject *obj, impl_POA_Nautilus_Undo_C CORBA_Environment ev; void (*servant_destroy_func) (PortableServer_Servant servant, CORBA_Environment *ev); - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); + + servant_destroy_func = NAUTILUS_UNDO_CONTEXT_CLASS + (GTK_OBJECT (servant->bonobo_object)->klass)->servant_destroy_func; - servant_destroy_func = NAUTILUS_UNDO_CONTEXT_CLASS (GTK_OBJECT (servant->gtk_object)->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); + (* servant_destroy_func) ((PortableServer_Servant) servant, &ev); + g_free (servant); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } static Nautilus_Undo_Context @@ -93,39 +93,39 @@ impl_Nautilus_Undo_Context__create (NautilusUndoContext *context, CORBA_Environm Nautilus_Undo_Context retval; impl_POA_Nautilus_Undo_Context *servant; void (*servant_init_func) (PortableServer_Servant servant, CORBA_Environment *ev); + NautilusUndoContextClass *context_class; - NautilusUndoContextClass *context_class = NAUTILUS_UNDO_CONTEXT_CLASS (GTK_OBJECT (context)->klass); + context_class = NAUTILUS_UNDO_CONTEXT_CLASS (GTK_OBJECT (context)->klass); servant_init_func = context_class->servant_init_func; servant = g_new0 (impl_POA_Nautilus_Undo_Context, 1); servant->servant.vepv = context_class->vepv; - if (!servant->servant.vepv->Bonobo_Unknown_epv) { + if (servant->servant.vepv->Bonobo_Unknown_epv == NULL) { servant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); } - servant_init_func ((PortableServer_Servant) servant, ev); + (* servant_init_func) ((PortableServer_Servant) servant, ev); - servant->gtk_object = context; + servant->bonobo_object = context; retval = bonobo_object_activate_servant (BONOBO_OBJECT (context), servant); - gtk_signal_connect (GTK_OBJECT (context), "destroy", GTK_SIGNAL_FUNC (impl_Nautilus_Undo_Context__destroy), servant); + gtk_signal_connect (GTK_OBJECT (context), "destroy", + GTK_SIGNAL_FUNC (impl_Nautilus_Undo_Context__destroy), + servant); return retval; } - static Nautilus_Undo_Manager -impl_Nautilus_Undo_Context__get_undo_manager (impl_POA_Nautilus_Undo_Context *servant, +impl_Nautilus_Undo_Context__get_undo_manager (PortableServer_Servant servant, CORBA_Environment *ev) { NautilusUndoContext *context; - g_assert (NAUTILUS_IS_UNDO_CONTEXT (servant->gtk_object)); - context = NAUTILUS_UNDO_CONTEXT (servant->gtk_object); + context = ((impl_POA_Nautilus_Undo_Context *) servant)->bonobo_object; - CORBA_Object_duplicate (servant->gtk_object->undo_manager, ev); - - return servant->gtk_object->undo_manager; + g_assert (NAUTILUS_IS_UNDO_CONTEXT (context)); + return CORBA_Object_duplicate (context->undo_manager, ev); } /* nautilus_undo_manager_new */ @@ -135,27 +135,24 @@ nautilus_undo_context_new (Nautilus_Undo_Manager undo_manager) NautilusUndoContext *context; context = gtk_type_new (nautilus_undo_context_get_type ()); - context->undo_manager = undo_manager; - return context; } - /* Object initialization function for the NautilusUndoContext */ static void nautilus_undo_context_initialize (NautilusUndoContext *context) { CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); - bonobo_object_construct (BONOBO_OBJECT (context), impl_Nautilus_Undo_Context__create (context, &ev)); + bonobo_object_construct (BONOBO_OBJECT (context), + impl_Nautilus_Undo_Context__create (context, &ev)); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } - /* Class initialization function for the NautilusUndoManager. */ static void nautilus_undo_context_initialize_class (NautilusUndoContextClass *klass) @@ -177,8 +174,6 @@ destroy (GtkObject *object) { NautilusUndoContext *context; - g_return_if_fail (NAUTILUS_IS_UNDO_CONTEXT (object)); - context = NAUTILUS_UNDO_CONTEXT (object); NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); diff --git a/libnautilus-extensions/nautilus-undo-manager.c b/libnautilus-extensions/nautilus-undo-manager.c index 245d475b5..7da62f7cd 100644 --- a/libnautilus-extensions/nautilus-undo-manager.c +++ b/libnautilus-extensions/nautilus-undo-manager.c @@ -43,54 +43,48 @@ Nautilus_Undo_Manager global_undo_manager; enum { - UNDO_TRANSACTION_OCCURED, + UNDO_TRANSACTION_OCCURRED, LAST_SIGNAL }; static guint signals[LAST_SIGNAL]; - typedef struct { POA_Nautilus_Undo_Manager servant; - gpointer bonobo_object; - - NautilusUndoManager *gtk_object; + NautilusUndoManager *bonobo_object; } impl_POA_Nautilus_Undo_Manager; /* GtkObject */ -static void nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *class); -static void nautilus_undo_manager_initialize (NautilusUndoManager *item); -static void destroy (GtkObject *object); - -static void free_undo_manager_list (GList *list); -static GList *prune_undo_manager_list (GList *list, int items); +static void nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *class); +static void nautilus_undo_manager_initialize (NautilusUndoManager *item); +static void destroy (GtkObject *object); +static void free_undo_manager_list (GList *list); +static GList *prune_undo_manager_list (GList *list, + int items); /* CORBA/Bonobo */ -static void impl_Nautilus_Undo_Manager__append (impl_POA_Nautilus_Undo_Manager *servant, - const Nautilus_Undo_Transaction transaction, - CORBA_Environment *ev); -static void impl_Nautilus_Undo_Manager__forget (impl_POA_Nautilus_Undo_Manager *servant, - const Nautilus_Undo_Transaction transaction, - CORBA_Environment *ev); -static void impl_Nautilus_Undo_Manager__undo (impl_POA_Nautilus_Undo_Manager *servant, - CORBA_Environment *ev); - - -static void nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, - Nautilus_Undo_Transaction transaction); -static void nautilus_undo_manager_undo (NautilusUndoManager *manager); +static void impl_Nautilus_Undo_Manager__append (PortableServer_Servant servant, + const Nautilus_Undo_Transaction transaction, + CORBA_Environment *ev); +static void impl_Nautilus_Undo_Manager__forget (PortableServer_Servant servant, + const Nautilus_Undo_Transaction transaction, + CORBA_Environment *ev); +static void impl_Nautilus_Undo_Manager__undo (PortableServer_Servant servant, + CORBA_Environment *ev); +static void nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, + Nautilus_Undo_Transaction transaction); +static void nautilus_undo_manager_undo (NautilusUndoManager *manager); NAUTILUS_DEFINE_CLASS_BOILERPLATE(NautilusUndoManager, nautilus_undo_manager, BONOBO_OBJECT_TYPE) POA_Nautilus_Undo_Manager__epv libnautilus_Nautilus_Undo_Manager_epv = { NULL, /* _private */ - (gpointer) &impl_Nautilus_Undo_Manager__append, - (gpointer) &impl_Nautilus_Undo_Manager__forget, - (gpointer) &impl_Nautilus_Undo_Manager__undo, + &impl_Nautilus_Undo_Manager__append, + &impl_Nautilus_Undo_Manager__forget, + &impl_Nautilus_Undo_Manager__undo, }; -static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL }; - +static PortableServer_ServantBase__epv base_epv; static POA_Nautilus_Undo_Manager__vepv impl_Nautilus_Undo_Manager_vepv = { &base_epv, @@ -98,17 +92,16 @@ static POA_Nautilus_Undo_Manager__vepv impl_Nautilus_Undo_Manager_vepv = &libnautilus_Nautilus_Undo_Manager_epv }; - static void -impl_Nautilus_Undo_Manager__destroy(BonoboObject *obj, impl_POA_Nautilus_Undo_Manager *servant) +impl_Nautilus_Undo_Manager__destroy (BonoboObject *obj, impl_POA_Nautilus_Undo_Manager *servant) { PortableServer_ObjectId *objid; CORBA_Environment ev; void (*servant_destroy_func) (PortableServer_Servant servant, CORBA_Environment *ev); - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); - servant_destroy_func = NAUTILUS_UNDO_MANAGER_CLASS (GTK_OBJECT (servant->gtk_object)->klass)->servant_destroy_func; + servant_destroy_func = NAUTILUS_UNDO_MANAGER_CLASS (GTK_OBJECT (servant->bonobo_object)->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); @@ -116,7 +109,7 @@ impl_Nautilus_Undo_Manager__destroy(BonoboObject *obj, impl_POA_Nautilus_Undo_Ma servant_destroy_func ((PortableServer_Servant) servant, &ev); g_free (servant); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } static Nautilus_Undo_Manager @@ -135,7 +128,7 @@ impl_Nautilus_Undo_Manager__create (NautilusUndoManager *manager, CORBA_Environm servant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); servant_init_func ((PortableServer_Servant) servant, ev); - servant->gtk_object = manager; + servant->bonobo_object = manager; retval = bonobo_object_activate_servant (BONOBO_OBJECT (manager), servant); @@ -144,62 +137,58 @@ impl_Nautilus_Undo_Manager__create (NautilusUndoManager *manager, CORBA_Environm return retval; } - static void -impl_Nautilus_Undo_Manager__append (impl_POA_Nautilus_Undo_Manager *servant, +impl_Nautilus_Undo_Manager__append (PortableServer_Servant servant, const Nautilus_Undo_Transaction undo_transaction, CORBA_Environment *ev) { NautilusUndoManager *manager; - g_assert (NAUTILUS_IS_UNDO_MANAGER (servant->gtk_object)); - manager = NAUTILUS_UNDO_MANAGER (servant->gtk_object); + manager = ((impl_POA_Nautilus_Undo_Manager *) servant)->bonobo_object; + g_assert (NAUTILUS_IS_UNDO_MANAGER (manager)); Nautilus_Undo_Transaction_ref (undo_transaction, ev); nautilus_undo_manager_add_transaction (manager, undo_transaction); } static void -impl_Nautilus_Undo_Manager__forget (impl_POA_Nautilus_Undo_Manager *servant, +impl_Nautilus_Undo_Manager__forget (PortableServer_Servant servant, const Nautilus_Undo_Transaction transaction, CORBA_Environment *ev) { NautilusUndoManager *manager; - g_assert (NAUTILUS_IS_UNDO_MANAGER (servant->gtk_object)); - manager = NAUTILUS_UNDO_MANAGER (servant->gtk_object); + manager = ((impl_POA_Nautilus_Undo_Manager *) servant)->bonobo_object; + g_assert (NAUTILUS_IS_UNDO_MANAGER (manager)); + + /* FIXME: Need to implement this. */ } static void -impl_Nautilus_Undo_Manager__undo (impl_POA_Nautilus_Undo_Manager *servant, CORBA_Environment *ev) +impl_Nautilus_Undo_Manager__undo (PortableServer_Servant servant, + CORBA_Environment *ev) { NautilusUndoManager *manager; - g_assert (NAUTILUS_IS_UNDO_MANAGER (servant->gtk_object)); - manager = NAUTILUS_UNDO_MANAGER (servant->gtk_object); - + manager = ((impl_POA_Nautilus_Undo_Manager *) servant)->bonobo_object; + g_assert (NAUTILUS_IS_UNDO_MANAGER (manager)); + nautilus_undo_manager_undo (manager); } - -/* nautilus_undo_manager_new */ NautilusUndoManager * nautilus_undo_manager_new (void) { - NautilusUndoManager *manager; - - manager = gtk_type_new (nautilus_undo_manager_get_type ()); - - return manager; + return gtk_type_new (nautilus_undo_manager_get_type ()); } - /* Object initialization function for the NautilusUndoManager */ static void nautilus_undo_manager_initialize (NautilusUndoManager *manager) { - CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_Environment ev; + + CORBA_exception_init (&ev); manager->details = g_new0 (NautilusUndoManagerDetails, 1); @@ -214,8 +203,8 @@ nautilus_undo_manager_initialize (NautilusUndoManager *manager) manager->details->queue_depth = 1; bonobo_object_construct (BONOBO_OBJECT (manager), impl_Nautilus_Undo_Manager__create (manager, &ev)); - - CORBA_exception_free(&ev); + + CORBA_exception_free (&ev); } @@ -234,7 +223,7 @@ nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *klass) klass->vepv = &impl_Nautilus_Undo_Manager_vepv; /* Setup signals */ - signals[UNDO_TRANSACTION_OCCURED] + signals[UNDO_TRANSACTION_OCCURRED] = gtk_signal_new ("undo_transaction_occurred", GTK_RUN_LAST, object_class->type, @@ -246,8 +235,6 @@ nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *klass) gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); } - -/* nautilus_undo_manager_undo_last_transaction */ static void nautilus_undo_manager_undo (NautilusUndoManager *manager) { @@ -255,7 +242,7 @@ nautilus_undo_manager_undo (NautilusUndoManager *manager) CORBA_Object undo_transaction; CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); /* Verify we have a transaction to be undone */ if (manager->details->undo_list == NULL) { @@ -282,22 +269,22 @@ nautilus_undo_manager_undo (NautilusUndoManager *manager) } /* Fire off signal informing that an undo transaction has occurred */ - gtk_signal_emit (GTK_OBJECT (manager), signals[UNDO_TRANSACTION_OCCURED]); + gtk_signal_emit (GTK_OBJECT (manager), + signals[UNDO_TRANSACTION_OCCURRED]); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } #if 0 -/* nautilus_undo_manager_redo_last_undone_transaction */ -static void +static void nautilus_undo_manager_redo (NautilusUndoManager *manager) -{ +{ GList *list; CORBA_Object redo_transaction; CORBA_Object undo_transaction; CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); /* Are we allowing redo operations? */ if (manager->details->enable_redo) { @@ -323,21 +310,21 @@ nautilus_undo_manager_redo (NautilusUndoManager *manager) Nautilus_Undo_Transaction_ref (undo_transaction, &ev); nautilus_undo_manager_add_transaction (manager, undo_transaction); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } #endif -/* nautilus_undo_manager_add_undo_transaction */ static void -nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, Nautilus_Undo_Transaction transaction) +nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, + Nautilus_Undo_Transaction transaction) { int length; - g_return_if_fail (transaction != NULL); - + g_return_if_fail (NAUTILUS_IS_UNDO_MANAGER (manager)); + g_return_if_fail (transaction != CORBA_OBJECT_NIL); + /* Check and see if we are over our queue limit */ length = g_list_length (manager->details->undo_list); - if (length >= manager->details->queue_depth) { manager->details->undo_list = prune_undo_manager_list (manager->details->undo_list, @@ -348,7 +335,8 @@ nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, Nautilus_Un manager->details->undo_list = g_list_append (manager->details->undo_list, transaction); /* Fire off signal informing that an undo transaction has occurred */ - gtk_signal_emit (GTK_OBJECT (manager), signals[UNDO_TRANSACTION_OCCURED]); + gtk_signal_emit (GTK_OBJECT (manager), + signals[UNDO_TRANSACTION_OCCURRED]); } /* nautilus_undo_manager_unregister_object @@ -356,7 +344,6 @@ nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, Nautilus_Un * Remove any transaction with object as target from * the undo and redo queues */ - gboolean nautilus_undo_manager_unregister_object (GtkObject *object) { @@ -366,10 +353,10 @@ nautilus_undo_manager_unregister_object (GtkObject *object) GList *list; int index, length; Nautilus_Undo_Transaction transaction; -*/ CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); +*/ /* FIXME: We can't get a pointer to the actual undo manager, so this * needs to work through the CORBA interface to the undo manager. @@ -424,46 +411,33 @@ nautilus_undo_manager_unregister_object (GtkObject *object) if (success) { /* Fire off signal informing that a transaction has occurred */ - gtk_signal_emit (GTK_OBJECT (manager), signals[UNDO_TRANSACTION_OCCURED]); + gtk_signal_emit (GTK_OBJECT (manager), + signals[UNDO_TRANSACTION_OCCURRED]); } return success; } -/* nautilus_undo_manager_can_undo */ -gboolean +gboolean nautilus_undo_manager_can_undo (NautilusUndoManager *manager) { - if (manager != NULL) { - return (g_list_length (manager->details->undo_list) > 0); - } else { - return FALSE; - } + return manager != NULL + && manager->details->undo_list != NULL; } -/* nautilus_undo_manager_can_redo */ -gboolean +gboolean nautilus_undo_manager_can_redo (NautilusUndoManager *manager) { - if (manager->details->enable_redo) { - if (manager != NULL) { - return (g_list_length (manager->details->redo_list) > 0); - } else { - return FALSE; - } - } else { - return FALSE; - } + return manager != NULL + && manager->details->enable_redo + && manager->details->redo_list != NULL; } -/* destroy */ static void destroy (GtkObject *object) { NautilusUndoManager *manager; - g_return_if_fail (NAUTILUS_IS_UNDO_MANAGER (object)); - manager = NAUTILUS_UNDO_MANAGER (object); /* Clear lists */ @@ -477,40 +451,34 @@ destroy (GtkObject *object) * * Enable or disable redo functionality */ - void nautilus_undo_manager_enable_redo (NautilusUndoManager *manager, gboolean value) { - g_return_if_fail (manager != NULL); + g_return_if_fail (NAUTILUS_IS_UNDO_MANAGER (manager)); + g_return_if_fail (value == FALSE || value == TRUE); manager->details->enable_redo = value; /* Flush and free redo queue */ - g_list_free (manager->details->redo_list); + free_undo_manager_list (manager->details->redo_list); + manager->details->redo_list = NULL; } -/* nautilus_undo_manager_enable_redo - * - * Enable or disable redo functionality - */ void nautilus_undo_manager_set_queue_depth (NautilusUndoManager *manager, int depth) { int length; - /* Don't allow negative or zero queue depth */ - if (depth <= 0) { - g_warning ("NautilusUndoManager doesn not allow negative or zero length queue."); - return; - } + g_return_if_fail (NAUTILUS_IS_UNDO_MANAGER (manager)); + g_return_if_fail (depth > 0); manager->details->queue_depth = depth; - + /* Prune lists */ length = g_list_length (manager->details->undo_list); if (length > depth) { manager->details->undo_list = prune_undo_manager_list (manager->details->undo_list, - length - depth); + length - depth); } length = g_list_length (manager->details->redo_list); if (length > depth) { @@ -519,7 +487,8 @@ nautilus_undo_manager_set_queue_depth (NautilusUndoManager *manager, int depth) } /* Fire off signal informing that an undo transaction has occurred */ - gtk_signal_emit (GTK_OBJECT (manager), signals[UNDO_TRANSACTION_OCCURED]); + gtk_signal_emit (GTK_OBJECT (manager), + signals[UNDO_TRANSACTION_OCCURRED]); } /* free_undo_manager_list @@ -533,13 +502,13 @@ free_undo_manager_list (GList *list) Nautilus_Undo_Transaction transaction; CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); for (p = list; p != NULL; p = p->next) { transaction = p->data; Nautilus_Undo_Transaction_unref (transaction, &ev); } - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); g_list_free (list); } @@ -665,7 +634,7 @@ nautilus_share_undo_manager (GtkObject *destination_object, nautilus_get_undo_manager (source_object)); } -/* Locates an undo manger for this bonobo control. +/* Locates an undo manager for this bonobo control. * The undo manager is supplied by an interface on * the control frame. The put that undo manager on * the Bonobo control's widget. diff --git a/libnautilus-private/nautilus-program-chooser.c b/libnautilus-private/nautilus-program-chooser.c index 095447182..9eb27cf70 100644 --- a/libnautilus-private/nautilus-program-chooser.c +++ b/libnautilus-private/nautilus-program-chooser.c @@ -48,18 +48,18 @@ nautilus_program_chooser_new (NautilusProgramChooserType type, file_name = nautilus_file_get_name (file); switch (type) { - case NAUTILUS_PROGRAM_CHOOSER_APPLICATIONS: - title = _("Nautilus: Choose an application"); - prompt = g_strdup_printf (_("Choose an application with which to open \"%s\"\n\n(Doesn't do anything yet)"), file_name); - break; - case NAUTILUS_PROGRAM_CHOOSER_COMPONENTS: - default: - title = _("Nautilus: Choose a viewer"); - prompt = g_strdup_printf (_("Choose a viewer with which to display \"%s\"\n\n(Doesn't do anything yet)"), file_name); - break; + case NAUTILUS_PROGRAM_CHOOSER_APPLICATIONS: + title = _("Nautilus: Choose an application"); + prompt = g_strdup_printf (_("Choose an application with which to open \"%s\"\n\n(Doesn't do anything yet)"), file_name); + break; + case NAUTILUS_PROGRAM_CHOOSER_COMPONENTS: + default: + title = _("Nautilus: Choose a viewer"); + prompt = g_strdup_printf (_("Choose a viewer with which to display \"%s\"\n\n(Doesn't do anything yet)"), file_name); + break; } g_free (file_name); - + window = gnome_dialog_new (title, GNOME_STOCK_BUTTON_OK, GNOME_STOCK_BUTTON_CANCEL, @@ -77,4 +77,4 @@ nautilus_program_chooser_new (NautilusProgramChooserType type, gnome_dialog_set_close (GNOME_DIALOG (window), TRUE); return GNOME_DIALOG (window); -}
\ No newline at end of file +} diff --git a/libnautilus-private/nautilus-program-choosing.c b/libnautilus-private/nautilus-program-choosing.c index fc5ae7a26..98b8688f8 100644 --- a/libnautilus-private/nautilus-program-choosing.c +++ b/libnautilus-private/nautilus-program-choosing.c @@ -190,4 +190,4 @@ nautilus_launch_application (const char *command_string, const char *uri) execlp (command_string, command_string, uri_parameter, NULL); exit (0); } -}
\ No newline at end of file +} diff --git a/libnautilus-private/nautilus-undo-context.c b/libnautilus-private/nautilus-undo-context.c index 0527fbf49..583704226 100644 --- a/libnautilus-private/nautilus-undo-context.c +++ b/libnautilus-private/nautilus-undo-context.c @@ -36,30 +36,27 @@ typedef struct { POA_Nautilus_Undo_Context servant; - gpointer bonobo_object; - - NautilusUndoContext *gtk_object; + NautilusUndoContext *bonobo_object; } impl_POA_Nautilus_Undo_Context; /* GtkObject */ -static void nautilus_undo_context_initialize_class (NautilusUndoContextClass *class); -static void nautilus_undo_context_initialize (NautilusUndoContext *item); -static void destroy (GtkObject *object); +static void nautilus_undo_context_initialize_class (NautilusUndoContextClass *class); +static void nautilus_undo_context_initialize (NautilusUndoContext *item); +static void destroy (GtkObject *object); /* CORBA/Bonobo */ -static Nautilus_Undo_Manager impl_Nautilus_Undo_Context__get_undo_manager (impl_POA_Nautilus_Undo_Context *servant, - CORBA_Environment *ev); +static Nautilus_Undo_Manager impl_Nautilus_Undo_Context__get_undo_manager (PortableServer_Servant servant, + CORBA_Environment *ev); NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusUndoContext, nautilus_undo_context, BONOBO_OBJECT_TYPE) POA_Nautilus_Undo_Context__epv libnautilus_Nautilus_Undo_Context_epv = { - NULL, /* _private */ - (gpointer) &impl_Nautilus_Undo_Context__get_undo_manager, + NULL, /* _private */ + &impl_Nautilus_Undo_Context__get_undo_manager, }; -static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL }; - +static PortableServer_ServantBase__epv base_epv; static POA_Nautilus_Undo_Context__vepv impl_Nautilus_Undo_Context_vepv = { &base_epv, @@ -74,17 +71,20 @@ impl_Nautilus_Undo_Context__destroy (BonoboObject *obj, impl_POA_Nautilus_Undo_C CORBA_Environment ev; void (*servant_destroy_func) (PortableServer_Servant servant, CORBA_Environment *ev); - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); + + servant_destroy_func = NAUTILUS_UNDO_CONTEXT_CLASS + (GTK_OBJECT (servant->bonobo_object)->klass)->servant_destroy_func; - servant_destroy_func = NAUTILUS_UNDO_CONTEXT_CLASS (GTK_OBJECT (servant->gtk_object)->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); + (* servant_destroy_func) ((PortableServer_Servant) servant, &ev); + g_free (servant); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } static Nautilus_Undo_Context @@ -93,39 +93,39 @@ impl_Nautilus_Undo_Context__create (NautilusUndoContext *context, CORBA_Environm Nautilus_Undo_Context retval; impl_POA_Nautilus_Undo_Context *servant; void (*servant_init_func) (PortableServer_Servant servant, CORBA_Environment *ev); + NautilusUndoContextClass *context_class; - NautilusUndoContextClass *context_class = NAUTILUS_UNDO_CONTEXT_CLASS (GTK_OBJECT (context)->klass); + context_class = NAUTILUS_UNDO_CONTEXT_CLASS (GTK_OBJECT (context)->klass); servant_init_func = context_class->servant_init_func; servant = g_new0 (impl_POA_Nautilus_Undo_Context, 1); servant->servant.vepv = context_class->vepv; - if (!servant->servant.vepv->Bonobo_Unknown_epv) { + if (servant->servant.vepv->Bonobo_Unknown_epv == NULL) { servant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); } - servant_init_func ((PortableServer_Servant) servant, ev); + (* servant_init_func) ((PortableServer_Servant) servant, ev); - servant->gtk_object = context; + servant->bonobo_object = context; retval = bonobo_object_activate_servant (BONOBO_OBJECT (context), servant); - gtk_signal_connect (GTK_OBJECT (context), "destroy", GTK_SIGNAL_FUNC (impl_Nautilus_Undo_Context__destroy), servant); + gtk_signal_connect (GTK_OBJECT (context), "destroy", + GTK_SIGNAL_FUNC (impl_Nautilus_Undo_Context__destroy), + servant); return retval; } - static Nautilus_Undo_Manager -impl_Nautilus_Undo_Context__get_undo_manager (impl_POA_Nautilus_Undo_Context *servant, +impl_Nautilus_Undo_Context__get_undo_manager (PortableServer_Servant servant, CORBA_Environment *ev) { NautilusUndoContext *context; - g_assert (NAUTILUS_IS_UNDO_CONTEXT (servant->gtk_object)); - context = NAUTILUS_UNDO_CONTEXT (servant->gtk_object); + context = ((impl_POA_Nautilus_Undo_Context *) servant)->bonobo_object; - CORBA_Object_duplicate (servant->gtk_object->undo_manager, ev); - - return servant->gtk_object->undo_manager; + g_assert (NAUTILUS_IS_UNDO_CONTEXT (context)); + return CORBA_Object_duplicate (context->undo_manager, ev); } /* nautilus_undo_manager_new */ @@ -135,27 +135,24 @@ nautilus_undo_context_new (Nautilus_Undo_Manager undo_manager) NautilusUndoContext *context; context = gtk_type_new (nautilus_undo_context_get_type ()); - context->undo_manager = undo_manager; - return context; } - /* Object initialization function for the NautilusUndoContext */ static void nautilus_undo_context_initialize (NautilusUndoContext *context) { CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); - bonobo_object_construct (BONOBO_OBJECT (context), impl_Nautilus_Undo_Context__create (context, &ev)); + bonobo_object_construct (BONOBO_OBJECT (context), + impl_Nautilus_Undo_Context__create (context, &ev)); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } - /* Class initialization function for the NautilusUndoManager. */ static void nautilus_undo_context_initialize_class (NautilusUndoContextClass *klass) @@ -177,8 +174,6 @@ destroy (GtkObject *object) { NautilusUndoContext *context; - g_return_if_fail (NAUTILUS_IS_UNDO_CONTEXT (object)); - context = NAUTILUS_UNDO_CONTEXT (object); NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); diff --git a/libnautilus-private/nautilus-undo-manager.c b/libnautilus-private/nautilus-undo-manager.c index 245d475b5..7da62f7cd 100644 --- a/libnautilus-private/nautilus-undo-manager.c +++ b/libnautilus-private/nautilus-undo-manager.c @@ -43,54 +43,48 @@ Nautilus_Undo_Manager global_undo_manager; enum { - UNDO_TRANSACTION_OCCURED, + UNDO_TRANSACTION_OCCURRED, LAST_SIGNAL }; static guint signals[LAST_SIGNAL]; - typedef struct { POA_Nautilus_Undo_Manager servant; - gpointer bonobo_object; - - NautilusUndoManager *gtk_object; + NautilusUndoManager *bonobo_object; } impl_POA_Nautilus_Undo_Manager; /* GtkObject */ -static void nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *class); -static void nautilus_undo_manager_initialize (NautilusUndoManager *item); -static void destroy (GtkObject *object); - -static void free_undo_manager_list (GList *list); -static GList *prune_undo_manager_list (GList *list, int items); +static void nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *class); +static void nautilus_undo_manager_initialize (NautilusUndoManager *item); +static void destroy (GtkObject *object); +static void free_undo_manager_list (GList *list); +static GList *prune_undo_manager_list (GList *list, + int items); /* CORBA/Bonobo */ -static void impl_Nautilus_Undo_Manager__append (impl_POA_Nautilus_Undo_Manager *servant, - const Nautilus_Undo_Transaction transaction, - CORBA_Environment *ev); -static void impl_Nautilus_Undo_Manager__forget (impl_POA_Nautilus_Undo_Manager *servant, - const Nautilus_Undo_Transaction transaction, - CORBA_Environment *ev); -static void impl_Nautilus_Undo_Manager__undo (impl_POA_Nautilus_Undo_Manager *servant, - CORBA_Environment *ev); - - -static void nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, - Nautilus_Undo_Transaction transaction); -static void nautilus_undo_manager_undo (NautilusUndoManager *manager); +static void impl_Nautilus_Undo_Manager__append (PortableServer_Servant servant, + const Nautilus_Undo_Transaction transaction, + CORBA_Environment *ev); +static void impl_Nautilus_Undo_Manager__forget (PortableServer_Servant servant, + const Nautilus_Undo_Transaction transaction, + CORBA_Environment *ev); +static void impl_Nautilus_Undo_Manager__undo (PortableServer_Servant servant, + CORBA_Environment *ev); +static void nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, + Nautilus_Undo_Transaction transaction); +static void nautilus_undo_manager_undo (NautilusUndoManager *manager); NAUTILUS_DEFINE_CLASS_BOILERPLATE(NautilusUndoManager, nautilus_undo_manager, BONOBO_OBJECT_TYPE) POA_Nautilus_Undo_Manager__epv libnautilus_Nautilus_Undo_Manager_epv = { NULL, /* _private */ - (gpointer) &impl_Nautilus_Undo_Manager__append, - (gpointer) &impl_Nautilus_Undo_Manager__forget, - (gpointer) &impl_Nautilus_Undo_Manager__undo, + &impl_Nautilus_Undo_Manager__append, + &impl_Nautilus_Undo_Manager__forget, + &impl_Nautilus_Undo_Manager__undo, }; -static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL }; - +static PortableServer_ServantBase__epv base_epv; static POA_Nautilus_Undo_Manager__vepv impl_Nautilus_Undo_Manager_vepv = { &base_epv, @@ -98,17 +92,16 @@ static POA_Nautilus_Undo_Manager__vepv impl_Nautilus_Undo_Manager_vepv = &libnautilus_Nautilus_Undo_Manager_epv }; - static void -impl_Nautilus_Undo_Manager__destroy(BonoboObject *obj, impl_POA_Nautilus_Undo_Manager *servant) +impl_Nautilus_Undo_Manager__destroy (BonoboObject *obj, impl_POA_Nautilus_Undo_Manager *servant) { PortableServer_ObjectId *objid; CORBA_Environment ev; void (*servant_destroy_func) (PortableServer_Servant servant, CORBA_Environment *ev); - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); - servant_destroy_func = NAUTILUS_UNDO_MANAGER_CLASS (GTK_OBJECT (servant->gtk_object)->klass)->servant_destroy_func; + servant_destroy_func = NAUTILUS_UNDO_MANAGER_CLASS (GTK_OBJECT (servant->bonobo_object)->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); @@ -116,7 +109,7 @@ impl_Nautilus_Undo_Manager__destroy(BonoboObject *obj, impl_POA_Nautilus_Undo_Ma servant_destroy_func ((PortableServer_Servant) servant, &ev); g_free (servant); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } static Nautilus_Undo_Manager @@ -135,7 +128,7 @@ impl_Nautilus_Undo_Manager__create (NautilusUndoManager *manager, CORBA_Environm servant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); servant_init_func ((PortableServer_Servant) servant, ev); - servant->gtk_object = manager; + servant->bonobo_object = manager; retval = bonobo_object_activate_servant (BONOBO_OBJECT (manager), servant); @@ -144,62 +137,58 @@ impl_Nautilus_Undo_Manager__create (NautilusUndoManager *manager, CORBA_Environm return retval; } - static void -impl_Nautilus_Undo_Manager__append (impl_POA_Nautilus_Undo_Manager *servant, +impl_Nautilus_Undo_Manager__append (PortableServer_Servant servant, const Nautilus_Undo_Transaction undo_transaction, CORBA_Environment *ev) { NautilusUndoManager *manager; - g_assert (NAUTILUS_IS_UNDO_MANAGER (servant->gtk_object)); - manager = NAUTILUS_UNDO_MANAGER (servant->gtk_object); + manager = ((impl_POA_Nautilus_Undo_Manager *) servant)->bonobo_object; + g_assert (NAUTILUS_IS_UNDO_MANAGER (manager)); Nautilus_Undo_Transaction_ref (undo_transaction, ev); nautilus_undo_manager_add_transaction (manager, undo_transaction); } static void -impl_Nautilus_Undo_Manager__forget (impl_POA_Nautilus_Undo_Manager *servant, +impl_Nautilus_Undo_Manager__forget (PortableServer_Servant servant, const Nautilus_Undo_Transaction transaction, CORBA_Environment *ev) { NautilusUndoManager *manager; - g_assert (NAUTILUS_IS_UNDO_MANAGER (servant->gtk_object)); - manager = NAUTILUS_UNDO_MANAGER (servant->gtk_object); + manager = ((impl_POA_Nautilus_Undo_Manager *) servant)->bonobo_object; + g_assert (NAUTILUS_IS_UNDO_MANAGER (manager)); + + /* FIXME: Need to implement this. */ } static void -impl_Nautilus_Undo_Manager__undo (impl_POA_Nautilus_Undo_Manager *servant, CORBA_Environment *ev) +impl_Nautilus_Undo_Manager__undo (PortableServer_Servant servant, + CORBA_Environment *ev) { NautilusUndoManager *manager; - g_assert (NAUTILUS_IS_UNDO_MANAGER (servant->gtk_object)); - manager = NAUTILUS_UNDO_MANAGER (servant->gtk_object); - + manager = ((impl_POA_Nautilus_Undo_Manager *) servant)->bonobo_object; + g_assert (NAUTILUS_IS_UNDO_MANAGER (manager)); + nautilus_undo_manager_undo (manager); } - -/* nautilus_undo_manager_new */ NautilusUndoManager * nautilus_undo_manager_new (void) { - NautilusUndoManager *manager; - - manager = gtk_type_new (nautilus_undo_manager_get_type ()); - - return manager; + return gtk_type_new (nautilus_undo_manager_get_type ()); } - /* Object initialization function for the NautilusUndoManager */ static void nautilus_undo_manager_initialize (NautilusUndoManager *manager) { - CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_Environment ev; + + CORBA_exception_init (&ev); manager->details = g_new0 (NautilusUndoManagerDetails, 1); @@ -214,8 +203,8 @@ nautilus_undo_manager_initialize (NautilusUndoManager *manager) manager->details->queue_depth = 1; bonobo_object_construct (BONOBO_OBJECT (manager), impl_Nautilus_Undo_Manager__create (manager, &ev)); - - CORBA_exception_free(&ev); + + CORBA_exception_free (&ev); } @@ -234,7 +223,7 @@ nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *klass) klass->vepv = &impl_Nautilus_Undo_Manager_vepv; /* Setup signals */ - signals[UNDO_TRANSACTION_OCCURED] + signals[UNDO_TRANSACTION_OCCURRED] = gtk_signal_new ("undo_transaction_occurred", GTK_RUN_LAST, object_class->type, @@ -246,8 +235,6 @@ nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *klass) gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); } - -/* nautilus_undo_manager_undo_last_transaction */ static void nautilus_undo_manager_undo (NautilusUndoManager *manager) { @@ -255,7 +242,7 @@ nautilus_undo_manager_undo (NautilusUndoManager *manager) CORBA_Object undo_transaction; CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); /* Verify we have a transaction to be undone */ if (manager->details->undo_list == NULL) { @@ -282,22 +269,22 @@ nautilus_undo_manager_undo (NautilusUndoManager *manager) } /* Fire off signal informing that an undo transaction has occurred */ - gtk_signal_emit (GTK_OBJECT (manager), signals[UNDO_TRANSACTION_OCCURED]); + gtk_signal_emit (GTK_OBJECT (manager), + signals[UNDO_TRANSACTION_OCCURRED]); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } #if 0 -/* nautilus_undo_manager_redo_last_undone_transaction */ -static void +static void nautilus_undo_manager_redo (NautilusUndoManager *manager) -{ +{ GList *list; CORBA_Object redo_transaction; CORBA_Object undo_transaction; CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); /* Are we allowing redo operations? */ if (manager->details->enable_redo) { @@ -323,21 +310,21 @@ nautilus_undo_manager_redo (NautilusUndoManager *manager) Nautilus_Undo_Transaction_ref (undo_transaction, &ev); nautilus_undo_manager_add_transaction (manager, undo_transaction); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } #endif -/* nautilus_undo_manager_add_undo_transaction */ static void -nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, Nautilus_Undo_Transaction transaction) +nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, + Nautilus_Undo_Transaction transaction) { int length; - g_return_if_fail (transaction != NULL); - + g_return_if_fail (NAUTILUS_IS_UNDO_MANAGER (manager)); + g_return_if_fail (transaction != CORBA_OBJECT_NIL); + /* Check and see if we are over our queue limit */ length = g_list_length (manager->details->undo_list); - if (length >= manager->details->queue_depth) { manager->details->undo_list = prune_undo_manager_list (manager->details->undo_list, @@ -348,7 +335,8 @@ nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, Nautilus_Un manager->details->undo_list = g_list_append (manager->details->undo_list, transaction); /* Fire off signal informing that an undo transaction has occurred */ - gtk_signal_emit (GTK_OBJECT (manager), signals[UNDO_TRANSACTION_OCCURED]); + gtk_signal_emit (GTK_OBJECT (manager), + signals[UNDO_TRANSACTION_OCCURRED]); } /* nautilus_undo_manager_unregister_object @@ -356,7 +344,6 @@ nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, Nautilus_Un * Remove any transaction with object as target from * the undo and redo queues */ - gboolean nautilus_undo_manager_unregister_object (GtkObject *object) { @@ -366,10 +353,10 @@ nautilus_undo_manager_unregister_object (GtkObject *object) GList *list; int index, length; Nautilus_Undo_Transaction transaction; -*/ CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); +*/ /* FIXME: We can't get a pointer to the actual undo manager, so this * needs to work through the CORBA interface to the undo manager. @@ -424,46 +411,33 @@ nautilus_undo_manager_unregister_object (GtkObject *object) if (success) { /* Fire off signal informing that a transaction has occurred */ - gtk_signal_emit (GTK_OBJECT (manager), signals[UNDO_TRANSACTION_OCCURED]); + gtk_signal_emit (GTK_OBJECT (manager), + signals[UNDO_TRANSACTION_OCCURRED]); } return success; } -/* nautilus_undo_manager_can_undo */ -gboolean +gboolean nautilus_undo_manager_can_undo (NautilusUndoManager *manager) { - if (manager != NULL) { - return (g_list_length (manager->details->undo_list) > 0); - } else { - return FALSE; - } + return manager != NULL + && manager->details->undo_list != NULL; } -/* nautilus_undo_manager_can_redo */ -gboolean +gboolean nautilus_undo_manager_can_redo (NautilusUndoManager *manager) { - if (manager->details->enable_redo) { - if (manager != NULL) { - return (g_list_length (manager->details->redo_list) > 0); - } else { - return FALSE; - } - } else { - return FALSE; - } + return manager != NULL + && manager->details->enable_redo + && manager->details->redo_list != NULL; } -/* destroy */ static void destroy (GtkObject *object) { NautilusUndoManager *manager; - g_return_if_fail (NAUTILUS_IS_UNDO_MANAGER (object)); - manager = NAUTILUS_UNDO_MANAGER (object); /* Clear lists */ @@ -477,40 +451,34 @@ destroy (GtkObject *object) * * Enable or disable redo functionality */ - void nautilus_undo_manager_enable_redo (NautilusUndoManager *manager, gboolean value) { - g_return_if_fail (manager != NULL); + g_return_if_fail (NAUTILUS_IS_UNDO_MANAGER (manager)); + g_return_if_fail (value == FALSE || value == TRUE); manager->details->enable_redo = value; /* Flush and free redo queue */ - g_list_free (manager->details->redo_list); + free_undo_manager_list (manager->details->redo_list); + manager->details->redo_list = NULL; } -/* nautilus_undo_manager_enable_redo - * - * Enable or disable redo functionality - */ void nautilus_undo_manager_set_queue_depth (NautilusUndoManager *manager, int depth) { int length; - /* Don't allow negative or zero queue depth */ - if (depth <= 0) { - g_warning ("NautilusUndoManager doesn not allow negative or zero length queue."); - return; - } + g_return_if_fail (NAUTILUS_IS_UNDO_MANAGER (manager)); + g_return_if_fail (depth > 0); manager->details->queue_depth = depth; - + /* Prune lists */ length = g_list_length (manager->details->undo_list); if (length > depth) { manager->details->undo_list = prune_undo_manager_list (manager->details->undo_list, - length - depth); + length - depth); } length = g_list_length (manager->details->redo_list); if (length > depth) { @@ -519,7 +487,8 @@ nautilus_undo_manager_set_queue_depth (NautilusUndoManager *manager, int depth) } /* Fire off signal informing that an undo transaction has occurred */ - gtk_signal_emit (GTK_OBJECT (manager), signals[UNDO_TRANSACTION_OCCURED]); + gtk_signal_emit (GTK_OBJECT (manager), + signals[UNDO_TRANSACTION_OCCURRED]); } /* free_undo_manager_list @@ -533,13 +502,13 @@ free_undo_manager_list (GList *list) Nautilus_Undo_Transaction transaction; CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); for (p = list; p != NULL; p = p->next) { transaction = p->data; Nautilus_Undo_Transaction_unref (transaction, &ev); } - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); g_list_free (list); } @@ -665,7 +634,7 @@ nautilus_share_undo_manager (GtkObject *destination_object, nautilus_get_undo_manager (source_object)); } -/* Locates an undo manger for this bonobo control. +/* Locates an undo manager for this bonobo control. * The undo manager is supplied by an interface on * the control frame. The put that undo manager on * the Bonobo control's widget. diff --git a/libnautilus/nautilus-undo-context.c b/libnautilus/nautilus-undo-context.c index 0527fbf49..583704226 100644 --- a/libnautilus/nautilus-undo-context.c +++ b/libnautilus/nautilus-undo-context.c @@ -36,30 +36,27 @@ typedef struct { POA_Nautilus_Undo_Context servant; - gpointer bonobo_object; - - NautilusUndoContext *gtk_object; + NautilusUndoContext *bonobo_object; } impl_POA_Nautilus_Undo_Context; /* GtkObject */ -static void nautilus_undo_context_initialize_class (NautilusUndoContextClass *class); -static void nautilus_undo_context_initialize (NautilusUndoContext *item); -static void destroy (GtkObject *object); +static void nautilus_undo_context_initialize_class (NautilusUndoContextClass *class); +static void nautilus_undo_context_initialize (NautilusUndoContext *item); +static void destroy (GtkObject *object); /* CORBA/Bonobo */ -static Nautilus_Undo_Manager impl_Nautilus_Undo_Context__get_undo_manager (impl_POA_Nautilus_Undo_Context *servant, - CORBA_Environment *ev); +static Nautilus_Undo_Manager impl_Nautilus_Undo_Context__get_undo_manager (PortableServer_Servant servant, + CORBA_Environment *ev); NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusUndoContext, nautilus_undo_context, BONOBO_OBJECT_TYPE) POA_Nautilus_Undo_Context__epv libnautilus_Nautilus_Undo_Context_epv = { - NULL, /* _private */ - (gpointer) &impl_Nautilus_Undo_Context__get_undo_manager, + NULL, /* _private */ + &impl_Nautilus_Undo_Context__get_undo_manager, }; -static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL }; - +static PortableServer_ServantBase__epv base_epv; static POA_Nautilus_Undo_Context__vepv impl_Nautilus_Undo_Context_vepv = { &base_epv, @@ -74,17 +71,20 @@ impl_Nautilus_Undo_Context__destroy (BonoboObject *obj, impl_POA_Nautilus_Undo_C CORBA_Environment ev; void (*servant_destroy_func) (PortableServer_Servant servant, CORBA_Environment *ev); - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); + + servant_destroy_func = NAUTILUS_UNDO_CONTEXT_CLASS + (GTK_OBJECT (servant->bonobo_object)->klass)->servant_destroy_func; - servant_destroy_func = NAUTILUS_UNDO_CONTEXT_CLASS (GTK_OBJECT (servant->gtk_object)->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); + (* servant_destroy_func) ((PortableServer_Servant) servant, &ev); + g_free (servant); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } static Nautilus_Undo_Context @@ -93,39 +93,39 @@ impl_Nautilus_Undo_Context__create (NautilusUndoContext *context, CORBA_Environm Nautilus_Undo_Context retval; impl_POA_Nautilus_Undo_Context *servant; void (*servant_init_func) (PortableServer_Servant servant, CORBA_Environment *ev); + NautilusUndoContextClass *context_class; - NautilusUndoContextClass *context_class = NAUTILUS_UNDO_CONTEXT_CLASS (GTK_OBJECT (context)->klass); + context_class = NAUTILUS_UNDO_CONTEXT_CLASS (GTK_OBJECT (context)->klass); servant_init_func = context_class->servant_init_func; servant = g_new0 (impl_POA_Nautilus_Undo_Context, 1); servant->servant.vepv = context_class->vepv; - if (!servant->servant.vepv->Bonobo_Unknown_epv) { + if (servant->servant.vepv->Bonobo_Unknown_epv == NULL) { servant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); } - servant_init_func ((PortableServer_Servant) servant, ev); + (* servant_init_func) ((PortableServer_Servant) servant, ev); - servant->gtk_object = context; + servant->bonobo_object = context; retval = bonobo_object_activate_servant (BONOBO_OBJECT (context), servant); - gtk_signal_connect (GTK_OBJECT (context), "destroy", GTK_SIGNAL_FUNC (impl_Nautilus_Undo_Context__destroy), servant); + gtk_signal_connect (GTK_OBJECT (context), "destroy", + GTK_SIGNAL_FUNC (impl_Nautilus_Undo_Context__destroy), + servant); return retval; } - static Nautilus_Undo_Manager -impl_Nautilus_Undo_Context__get_undo_manager (impl_POA_Nautilus_Undo_Context *servant, +impl_Nautilus_Undo_Context__get_undo_manager (PortableServer_Servant servant, CORBA_Environment *ev) { NautilusUndoContext *context; - g_assert (NAUTILUS_IS_UNDO_CONTEXT (servant->gtk_object)); - context = NAUTILUS_UNDO_CONTEXT (servant->gtk_object); + context = ((impl_POA_Nautilus_Undo_Context *) servant)->bonobo_object; - CORBA_Object_duplicate (servant->gtk_object->undo_manager, ev); - - return servant->gtk_object->undo_manager; + g_assert (NAUTILUS_IS_UNDO_CONTEXT (context)); + return CORBA_Object_duplicate (context->undo_manager, ev); } /* nautilus_undo_manager_new */ @@ -135,27 +135,24 @@ nautilus_undo_context_new (Nautilus_Undo_Manager undo_manager) NautilusUndoContext *context; context = gtk_type_new (nautilus_undo_context_get_type ()); - context->undo_manager = undo_manager; - return context; } - /* Object initialization function for the NautilusUndoContext */ static void nautilus_undo_context_initialize (NautilusUndoContext *context) { CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); - bonobo_object_construct (BONOBO_OBJECT (context), impl_Nautilus_Undo_Context__create (context, &ev)); + bonobo_object_construct (BONOBO_OBJECT (context), + impl_Nautilus_Undo_Context__create (context, &ev)); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } - /* Class initialization function for the NautilusUndoManager. */ static void nautilus_undo_context_initialize_class (NautilusUndoContextClass *klass) @@ -177,8 +174,6 @@ destroy (GtkObject *object) { NautilusUndoContext *context; - g_return_if_fail (NAUTILUS_IS_UNDO_CONTEXT (object)); - context = NAUTILUS_UNDO_CONTEXT (object); NAUTILUS_CALL_PARENT_CLASS (GTK_OBJECT_CLASS, destroy, (object)); diff --git a/libnautilus/nautilus-undo-manager.c b/libnautilus/nautilus-undo-manager.c index 245d475b5..7da62f7cd 100644 --- a/libnautilus/nautilus-undo-manager.c +++ b/libnautilus/nautilus-undo-manager.c @@ -43,54 +43,48 @@ Nautilus_Undo_Manager global_undo_manager; enum { - UNDO_TRANSACTION_OCCURED, + UNDO_TRANSACTION_OCCURRED, LAST_SIGNAL }; static guint signals[LAST_SIGNAL]; - typedef struct { POA_Nautilus_Undo_Manager servant; - gpointer bonobo_object; - - NautilusUndoManager *gtk_object; + NautilusUndoManager *bonobo_object; } impl_POA_Nautilus_Undo_Manager; /* GtkObject */ -static void nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *class); -static void nautilus_undo_manager_initialize (NautilusUndoManager *item); -static void destroy (GtkObject *object); - -static void free_undo_manager_list (GList *list); -static GList *prune_undo_manager_list (GList *list, int items); +static void nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *class); +static void nautilus_undo_manager_initialize (NautilusUndoManager *item); +static void destroy (GtkObject *object); +static void free_undo_manager_list (GList *list); +static GList *prune_undo_manager_list (GList *list, + int items); /* CORBA/Bonobo */ -static void impl_Nautilus_Undo_Manager__append (impl_POA_Nautilus_Undo_Manager *servant, - const Nautilus_Undo_Transaction transaction, - CORBA_Environment *ev); -static void impl_Nautilus_Undo_Manager__forget (impl_POA_Nautilus_Undo_Manager *servant, - const Nautilus_Undo_Transaction transaction, - CORBA_Environment *ev); -static void impl_Nautilus_Undo_Manager__undo (impl_POA_Nautilus_Undo_Manager *servant, - CORBA_Environment *ev); - - -static void nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, - Nautilus_Undo_Transaction transaction); -static void nautilus_undo_manager_undo (NautilusUndoManager *manager); +static void impl_Nautilus_Undo_Manager__append (PortableServer_Servant servant, + const Nautilus_Undo_Transaction transaction, + CORBA_Environment *ev); +static void impl_Nautilus_Undo_Manager__forget (PortableServer_Servant servant, + const Nautilus_Undo_Transaction transaction, + CORBA_Environment *ev); +static void impl_Nautilus_Undo_Manager__undo (PortableServer_Servant servant, + CORBA_Environment *ev); +static void nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, + Nautilus_Undo_Transaction transaction); +static void nautilus_undo_manager_undo (NautilusUndoManager *manager); NAUTILUS_DEFINE_CLASS_BOILERPLATE(NautilusUndoManager, nautilus_undo_manager, BONOBO_OBJECT_TYPE) POA_Nautilus_Undo_Manager__epv libnautilus_Nautilus_Undo_Manager_epv = { NULL, /* _private */ - (gpointer) &impl_Nautilus_Undo_Manager__append, - (gpointer) &impl_Nautilus_Undo_Manager__forget, - (gpointer) &impl_Nautilus_Undo_Manager__undo, + &impl_Nautilus_Undo_Manager__append, + &impl_Nautilus_Undo_Manager__forget, + &impl_Nautilus_Undo_Manager__undo, }; -static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL }; - +static PortableServer_ServantBase__epv base_epv; static POA_Nautilus_Undo_Manager__vepv impl_Nautilus_Undo_Manager_vepv = { &base_epv, @@ -98,17 +92,16 @@ static POA_Nautilus_Undo_Manager__vepv impl_Nautilus_Undo_Manager_vepv = &libnautilus_Nautilus_Undo_Manager_epv }; - static void -impl_Nautilus_Undo_Manager__destroy(BonoboObject *obj, impl_POA_Nautilus_Undo_Manager *servant) +impl_Nautilus_Undo_Manager__destroy (BonoboObject *obj, impl_POA_Nautilus_Undo_Manager *servant) { PortableServer_ObjectId *objid; CORBA_Environment ev; void (*servant_destroy_func) (PortableServer_Servant servant, CORBA_Environment *ev); - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); - servant_destroy_func = NAUTILUS_UNDO_MANAGER_CLASS (GTK_OBJECT (servant->gtk_object)->klass)->servant_destroy_func; + servant_destroy_func = NAUTILUS_UNDO_MANAGER_CLASS (GTK_OBJECT (servant->bonobo_object)->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); @@ -116,7 +109,7 @@ impl_Nautilus_Undo_Manager__destroy(BonoboObject *obj, impl_POA_Nautilus_Undo_Ma servant_destroy_func ((PortableServer_Servant) servant, &ev); g_free (servant); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } static Nautilus_Undo_Manager @@ -135,7 +128,7 @@ impl_Nautilus_Undo_Manager__create (NautilusUndoManager *manager, CORBA_Environm servant->servant.vepv->Bonobo_Unknown_epv = bonobo_object_get_epv (); servant_init_func ((PortableServer_Servant) servant, ev); - servant->gtk_object = manager; + servant->bonobo_object = manager; retval = bonobo_object_activate_servant (BONOBO_OBJECT (manager), servant); @@ -144,62 +137,58 @@ impl_Nautilus_Undo_Manager__create (NautilusUndoManager *manager, CORBA_Environm return retval; } - static void -impl_Nautilus_Undo_Manager__append (impl_POA_Nautilus_Undo_Manager *servant, +impl_Nautilus_Undo_Manager__append (PortableServer_Servant servant, const Nautilus_Undo_Transaction undo_transaction, CORBA_Environment *ev) { NautilusUndoManager *manager; - g_assert (NAUTILUS_IS_UNDO_MANAGER (servant->gtk_object)); - manager = NAUTILUS_UNDO_MANAGER (servant->gtk_object); + manager = ((impl_POA_Nautilus_Undo_Manager *) servant)->bonobo_object; + g_assert (NAUTILUS_IS_UNDO_MANAGER (manager)); Nautilus_Undo_Transaction_ref (undo_transaction, ev); nautilus_undo_manager_add_transaction (manager, undo_transaction); } static void -impl_Nautilus_Undo_Manager__forget (impl_POA_Nautilus_Undo_Manager *servant, +impl_Nautilus_Undo_Manager__forget (PortableServer_Servant servant, const Nautilus_Undo_Transaction transaction, CORBA_Environment *ev) { NautilusUndoManager *manager; - g_assert (NAUTILUS_IS_UNDO_MANAGER (servant->gtk_object)); - manager = NAUTILUS_UNDO_MANAGER (servant->gtk_object); + manager = ((impl_POA_Nautilus_Undo_Manager *) servant)->bonobo_object; + g_assert (NAUTILUS_IS_UNDO_MANAGER (manager)); + + /* FIXME: Need to implement this. */ } static void -impl_Nautilus_Undo_Manager__undo (impl_POA_Nautilus_Undo_Manager *servant, CORBA_Environment *ev) +impl_Nautilus_Undo_Manager__undo (PortableServer_Servant servant, + CORBA_Environment *ev) { NautilusUndoManager *manager; - g_assert (NAUTILUS_IS_UNDO_MANAGER (servant->gtk_object)); - manager = NAUTILUS_UNDO_MANAGER (servant->gtk_object); - + manager = ((impl_POA_Nautilus_Undo_Manager *) servant)->bonobo_object; + g_assert (NAUTILUS_IS_UNDO_MANAGER (manager)); + nautilus_undo_manager_undo (manager); } - -/* nautilus_undo_manager_new */ NautilusUndoManager * nautilus_undo_manager_new (void) { - NautilusUndoManager *manager; - - manager = gtk_type_new (nautilus_undo_manager_get_type ()); - - return manager; + return gtk_type_new (nautilus_undo_manager_get_type ()); } - /* Object initialization function for the NautilusUndoManager */ static void nautilus_undo_manager_initialize (NautilusUndoManager *manager) { - CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_Environment ev; + + CORBA_exception_init (&ev); manager->details = g_new0 (NautilusUndoManagerDetails, 1); @@ -214,8 +203,8 @@ nautilus_undo_manager_initialize (NautilusUndoManager *manager) manager->details->queue_depth = 1; bonobo_object_construct (BONOBO_OBJECT (manager), impl_Nautilus_Undo_Manager__create (manager, &ev)); - - CORBA_exception_free(&ev); + + CORBA_exception_free (&ev); } @@ -234,7 +223,7 @@ nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *klass) klass->vepv = &impl_Nautilus_Undo_Manager_vepv; /* Setup signals */ - signals[UNDO_TRANSACTION_OCCURED] + signals[UNDO_TRANSACTION_OCCURRED] = gtk_signal_new ("undo_transaction_occurred", GTK_RUN_LAST, object_class->type, @@ -246,8 +235,6 @@ nautilus_undo_manager_initialize_class (NautilusUndoManagerClass *klass) gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL); } - -/* nautilus_undo_manager_undo_last_transaction */ static void nautilus_undo_manager_undo (NautilusUndoManager *manager) { @@ -255,7 +242,7 @@ nautilus_undo_manager_undo (NautilusUndoManager *manager) CORBA_Object undo_transaction; CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); /* Verify we have a transaction to be undone */ if (manager->details->undo_list == NULL) { @@ -282,22 +269,22 @@ nautilus_undo_manager_undo (NautilusUndoManager *manager) } /* Fire off signal informing that an undo transaction has occurred */ - gtk_signal_emit (GTK_OBJECT (manager), signals[UNDO_TRANSACTION_OCCURED]); + gtk_signal_emit (GTK_OBJECT (manager), + signals[UNDO_TRANSACTION_OCCURRED]); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } #if 0 -/* nautilus_undo_manager_redo_last_undone_transaction */ -static void +static void nautilus_undo_manager_redo (NautilusUndoManager *manager) -{ +{ GList *list; CORBA_Object redo_transaction; CORBA_Object undo_transaction; CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); /* Are we allowing redo operations? */ if (manager->details->enable_redo) { @@ -323,21 +310,21 @@ nautilus_undo_manager_redo (NautilusUndoManager *manager) Nautilus_Undo_Transaction_ref (undo_transaction, &ev); nautilus_undo_manager_add_transaction (manager, undo_transaction); - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); } #endif -/* nautilus_undo_manager_add_undo_transaction */ static void -nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, Nautilus_Undo_Transaction transaction) +nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, + Nautilus_Undo_Transaction transaction) { int length; - g_return_if_fail (transaction != NULL); - + g_return_if_fail (NAUTILUS_IS_UNDO_MANAGER (manager)); + g_return_if_fail (transaction != CORBA_OBJECT_NIL); + /* Check and see if we are over our queue limit */ length = g_list_length (manager->details->undo_list); - if (length >= manager->details->queue_depth) { manager->details->undo_list = prune_undo_manager_list (manager->details->undo_list, @@ -348,7 +335,8 @@ nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, Nautilus_Un manager->details->undo_list = g_list_append (manager->details->undo_list, transaction); /* Fire off signal informing that an undo transaction has occurred */ - gtk_signal_emit (GTK_OBJECT (manager), signals[UNDO_TRANSACTION_OCCURED]); + gtk_signal_emit (GTK_OBJECT (manager), + signals[UNDO_TRANSACTION_OCCURRED]); } /* nautilus_undo_manager_unregister_object @@ -356,7 +344,6 @@ nautilus_undo_manager_add_transaction (NautilusUndoManager *manager, Nautilus_Un * Remove any transaction with object as target from * the undo and redo queues */ - gboolean nautilus_undo_manager_unregister_object (GtkObject *object) { @@ -366,10 +353,10 @@ nautilus_undo_manager_unregister_object (GtkObject *object) GList *list; int index, length; Nautilus_Undo_Transaction transaction; -*/ CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); +*/ /* FIXME: We can't get a pointer to the actual undo manager, so this * needs to work through the CORBA interface to the undo manager. @@ -424,46 +411,33 @@ nautilus_undo_manager_unregister_object (GtkObject *object) if (success) { /* Fire off signal informing that a transaction has occurred */ - gtk_signal_emit (GTK_OBJECT (manager), signals[UNDO_TRANSACTION_OCCURED]); + gtk_signal_emit (GTK_OBJECT (manager), + signals[UNDO_TRANSACTION_OCCURRED]); } return success; } -/* nautilus_undo_manager_can_undo */ -gboolean +gboolean nautilus_undo_manager_can_undo (NautilusUndoManager *manager) { - if (manager != NULL) { - return (g_list_length (manager->details->undo_list) > 0); - } else { - return FALSE; - } + return manager != NULL + && manager->details->undo_list != NULL; } -/* nautilus_undo_manager_can_redo */ -gboolean +gboolean nautilus_undo_manager_can_redo (NautilusUndoManager *manager) { - if (manager->details->enable_redo) { - if (manager != NULL) { - return (g_list_length (manager->details->redo_list) > 0); - } else { - return FALSE; - } - } else { - return FALSE; - } + return manager != NULL + && manager->details->enable_redo + && manager->details->redo_list != NULL; } -/* destroy */ static void destroy (GtkObject *object) { NautilusUndoManager *manager; - g_return_if_fail (NAUTILUS_IS_UNDO_MANAGER (object)); - manager = NAUTILUS_UNDO_MANAGER (object); /* Clear lists */ @@ -477,40 +451,34 @@ destroy (GtkObject *object) * * Enable or disable redo functionality */ - void nautilus_undo_manager_enable_redo (NautilusUndoManager *manager, gboolean value) { - g_return_if_fail (manager != NULL); + g_return_if_fail (NAUTILUS_IS_UNDO_MANAGER (manager)); + g_return_if_fail (value == FALSE || value == TRUE); manager->details->enable_redo = value; /* Flush and free redo queue */ - g_list_free (manager->details->redo_list); + free_undo_manager_list (manager->details->redo_list); + manager->details->redo_list = NULL; } -/* nautilus_undo_manager_enable_redo - * - * Enable or disable redo functionality - */ void nautilus_undo_manager_set_queue_depth (NautilusUndoManager *manager, int depth) { int length; - /* Don't allow negative or zero queue depth */ - if (depth <= 0) { - g_warning ("NautilusUndoManager doesn not allow negative or zero length queue."); - return; - } + g_return_if_fail (NAUTILUS_IS_UNDO_MANAGER (manager)); + g_return_if_fail (depth > 0); manager->details->queue_depth = depth; - + /* Prune lists */ length = g_list_length (manager->details->undo_list); if (length > depth) { manager->details->undo_list = prune_undo_manager_list (manager->details->undo_list, - length - depth); + length - depth); } length = g_list_length (manager->details->redo_list); if (length > depth) { @@ -519,7 +487,8 @@ nautilus_undo_manager_set_queue_depth (NautilusUndoManager *manager, int depth) } /* Fire off signal informing that an undo transaction has occurred */ - gtk_signal_emit (GTK_OBJECT (manager), signals[UNDO_TRANSACTION_OCCURED]); + gtk_signal_emit (GTK_OBJECT (manager), + signals[UNDO_TRANSACTION_OCCURRED]); } /* free_undo_manager_list @@ -533,13 +502,13 @@ free_undo_manager_list (GList *list) Nautilus_Undo_Transaction transaction; CORBA_Environment ev; - CORBA_exception_init(&ev); + CORBA_exception_init (&ev); for (p = list; p != NULL; p = p->next) { transaction = p->data; Nautilus_Undo_Transaction_unref (transaction, &ev); } - CORBA_exception_free(&ev); + CORBA_exception_free (&ev); g_list_free (list); } @@ -665,7 +634,7 @@ nautilus_share_undo_manager (GtkObject *destination_object, nautilus_get_undo_manager (source_object)); } -/* Locates an undo manger for this bonobo control. +/* Locates an undo manager for this bonobo control. * The undo manager is supplied by an interface on * the control frame. The put that undo manager on * the Bonobo control's widget. diff --git a/src/nautilus-applicable-views.c b/src/nautilus-applicable-views.c index 75d94e1a1..5edf61098 100644 --- a/src/nautilus-applicable-views.c +++ b/src/nautilus-applicable-views.c @@ -53,8 +53,6 @@ #include <ctype.h> #include <string.h> -#include "ntl-types.h" - /* forward declarations */ static void add_sidebar_panel_identifiers (NautilusNavigationInfo *navinfo); static void async_get_file_info_text (GnomeVFSAsyncHandle **handle, diff --git a/src/nautilus-application.c b/src/nautilus-application.c index 31d3449de..8b0e00815 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -25,7 +25,9 @@ */ #include <config.h> -#include "nautilus.h" +#include "ntl-app.h" + +#include "ntl-window-state.h" #include <libnautilus/libnautilus.h> #include <bonobo.h> #include "file-manager/fm-icon-view.h" @@ -34,6 +36,7 @@ #include <libnautilus-extensions/nautilus-gnome-extensions.h> #include <libnautilus-extensions/nautilus-global-preferences.h> #include <libnautilus/nautilus-undo-manager.h> +#include <liboaf/liboaf.h> typedef struct { POA_Nautilus_Application servant; @@ -234,14 +237,12 @@ nautilus_app_init (NautilusApp *app) /* Init undo manager */ app->undo_manager = BONOBO_OBJECT (nautilus_undo_manager_new ()); undo_manager = bonobo_object_corba_objref (BONOBO_OBJECT (app->undo_manager)); - /* Fix this */ - Bonobo_Unknown_ref (undo_manager, &ev); /* Stash a global reference to the object */ nautilus_undo_manager_stash_global_undo (undo_manager); - /* Add it to the application object*/ - nautilus_attach_undo_manager ( GTK_OBJECT (app), undo_manager); + /* Add it to the application object */ + nautilus_attach_undo_manager (GTK_OBJECT (app), undo_manager); CORBA_exception_free (&ev); } diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c index eff0f144d..6484455ca 100644 --- a/src/nautilus-information-panel.c +++ b/src/nautilus-information-panel.c @@ -760,10 +760,8 @@ add_command_buttons (NautilusIndexPanel *index_panel, GList *command_list) g_free(temp_str); nautilus_gtk_signal_connect_free_data - (GTK_OBJECT (temp_button), - "clicked", - GTK_SIGNAL_FUNC (command_button_callback), - command_string); + (GTK_OBJECT (temp_button), "clicked", + GTK_SIGNAL_FUNC (command_button_callback), command_string); gtk_object_set_user_data (GTK_OBJECT (temp_button), index_panel); gtk_widget_show (temp_button); @@ -771,24 +769,18 @@ add_command_buttons (NautilusIndexPanel *index_panel, GList *command_list) /* Catch-all button after all the others. */ temp_button = gtk_button_new_with_label (_("Open with ...")); - gtk_signal_connect - (GTK_OBJECT (temp_button), - "clicked", - open_with_callback, - NULL); - gtk_object_set_user_data (GTK_OBJECT (temp_button), index_panel); + gtk_signal_connect (GTK_OBJECT (temp_button), "clicked", + open_with_callback, NULL); + gtk_object_set_user_data (GTK_OBJECT (temp_button), index_panel); gtk_widget_show (temp_button); gtk_box_pack_start (GTK_BOX (index_panel->details->button_box), - temp_button, - FALSE, FALSE, - 0); + temp_button, FALSE, FALSE, 0); } /* here's where we set up the command buttons, based on the mime-type of the associated URL */ /* FIXME bugzilla.eazel.com 596: eventually, we need a way to * override/augment the type from info in the metadata. */ - void nautilus_index_panel_update_buttons (NautilusIndexPanel *index_panel) { diff --git a/src/nautilus-main.c b/src/nautilus-main.c index 18bf64e73..0296d5da1 100644 --- a/src/nautilus-main.c +++ b/src/nautilus-main.c @@ -29,14 +29,20 @@ /* ntl-main.c: Implementation of the routines that drive program lifecycle and main window creation/destruction. */ #include <config.h> -#include "nautilus.h" + #include "nautilus-self-check-functions.h" +#include "ntl-app.h" #include <libnautilus-extensions/nautilus-debug.h> #include <libnautilus-extensions/nautilus-lib-self-check-functions.h> #include <libnautilus-extensions/nautilus-self-checks.h> -#include <nautilus-widgets/nautilus-widgets-self-check-functions.h> #include <nautilus-widgets/nautilus-preferences.h> +#include <nautilus-widgets/nautilus-widgets-self-check-functions.h> +#include <popt.h> +#include <libgnome/gnome-i18n.h> +#include <libgnomeui/gnome-init.h> + #include <libgnomevfs/gnome-vfs-init.h> +#include <liboaf/liboaf.h> int main(int argc, char *argv[]) diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c index adabef894..eba6b06ae 100644 --- a/src/nautilus-navigation-window.c +++ b/src/nautilus-navigation-window.c @@ -24,14 +24,19 @@ * John Sullivan <sullivan@eazel.com> * */ + /* ntl-window.c: Implementation of the main window object */ #include <config.h> #include "ntl-window-private.h" +#include "ntl-window-msgs.h" +#include "ntl-window-state.h" +#include "ntl-app.h" +#include "ntl-meta-view.h" + #include <gnome.h> #include <math.h> -#include "nautilus.h" #include "nautilus-bookmarks-window.h" #include "nautilus-signaller.h" #include "nautilus-location-bar.h" diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c index adabef894..eba6b06ae 100644 --- a/src/nautilus-object-window.c +++ b/src/nautilus-object-window.c @@ -24,14 +24,19 @@ * John Sullivan <sullivan@eazel.com> * */ + /* ntl-window.c: Implementation of the main window object */ #include <config.h> #include "ntl-window-private.h" +#include "ntl-window-msgs.h" +#include "ntl-window-state.h" +#include "ntl-app.h" +#include "ntl-meta-view.h" + #include <gnome.h> #include <math.h> -#include "nautilus.h" #include "nautilus-bookmarks-window.h" #include "nautilus-signaller.h" #include "nautilus-location-bar.h" diff --git a/src/nautilus-sidebar.c b/src/nautilus-sidebar.c index eff0f144d..6484455ca 100644 --- a/src/nautilus-sidebar.c +++ b/src/nautilus-sidebar.c @@ -760,10 +760,8 @@ add_command_buttons (NautilusIndexPanel *index_panel, GList *command_list) g_free(temp_str); nautilus_gtk_signal_connect_free_data - (GTK_OBJECT (temp_button), - "clicked", - GTK_SIGNAL_FUNC (command_button_callback), - command_string); + (GTK_OBJECT (temp_button), "clicked", + GTK_SIGNAL_FUNC (command_button_callback), command_string); gtk_object_set_user_data (GTK_OBJECT (temp_button), index_panel); gtk_widget_show (temp_button); @@ -771,24 +769,18 @@ add_command_buttons (NautilusIndexPanel *index_panel, GList *command_list) /* Catch-all button after all the others. */ temp_button = gtk_button_new_with_label (_("Open with ...")); - gtk_signal_connect - (GTK_OBJECT (temp_button), - "clicked", - open_with_callback, - NULL); - gtk_object_set_user_data (GTK_OBJECT (temp_button), index_panel); + gtk_signal_connect (GTK_OBJECT (temp_button), "clicked", + open_with_callback, NULL); + gtk_object_set_user_data (GTK_OBJECT (temp_button), index_panel); gtk_widget_show (temp_button); gtk_box_pack_start (GTK_BOX (index_panel->details->button_box), - temp_button, - FALSE, FALSE, - 0); + temp_button, FALSE, FALSE, 0); } /* here's where we set up the command buttons, based on the mime-type of the associated URL */ /* FIXME bugzilla.eazel.com 596: eventually, we need a way to * override/augment the type from info in the metadata. */ - void nautilus_index_panel_update_buttons (NautilusIndexPanel *index_panel) { diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c index adabef894..eba6b06ae 100644 --- a/src/nautilus-spatial-window.c +++ b/src/nautilus-spatial-window.c @@ -24,14 +24,19 @@ * John Sullivan <sullivan@eazel.com> * */ + /* ntl-window.c: Implementation of the main window object */ #include <config.h> #include "ntl-window-private.h" +#include "ntl-window-msgs.h" +#include "ntl-window-state.h" +#include "ntl-app.h" +#include "ntl-meta-view.h" + #include <gnome.h> #include <math.h> -#include "nautilus.h" #include "nautilus-bookmarks-window.h" #include "nautilus-signaller.h" #include "nautilus-location-bar.h" diff --git a/src/nautilus-view-frame-bonobo-control.c b/src/nautilus-view-frame-bonobo-control.c index bc5cafb4a..d37a93f28 100644 --- a/src/nautilus-view-frame-bonobo-control.c +++ b/src/nautilus-view-frame-bonobo-control.c @@ -26,8 +26,8 @@ #include <config.h> -#include "nautilus.h" #include "ntl-view-private.h" +#include "ntl-window.h" typedef struct { BonoboObject *control_frame; diff --git a/src/nautilus-view-frame-bonobo-embeddable.c b/src/nautilus-view-frame-bonobo-embeddable.c index 1288470ad..f0c4bf63d 100644 --- a/src/nautilus-view-frame-bonobo-embeddable.c +++ b/src/nautilus-view-frame-bonobo-embeddable.c @@ -26,8 +26,8 @@ #include <config.h> -#include "nautilus.h" #include "ntl-view-private.h" +#include "ntl-window.h" #include <libnautilus-extensions/bonobo-stream-vfs.h> typedef struct { diff --git a/src/nautilus-view-frame-corba.c b/src/nautilus-view-frame-corba.c index 0c025c5a3..342e83b9b 100644 --- a/src/nautilus-view-frame-corba.c +++ b/src/nautilus-view-frame-corba.c @@ -27,8 +27,9 @@ representing a data view frame. */ #include <config.h> -#include "nautilus.h" + #include "ntl-view-private.h" +#include "ntl-window.h" static Nautilus_ViewWindow impl_Nautilus_ViewFrame__get_main_window(impl_POA_Nautilus_ViewFrame *servant, diff --git a/src/nautilus-view-frame-nautilus-view.c b/src/nautilus-view-frame-nautilus-view.c index 5e4ca2eed..6465c7276 100644 --- a/src/nautilus-view-frame-nautilus-view.c +++ b/src/nautilus-view-frame-nautilus-view.c @@ -26,8 +26,8 @@ #include <config.h> -#include "nautilus.h" #include "ntl-view-private.h" +#include "ntl-window.h" typedef struct { BonoboObject *control_frame; diff --git a/src/nautilus-view-frame-private.h b/src/nautilus-view-frame-private.h index e1c5a276b..697f59582 100644 --- a/src/nautilus-view-frame-private.h +++ b/src/nautilus-view-frame-private.h @@ -29,7 +29,7 @@ #ifndef NTL_VIEW_PRIVATE_H #define NTL_VIEW_PRIVATE_H -#include "nautilus.h" +#include "ntl-view.h" typedef struct { POA_Nautilus_ViewFrame servant; diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c index e05ae0fd0..c57ea0ee9 100644 --- a/src/nautilus-view-frame.c +++ b/src/nautilus-view-frame.c @@ -28,8 +28,11 @@ object. */ #include <config.h> + #include "ntl-view-private.h" -#include "nautilus.h" +#include "ntl-meta-view.h" +#include "ntl-content-view.h" +#include "ntl-window.h" #include <libnautilus-extensions/nautilus-gtk-extensions.h> #include <gtk/gtksignal.h> #include <gtk/gtk.h> diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c index e7dc26308..597192418 100644 --- a/src/nautilus-window-manage-views.c +++ b/src/nautilus-window-manage-views.c @@ -50,7 +50,6 @@ #include "ntl-window-private.h" #include "ntl-window-state.h" #include "nautilus-location-bar.h" -#include "ntl-types.h" /*#define EXTREME_DEBUGGING*/ diff --git a/src/nautilus-window-state.c b/src/nautilus-window-state.c index 0fec33f9f..af6a05e7a 100644 --- a/src/nautilus-window-state.c +++ b/src/nautilus-window-state.c @@ -25,7 +25,8 @@ */ #include <config.h> -#include "nautilus.h" +#include "ntl-window-state.h" + #include <libnautilus-extensions/nautilus-file-utilities.h> #include <libnautilus-extensions/nautilus-global-preferences.h> diff --git a/src/nautilus-window.c b/src/nautilus-window.c index adabef894..eba6b06ae 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -24,14 +24,19 @@ * John Sullivan <sullivan@eazel.com> * */ + /* ntl-window.c: Implementation of the main window object */ #include <config.h> #include "ntl-window-private.h" +#include "ntl-window-msgs.h" +#include "ntl-window-state.h" +#include "ntl-app.h" +#include "ntl-meta-view.h" + #include <gnome.h> #include <math.h> -#include "nautilus.h" #include "nautilus-bookmarks-window.h" #include "nautilus-signaller.h" #include "nautilus-location-bar.h" diff --git a/src/nautilus-zoomable-frame-corba.c b/src/nautilus-zoomable-frame-corba.c index b89206447..213018bf1 100644 --- a/src/nautilus-zoomable-frame-corba.c +++ b/src/nautilus-zoomable-frame-corba.c @@ -28,7 +28,6 @@ Nautilus::ZoomableFrame interface of a nautilus ViewFrame. */ #include <config.h> -#include "nautilus.h" #include "ntl-view-private.h" typedef struct { diff --git a/src/nautilus-zoomable-frame-svr.c b/src/nautilus-zoomable-frame-svr.c index b89206447..213018bf1 100644 --- a/src/nautilus-zoomable-frame-svr.c +++ b/src/nautilus-zoomable-frame-svr.c @@ -28,7 +28,6 @@ Nautilus::ZoomableFrame interface of a nautilus ViewFrame. */ #include <config.h> -#include "nautilus.h" #include "ntl-view-private.h" typedef struct { diff --git a/src/nautilus.h b/src/nautilus.h deleted file mode 100644 index ca2d8fd73..000000000 --- a/src/nautilus.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ - -#ifndef NAUTILUS_H -#define NAUTILUS_H 1 - -#include <gnome.h> -#include <liboaf/liboaf.h> -#include <bonobo.h> - -#include "ntl-types.h" -#include "ntl-window.h" -#include "ntl-window-state.h" -#include "ntl-window-msgs.h" -#include "ntl-view.h" -#include "ntl-meta-view.h" -#include "ntl-content-view.h" -#include "ntl-uri-map.h" - -#include "ntl-app.h" - -#endif diff --git a/src/ntl-app.c b/src/ntl-app.c index 31d3449de..8b0e00815 100644 --- a/src/ntl-app.c +++ b/src/ntl-app.c @@ -25,7 +25,9 @@ */ #include <config.h> -#include "nautilus.h" +#include "ntl-app.h" + +#include "ntl-window-state.h" #include <libnautilus/libnautilus.h> #include <bonobo.h> #include "file-manager/fm-icon-view.h" @@ -34,6 +36,7 @@ #include <libnautilus-extensions/nautilus-gnome-extensions.h> #include <libnautilus-extensions/nautilus-global-preferences.h> #include <libnautilus/nautilus-undo-manager.h> +#include <liboaf/liboaf.h> typedef struct { POA_Nautilus_Application servant; @@ -234,14 +237,12 @@ nautilus_app_init (NautilusApp *app) /* Init undo manager */ app->undo_manager = BONOBO_OBJECT (nautilus_undo_manager_new ()); undo_manager = bonobo_object_corba_objref (BONOBO_OBJECT (app->undo_manager)); - /* Fix this */ - Bonobo_Unknown_ref (undo_manager, &ev); /* Stash a global reference to the object */ nautilus_undo_manager_stash_global_undo (undo_manager); - /* Add it to the application object*/ - nautilus_attach_undo_manager ( GTK_OBJECT (app), undo_manager); + /* Add it to the application object */ + nautilus_attach_undo_manager (GTK_OBJECT (app), undo_manager); CORBA_exception_free (&ev); } diff --git a/src/ntl-index-panel.c b/src/ntl-index-panel.c index eff0f144d..6484455ca 100644 --- a/src/ntl-index-panel.c +++ b/src/ntl-index-panel.c @@ -760,10 +760,8 @@ add_command_buttons (NautilusIndexPanel *index_panel, GList *command_list) g_free(temp_str); nautilus_gtk_signal_connect_free_data - (GTK_OBJECT (temp_button), - "clicked", - GTK_SIGNAL_FUNC (command_button_callback), - command_string); + (GTK_OBJECT (temp_button), "clicked", + GTK_SIGNAL_FUNC (command_button_callback), command_string); gtk_object_set_user_data (GTK_OBJECT (temp_button), index_panel); gtk_widget_show (temp_button); @@ -771,24 +769,18 @@ add_command_buttons (NautilusIndexPanel *index_panel, GList *command_list) /* Catch-all button after all the others. */ temp_button = gtk_button_new_with_label (_("Open with ...")); - gtk_signal_connect - (GTK_OBJECT (temp_button), - "clicked", - open_with_callback, - NULL); - gtk_object_set_user_data (GTK_OBJECT (temp_button), index_panel); + gtk_signal_connect (GTK_OBJECT (temp_button), "clicked", + open_with_callback, NULL); + gtk_object_set_user_data (GTK_OBJECT (temp_button), index_panel); gtk_widget_show (temp_button); gtk_box_pack_start (GTK_BOX (index_panel->details->button_box), - temp_button, - FALSE, FALSE, - 0); + temp_button, FALSE, FALSE, 0); } /* here's where we set up the command buttons, based on the mime-type of the associated URL */ /* FIXME bugzilla.eazel.com 596: eventually, we need a way to * override/augment the type from info in the metadata. */ - void nautilus_index_panel_update_buttons (NautilusIndexPanel *index_panel) { diff --git a/src/ntl-main.c b/src/ntl-main.c index 18bf64e73..0296d5da1 100644 --- a/src/ntl-main.c +++ b/src/ntl-main.c @@ -29,14 +29,20 @@ /* ntl-main.c: Implementation of the routines that drive program lifecycle and main window creation/destruction. */ #include <config.h> -#include "nautilus.h" + #include "nautilus-self-check-functions.h" +#include "ntl-app.h" #include <libnautilus-extensions/nautilus-debug.h> #include <libnautilus-extensions/nautilus-lib-self-check-functions.h> #include <libnautilus-extensions/nautilus-self-checks.h> -#include <nautilus-widgets/nautilus-widgets-self-check-functions.h> #include <nautilus-widgets/nautilus-preferences.h> +#include <nautilus-widgets/nautilus-widgets-self-check-functions.h> +#include <popt.h> +#include <libgnome/gnome-i18n.h> +#include <libgnomeui/gnome-init.h> + #include <libgnomevfs/gnome-vfs-init.h> +#include <liboaf/liboaf.h> int main(int argc, char *argv[]) diff --git a/src/ntl-meta-view.c b/src/ntl-meta-view.c index 78e76df4f..caa18c499 100644 --- a/src/ntl-meta-view.c +++ b/src/ntl-meta-view.c @@ -26,7 +26,8 @@ /* ntl-meta-view.c: Implementation of the object representing a meta/navigation view. */ #include <config.h> -#include "nautilus.h" +#include "ntl-meta-view.h" + #include "ntl-view-private.h" #include <gtk/gtksignal.h> #include <libnautilus-extensions/nautilus-gtk-macros.h> diff --git a/src/ntl-types.h b/src/ntl-types.h deleted file mode 100644 index a9d4ec70d..000000000 --- a/src/ntl-types.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */ - -/* - * Nautilus - * - * Copyright (C) 1999, 2000 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this library; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Author: Elliot Lee <sopwith@redhat.com> - * - */ -/* ntl-types.h: Declarations of basic types */ - -#ifndef NTL_TYPES_H -#define NTL_TYPES_H - -typedef char *NautilusLocationReference; - -#endif - diff --git a/src/ntl-uri-map.c b/src/ntl-uri-map.c index 75d94e1a1..5edf61098 100644 --- a/src/ntl-uri-map.c +++ b/src/ntl-uri-map.c @@ -53,8 +53,6 @@ #include <ctype.h> #include <string.h> -#include "ntl-types.h" - /* forward declarations */ static void add_sidebar_panel_identifiers (NautilusNavigationInfo *navinfo); static void async_get_file_info_text (GnomeVFSAsyncHandle **handle, diff --git a/src/ntl-view-bonobo-control.c b/src/ntl-view-bonobo-control.c index bc5cafb4a..d37a93f28 100644 --- a/src/ntl-view-bonobo-control.c +++ b/src/ntl-view-bonobo-control.c @@ -26,8 +26,8 @@ #include <config.h> -#include "nautilus.h" #include "ntl-view-private.h" +#include "ntl-window.h" typedef struct { BonoboObject *control_frame; diff --git a/src/ntl-view-bonobo-subdoc.c b/src/ntl-view-bonobo-subdoc.c index 1288470ad..f0c4bf63d 100644 --- a/src/ntl-view-bonobo-subdoc.c +++ b/src/ntl-view-bonobo-subdoc.c @@ -26,8 +26,8 @@ #include <config.h> -#include "nautilus.h" #include "ntl-view-private.h" +#include "ntl-window.h" #include <libnautilus-extensions/bonobo-stream-vfs.h> typedef struct { diff --git a/src/ntl-view-frame-svr.c b/src/ntl-view-frame-svr.c index 0c025c5a3..342e83b9b 100644 --- a/src/ntl-view-frame-svr.c +++ b/src/ntl-view-frame-svr.c @@ -27,8 +27,9 @@ representing a data view frame. */ #include <config.h> -#include "nautilus.h" + #include "ntl-view-private.h" +#include "ntl-window.h" static Nautilus_ViewWindow impl_Nautilus_ViewFrame__get_main_window(impl_POA_Nautilus_ViewFrame *servant, diff --git a/src/ntl-view-nautilus.c b/src/ntl-view-nautilus.c index 5e4ca2eed..6465c7276 100644 --- a/src/ntl-view-nautilus.c +++ b/src/ntl-view-nautilus.c @@ -26,8 +26,8 @@ #include <config.h> -#include "nautilus.h" #include "ntl-view-private.h" +#include "ntl-window.h" typedef struct { BonoboObject *control_frame; diff --git a/src/ntl-view-private.h b/src/ntl-view-private.h index e1c5a276b..697f59582 100644 --- a/src/ntl-view-private.h +++ b/src/ntl-view-private.h @@ -29,7 +29,7 @@ #ifndef NTL_VIEW_PRIVATE_H #define NTL_VIEW_PRIVATE_H -#include "nautilus.h" +#include "ntl-view.h" typedef struct { POA_Nautilus_ViewFrame servant; diff --git a/src/ntl-view.c b/src/ntl-view.c index e05ae0fd0..c57ea0ee9 100644 --- a/src/ntl-view.c +++ b/src/ntl-view.c @@ -28,8 +28,11 @@ object. */ #include <config.h> + #include "ntl-view-private.h" -#include "nautilus.h" +#include "ntl-meta-view.h" +#include "ntl-content-view.h" +#include "ntl-window.h" #include <libnautilus-extensions/nautilus-gtk-extensions.h> #include <gtk/gtksignal.h> #include <gtk/gtk.h> diff --git a/src/ntl-window-msgs.c b/src/ntl-window-msgs.c index e7dc26308..597192418 100644 --- a/src/ntl-window-msgs.c +++ b/src/ntl-window-msgs.c @@ -50,7 +50,6 @@ #include "ntl-window-private.h" #include "ntl-window-state.h" #include "nautilus-location-bar.h" -#include "ntl-types.h" /*#define EXTREME_DEBUGGING*/ diff --git a/src/ntl-window-state.c b/src/ntl-window-state.c index 0fec33f9f..af6a05e7a 100644 --- a/src/ntl-window-state.c +++ b/src/ntl-window-state.c @@ -25,7 +25,8 @@ */ #include <config.h> -#include "nautilus.h" +#include "ntl-window-state.h" + #include <libnautilus-extensions/nautilus-file-utilities.h> #include <libnautilus-extensions/nautilus-global-preferences.h> diff --git a/src/ntl-window.c b/src/ntl-window.c index adabef894..eba6b06ae 100644 --- a/src/ntl-window.c +++ b/src/ntl-window.c @@ -24,14 +24,19 @@ * John Sullivan <sullivan@eazel.com> * */ + /* ntl-window.c: Implementation of the main window object */ #include <config.h> #include "ntl-window-private.h" +#include "ntl-window-msgs.h" +#include "ntl-window-state.h" +#include "ntl-app.h" +#include "ntl-meta-view.h" + #include <gnome.h> #include <math.h> -#include "nautilus.h" #include "nautilus-bookmarks-window.h" #include "nautilus-signaller.h" #include "nautilus-location-bar.h" |