[tracker] Delete tracker-preferences
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker] Delete tracker-preferences
- Date: Mon, 3 Jul 2017 13:22:58 +0000 (UTC)
commit d4a8d6e45e991758440276b4ca3ad6e821dfdab2
Author: Carlos Garnacho <carlosg gnome org>
Date: Sun Jul 2 16:42:18 2017 +0200
Delete tracker-preferences
This is a mix of store and miner features which can't be assumed to go
together. It is better to leave configuration UI up to the environment,
in the GNOME case this is gnome-control-center search panel.
For settings that fall in the cracks, or for environments that don't
integrate Tracker search in their configuration UI, there's the rather
capable dconf-editor which will provide all toggles, and will explain
them better than any UI we may have.
In the future the CLI tools might gain some configuration subcommand,
but it will not be a graphical UI.
configure.ac | 41 -
docs/manpages/Makefile.am | 5 -
po/POTFILES.in | 3 -
src/Makefile.am | 4 -
src/meson.build | 3 -
src/tracker-preferences/.gitignore | 2 -
src/tracker-preferences/Makefile.am | 50 -
src/tracker-preferences/config.vapi | 29 -
src/tracker-preferences/meson.build | 37 -
src/tracker-preferences/tracker-config.vapi | 52 -
.../tracker-preferences.appdata.xml | 34 -
.../tracker-preferences.desktop.in.in | 13 -
src/tracker-preferences/tracker-preferences.ui | 1578 --------------------
src/tracker-preferences/tracker-preferences.vala | 997 -------------
.../tracker-status-icon-config.vapi | 29 -
15 files changed, 0 insertions(+), 2877 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7d05d14..d50b2ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -415,16 +415,6 @@ PKG_CHECK_MODULES(TRACKER_NEEDLE, [$TRACKER_NEEDLE_REQUIRED],
[have_tracker_needle=yes],
[have_tracker_needle=no])
-# Check requirements for tracker-preferences
-TRACKER_PREFERENCES_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
- gio-unix-2.0 >= $GLIB_REQUIRED
- gmodule-2.0 >= $GLIB_REQUIRED
- gtk+-3.0 >= $GTK_REQUIRED"
-
-PKG_CHECK_MODULES(TRACKER_PREFERENCES, [$TRACKER_PREFERENCES_REQUIRED],
- [have_tracker_preferences=yes],
- [have_tracker_preferences=no])
-
# Check we have Vala valac command we need
VALA_MIN_VERSION=0.18.0
AM_PROG_VALAC([$VALA_MIN_VERSION])
@@ -518,7 +508,6 @@ if test "x$enable_minimal" = "xyes"; then
enable_miner_apps=no
enable_miner_rss=no
enable_tracker_needle=no
- enable_tracker_preferences=no
fi
####################################################################
@@ -1271,34 +1260,6 @@ fi
AM_CONDITIONAL(HAVE_TRACKER_NEEDLE, test "$have_tracker_needle" = "yes")
##################################################################
-# Check for tracker-preferences
-##################################################################
-
-AC_ARG_ENABLE([tracker-preferences],
- AS_HELP_STRING([--enable-tracker-preferences],
- [enable GTK+ UI to configure Tracker [[default=auto]]]),
- [enable_tracker_preferences=$enableval],
- [enable_tracker_preferences=auto])
-
-# If we don't have miner-fs enabled, the preferences are pointless
-# So we override in this case.
-if test "x$enable_tracker_miner_fs" = "xyes" ; then
- enable_tracker_miner_fs="no"
-fi
-
-if test "x$enable_tracker_preferences" = "xyes" ; then
- if test "x$have_tracker_preferences" != "xyes"; then
- AC_MSG_ERROR([Could not find tracker-preferences dependencies ($TRACKER_PREFERENCES_REQUIRED).])
- fi
-else
- if test "x$enable_tracker_preferences" = "xno"; then
- have_tracker_preferences="no (disabled)"
- fi
-fi
-
-AM_CONDITIONAL(HAVE_TRACKER_PREFERENCES, test "$have_tracker_preferences" = "yes")
-
-##################################################################
# Check for tracker-resdump
##################################################################
@@ -2263,7 +2224,6 @@ AC_CONFIG_FILES([
src/tracker-store/Makefile
src/tracker/Makefile
src/tracker-extract/Makefile
- src/tracker-preferences/Makefile
src/tracker-needle/Makefile
src/tracker-needle/icons/Makefile
src/tracker-needle/icons/16x16/Makefile
@@ -2434,7 +2394,6 @@ fi
echo "
Applications:
- Build tracker-preferences: $have_tracker_preferences
Build tracker-needle: $have_tracker_needle
Frameworks / Options:
diff --git a/docs/manpages/Makefile.am b/docs/manpages/Makefile.am
index b47c965..e261489 100644
--- a/docs/manpages/Makefile.am
+++ b/docs/manpages/Makefile.am
@@ -1,4 +1,3 @@
-tp = tracker-preferences.1
tn = tracker-needle.1
tmrss = tracker-miner-rss.1
@@ -20,10 +19,6 @@ common = \
# Require only common and enabled manpages
man_MANS = $(common)
-if HAVE_TRACKER_PREFERENCES
-man_MANS += $(tp)
-endif
-
if HAVE_TRACKER_NEEDLE
man_MANS += $(tn)
endif
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a06cd5c..042a150 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39,9 +39,6 @@ src/tracker-needle/tracker-stats.vala
src/tracker-needle/tracker-tags-view.vala
src/tracker-needle/tracker-utils.vala
src/tracker-needle/tracker-view.vala
-src/tracker-preferences/tracker-preferences.desktop.in.in
-[type: gettext/glade]src/tracker-preferences/tracker-preferences.ui
-src/tracker-preferences/tracker-preferences.vala
src/tracker-store/tracker-main.vala
src/tracker-store/tracker-store.desktop.in.in
src/tracker-store/org.freedesktop.Tracker.Store.gschema.xml.in
diff --git a/src/Makefile.am b/src/Makefile.am
index 688d56e..131f1dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,10 +28,6 @@ if HAVE_TRACKER_WRITEBACK
SUBDIRS += tracker-writeback
endif
-if HAVE_TRACKER_PREFERENCES
-SUBDIRS += tracker-preferences
-endif
-
if HAVE_TRACKER_NEEDLE
SUBDIRS += tracker-needle
endif
diff --git a/src/meson.build b/src/meson.build
index 1192caf..1ea9619 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -44,7 +44,4 @@ subdir('tracker-store')
# Example search application
subdir('tracker-needle')
-# Example configuration application
-subdir('tracker-preferences')
-
meson.add_install_script('create-miner-symlinks.sh', dbus_services_dir, tracker_miner_services_dir)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]