From d21af5dbf4433cdff8b1aacad13eff48ebcad9c5 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Wed, 22 Dec 2004 20:02:26 +0000 Subject: prevent compare against null default_fb_uri and fix thinko 2004-12-22 JP Rosevear * gui/e-meeting-store.c (freebusy_async): prevent compare against null default_fb_uri and fix thinko svn path=/trunk/; revision=28185 --- calendar/ChangeLog | 5 +++++ calendar/gui/e-meeting-store.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'calendar') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 7d90c7720c..cc97a2a5dc 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,5 +1,10 @@ 2004-12-22 JP Rosevear + * gui/e-meeting-store.c (freebusy_async): prevent compare against + null default_fb_uri and fix thinko + +2004-12-22 JP Rosevear + * gui/e-cal-model.c: Change copyright from ximian to novell 2004-12-17 Not Zed diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c index b1082cb02b..7cbfbe2b79 100644 --- a/calendar/gui/e-meeting-store.c +++ b/calendar/gui/e-meeting-store.c @@ -1255,7 +1255,7 @@ freebusy_async (gpointer data) /* Check for free busy info on the default server */ default_fb_uri = g_strdup (fbd->fb_uri); - if (default_fb_uri != NULL || !g_str_equal (default_fb_uri, "")) { + if (default_fb_uri != NULL && !g_str_equal (default_fb_uri, "")) { GnomeVFSAsyncHandle *handle; gchar *tmp_fb_uri; gchar **split_email; -- cgit