[nautilus/wip/cdavis/adaptive-flap: 24/24] Move NautilusAdaptiveMode to nautilus-ui-utilities.h




commit 912663f58e12f030601f257dae8e747bf72c389f
Author: Christopher Davis <brainblasted disroot org>
Date:   Fri Dec 25 21:45:31 2020 -0800

    Move NautilusAdaptiveMode to nautilus-ui-utilities.h

 src/nautilus-adaptive-mode.h | 34 ----------------------------------
 src/nautilus-toolbar.h       |  2 +-
 src/nautilus-ui-utilities.h  | 10 ++++++++++
 src/nautilus-window.c        |  1 -
 4 files changed, 11 insertions(+), 36 deletions(-)
---
diff --git a/src/nautilus-toolbar.h b/src/nautilus-toolbar.h
index 8947d2eef..a42e4bced 100644
--- a/src/nautilus-toolbar.h
+++ b/src/nautilus-toolbar.h
@@ -26,7 +26,7 @@
 #include <gtk/gtk.h>
 #include <libhandy-1/handy.h>
 
-#include "nautilus-adaptive-mode.h"
+#include "nautilus-ui-utilities.h"
 #include "nautilus-window-slot.h"
 
 G_BEGIN_DECLS
diff --git a/src/nautilus-ui-utilities.h b/src/nautilus-ui-utilities.h
index 1136e1de6..c2a499433 100644
--- a/src/nautilus-ui-utilities.h
+++ b/src/nautilus-ui-utilities.h
@@ -49,3 +49,13 @@ void        show_unmount_progress_cb                (GMountOperation   *op,
                                                      gpointer           user_data);
 void        show_unmount_progress_aborted_cb        (GMountOperation   *op,
                                                      gpointer           user_data);
+
+G_BEGIN_DECLS
+
+typedef enum
+{
+    NAUTILUS_ADAPTIVE_MODE_NARROW,
+    NAUTILUS_ADAPTIVE_MODE_NORMAL,
+} NautilusAdaptiveMode;
+
+G_END_DECLS
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index d24209136..272e007e6 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -47,7 +47,6 @@
 #define DEBUG_FLAG NAUTILUS_DEBUG_WINDOW
 #include "nautilus-debug.h"
 
-#include "nautilus-adaptive-mode.h"
 #include "nautilus-application.h"
 #include "nautilus-bookmark-list.h"
 #include "nautilus-bottom-toolbar.h"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]