diff options
author | Cosimo Cecchi <cosimoc@gnome.org> | 2010-12-21 18:17:52 +0100 |
---|---|---|
committer | Cosimo Cecchi <cosimoc@gnome.org> | 2011-01-11 11:43:18 +0100 |
commit | ad0d377ac236392a9ccaeae789e07e1af4a796e5 (patch) | |
tree | b5441f47c0ef9f5afb34ab753806592c2e74b97b /src/nautilus-application.h | |
parent | 4c031a4794126af08cea1774dd7ec3904d0ad25e (diff) | |
download | nautilus-ad0d377ac236392a9ccaeae789e07e1af4a796e5.tar.gz |
Rework architecture of NautilusWindow/NautilusWindowSlotInfo
In the past, nautilus was designed keeping in mind the concept that it
might not just be a file browser, but a sort of platform to embed
various kind of views in it.
- libnautilus-private: general lowlevel items, such as the icon
container, NautilusFile, I/O and so on
- src: general widgets and UI items
- src/file-manager: file manager views, agnostic of what's in src/,
for the sake of being pluggable enough
This is really not applicable anymore, as nautilus won't go in any
direction other than being a file manager; at the same time, this
complicates code and architecture quite a lot.
In this commit, as a first step towards a more clean codebase, we remove
the NautilusWindowInfo and NautilusWindowSlotInfo interfaces, using
NautilusWindow and NautilusWindowSlot directly.
Note that there should be no actual code changes, only moving of pieces
around.
Diffstat (limited to 'src/nautilus-application.h')
-rw-r--r-- | src/nautilus-application.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/nautilus-application.h b/src/nautilus-application.h index ea6cd60a9..6ee8d89b0 100644 --- a/src/nautilus-application.h +++ b/src/nautilus-application.h @@ -30,6 +30,8 @@ #include <libnautilus-private/nautilus-undo-manager.h> +#include "nautilus-window.h" + #define NAUTILUS_DESKTOP_ICON_VIEW_IID "OAFIID:Nautilus_File_Manager_Desktop_Icon_View" #define NAUTILUS_TYPE_APPLICATION nautilus_application_get_type() @@ -44,11 +46,6 @@ #define NAUTILUS_APPLICATION_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_APPLICATION, NautilusApplicationClass)) -#ifndef NAUTILUS_WINDOW_DEFINED -#define NAUTILUS_WINDOW_DEFINED -typedef struct NautilusWindow NautilusWindow; -#endif - #ifndef NAUTILUS_SPATIAL_WINDOW_DEFINED #define NAUTILUS_SPATIAL_WINDOW_DEFINED typedef struct _NautilusSpatialWindow NautilusSpatialWindow; |