window: remove nautilus-window-types.h

Cleanup and rearrange typedefs to avoid the need for a separate types
header.

1 files changed, 22 insertions, 20 deletions

diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index 6bcf477e8..3dc343f6c 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -34,8 +34,27 @@
 #include <libnautilus-private/nautilus-bookmark.h>
 #include <libnautilus-private/nautilus-search-directory.h>
 
+typedef struct NautilusWindow NautilusWindow;
+typedef struct NautilusWindowClass NautilusWindowClass;
+typedef struct NautilusWindowDetails NautilusWindowDetails;
+
+typedef enum {
+        NAUTILUS_WINDOW_OPEN_FLAG_CLOSE_BEHIND = 1 << 0,
+        NAUTILUS_WINDOW_OPEN_FLAG_NEW_WINDOW = 1 << 1,
+        NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB = 1 << 2
+} NautilusWindowOpenFlags;
+
+typedef enum {
+	NAUTILUS_WINDOW_OPEN_SLOT_NONE = 0,
+	NAUTILUS_WINDOW_OPEN_SLOT_APPEND = 1
+}  NautilusWindowOpenSlotFlags;
+
+typedef gboolean (* NautilusWindowGoToCallback) (NautilusWindow *window,
+                                                 GError *error,
+                                                 gpointer user_data);
+
 #include "nautilus-view.h"
-#include "nautilus-window-types.h"
+#include "nautilus-window-slot.h"
 
 #define NAUTILUS_TYPE_WINDOW nautilus_window_get_type()
 #define NAUTILUS_WINDOW(obj) \
@@ -49,34 +68,17 @@
 #define NAUTILUS_WINDOW_GET_CLASS(obj) \
   (G_TYPE_INSTANCE_GET_CLASS ((obj), NAUTILUS_TYPE_WINDOW, NautilusWindowClass))
 
-typedef enum {
-        NAUTILUS_WINDOW_NOT_SHOWN,
-        NAUTILUS_WINDOW_POSITION_SET,
-        NAUTILUS_WINDOW_SHOULD_SHOW
-} NautilusWindowShowState;
-
-typedef enum {
-	NAUTILUS_WINDOW_OPEN_SLOT_NONE = 0,
-	NAUTILUS_WINDOW_OPEN_SLOT_APPEND = 1
-}  NautilusWindowOpenSlotFlags;
-
 #define NAUTILUS_WINDOW_SIDEBAR_PLACES "places"
 #define NAUTILUS_WINDOW_SIDEBAR_TREE "tree"
 
-typedef struct NautilusWindowDetails NautilusWindowDetails;
-
-typedef struct {
+struct NautilusWindowClass {
         GtkApplicationWindowClass parent_spot;
 
 	/* Function pointers for overriding, without corresponding signals */
-
         void   (* sync_title) (NautilusWindow *window,
 			       NautilusWindowSlot *slot);
-        NautilusIconInfo * (* get_icon) (NautilusWindow *window,
-                                         NautilusWindowSlot *slot);
-
         void   (* close) (NautilusWindow *window);
-} NautilusWindowClass;
+};
 
 struct NautilusWindow {
         GtkApplicationWindow parent_object;