[evolution-kolab/ek-wip-porting: 5/10] ECalBackendKolab: removed unneeded notification after online state switching
- From: Christian Hilberg <chilberg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-kolab/ek-wip-porting: 5/10] ECalBackendKolab: removed unneeded notification after online state switching
- Date: Sat, 17 Mar 2012 22:30:00 +0000 (UTC)
commit a6e40b3dc8f53951690078b91190f9cc849b99fd
Author: Christian Hilberg <hilberg kernelconcepts de>
Date: Sat Mar 17 08:53:37 2012 +0100
ECalBackendKolab: removed unneeded notification after online state switching
src/calendar/e-cal-backend-kolab.c | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 deletions(-)
---
diff --git a/src/calendar/e-cal-backend-kolab.c b/src/calendar/e-cal-backend-kolab.c
index 7f27f1f..6409609 100644
--- a/src/calendar/e-cal-backend-kolab.c
+++ b/src/calendar/e-cal-backend-kolab.c
@@ -93,7 +93,6 @@ cal_backend_kolab_signal_online_cb (GObject *object)
ECalBackendKolab *self = NULL;
ECalBackendKolabPrivate *priv = NULL;
gboolean online = FALSE;
- gboolean ok = FALSE;
g_return_if_fail (E_IS_CAL_BACKEND_KOLAB (object));
@@ -146,23 +145,19 @@ cal_backend_kolab_signal_online_cb (GObject *object)
g_error_free (priv->mode_switch_err);
priv->mode_switch_err = NULL;
}
- ok = kolab_util_backend_deploy_mode_by_backend (priv->cal_koma,
- online,
- NULL, /* GCancellable (see above )*/
- &(priv->mode_switch_err));
+ (void) kolab_util_backend_deploy_mode_by_backend (priv->cal_koma,
+ online,
+ NULL, /* GCancellable (see above )*/
+ &(priv->mode_switch_err));
if (priv->mode_switch_err) {
g_warning ("%s()[%u]: Online mode switching error pending (%s)",
__func__, __LINE__, priv->mode_switch_err->message);
}
-
- if (ok) {
- e_cal_backend_notify_online (E_CAL_BACKEND (self), online);
- }
}
static gboolean
cal_backend_kolab_notify_open (ECalBackendKolab *self,
- GError **err)
+ GError **err)
{
ECalBackend *cbackend = NULL;
ECalBackendKolabPrivate *priv = NULL;
@@ -181,7 +176,7 @@ cal_backend_kolab_notify_open (ECalBackendKolab *self,
return FALSE;
}
e_cal_backend_notify_online (cbackend,
- tmp_mode = KOLAB_MAIL_ACCESS_OPMODE_ONLINE ? TRUE : FALSE);
+ tmp_mode = KOLAB_MAIL_ACCESS_OPMODE_ONLINE ? TRUE : FALSE);
e_cal_backend_notify_opened (cbackend, NULL);
return TRUE;
@@ -1621,8 +1616,8 @@ e_cal_backend_kolab_authenticate_user (ECalBackendSync *backend,
/* warn about a possible inconsistency in user names */
kset_user = kolab_settings_handler_get_char_field (ksettings,
- KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_USER_NAME,
- &tmp_err);
+ KOLAB_SETTINGS_HANDLER_CHAR_FIELD_KOLAB_USER_NAME,
+ &tmp_err);
if (tmp_err != NULL) {
g_object_unref (ksettings);
kolab_util_calendar_err_to_edb_err (error, tmp_err, __func__, __LINE__);
@@ -1651,9 +1646,9 @@ e_cal_backend_kolab_authenticate_user (ECalBackendSync *backend,
online = e_backend_get_online (E_BACKEND (backend));
ok = kolab_util_backend_deploy_mode_by_backend (priv->cal_koma,
- online,
- cancellable,
- &tmp_err);
+ online,
+ cancellable,
+ &tmp_err);
if (! ok) {
kolab_util_calendar_err_to_edb_err (error, tmp_err, __func__, __LINE__);
g_error_free (tmp_err);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]