diff -ru /home/muhri/cvs/skipstone/src/Makefile ../src/Makefile
--- /home/muhri/cvs/skipstone/src/Makefile	2006-03-17 12:03:52.000000000 +0300
+++ ../src/Makefile	2006-03-31 21:59:52.000000000 +0300
@@ -2,7 +2,7 @@
 include ../config.mk
 srcdir = .
 
-OBJS = main.o go.o session.o callbacks.o encoding.o moz_callbacks.o support.o ipc.o bookmarks.o interface.o interface-notebook.o history.o crash.o skipstone-config.o context.o skipstone-plugin.o skipstone-print.o  debug.o mozilla.o SkipStonePrompter.o PromptService.o
+OBJS = main.o go.o session.o callbacks.o encoding.o moz_callbacks.o support.o ipc.o bookmarks.o interface.o interface-notebook.o history.o crash.o skipstone-config.o context.o skipstone-plugin.o skipstone-print.o debug.o mozilla.o SkipStoneContentHandler.o
 
 DOWNLOADOBJS = skipdownload.o
 
@@ -69,7 +69,5 @@
 debug.o: debug.c skipstone.h debug.h
 mozilla.o: mozilla.cpp
 skipstone-plugin.o: skipstone-plugin.c skipstone.h skipstone-plugin.h
-SkipStonePrompter.o: SkipStonePrompter.cpp SkipStonePrompter.h
-PromptService.o: PromptService.cpp PromptService.h
-
+SkipStoneContentHandler.o: SkipStoneContentHandler.cpp SkipStoneContentHandler.h
 
Only in /home/muhri/cvs/skipstone/src/: PromptService.o
Only in ../src: SkipStoneContentHandler.cpp
Only in ../src: SkipStoneContentHandler.h
Only in ../src: SkipStoneContentHandler.o
Only in /home/muhri/cvs/skipstone/src/: SkipStonePrompter.cpp~
Only in /home/muhri/cvs/skipstone/src/: SkipStonePrompter.o
Binary files /home/muhri/cvs/skipstone/src/bookmarks.o and ../src/bookmarks.o differ
Binary files /home/muhri/cvs/skipstone/src/callbacks.o and ../src/callbacks.o differ
Binary files /home/muhri/cvs/skipstone/src/context.o and ../src/context.o differ
Binary files /home/muhri/cvs/skipstone/src/crash.o and ../src/crash.o differ
Binary files /home/muhri/cvs/skipstone/src/debug.o and ../src/debug.o differ
Binary files /home/muhri/cvs/skipstone/src/encoding.o and ../src/encoding.o differ
Binary files /home/muhri/cvs/skipstone/src/go.o and ../src/go.o differ
Binary files /home/muhri/cvs/skipstone/src/history.o and ../src/history.o differ
diff -ru /home/muhri/cvs/skipstone/src/interface-notebook.c ../src/interface-notebook.c
--- /home/muhri/cvs/skipstone/src/interface-notebook.c	2004-06-19 21:30:58.000000000 +0300
+++ ../src/interface-notebook.c	2006-04-01 00:10:37.000000000 +0300
@@ -505,7 +505,7 @@
 				 "Embed",
 				 GTK_WIDGET(skipstone->embed),
 				 (GtkDestroyNotify)g_object_unref);*/
-     	create_toolbar(skipstone,0);
+     	create_toolbar(skipstone,0,with_plugins);
      	skipstone->statusbar = gtk_statusbar_new();
      	skipstone->sbar_temp_msg_id =
 	  gtk_statusbar_get_context_id(GTK_STATUSBAR(skipstone->statusbar), "statusbar temp message");
