Get rid of starthere: and default to google, as discussed with Seth. Add a

2003-06-09  Marco Pesenti Gritti  <marco@it.gnome.org>

	* data/epiphany.schemas.in:
	* data/ui/epiphany-bookmark-editor-ui.xml.in:
	* embed/ephy-embed-shell.c: (ephy_embed_shell_class_init):
	* embed/mozilla/Makefile.am:
	* embed/mozilla/MozRegisterComponents.cpp:
	* lib/Makefile.am:
	* src/bookmarks/ephy-bookmark-action.c: (create_tool_item),
	(ephy_bookmark_action_sync_smart_url), (entry_activated_cb),
	(activate_cb), (connect_proxy),
	(ephy_bookmark_action_set_property),
	(ephy_bookmark_action_finalize), (ephy_bookmark_action_class_init),
	(sync_bookmark_properties), (ephy_bookmark_action_init):
	* src/bookmarks/ephy-bookmark-properties.c:
	(location_entry_changed_cb):
	* src/bookmarks/ephy-bookmarks-editor.c: (show_properties_dialog),
	(add_bookmarks_source_menu), (import_dialog_response_cb),
	(cmd_bookmarks_import):
	* src/bookmarks/ephy-bookmarks-import.c: (ephy_bookmarks_import),
	(mozilla_parse_bookmarks), (xbel_parse_folder),
	(xbel_parse_bookmarks), (ephy_bookmarks_import_xbel):
	* src/bookmarks/ephy-bookmarks-import.h:
	* src/bookmarks/ephy-bookmarks.c:
	(ephy_bookmarks_autocompletion_source_foreach),
	(ephy_bookmarks_init_defaults), (update_topics_list),
	(update_has_smart_address), (ephy_bookmarks_add),
	(ephy_bookmarks_set_address):
	* src/bookmarks/ephy-bookmarks.h:
	* src/bookmarks/ephy-new-bookmark.c: (ephy_new_bookmark_finalize),
	(ephy_new_bookmark_add), (ephy_new_bookmark_init),
	(ephy_new_bookmark_set_title):
	* src/bookmarks/ephy-new-bookmark.h:
	* src/ephy-shell.c: (ephy_shell_init):
	* src/popup-commands.c: (popup_cmd_bookmark_link):

	Get rid of starthere: and default to google, as discussed
	with Seth.
	Add a way to import bookmarks from the editor. (you still
	cant specificy a file, that's sort of low priority for me, but
	we have a plan on how to do it).
	Allow to edit smart bookmarks in the user interface. The address
	field is used and when there is a %s, it's considered a smart
	url. (like mozilla does it).

3 files changed, 0 insertions, 29 deletions

diff --git a/embed/ephy-embed-shell.c b/embed/ephy-embed-shell.c
index 37f57a1bf..fe4dedebe 100644
--- a/embed/ephy-embed-shell.c
+++ b/embed/ephy-embed-shell.c
@@ -26,12 +26,6 @@
 
 #include <string.h>
 
-enum
-{
-	COMMAND,
-	LAST_SIGNAL
-};
-
 struct EphyEmbedShellPrivate
 {
 	EphyHistory *global_history;
@@ -54,7 +48,6 @@ static DownloaderView *
 impl_get_downloader_view (EphyEmbedShell *shell);
 
 static GObjectClass *parent_class = NULL;
-static guint ephy_embed_shell_signals[LAST_SIGNAL] = { 0 };
 
 EphyEmbedShell *embed_shell;
 
@@ -96,18 +89,6 @@ ephy_embed_shell_class_init (EphyEmbedShellClass *klass)
         object_class->finalize = ephy_embed_shell_finalize;
 	klass->get_downloader_view = impl_get_downloader_view;
 	klass->get_global_history = impl_get_global_history;
-
-	ephy_embed_shell_signals[COMMAND] =
-                g_signal_new ("command",
-                              G_OBJECT_CLASS_TYPE (object_class),
-                              G_SIGNAL_RUN_LAST,
-                              G_STRUCT_OFFSET (EphyEmbedShellClass, command),
-                              NULL, NULL,
-                              ephy_marshal_VOID__STRING_STRING,
-                              G_TYPE_NONE,
-                              2,
-                              G_TYPE_STRING,
-			      G_TYPE_STRING);
 }
 
 static void
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index 59eba1291..30ce0d2c7 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -87,8 +87,6 @@ libephymozillaembed_la_SOURCES = 	\
 	PrintProgressListener.h         \
 	ProgressListener.cpp		\
 	ProgressListener.h		\
-	StartHereProtocolHandler.cpp	\
-	StartHereProtocolHandler.h	\
 	mozilla-embed.cpp	        \
 	mozilla-embed.h			\
 	mozilla-embed-persist.cpp       \
diff --git a/embed/mozilla/MozRegisterComponents.cpp b/embed/mozilla/MozRegisterComponents.cpp
index cd68b8c4d..353deba88 100644
--- a/embed/mozilla/MozRegisterComponents.cpp
+++ b/embed/mozilla/MozRegisterComponents.cpp
@@ -23,7 +23,6 @@
 #include "ContentHandler.h"
 #include "FilePicker.h"
 #include "FtpProtocolHandler.h"
-#include "StartHereProtocolHandler.h"
 #include "GlobalHistory.h"
 #include "IRCProtocolHandler.h"
 #include "MailtoProtocolHandler.h"
@@ -40,7 +39,6 @@
 #include <glib.h>
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(EphyAboutRedirector)
-NS_GENERIC_FACTORY_CONSTRUCTOR(GStartHereProtocolHandler)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GProgressListener)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GFilePicker)
 NS_GENERIC_FACTORY_CONSTRUCTOR(GContentHandler)
@@ -112,12 +110,6 @@ static const nsModuleComponentInfo sAppComps[] = {
 		GFtpProtocolHandlerConstructor
 	},
 	{
-		G_START_HERE_PROTOCOLHANDLER_CLASSNAME,
-		G_START_HERE_PROTOCOLHANDLER_CID,
-		G_START_HERE_PROTOCOLHANDLER_CONTRACTID,
-		GStartHereProtocolHandlerConstructor
-	},
-	{
 		EPHY_ABOUT_REDIRECTOR_CLASSNAME,
 		EPHY_ABOUT_REDIRECTOR_CID,
 		EPHY_ABOUT_REDIRECTOR_EPIPHANY_CONTRACTID,