diff options
Diffstat (limited to 'src')
35 files changed, 102 insertions, 138 deletions
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" |