diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 4 | ||||
| -rw-r--r-- | data/epiphany.convert | 1 | ||||
| -rw-r--r-- | data/epiphany.m4 | 75 | ||||
| -rw-r--r-- | data/epiphany.pc.in | 1 | ||||
| -rw-r--r-- | data/org.gnome.epiphany.gschema.xml | 5 |
5 files changed, 0 insertions, 86 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 7b7b89c8c..1d0ea3851 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -25,9 +25,6 @@ aboutdialog_DATA = about.ini mimepermissiondir = $(pkgdatadir) mimepermission_DATA = mime-types-permissions.xml -m4datadir = $(datadir)/aclocal -m4data_DATA = epiphany.m4 - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = epiphany-$(EPIPHANY_API_VERSION).pc @@ -70,7 +67,6 @@ EXTRA_DIST = \ $(pkgconfig_DATA) \ $(xsl_DATA) \ $(service_DATA) \ - $(m4data_DATA) \ $(default_bookmarks_in_files) \ $(gsettings_SCHEMAS) \ $(convert_DATA) \ diff --git a/data/epiphany.convert b/data/epiphany.convert index 5ec75185a..66b37aff8 100644 --- a/data/epiphany.convert +++ b/data/epiphany.convert @@ -9,7 +9,6 @@ keyword-search-url = /apps/epiphany/general/url_search managed-network = /apps/epiphany/general/managed_network enable-smooth-scrolling = /apps/epiphany/web/smooth_scroll enable-caret-browsing = /apps/epiphany/web/browse_with_caret -enabled-extensions = /apps/epiphany/general/active_extensions [org.gnome.Epiphany.ui] always-show-tabs-bar = /apps/epiphany/general/always_show_tabs_bar diff --git a/data/epiphany.m4 b/data/epiphany.m4 deleted file mode 100644 index d912a0e62..000000000 --- a/data/epiphany.m4 +++ /dev/null @@ -1,75 +0,0 @@ -## epiphany.m4 - Macros for building epiphany extensions. -*-Shell-script-*- -## Copyright © Crispin Flowerday <crispin@gnome.org> -## -## 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 2 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, write to the Free Software -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -## -## As a special exception to the GNU General Public License, if you -## distribute this file as part of a program that contains a -## configuration script generated by Autoconf, you may include it under -## the same distribution terms that you use for the rest of that program. - - -# Usage: -# EPIPHANY_EXTENSION_INIT(ephy-api-version, [minimum-ephy-version]) -# -# Side effects: -# EPIPHANY_EXTENSIONS_DIR is set to the directory to install extensions in -# EPIPHANY_EXTENSION_RULE can be used to translate .ephy-extension files -AC_DEFUN([EPIPHANY_EXTENSION_INIT], -[ -dnl Check we have an api-version -ifelse([$1], [], [AC_MSG_ERROR([Required Epiphany API version not supplied])], []) - -_epiphany_api_version=$1 - -AC_MSG_CHECKING([whether epiphany-$_epiphany_api_version is available]) -PKG_CHECK_EXISTS([epiphany-$_epiphany_api_version], [result=yes],[result=no]) -AC_MSG_RESULT([$result]) - -if test $result = "no" ; then - AC_MSG_ERROR([Epiphany API version $_epiphany_api_version is required - -This API version is used in the $_epiphany_api_version stable series, and -the preceeding development series. Please ensure you have the appropriate -Epiphany version installed.]) -fi - -dnl Check the minimum version -ifelse([$2], [], [], -[ - AC_MSG_CHECKING([whether minimum epiphany version $2 is available]) - PKG_CHECK_EXISTS([epiphany-$_epiphany_api_version >= $2], [result=yes], [result=no]) - AC_MSG_RESULT([$result]) - - if test $result = "no" ; then - AC_MSG_ERROR([The minimum epiphany version supported by this application is $2. - -Please upgrade to at least $2. If you have compiled a later version it is -possible pkg-config isn't finding it, in which case set the PKG_CONFIG_PATH -environment variable.]) - fi -]) - -dnl set the EPIPHANY_EXTENSIONS_DIR variable -EPIPHANY_EXTENSIONS_DIR="`$PKG_CONFIG --variable=extensionsdir epiphany-$_epiphany_api_version`" -AC_SUBST([EPIPHANY_EXTENSIONS_DIR]) - -dnl Add a rule that auto-translates the .ephy-extension files -dnl (like the INTLTOOL_XML_RULE does for xml files) -EPIPHANY_EXTENSION_RULE='%.ephy-extension: %.ephy-extension.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - -AC_SUBST(EPIPHANY_EXTENSION_RULE) - -]) diff --git a/data/epiphany.pc.in b/data/epiphany.pc.in index 5a27ef0a4..5dedeabe2 100644 --- a/data/epiphany.pc.in +++ b/data/epiphany.pc.in @@ -2,7 +2,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@/epiphany/@EPIPHANY_MAJOR@ -extensionsdir=@libdir@/@PACKAGE@/@EPIPHANY_API_VERSION@/extensions loaderdir=@libdir@/@PACKAGE@/@EPIPHANY_MAJOR@/loaders datarootdir=@datarootdir@ datadir=@datadir@ diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml index f97681e40..c94df5fd1 100644 --- a/data/org.gnome.epiphany.gschema.xml +++ b/data/org.gnome.epiphany.gschema.xml @@ -50,11 +50,6 @@ <default>false</default> <summary>Enable smooth scrolling</summary> </key> - <key type="as" name="enabled-extensions"> - <default>['extensions-manager-ui' ]</default> - <summary>Active extensions</summary> - <description>Lists the active extensions.</description> - </key> <key type="b" name="internal-view-source"> <default>true</default> <summary>Don't use an external application to view page source.</summary> |