=== Release 2.15.2 ===RELEASE_2_15_2

2006-05-15  Christian Persch  <chpe@cvs.gnome.org>

	=== Release 2.15.2 ===

	* NEWS:

2006-05-15  Christian Persch  <chpe@cvs.gnome.org>

	* embed/mozilla/EphyHeaderSniffer.cpp:
	* embed/mozilla/EphyUtils.cpp:
	* embed/mozilla/FilePicker.cpp:
	* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
	* embed/mozilla/GtkNSSDialogs.cpp:
	* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
	* embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:
	* embed/mozilla/MozDownload.cpp:
	* embed/mozilla/mozilla-embed-persist.cpp:
	* embed/mozilla/mozilla-embed-single.cpp:
	* embed/mozilla/mozilla-notifiers.cpp:
	* embed/mozilla/mozilla-x509-cert.cpp:

	Some castings.

14 files changed, 84 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 18279216b..6d50f1c41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2006-05-15  Christian Persch  <chpe@cvs.gnome.org>
+
+	=== Release 2.15.2 ===
+
+	* NEWS:
+
+2006-05-15  Christian Persch  <chpe@cvs.gnome.org>
+
+	* embed/mozilla/EphyHeaderSniffer.cpp:
+	* embed/mozilla/EphyUtils.cpp:
+	* embed/mozilla/FilePicker.cpp:
+	* embed/mozilla/GtkNSSClientAuthDialogs.cpp:
+	* embed/mozilla/GtkNSSDialogs.cpp:
+	* embed/mozilla/GtkNSSKeyPairDialogs.cpp:
+	* embed/mozilla/GtkNSSSecurityWarningDialogs.cpp:
+	* embed/mozilla/MozDownload.cpp:
+	* embed/mozilla/mozilla-embed-persist.cpp:
+	* embed/mozilla/mozilla-embed-single.cpp:
+	* embed/mozilla/mozilla-notifiers.cpp:
+	* embed/mozilla/mozilla-x509-cert.cpp:
+
+	Some castings.
+
 2006-05-14  Christian Persch  <chpe@cvs.gnome.org>
 
 	* embed/mozilla/EphyUtils.cpp:
diff --git a/NEWS b/NEWS
index 23567a0e9..9cc03d758 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,32 @@
 ===============
+Epiphany 2.15.1
+===============
+
+NOTE: This release drops support for mozilla 1.7. Only Gecko versions 1.8
+(firefox >= 1.5 and xulrunner >= 1.8) and trunk are now supported.
+
+
+Contributors to this release:
+
+Wouter Bolsterlee, Thomas de Grenier de Latour, Michael Hofmann,
+Christian Persch and Celso Pinto
+
+Documentation:
+Victor Osadci
+
+Translations:
+Rostislav "zbrox" Raykov (bg), Francisco Javier F. Serrador (es),
+Ivar Smolin (et), Ankit Patel (gu), Fanomezana Rajaonarisoa (mg),
+Øivind Hoel (nb) and Clytie Siddall (vi)
+
+
+===============
+Epiphany 2.15.1
+===============
+
+No news available.
+
+===============
 Epiphany 2.14.0
 ===============
 
