From bd8de625888d481cb6c6ce73721d3597349f5afb Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@gnome.org>
Date: Wed, 10 Sep 2003 08:11:43 +0000
Subject: Make spinner status per tab. Remove the default to tab pref, use tab
 by

2003-09-10  Marco Pesenti Gritti  <marco@gnome.org>

        * data/epiphany.schemas.in:
        * data/glade/prefs-dialog.glade:
        * lib/ephy-prefs.h:
        * src/ephy-notebook.c: (update_tabs_visibility),
        (ephy_notebook_init):
        * src/ephy-shell.c: (ephy_shell_new_tab):
        * src/ephy-tab.c: (open_link_in_new_tab):
        * src/ephy-window.c: (sync_tab_load_status),
        (ephy_window_set_active_tab), (tab_added_cb), (tab_removed_cb):
        * src/prefs-dialog.c:

        Make spinner status per tab.
        Remove the default to tab pref, use tab by default for middle
        click on links, add a always_show_tabs_bar hidden  pref.
---
 data/epiphany.schemas.in      |  6 ++---
 data/glade/prefs-dialog.glade | 52 -------------------------------------------
 2 files changed, 3 insertions(+), 55 deletions(-)

(limited to 'data')

diff --git a/data/epiphany.schemas.in b/data/epiphany.schemas.in
index 7626161f9..446e651c9 100644
--- a/data/epiphany.schemas.in
+++ b/data/epiphany.schemas.in
@@ -89,14 +89,14 @@
         </locale>
       </schema>
       <schema>
-        <key>/schemas/apps/epiphany/general/open_in_tab</key>
+        <key>/schemas/apps/epiphany/general/always_show_tabs_bar</key>
         <applyto>/apps/epiphany/general/open_in_tab</applyto>
         <owner>epiphany</owner>
         <type>bool</type>
         <default>false</default>
         <locale name="C">
-        <short>Use tabs</short>
-        <long>Open in tabs by default.</long>
+        <short>Always show the tab bar</short>
+        <long>Show the tab bar also when there is only one tab open.</long>
         </locale>
       </schema>
      <schema>
diff --git a/data/glade/prefs-dialog.glade b/data/glade/prefs-dialog.glade
index ec6224ce2..6596bcef8 100644
--- a/data/glade/prefs-dialog.glade
+++ b/data/glade/prefs-dialog.glade
@@ -261,27 +261,6 @@
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">6</property>
 
-		      <child>
-			<widget class="GtkLabel" id="label1252">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;Tabs&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="hbox145">
 			  <property name="visible">True</property>
@@ -308,37 +287,6 @@
 			      <property name="fill">False</property>
 			    </packing>
 			  </child>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox160">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkCheckButton" id="open_in_tabs_checkbutton">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Open in _tabs by default</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>
-			    </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>
-- 
cgit v1.2.3