Added the hooks needed to make metafile reading asynchronous.

	Next I'll change the actual metafile access to work that way.

	* libnautilus/nautilus-directory.h:
	* libnautilus/nautilus-directory.c:
	(nautilus_directory_metadata_call_when_ready): Added function
	that requests a read of some metadata and calls back when the
	data is ready.

	* src/ntl-app.c: (nautilus_app_startup): Got rid of call to
	nautilus_navinfo_init.

	* src/ntl-types.h: Moved the NautilusNavigationInfo struct
	and related defines to ntl-uri-map.h.

	* src/ntl-uri-map.h:
	* src/ntl-uri-map.c:
	Reformatted and changed the names of many functions.
	Added code to use the new metadata callback.

	* src/ntl-index-panel.c:
	* src/ntl-main.c:
	* src/ntl-view.h:
	* src/ntl-window-msgs.c:
	* src/ntl-window.c:
	* src/ntl-window.h:
	Had to change includes a bit because of my changes to what
	header files are including.

	* src/ntl-window-msgs.c: (nautilus_window_update_state):
	* src/ntl-window.h:
	Use the new nautilus_navigation_info_cancel call instead of
	reaching right in to cancel the underlying call.

	* src/ntl-view-private.h:
	Reformatting.

1 files changed, 93 insertions, 97 deletions

diff --git a/src/ntl-view.h b/src/ntl-view.h
index e6c6d0d47..7472141e6 100644
--- a/src/ntl-view.h
+++ b/src/ntl-view.h
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
 
 /*
  *  Nautilus
@@ -23,125 +23,121 @@
  *  Author: Elliot Lee <sopwith@redhat.com>
  *
  */
+
 /* ntl-view.h: Interface of the object representing a data
    view. NautilusContentView and NautilusMetaView derive from this
    class. */
 
-#ifndef __NAUTILUS_VIEW_H__
-#define __NAUTILUS_VIEW_H__
+#ifndef NAUTILUS_VIEW_H
+#define NAUTILUS_VIEW_H
 
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkbin.h>
-#include "ntl-types.h"
 #include <bonobo.h>
