aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog11
-rw-r--r--data/epiphany.schemas.in12
-rw-r--r--data/glade/prefs-dialog.glade137
-rw-r--r--lib/ephy-prefs.h1
-rw-r--r--src/ephy-shell.c5
-rw-r--r--src/prefs-dialog.c2
6 files changed, 13 insertions, 155 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e5ecf483..5fd5eea75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-05-19 David Bordoley <bordoley@msu.edu>
+
+ * data/epiphany.schemas.in:
+ * data/glade/prefs-dialog.glade:
+ * lib/ephy-prefs.h:
+ * src/ephy-shell.c: (build_homepage_url):
+ * src/pref-dialog.c: (properties[])
+
+ Shortest patch ever!!! Kill the new page pref.
+ Make Seth happy :)
+
2003-05-19 Marco Pesenti Gritti <marco@it.gnome.org>
* lib/Makefile.am:
diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in
index ccce5152d..f85e6b4d6 100644
--- a/data/epiphany.schemas.in
+++ b/data/epiphany.schemas.in
@@ -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>
diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade
index e5a695f15..72d7dfeea 100644
--- a/data/glade/prefs-dialog.glade
+++ b/data/glade/prefs-dialog.glade
@@ -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>
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index c34e6ddb6..bed33c9d5 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -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"
diff --git a/src/ephy-shell.c b/src/ephy-shell.c
index 373b9711c..6322a04ef 100644
--- a/src/ephy-shell.c
+++ b/src/ephy-shell.c
@@ -66,8 +66,7 @@ struct EphyShellPrivate
enum
{
STARTPAGE_HOME,
- STARTPAGE_LAST,
- STARTPAGE_BLANK,
+ STARTPAGE_LAST
};
static void
@@ -388,7 +387,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 */
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index dbff591f9..de43889d7 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -195,7 +195,6 @@ enum
/* General */
OPEN_IN_TABS_PROP,
HOMEPAGE_ENTRY_PROP,
- NEW_PAGE_PROP,
AUTOCHARSET_PROP,
DEFAULT_CHARSET_PROP,
LANGUAGE_PROP,
@@ -232,7 +231,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 },
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 05:31:04 +0800