epiphany r8651 - trunk/src

[xan svn gnome org]

Author: xan
Date: Tue Dec 30 22:32:44 2008
New Revision: 8651
URL: http://svn.gnome.org/viewvc/epiphany?rev=8651&view=rev

Log:
Remove progress from statusbar now that we show it in the location entry.

Modified:
   trunk/src/ephy-statusbar.c
   trunk/src/ephy-statusbar.h
   trunk/src/ephy-window.c
   trunk/src/epiphany.defs

Modified: trunk/src/ephy-statusbar.c
==============================================================================
--- trunk/src/ephy-statusbar.c	(original)
+++ trunk/src/ephy-statusbar.c	Tue Dec 30 22:32:44 2008
@@ -41,7 +41,6 @@
 
 	GtkWidget *caret_indicator;
 	GtkWidget *security_icon;
-	GtkWidget *progressbar;
 	GtkWidget *security_evbox;
 	GtkWidget *popups_manager_icon;
 	GtkWidget *popups_manager_evbox;
@@ -140,30 +139,6 @@
 }
 
 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)
 {
 	GtkStatusbar *gstatusbar = GTK_STATUSBAR (t);
@@ -205,7 +180,6 @@
 	/* don't show priv->popups_manager_evbox yet */
 
 	create_caret_indicator (t);
-	create_statusbar_progress (t);
 }
 
 /**
@@ -287,30 +261,6 @@
 	}
 }
 
-/**
- * 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,

Modified: trunk/src/ephy-statusbar.h
==============================================================================
--- trunk/src/ephy-statusbar.h	(original)
+++ trunk/src/ephy-statusbar.h	Tue Dec 30 22:32:44 2008
@@ -75,9 +75,6 @@
 							 gboolean hidden,
 							 const char *tooltip);
 
-void          ephy_statusbar_set_progress		(EphyStatusbar *statusbar,
-							 int progress);
-
 void	      ephy_statusbar_add_widget			(EphyStatusbar *statusbar,
 							 GtkWidget *widget);
 

Modified: trunk/src/ephy-window.c
==============================================================================
--- trunk/src/ephy-window.c	(original)
+++ trunk/src/ephy-window.c	Tue Dec 30 22:32:44 2008
@@ -1634,9 +1634,6 @@
 	}
 
 	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

Modified: trunk/src/epiphany.defs
==============================================================================
--- trunk/src/epiphany.defs	(original)
+++ trunk/src/epiphany.defs	Tue Dec 30 22:32:44 2008
@@ -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")