diff --git a/embed/mozilla/EphyHeaderSniffer.cpp b/embed/mozilla/EphyHeaderSniffer.cpp
index b0d1ceb88..88720fa38 100644
--- a/embed/mozilla/EphyHeaderSniffer.cpp
+++ b/embed/mozilla/EphyHeaderSniffer.cpp
@@ -226,7 +226,7 @@ EphyHeaderSniffer::GetInterface(const nsIID & uuid, void * *result)
 	{
 		EphyEmbedPersistFlags flags;
 
-		g_object_get (mEmbedPersist, "flags", &flags, NULL);
+		g_object_get (mEmbedPersist, "flags", &flags, (char *) NULL);
 
 		if (flags & EPHY_EMBED_PERSIST_NO_CERTDIALOGS)
 		{
diff --git a/embed/mozilla/EphyUtils.cpp b/embed/mozilla/EphyUtils.cpp
index 60b5e01af..b0ed8df4b 100644
--- a/embed/mozilla/EphyUtils.cpp
+++ b/embed/mozilla/EphyUtils.cpp
@@ -255,7 +255,7 @@ EphyUtils::CollatePrintSettings (EmbedPrintInfo *info,
 		const char *temp_dir;
 		
 		temp_dir = ephy_file_tmp_dir ();
-		base = g_build_filename (temp_dir, "printXXXXXX", NULL);
+		base = g_build_filename (temp_dir, "printXXXXXX", (char *) NULL);
 		info->tempfile = ephy_file_tmp_filename (base, "ps");
 		g_free (base);
 		
diff --git a/embed/mozilla/FilePicker.cpp b/embed/mozilla/FilePicker.cpp
index d3445919a..aff2249ce 100644
--- a/embed/mozilla/FilePicker.cpp
+++ b/embed/mozilla/FilePicker.cpp
@@ -146,7 +146,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 	if (filterMask & nsIFilePicker::filterAll)
 	{
 		ephy_file_chooser_add_pattern_filter (mDialog, _("All files"),
-						      "*", NULL);
+						      "*", (char*) NULL);
 	}
 	if (filterMask & nsIFilePicker::filterHTML)
 	{
@@ -154,7 +154,7 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 						   "text/html",
 						   "application/xhtml+xml",
 						   "text/xml",
-						   NULL);
+						   (char *) NULL);
 	}
 	if (filterMask & nsIFilePicker::filterText)
 	{
@@ -167,17 +167,17 @@ NS_IMETHODIMP GFilePicker::AppendFilters(PRInt32 filterMask)
 						   "image/png",
 						   "image/jpeg",
 						   "image/gif",
-						   NULL);
+						   (char *) NULL);
 	}
 	if (filterMask & nsIFilePicker::filterXML)
 	{
 		ephy_file_chooser_add_pattern_filter (mDialog, _("XML files"),
-						      "*.xml", NULL);
+						      "*.xml", (char *) NULL);
 	}
 	if (filterMask & nsIFilePicker::filterXUL)
 	{
 		ephy_file_chooser_add_pattern_filter (mDialog, _("XUL files"),
-						      "*.xul", NULL);
+						      "*.xul", (char *) NULL);
 	}
 
 	return NS_OK;
@@ -357,7 +357,7 @@ NS_IMETHODIMP GFilePicker::SetDisplayDirectory(nsILocalFile *aDisplayDirectory)
 		NS_UTF16ToCString (mDefaultString, NS_CSTRING_ENCODING_NATIVE_FILESYSTEM,
 				   defaultString);
 
-		char *filename = g_build_filename (dir.get(), defaultString.get(), NULL);
+		char *filename = g_build_filename (dir.get(), defaultString.get(), (char *) NULL);
 		LOG ("Setting filename to %s", filename);
 		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (mDialog), filename);
 		g_free (filename);
