Exorcise gecko configure & build stuff

svn path=/trunk/; revision=8183

3 files changed, 144 insertions, 196 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 19dffcd9d..161e91dfb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -181,15 +181,6 @@ libpyphany_la_LIBADD = \
 endif
 
 
-# we do this to force c++ linkage if we are using the glue and 
-# are running gecko 1.9 because standalone glue embedders that use
-# gtk_moz_embed_* need to #include <gtkmozembed_glue.cpp>
-if HAVE_GECKO_1_9
-if HAVE_GECKO_XPCOM_GLUE
-nodist_EXTRA_epiphany_SOURCES = dummy.cpp
-endif
-endif
-
 epiphany_SOURCES = ephy-main.c
 
 epiphany_CPPFLAGS = \
@@ -213,57 +204,14 @@ epiphany_LDFLAGS = -dlopen self
 epiphany_LDADD = \
 	libephymain.la \
 	$(top_builddir)/src/bookmarks/libephybookmarks.la \
-	$(top_builddir)/embed/libephyembedfactory.la
-
-if WITH_XULRUNNER_ENGINE
-epiphany_LDADD += \
-	$(top_builddir)/embed/xulrunner/utils/libephyxulrunnerutils.la	\
-	$(top_builddir)/embed/xulrunner/src/libgnomegeckoembed.la	\
-	$(top_builddir)/embed/xulrunner/embed/libephyxulrunnerembed.la	\
-	$(top_builddir)/embed/xulrunner/components/libephycomponents.la
-endif
-
-if WITH_GECKO_ENGINE
-epiphany_LDADD += \
-	$(GECKO_LIBS) \
-	$(top_builddir)/embed/mozilla/libephymozillaembed.la
-endif
-
-if WITH_WEBKIT_ENGINE
-epiphany_LDADD += \
-	$(top_builddir)/embed/webkit/libephywebkitembed.la
-endif
-
-epiphany_LDADD += \
+	$(top_builddir)/embed/libephyembedfactory.la \
+	$(top_builddir)/embed/webkit/libephywebkitembed.la \
 	$(top_builddir)/embed/libephyembed.la \
 	$(top_builddir)/lib/widgets/libephywidgets.la \
 	$(top_builddir)/lib/libephymisc.la \
-	$(top_builddir)/lib/egg/libegg.la
-
-if WITH_XULRUNNER_ENGINE
-epiphany_LDFLAGS += -R$(LIBXUL_LIBDIR)
-epiphany_LDADD += $(LIBXUL_LIBS) -lxpcomglue
-endif
-
-if WITH_GECKO_ENGINE
-if !HAVE_GECKO_XPCOM_GLUE
-epiphany_LDFLAGS += -R$(GECKO_HOME)
-endif
-
-epiphany_LDADD += \
-	$(GECKO_LIBS) \
-	$(GECKO_EXTRA_LIBS) \
-	$(GECKO_GLUE_LIBS)
-endif
-
-if WITH_WEBKIT_ENGINE
-epiphany_LDADD += \
-	$(WEBKIT_LIBS)
-endif
-
-epiphany_LDADD += \
-	$(GECKO_LIBS) \
+	$(top_builddir)/lib/egg/libegg.la \
 	$(DEPENDENCIES_LIBS) \
+	$(WEBKIT_LIBS) \
 	$(DBUS_LIBS) \
 	$(LIBINTL)
 
diff --git a/src/epiphany.defs b/src/epiphany.defs
index d7a7747e1..f3361ce1e 100644
--- a/src/epiphany.defs
+++ b/src/epiphany.defs
@@ -152,11 +152,11 @@
   (gtype-id "EPHY_TYPE_PASSWORD_MANAGER")
 )
 
-(define-interface PermissionManager
-  (in-module "Ephy")
-  (c-name "EphyPermissionManager")
-  (gtype-id "EPHY_TYPE_PERMISSION_MANAGER")
-)
+;; (define-interface PermissionManager
+;;   (in-module "Ephy")
+;;   (c-name "EphyPermissionManager")
+;;   (gtype-id "EPHY_TYPE_PERMISSION_MANAGER")
+;; )
 
 (define-object SearchEntry
   (in-module "Ephy")
@@ -329,16 +329,16 @@
   )
 )
 
