make it possible to add new lines and markup in the dialog text.

2005-11-15  Lucas Rocha  <lucasr@cvs.gnome.org>

        * src/calendar.c, src/progress.c, src/tree.c: make
        it possible to add new lines and markup in the dialog
        text.

4 files changed, 11 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 661600cf..ad2abc4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-15  Lucas Rocha  <lucasr@cvs.gnome.org>
+
+	* src/calendar.c, src/progress.c, src/tree.c: make 
+	it possible to add new lines and markup in the dialog
+	text.
+
 2005-11-13  Lucas Rocha  <lucasr@cvs.gnome.org>
 
 	* configure.in: post release version bump.
diff --git a/src/calendar.c b/src/calendar.c
index f876c038..fd0eb7b5 100644
--- a/src/calendar.c
+++ b/src/calendar.c
@@ -68,7 +68,7 @@ zenity_calendar (ZenityData *data, ZenityCalendarData *cal_data)
   text = glade_xml_get_widget (glade_dialog, "zenity_calendar_text");
 
   if (cal_data->dialog_text)
-  gtk_label_set_text (GTK_LABEL (text), cal_data->dialog_text);
+    gtk_label_set_markup (GTK_LABEL (text), g_strcompress (cal_data->dialog_text));
 
   calendar = glade_xml_get_widget (glade_dialog, "zenity_calendar");
 	
diff --git a/src/progress.c b/src/progress.c
index 34779c12..68f34ac4 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -204,7 +204,9 @@ zenity_progress (ZenityData *data, ZenityProgressData *progress_data)
     gtk_window_set_default_size (GTK_WINDOW (dialog), data->width, data->height);
 
   text = glade_xml_get_widget (glade_dialog, "zenity_progress_text");
-  gtk_label_set_text (GTK_LABEL (text), progress_data->dialog_text);
+
+  if (progress_data->dialog_text)
+    gtk_label_set_markup (GTK_LABEL (text), g_strcompress (progress_data->dialog_text));
 
   progress_bar = glade_xml_get_widget (glade_dialog, "zenity_progress_bar");
 
diff --git a/src/tree.c b/src/tree.c
index d6621c32..b3bb977c 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -341,7 +341,7 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data)
   text = glade_xml_get_widget (glade_dialog, "zenity_tree_text");
                                                                                 
   if (tree_data->dialog_text)
-    gtk_label_set_text (GTK_LABEL (text), tree_data->dialog_text);
+    gtk_label_set_markup (GTK_LABEL (text), g_strcompress (tree_data->dialog_text));
 
   zenity_util_set_window_icon (dialog, data->window_icon, ZENITY_IMAGE_FULLPATH ("zenity-list.png"));