*** empty log message ***

9 files changed, 63 insertions, 60 deletions

diff --git a/lib/toolbar/Makefile.am b/lib/toolbar/Makefile.am
index eb2bcf687..d616b1ef5 100644
--- a/lib/toolbar/Makefile.am
+++ b/lib/toolbar/Makefile.am
@@ -15,29 +15,30 @@ noinst_LTLIBRARIES = libephytoolbar.la
 libephytoolbar_la_SOURCES = \
 	ephy-toolbar.h				\
 	ephy-toolbar.c				\
+	ephy-toolbar-bonobo-view.c		\
+	ephy-toolbar-bonobo-view.h		\
+	ephy-toolbar-editor.h			\
+	ephy-toolbar-editor.c			\
 	ephy-toolbar-item.h			\
 	ephy-toolbar-item.c			\
 	ephy-toolbar-item-factory.h		\
 	ephy-toolbar-item-factory.c		\
-	ephy-tbi-zoom.h				\
-	ephy-tbi-zoom.c				\
-	ephy-tbi-separator.h			\
-	ephy-tbi-separator.c			\
+	ephy-toolbar-tree-model.h		\
+	ephy-toolbar-tree-model.c		\
+	ephy-tb-button.c			\
+	ephy-tb-button.h			\
 	ephy-tbi-favicon.h			\
 	ephy-tbi-favicon.c			\
-	ephy-tbi-spinner.h			\
-	ephy-tbi-spinner.c			\
 	ephy-tbi-location.h			\
 	ephy-tbi-location.c			\
 	ephy-tbi-navigation-history.h		\
 	ephy-tbi-navigation-history.c		\
+	ephy-tbi-separator.h			\
+	ephy-tbi-separator.c			\
+	ephy-tbi-spinner.h			\
+	ephy-tbi-spinner.c			\
 	ephy-tbi-std-toolitem.h			\
 	ephy-tbi-std-toolitem.c			\
-	ephy-toolbar-bonobo-view.c		\
-	ephy-toolbar-bonobo-view.h		\
-	ephy-toolbar-tree-model.h		\
-	ephy-toolbar-tree-model.c		\
-	ephy-toolbar-editor.h			\
-	ephy-toolbar-editor.c			\
-	ephy-tb-button.c			\
-	ephy-tb-button.h
+	ephy-tbi-zoom.h				\
+	ephy-tbi-zoom.c
+
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index a8b7a69b8..b7d859202 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -12,19 +12,20 @@ INCLUDES = \
 noinst_LTLIBRARIES = libephywidgets.la
 
 libephywidgets_la_SOURCES = \
+	eggtreemodelfilter.c			\
+	eggtreemodelfilter.h
+	eggtreemultidnd.c			\
+	eggtreemultidnd.h			\
+	ephy-autocompletion-window.c		\
+	ephy-autocompletion-window.h		\
 	ephy-ellipsizing-label.c		\
 	ephy-ellipsizing-label.h		\
-	ephy-notebook.c				\
-	ephy-notebook.h				\
 	ephy-location-entry.c			\
 	ephy-location-entry.h			\
-	ephy-autocompletion-window.c		\
-	ephy-autocompletion-window.h		\
+	ephy-notebook.c				\
+	ephy-notebook.h				\
 	ephy-spinner.c				\
 	ephy-spinner.h				\
-	eggtreemultidnd.c			\
-	eggtreemultidnd.h			\
 	ephy-tree-model-sort.c			\
-	ephy-tree-model-sort.h			\
-	eggtreemodelfilter.c			\
-	eggtreemodelfilter.h
+	ephy-tree-model-sort.h
+
diff --git a/src/Makefile.am b/src/Makefile.am
index cad9cd290..e2b4a65e2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,49 +41,49 @@ endif
 epiphany_SOURCES = 				    	\
 	$(ephy_automation_interface_idl_sources) 	\
 	$(nautilus_view_sources)			\
-	ui-prefs.c					\
-	ui-prefs.h					\
-	prefs-dialog.c					\
-	prefs-dialog.h					\
-	toolbar.c					\
-	toolbar.h					\
-	statusbar.c					\
-	statusbar.h					\
-	ephy-main.c					\
+	appearance-prefs.c				\
+	appearance-prefs.h				\
 	ephy-automation.c				\
 	ephy-automation.h				\
+	ephy-favorites-menu.c				\
+	ephy-favorites-menu.h				\
+	ephy-history-model.c				\
+	ephy-history-model.h				\
+	ephy-main.c					\
+	ephy-navigation-button.c			\
+	ephy-navigation-button.h			\
 	ephy-shell.c					\
 	ephy-shell.h					\
 	ephy-tab.c					\
 	ephy-tab.h					\
+	ephy-tbi.c					\
+	ephy-tbi.h					\
 	ephy-window.c					\
 	ephy-window.h					\
-	window-commands.c				\
-	window-commands.h				\
-	popup-commands.c				\
-	popup-commands.h				\
-	history-dialog.c				\
-	history-dialog.h				\
-	ppview-toolbar.c				\
-	ppview-toolbar.h				\
-	session.c					\
-	session.h					\
 	general-prefs.c					\
 	general-prefs.h					\
+	history-dialog.c				\
+	history-dialog.h				\
 	language-editor.c				\
 	language-editor.h				\
-	appearance-prefs.c				\
-	appearance-prefs.h				\
 	pdm-dialog.c					\
 	pdm-dialog.h					\
