Index: data/epiphany.schemas.in
===================================================================
RCS file: /cvs/gnome/epiphany/data/epiphany.schemas.in,v
retrieving revision 1.16
diff -u -p -r1.16 epiphany.schemas.in
--- data/epiphany.schemas.in	15 May 2003 16:25:11 -0000	1.16
+++ data/epiphany.schemas.in	18 May 2003 20:37:10 -0000
@@ -13,18 +13,6 @@
         </locale>
       </schema>
      <schema>
-        <key>/schemas/apps/epiphany/general/newpage_type</key>
-        <applyto>/apps/epiphany/general/newpage_type</applyto>
-        <owner>epiphany</owner>
-        <type>int</type>
-        <default>0</default>
-        <locale name="C">
-        <short>New page type</short>
-        <long>Type of page to show when opening a new window or tab.  Possible
-        values are: 0 (home page), 1 (last page), 2 (blank)</long>
-        </locale>
-      </schema>
-     <schema>
         <key>/schemas/apps/epiphany/find/match_case</key>
         <applyto>/apps/epiphany/find/match_case</applyto>
         <owner>epiphany</owner>
Index: data/glade/prefs-dialog.glade
===================================================================
RCS file: /cvs/gnome/epiphany/data/glade/prefs-dialog.glade,v
retrieving revision 1.8
diff -u -p -r1.8 prefs-dialog.glade
--- data/glade/prefs-dialog.glade	10 May 2003 16:39:09 -0000	1.8
+++ data/glade/prefs-dialog.glade	18 May 2003 20:37:41 -0000
@@ -250,143 +250,6 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkVBox" id="vbox153">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label1240">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;On New Page&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox137">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label1241">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">    </property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox155">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkRadioButton" id="new_page_show_homepage">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Show hom_e page</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkRadioButton" id="radiobutton32">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Show la_st page</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <property name="group">new_page_show_homepage</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkRadioButton" id="radiobutton33">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Show blan_k page</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <property name="group">new_page_show_homepage</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
 		<widget class="GtkVBox" id="ui_page_box">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
Index: lib/ephy-prefs.h
===================================================================
RCS file: /cvs/gnome/epiphany/lib/ephy-prefs.h,v
retrieving revision 1.8
diff -u -p -r1.8 ephy-prefs.h
--- lib/ephy-prefs.h	10 May 2003 09:53:36 -0000	1.8
+++ lib/ephy-prefs.h	18 May 2003 20:37:44 -0000
@@ -23,7 +23,6 @@ G_BEGIN_DECLS
 
 /* General */
 #define CONF_GENERAL_HOMEPAGE "/apps/epiphany/general/start_page"
-#define CONF_GENERAL_NEWPAGE_TYPE "/apps/epiphany/general/newpage_type"
 
 /* Interface */
 #define CONF_TABS_TABBED "/apps/epiphany/interface/open_in_tab"
Index: src/ephy-shell.c
===================================================================
RCS file: /cvs/gnome/epiphany/src/ephy-shell.c,v
retrieving revision 1.35
diff -u -p -r1.35 ephy-shell.c
--- src/ephy-shell.c	10 May 2003 09:53:38 -0000	1.35
+++ src/ephy-shell.c	18 May 2003 20:37:56 -0000
@@ -67,7 +67,6 @@ enum
 {
         STARTPAGE_HOME,
         STARTPAGE_LAST,
-        STARTPAGE_BLANK,
 };
 
 static void
@@ -390,7 +389,7 @@ build_homepage_url (EphyShell *gs,
         }
         else
         {
-                page_type = eel_gconf_get_integer (CONF_GENERAL_NEWPAGE_TYPE);
+                page_type = STARTPAGE_LAST;
         }
 
         /* return the appropriate page */
@@ -422,7 +421,7 @@ build_homepage_url (EphyShell *gs,
 	if (result == NULL)
 	{
 		/* even in case of error, it's a good default */
-		result = g_strdup ("about:blank");
+		result = g_strdup ("home:");
 	}
 
 	return result;
Index: src/prefs-dialog.c
===================================================================
RCS file: /cvs/gnome/epiphany/src/prefs-dialog.c,v
retrieving revision 1.15
diff -u -p -r1.15 prefs-dialog.c
--- src/prefs-dialog.c	17 May 2003 12:43:32 -0000	1.15
+++ src/prefs-dialog.c	18 May 2003 20:38:01 -0000
@@ -195,7 +195,6 @@ enum
 	/* General */
 	OPEN_IN_TABS_PROP,
 	HOMEPAGE_ENTRY_PROP,
-	NEW_PAGE_PROP,
 	AUTOCHARSET_PROP,
 	DEFAULT_CHARSET_PROP,
 	LANGUAGE_PROP,
@@ -237,7 +236,6 @@ EphyDialogProperty properties [] =
 	/* General */
 	{ OPEN_IN_TABS_PROP, "open_in_tabs_checkbutton", CONF_TABS_TABBED, PT_AUTOAPPLY, NULL },
 	{ HOMEPAGE_ENTRY_PROP, "homepage_entry", CONF_GENERAL_HOMEPAGE, PT_AUTOAPPLY, NULL },
-	{ NEW_PAGE_PROP, "new_page_show_homepage", CONF_GENERAL_NEWPAGE_TYPE, PT_AUTOAPPLY, NULL },
 	{ AUTOCHARSET_PROP, "autocharset_optionmenu", CONF_LANGUAGE_AUTODETECT_CHARSET, PT_AUTOAPPLY, NULL },
 	{ DEFAULT_CHARSET_PROP, "default_charset_optionmenu", NULL, PT_NORMAL, NULL },
 	{ LANGUAGE_PROP, "language_optionmenu", NULL, PT_NORMAL, NULL },
