if the document requests an unknown URL, it's not an error; just ignore

	* mail-display.c (on_url_requested): if the document requests an
	unknown URL, it's not an error; just ignore the URL.

	* mail-ops.c (fetch_mail): If there's no new mail, tell the user.

svn path=/trunk/; revision=3574

3 files changed, 17 insertions, 1 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index 7f947eb3e6..7e792895d7 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-15  Dan Winship  <danw@helixcode.com>
+
+	* mail-display.c (on_url_requested): if the document requests an
+	unknown URL, it's not an error; just ignore the URL.
+
+	* mail-ops.c (fetch_mail): If there's no new mail, tell the user.
+
 2000-06-14  Radek Doulik  <rodo@helixcode.com>
 
 	* main.c (main): call gtkhtmllib_init here
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 8b07d7eaec..b5db4c69e1 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -275,7 +275,8 @@ on_url_requested (GtkHTML *html, const char *url, GtkHTMLStream *handle,
 	urls = gtk_object_get_data (GTK_OBJECT (message), "urls");
 
 	user_data = g_hash_table_lookup (urls, url);
-	g_return_if_fail (user_data != NULL);
+	if (user_data == NULL)
+		return;
 
 	if (strncmp (url, "cid:", 4) == 0) {
 		CamelMedium *medium = user_data;
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 3ad9a4fe57..2e5100b5cb 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -228,6 +228,14 @@ fetch_mail (GtkWidget *button, gpointer user_data)
 		}
 	}
 
+	if (camel_folder_get_message_count (folder, ex) == 0) {
+		gnome_ok_dialog ("No new messages.");
+		goto cleanup;
+	} else if (camel_exception_is_set (ex)) {
+		mail_exception_dialog ("Unable to get new mail", ex, fb);
+		goto cleanup;
+	}
+
 	/* apply filtering rules to this inbox */
 	filter = filter_driver_new();
 	userrules = g_strdup_printf ("%s/filters.xml", evolution_dir);