From efcd0960fd775cb262f852f79edfcbbd75a33849 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sun, 5 Jun 2005 09:41:42 +0000 Subject: Version 1.7.1. 2005-06-05 Christian Persch 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. --- src/Makefile.am | 1 + src/ephy-extensions-manager.c | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src') 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; } -- cgit v1.2.3