diff --git a/embed/mozilla/GtkNSSClientAuthDialogs.cpp b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
index 60171f345..26ed934d9 100644
--- a/embed/mozilla/GtkNSSClientAuthDialogs.cpp
+++ b/embed/mozilla/GtkNSSClientAuthDialogs.cpp
@@ -159,7 +159,7 @@ GtkNSSClientAuthDialogs::ChooseCertificate (nsIInterfaceRequestor *ctx,
 					      GTK_RESPONSE_CANCEL,
 					      _("_Select Certificate"),
 					      GTK_RESPONSE_OK,
-					      NULL);
+					      (char *) NULL);
 
 	if (gparent)
 	{
@@ -238,7 +238,7 @@ GtkNSSClientAuthDialogs::ChooseCertificate (nsIInterfaceRequestor *ctx,
         gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
         gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer,
                                         "text", 0,
-                                        NULL);
+                                        (char *) NULL);
 
 	gtk_widget_show (combo);
 	gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, TRUE, 0);
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index ea2d95e38..8bae2e8e8 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -229,7 +229,7 @@ display_cert_warning_box (nsIInterfaceRequestor *ctx,
 	
 	dialog = gtk_dialog_new_with_buttons ("", gparent,
 					      GTK_DIALOG_DESTROY_WITH_PARENT,
-					      NULL);
+					      (char *) NULL);
 	if (gparent)
 	{
 		gtk_window_group_add_window (ephy_gui_ensure_window_group (gparent),
@@ -499,7 +499,7 @@ GtkNSSDialogs::NotifyCrlNextupdate (nsIInterfaceRequestor *ctx,
 					      GTK_DIALOG_DESTROY_WITH_PARENT,
 					      GTK_STOCK_OK,
 					      GTK_RESPONSE_OK,
-					      NULL);
+					      (char *) NULL);
 
 	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
 
@@ -564,7 +564,7 @@ GtkNSSDialogs::ConfirmDownloadCACert(nsIInterfaceRequestor *ctx,
 					      NSSDIALOG_RESPONSE_VIEW_CERT,
 					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					      _("_Trust CA"),	GTK_RESPONSE_ACCEPT,
-					      NULL);
+					      (char *) NULL);
 
 	if (gparent)
 	{
@@ -647,7 +647,7 @@ GtkNSSDialogs::NotifyCACertExists (nsIInterfaceRequestor *ctx)
 					      GTK_DIALOG_DESTROY_WITH_PARENT,
 					      GTK_STOCK_OK,
 					      GTK_RESPONSE_OK,
-					      NULL);
+					      (char *) NULL);
 
 	if (gparent)
 	{
@@ -779,7 +779,7 @@ GtkNSSDialogs::SetPKCS12FilePassword(nsIInterfaceRequestor *ctx,
 					      GTK_DIALOG_DESTROY_WITH_PARENT,
 					      GTK_STOCK_CANCEL,
 					      GTK_RESPONSE_CANCEL,
-					      NULL);
+					      (char *) NULL);
 
 	if (gparent)
 	{
@@ -902,7 +902,7 @@ GtkNSSDialogs::GetPKCS12FilePassword(nsIInterfaceRequestor *ctx,
 					      GTK_DIALOG_DESTROY_WITH_PARENT,
 					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					      _("I_mport Certificate"), GTK_RESPONSE_OK,
-					      NULL);
+					      (char *) NULL);
 
 	if (gparent)
 	{
@@ -1004,7 +1004,7 @@ GtkNSSDialogs::CrlImportStatusDialog(nsIInterfaceRequestor *ctx, nsICRLInfo *crl
 					      GTK_WINDOW (gparent),
 					      GTK_DIALOG_DESTROY_WITH_PARENT,
 					      GTK_STOCK_OK, GTK_RESPONSE_OK,
-					      NULL);
+					      (char *) NULL);
 
 	gtk_window_set_icon_name (GTK_WINDOW (dialog), "web-browser");
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Certificate Revocation List Imported"));
@@ -1283,7 +1283,7 @@ setup_view_cert_tree (GtkWidget *dialog, GladeXML*gxml, nsIArray *certChain)
 						     0, "Certificate",
 						     renderer,
 						     "text", 0,
-						     NULL);
+						     (char *) NULL);
 
 	GtkTreeSelection *select = gtk_tree_view_get_selection (GTK_TREE_VIEW (chain_tree_view));
 	gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);
@@ -1304,7 +1304,7 @@ setup_view_cert_tree (GtkWidget *dialog, GladeXML*gxml, nsIArray *certChain)
 						     0, "Certificate Field",
 						     renderer,
 						     "text", 0,
