[gnome-calendar/gnome-3-36] new-calendar-page: improve URI validity check

[Michael Catanzaro <mcatanzaro src gnome org>]

commit f11a3c82d416f3577a3faf9f1ffeac00a477fab6
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Thu Apr 2 02:18:47 2020 +0000

    new-calendar-page: improve URI validity check
    
    This check passes if the URI is empty. Normally this callback only runs
    when there is text in the URL entry, but there is a race window where
    the user could delete it first. (Passing NULL to a SoupURI creates an
    invalid non-NULL empty URI that can be filled in later.)
    
    
    (cherry picked from commit bba6c60c328dc77f532f4d095d101f22e48e7e4c)

 src/gui/calendar-management/gcal-new-calendar-page.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/src/gui/calendar-management/gcal-new-calendar-page.c 
b/src/gui/calendar-management/gcal-new-calendar-page.c
index 82af123e..e5e526c1 100644
--- a/src/gui/calendar-management/gcal-new-calendar-page.c
+++ b/src/gui/calendar-management/gcal-new-calendar-page.c
@@ -341,7 +341,7 @@ validate_url_cb (gpointer data)
   self->validate_url_resource_id = 0;
 
   uri = soup_uri_new (gtk_entry_get_text (self->calendar_address_entry));
-  valid_uri = uri != NULL;
+  valid_uri = uri != NULL && SOUP_URI_IS_VALID (uri);
 
   set_url_entry_error (self, !valid_uri);