[evolution-exchange] More whitespace cleanup.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-exchange] More whitespace cleanup.
- Date: Sun, 30 Jan 2011 15:22:47 +0000 (UTC)
commit 41a45f12970aae707b2bb021cd1b7435b810155e
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun Jan 30 10:19:17 2011 -0500
More whitespace cleanup.
addressbook/e-book-backend-db-cache.c | 4 +-
calendar/e-cal-backend-exchange-calendar.c | 24 +-
calendar/e-cal-backend-exchange-tasks.c | 444 +++++++++++++-------------
calendar/e-cal-backend-exchange.c | 4 +-
eplugin/exchange-account-setup.c | 6 +-
eplugin/exchange-calendar.c | 8 +-
eplugin/exchange-change-password.c | 4 +-
eplugin/exchange-config-listener.c | 18 +-
eplugin/exchange-folder-size-display.c | 22 +-
eplugin/exchange-send-options.c | 2 +-
server/lib/e2k-context.c | 4 +-
server/lib/e2k-xml-utils.c | 6 +-
server/lib/ebrowse.c | 2 +-
server/storage/exchange-account.c | 6 +-
server/storage/exchange-esource.c | 18 +-
server/storage/exchange-folder-size.c | 4 +-
server/storage/exchange-hierarchy-foreign.c | 14 +-
server/storage/exchange-hierarchy-webdav.c | 14 +-
server/storage/exchange-hierarchy.c | 2 +-
server/xntlm/xntlm.c | 12 +-
tools/exchange-share-config-listener.c | 4 +-
21 files changed, 311 insertions(+), 311 deletions(-)
---
diff --git a/addressbook/e-book-backend-db-cache.c b/addressbook/e-book-backend-db-cache.c
index cfdd497..1d60994 100644
--- a/addressbook/e-book-backend-db-cache.c
+++ b/addressbook/e-book-backend-db-cache.c
@@ -312,7 +312,7 @@ e_book_backend_db_cache_get_contacts (DB *db, const gchar *query)
DBT uid_dbt, vcard_dbt;
gint db_error;
GList *list = NULL;
- EBookBackendSExp *sexp = NULL;
+ EBookBackendSExp *sexp = NULL;
EContact *contact;
if (query) {
@@ -347,7 +347,7 @@ e_book_backend_db_cache_get_contacts (DB *db, const gchar *query)
if (sexp)
g_object_unref (sexp);
- return list;
+ return list;
}
/**
diff --git a/calendar/e-cal-backend-exchange-calendar.c b/calendar/e-cal-backend-exchange-calendar.c
index a76ab4b..f5527eb 100644
--- a/calendar/e-cal-backend-exchange-calendar.c
+++ b/calendar/e-cal-backend-exchange-calendar.c
@@ -593,10 +593,10 @@ open_calendar (ECalBackendSync *backend, EDataCal *cal,
e_folder_exchange_subscribe (E_CAL_BACKEND_EXCHANGE (backend)->folder,
E2K_CONTEXT_OBJECT_CHANGED, 30,
notify_changes, backend);
- e_folder_exchange_subscribe (E_CAL_BACKEND_EXCHANGE (backend)->folder,
+ e_folder_exchange_subscribe (E_CAL_BACKEND_EXCHANGE (backend)->folder,
E2K_CONTEXT_OBJECT_ADDED, 30,
notify_changes, backend);
- e_folder_exchange_subscribe (E_CAL_BACKEND_EXCHANGE (backend)->folder,
+ e_folder_exchange_subscribe (E_CAL_BACKEND_EXCHANGE (backend)->folder,
E2K_CONTEXT_OBJECT_REMOVED, 30,
notify_changes, backend);
@@ -1151,9 +1151,9 @@ modify_object_with_href (ECalBackendSync *backend, EDataCal *cal,
e_return_data_cal_error_and_val_if_fail (calobj != NULL, InvalidArg, FALSE);
if (!e_cal_backend_exchange_is_online (E_CAL_BACKEND_EXCHANGE (backend))) {
- g_propagate_error (error, EDC_ERROR (RepositoryOffline));
+ g_propagate_error (error, EDC_ERROR (RepositoryOffline));
return FALSE;
- }
+ }
if (rid_to_remove)
remove = TRUE;
@@ -1550,8 +1550,8 @@ remove_object (ECalBackendSync *backend, EDataCal *cal,
if (!e_cal_backend_exchange_is_online (E_CAL_BACKEND_EXCHANGE (backend))) {
g_propagate_error (error, EDC_ERROR (RepositoryOffline));
- return;
- }
+ return;
+ }
e_cal_backend_exchange_cache_lock (cbex);
ecomp = get_exchange_comp (E_CAL_BACKEND_EXCHANGE (cbexc), uid);
@@ -1637,8 +1637,8 @@ receive_objects (ECalBackendSync *backend, EDataCal *cal,
if (!e_cal_backend_exchange_is_online (E_CAL_BACKEND_EXCHANGE (backend))) {
g_propagate_error (error, EDC_ERROR (RepositoryOffline));
- return;
- }
+ return;
+ }
if (!e_cal_backend_exchange_extract_components (calobj, &method, &comps, error))
return;
@@ -2263,8 +2263,8 @@ discard_alarm (ECalBackendSync *backend, EDataCal *cal,
if (!e_cal_backend_exchange_is_online (E_CAL_BACKEND_EXCHANGE (backend))) {
g_propagate_error (error, EDC_ERROR (RepositoryOffline));
- return;
- }
+ return;
+ }
cbex = E_CAL_BACKEND_EXCHANGE (backend);
@@ -2312,8 +2312,8 @@ get_free_busy (ECalBackendSync *backend, EDataCal *cal,
if (!e_cal_backend_exchange_is_online (E_CAL_BACKEND_EXCHANGE (backend))) {
g_propagate_error (perror, EDC_ERROR (RepositoryOffline));
- return;
- }
+ return;
+ }
/* The calendar component sets start to "exactly 24 hours
* ago". But since we're going to get the information in
diff --git a/calendar/e-cal-backend-exchange-tasks.c b/calendar/e-cal-backend-exchange-tasks.c
index fefe069..fa0a59c 100644
--- a/calendar/e-cal-backend-exchange-tasks.c
+++ b/calendar/e-cal-backend-exchange-tasks.c
@@ -86,75 +86,75 @@ get_from (ECalBackendSync *backend, ECalComponent *comp, gchar **from_name, gcha
*from_name = org.cn;
if (!g_ascii_strncasecmp (org.value, "mailto:";, 7))
*from_addr = org.value + 7;
- else
+ else
*from_addr = org.value;
- } else {
+ } else {
*from_name = e_cal_backend_exchange_get_cal_owner (E_CAL_BACKEND_SYNC (backend));
*from_addr = e_cal_backend_exchange_get_cal_address (E_CAL_BACKEND_SYNC (backend));
- }
+ }
#endif
}
static void
set_uid (E2kProperties *props, ECalComponent *comp)
{
- const gchar *uid;
+ const gchar *uid;
e_cal_component_get_uid (E_CAL_COMPONENT (comp), &uid);
- e2k_properties_set_string (props, E2K_PR_CALENDAR_UID, g_strdup (uid));
+ e2k_properties_set_string (props, E2K_PR_CALENDAR_UID, g_strdup (uid));
}
static void
set_summary (E2kProperties *props, ECalComponent *comp)
{
- static ECalComponentText summary;
+ static ECalComponentText summary;
e_cal_component_get_summary (E_CAL_COMPONENT (comp), &summary);
- if (summary.value) {
- e2k_properties_set_string (props, E2K_PR_HTTPMAIL_THREAD_TOPIC,
- g_strdup (summary.value));
- } else
- e2k_properties_remove (props, E2K_PR_HTTPMAIL_THREAD_TOPIC);
+ if (summary.value) {
+ e2k_properties_set_string (props, E2K_PR_HTTPMAIL_THREAD_TOPIC,
+ g_strdup (summary.value));
+ } else
+ e2k_properties_remove (props, E2K_PR_HTTPMAIL_THREAD_TOPIC);
}
static void
set_priority (E2kProperties *props, ECalComponent *comp)
{
- gint *priority, value = 0;
+ gint *priority, value = 0;
e_cal_component_get_priority (E_CAL_COMPONENT (comp), &priority);
- if (priority) {
- if (*priority == 0)
- value = 0;
- else if (*priority <= 4)
- value = 1;
- else if (*priority == 5)
- value = 0;
- else
- value = -1;
- e_cal_component_free_priority (priority);
- }
- e2k_properties_set_int (props, E2K_PR_MAPI_PRIORITY, value);
+ if (priority) {
+ if (*priority == 0)
+ value = 0;
+ else if (*priority <= 4)
+ value = 1;
+ else if (*priority == 5)
+ value = 0;
+ else
+ value = -1;
+ e_cal_component_free_priority (priority);
+ }
+ e2k_properties_set_int (props, E2K_PR_MAPI_PRIORITY, value);
}
static void
set_sensitivity (E2kProperties *props, ECalComponent *comp)
{
- ECalComponentClassification classif;
- gint sensitivity;
+ ECalComponentClassification classif;
+ gint sensitivity;
e_cal_component_get_classification (E_CAL_COMPONENT (comp), &classif);
- switch (classif) {
- case E_CAL_COMPONENT_CLASS_PRIVATE:
- sensitivity = 2;
- break;
- case E_CAL_COMPONENT_CLASS_CONFIDENTIAL:
- sensitivity = 1;
- break;
- default:
- sensitivity = 0;
- break;
- }
+ switch (classif) {
+ case E_CAL_COMPONENT_CLASS_PRIVATE:
+ sensitivity = 2;
+ break;
+ case E_CAL_COMPONENT_CLASS_CONFIDENTIAL:
+ sensitivity = 1;
+ break;
+ default:
+ sensitivity = 0;
+ break;
+ }
e2k_properties_set_int (props, E2K_PR_MAPI_SENSITIVITY, sensitivity);
}
@@ -187,15 +187,15 @@ gchar *
calcomponentdatetime_to_string (ECalComponentDateTime *dt,
icaltimezone *izone)
{
- time_t tt;
+ time_t tt;
g_return_val_if_fail (dt != NULL, NULL);
- g_return_val_if_fail (dt->value != NULL, NULL);
+ g_return_val_if_fail (dt->value != NULL, NULL);
if (izone != NULL)
- tt = icaltime_as_timet_with_zone (*dt->value, izone);
- else
- tt = icaltime_as_timet (*dt->value);
+ tt = icaltime_as_timet_with_zone (*dt->value, izone);
+ else
+ tt = icaltime_as_timet (*dt->value);
return e2k_make_timestamp (tt);
}
@@ -203,15 +203,15 @@ calcomponentdatetime_to_string (ECalComponentDateTime *dt,
static gchar *
convert_to_utc (ECalComponentDateTime *dt)
{
- icaltimezone *from_zone;
- icaltimezone *utc_zone;
+ icaltimezone *from_zone;
+ icaltimezone *utc_zone;
from_zone = icaltimezone_get_builtin_timezone_from_tzid (dt->tzid);
- utc_zone = icaltimezone_get_utc_timezone ();
- if (!from_zone)
- from_zone = get_default_timezone ();
- dt->value->is_date = 0;
- icaltimezone_convert_time (dt->value, from_zone, utc_zone);
+ utc_zone = icaltimezone_get_utc_timezone ();
+ if (!from_zone)
+ from_zone = get_default_timezone ();
+ dt->value->is_date = 0;
+ icaltimezone_convert_time (dt->value, from_zone, utc_zone);
return calcomponentdatetime_to_string (dt, utc_zone);
}
@@ -219,67 +219,67 @@ convert_to_utc (ECalComponentDateTime *dt)
static void
set_dtstart (E2kProperties *props, ECalComponent *comp)
{
- ECalComponentDateTime dt;
- gchar *dtstart_str;
+ ECalComponentDateTime dt;
+ gchar *dtstart_str;
e_cal_component_get_dtstart (E_CAL_COMPONENT (comp), &dt);
- if (!dt.value || icaltime_is_null_time (*dt.value)) {
- e_cal_component_free_datetime (&dt);
- e2k_properties_remove (props, E2K_PR_MAPI_COMMON_START);
- return;
- }
+ if (!dt.value || icaltime_is_null_time (*dt.value)) {
+ e_cal_component_free_datetime (&dt);
+ e2k_properties_remove (props, E2K_PR_MAPI_COMMON_START);
+ return;
+ }
dtstart_str = convert_to_utc (&dt);
- e_cal_component_free_datetime (&dt);
- e2k_properties_set_date (props, E2K_PR_MAPI_COMMON_START, dtstart_str);
+ e_cal_component_free_datetime (&dt);
+ e2k_properties_set_date (props, E2K_PR_MAPI_COMMON_START, dtstart_str);
}
static void
set_due_date (E2kProperties *props, ECalComponent *comp)
{
- ECalComponentDateTime dt;
- gchar *due_str;
+ ECalComponentDateTime dt;
+ gchar *due_str;
e_cal_component_get_due (E_CAL_COMPONENT (comp), &dt);
- if (!dt.value || icaltime_is_null_time (*dt.value)) {
- e_cal_component_free_datetime (&dt);
- e2k_properties_remove (props, E2K_PR_MAPI_COMMON_END);
- return;
- }
+ if (!dt.value || icaltime_is_null_time (*dt.value)) {
+ e_cal_component_free_datetime (&dt);
+ e2k_properties_remove (props, E2K_PR_MAPI_COMMON_END);
+ return;
+ }
due_str = convert_to_utc (&dt);
- e_cal_component_free_datetime (&dt);
- e2k_properties_set_date (props, E2K_PR_MAPI_COMMON_END, due_str);
+ e_cal_component_free_datetime (&dt);
+ e2k_properties_set_date (props, E2K_PR_MAPI_COMMON_END, due_str);
}
gchar *
icaltime_to_e2k_time (struct icaltimetype *itt)
{
- time_t tt;
+ time_t tt;
g_return_val_if_fail (itt != NULL, NULL);
tt = icaltime_as_timet_with_zone (*itt, icaltimezone_get_utc_timezone ());
- return e2k_make_timestamp (tt);
+ return e2k_make_timestamp (tt);
}
static void
set_date_completed (E2kProperties *props, ECalComponent *comp)
{
- struct icaltimetype *itt;
- gchar *tstr;
+ struct icaltimetype *itt;
+ gchar *tstr;
e_cal_component_get_completed (E_CAL_COMPONENT (comp), &itt);
- if (!itt || icaltime_is_null_time (*itt)) {
- e2k_properties_remove (props, E2K_PR_OUTLOOK_TASK_DONE_DT);
- return;
- }
+ if (!itt || icaltime_is_null_time (*itt)) {
+ e2k_properties_remove (props, E2K_PR_OUTLOOK_TASK_DONE_DT);
+ return;
+ }
icaltimezone_convert_time (itt,
icaltimezone_get_builtin_timezone ((const gchar *)itt->zone),
icaltimezone_get_utc_timezone ());
- tstr = icaltime_to_e2k_time (itt);
- e_cal_component_free_icaltimetype (itt);
+ tstr = icaltime_to_e2k_time (itt);
+ e_cal_component_free_icaltimetype (itt);
e2k_properties_set_date (props, E2K_PR_OUTLOOK_TASK_DONE_DT, tstr);
}
@@ -287,48 +287,48 @@ set_date_completed (E2kProperties *props, ECalComponent *comp)
static void
set_status (E2kProperties *props, ECalComponent *comp)
{
- icalproperty_status ical_status;
- gint status;
+ icalproperty_status ical_status;
+ gint status;
e_cal_component_get_status (E_CAL_COMPONENT (comp), &ical_status);
- switch (ical_status) {
- case ICAL_STATUS_NONE :
- case ICAL_STATUS_NEEDSACTION :
+ switch (ical_status) {
+ case ICAL_STATUS_NONE :
+ case ICAL_STATUS_NEEDSACTION :
/* Not Started */
- status = 0;
- break;
- case ICAL_STATUS_INPROCESS :
+ status = 0;
+ break;
+ case ICAL_STATUS_INPROCESS :
/* In Progress */
- status = 1;
- break;
- case ICAL_STATUS_COMPLETED :
+ status = 1;
+ break;
+ case ICAL_STATUS_COMPLETED :
/* Completed */
- status = 2;
- break;
- case ICAL_STATUS_CANCELLED :
+ status = 2;
+ break;
+ case ICAL_STATUS_CANCELLED :
/* Deferred */
- status = 4;
- break;
- default :
- status = 0;
- }
+ status = 4;
+ break;
+ default :
+ status = 0;
+ }
e2k_properties_set_int (props, E2K_PR_OUTLOOK_TASK_STATUS, status);
- e2k_properties_set_bool (props, E2K_PR_OUTLOOK_TASK_IS_DONE, status == 2);
+ e2k_properties_set_bool (props, E2K_PR_OUTLOOK_TASK_IS_DONE, status == 2);
}
static void
set_percent (E2kProperties *props, ECalComponent *comp)
{
- gint *percent;
- gfloat res;
+ gint *percent;
+ gfloat res;
e_cal_component_get_percent (E_CAL_COMPONENT (comp), &percent);
- if (percent) {
- res = (gfloat) *percent / 100.0;
- e_cal_component_free_percent (percent);
- } else
- res = 0.;
+ if (percent) {
+ res = (gfloat) *percent / 100.0;
+ e_cal_component_free_percent (percent);
+ } else
+ res = 0.;
e2k_properties_set_float (props, E2K_PR_OUTLOOK_TASK_PERCENT, res);
}
@@ -336,24 +336,24 @@ set_percent (E2kProperties *props, ECalComponent *comp)
static void
set_categories (E2kProperties *props, ECalComponent *comp)
{
- GSList *categories;
- GSList *sl;
- GPtrArray *array;
+ GSList *categories;
+ GSList *sl;
+ GPtrArray *array;
e_cal_component_get_categories_list (E_CAL_COMPONENT (comp), &categories);
- if (!categories) {
- e2k_properties_remove (props, E2K_PR_EXCHANGE_KEYWORDS);
- return;
- }
+ if (!categories) {
+ e2k_properties_remove (props, E2K_PR_EXCHANGE_KEYWORDS);
+ return;
+ }
array = g_ptr_array_new ();
- for (sl = categories; sl != NULL; sl = sl->next) {
- gchar *cat = (gchar *) sl->data;
+ for (sl = categories; sl != NULL; sl = sl->next) {
+ gchar *cat = (gchar *) sl->data;
if (cat)
- g_ptr_array_add (array, g_strdup (cat));
- }
- e_cal_component_free_categories_list (categories);
+ g_ptr_array_add (array, g_strdup (cat));
+ }
+ e_cal_component_free_categories_list (categories);
e2k_properties_set_string_array (props, E2K_PR_EXCHANGE_KEYWORDS, array);
}
@@ -361,13 +361,13 @@ set_categories (E2kProperties *props, ECalComponent *comp)
static void
set_url (E2kProperties *props, ECalComponent *comp)
{
- const gchar *url;
+ const gchar *url;
e_cal_component_get_url (E_CAL_COMPONENT (comp), &url);
- if (url)
- e2k_properties_set_string (props, E2K_PR_CALENDAR_URL, g_strdup (url));
- else
- e2k_properties_remove (props, E2K_PR_CALENDAR_URL);
+ if (url)
+ e2k_properties_set_string (props, E2K_PR_CALENDAR_URL, g_strdup (url));
+ else
+ e2k_properties_remove (props, E2K_PR_CALENDAR_URL);
}
static void
@@ -442,29 +442,29 @@ put_body (ECalComponent *comp, E2kContext *ctx, E2kOperation *op,
gchar **repl_uid)
{
- GSList *desc_list;
- GString *desc;
- gchar *desc_crlf;
- gchar *body, *date;
- gint status;
+ GSList *desc_list;
+ GString *desc;
+ gchar *desc_crlf;
+ gchar *body, *date;
+ gint status;
/* get the description */
- e_cal_component_get_description_list (E_CAL_COMPONENT (comp), &desc_list);
+ e_cal_component_get_description_list (E_CAL_COMPONENT (comp), &desc_list);
desc = g_string_new ("");
- if (desc_list != NULL) {
- GSList *sl;
+ if (desc_list != NULL) {
+ GSList *sl;
- for (sl = desc_list; sl; sl = sl->next) {
- ECalComponentText *text = (ECalComponentText *) sl->data;
+ for (sl = desc_list; sl; sl = sl->next) {
+ ECalComponentText *text = (ECalComponentText *) sl->data;
- if (text)
- desc = g_string_append (desc, text->value);
- }
- }
+ if (text)
+ desc = g_string_append (desc, text->value);
+ }
+ }
/* PUT the component on the server */
- desc_crlf = e2k_lf_to_crlf ((const gchar *) desc->str);
- date = e2k_make_timestamp_rfc822 (time (NULL));
+ desc_crlf = e2k_lf_to_crlf ((const gchar *) desc->str);
+ date = e2k_make_timestamp_rfc822 (time (NULL));
if (attach_body) {
body = g_strdup_printf ("content-class: urn:content-classes:task\r\n"
@@ -485,17 +485,17 @@ put_body (ECalComponent *comp, E2kContext *ctx, E2kOperation *op,
"Priority: %s\r\n"
"Importance: %s\r\n"
"\r\n%s\r\n%s",
- get_summary (comp),
- date,
- get_uid (comp),
+ get_summary (comp),
+ date,
+ get_uid (comp),
boundary,
from_name ? from_name : "Evolution",
from_addr ? from_addr : "",
boundary,
- get_summary (comp),
- get_priority (comp),
- get_priority (comp),
- desc_crlf,
+ get_summary (comp),
+ get_priority (comp),
+ get_priority (comp),
+ desc_crlf,
attach_body);
} else {
@@ -512,28 +512,28 @@ put_body (ECalComponent *comp, E2kContext *ctx, E2kOperation *op,
"Importance: %s\r\n"
"From: \"%s\" <%s>\r\n"
"\r\n%s",
- get_summary (comp),
- date,
- get_uid (comp),
- get_summary (comp),
- get_priority (comp),
- get_priority (comp),
+ get_summary (comp),
+ date,
+ get_uid (comp),
+ get_summary (comp),
+ get_priority (comp),
+ get_priority (comp),
from_name ? from_name : "Evolution",
from_addr ? from_addr : "",
- desc_crlf);
+ desc_crlf);
}
status = e2k_context_put (ctx, NULL, uri, "message/rfc822",
body, strlen (body), NULL);
/* free memory */
- g_free (body);
- g_free (desc_crlf);
- g_free (date);
- e_cal_component_free_text_list (desc_list);
- g_string_free (desc, TRUE);
+ g_free (body);
+ g_free (desc_crlf);
+ g_free (date);
+ e_cal_component_free_text_list (desc_list);
+ g_string_free (desc, TRUE);
- return status;
+ return status;
}
static const gchar *task_props[] = {
@@ -583,7 +583,7 @@ get_changed_tasks (ECalBackendExchange *cbex)
const gchar *since = NULL;
ECalBackendExchangeTasks *cbext = E_CAL_BACKEND_EXCHANGE_TASKS (cbex);
- g_return_val_if_fail (E_IS_CAL_BACKEND_EXCHANGE (cbex), SOUP_STATUS_CANCELLED);
+ g_return_val_if_fail (E_IS_CAL_BACKEND_EXCHANGE (cbex), SOUP_STATUS_CANCELLED);
g_mutex_lock (cbext->priv->mutex);
@@ -603,16 +603,16 @@ get_changed_tasks (ECalBackendExchange *cbex)
e_cal_backend_exchange_cache_sync_start (cbex);
e_cal_backend_exchange_cache_unlock (cbex);
- if (cbex->private_item_restriction) {
- e2k_restriction_ref (cbex->private_item_restriction);
- rn = e2k_restriction_andv (rn, cbex->private_item_restriction, NULL);
- }
+ if (cbex->private_item_restriction) {
+ e2k_restriction_ref (cbex->private_item_restriction);
+ rn = e2k_restriction_andv (rn, cbex->private_item_restriction, NULL);
+ }
- iter = e_folder_exchange_search_start (cbex->folder, NULL,
+ iter = e_folder_exchange_search_start (cbex->folder, NULL,
task_props,
G_N_ELEMENTS (task_props),
rn, NULL, TRUE);
- e2k_restriction_unref (rn);
+ e2k_restriction_unref (rn);
hrefs = g_ptr_array_new ();
modtimes = g_hash_table_new_full (g_str_hash, g_str_equal,
@@ -1010,15 +1010,15 @@ open_task (ECalBackendSync *backend, EDataCal *cal,
return;
/* Subscribe to the folder to notice changes */
- e_folder_exchange_subscribe (E_CAL_BACKEND_EXCHANGE (backend)->folder,
- E2K_CONTEXT_OBJECT_CHANGED, 30,
- notify_changes, backend);
- e_folder_exchange_subscribe (E_CAL_BACKEND_EXCHANGE (backend)->folder,
- E2K_CONTEXT_OBJECT_ADDED, 30,
- notify_changes, backend);
- e_folder_exchange_subscribe (E_CAL_BACKEND_EXCHANGE (backend)->folder,
- E2K_CONTEXT_OBJECT_REMOVED, 30,
- notify_changes, backend);
+ e_folder_exchange_subscribe (E_CAL_BACKEND_EXCHANGE (backend)->folder,
+ E2K_CONTEXT_OBJECT_CHANGED, 30,
+ notify_changes, backend);
+ e_folder_exchange_subscribe (E_CAL_BACKEND_EXCHANGE (backend)->folder,
+ E2K_CONTEXT_OBJECT_ADDED, 30,
+ notify_changes, backend);
+ e_folder_exchange_subscribe (E_CAL_BACKEND_EXCHANGE (backend)->folder,
+ E2K_CONTEXT_OBJECT_REMOVED, 30,
+ notify_changes, backend);
thread = g_thread_create ((GThreadFunc) get_changed_tasks, E_CAL_BACKEND_EXCHANGE (backend), FALSE, &error);
if (!thread) {
@@ -1084,11 +1084,11 @@ create_task_object (ECalBackendSync *backend, EDataCal *cal,
/* Check kind with the parent */
kind = e_cal_backend_get_kind (E_CAL_BACKEND (ecalbex));
- if (icalcomponent_isa (icalcomp) != kind) {
+ if (icalcomponent_isa (icalcomp) != kind) {
icalcomponent_free (icalcomp);
g_propagate_error (error, EDC_ERROR (InvalidObject));
return;
- }
+ }
current = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ());
icalprop = icalcomponent_get_first_property (icalcomp, ICAL_CREATED_PROPERTY);
@@ -1133,8 +1133,8 @@ create_task_object (ECalBackendSync *backend, EDataCal *cal,
summary = "";
/* Create the cal component */
- comp = e_cal_component_new ();
- e_cal_component_set_icalcomponent (comp, icalcomp);
+ comp = e_cal_component_new ();
+ e_cal_component_set_icalcomponent (comp, icalcomp);
get_from (backend, comp, &from_name, &from_addr);
@@ -1246,22 +1246,22 @@ modify_task_object (ECalBackendSync *backend, EDataCal *cal,
}
/* Parse the icalendar text */
- icalcomp = icalparser_parse_string ((gchar *) calobj);
- if (!icalcomp) {
- g_propagate_error (error, EDC_ERROR (InvalidObject));
+ icalcomp = icalparser_parse_string ((gchar *) calobj);
+ if (!icalcomp) {
+ g_propagate_error (error, EDC_ERROR (InvalidObject));
return;
}
/* Check kind with the parent */
- if (icalcomponent_isa (icalcomp) !=
+ if (icalcomponent_isa (icalcomp) !=
e_cal_backend_get_kind (E_CAL_BACKEND (backend))) {
- icalcomponent_free (icalcomp);
+ icalcomponent_free (icalcomp);
g_propagate_error (error, EDC_ERROR (InvalidObject));
return;
- }
+ }
/* Get the uid */
- comp_uid = icalcomponent_get_uid (icalcomp);
+ comp_uid = icalcomponent_get_uid (icalcomp);
e_cal_backend_exchange_cache_lock (ecalbex);
/* Get the object from our cache */
@@ -1275,8 +1275,8 @@ modify_task_object (ECalBackendSync *backend, EDataCal *cal,
return;
}
- cache_comp = e_cal_component_new ();
- e_cal_component_set_icalcomponent (cache_comp, icalcomponent_new_clone (ecalbexcomp->icomp));
+ cache_comp = e_cal_component_new ();
+ e_cal_component_set_icalcomponent (cache_comp, icalcomponent_new_clone (ecalbexcomp->icomp));
*old_object = e_cal_component_get_as_string (cache_comp);
g_object_unref (cache_comp);
@@ -1291,12 +1291,12 @@ modify_task_object (ECalBackendSync *backend, EDataCal *cal,
summary = "";
/* Create the cal component */
- new_comp = e_cal_component_new ();
- e_cal_component_set_icalcomponent (new_comp, icalcomp);
+ new_comp = e_cal_component_new ();
+ e_cal_component_set_icalcomponent (new_comp, icalcomp);
/* Set the last modified time on the component */
- current = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ());
- e_cal_component_set_last_modified (new_comp, ¤t);
+ current = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ());
+ e_cal_component_set_last_modified (new_comp, ¤t);
/* Set Attachments */
if (e_cal_component_has_attachments (new_comp)) {
@@ -1315,12 +1315,12 @@ modify_task_object (ECalBackendSync *backend, EDataCal *cal,
get_from (backend, new_comp, &from_name, &from_addr);
- props = e2k_properties_new ();
+ props = e2k_properties_new ();
update_props (new_comp, &props);
e_cal_component_commit_sequence (new_comp);
- e2kctx = exchange_account_get_context (ecalbex->account);
+ e2kctx = exchange_account_get_context (ecalbex->account);
status = e2k_context_proppatch (e2kctx, NULL, ecalbexcomp->href, props, FALSE, NULL);
comp_str = e_cal_component_get_as_string (new_comp);
icalcomp = icalparser_parse_string (comp_str);
@@ -1346,18 +1346,18 @@ receive_task_objects (ECalBackendSync *backend, EDataCal *cal,
{
ECalBackendExchangeTasks *ecalbextask;
ECalBackendExchange *cbex;
- ECalComponent *ecalcomp;
- GList *comps, *l;
- struct icaltimetype current;
- icalproperty_method method;
- icalcomponent *subcomp;
+ ECalComponent *ecalcomp;
+ GList *comps, *l;
+ struct icaltimetype current;
+ icalproperty_method method;
+ icalcomponent *subcomp;
GError *err = NULL;
ecalbextask = E_CAL_BACKEND_EXCHANGE_TASKS (backend);
cbex = E_CAL_BACKEND_EXCHANGE (backend);
e_return_data_cal_error_if_fail (E_IS_CAL_BACKEND_EXCHANGE_TASKS (ecalbextask), InvalidArg);
- e_return_data_cal_error_if_fail (calobj != NULL, InvalidArg);
+ e_return_data_cal_error_if_fail (calobj != NULL, InvalidArg);
if (!e_cal_backend_exchange_is_online (E_CAL_BACKEND_EXCHANGE (backend))) {
d(printf ("tasks are offline\n"));
@@ -1369,59 +1369,59 @@ receive_task_objects (ECalBackendSync *backend, EDataCal *cal,
return;
for (l = comps; l; l = l->next) {
- const gchar *uid;
- gchar *calobj, *rid = NULL;
+ const gchar *uid;
+ gchar *calobj, *rid = NULL;
- subcomp = l->data;
+ subcomp = l->data;
- ecalcomp = e_cal_component_new ();
- e_cal_component_set_icalcomponent (ecalcomp, subcomp);
+ ecalcomp = e_cal_component_new ();
+ e_cal_component_set_icalcomponent (ecalcomp, subcomp);
- current = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ());
- e_cal_component_set_created (ecalcomp, ¤t);
- e_cal_component_set_last_modified (ecalcomp, ¤t);
+ current = icaltime_current_time_with_zone (icaltimezone_get_utc_timezone ());
+ e_cal_component_set_created (ecalcomp, ¤t);
+ e_cal_component_set_last_modified (ecalcomp, ¤t);
/*sanitize?*/
e_cal_component_get_uid (ecalcomp, &uid);
- rid = e_cal_component_get_recurid_as_string (ecalcomp);
+ rid = e_cal_component_get_recurid_as_string (ecalcomp);
/*see if the object is there in the cache. if found, modify object, else create object*/
e_cal_backend_exchange_cache_lock (cbex);
- if (get_exchange_comp (E_CAL_BACKEND_EXCHANGE (ecalbextask), uid)) {
- gchar *old_object;
+ if (get_exchange_comp (E_CAL_BACKEND_EXCHANGE (ecalbextask), uid)) {
+ gchar *old_object;
e_cal_backend_exchange_cache_unlock (cbex);
- modify_task_object (backend, cal, calobj, CALOBJ_MOD_THIS, &old_object, NULL, &err);
- if (err) {
+ modify_task_object (backend, cal, calobj, CALOBJ_MOD_THIS, &old_object, NULL, &err);
+ if (err) {
g_free (rid);
g_propagate_error (error, err);
- return;
+ return;
}
- e_cal_backend_notify_object_modified (E_CAL_BACKEND (backend), old_object, calobj);
+ e_cal_backend_notify_object_modified (E_CAL_BACKEND (backend), old_object, calobj);
g_free (old_object);
- } else {
- gchar *returned_uid;
+ } else {
+ gchar *returned_uid;
e_cal_backend_exchange_cache_unlock (cbex);
calobj = (gchar *) icalcomponent_as_ical_string_r (subcomp);
create_task_object (backend, cal, &calobj, &returned_uid, &err);
- if (err) {
+ if (err) {
g_free (calobj);
g_free (rid);
g_propagate_error (error, err);
- return;
+ return;
}
- e_cal_backend_notify_object_created (E_CAL_BACKEND (backend), calobj);
+ e_cal_backend_notify_object_created (E_CAL_BACKEND (backend), calobj);
g_free (calobj);
- }
+ }
g_free (rid);
- }
+ }
- g_list_free (comps);
+ g_list_free (comps);
}
static void
@@ -1452,7 +1452,7 @@ remove_task_object (ECalBackendSync *backend, EDataCal *cal,
return;
}
- comp = e_cal_component_new ();
+ comp = e_cal_component_new ();
e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (ecalbexcomp->icomp));
*old_object = e_cal_component_get_as_string (comp);
g_object_unref (comp);
diff --git a/calendar/e-cal-backend-exchange.c b/calendar/e-cal-backend-exchange.c
index 7730e9c..0bf6436 100644
--- a/calendar/e-cal-backend-exchange.c
+++ b/calendar/e-cal-backend-exchange.c
@@ -237,9 +237,9 @@ load_cache (ECalBackendExchange *cbex, E2kUri *e2kuri, GError **perror)
g_free (mangled_uri);
/* Check if the cache file is present. If it is not present the account might
- be newly created one. It will be created while save the cache */
+ be newly created one. It will be created while save the cache */
if (!g_file_test (cbex->priv->object_cache_file, G_FILE_TEST_EXISTS))
- return TRUE;
+ return TRUE;
vcalcomp = e_cal_util_parse_ics_file (cbex->priv->object_cache_file);
if (!vcalcomp) {
diff --git a/eplugin/exchange-account-setup.c b/eplugin/exchange-account-setup.c
index 384badc..e854009 100644
--- a/eplugin/exchange-account-setup.c
+++ b/eplugin/exchange-account-setup.c
@@ -249,8 +249,8 @@ org_gnome_exchange_settings (EPlugin *epl, EConfigHookItemFactoryData *data)
e_alert_run_dialog_for_args (GTK_WINDOW (data->config->target->widget), ERROR_DOMAIN ":state-read-error", NULL);
- return NULL;
- }
+ return NULL;
+ }
if (message && *message)
oof_data->message = g_strdup (message);
@@ -909,7 +909,7 @@ org_gnome_exchange_commit (EPlugin *epl, EMConfigTargetAccount *target_account)
&offline_status);
if (offline_status == OFFLINE_MODE) {
- return;
+ return;
}
/* Set oof data in exchange account */
diff --git a/eplugin/exchange-calendar.c b/eplugin/exchange-calendar.c
index 4662845..4a1f472 100644
--- a/eplugin/exchange-calendar.c
+++ b/eplugin/exchange-calendar.c
@@ -153,7 +153,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
ExchangeAccount *account;
gchar *ruri;
gchar *account_name;
- gchar *uri_text;
+ gchar *uri_text;
gchar *cal_name;
gchar *folder_size;
const gchar *rel_uri;
@@ -178,7 +178,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
if (uri && strcmp (uri->protocol, "exchange")) {
e_uri_free (uri);
- g_free (uri_text);
+ g_free (uri_text);
return hidden;
}
@@ -339,8 +339,8 @@ e_exchange_calendar_check (EPlugin *epl, EConfigHookPageCheckData *data)
if (!calendar_src_exists) {
/* new folder */
- return TRUE;
- }
+ return TRUE;
+ }
account = exchange_operations_get_exchange_account ();
if (!account)
diff --git a/eplugin/exchange-change-password.c b/eplugin/exchange-change-password.c
index 68e93ab..f86c8e7 100644
--- a/eplugin/exchange-change-password.c
+++ b/eplugin/exchange-change-password.c
@@ -38,8 +38,8 @@ entry_changed (GtkEntry *entry, gpointer user_data)
GtkDialog *pass_dialog;
const gchar *text;
- new_entry = GTK_ENTRY (entry);
- confirm_entry = GTK_ENTRY (user_data);
+ new_entry = GTK_ENTRY (entry);
+ confirm_entry = GTK_ENTRY (user_data);
pass_dialog = GTK_DIALOG (g_object_get_data (G_OBJECT (new_entry), "pass_dialog"));
text = gtk_entry_get_text (new_entry);
diff --git a/eplugin/exchange-config-listener.c b/eplugin/exchange-config-listener.c
index 5cadde1..c460c41 100644
--- a/eplugin/exchange-config-listener.c
+++ b/eplugin/exchange-config-listener.c
@@ -405,7 +405,7 @@ add_new_sources (ExchangeAccount *account)
GPtrArray *exchange_folders;
exchange_folders = exchange_account_get_folders (account);
- if (exchange_folders && exchange_folders->len > 0) {
+ if (exchange_folders && exchange_folders->len > 0) {
gint i;
const gchar *folder_type;
const gchar *folder_name;
@@ -449,7 +449,7 @@ add_new_sources (ExchangeAccount *account)
folder_name, folder_uri);
} /* End hierarchy type check */
} /* End for loop */
- } /* End check for a list of folders */
+ } /* End check for a list of folders */
}
static void
@@ -458,7 +458,7 @@ add_sources (ExchangeAccount *account)
GPtrArray *exchange_folders;
exchange_folders = exchange_account_get_folders (account);
- if (exchange_folders && exchange_folders->len > 0) {
+ if (exchange_folders && exchange_folders->len > 0) {
gint i;
const gchar *folder_type;
EFolder *folder;
@@ -499,7 +499,7 @@ add_sources (ExchangeAccount *account)
add_account_esources (account, folders);
g_slist_foreach (folders, (GFunc) g_free, NULL);
g_slist_free (folders);
- }
+ }
}
#endif
@@ -536,8 +536,8 @@ remove_account_esource (ExchangeAccount *account,
group = E_SOURCE_GROUP (groups->data);
if (strcmp (e_source_group_peek_name (group), account->account_name) == 0
- &&
- strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
+ &&
+ strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
sources = e_source_group_peek_sources (group);
for (; sources != NULL; sources = g_slist_next (sources)) {
@@ -1358,7 +1358,7 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac
ESourceGroup *group = E_SOURCE_GROUP (groups->data);
if (strcmp (e_source_group_peek_name (group), account->account_name) == 0
- &&
+ &&
strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
GSList *sources = e_source_group_peek_sources (group);
@@ -1473,8 +1473,8 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const gchar *gco
group = E_SOURCE_GROUP (groups->data);
if (strcmp (e_source_group_peek_name (group), account->account_name) == 0
- &&
- strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
+ &&
+ strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
sources = e_source_group_peek_sources (group);
for (; sources != NULL; sources = g_slist_next (sources)) {
diff --git a/eplugin/exchange-folder-size-display.c b/eplugin/exchange-folder-size-display.c
index 9ef7d1c..4e1956a 100644
--- a/eplugin/exchange-folder-size-display.c
+++ b/eplugin/exchange-folder-size-display.c
@@ -117,7 +117,7 @@ calc_folder_size_func (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter
void
exchange_folder_size_display (GtkListStore *model, GtkWidget *parent)
{
- GtkTreeViewColumn *column;
+ GtkTreeViewColumn *column;
GtkTreeSortable *sortable;
GtkCellRenderer *cell;
GtkWidget *folder_tree;
@@ -130,7 +130,7 @@ exchange_folder_size_display (GtkListStore *model, GtkWidget *parent)
gchar *col_name, *total_size_str;
gdouble total_size;
- g_return_if_fail (GTK_IS_WIDGET (parent));
+ g_return_if_fail (GTK_IS_WIDGET (parent));
folder_tree = gtk_dialog_new_with_buttons (
_("Exchange Folder Tree"),
@@ -175,13 +175,13 @@ exchange_folder_size_display (GtkListStore *model, GtkWidget *parent)
sortable = GTK_TREE_SORTABLE (model);
gtk_tree_sortable_set_sort_column_id (sortable, COLUMN_SIZE, GTK_SORT_DESCENDING);
- column = gtk_tree_view_column_new_with_attributes (
+ column = gtk_tree_view_column_new_with_attributes (
_("Folder Name"), gtk_cell_renderer_text_new (), "text", COLUMN_NAME, NULL);
- gtk_tree_view_append_column (GTK_TREE_VIEW (folder_treeview),
- column);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (folder_treeview),
+ column);
col_name = g_strdup_printf ("%s (KB)", _("Folder Size"));
- column = gtk_tree_view_column_new_with_attributes (
+ column = gtk_tree_view_column_new_with_attributes (
col_name, gtk_cell_renderer_text_new (), "text", COLUMN_SIZE, NULL);
g_free (col_name);
@@ -190,10 +190,10 @@ exchange_folder_size_display (GtkListStore *model, GtkWidget *parent)
gtk_tree_view_column_set_cell_data_func (column, cell, format_size_func, NULL, NULL );
g_list_free (l);
- gtk_tree_view_append_column (GTK_TREE_VIEW (folder_treeview),
- column);
- gtk_tree_view_set_model (GTK_TREE_VIEW (folder_treeview),
- GTK_TREE_MODEL (model));
+ gtk_tree_view_append_column (GTK_TREE_VIEW (folder_treeview),
+ column);
+ gtk_tree_view_set_model (GTK_TREE_VIEW (folder_treeview),
+ GTK_TREE_MODEL (model));
gtk_dialog_run (GTK_DIALOG (folder_tree));
- gtk_widget_destroy (folder_tree);
+ gtk_widget_destroy (folder_tree);
}
diff --git a/eplugin/exchange-send-options.c b/eplugin/exchange-send-options.c
index 7357755..50b440d 100644
--- a/eplugin/exchange-send-options.c
+++ b/eplugin/exchange-send-options.c
@@ -219,7 +219,7 @@ static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer fu
ExchangeSendOptionsDialog *sod;
sod = func_data;
- priv = sod->priv;
+ priv = sod->priv;
switch (state) {
case GTK_RESPONSE_OK:
diff --git a/server/lib/e2k-context.c b/server/lib/e2k-context.c
index fa6c87f..6fa9180 100644
--- a/server/lib/e2k-context.c
+++ b/server/lib/e2k-context.c
@@ -433,8 +433,8 @@ e2k_context_set_auth (E2kContext *ctx, const gchar *username,
timeout = atoi (g_getenv ("SOUP_SESSION_TIMEOUT"));
/* Check do we need a proxy to contact the server? */
- if (e_proxy_require_proxy_for_uri (ctx->priv->proxy, ctx->priv->owa_uri))
- uri = e_proxy_peek_uri_for (ctx->priv->proxy, ctx->priv->owa_uri);
+ if (e_proxy_require_proxy_for_uri (ctx->priv->proxy, ctx->priv->owa_uri))
+ uri = e_proxy_peek_uri_for (ctx->priv->proxy, ctx->priv->owa_uri);
ctx->priv->session = soup_session_sync_new_with_options (
SOUP_SESSION_USE_NTLM, !authmech || !strcmp (authmech, "NTLM"),
diff --git a/server/lib/e2k-xml-utils.c b/server/lib/e2k-xml-utils.c
index 75b98b3..2f2d955 100644
--- a/server/lib/e2k-xml-utils.c
+++ b/server/lib/e2k-xml-utils.c
@@ -70,7 +70,7 @@ e2k_parse_xml (const gchar *buf, gint len)
return NULL;
xmlFree (ctxt->sax);
- ctxt->sax = sax;
+ ctxt->sax = sax;
#if LIBXML_VERSION > 20600
ctxt->sax2 = 1;
ctxt->str_xml = xmlDictLookup (ctxt->dict, BAD_CAST "xml", 3);
@@ -128,8 +128,8 @@ e2k_parse_html (const gchar *buf, gint len)
if (!ctxt)
return NULL;
- xmlFree (ctxt->sax);
- ctxt->sax = sax;
+ xmlFree (ctxt->sax);
+ ctxt->sax = sax;
ctxt->vctxt.error = my_xml_parser_error_handler;
ctxt->vctxt.warning = my_xml_parser_error_handler;
diff --git a/server/lib/ebrowse.c b/server/lib/ebrowse.c
index 1f6363c..ce610cc 100644
--- a/server/lib/ebrowse.c
+++ b/server/lib/ebrowse.c
@@ -338,7 +338,7 @@ get_fav_properties (E2kContext *ctx, gchar *uri)
rn = e2k_restriction_prop_bool (E2K_PR_DAV_IS_COLLECTION,
E2K_RELOP_EQ, FALSE);
iter = e2k_context_search_start (ctx, &op, top, &prop, 1,
- rn, NULL, FALSE);
+ rn, NULL, FALSE);
e2k_restriction_unref (rn);
while ((result = e2k_result_iter_next (iter))) {
diff --git a/server/storage/exchange-account.c b/server/storage/exchange-account.c
index 1978b46..f74899a 100644
--- a/server/storage/exchange-account.c
+++ b/server/storage/exchange-account.c
@@ -1598,10 +1598,10 @@ exchange_account_connect (ExchangeAccount *account, const gchar *pword,
/* Check for quota usage */
e2k_operation_init (&gcop);
gcstatus = e2k_global_catalog_lookup (account->priv->gc, &gcop,
- E2K_GLOBAL_CATALOG_LOOKUP_BY_EMAIL,
- account->priv->identity_email,
+ E2K_GLOBAL_CATALOG_LOOKUP_BY_EMAIL,
+ account->priv->identity_email,
E2K_GLOBAL_CATALOG_LOOKUP_QUOTA,
- &entry);
+ &entry);
e2k_operation_free (&gcop);
/* FIXME: warning message should have quota limit value
diff --git a/server/storage/exchange-esource.c b/server/storage/exchange-esource.c
index ccf6fc9..5654cc9 100644
--- a/server/storage/exchange-esource.c
+++ b/server/storage/exchange-esource.c
@@ -133,7 +133,7 @@ add_folder_esource (ExchangeAccount *account,
useremail = exchange_account_get_email_id (account);
authtype = exchange_account_get_authtype (account);
- if ((source_group = find_account_group (source_list, account)) == NULL) {
+ if ((source_group = find_account_group (source_list, account)) == NULL) {
source_group = e_source_group_new (account->account_name,
EXCHANGE_URI_PREFIX);
if (!e_source_list_add_group (source_list, source_group, -1)) {
@@ -361,8 +361,8 @@ remove_folder_esource (ExchangeAccount *account,
group = E_SOURCE_GROUP (groups->data);
if (strcmp (e_source_group_peek_name (group), account->account_name) == 0
- &&
- strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
+ &&
+ strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
sources = e_source_group_peek_sources (group);
@@ -426,13 +426,13 @@ remove_folder_esource (ExchangeAccount *account,
g_slist_free (ids);
}
}
- found_group = TRUE;
- break;
- }
+ found_group = TRUE;
+ break;
+ }
g_free (read_uri);
- }
- }
- }
+ }
+ }
+ }
g_object_unref (source_list);
g_object_unref (client);
}
diff --git a/server/storage/exchange-folder-size.c b/server/storage/exchange-folder-size.c
index 1f522ba..ff65ca8 100644
--- a/server/storage/exchange-folder-size.c
+++ b/server/storage/exchange-folder-size.c
@@ -114,7 +114,7 @@ exchange_folder_size_init (ExchangeFolderSize *fsize)
{
fsize->priv = g_new0 (ExchangeFolderSizePrivate, 1);
fsize->priv->table = g_hash_table_new (g_str_hash, g_str_equal);
- fsize->priv->model = gtk_list_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_DOUBLE);
+ fsize->priv->model = gtk_list_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_DOUBLE);
fsize->priv->row_refs = g_hash_table_new (g_str_hash, g_str_equal);
}
@@ -240,7 +240,7 @@ exchange_folder_size_get (ExchangeFolderSize *fsize,
GtkListStore *
exchange_folder_size_get_model (ExchangeFolderSize *fsize)
{
- ExchangeFolderSizePrivate *priv;
+ ExchangeFolderSizePrivate *priv;
priv = fsize->priv;
diff --git a/server/storage/exchange-hierarchy-foreign.c b/server/storage/exchange-hierarchy-foreign.c
index 93d5174..3eff09c 100644
--- a/server/storage/exchange-hierarchy-foreign.c
+++ b/server/storage/exchange-hierarchy-foreign.c
@@ -348,21 +348,21 @@ remove_folder (ExchangeHierarchy *hier, EFolder *folder)
/* Temp Fix for remove fav folders. see #59168 */
/* remove ESources */
- folder_type = e_folder_get_type_string (folder);
- physical_uri = e_folder_get_physical_uri (folder);
+ folder_type = e_folder_get_type_string (folder);
+ physical_uri = e_folder_get_physical_uri (folder);
if (strcmp (folder_type, "calendar") == 0) {
- remove_folder_esource (hier->account,
+ remove_folder_esource (hier->account,
EXCHANGE_CALENDAR_FOLDER,
physical_uri);
- }
+ }
else if (strcmp (folder_type, "tasks") == 0) {
- remove_folder_esource (hier->account,
+ remove_folder_esource (hier->account,
EXCHANGE_TASKS_FOLDER,
physical_uri);
- }
+ }
else if (strcmp (folder_type, "contacts") == 0) {
- remove_folder_esource (hier->account,
+ remove_folder_esource (hier->account,
EXCHANGE_CONTACTS_FOLDER,
physical_uri);
}
diff --git a/server/storage/exchange-hierarchy-webdav.c b/server/storage/exchange-hierarchy-webdav.c
index 71df3a3..e53c17e 100644
--- a/server/storage/exchange-hierarchy-webdav.c
+++ b/server/storage/exchange-hierarchy-webdav.c
@@ -311,8 +311,8 @@ create_folder (ExchangeHierarchy *hier, EFolder *parent,
gint i, mode;
exchange_account_is_offline (hier->account, &mode);
- if (mode != ONLINE_MODE)
- return EXCHANGE_ACCOUNT_FOLDER_OFFLINE;
+ if (mode != ONLINE_MODE)
+ return EXCHANGE_ACCOUNT_FOLDER_OFFLINE;
for (i = 0; folder_types[i].component; i++) {
if (!strcmp (folder_types[i].component, type))
@@ -361,10 +361,10 @@ remove_folder (ExchangeHierarchy *hier, EFolder *folder)
E2kHTTPStatus status;
gint mode;
- exchange_account_is_offline (hier->account, &mode);
+ exchange_account_is_offline (hier->account, &mode);
- if (mode != ONLINE_MODE)
- return EXCHANGE_ACCOUNT_FOLDER_OFFLINE;
+ if (mode != ONLINE_MODE)
+ return EXCHANGE_ACCOUNT_FOLDER_OFFLINE;
if (folder == hier->toplevel)
return EXCHANGE_ACCOUNT_FOLDER_PERMISSION_DENIED;
@@ -394,8 +394,8 @@ xfer_folder (ExchangeHierarchy *hier, EFolder *source,
gint mode;
exchange_account_is_offline (hier->account, &mode);
- if (mode != ONLINE_MODE)
- return EXCHANGE_ACCOUNT_FOLDER_OFFLINE;
+ if (mode != ONLINE_MODE)
+ return EXCHANGE_ACCOUNT_FOLDER_OFFLINE;
if (source == hier->toplevel)
return EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR;
diff --git a/server/storage/exchange-hierarchy.c b/server/storage/exchange-hierarchy.c
index afc347b..b152ea1 100644
--- a/server/storage/exchange-hierarchy.c
+++ b/server/storage/exchange-hierarchy.c
@@ -160,7 +160,7 @@ exchange_hierarchy_removed_folder (ExchangeHierarchy *hier,
EFolder *folder)
{
g_return_if_fail (EXCHANGE_IS_HIERARCHY (hier));
- g_return_if_fail (E_IS_FOLDER (folder));
+ g_return_if_fail (E_IS_FOLDER (folder));
g_signal_emit (hier, signals[REMOVED_FOLDER], 0, folder);
}
diff --git a/server/xntlm/xntlm.c b/server/xntlm/xntlm.c
index c97db03..557a2fe 100644
--- a/server/xntlm/xntlm.c
+++ b/server/xntlm/xntlm.c
@@ -252,7 +252,7 @@ setup_schedule (const guchar *key_56, XNTLM_DES_KS ks)
key[i] ^= 0x01;
}
- xntlm_deskey (ks, key, XNTLM_DES_ENCRYPT);
+ xntlm_deskey (ks, key, XNTLM_DES_ENCRYPT);
}
static guchar LM_PASSWORD_MAGIC[] = {
@@ -305,19 +305,19 @@ static void
ntlm_calc_response (const guchar key[21], const guchar plaintext[8],
guchar results[24])
{
- XNTLM_DES_KS ks;
+ XNTLM_DES_KS ks;
memcpy (results, plaintext, 8);
memcpy (results + 8, plaintext, 8);
memcpy (results + 16, plaintext, 8);
- setup_schedule (key, ks);
+ setup_schedule (key, ks);
xntlm_des (ks, results);
- setup_schedule (key + 7, ks);
+ setup_schedule (key + 7, ks);
xntlm_des (ks, results + 8);
- setup_schedule (key + 14, ks);
- xntlm_des (ks, results + 16);
+ setup_schedule (key + 14, ks);
+ xntlm_des (ks, results + 16);
}
diff --git a/tools/exchange-share-config-listener.c b/tools/exchange-share-config-listener.c
index 7270eca..3385214 100644
--- a/tools/exchange-share-config-listener.c
+++ b/tools/exchange-share-config-listener.c
@@ -321,8 +321,8 @@ migrate_account_esource (EAccount *account,
group = E_SOURCE_GROUP (groups->data);
if (strcmp (e_source_group_peek_name (group), account->name) == 0
- &&
- strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
+ &&
+ strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) {
sources = e_source_group_peek_sources (group);
found_group = TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