-						     NULL);
+						     (char *) NULL);
 
 	select = gtk_tree_view_get_selection (GTK_TREE_VIEW (field_tree_view));
 	gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);
diff --git a/embed/mozilla/GtkNSSKeyPairDialogs.cpp b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
index 24ec23f25..f7f1e5eb3 100644
--- a/embed/mozilla/GtkNSSKeyPairDialogs.cpp
+++ b/embed/mozilla/GtkNSSKeyPairDialogs.cpp
@@ -157,7 +157,7 @@ GtkNSSKeyPairDialogs::DisplayGeneratingKeypairInfo (nsIInterfaceRequestor *ctx,
 	GtkWindow *gparent = GTK_WINDOW (EphyUtils::FindGtkParent (parent));
 
 	dialog = gtk_dialog_new_with_buttons ("", gparent,
-					      GTK_DIALOG_DESTROY_WITH_PARENT, NULL);
+					      GTK_DIALOG_DESTROY_WITH_PARENT, (char *) NULL);
 
 	if (gparent)
 	{
diff --git a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
index 02fc23330..fca676a52 100644
--- a/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
+++ b/embed/mozilla/GtkNSSSecurityWarningDialogs.cpp
@@ -214,7 +214,7 @@ GtkNSSSecurityWarningDialogs::DoDialog (nsIInterfaceRequestor *aContext,
 	PRBool showOnce = PR_FALSE;
 	if (!show && prefBranch && aPrefName)
 	{
-		showOncePref = g_strconcat (aPrefName, ".show_once", NULL);
+		showOncePref = g_strconcat (aPrefName, ".show_once", (char *) NULL);
 		rv = prefBranch->GetBoolPref (showOncePref, &showOnce);
 		if (NS_FAILED (rv)) showOnce = PR_FALSE;
 	}
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index 7a7b115a8..39fd8ee22 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -451,7 +451,7 @@ MozDownload::GetInterface(const nsIID & uuid, void * *result)
 	{
 		EphyEmbedPersistFlags flags;
 
-		g_object_get (mEmbedPersist, "flags", &flags, NULL);
+		g_object_get (mEmbedPersist, "flags", &flags, (char *) NULL);
 
 		if (flags & EPHY_EMBED_PERSIST_NO_CERTDIALOGS)
 		{
@@ -607,12 +607,12 @@ GetFilePath (const char *filename)
 
 	if (ephy_ensure_dir_exists (download_dir, NULL))
 	{
-		path = g_build_filename (download_dir, filename, NULL);
+		path = g_build_filename (download_dir, filename, (char *) NULL);
 	}
 	else
 	{
 		home_dir = g_get_home_dir ();
-		path = g_build_filename (home_dir ? home_dir : "/", filename, NULL);
+		path = g_build_filename (home_dir ? home_dir : "/", filename, (char *) NULL);
 	}
 	g_free (download_dir);
 	
diff --git a/embed/mozilla/mozilla-embed-persist.cpp b/embed/mozilla/mozilla-embed-persist.cpp
index 63ded311c..22c6b9f9d 100644
--- a/embed/mozilla/mozilla-embed-persist.cpp
+++ b/embed/mozilla/mozilla-embed-persist.cpp
@@ -168,7 +168,7 @@ impl_save (EphyEmbedPersist *persist)
 		      "flags", &flags,
 		      "embed", &embed,
 		      "max_size", &max_size,
-		      NULL);
+		      (char *) NULL);
 
 	g_return_val_if_fail (!(flags & EPHY_EMBED_PERSIST_COPY_PAGE)
 			      || embed != NULL, FALSE);	
@@ -291,7 +291,7 @@ impl_save (EphyEmbedPersist *persist)
 	{
 		/* Get a temp filename to save to */
 		char *tmp_filename, *base;
-		base = g_build_filename (g_get_tmp_dir (), "sav-XXXXXX", NULL);
+		base = g_build_filename (g_get_tmp_dir (), "sav-XXXXXX", (char *) NULL);
 		tmp_filename = ephy_file_tmp_filename (base, "html");
 		g_free (base);
 		if (tmp_filename == NULL) return FALSE;
@@ -350,7 +350,7 @@ impl_to_string (EphyEmbedPersist *persist)
 	g_object_get (persist,
 	              "flags", &flags,
 	              "embed", &embed,
-	              NULL);
+	              (char *) NULL);
 	g_object_unref (persist);
 	g_return_val_if_fail (embed != NULL, NULL);
 
diff --git a/embed/mozilla/mozilla-embed-single.cpp b/embed/mozilla/mozilla-embed-single.cpp
index 0c90f6445..f653228ca 100644
--- a/embed/mozilla/mozilla-embed-single.cpp
+++ b/embed/mozilla/mozilla-embed-single.cpp
@@ -328,7 +328,7 @@ mozilla_init_plugin_path ()
 #ifdef HAVE_PRIVATE_PLUGINS
 				":" PLUGINDIR,
 #endif
-				NULL);
+				(char *) NULL);
 
 	g_setenv ("MOZ_PLUGIN_PATH", new_path, TRUE);
 	g_free (new_path);
