diff options
author | Darin Adler <darin@src.gnome.org> | 2000-01-18 18:55:36 +0000 |
---|---|---|
committer | Darin Adler <darin@src.gnome.org> | 2000-01-18 18:55:36 +0000 |
commit | 7e292ac0048804f96845aa930d584dc24ed90d38 (patch) | |
tree | c171d655adf8726565219d65457e6488e9d73aeb /libnautilus/nautilus-view.h | |
parent | 98d22d4f2b47e8c5d580a3745967826f15ddfc02 (diff) | |
download | nautilus-7e292ac0048804f96845aa930d584dc24ed90d38.tar.gz |
Added first cut at code to put metafiles in the user's home directory if
* libnautilus/nautilus-directory.c:
(nautilus_directory_read_metafile):
(nautilus_directory_try_to_read_metafile):
(nautilus_directory_write_metafile):
(nautilus_directory_try_to_write_metafile):
(nautilus_directory_switch_to_alternate_metafile_uri):
(nautilus_directory_escape_slashes):
(nautilus_make_directory_and_parents): Added first cut at code to
put metafiles in the user's home directory if the directory is not
accessible and you can't read and write a metafile in the
directory itself. We'll have to refine this later to handle cases
where you end up with two metafiles.
* libnautilus/Makefile.am: libnautilus/nautilus-debug.h:
libnautilus/nautilus-debug.c: Took trick for getting into the
debugger and put it into a public header file so it can be used
outside of the nautilus executable.
* src/ntl-main.c: (stop_in_debugger):
(nautilus_stop_after_default_log_handler): (main): Use the new
calls from libnautilus to set up the drop into debugger for
criticals and warnings.
* src/file-manager/fm-main.c: (main): Minimized includes and used
the new calls from libnautilus to set up the drop into debugger
for criticals and warnings.
* src/ntl-uri-map.c: (nautilus_navinfo_add_mapping):
src/ntl-window.c: (nautilus_window_constructed):
src/file-manager/fm-directory-view.c:
(fm_directory_view_initialize): (fm_directory_view_destroy):
(notify_location_change_cb): (stop_location_change_cb):
(fm_directory_view_sort): Removed some messages that aren't so
useful.
* libnautilus/ntl-view-frame.h: Minimized includes.
* libnautilus/ntl-view-frame.c: Include "ntl-view-frame.h" first
so it tests to see that it has sufficient includes in it.
* src/ntl-view.c: (nautilus_view_load_client): Changed function so
that NULL for an iid is allowed and simply results in a failed
load instead of being illegal.
* src/ntl-window-msgs.c:
(nautilus_window_change_location_internal): src/ntl-window.c:
(nautilus_window_up): Got rid of calls to gnome_vfs_uri_destroy;
use gnome_vfs_uri_unref instead since it's safer and Federico is
getting rid of gnome_vfs_uri_destroy.
* src/file-manager/fm-directory-view-icons.h:
src/file-manager/fm-directory-view-icons.c:
(fm_directory_view_icons_new):
src/file-manager/fm-directory-view-list.h:
src/file-manager/fm-directory-view-list.c:
(fm_directory_view_list_new):
src/file-manager/fm-directory-view.h:
src/file-manager/fm-directory-view.c: (fm_directory_view_new):
Minimized includes and got rid of the unused _new functions.
* libnautilus/nautilus-directory.h: Added a missing 2000 copyright
date.
Diffstat (limited to 'libnautilus/nautilus-view.h')
-rw-r--r-- | libnautilus/nautilus-view.h | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/libnautilus/nautilus-view.h b/libnautilus/nautilus-view.h index 7f3bbf35f..85cf88f07 100644 --- a/libnautilus/nautilus-view.h +++ b/libnautilus/nautilus-view.h @@ -1,4 +1,4 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */ /* * libnautilus: A library for nautilus view implementations. @@ -30,7 +30,9 @@ #ifndef NTL_VIEW_FRAME_H #define NTL_VIEW_FRAME_H -#include <gtk/gtk.h> +#include <gtk/gtkbin.h> +#include "nautilus.h" +#include <bonobo/gnome-object.h> #ifdef __cplusplus extern "C" { @@ -47,42 +49,42 @@ typedef struct _NautilusViewFrameClass NautilusViewFrameClass; struct _NautilusViewFrameClass { - GtkBinClass parent_spot; + GtkBinClass parent_spot; - void (*notify_location_change) (NautilusViewFrame *view, + void (*notify_location_change) (NautilusViewFrame *view, Nautilus_NavigationInfo *nav_context); - void (*notify_selection_change) (NautilusViewFrame *view, + void (*notify_selection_change) (NautilusViewFrame *view, Nautilus_SelectionInfo *nav_context); - void (*load_state) (NautilusViewFrame *view, const char *config_path); - void (*save_state) (NautilusViewFrame *view, const char *config_path); - void (*show_properties) (NautilusViewFrame *view); - void (*stop_location_change) (NautilusViewFrame *view); + void (*load_state) (NautilusViewFrame *view, const char *config_path); + void (*save_state) (NautilusViewFrame *view, const char *config_path); + void (*show_properties) (NautilusViewFrame *view); + void (*stop_location_change) (NautilusViewFrame *view); - GtkBinClass *parent_class; + GtkBinClass *parent_class; - gpointer servant_init_func, servant_destroy_func, vepv; + gpointer servant_init_func, servant_destroy_func, vepv; }; struct _NautilusViewFrame { - GtkBin parent; + GtkBin parent; - GtkWidget *main_window; + GtkWidget *main_window; - GnomeObject *control, *view_server; - Nautilus_ViewFrame view_frame; + GnomeObject *control, *view_server; + Nautilus_ViewFrame view_frame; }; -GtkType nautilus_view_frame_get_type (void); -void nautilus_view_frame_request_location_change (NautilusViewFrame *view, - Nautilus_NavigationRequestInfo *loc); -void nautilus_view_frame_request_selection_change (NautilusViewFrame *view, - Nautilus_SelectionRequestInfo *loc); -void nautilus_view_frame_request_status_change (NautilusViewFrame *view, - Nautilus_StatusRequestInfo *loc); -void nautilus_view_frame_request_progress_change (NautilusViewFrame *view, - Nautilus_ProgressRequestInfo *loc); -GnomeObject *nautilus_view_frame_get_gnome_object (NautilusViewFrame *view); +GtkType nautilus_view_frame_get_type (void); +void nautilus_view_frame_request_location_change (NautilusViewFrame *view, + Nautilus_NavigationRequestInfo *loc); +void nautilus_view_frame_request_selection_change (NautilusViewFrame *view, + Nautilus_SelectionRequestInfo *loc); +void nautilus_view_frame_request_status_change (NautilusViewFrame *view, + Nautilus_StatusRequestInfo *loc); +void nautilus_view_frame_request_progress_change (NautilusViewFrame *view, + Nautilus_ProgressRequestInfo *loc); +GnomeObject *nautilus_view_frame_get_gnome_object (NautilusViewFrame *view); #ifdef __cplusplus } |