Binary files /home/muhri/cvs/skipstone/src/interface-notebook.o and ../src/interface-notebook.o differ
diff -ru /home/muhri/cvs/skipstone/src/interface.c ../src/interface.c
--- /home/muhri/cvs/skipstone/src/interface.c	2004-06-19 21:31:12.000000000 +0300
+++ ../src/interface.c	2006-04-01 16:35:27.294261208 +0300
@@ -406,20 +406,25 @@
 	gtk_box_pack_start(GTK_BOX(skipstone->vbox), skipstone->bmarkhandlebox,FALSE,FALSE,0);
 
      	/* toolbar and pixmaps */
-     	create_toolbar(skipstone,0);
+     	create_toolbar(skipstone,0,with_plugins);
      	/* ------------------- */
      
      	/* do we have any plugins to pack after the toolbar, do that now */
-	if (with_plugins) skipstone_plugin_check(skipstone, PLUGIN_AFTER_TOOLBAR);
+	if (with_plugins)
+	     skipstone_plugin_check(skipstone, PLUGIN_AFTER_TOOLBAR);
+	
 	
 	skipstone->right_of_embed_box = gtk_hbox_new(0,0);
 	/* any plugins right of mozembed? */
-	if (with_plugins) skipstone_plugin_check(skipstone, PLUGIN_RIGHT_OF_MOZEMBED);
+	if (with_plugins)
+	     skipstone_plugin_check(skipstone, PLUGIN_RIGHT_OF_MOZEMBED);
+
 	
 	skipstone->left_of_embed_box = gtk_hbox_new(0,0);
 	/* any left of it ? */
-	if (with_plugins) skipstone_plugin_check(skipstone, PLUGIN_LEFT_OF_MOZEMBED);
-	
+	if (with_plugins)
+	     skipstone_plugin_check(skipstone, PLUGIN_LEFT_OF_MOZEMBED);
+
 	skipstone->main_hbox = gtk_hbox_new(0,0);
 	
 	gtk_box_pack_start(GTK_BOX(skipstone->main_hbox), skipstone->left_of_embed_box, FALSE, FALSE, 0);
@@ -434,13 +439,17 @@
      
 	gtk_box_pack_start(GTK_BOX(skipstone->vbox), skipstone->main_hbox, TRUE, TRUE, 0);
 	/* plugins after mozembed */
-	if (with_plugins) skipstone_plugin_check(skipstone, PLUGIN_AFTER_MOZEMBED);
+	if (with_plugins)
+	     skipstone_plugin_check(skipstone, PLUGIN_AFTER_MOZEMBED);
+
      	
 	skipstone->statusbox = gtk_hbox_new(0,0);
      	gtk_box_pack_start(GTK_BOX(skipstone->vbox), skipstone->statusbox, FALSE, FALSE, FALSE);
 
 	/*plugins after the statusbar */
-	if (with_plugins) skipstone_plugin_check(skipstone, PLUGIN_AFTER_STATUSBAR);
+	if (with_plugins)
+	     skipstone_plugin_check(skipstone, PLUGIN_AFTER_STATUSBAR);
+
 	
      	skipstone->statusbar = gtk_statusbar_new();
      	skipstone->sbar_temp_msg_id =
@@ -517,7 +526,7 @@
      	D_RETURN_(tbarsen);
 }
 
