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).

1 files changed, 0 insertions, 83 deletions

diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 631e6f44a..e126562c8 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -127,84 +127,6 @@ ephy_shell_class_init (EphyShellClass *klass)
 }
 
 static void
-ephy_shell_command_cb (EphyEmbedShell *shell,
-		       char *command,
-		       char *param,
-		       gpointer data)
-{
-	EphyBookmarks *bookmarks;
-	GtkWidget *dialog;
-	const gchar *message = NULL;
-	GtkMessageType message_type = GTK_MESSAGE_INFO;
-	EphyWindow *window;
-
-	bookmarks = ephy_shell_get_bookmarks (EPHY_SHELL (shell));
-
-	if (strcmp (command, "import-mozilla-bookmarks") == 0)
-	{
-		if (ephy_bookmarks_import_mozilla (bookmarks, param))
-		{
-			message_type =  GTK_MESSAGE_INFO;
-			message = _("Mozilla bookmarks imported successfully.");
-		}
-		else
-		{
-			message_type = GTK_MESSAGE_ERROR;
-			message = _("Importing Mozilla bookmarks failed.");
-		}
-	}
-	else if (strcmp (command, "import-galeon-bookmarks") == 0)
-	{
-		if (ephy_bookmarks_import_xbel (bookmarks, param,
-						_("Galeon")))
-		{
-			message_type = GTK_MESSAGE_INFO;
-			message = _("Galeon bookmarks imported successfully.");
-		}
-		else
-		{
-			message_type = GTK_MESSAGE_ERROR;
-			message = _("Importing Galeon bookmarks failed.");
-		}
-	}
-	else if (strcmp (command, "import-konqueror-bookmarks") == 0)
-	{
-		if (ephy_bookmarks_import_xbel (bookmarks, param,
-						_("Konqueror")))
-		{
-			message_type = GTK_MESSAGE_INFO;
-			message = _("Konqueror bookmarks imported successfully.");
-		}
-		else
-		{
-			message_type = GTK_MESSAGE_ERROR;
-			message = _("Importing Konqueror bookmarks failed.");
-		}
-	}
-	else if (strcmp (command, "configure-network") == 0)
-	{
-		ephy_file_launch_application ("gnome-network-preferences",
-					      NULL,
-					      FALSE);
-	}
-
-	if (message != NULL)
-	{
-		window = ephy_shell_get_active_window (EPHY_SHELL (shell));
-		dialog = gtk_message_dialog_new (GTK_WINDOW (window),
-				 		 GTK_DIALOG_DESTROY_WITH_PARENT,
-				 		 message_type,
-				 		 GTK_BUTTONS_OK,
-				 		 message);
-		gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-		g_signal_connect_swapped (G_OBJECT (dialog), "response",
-                           		  G_CALLBACK (gtk_widget_destroy),
-                           		  G_OBJECT (dialog));
-		gtk_widget_show (dialog);
-	}
-}
-
-static void
 ephy_shell_new_window_cb (EphyEmbedShell *shell,
 			  EphyEmbed **new_embed,
                           EmbedChromeMask chromemask,
@@ -254,11 +176,6 @@ ephy_shell_init (EphyShell *gs)
 			  G_CALLBACK(ephy_shell_new_window_cb),
 			  NULL);
 
-	g_signal_connect (G_OBJECT (gs),
-			  "command",
-			  G_CALLBACK(ephy_shell_command_cb),
-			  NULL);
-
 	ephy_init_services (gs);
 }