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.

13 files changed, 137 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index 5f18cefcd..03a30c477 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+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.
+
 2005-06-04  Christian Persch  <chpe@cvs.gnome.org>
 
 	* src/ephy-find-toolbar.c: (tab_dom_mouse_click_cb),
diff --git a/Makefile.am b/Makefile.am
index beec01ead..6ed29de2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,4 +25,4 @@ DISTCLEANFILES = 		\
 	intltool-merge 		\
 	intltool-update
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-schemas-install --with-mozilla=$(MOZILLA)
+DISTCHECK_CONFIGURE_FLAGS = --enable-python --enable-gtk-doc --disable-schemas-install --with-mozilla=$(MOZILLA)
diff --git a/NEWS b/NEWS
index 92e7e900b..09871989a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,39 @@
 ==============
+Epiphany 1.7.1
+==============
+
+Highlights:
+
+	* Integrated Python bindings
+	* Find toolbar
+
+Other changes:
+
+	* Numerous improvements and UI enhancements
+	* Numerous bugs fixed: #152482, #306169, #303922, #168295, #305788,
+	  #124236, #305767, #301153, #304992, #173000, #301044, #159767,
+	  #152490, #167319, #301093, #301065, #301048, #136288, #155395,
+	  #300452, #171179, #171657, #170493, #170493, #171197, #167657,
+	  #162748, #169833, #170353, #118107, #169956, #169956, #169039.
+
+
+Contributors: Paolo Borelli, Colin Gibbs, James Henstridge,
+Martin Kretzschmar, Thom May, Christian Persch, Jean-François Rameau,
+Sjoerd Simons and Raphaël Slinckx.
+
+New and updated translations by Vladimir Petkov (bg), Miloslav Trmac (cs),
+Hendrik Richter (de), Nikos Charonitakis (el), Adam Weinberger (en_CA),
+David Lodge (en_GB), <unknown> (es), <unknown> (eu), Pauli Virtanen (fi),
+Ignacio Casal Quinteiro (gl), Ankit Patel (gu), Gabor Kelemen (hu),
+tunggul arif siswoyo (id), Francesco Marletta (it), Takeshi AIHANA (ja),
+Changwoo Ryu (ko), Terance Edward Sola (nb), <unknown> (ne),
+Reinout van Schouwen (nl), Terance Edward Sola (no), GNOME PL Team (pl),
+Afonso Celso Medina (pt_BR), Steve Murphy (rw), Laurent Dhima (sq),
+Данило Шеган (sr), Christian Rose (sv), Baris Cicek (tr), Clytie Siddall (vi),
+Liu Songhe (zh_CN) and Ching-Hung Lin (zh_TW).
+
+
+==============
 Epiphany 1.6.0
 ==============
 
diff --git a/configure.ac b/configure.ac
index e53aa02ce..2a5f3cc52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ dnl You should have received a copy of the GNU General Public License along
 dnl with this program; if not, write to the Free Software Foundation, Inc.,
 dnl 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
-AC_INIT([GNOME Web Browser],[1.7.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
+AC_INIT([GNOME Web Browser],[1.7.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany],[epiphany])
 
 GNOME_COMMON_INIT
 
diff --git a/doc/reference/tmpl/ephy-embed-persist.sgml b/doc/reference/tmpl/ephy-embed-persist.sgml
index b4a48fa41..bee78f54a 100644
--- a/doc/reference/tmpl/ephy-embed-persist.sgml
+++ b/doc/reference/tmpl/ephy-embed-persist.sgml
@@ -111,9 +111,9 @@ save_page (EphyEmbed *embed,
 </para>
 
 @persist: 
-@Param2: 
-<!-- # Unused Parameters # -->
 @value: 
+<!-- # Unused Parameters # -->
+@Param2: 
 
 
 <!-- ##### FUNCTION ephy_embed_persist_set_persist_key ##### -->
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index c86b65f81..6ff40c853 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -42,6 +42,14 @@ be done by casting).
 </para>
 
 
+<!-- ##### SIGNAL EphyEmbed::dom-content-loaded ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1: 
+
 <!-- ##### SIGNAL EphyEmbed::ge-content-change ##### -->
 <para>
 
@@ -93,6 +101,16 @@ be done by casting).
 @ephyembed: the object which received the signal.
 @arg1: 
 
+<!-- ##### SIGNAL EphyEmbed::ge-feed-link ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@arg1: 
+@arg2: 
+@arg3: 
+
 <!-- ##### SIGNAL EphyEmbed::ge-location ##### -->
 <para>
 
@@ -227,8 +245,19 @@ be done by casting).
 @: 
 @:
 @: 
+@:
+@: 
 @: 
 
+<!-- ##### SIGNAL EphyEmbed::ge-search-key-press ##### -->
+<para>
+
+</para>
+
+@ephyembed: the object which received the signal.
+@event: 
+@Returns: 
+
 <!-- ##### SIGNAL EphyEmbed::ge-security-change ##### -->
 <para>
 
@@ -253,10 +282,12 @@ be done by casting).
 @base_iface: 
 @context_menu: 
 @favicon: 
