diff options
| author | JP Rosevear <jpr@novell.com> | 2004-12-23 04:02:26 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2004-12-23 04:02:26 +0800 |
| commit | d21af5dbf4433cdff8b1aacad13eff48ebcad9c5 (patch) | |
| tree | b52d6dcf3f0097056ea04188b31c23dd52bc82e3 | |
| parent | 2698f79304b6e643123c5765754169e92831b73f (diff) | |
| download | gsoc2013-evolution-d21af5dbf4433cdff8b1aacad13eff48ebcad9c5.tar gsoc2013-evolution-d21af5dbf4433cdff8b1aacad13eff48ebcad9c5.tar.gz gsoc2013-evolution-d21af5dbf4433cdff8b1aacad13eff48ebcad9c5.tar.bz2 gsoc2013-evolution-d21af5dbf4433cdff8b1aacad13eff48ebcad9c5.tar.lz gsoc2013-evolution-d21af5dbf4433cdff8b1aacad13eff48ebcad9c5.tar.xz gsoc2013-evolution-d21af5dbf4433cdff8b1aacad13eff48ebcad9c5.tar.zst gsoc2013-evolution-d21af5dbf4433cdff8b1aacad13eff48ebcad9c5.zip | |
prevent compare against null default_fb_uri and fix thinko
2004-12-22 JP Rosevear <jpr@novell.com>
* gui/e-meeting-store.c (freebusy_async): prevent compare against
null default_fb_uri and fix thinko
svn path=/trunk/; revision=28185
| -rw-r--r-- | calendar/ChangeLog | 5 | ||||
| -rw-r--r-- | calendar/gui/e-meeting-store.c | 2 |
2 files changed, 6 insertions, 1 deletions
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 <jpr@novell.com> + * gui/e-meeting-store.c (freebusy_async): prevent compare against + null default_fb_uri and fix thinko + +2004-12-22 JP Rosevear <jpr@novell.com> + * gui/e-cal-model.c: Change copyright from ximian to novell 2004-12-17 Not Zed <NotZed@Ximian.com> 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; |