-	ephy-favorites-menu.c				\
-	ephy-favorites-menu.h				\
-	ephy-history-model.c				\
-	ephy-history-model.h				\
-	ephy-tbi.c					\
-	ephy-tbi.h					\
-	ephy-navigation-button.c			\
-	ephy-navigation-button.h
+	popup-commands.c				\
+	popup-commands.h				\
+	prefs-dialog.c					\
+	prefs-dialog.h					\
+	ppview-toolbar.c				\
+	ppview-toolbar.h				\
+	session.c					\
+	session.h					\
+	statusbar.c					\
+	statusbar.h					\
+	toolbar.c					\
+	toolbar.h					\
+	ui-prefs.c					\
+	ui-prefs.h					\
+	window-commands.c				\
+	window-commands.h
 
 epiphany_LDADD = \
 	$(top_builddir)/embed/libephyembed.la \
diff --git a/src/bookmarks/ephy-new-bookmark.c b/src/bookmarks/ephy-new-bookmark.c
index ee0d4b983..2b282fd6e 100644
--- a/src/bookmarks/ephy-new-bookmark.c
+++ b/src/bookmarks/ephy-new-bookmark.c
@@ -186,6 +186,7 @@ build_editing_table (EphyNewBookmark *editor)
 	gtk_label_set_markup (GTK_LABEL (label), _("<b>Title:</b>"));
 	gtk_widget_show (label);
 	entry = gtk_entry_new ();
+	gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
 	editor->priv->title_entry = entry;
 	gtk_widget_set_size_request (entry, 200, -1);
 	gtk_widget_show (entry);
@@ -197,6 +198,7 @@ build_editing_table (EphyNewBookmark *editor)
 	gtk_label_set_markup (GTK_LABEL (label), _("<b>Keywords:</b>"));
 	gtk_widget_show (label);
 	entry = ephy_keywords_entry_new ();
+	gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
 	ephy_keywords_entry_set_bookmarks (EPHY_KEYWORDS_ENTRY (entry),
 					   editor->priv->bookmarks);
 	editor->priv->keywords_entry = entry;
diff --git a/src/ephy-nautilus-view.c b/src/ephy-nautilus-view.c
index f7a0ff867..8af22ba66 100644
--- a/src/ephy-nautilus-view.c
+++ b/src/ephy-nautilus-view.c
@@ -389,8 +389,7 @@ gnv_embed_location_cb (EphyEmbed *embed, EphyNautilusView *view)
 	p = view->priv;
 	g_return_if_fail (view->priv->embed == embed);
 
-	ephy_embed_get_location (embed, TRUE, FALSE, 
-				   &new_uri);
+	ephy_embed_get_location (embed, TRUE, &new_uri);
 
  	g_return_if_fail (new_uri != NULL);
 
@@ -549,7 +548,7 @@ gnv_popup_cmd_frame_in_new_window (BonoboUIComponent *uic,
 	
 	info = ephy_embed_popup_get_event (popup);
 	
-	ephy_embed_get_location (view->priv->embed, FALSE, FALSE, &location);
+	ephy_embed_get_location (view->priv->embed, FALSE, &location);
 
 	nautilus_view_open_location_force_new_window (NAUTILUS_VIEW (view),
 						      location, NULL);
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index eeacdf819..d408a7652 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -304,7 +304,7 @@ build_homepage_url (EphyShell *gs,
 		if (previous_embed != NULL)
 		{
 			ephy_embed_get_location (previous_embed,
-						 TRUE, TRUE,
+						 TRUE,
 						 &result);
 		}
 
diff --git a/src/ephy-tab.c b/src/ephy-tab.c
index b1fe71fb6..b66beb2e7 100644
--- a/src/ephy-tab.c
+++ b/src/ephy-tab.c
@@ -461,7 +461,7 @@ static void
 ephy_tab_location_cb (EphyEmbed *embed, EphyTab *tab)
 {
 	if (tab->priv->location) g_free (tab->priv->location);
-	ephy_embed_get_location (embed, TRUE, FALSE,
+	ephy_embed_get_location (embed, TRUE,
 				 &tab->priv->location);
 
 	if (tab->priv->is_active)
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
index 5e077972a..021126424 100755
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -397,7 +397,7 @@ pdm_dialog_cookie_add (PdmActionInfo *info,
 	gtk_list_store_append (store, &iter);
         gtk_list_store_set (store,
                             &iter,
-			    COL_COOKIES_HOST, cinfo->base.domain,
+			    COL_COOKIES_HOST, cinfo->domain,
                             COL_COOKIES_NAME, cinfo->name,
 			    COL_COOKIES_DATA, cinfo,
                             -1);
diff --git a/src/popup-commands.c b/src/popup-commands.c
index bf187d981..b7c39ca40 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -173,7 +173,7 @@ void popup_cmd_frame_in_new_tab (BonoboUIComponent *uic,
 
 	embed = ephy_window_get_active_embed (window);
 
-	ephy_embed_get_location (embed, FALSE, FALSE, &location);
+	ephy_embed_get_location (embed, FALSE, &location);
 
 	ephy_shell_new_tab (ephy_shell, window, tab,
 			    location,
@@ -198,7 +198,7 @@ void popup_cmd_frame_in_new_window (BonoboUIComponent *uic,
 
 	embed = ephy_window_get_active_embed (window);
 
-	ephy_embed_get_location (embed, FALSE, FALSE, &location);
+	ephy_embed_get_location (embed, FALSE, &location);
 
 	ephy_shell_new_tab (ephy_shell, NULL, tab,
 			    location,