-void create_toolbar(SkipStone *skipstone, gint i)
+void create_toolbar(SkipStone *skipstone, gint i, gboolean with_plugins)
 {
      	GtkWidget *back, *forward, *stop, *home, *reload;
      	gint entry_length = config.xsize - 150;
@@ -539,7 +548,7 @@
 
      	gtk_container_add(GTK_CONTAINER(skipstone->handlebox), skipstone->toolbar);
 
-     	skipstone_plugin_check(skipstone, PLUGIN_IN_TOOLBAR_START);
+     	if (with_plugins) skipstone_plugin_check(skipstone, PLUGIN_IN_TOOLBAR_START);
 
 	if (config.navbar_buttons & NAVBAR_BACK) {
 	     	back = create_pixmap(skipstone->toolbar,"back.png",&loaded);
@@ -572,7 +581,7 @@
      		gtk_combo_set_popdown_strings(GTK_COMBO(skipstone->combo),combo_urls);
 	
 	gtk_combo_disable_activate(GTK_COMBO(skipstone->combo));
-        skipstone_plugin_check(skipstone, PLUGIN_IN_TOOLBAR_BEFORE_ENTRY);
+        if (with_plugins) skipstone_plugin_check(skipstone, PLUGIN_IN_TOOLBAR_BEFORE_ENTRY);
      	gtk_toolbar_append_widget(GTK_TOOLBAR(skipstone->toolbar), skipstone->combo, _("Enter a URL here"),NULL);
 
 	if (config.navbar_buttons & NAVBAR_HOME) {
@@ -596,7 +605,7 @@
 		set_sensitive_buttons(skipstone,tbarsen);
 	}
      	/* if any plugins would like to be in the toolbar, now is the time */
-	skipstone_plugin_check(skipstone, PLUGIN_IN_TOOLBAR);
+	if (with_plugins) skipstone_plugin_check(skipstone, PLUGIN_IN_TOOLBAR);
 	D_RETURN;
 }
 
Binary files /home/muhri/cvs/skipstone/src/interface.o and ../src/interface.o differ
Binary files /home/muhri/cvs/skipstone/src/ipc.o and ../src/ipc.o differ
diff -ru /home/muhri/cvs/skipstone/src/main.c ../src/main.c
--- /home/muhri/cvs/skipstone/src/main.c	2004-06-22 00:48:12.000000000 +0300
+++ ../src/main.c	2006-03-31 22:04:09.000000000 +0300
@@ -14,7 +14,7 @@
 ConfigData config;
 gchar *app_path = NULL;
 G_CONST_RETURN gchar *home = NULL;
-
+extern void register_ch();
 
 static void skipstone_read_configs(void);
 static void skipstone_init_mozembed(void);
@@ -43,6 +43,7 @@
      	g_free(profile);
      	gtk_moz_embed_push_startup();
         mozilla_init_chrome ();
+        register_ch();
      	D_RETURN;
 }
 
Binary files /home/muhri/cvs/skipstone/src/main.o and ../src/main.o differ
diff -ru /home/muhri/cvs/skipstone/src/moz_callbacks.c ../src/moz_callbacks.c
--- /home/muhri/cvs/skipstone/src/moz_callbacks.c	2006-03-31 23:43:36.000000000 +0300
+++ ../src/moz_callbacks.c	2006-04-01 16:32:31.426997096 +0300
@@ -390,16 +390,16 @@
      	D_ENTER;
 
      	skipstone = new_skipstone_window (FALSE, FALSE);
-     	if (!(chromemask & GTK_MOZ_EMBED_FLAG_MENUBARON)) {
+/*     	if (!(chromemask & GTK_MOZ_EMBED_FLAG_MENUBARON)) {*/
        		gtk_widget_hide(skipstone->menubar);
-	}
-     	if (!(chromemask & GTK_MOZ_EMBED_FLAG_TOOLBARON)) {
+/*	}*/
+  /*   	if (!(chromemask & GTK_MOZ_EMBED_FLAG_TOOLBARON)) {*/
 	     	gtk_widget_hide(skipstone->handlebox);
 	     	gtk_widget_hide(skipstone->bmarkhandlebox);
-	}
-     	if (!(chromemask & GTK_MOZ_EMBED_FLAG_STATUSBARON)) {
+/*	}*/
+  /*   	if (!(chromemask & GTK_MOZ_EMBED_FLAG_STATUSBARON)) {*/
        		gtk_widget_hide(skipstone->statusbox);
-	}
+/*	}*/
      	*retval = GTK_MOZ_EMBED (skipstone->embed);
      	D_RETURN;
 }
