[epiphany] extensions: remove seed support
- From: Diego Escalante Urrelo <diegoe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [epiphany] extensions: remove seed support
- Date: Tue, 31 Jul 2012 14:47:32 +0000 (UTC)
commit e1944188455f159dfa9c9fcc45b0e3887c88ad53
Author: Diego Escalante Urrelo <diegoe igalia com>
Date: Tue Jul 31 16:09:17 2012 +0200
extensions: remove seed support
https://bugzilla.gnome.org/show_bug.cgi?id=680905
configure.ac | 26 ----
doc/reference/Makefile.am | 5 -
src/Makefile.am | 18 ---
src/ephy-extensions-manager.c | 21 +---
src/ephy-seed-extension.c | 276 -----------------------------------------
src/ephy-seed-extension.h | 61 ---------
src/ephy-seed-loader.c | 107 ----------------
src/ephy-seed-loader.h | 61 ---------
tests/Makefile.am | 7 -
9 files changed, 2 insertions(+), 580 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1606343..58d1fb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,31 +168,6 @@ else
found_introspection=no
fi
-# ****
-# Seed
-# ****
-
-AC_MSG_CHECKING([whether Seed support is requested])
-AC_ARG_ENABLE([seed],
- [AS_HELP_STRING([--enable-seed],[Enable Seed support (default: disabled)])],
- [],[enable_seed=no])
-AC_MSG_RESULT([$enable_seed])
-
-if test "$enable_seed" = "yes" -a "$found_introspection" != "yes"; then
- AC_MSG_ERROR([GObject introspection support must be enabled for Seed])
-fi
-
-if test "$enable_seed" = "yes"; then
- EPIPHANY_FEATURES="$EPIPHANY_FEATURES seed"
-
- SEED_REQUIRED=2.27.91
- PKG_CHECK_MODULES([SEED],[seed >= $SEED_REQUIRED])
-
- AC_DEFINE([ENABLE_SEED],[1],[Define to compile with Seed support])
-fi
-
-AM_CONDITIONAL([ENABLE_SEED],[test "$enable_seed" = "yes"])
-
# ***
# NSS
# ***
@@ -363,7 +338,6 @@ Epiphany was configured with the following options:
Zeroconf bookmarks support : $enable_zeroconf
GObject introspection : $found_introspection
- Seed support : $enable_seed
NSS support : $enable_nss
Build tests : $enable_tests
WebKit2 : $with_webkit2
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 90341fa..605d142 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -121,11 +121,6 @@ GTKDOC_LIBS = \
$(DBUS_LIBS) \
$(LIBINTL)
-if ENABLE_SEED
-GTKDOC_LIBS += \
- $(SEED_LIBS)
-endif
-
# If you need to override some of the declarations, place them in the
# $(DOC_MODULE)-overrides.txt file and uncomment the second line here.
DOC_OVERRIDES =
diff --git a/src/Makefile.am b/src/Makefile.am
index 3750c19..d7725fb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -136,20 +136,6 @@ BUILT_SOURCES = \
$(TYPES_SOURCE) \
$(NULL)
-if ENABLE_SEED
-NOINST_H_FILES += \
- ephy-seed-extension.h \
- ephy-seed-loader.h \
- $(NULL)
-
-libephymain_la_SOURCES += \
- ephy-seed-loader.c \
- ephy-seed-extension.c \
- $(NULL)
-
-libephymain_la_CFLAGS += $(SEED_CFLAGS)
-endif # ENABLE_SEED
-
epiphany_SOURCES = ephy-main.c \
$(EPIPHANY_RESOURCES) \
$(NULL)
@@ -190,10 +176,6 @@ epiphany_LDADD += $(INTROSPECTION_LIBS)
endif
endif
-if ENABLE_SEED
-epiphany_LDADD += $(SEED_LIBS)
-endif # ENABLE_SEED
-
TYPES_SOURCE = \
ephy-type-builtins.c \
ephy-type-builtins.h
diff --git a/src/ephy-extensions-manager.c b/src/ephy-extensions-manager.c
index c048550..71a888f 100644
--- a/src/ephy-extensions-manager.c
+++ b/src/ephy-extensions-manager.c
@@ -38,10 +38,6 @@
#include <gmodule.h>
#include <string.h>
-#ifdef ENABLE_SEED
-#include "ephy-seed-loader.h"
-#endif
-
#define EE_GROUP "Epiphany Extension"
#define DOT_INI ".ephy-extension"
#define RELOAD_DELAY 333 /* ms */
@@ -447,25 +443,12 @@ get_loader_for_type (EphyExtensionsManager *manager,
return g_object_ref (info->loader);
}
- if (strcmp (type, "python") == 0)
+ if (strcmp (type, "python") == 0 ||
+ strcmp (type, "seed") == 0)
{
return NULL;
}
-#ifdef ENABLE_SEED
- if (strcmp (type, "seed") == 0)
- {
- info = g_new (LoaderInfo, 1);
- info->type = g_strdup (type);
- info->loader = g_object_new (EPHY_TYPE_SEED_LOADER, NULL);
-
- manager->priv->factories =
- g_list_append (manager->priv->factories, info);
-
- return g_object_ref (info->loader);
- return NULL;
- }
-#endif
shlib_loader = get_loader_for_type (manager, "shlib");
g_return_val_if_fail (shlib_loader != NULL, NULL);
diff --git a/tests/Makefile.am b/tests/Makefile.am
index abaa936..8a2f106 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -111,13 +111,6 @@ LDADD = \
$(DBUS_LIBS) \
$(DEPENDENCIES_LIBS)
-if ENABLE_SEED
-CFLAGS += \
- $(SEED_CFLAGS)
-LDADD += \
- $(SEED_LIBS)
-endif
-
test_ephy_download_SOURCES = \
ephy-download-test.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]