[ease] [general] Display Dialog.Progress text inside progress bar

[Nate Stedman <natesm src gnome org>]

commit bf9370b9b25fb6f1ec96c255ec812b0542a9bc5d
Author: Nate Stedman <natesm gmail com>
Date:   Mon Aug 23 06:01:19 2010 -0400

    [general] Display Dialog.Progress text inside progress bar

 data/ui/progress-dialog.ui          |   10 +---------
 ease-core/ease-dialog-progress.vala |   12 ++----------
 2 files changed, 3 insertions(+), 19 deletions(-)
---
diff --git a/data/ui/progress-dialog.ui b/data/ui/progress-dialog.ui
index ac3216d..8258b5c 100644
--- a/data/ui/progress-dialog.ui
+++ b/data/ui/progress-dialog.ui
@@ -18,15 +18,7 @@
             <property name="visible">True</property>
             <property name="spacing">4</property>
             <child>
-              <object class="GtkLabel" id="label">
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">label</property>
-                <property name="use_markup">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">0</property>
-              </packing>
+              <placeholder/>
             </child>
             <child>
               <object class="GtkProgressBar" id="progress">
diff --git a/ease-core/ease-dialog-progress.vala b/ease-core/ease-dialog-progress.vala
index 498983c..fcb08c3 100644
--- a/ease-core/ease-dialog-progress.vala
+++ b/ease-core/ease-dialog-progress.vala
@@ -27,7 +27,6 @@ public class Ease.Dialog.Progress : GLib.Object
 	
 	private Gtk.Dialog dialog;
 	private Gtk.Button cancel;
-	private Gtk.Label label;
 	private Gtk.ProgressBar progress;
 	private double max_val;
 	private bool destroyed = false;
@@ -56,7 +55,6 @@ public class Ease.Dialog.Progress : GLib.Object
 		// get builder objects
 		dialog = builder.get_object("dialog") as Gtk.Dialog;
 		cancel = builder.get_object("cancel") as Gtk.Button;
-		label = builder.get_object("label") as Gtk.Label;
 		progress = builder.get_object("progress") as Gtk.ProgressBar;
 		
 		// set basic stuff
@@ -84,17 +82,11 @@ public class Ease.Dialog.Progress : GLib.Object
 	}
 	
 	/**
-	 * Sets (or unsets with null) the label of this dialog. Markup allowed.
+	 * Sets (or unsets with null) the label of this dialog.
 	 */
 	public void set_label(string? str)
 	{
-		if (str == null)
-		{
-			label.hide();
-			return;
-		}
-		label.set_markup(str);
-		label.show_all();
+		progress.set_text(str);
 	}
 	
 	/**