aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-06-05 17:41:42 +0800
committerChristian Persch <chpe@src.gnome.org>2005-06-05 17:41:42 +0800
commitefcd0960fd775cb262f852f79edfcbbd75a33849 (patch)
treea6fb47e7495b94a97043cbf4888f6e5999ec8353 /src
parentcbf7d80c5be648d7d7610c5f63d31e8e84995d5d (diff)
downloadgsoc2013-epiphany-efcd0960fd775cb262f852f79edfcbbd75a33849.tar
gsoc2013-epiphany-efcd0960fd775cb262f852f79edfcbbd75a33849.tar.gz
gsoc2013-epiphany-efcd0960fd775cb262f852f79edfcbbd75a33849.tar.bz2
gsoc2013-epiphany-efcd0960fd775cb262f852f79edfcbbd75a33849.tar.lz
gsoc2013-epiphany-efcd0960fd775cb262f852f79edfcbbd75a33849.tar.xz
gsoc2013-epiphany-efcd0960fd775cb262f852f79edfcbbd75a33849.tar.zst
gsoc2013-epiphany-efcd0960fd775cb262f852f79edfcbbd75a33849.zip
Version 1.7.1.Release171
2005-06-05 Christian Persch <chpe@cvs.gnome.org> Version 1.7.1. * Makefile.am: Add --enable-python to distcheck configure flags. * NEWS: * configure.ac: Updated for version 1.7.1. * embed/mozilla/EphyBrowser.cpp: * embed/mozilla/EventContext.cpp: Fix warnings. * src/ephy-extensions-manager.c: (get_loader_for_type), (load_extension): Fix --disable-python case. * src/Makefile.am: Fix make distcheck.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am1
-rw-r--r--src/ephy-extensions-manager.c8
2 files changed, 6 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index ecad19dbf..86899bcfc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -228,6 +228,7 @@ pydefsdir = $(datadir)/pygtk/2.0/defs
pydefs_DATA = epiphany.defs
EXTRA_DIST = \
+ epiphany.override \
$(pydefs_DATA)
endif
diff --git a/src/ephy-extensions-manager.c b/src/ephy-extensions-manager.c
index f38a6ad43..055178a56 100644
--- a/src/ephy-extensions-manager.c
+++ b/src/ephy-extensions-manager.c
@@ -758,9 +758,9 @@ get_loader_for_type (EphyExtensionsManager *manager,
return g_object_ref (info->loader);
}
-#ifdef ENABLE_PYTHON
if (strcmp (type, "python") == 0)
{
+#ifdef ENABLE_PYTHON
info = g_new (LoaderInfo, 1);
info->type = g_strdup (type);
info->loader = g_object_new (EPHY_TYPE_PYTHON_LOADER, NULL);
@@ -769,8 +769,10 @@ get_loader_for_type (EphyExtensionsManager *manager,
g_list_append (manager->priv->factories, info);
return g_object_ref (info->loader);
- }
+#else
+ return NULL;
#endif
+ }
stype = sanitise_type (type);
name = g_strconcat ("lib", stype, "loader.", G_MODULE_SUFFIX, NULL);
@@ -838,7 +840,7 @@ load_extension (EphyExtensionsManager *manager,
loader = get_loader_for_type (manager, info->loader_type);
if (loader == NULL)
{
- g_warning ("No loader found for extension '%s' of type '%s'\n",
+ g_message ("No loader found for extension '%s' of type '%s'\n",
info->info.identifier, info->loader_type);
return;
}