diff options
author | Darin Adler <darin@src.gnome.org> | 2000-05-31 15:53:21 +0000 |
---|---|---|
committer | Darin Adler <darin@src.gnome.org> | 2000-05-31 15:53:21 +0000 |
commit | a0095deb3efcb8e0b89dfd17ea62daa051739ee2 (patch) | |
tree | 3e77910a32be4976c7ac1b1ba0333c763d311819 /src/nautilus-sidebar.h | |
parent | 21faf543a197a3a617cee13f3193b08477ebec03 (diff) | |
download | nautilus-a0095deb3efcb8e0b89dfd17ea62daa051739ee2.tar.gz |
Small updates.
* RENAMING: Small updates.
* components/help/converters/gnome-info2html2/main.c: (main):
* components/html/glibwww-init.c: (glibwww_parse_proxy_env):
* components/html/ntl-web-browser.c: (main):
* components/loser/content/nautilus-content-loser.c:
(ensure_fail_env):
* components/loser/sidebar/nautilus-sidebar-loser.c:
(ensure_fail_env):
* components/notes/nautilus-notes.c: (main):
* libnautilus-extensions/nautilus-view-identifier.c:
(get_lang_list):
* src/nautilus-application.c: (nautilus_app_startup):
* src/nautilus-main.c: (main):
Changed from getenv to g_getenv, even though it makes no
difference right now, because it's "the right thing to do (tm)".
* components/services/time/nautilus-view/trilobite-eazel-time-view.h:
Fixed include (the build was broken for me or anyone who doesn't
have old .h files sitting around in their install directory).
* libnautilus-extensions/nautilus-directory.c:
(construct_alternate_metafile_uri):
Use nautilus_get_user_directory instead of hard-coding the name
of the user directory.
* libnautilus-extensions/nautilus-file-utilities.h:
* libnautilus-extensions/nautilus-file-utilities.c:
(nautilus_get_user_directory), (nautilus_get_user_main_directory):
Use #defines instead of global constants since these are things
that do not change and this is not C++ :-) Added "get_" to the
names of these functions so they would be verbs instead of nouns.
(nautilus_get_desktop_directory): Added this new function for use
by the desktop code.
* libnautilus-extensions/nautilus-global-preferences.c:
(global_preferences_create_dialog),
(nautilus_global_preferences_get_enabled_sidebar_panel_view_identifiers),
(nautilus_global_preferences_get_disabled_sidebar_panel_view_identifiers),
(global_preferences_register_sidebar_panels_preferences_for_ui):
* libnautilus-extensions/nautilus-view-identifier.h:
* libnautilus-extensions/nautilus-view-identifier.c:
(nautilus_view_identifier_list_free):
* src/nautilus-applicable-views.c: (nautilus_navigation_info_free):
Changed nautilus_view_identifier_free_list to *_list_free to match
other calls with similar names.
* libnautilus-extensions/nautilus-global-preferences.c:
(user_level_changed_callback):
* libnautilus-extensions/nautilus-icon-factory.c:
(get_themed_icon_file_path):
* src/file-manager/fm-properties-window.c: (get_property_names):
* src/nautilus-bookmark-list.c:
(nautilus_bookmark_list_get_file_path):
* src/nautilus-property-browser.c:
(nautilus_property_browser_drag_data_get), (make_drag_image),
(remove_color), (remove_background), (remove_emblem),
(get_xml_path), (add_background_to_browser), (add_color_to_file),
(emblem_dialog_clicked), (make_properties_from_directory):
Change to use directory calls by new "get_" names.
* src/Makefile.am: Removed nautilus.h since it is long gone,
and fixed spelling of nautlus-window-state.h.
* src/file-manager/.cvsignore: Stop ignoring things that we
no longer generated.
* src/file-manager/desktop-item.c: [removed]
* src/file-manager/desktop-item.h: [removed]
* src/file-manager/desktop-layout.c: [removed]
* src/file-manager/desktop-layout.h: [removed]
* src/file-manager/desktop-window.c: [removed]
* src/file-manager/desktop-window.h: [removed]
The rest of the code has been harvested from the desktop
implementation. As I said before we can always recover it if we
decide we want to reuse it.
* src/file-manager/fm-main.c: [removed]
This was no longer used and was getting out of date. The file manager
is now compiled in rather than being a separate process.
* src/nautilus-desktop-window.c:
(nautilus_desktop_window_initialize_class),
(nautilus_desktop_window_initialize),
(nautilus_desktop_window_new), (realize):
Another cut at the desktop code. Still not working too well,
but way further along.
* src/nautilus-sidebar.h:
* src/nautilus-sidebar.c:
* src/nautilus-view-frame.c:
(nautilus_view_frame_handle_client_destroy_2):
* src/nautilus-window-manage-views.c:
* src/nautilus-window.h:
* src/nautilus-window.c:
* src/nautilus-window-private.h:
Changed the names to use Sidebar instead of IndexPanel.
Also changed to say sidebar panel instead of meta view in many
places.
Diffstat (limited to 'src/nautilus-sidebar.h')
-rw-r--r-- | src/nautilus-sidebar.h | 68 |
1 files changed, 31 insertions, 37 deletions
diff --git a/src/nautilus-sidebar.h b/src/nautilus-sidebar.h index 7f62ba64a..20ecd666b 100644 --- a/src/nautilus-sidebar.h +++ b/src/nautilus-sidebar.h @@ -29,47 +29,41 @@ #include <gtk/gtkeventbox.h> #include "nautilus-view-frame.h" -typedef struct NautilusIndexPanel NautilusIndexPanel; -typedef struct NautilusIndexPanelClass NautilusIndexPanelClass; +#define NAUTILUS_TYPE_SIDEBAR \ + (nautilus_sidebar_get_type ()) +#define NAUTILUS_SIDEBAR(obj) \ + (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_SIDEBAR, NautilusSidebar)) +#define NAUTILUS_SIDEBAR_CLASS(klass) \ + (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_SIDEBAR, NautilusSidebarClass)) +#define NAUTILUS_IS_SIDEBAR(obj) \ + (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_SIDEBAR)) +#define NAUTILUS_IS_SIDEBAR_CLASS(klass) \ + (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_SIDEBAR)) -#define NAUTILUS_TYPE_INDEX_PANEL \ - (nautilus_index_panel_get_type ()) -#define NAUTILUS_INDEX_PANEL(obj) \ - (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_INDEX_PANEL, NautilusIndexPanel)) -#define NAUTILUS_INDEX_PANEL_CLASS(klass) \ - (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_INDEX_PANEL, NautilusIndexPanelClass)) -#define NAUTILUS_IS_INDEX_PANEL(obj) \ - (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_INDEX_PANEL)) -#define NAUTILUS_IS_INDEX_PANEL_CLASS(klass) \ - (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_INDEX_PANEL)) +typedef struct NautilusSidebarDetails NautilusSidebarDetails; -typedef struct NautilusIndexPanelDetails NautilusIndexPanelDetails; +typedef struct { + GtkEventBox parent_slot; + NautilusSidebarDetails *details; +} NautilusSidebar; -struct NautilusIndexPanel -{ - GtkEventBox event_box; - NautilusIndexPanelDetails *details; -}; - -struct NautilusIndexPanelClass -{ - GtkEventBoxClass parent_class; +typedef struct { + GtkEventBoxClass parent_slot; - void (*location_changed) (NautilusIndexPanel *index_panel, - const char *location); - -}; + void (*location_changed) (NautilusSidebar *sidebar, + const char *location); +} NautilusSidebarClass; -GtkType nautilus_index_panel_get_type (void); -NautilusIndexPanel *nautilus_index_panel_new (void); -void nautilus_index_panel_add_meta_view (NautilusIndexPanel *panel, - NautilusViewFrame *meta_view); -void nautilus_index_panel_remove_meta_view (NautilusIndexPanel *panel, - NautilusViewFrame *meta_view); -void nautilus_index_panel_set_uri (NautilusIndexPanel *panel, - const char *new_uri, - const char *initial_title); -void nautilus_index_panel_set_title (NautilusIndexPanel *panel, - const char *new_title); +GtkType nautilus_sidebar_get_type (void); +NautilusSidebar *nautilus_sidebar_new (void); +void nautilus_sidebar_add_panel (NautilusSidebar *sidebar, + NautilusViewFrame *panel); +void nautilus_sidebar_remove_panel (NautilusSidebar *sidebar, + NautilusViewFrame *panel); +void nautilus_sidebar_set_uri (NautilusSidebar *sidebar, + const char *new_uri, + const char *initial_title); +void nautilus_sidebar_set_title (NautilusSidebar *sidebar, + const char *new_title); #endif /* NAUTILUS_SIDEBAR_H */ |