Only in /home/muhri/cvs/skipstone/src/: moz_callbacks.c~
Binary files /home/muhri/cvs/skipstone/src/moz_callbacks.o and ../src/moz_callbacks.o differ
Binary files /home/muhri/cvs/skipstone/src/mozilla.o and ../src/mozilla.o differ
Only in ../src: patch
Binary files /home/muhri/cvs/skipstone/src/session.o and ../src/session.o differ
Binary files /home/muhri/cvs/skipstone/src/skipdownload and ../src/skipdownload differ
Binary files /home/muhri/cvs/skipstone/src/skipdownload.o and ../src/skipdownload.o differ
Binary files /home/muhri/cvs/skipstone/src/skipstone-bin and ../src/skipstone-bin differ
diff -ru /home/muhri/cvs/skipstone/src/skipstone-config.c ../src/skipstone-config.c
--- /home/muhri/cvs/skipstone/src/skipstone-config.c	2004-06-21 20:22:02.000000000 +0300
+++ ../src/skipstone-config.c	2006-04-01 00:11:18.000000000 +0300
@@ -1597,7 +1597,7 @@
 	     	 for (l = window_count; l; l=l->next) {
 	       		SkipStone *skipstone = (SkipStone *)l->data;	     
 	     		if (skipstone)
-	     			create_toolbar(skipstone,1);
+	     			create_toolbar(skipstone,1,TRUE);
 		 }
 	}
 	
Binary files /home/muhri/cvs/skipstone/src/skipstone-config.o and ../src/skipstone-config.o differ
Binary files /home/muhri/cvs/skipstone/src/skipstone-plugin.o and ../src/skipstone-plugin.o differ
Binary files /home/muhri/cvs/skipstone/src/skipstone-print.o and ../src/skipstone-print.o differ
diff -ru /home/muhri/cvs/skipstone/src/skipstone.h ../src/skipstone.h
--- /home/muhri/cvs/skipstone/src/skipstone.h	2006-03-16 13:05:55.000000000 +0300
+++ ../src/skipstone.h	2006-04-01 16:14:17.503298776 +0300
@@ -110,7 +110,7 @@
 void make_notebook_tab(const gchar *url);
 void make_real_window(const gchar *url);
 void make_menu(SkipStone *skipstone);
-void create_toolbar(SkipStone *skipstone, gint i);
+void create_toolbar(SkipStone *skipstone, gint i,gboolean with_plugins);
 void connect_embed_signals(SkipStone *skipstone);
 void make_themes_menu(GtkWidget *menu);
 
diff -ru /home/muhri/cvs/skipstone/src/support.c ../src/support.c
--- /home/muhri/cvs/skipstone/src/support.c	2004-06-21 20:47:04.000000000 +0300
+++ ../src/support.c	2006-04-01 16:14:34.406729064 +0300
@@ -8,7 +8,6 @@
 #include <regex.h>
 
 static gboolean process_uri(const gchar *uri);
-static gboolean download_url(const gchar *uri);
 static gchar* check_file_exists(const gchar *directory, const gchar *filename);
 static void launch_mailer(const gchar *uri);
 static void set_theme_dirs(void);
@@ -19,6 +18,7 @@
 static void skipstone_set_proxy_prefs(void);
 static void write_skipstone_plugin_config(void);
 gchar* get_bracketed_string(gchar *charset);
+gboolean download_url(const gchar *uri);
 
 extern GSList *window_count;
 extern ConfigData config;
@@ -344,7 +344,7 @@
 	D_RETURN_ ( FALSE );
 }
 
-static gboolean download_url(const gchar *uri)
+gboolean download_url(const gchar *uri)
 {
 	FILE *pipe;
      	gchar *cmd = g_strdup_printf("%s \"%s\" &", config.downloader, uri);
@@ -1603,7 +1603,7 @@
      	for (l=window_count; l; l=l->next) {
 	     SkipStone *skipstone = (SkipStone *)l->data;
 	     if (skipstone)
-		     create_toolbar(skipstone,1);
+		     create_toolbar(skipstone,1,TRUE);
 	}      
      	
      	D_RETURN;
Binary files /home/muhri/cvs/skipstone/src/support.o and ../src/support.o differ
Only in ../src: test