+@feed_link: 
 @location: 
 @net_state: 
 @dom_mouse_click: 
 @dom_mouse_down: 
+@dom_content_loaded: 
 @popup_blocked: 
 @security_change: 
 @zoom_change: 
@@ -265,6 +296,7 @@ be done by casting).
 @modal_alert_closed: 
 @document_type: 
 @new_window: 
+@search_key_press: 
 @load_url: 
 @stop_load: 
 @reload: 
@@ -287,8 +319,6 @@ be done by casting).
 @show_page_certificate: 
 @set_zoom: 
 @get_zoom: 
-@find_set_properties: 
-@find_next: 
 @get_encoding: 
 @has_automatic_encoding: 
 @set_encoding: 
@@ -513,20 +543,12 @@ windows opened with JavaScript often use a nonstandard chrome.
 
 </para>
 
-@embed: 
+@find: 
 @search_string: 
 @case_sensitive: 
-@wrap_around: 
-
-
-<!-- ##### FUNCTION ephy_embed_find_next ##### -->
-<para>
-
-</para>
-
+<!-- # Unused Parameters # -->
 @embed: 
-@backwards: 
-@Returns: 
+@wrap_around: 
 
 
 <!-- ##### FUNCTION ephy_embed_set_encoding ##### -->
diff --git a/doc/reference/tmpl/ephy-node-db.sgml b/doc/reference/tmpl/ephy-node-db.sgml
index 3cffa4c64..4c3617ec4 100644
--- a/doc/reference/tmpl/ephy-node-db.sgml
+++ b/doc/reference/tmpl/ephy-node-db.sgml
@@ -45,15 +45,6 @@ and restored using ephy_node_db_load_from_file().
 A string identifier unique to this #EphyNodeDb
 </para>
 
-<!-- ##### FUNCTION ephy_node_db_get_by_name ##### -->
-<para>
-
-</para>
-
-@name: 
-@Returns: 
-
-
 <!-- ##### FUNCTION ephy_node_db_new ##### -->
 <para>
 
diff --git a/doc/reference/tmpl/ephy-window.sgml b/doc/reference/tmpl/ephy-window.sgml
index 752176ebc..48d840c18 100644
--- a/doc/reference/tmpl/ephy-window.sgml
+++ b/doc/reference/tmpl/ephy-window.sgml
@@ -44,6 +44,11 @@ These are restricted to ephy_window_set_zoom() and ephy_window_load_url().
 
 </para>
 
+<!-- ##### ARG EphyWindow:is-popup ##### -->
+<para>
+
+</para>
+
 <!-- ##### ARG EphyWindow:print-preview-mode ##### -->
 <para>
 
@@ -63,6 +68,7 @@ These are restricted to ephy_window_set_zoom() and ephy_window_load_url().
 </para>
 
 @chrome: 
+@is_popup: 
 @Returns: 
 
 
diff --git a/doc/reference/tmpl/epiphany-unused.sgml b/doc/reference/tmpl/epiphany-unused.sgml
index eaa279c2f..96f81582c 100644
--- a/doc/reference/tmpl/epiphany-unused.sgml
+++ b/doc/reference/tmpl/epiphany-unused.sgml
@@ -206,6 +206,15 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
 </para>
 
 
+<!-- ##### FUNCTION ephy_embed_find_next ##### -->
+<para>
+
+</para>
+
+@embed: 
+@backwards: 
+@Returns: 
+
 <!-- ##### FUNCTION ephy_embed_get_encoding_info ##### -->
 <para>
 
@@ -261,6 +270,14 @@ Represents the state of an #EphyEmbed with regards to networking negotiations.
 
 @Returns: 
 
+<!-- ##### FUNCTION ephy_node_db_get_by_name ##### -->
+<para>
+
+</para>
+
+@name: 
+@Returns: 
+
 <!-- ##### FUNCTION ephy_password_manager_add ##### -->
 <para>
 
diff --git a/embed/mozilla/EphyBrowser.cpp b/embed/mozilla/EphyBrowser.cpp
index 56d4932d3..023350fce 100644
--- a/embed/mozilla/EphyBrowser.cpp
+++ b/embed/mozilla/EphyBrowser.cpp
@@ -219,9 +219,11 @@ EphyDOMLinkEventListener::HandleEvent (nsIDOMEvent* aDOMEvent)
 		NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
 		if (!shouldLoad) return NS_OK;
 #endif
-
+		
 		/* Hide password part */
-		favUri->SetPassword (nsEmbedCString ());
+		nsEmbedCString user;
+		favUri->GetUsername (user);
+		favUri->SetUserPass (user);
 
 		nsEmbedCString spec;
 		favUri->GetSpec (spec);
diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index 76da99c8c..04e1c1022 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -985,7 +985,9 @@ nsresult EventContext::SetURIProperty (nsIDOMNode *node, const char *name, const
 	if (NS_SUCCEEDED (rv) && uri)
 	{
 		/* Hide password part */
-		uri->SetPassword (nsEmbedCString());
+		nsEmbedCString user;
+		uri->GetUsername (user);
+		uri->SetUserPass (user);
 
 		nsEmbedCString spec;
 		uri->GetSpec (spec);
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;
 	}