-(define-enum Permission
-  (in-module "Ephy")
-  (c-name "EphyPermission")
-  (gtype-id "EPHY_TYPE_PERMISSION")
-  (values
-    '("allowed" "EPHY_PERMISSION_ALLOWED")
-    '("denied" "EPHY_PERMISSION_DENIED")
-    '("default" "EPHY_PERMISSION_DEFAULT")
-  )
-)
+;; (define-enum Permission
+;;   (in-module "Ephy")
+;;   (c-name "EphyPermission")
+;;   (gtype-id "EPHY_TYPE_PERMISSION")
+;;   (values
+;;     '("allowed" "EPHY_PERMISSION_ALLOWED")
+;;     '("denied" "EPHY_PERMISSION_DENIED")
+;;     '("default" "EPHY_PERMISSION_DEFAULT")
+;;   )
+;; )
 
 (define-flags TbModelFlags
   (in-module "Egg")
@@ -965,10 +965,10 @@
   (return-type "GType")
 )
 
-(define-function ephy_permission_get_type
-  (c-name "ephy_permission_get_type")
-  (return-type "GType")
-)
+;; (define-function ephy_permission_get_type
+;;   (c-name "ephy_permission_get_type")
+;;   (return-type "GType")
+;; )
 
 
 
@@ -1563,90 +1563,90 @@
 
 ;; From ../../embed/ephy-permission-manager.h
 
-(define-function ephy_permission_get_type
-  (c-name "ephy_permission_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_permission_info_get_type
-  (c-name "ephy_permission_info_get_type")
-  (return-type "GType")
-)
-
-(define-function ephy_permission_info_new
-  (c-name "ephy_permission_info_new")
-  (is-constructor-of "EphyPermissionInfo")
-  (return-type "EphyPermissionInfo*")
-  (parameters
-    '("const-char*" "host")
-    '("const-char*" "type")
-    '("EphyPermission" "permission")
-  )
-)
-
-(define-method copy
-  (of-object "EphyPermissionInfo")
-  (c-name "ephy_permission_info_copy")
-  (return-type "EphyPermissionInfo*")
-)
-
-(define-method free
-  (of-object "EphyPermissionInfo")
-  (c-name "ephy_permission_info_free")
-  (return-type "none")
-)
-
-(define-function ephy_permission_manager_get_type
-  (c-name "ephy_permission_manager_get_type")
-  (return-type "GType")
-)
-
-(define-method add_permission
-  (of-object "EphyPermissionManager")
-  (c-name "ephy_permission_manager_add_permission")
-  (return-type "none")
-  (parameters
-    '("const-char*" "host")
-    '("const-char*" "type")
-    '("EphyPermission" "permission")
-  )
-)
-
-(define-method remove_permission
-  (of-object "EphyPermissionManager")
-  (c-name "ephy_permission_manager_remove_permission")
-  (return-type "none")
-  (parameters
-    '("const-char*" "host")
-    '("const-char*" "type")
-  )
-)
-
-(define-method clear_permissions
-  (of-object "EphyPermissionManager")
-  (c-name "ephy_permission_manager_clear_permissions")
-  (return-type "none")
-)
-
-(define-method test_permission
-  (of-object "EphyPermissionManager")
-  (c-name "ephy_permission_manager_test_permission")
-  (return-type "EphyPermission")
-  (parameters
-    '("const-char*" "host")
-    '("const-char*" "type")
-  )
-)
-
-(define-method list_permissions
-  (of-object "EphyPermissionManager")
-  (c-name "ephy_permission_manager_list_permissions")
-  (return-type "GList*")
-  (parameters
-    '("const-char*" "type")
-  )
-)
-
+;; (define-function ephy_permission_get_type
+;;   (c-name "ephy_permission_get_type")
+;;   (return-type "GType")
+;; )
+;; 
+;; (define-function ephy_permission_info_get_type
+;;   (c-name "ephy_permission_info_get_type")
+;;   (return-type "GType")
+;; )
+;; 
+;; (define-function ephy_permission_info_new
+;;   (c-name "ephy_permission_info_new")
+;;   (is-constructor-of "EphyPermissionInfo")
+;;   (return-type "EphyPermissionInfo*")
+;;   (parameters
+;;     '("const-char*" "host")
+;;     '("const-char*" "type")
+;;     '("EphyPermission" "permission")
+;;   )
+;; )
+;; 
+;; (define-method copy
+;;   (of-object "EphyPermissionInfo")
+;;   (c-name "ephy_permission_info_copy")
+;;   (return-type "EphyPermissionInfo*")
+;; )
+;; 
+;; (define-method free
+;;   (of-object "EphyPermissionInfo")
+;;   (c-name "ephy_permission_info_free")
+;;   (return-type "none")
+;; )
+;; 
+;; (define-function ephy_permission_manager_get_type
+;;   (c-name "ephy_permission_manager_get_type")
+;;   (return-type "GType")
+;; )
+;; 
+;; (define-method add_permission
+;;   (of-object "EphyPermissionManager")
+;;   (c-name "ephy_permission_manager_add_permission")
+;;   (return-type "none")
+;;   (parameters
+;;     '("const-char*" "host")
+;;     '("const-char*" "type")
+;;     '("EphyPermission" "permission")
+;;   )
+;; )
+;; 
+;; (define-method remove_permission
+;;   (of-object "EphyPermissionManager")
+;;   (c-name "ephy_permission_manager_remove_permission")
+;;   (return-type "none")
+;;   (parameters
+;;     '("const-char*" "host")
+;;     '("const-char*" "type")
+;;   )
+;; )
+;; 
+;; (define-method clear_permissions
+;;   (of-object "EphyPermissionManager")
+;;   (c-name "ephy_permission_manager_clear_permissions")
+;;   (return-type "none")
+;; )
+;; 
+;; (define-method test_permission
+;;   (of-object "EphyPermissionManager")
+;;   (c-name "ephy_permission_manager_test_permission")
+;;   (return-type "EphyPermission")
+;;   (parameters
+;;     '("const-char*" "host")
+;;     '("const-char*" "type")
+;;   )
+;; )
+;; 
+;; (define-method list_permissions
+;;   (of-object "EphyPermissionManager")
+;;   (c-name "ephy_permission_manager_list_permissions")
+;;   (return-type "GList*")
+;;   (parameters
+;;     '("const-char*" "type")
+;;   )
+;; )
+;; 
 
 
 ;; From ../../lib/egg/egg-editable-toolbar.h
@@ -3622,13 +3622,13 @@
   (gtype-id "EPHY_TYPE_NODE")
 )
 
