More start here page work, importing bookmarks from mozilla now should

2003-01-08  Marco Pesenti Gritti  <marco@it.gnome.org>

	* TODO:
	* data/starthere/Makefile.am:
	* data/starthere/index.xml.in:
	* data/starthere/section.xsl:
	* data/starthere/smartbookmarks.xml.in:
	* embed/ephy-embed-shell.c: (ephy_embed_shell_class_init):
	* embed/ephy-embed-shell.h:
	* embed/mozilla/StartHereProtocolHandler.cpp:
	* po/POTFILES.in:
	* src/ephy-shell.c: (ephy_shell_command_cb), (ephy_shell_init):

	More start here page work, importing bookmarks from mozilla
	now should work.

1 files changed, 18 insertions, 1 deletions

diff --git a/embed/mozilla/StartHereProtocolHandler.cpp b/embed/mozilla/StartHereProtocolHandler.cpp
index 2d2bb3c35..a4548378d 100644
--- a/embed/mozilla/StartHereProtocolHandler.cpp
+++ b/embed/mozilla/StartHereProtocolHandler.cpp
@@ -18,6 +18,9 @@
 
 #include "ephy-file-helpers.h"
 #include "ephy-start-here.h"
+#include "ephy-embed-shell.h"
+
+#include <string.h>
 
 #include "nsCOMPtr.h"
 #include "nsIFactory.h"
@@ -121,6 +124,19 @@ NS_IMETHODIMP GStartHereProtocolHandler::NewChannel(nsIURI *aURI,
 	rv = aURI->GetPath(path);
 	if (NS_FAILED(rv)) return rv;
 
+	if (g_str_has_prefix (path.get(), "import-bookmarks"))
+	{
+		g_signal_emit_by_name (embed_shell, "command", "import-bookmarks",
+				       path.get() + strlen ("import-bookmarks?"));
+		return NS_ERROR_FAILURE;
+	}
+	else if (g_str_has_prefix (path.get(), "configure-network"))
+	{
+		g_signal_emit_by_name (embed_shell, "command", "configure-network",
+				       NULL);
+		return NS_ERROR_FAILURE;	
+	}
+
     	nsCOMPtr<nsIStorageStream> sStream;
 	nsCOMPtr<nsIOutputStream> stream;
 
@@ -131,7 +147,8 @@ NS_IMETHODIMP GStartHereProtocolHandler::NewChannel(nsIURI *aURI,
 	if (NS_FAILED(rv)) return rv;
 
 	sh = ephy_start_here_new ();
-	buf = ephy_start_here_get_page (sh, "index");
+	buf = ephy_start_here_get_page
+		(sh, path.IsEmpty() ? "index" : path.get ());
 	aBaseURI = ephy_start_here_get_base_uri (sh);	
 	
 	rv = stream->Write (buf, strlen (buf), &bytesWritten);