[epiphany] Removed toolbar-style references from config.

[Robert Roth <robertroth src gnome org>]

commit 269f01c98e568e18ab69b26ca59786b6f0b84304
Author: Robert Roth <robert roth off gmail com>
Date:   Fri Jun 12 15:44:31 2015 +0300

    Removed toolbar-style references from config.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=728874

 data/epiphany.convert               |    1 -
 data/org.gnome.epiphany.gschema.xml |    5 -----
 lib/ephy-prefs.h                    |    9 ---------
 3 files changed, 0 insertions(+), 15 deletions(-)
---
diff --git a/data/epiphany.convert b/data/epiphany.convert
index bd93666..8808119 100644
--- a/data/epiphany.convert
+++ b/data/epiphany.convert
@@ -11,7 +11,6 @@ enable-caret-browsing = /apps/epiphany/web/browse_with_caret
 
 [org.gnome.Epiphany.ui]
 always-show-tabs-bar = /apps/epiphany/general/always_show_tabs_bar
-toolbar-style = /apps/epiphany/general/toolbar_style
 downloads-hidden = /apps/epiphany/dialogs/downloads_hidden
 
 [org.gnome.Epiphany.web]
diff --git a/data/org.gnome.epiphany.gschema.xml b/data/org.gnome.epiphany.gschema.xml
index c2837d8..d69c37c 100644
--- a/data/org.gnome.epiphany.gschema.xml
+++ b/data/org.gnome.epiphany.gschema.xml
@@ -73,11 +73,6 @@
                 </key>
        </schema>
        <schema path="/org/gnome/epiphany/ui/" id="org.gnome.Epiphany.ui">
-               <key name="toolbar-style" enum="org.gnome.Epiphany.EphyPrefsUIToolbarStyle">
-                       <default>'both-horiz'</default>
-                       <summary>Toolbar style</summary>
-                       <description>Toolbar style. Allowed values are "" (use GNOME default style), "both" 
(text and icons), "both-horiz" (text besides icons), "icons", and "text".</description>
-               </key>
                <key type="b" name="always-show-tabs-bar">
                        <default>false</default>
                        <summary>[Deprecated]</summary>
diff --git a/lib/ephy-prefs.h b/lib/ephy-prefs.h
index c0ca33d..8f0ba5a 100644
--- a/lib/ephy-prefs.h
+++ b/lib/ephy-prefs.h
@@ -30,14 +30,6 @@ G_BEGIN_DECLS
 
 typedef enum
 {
-  EPHY_PREFS_UI_TOOLBAR_STYLE_BOTH,
-  EPHY_PREFS_UI_TOOLBAR_STYLE_BOTH_HORIZ,
-  EPHY_PREFS_UI_TOOLBAR_STYLE_ICONS,
-  EPHY_PREFS_UI_TOOLBAR_STYLE_TEXT
-} EphyPrefsUIToolbarStyle;
-
-typedef enum
-{
   EPHY_PREFS_RESTORE_SESSION_POLICY_ALWAYS,
   EPHY_PREFS_RESTORE_SESSION_POLICY_NEVER,
   EPHY_PREFS_RESTORE_SESSION_POLICY_CRASHED
@@ -65,7 +57,6 @@ typedef enum
 
 #define EPHY_PREFS_UI_SCHEMA                     "org.gnome.Epiphany.ui"
 #define EPHY_PREFS_UI_ALWAYS_SHOW_TABS_BAR       "always-show-tabs-bar"
-#define EPHY_PREFS_UI_TOOLBAR_STYLE              "toolbar-style"
 #define EPHY_PREFS_UI_DOWNLOADS_HIDDEN           "downloads-hidden"
 #define EPHY_PREFS_UI_TABS_BAR_VISIBILITY_POLICY "tabs-bar-visibility-policy"