13 files changed, 20 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 79b6664..9cb482a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2003-01-18  Glynn Foster  <glynn.foster@sun.com>
 
+	* help/C/figures/zenity-calendar-screenshot.png,
+	help/C/figures/zenity-entry-screenshot.png,
+	help/C/figures/zenity-error-screenshot.png,
+	help/C/figures/zenity-fileselection-screenshot.png,
+	help/C/figures/zenity-information-screenshot.png,
+	help/C/figures/zenity-list-screenshot.png,
+	help/C/figures/zenity-progress-screenshot.png,
+	help/C/figures/zenity-question-screenshot.png,
+	help/C/figures/zenity-text-screenshot.png,
+	help/C/figures/zenity-warning-screenshot.png: Add some 
+	screenshots for the help documentation.
+
+	* src/entry.c, src/msg.c: Don't set the text if it's NULL.
+
+2003-01-18  Glynn Foster  <glynn.foster@sun.com>
+
 	* help/C/zenity.xml: Only some examples and some screenshots
 	and we're mostly done for a first draft.
 
diff --git a/help/C/figures/zenity-calendar-screenshot.png b/help/C/figures/zenity-calendar-screenshot.png
new file mode 100644
index 0000000..9058931
--- /dev/null
+++ b/help/C/figures/zenity-calendar-screenshot.png
diff --git a/help/C/figures/zenity-entry-screenshot.png b/help/C/figures/zenity-entry-screenshot.png
new file mode 100644
index 0000000..2726664
--- /dev/null
+++ b/help/C/figures/zenity-entry-screenshot.png
diff --git a/help/C/figures/zenity-error-screenshot.png b/help/C/figures/zenity-error-screenshot.png
new file mode 100644
index 0000000..36720d6
--- /dev/null
+++ b/help/C/figures/zenity-error-screenshot.png
diff --git a/help/C/figures/zenity-fileselection-screenshot.png b/help/C/figures/zenity-fileselection-screenshot.png
new file mode 100644
index 0000000..6c0f47c
--- /dev/null
+++ b/help/C/figures/zenity-fileselection-screenshot.png
diff --git a/help/C/figures/zenity-information-screenshot.png b/help/C/figures/zenity-information-screenshot.png
new file mode 100644
index 0000000..3dad60d
--- /dev/null
+++ b/help/C/figures/zenity-information-screenshot.png
diff --git a/help/C/figures/zenity-list-screenshot.png b/help/C/figures/zenity-list-screenshot.png
new file mode 100644
index 0000000..7f36824
--- /dev/null
+++ b/help/C/figures/zenity-list-screenshot.png
diff --git a/help/C/figures/zenity-progress-screenshot.png b/help/C/figures/zenity-progress-screenshot.png
new file mode 100644
index 0000000..56ba2a3
--- /dev/null
+++ b/help/C/figures/zenity-progress-screenshot.png
diff --git a/help/C/figures/zenity-question-screenshot.png b/help/C/figures/zenity-question-screenshot.png
new file mode 100644
index 0000000..1ed334d
--- /dev/null
+++ b/help/C/figures/zenity-question-screenshot.png
diff --git a/help/C/figures/zenity-text-screenshot.png b/help/C/figures/zenity-text-screenshot.png
new file mode 100644
index 0000000..4efee26
--- /dev/null
+++ b/help/C/figures/zenity-text-screenshot.png
diff --git a/help/C/figures/zenity-warning-screenshot.png b/help/C/figures/zenity-warning-screenshot.png
new file mode 100644
index 0000000..fe6ffce
--- /dev/null
+++ b/help/C/figures/zenity-warning-screenshot.png
diff --git a/src/entry.c b/src/entry.c
index 81fc2c5..3578788 100644
--- a/src/entry.c
+++ b/src/entry.c
@@ -56,7 +56,7 @@ zenity_entry (ZenityData *data, ZenityEntryData *entry_data)
 	if (data->window_icon)
 		zenity_util_set_window_icon (dialog, data->window_icon);
 	else
-		/* FIXME: Come up with a nice default window icon */;
+		zenity_util_set_window_icon (dialog, ZENITY_IMAGE_FULLPATH ("zenity-entry.png"));
 	
 	text = glade_xml_get_widget (glade_dialog, "zenity_entry_text");
 
diff --git a/src/msg.c b/src/msg.c
index cc1f092..5c73af0 100644
--- a/src/msg.c
+++ b/src/msg.c
@@ -103,8 +103,9 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data)
 				break;
 		}
 	}
-
-	gtk_label_set_text (GTK_LABEL (text), msg_data->dialog_text);
+        
+        if (msg_data->dialog_text)
+	        gtk_label_set_text (GTK_LABEL (text), msg_data->dialog_text);
 
 	gtk_widget_show (dialog);
 	gtk_main ();