From 8676779c654bf09dd9d055ae7a32cb8d7be8ab64 Mon Sep 17 00:00:00 2001
From: Xan Lopez <xan@src.gnome.org>
Date: Tue, 30 Dec 2008 22:32:44 +0000
Subject: Remove progress from statusbar now that we show it in the location
 entry.

svn path=/trunk/; revision=8651
---
 src/ephy-statusbar.c | 50 --------------------------------------------------
 src/ephy-statusbar.h |  3 ---
 src/ephy-window.c    |  3 ---
 src/epiphany.defs    |  9 ---------
 4 files changed, 65 deletions(-)

(limited to 'src')

diff --git a/src/ephy-statusbar.c b/src/ephy-statusbar.c
index a052b628b..355c20dc2 100644
--- a/src/ephy-statusbar.c
+++ b/src/ephy-statusbar.c
@@ -41,7 +41,6 @@ struct _EphyStatusbarPrivate
 
 	GtkWidget *caret_indicator;
 	GtkWidget *security_icon;
-	GtkWidget *progressbar;
 	GtkWidget *security_evbox;
 	GtkWidget *popups_manager_icon;
 	GtkWidget *popups_manager_evbox;
@@ -139,30 +138,6 @@ create_icon_frame (EphyStatusbar *statusbar,
 	*_icon = icon;
 }
 
-static void
-create_statusbar_progress (EphyStatusbar *s)
-{
-	EphyStatusbarPrivate *priv = s->priv;
-	GtkWidget *vbox;
-
-	vbox = gtk_vbox_new (FALSE, 0);
-	gtk_box_pack_end (GTK_BOX (priv->hbox), vbox, FALSE, FALSE, 0);
-
-	priv->progressbar = gtk_progress_bar_new ();
-	gtk_box_pack_start (GTK_BOX (vbox),
-			    GTK_WIDGET (priv->progressbar),
-		 	    TRUE, TRUE, 1);
-
-        /* We need to set the vertical size request to a small value here,
-         * because the progressbar's default size request is taller than the whole
-         * statusbar. Packing it with expand&fill in the vbox above will nevertheless
-         * make it use the greatest available height.
-         */
-	gtk_widget_set_size_request (priv->progressbar, -1, 10);
-
-	gtk_widget_show_all (vbox);
-}
-
 static void
 ephy_statusbar_init (EphyStatusbar *t)
 {
@@ -205,7 +180,6 @@ ephy_statusbar_init (EphyStatusbar *t)
 	/* don't show priv->popups_manager_evbox yet */
 
 	create_caret_indicator (t);
-	create_statusbar_progress (t);
 }
 
 /**
@@ -287,30 +261,6 @@ ephy_statusbar_set_popups_state (EphyStatusbar *statusbar,
 	}
 }
 
-/**
- * ephy_statusbar_set_progress:
- * @statusbar: a #EphyStatusbar
- * @progress: the progress as an integer between 0 and 100 per cent.
- * 
- * Sets the statusbar's progress.
- **/
-void
-ephy_statusbar_set_progress (EphyStatusbar *statusbar,
-			     int progress)
-{
-	gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (statusbar->priv->progressbar),
-				       (float) (progress) / 100.0);
-
-	if (progress < 100)
-	{
-		gtk_widget_show (statusbar->priv->progressbar);
-	}
-	else
-	{
-		gtk_widget_hide (statusbar->priv->progressbar);
-	}
-}
-
 static void
 sync_visibility (GtkWidget *widget,
 		 GParamSpec *pspec,
diff --git a/src/ephy-statusbar.h b/src/ephy-statusbar.h
index 3e064b786..a92f66198 100644
--- a/src/ephy-statusbar.h
+++ b/src/ephy-statusbar.h
@@ -75,9 +75,6 @@ void          ephy_statusbar_set_popups_state		(EphyStatusbar *statusbar,
 							 gboolean hidden,
 							 const char *tooltip);
 
-void          ephy_statusbar_set_progress		(EphyStatusbar *statusbar,
-							 int progress);
-
 void	      ephy_statusbar_add_widget			(EphyStatusbar *statusbar,
 							 GtkWidget *widget);
 
diff --git a/src/ephy-window.c b/src/ephy-window.c
index 8b3d97486..08e3b595f 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -1634,9 +1634,6 @@ sync_tab_load_progress (EphyEmbed *embed, GParamSpec *pspec, EphyWindow *window)
 	}
 
 	gtk_entry_set_progress_fraction (GTK_ENTRY (window->priv->entry), progress);
-					 
-	ephy_statusbar_set_progress (EPHY_STATUSBAR (window->priv->statusbar),
-				     ephy_embed_get_load_percent (embed));
 }
 
 static void
diff --git a/src/epiphany.defs b/src/epiphany.defs
index b96b50560..833859e1f 100644
--- a/src/epiphany.defs
+++ b/src/epiphany.defs
@@ -3276,15 +3276,6 @@
   )
 )
 
-(define-method set_progress
-  (of-object "EphyStatusbar")
-  (c-name "ephy_statusbar_set_progress")
-  (return-type "none")
-  (parameters
-    '("int" "progress")
-  )
-)
-
 (define-method add_widget
   (of-object "EphyStatusbar")
   (c-name "ephy_statusbar_add_widget")
-- 
cgit v1.2.3