@@ -358,7 +358,7 @@ mozilla_init_profile (void)
 	char *profile_path;
 	profile_path = g_build_filename (ephy_dot_dir (), 
 					 MOZILLA_PROFILE_DIR,
-					 NULL);
+					 (char *) NULL);
         gtk_moz_embed_set_profile_path (profile_path, MOZILLA_PROFILE_NAME);
         g_free (profile_path);
 }
@@ -546,7 +546,7 @@ mozilla_stylesheet_init (MozillaEmbedSingle *single)
 
 	priv->user_css_file = g_build_filename (ephy_dot_dir (),
 						USER_STYLESHEET_FILENAME,
-						NULL);
+						(char *) NULL);
 
 	user_css_enabled_notify (NULL, 0, NULL, single);
 	priv->user_css_enabled_notifier_id =
@@ -654,7 +654,7 @@ mozilla_embed_single_init (MozillaEmbedSingle *mes)
 				  MOZILLA_PROFILE_DIR,
 				  MOZILLA_PROFILE_NAME,
 				  MOZILLA_PROFILE_FILE,
-				  NULL);
+				  (char *) NULL);
 
 	g_signal_connect_object (embed_shell, "prepare-close",
 				 G_CALLBACK (prepare_close_cb), mes,
diff --git a/embed/mozilla/mozilla-notifiers.cpp b/embed/mozilla/mozilla-notifiers.cpp
index 07c7f8502..2682aa4ac 100644
--- a/embed/mozilla/mozilla-notifiers.cpp
+++ b/embed/mozilla/mozilla-notifiers.cpp
@@ -646,7 +646,7 @@ mozilla_get_dpi ()
 	if (g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (settings)),
 					  "gtk-xft-dpi"))
 	{
-		g_object_get (G_OBJECT (settings), "gtk-xft-dpi", &dpi, NULL);
+		g_object_get (G_OBJECT (settings), "gtk-xft-dpi", &dpi, (char *) NULL);
 		if (dpi) return INT_ROUND (dpi / PANGO_SCALE);
 	}
 
diff --git a/embed/mozilla/mozilla-x509-cert.cpp b/embed/mozilla/mozilla-x509-cert.cpp
index 60468ee9b..51c79a209 100644
--- a/embed/mozilla/mozilla-x509-cert.cpp
+++ b/embed/mozilla/mozilla-x509-cert.cpp
@@ -256,6 +256,6 @@ mozilla_x509_cert_new (nsIX509Cert *moz_cert)
 
 	cert = (MozillaX509Cert*)g_object_new (MOZILLA_TYPE_X509_CERT,
 					       "mozilla-cert", moz_cert,
-					       NULL);
+					       (char *) NULL);
 	return cert;
 }