[Epiphany] Re: Default bookmarks more like safari, and some other stuff

["David Adam Bordoley" <bordoley msu edu>]

David Adam Bordoley writes: 

> Attach patch changes the default bookmark set to match safari's (excluding 
> the mac and kids "Folders"). Also it marks the google smartbookmark for 
> translation and includes a comment to instruct translators how to properly 
> translate the bookmark for their locale. Also it adds this bookmark to the 
> bmt by default. oh and it changes the spacing between a topic and its 
> arrow to 3px instead of 6 just cuz i think it looks better.  
> 
> dave  
> 

should include the patch i guess :/ 


Index: src/bookmarks/ephy-bookmarks.c
===================================================================
RCS file: /cvs/gnome/epiphany/src/bookmarks/ephy-bookmarks.c,v
retrieving revision 1.32
diff -u -p -r1.32 ephy-bookmarks.c
--- src/bookmarks/ephy-bookmarks.c	3 May 2003 11:59:29 -0000	1.32
+++ src/bookmarks/ephy-bookmarks.c	5 May 2003 04:42:50 -0000
@@ -23,6 +23,7 @@
 #include "ephy-debug.h"
 #include "ephy-tree-model-node.h"
 #include "ephy-node-view.h"
+#include "ephy-toolbars-model.h"
 
 #include <string.h>
 #include <libgnome/gnome-i18n.h>
@@ -51,16 +52,22 @@ typedef struct
 
 static const EphyBookmarksBookmarkInfo default_bookmarks [] =
 {
-	{ N_("Search the web"), "http://www.google.com";, "http://www.google.com/search?q=%s"; }
+	/* Translators you should change these links to respect your locale.
+	 * For instance in .nl these should be
+	 * "http://www.google.nl"; and "http://www.google.nl/search?q=%s";
+	 */
+
+	{ N_("Search the web"), N_("http://www.google.com";), N_("http://www.google.com/search?q=%s";) }
 };
 static int n_default_bookmarks = G_N_ELEMENTS (default_bookmarks);
 
 static const char *default_topics [] =
 {
+	N_("Entertainment"),
 	N_("News"),
-	N_("People"),
-	N_("Shop"),
-	N_("Art"),
+	N_("Shopping"),
+	N_("Sports"),
+	N_("Travel"),
 	N_("Work")
 };
 static int n_default_topics = G_N_ELEMENTS (default_topics);
@@ -221,6 +228,10 @@ static void
 ephy_bookmarks_init_defaults (EphyBookmarks *eb)
 {
 	int i;
+	int id;
+	EphyToolbarsModel *model;
+
+	model = ephy_shell_get_toolbars_model (ephy_shell);
 
 	for (i = 0; i < n_default_topics; i++)
 	{
@@ -232,6 +243,9 @@ ephy_bookmarks_init_defaults (EphyBookma
 		ephy_bookmarks_add (eb, default_bookmarks[i].title,
 				    default_bookmarks[i].location,
 				    default_bookmarks[i].smart_url);
+		
+		id = ephy_bookmarks_get_bookmark_id (eb, default_bookmarks[i].location);
+		ephy_toolbars_model_add_bookmark (model, FALSE, id);
 	}
 }
 
Index: src/bookmarks/ephy-topic-action.c
===================================================================
RCS file: /cvs/gnome/epiphany/src/bookmarks/ephy-topic-action.c,v
retrieving revision 1.10
diff -u -p -r1.10 ephy-topic-action.c
--- src/bookmarks/ephy-topic-action.c	28 Apr 2003 09:05:56 -0000	1.10
+++ src/bookmarks/ephy-topic-action.c	5 May 2003 04:42:52 -0000
@@ -98,7 +98,7 @@ create_tool_item (EggAction *action)
 	arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE);
 	gtk_widget_show (arrow);
 
-	hbox = gtk_hbox_new (FALSE, 6);
+	hbox = gtk_hbox_new (FALSE, 3);
 	gtk_widget_show (hbox);
 	gtk_container_add (GTK_CONTAINER (button), hbox);