+#include <libnautilus/nautilus.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#define NAUTILUS_TYPE_VIEW			(nautilus_view_get_type ())
-#define NAUTILUS_VIEW(obj)			(GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW, NautilusView))
-#define NAUTILUS_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW, NautilusViewClass))
-#define NAUTILUS_IS_VIEW(obj)			(GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW))
-#define NAUTILUS_IS_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW))
-
-typedef struct _NautilusView       NautilusView;
-typedef struct _NautilusViewClass  NautilusViewClass;
-
-struct _NautilusViewClass
-{
-  GtkBinClass parent_spot;
-
-  /* These signals correspond to the Natuilus:ViewFrame CORBA interface. They
-     are requests that the underlying view may make of the framework. */
-
-  void (*request_location_change)	(NautilusView *view,
-					 Nautilus_NavigationRequestInfo *navinfo);
-  void (*request_selection_change)      (NautilusView *view,
-				         Nautilus_SelectionRequestInfo *selinfo);
-  void (*request_status_change)         (NautilusView *view,
-                                         Nautilus_StatusRequestInfo *loc);
-  void (*request_progress_change)       (NautilusView *view,
-                                         Nautilus_ProgressRequestInfo *loc);
-  void (*notify_zoom_level)             (NautilusView *view,
-                                         gdouble       zoom_level);
-
-  /* Not a signal. Work-around for Gtk+'s lack of a 'constructed' operation */
-  void (*view_constructed) (NautilusView *view);
-
-  GtkBinClass *parent_class;
-  guint num_construct_args;
-
-  gpointer servant_init_func, servant_destroy_func, vepv;
-  gpointer zoomable_servant_init_func, zoomable_servant_destroy_func, zoomable_vepv;
+#define NAUTILUS_TYPE_VIEW            (nautilus_view_get_type ())
+#define NAUTILUS_VIEW(obj)            (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW, NautilusView))
+#define NAUTILUS_VIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW, NautilusViewClass))
+#define NAUTILUS_IS_VIEW(obj)         (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW))
+#define NAUTILUS_IS_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW))
+        
+typedef struct NautilusView NautilusView;
+typedef struct NautilusViewClass NautilusViewClass;
+
+struct NautilusViewClass {
+        GtkBinClass parent_spot;
+        
+        /* These signals correspond to the Natuilus:ViewFrame CORBA interface. They
+           are requests that the underlying view may make of the framework. */
+        
+        void (*request_location_change)	 (NautilusView *view,
+					  Nautilus_NavigationRequestInfo *navinfo);
+        void (*request_selection_change) (NautilusView *view,
+                                          Nautilus_SelectionRequestInfo *selinfo);
+        void (*request_status_change)    (NautilusView *view,
+                                          Nautilus_StatusRequestInfo *loc);
+        void (*request_progress_change)  (NautilusView *view,
+                                          Nautilus_ProgressRequestInfo *loc);
+        void (*notify_zoom_level)        (NautilusView *view,
+                                          gdouble       zoom_level);
+        
+        /* Not a signal. Work-around for Gtk+'s lack of a 'constructed' operation */
+        void (*view_constructed) (NautilusView *view);
+        
+        GtkBinClass *parent_class;
+        guint num_construct_args;
+        
+        gpointer servant_init_func, servant_destroy_func, vepv;
+        gpointer zoomable_servant_init_func, zoomable_servant_destroy_func, zoomable_vepv;
 };
 
-typedef struct _NautilusViewComponentType NautilusViewComponentType;
-
-struct _NautilusView
-{
-  GtkBin parent;
-
-  GtkWidget *main_window;
-
-  char *iid;
-
-  BonoboObjectClient *client_object;
-  GtkWidget *client_widget;
-
-  BonoboObject *view_frame;
-  BonoboObject *zoomable_frame;
-
-  Nautilus_Zoomable zoomable;
-  NautilusViewComponentType *component_class;
-  gpointer component_data;
-
-  guint construct_arg_count;
-
-  guint timer_id;
-  guint checking;
+typedef struct NautilusViewComponentType NautilusViewComponentType;
+
+struct NautilusView {
+        GtkBin parent;
+        
+        GtkWidget *main_window;
+        
+        char *iid;
+        
+        BonoboObjectClient *client_object;
+        GtkWidget *client_widget;
+        
+        BonoboObject *view_frame;
+        BonoboObject *zoomable_frame;
+        
+        Nautilus_Zoomable zoomable;
+        NautilusViewComponentType *component_class;
+        gpointer component_data;
+        
+        guint construct_arg_count;
+        
+        guint timer_id;
+        guint checking;
 };
 
-GtkType nautilus_view_get_type                  (void);
-gboolean nautilus_view_load_client              (NautilusView              *view,
-                                                 const char *               iid);
-const char *nautilus_view_get_iid               (NautilusView *view);
-CORBA_Object nautilus_view_get_client_objref    (NautilusView *view);
-BonoboObject *nautilus_view_get_control_frame    (NautilusView *view);
-CORBA_Object nautilus_view_get_objref           (NautilusView *view);
+GtkType       nautilus_view_get_type                (void);
+gboolean      nautilus_view_load_client             (NautilusView            *view,
+                                                     const char              *iid);
+const char *  nautilus_view_get_iid                 (NautilusView            *view);
+CORBA_Object  nautilus_view_get_client_objref       (NautilusView            *view);
+BonoboObject *nautilus_view_get_control_frame       (NautilusView            *view);
+CORBA_Object  nautilus_view_get_objref              (NautilusView            *view);
 
 /* These functions correspond to methods of the Nautilus:View CORBAinterface */
-
-void nautilus_view_notify_location_change       (NautilusView *view,
-					         Nautilus_NavigationInfo *nav_context);
-void nautilus_view_notify_selection_change      (NautilusView *view,
-					         Nautilus_SelectionInfo *sel_context);
-void nautilus_view_load_state                   (NautilusView *view, 
-                                                 const char *config_path);
-void nautilus_view_save_state                   (NautilusView *view, 
-                                                 const char *config_path);
-void nautilus_view_show_properties              (NautilusView *view);
-void nautilus_view_stop_location_change         (NautilusView *view);
-void nautilus_view_set_active_errors            (NautilusView *view, gboolean enabled);
-
-
-gboolean  nautilus_view_is_zoomable                (NautilusView *view);
-gdouble   nautilus_view_get_zoom_level             (NautilusView *view);
-void      nautilus_view_set_zoom_level             (NautilusView *view,
-                                                    gdouble       zoom_level);
-gdouble   nautilus_view_get_min_zoom_level         (NautilusView *view);
-gdouble   nautilus_view_get_max_zoom_level         (NautilusView *view);
-gboolean  nautilus_view_get_is_continuous          (NautilusView *view);
-void      nautilus_view_zoom_in                    (NautilusView *view);
-void      nautilus_view_zoom_out	           (NautilusView *view);
-void      nautilus_view_zoom_to_fit	           (NautilusView *view);
-
+void          nautilus_view_notify_location_change  (NautilusView            *view,
+                                                     Nautilus_NavigationInfo *nav_context);
+void          nautilus_view_notify_selection_change (NautilusView            *view,
+                                                     Nautilus_SelectionInfo  *sel_context);
+void          nautilus_view_load_state              (NautilusView            *view,
+                                                     const char              *config_path);
+void          nautilus_view_save_state              (NautilusView            *view,
+                                                     const char              *config_path);
+void          nautilus_view_show_properties         (NautilusView            *view);
+void          nautilus_view_stop_location_change    (NautilusView            *view);
+void          nautilus_view_set_active_errors       (NautilusView            *view,
+                                                     gboolean                 enabled);
+gboolean      nautilus_view_is_zoomable             (NautilusView            *view);
+gdouble       nautilus_view_get_zoom_level          (NautilusView            *view);
+void          nautilus_view_set_zoom_level          (NautilusView            *view,
+                                                     gdouble                  zoom_level);
+gdouble       nautilus_view_get_min_zoom_level      (NautilusView            *view);
+gdouble       nautilus_view_get_max_zoom_level      (NautilusView            *view);
+gboolean      nautilus_view_get_is_continuous       (NautilusView            *view);
+void          nautilus_view_zoom_in                 (NautilusView            *view);
+void          nautilus_view_zoom_out                (NautilusView            *view);
+void          nautilus_view_zoom_to_fit             (NautilusView            *view);
 
 /* This is a "protected" operation */
-void    nautilus_view_construct_arg_set(NautilusView *view);
+void          nautilus_view_construct_arg_set       (NautilusView            *view);
 
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
 
-#endif /* __NAUTILUS_VIEW_H__ */
+#endif /* NAUTILUS_VIEW_H */