[nautilus] general: remove empty view
- From: Ernestas Kulik <ernestask src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] general: remove empty view
- Date: Mon, 27 Feb 2017 14:48:11 +0000 (UTC)
commit ec92b8ab602e910e906014cdaca88e92e4ac84e7
Author: Ernestas Kulik <ernestask src gnome org>
Date: Mon Feb 27 15:27:42 2017 +0200
general: remove empty view
Since testing is planned to be done with actual views and no one has
built Nautilus with the empty view enabled recently, it is safe to say
that it should go. This commit removes the empty view.
https://bugzilla.gnome.org/show_bug.cgi?id=779255
config.h.meson | 1 -
configure.ac | 9 --
meson.build | 4 -
meson_options.txt | 3 -
src/Makefile.am | 8 --
src/nautilus-empty-view.c | 303 ---------------------------------------------
src/nautilus-empty-view.h | 33 -----
src/nautilus-files-view.c | 12 --
8 files changed, 0 insertions(+), 373 deletions(-)
---
diff --git a/config.h.meson b/config.h.meson
index 9bedac6..6391b75 100644
--- a/config.h.meson
+++ b/config.h.meson
@@ -2,7 +2,6 @@
#mesondefine PACKAGE_VERSION
#mesondefine GETTEXT_PACKAGE
#mesondefine HAVE_SELINUX
-#mesondefine ENABLE_EMPTY_VIEW
#mesondefine ENABLE_DESKTOP
#mesondefine ENABLE_PACKAGEKIT
#mesondefine ENABLE_TRACKER
diff --git a/configure.ac b/configure.ac
index 4db4f42..739b2b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,15 +153,6 @@ AS_IF([test "$enable_selinux" != "no"],
])
])
-
-AC_ARG_ENABLE(empty_view,
- AS_HELP_STRING([--enable-empty-view],[Enable empty view]),
- [ENABLE_EMPTY_VIEW=1
- AC_DEFINE(ENABLE_EMPTY_VIEW, 1, [define to enable the empty view that is used for performance
measurement])])
-
-AC_SUBST(ENABLE_EMPTY_VIEW)
-AM_CONDITIONAL(ENABLE_EMPTY_VIEW, test "x$ENABLE_EMPTY_VIEW" = "x1")
-
dnl ==========================================================================
dnl *********************************
diff --git a/meson.build b/meson.build
index d94d95b..e990613 100644
--- a/meson.build
+++ b/meson.build
@@ -79,10 +79,6 @@ if get_option ('enable-selinux')
conf.set10 ('HAVE_SELINUX', true)
endif
-if get_option ('enable-empty-view')
- conf.set10 ('ENABLE_EMPTY_VIEW', true)
-endif
-
if get_option ('enable-desktop')
conf.set10 ('ENABLE_DESKTOP', true)
endif
diff --git a/meson_options.txt b/meson_options.txt
index b523b89..9025527 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -15,9 +15,6 @@ option ('enable-xmp',
option ('enable-selinux',
type: 'boolean',
value: true)
-option ('enable-empty-view',
- type: 'boolean',
- value: false)
option ('enable-desktop',
type: 'boolean',
value: true)
diff --git a/src/Makefile.am b/src/Makefile.am
index 8ec8031..ad3ef5c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -369,14 +369,6 @@ nautilus_SOURCES = \
nautilus-main.c \
$(NULL)
-EMPTY_VIEW_SOURCES = \
- nautilus-empty-view.c \
- nautilus-empty-view.h
-
-if ENABLE_EMPTY_VIEW
-nautilus_SOURCES += $(EMPTY_VIEW_SOURCES)
-endif
-
nautilus_autorun_software_SOURCES= \
nautilus-autorun-software.c \
$(NULL)
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 0ab0358..bf4ec44 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -45,10 +45,6 @@
#include "nautilus-toolbar.h"
#include "nautilus-view.h"
-#if ENABLE_EMPTY_VIEW
-#include "nautilus-empty-view.h"
-#endif
-
#ifdef HAVE_X11_XF86KEYSYM_H
#include <X11/XF86keysym.h>
#endif
@@ -9714,14 +9710,6 @@ nautilus_files_view_new (guint id,
view = nautilus_list_view_new (slot);
}
break;
-
-#if ENABLE_EMPTY_VIEW
- case NAUTILUS_VIEW_EMPTY_ID:
- {
- view = nautilus_empty_view_new (slot);
- }
- break;
-#endif
}
if (view == NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]