From 912663f58e12f030601f257dae8e747bf72c389f Mon Sep 17 00:00:00 2001 From: Christopher Davis Date: Fri, 25 Dec 2020 21:45:31 -0800 Subject: 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(-) delete mode 100644 src/nautilus-adaptive-mode.h diff --git a/src/nautilus-adaptive-mode.h b/src/nautilus-adaptive-mode.h deleted file mode 100644 index 1af632ed7..000000000 --- a/src/nautilus-adaptive-mode.h +++ /dev/null @@ -1,34 +0,0 @@ -/* nautilus-adaptive-mode.h - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * SPDX-License-Identifier: GPL-3.0-or-later - * - * Adapted from https://gitlab.gnome.org/GNOME/epiphany/-/blob/master/src/ephy-adaptive-mode.h - * (C) 2018 Purism SPC, Adrien Plazas - */ - -#pragma once - -#include - -G_BEGIN_DECLS - -typedef enum -{ - NAUTILUS_ADAPTIVE_MODE_NARROW, - NAUTILUS_ADAPTIVE_MODE_NORMAL, -} NautilusAdaptiveMode; - -G_END_DECLS 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 #include -#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" -- cgit v1.2.1