From a3f08a52b5b93c67665ad9ca4341e30940538cf1 Mon Sep 17 00:00:00 2001
From: Xan Lopez <xan@gnome.org>
Date: Thu, 13 May 2010 12:56:29 +0200
Subject: ephy-statusbar: remove caret browsing indicator

We now show a dialog before enabling the preference, which should be
warning enough.
---
 src/ephy-statusbar.c | 39 ---------------------------------------
 src/ephy-statusbar.h |  3 ---
 src/ephy-window.c    |  3 ---
 3 files changed, 45 deletions(-)

(limited to 'src')

diff --git a/src/ephy-statusbar.c b/src/ephy-statusbar.c
index b054129fb..bf37eb266 100644
--- a/src/ephy-statusbar.c
+++ b/src/ephy-statusbar.c
@@ -45,7 +45,6 @@ struct _EphyStatusbarPrivate
 	GtkWidget *hbox;
 	GtkWidget *icon_container;
 
-	GtkWidget *caret_indicator;
 	GtkWidget *popups_manager_icon;
 	GtkWidget *popups_manager_evbox;
 };
@@ -68,24 +67,6 @@ ephy_statusbar_class_init (EphyStatusbarClass *klass)
 	g_type_class_add_private (object_class, sizeof (EphyStatusbarPrivate));
 }
 
-static void
-create_caret_indicator (EphyStatusbar *statusbar)
-{
-	EphyStatusbarPrivate *priv = statusbar->priv;
-	GtkWidget *label;
-
-	priv->caret_indicator = label = gtk_label_new (_("Caret"));
-	gtk_widget_show (label);
-
-	gtk_widget_set_tooltip_text (label,
-				     /* Translators: this is the tooltip on the "Caret" icon
-				      * in the statusbar.
-				      */
-				     _("In keyboard selection mode, press F7 to exit"));
-
-	ephy_statusbar_add_widget (statusbar, priv->caret_indicator);
-}
-
 static gboolean
 padlock_button_press_cb (GtkWidget *ebox,
                          GdkEventButton *event,
@@ -170,8 +151,6 @@ ephy_statusbar_init (EphyStatusbar *t)
 			   &priv->popups_manager_evbox,
 			   &priv->popups_manager_icon);
 	/* don't show priv->popups_manager_evbox yet */
-
-	create_caret_indicator (t);
 }
 
 /**
@@ -187,24 +166,6 @@ ephy_statusbar_new (void)
 	return GTK_WIDGET (g_object_new (EPHY_TYPE_STATUSBAR, NULL));
 }
 
-/**
- * ephy_statusbar_set_caret_mode:
- * @statusbar: an #EphyStatusbar
- * @enabled: %TRUE to show the caret browsing mode indicator
- * 
- * Sets the statusbar's caret browsing mode indicator.
- **/
-void
-ephy_statusbar_set_caret_mode (EphyStatusbar *statusbar,
-			       gboolean enabled)
-{
-	EphyStatusbarPrivate *priv = statusbar->priv;
-
-	enabled = enabled != FALSE;
-
-	g_object_set (priv->caret_indicator, "visible", enabled, NULL);
-}
-
 /**
  * ephy_statusbar_set_popups_state:
  * @statusbar: an #EphyStatusbar
diff --git a/src/ephy-statusbar.h b/src/ephy-statusbar.h
index fdcd2e93c..32993605d 100644
--- a/src/ephy-statusbar.h
+++ b/src/ephy-statusbar.h
@@ -58,9 +58,6 @@ GType         ephy_statusbar_get_type			(void);
 
 GtkWidget    *ephy_statusbar_new			(void);
 
-void	      ephy_statusbar_set_caret_mode		(EphyStatusbar *statusbar,
-							 gboolean enabled);
-
 void          ephy_statusbar_set_popups_state		(EphyStatusbar *statusbar,
 							 gboolean hidden,
 							 const char *tooltip);
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 063ae7878..31502ee4a 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -3455,7 +3455,6 @@ browse_with_caret_notifier (GConfClient *client,
 			    GConfEntry *entry,
 			    EphyWindow *window)
 {
-	EphyWindowPrivate *priv = window->priv;
 	GtkAction *action;
 	gboolean enabled;
 
@@ -3463,8 +3462,6 @@ browse_with_caret_notifier (GConfClient *client,
 	action = gtk_action_group_get_action (window->priv->action_group,
 					      "BrowseWithCaret");
 	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), enabled);
-
-	ephy_statusbar_set_caret_mode (EPHY_STATUSBAR (priv->statusbar), enabled);
 }
 
 static void
-- 
cgit v1.2.3