-(define-boxed PermissionInfo
-  (in-module "Ephy")
-  (c-name "EphyPermissionInfo")
-  (gtype-id  "EPHY_TYPE_PERMISSION_INFO")
-  (fields
-    '("char*" "host")
-    '("GQuark" "type")
-    '("EphyPermission" "permission")
-  )
-)
+;; (define-boxed PermissionInfo
+;;   (in-module "Ephy")
+;;   (c-name "EphyPermissionInfo")
+;;   (gtype-id  "EPHY_TYPE_PERMISSION_INFO")
+;;   (fields
+;;     '("char*" "host")
+;;     '("GQuark" "type")
+;;     '("EphyPermission" "permission")
+;;   )
+;; )
diff --git a/src/epiphany.override b/src/epiphany.override
index 44b60d66d..5dd0c26e1 100644
--- a/src/epiphany.override
+++ b/src/epiphany.override
@@ -371,34 +371,34 @@ _wrap_ephy_cookie_manager_list_cookies(PyGObject *self)
     return _helper_wrap_boxed_glist (EPHY_TYPE_COOKIE, list);
 }
 %%
-override ephy_permission_manager_list_permissions kwargs
-static PyObject *
-_wrap_ephy_permission_manager_list_permissions (PyGObject *self,
-                                                PyObject *args, PyObject *kwargs)
-{
-    static char *kwlist[] = {"type", NULL};
-    char *type;
-    GList *list;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, 
-                                     "s:EphyPermissionManager.list_permissions", kwlist, &type))
-        return NULL;
-       
-    list = ephy_permission_manager_list_permissions(EPHY_PERMISSION_MANAGER (self->obj), type);
-
-    return _helper_wrap_boxed_glist (EPHY_TYPE_PERMISSION_INFO, list);
-}
+//override ephy_permission_manager_list_permissions kwargs
+// static PyObject *
+// _wrap_ephy_permission_manager_list_permissions (PyGObject *self,
+//                                                 PyObject *args, PyObject *kwargs)
+// {
+//     static char *kwlist[] = {"type", NULL};
+//     char *type;
+//     GList *list;
+// 
+//     if (!PyArg_ParseTupleAndKeywords(args, kwargs,
+//                                      "s:EphyPermissionManager.list_permissions", kwlist, &type))
+//         return NULL;
+// 
+//     list = ephy_permission_manager_list_permissions(EPHY_PERMISSION_MANAGER (self->obj), type);
+// 
+//     return _helper_wrap_boxed_glist (EPHY_TYPE_PERMISSION_INFO, list);
+// }
 %%
-override-attr EphyPermissionInfo.type
-static PyObject*
-_wrap_ephy_permission_info__get_type (PyObject* self, void* closure)
-{
-    const char* type;
-    
-    type = g_quark_to_string (pyg_boxed_get(self, EphyPermissionInfo)->qtype);
-    
-    return PyString_FromString (type);
-}
+// override-attr EphyPermissionInfo.type
+// static PyObject*
+// _wrap_ephy_permission_info__get_type (PyObject* self, void* closure)
+// {
+//     const char* type;
+// 
+//     type = g_quark_to_string (pyg_boxed_get(self, EphyPermissionInfo)->qtype);
+// 
+//     return PyString_FromString (type);
+// }
 %%
 override ephy_node_get_children noargs
 static PyObject *