Fixes #55719

2004-04-02  Rodrigo Moya <rodrigo@ximian.com>

	Fixes #55719

	* backends/groupwise/e-cal-backend-groupwise.c (connect_to_server):
	use correct type for populate_cache's return value.
	(e_cal_backend_groupwise_set_mode): use correct type for
	connect_to_server's return value.

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index c461acc..a8dbf3f 100644 (file)
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+2004-04-02  Rodrigo Moya <rodrigo@ximian.com>
+
+       Fixes #55719
+
+       * backends/groupwise/e-cal-backend-groupwise.c (connect_to_server):
+       use correct type for populate_cache's return value.
+       (e_cal_backend_groupwise_set_mode): use correct type for
+       connect_to_server's return value.
+
 2004-03-30  JP Rosevear <jpr@ximian.com>
 
        * backends/file/e-cal-backend-file.c: allow debugging code to be

diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise.c b/calendar/backends/groupwise/e-cal-backend-groupwise.c
index 1b266a9..5772abd 100644 (file)
--- a/calendar/backends/groupwise/e-cal-backend-groupwise.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise.c
@@ -185,7 +185,7 @@ connect_to_server (ECalBackendGroupwise *cbgw)
        GnomeVFSURI *vuri;
        char *real_uri;
        ECalBackendGroupwisePrivate *priv;
-       ECalBackendSyncStatus status;
+       EGwConnectionStatus cnc_status;
 
        priv = cbgw->priv;
 
@@ -230,8 +230,8 @@ connect_to_server (ECalBackendGroupwise *cbgw)
 
                        /* Populate the cache for the first time.*/
                        /* start a timed polling thread set to 10 minutes*/
-                       status = populate_cache (cbgw);
-                       if (status != E_GW_CONNECTION_STATUS_OK) {
+                       cnc_status = populate_cache (cbgw);
+                       if (cnc_status != E_GW_CONNECTION_STATUS_OK) {
                                g_object_unref (priv->cnc);
                                priv->cnc = NULL;
                                g_warning (G_STRLOC ": Could not populate the cache");
@@ -241,9 +241,8 @@ connect_to_server (ECalBackendGroupwise *cbgw)
                                g_object_ref (priv->cache);
                                g_timeout_add (CACHE_REFRESH_INTERVAL, (GSourceFunc) get_deltas, (gpointer) cbgw);
                                priv->mode = CAL_MODE_REMOTE;
+                               return GNOME_Evolution_Calendar_Success;
                        }
-
-                       return status;
                } else {
                        e_cal_backend_notify_error (E_CAL_BACKEND (cbgw), _("Authentication failed"));
                        return GNOME_Evolution_Calendar_AuthenticationFailed;
@@ -485,7 +484,7 @@ e_cal_backend_groupwise_get_mode (ECalBackend *backend)
 static void
 e_cal_backend_groupwise_set_mode (ECalBackend *backend, CalMode mode)
 {
-       EGwConnectionStatus status;
+       ECalBackendSyncStatus status;
        ECalBackendGroupwise *cbgw;
        ECalBackendGroupwisePrivate *priv;