From 00a0ba94312aa3fc5cdb3f39a29c1bbbc4f02b99 Mon Sep 17 00:00:00 2001
From: David Bordoley <bordoley@msu.edu>
Date: Wed, 30 Apr 2003 18:16:24 +0000
Subject: Remove old unused sidebar and toolbar config stuff.

2003-04-30  David Bordoley <bordoley@msu.edu>

	* data/epiphany.schemas.in:
	* embed/ephy-embed-types.h:
	* lib/ephy-prefs.h:
	* src/ephy-window.c:

	Remove old unused sidebar and toolbar config stuff.
---
 ChangeLog                |  9 +++++++++
 data/epiphany.schemas.in | 45 ---------------------------------------------
 embed/ephy-embed-types.h |  1 -
 lib/ephy-prefs.h         |  4 ----
 src/ephy-window.c        |  1 -
 5 files changed, 9 insertions(+), 51 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b555e8639..f3f20136d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-04-30  David Bordoley <bordoley@msu.edu>
+
+	* data/epiphany.schemas.in:
+	* embed/ephy-embed-types.h:
+	* lib/ephy-prefs.h:
+	* src/ephy-window.c:
+
+	Remove old unused sidebar and toolbar config stuff.	
+
 2003-04-30  David Bordoley <bordoley@msu.edu>
 
 	* lib/ephy-state.c: (ephy_state_window_set_position),
diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in
index f56d3038e..5938060b7 100644
--- a/data/epiphany.schemas.in
+++ b/data/epiphany.schemas.in
@@ -182,39 +182,6 @@
         <long>Middle click on the web page will load the url in X clipboard.</long>
         </locale>
       </schema> 
-      <schema>
-        <key>/schemas/apps/epiphany/interface/show_sidebar</key>
-        <applyto>/apps/epiphany/interface/show_sidebar</applyto>
-        <owner>epiphany</owner>
-        <type>bool</type>
-        <default>0</default>
-        <locale name="C">
-        <short>Show sidebar by default</short>
-        <long>Show sidebar by default.</long>
-        </locale>
-      </schema>
-      <schema>
-        <key>/schemas/apps/epiphany/interface/sidebar_size</key>
-        <applyto>/apps/epiphany/interface/sidebar_size</applyto>
-        <owner>epiphany</owner>
-        <type>int</type>
-        <default>100</default>
-        <locale name="C">
-        <short>Default sidebar size</short>
-        <long>Default sidebar size.</long>
-        </locale>
-      </schema>
-      <schema>
-        <key>/schemas/apps/epiphany/interface/sidebar_page</key>
-        <applyto>/apps/epiphany/interface/sidebar_page</applyto>
-        <owner>epiphany</owner>
-        <type>string</type>
-        <default>history</default>
-        <locale name="C">
-        <short>Default sidebar page</short>
-        <long>Default sidebar page.</long>
-        </locale>
-      </schema>
       <schema>
         <key>/schemas/apps/epiphany/interface/show_toolbars</key>
         <applyto>/apps/epiphany/interface/show_toolbars</applyto>
@@ -306,18 +273,6 @@
         <long>Default spinner theme</long>
         </locale>
       </schema>
-      <schema>
-        <key>/schemas/apps/epiphany/interface/toolbar_setup</key>
-        <applyto>/apps/epiphany/interface/toolbar_setup</applyto>
-        <owner>epiphany</owner>
-        <type>string</type>
-        <default>back_menu=navigation_button(direction=back,arrow=TRUE);forward_menu=navigation_button(direction=forward,arrow=TRUE);stop=std_toolitem(item=stop);reload=std_toolitem(item=reload);home_separator=separator;home=std_toolitem(item=home);favicons_separator=separator;favicon=favicon;location=location;spinner=spinner;</default>
-        <locale name="C">
-        <short>Toolbar setup</short>
-        <long>The list of controls that will be present in the toolbar. You should edit 
-	this setting with the toolbar editor unless you know what you are doing.</long>
-        </locale>
-      </schema>
      <schema>
         <key>/schemas/apps/epiphany/downloader/keep_open</key>
         <applyto>/apps/epiphany/downloader/keep_open</applyto>
diff --git a/embed/ephy-embed-types.h b/embed/ephy-embed-types.h
index 1252b30b5..d56cec05e 100644
--- a/embed/ephy-embed-types.h
+++ b/embed/ephy-embed-types.h
@@ -39,7 +39,6 @@ typedef enum
 	EMBED_CHROME_OPENASPOPUP = 1 << 10,
 	EMBED_CHROME_OPENASFULLSCREEN = 1 << 11,
 	EMBED_CHROME_PPVIEWTOOLBARON = 1 << 12,
-	EMBED_CHROME_SIDEBARON = 1 << 13
 } EmbedChromeMask;
 
 G_END_DECLS
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index 02c1d04fb..c50cb110b 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -29,13 +29,9 @@ G_BEGIN_DECLS
 #define CONF_TABS_TABBED "/apps/epiphany/interface/open_in_tab"
 #define CONF_TABS_TABBED_POPUPS "/apps/epiphany/interface/popups_in_tab"
 #define CONF_TABS_TABBED_AUTOJUMP "/apps/epiphany/interface/jumpto_tab"
-#define CONF_WINDOWS_SIDEBAR_PAGE "/apps/epiphany/interface/sidebar_page"
-#define CONF_WINDOWS_SIDEBAR_SIZE "/apps/epiphany/interface/sidebar_size"
-#define CONF_WINDOWS_SHOW_SIDEBAR "/apps/epiphany/interface/show_sidebar"
 #define CONF_WINDOWS_SHOW_TOOLBARS "/apps/epiphany/interface/show_toolbars"
 #define CONF_WINDOWS_SHOW_BOOKMARKS_BAR "/apps/epiphany/interface/show_bookmarks_bar"
 #define CONF_WINDOWS_SHOW_STATUSBAR "/apps/epiphany/interface/show_statusbar"
-#define CONF_TOOLBAR_SETUP "/apps/epiphany/interface/toolbar_setup"
 #define CONF_TOOLBAR_SPINNER_THEME "/apps/epiphany/interface/spinner_theme"
 #define CONF_BOOKMARKS_SELECTED_NODE "/apps/epiphany/interface/bookmark_keyword_selected_node"
 #define CONF_INTERFACE_MIDDLE_CLICK_OPEN_URL "/apps/epiphany/interface/middle_click_open_url"
diff --git a/src/ephy-window.c b/src/ephy-window.c
index fc7df0281..ef5aa8e4d 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -264,7 +264,6 @@ struct EphyWindowPrivate
 	PPViewToolbar *ppview_toolbar;
 	GtkNotebook *notebook;
 	EphyTab *active_tab;
-	GtkWidget *sidebar;
 	EphyDialog *find_dialog;
 	EmbedChromeMask chrome_mask;
 	gboolean closing;
-- 
cgit v1.2.3