[evolution-exchange] Coding style cleanups.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-exchange] Coding style cleanups.
- Date: Mon, 13 Sep 2010 13:16:38 +0000 (UTC)
commit f5d6f04990b1e01222a5be6efa21fded1ab64e87
Author: Matthew Barnes <mbarnes redhat com>
Date: Mon Sep 13 08:30:30 2010 -0400
Coding style cleanups.
addressbook/e-book-backend-db-cache.c | 34 ++--
addressbook/e-book-backend-db-cache.h | 10 +-
addressbook/e-book-backend-exchange.c | 32 ++--
addressbook/e-book-backend-gal.c | 230 ++++++++++++++--------------
addressbook/e-book-backend-gal.h | 12 +-
calendar/e-cal-backend-exchange-calendar.c | 12 +-
calendar/e-cal-backend-exchange-tasks.c | 16 +-
calendar/e-cal-backend-exchange.c | 12 +-
camel/camel-exchange-folder.c | 14 +-
camel/camel-exchange-store.c | 2 +-
camel/camel-exchange-summary.c | 20 ++--
camel/camel-exchange-utils.c | 8 +-
camel/mail-utils.c | 4 +-
eplugin/exchange-account-setup.c | 138 +++++++++---------
eplugin/exchange-calendar.c | 4 +-
eplugin/exchange-config-listener.c | 2 +-
eplugin/exchange-contacts.c | 4 +-
eplugin/exchange-delegates-user.c | 2 +-
eplugin/exchange-folder-size-display.c | 4 +-
eplugin/exchange-mail-send-options.c | 2 +-
eplugin/exchange-operations.c | 6 +-
eplugin/exchange-send-options.c | 6 +-
server/lib/e2k-autoconfig.c | 2 +-
server/lib/e2k-global-catalog.c | 10 +-
server/lib/e2k-properties.h | 2 +-
server/lib/e2k-security-descriptor.c | 24 ++--
server/lib/e2k-types.h | 4 +-
server/lib/e2k-uri.c | 2 +-
server/lib/e2k-xml-utils.c | 4 +-
server/lib/ebrowse.c | 10 +-
server/storage/exchange-folder-size.c | 2 +-
server/storage/exchange-hierarchy-webdav.c | 2 +-
server/storage/exchange-oof.c | 4 +-
server/xntlm/xntlm-des.c | 38 +++---
server/xntlm/xntlm-md4.c | 100 ++++++------
tools/exchange-autoconfig-wizard.c | 2 +-
36 files changed, 390 insertions(+), 390 deletions(-)
---
diff --git a/addressbook/e-book-backend-db-cache.c b/addressbook/e-book-backend-db-cache.c
index ed83036..cfdd497 100644
--- a/addressbook/e-book-backend-db-cache.c
+++ b/addressbook/e-book-backend-db-cache.c
@@ -30,11 +30,11 @@
#include <libedataserver/e-data-server-util.h>
void
-string_to_dbt(const gchar *str, DBT *dbt)
+string_to_dbt (const gchar *str, DBT *dbt)
{
- memset(dbt, 0, sizeof(dbt));
+ memset (dbt, 0, sizeof (dbt));
dbt->data = (gpointer)str;
- dbt->size = strlen(str) + 1;
+ dbt->size = strlen (str) + 1;
dbt->flags = DB_DBT_USERMEM;
}
@@ -67,7 +67,7 @@ get_filename_from_uri (const gchar *uri)
**/
void
-e_book_backend_db_cache_set_filename(DB *db, const gchar *filename)
+e_book_backend_db_cache_set_filename (DB *db, const gchar *filename)
{
DBT uid_dbt, vcard_dbt;
gint db_error;
@@ -90,14 +90,14 @@ e_book_backend_db_cache_set_filename(DB *db, const gchar *filename)
**/
gchar *
-e_book_backend_db_cache_get_filename(DB *db)
+e_book_backend_db_cache_get_filename (DB *db)
{
DBT uid_dbt, vcard_dbt;
gint db_error;
gchar *filename;
string_to_dbt ("filename", &uid_dbt);
- memset (&vcard_dbt, 0 , sizeof(vcard_dbt));
+ memset (&vcard_dbt, 0 , sizeof (vcard_dbt));
vcard_dbt.flags = DB_DBT_MALLOC;
db_error = db->get (db, NULL, &uid_dbt, &vcard_dbt, 0);
@@ -113,7 +113,7 @@ e_book_backend_db_cache_get_filename(DB *db)
}
void
-e_book_backend_db_cache_set_time(DB *db, const gchar *t)
+e_book_backend_db_cache_set_time (DB *db, const gchar *t)
{
DBT uid_dbt, vcard_dbt;
gint db_error;
@@ -135,7 +135,7 @@ e_book_backend_db_cache_get_time (DB *db)
gchar *t;
string_to_dbt ("last_update_time", &uid_dbt);
- memset (&vcard_dbt, 0, sizeof(vcard_dbt));
+ memset (&vcard_dbt, 0, sizeof (vcard_dbt));
vcard_dbt.flags = DB_DBT_MALLOC;
db_error = db->get (db, NULL, &uid_dbt, &vcard_dbt, 0);
@@ -171,7 +171,7 @@ e_book_backend_db_cache_get_contact (DB *db, const gchar *uid)
g_return_val_if_fail (uid != NULL, NULL);
string_to_dbt (uid, &uid_dbt);
- memset (&vcard_dbt, 0 , sizeof(vcard_dbt));
+ memset (&vcard_dbt, 0 , sizeof (vcard_dbt));
vcard_dbt.flags = DB_DBT_MALLOC;
db_error = db->get (db, NULL, &uid_dbt, &vcard_dbt,0);
@@ -217,7 +217,7 @@ e_book_backend_db_cache_add_contact (DB *db,
}
string_to_dbt (uid, &uid_dbt);
- vcard_str = e_vcard_to_string (E_VCARD(contact), EVC_FORMAT_VCARD_30);
+ vcard_str = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
string_to_dbt (vcard_str, &vcard_dbt);
//db_error = db->del (db, NULL, &uid_dbt, 0);
@@ -282,7 +282,7 @@ e_book_backend_db_cache_check_contact (DB *db, const gchar *uid)
g_return_val_if_fail (uid != NULL, FALSE);
string_to_dbt (uid, &uid_dbt);
- memset (&vcard_dbt, 0 , sizeof(vcard_dbt));
+ memset (&vcard_dbt, 0 , sizeof (vcard_dbt));
vcard_dbt.flags = DB_DBT_MALLOC;
db_error = db->get (db, NULL, &uid_dbt, &vcard_dbt,0);
@@ -327,13 +327,13 @@ e_book_backend_db_cache_get_contacts (DB *db, const gchar *query)
return NULL;
}
- memset(&vcard_dbt, 0 , sizeof(vcard_dbt));
- memset(&uid_dbt, 0, sizeof(uid_dbt));
- db_error = dbc->c_get(dbc, &uid_dbt, &vcard_dbt, DB_FIRST);
+ memset (&vcard_dbt, 0 , sizeof (vcard_dbt));
+ memset (&uid_dbt, 0, sizeof (uid_dbt));
+ db_error = dbc->c_get (dbc, &uid_dbt, &vcard_dbt, DB_FIRST);
while (db_error == 0) {
if (vcard_dbt.data && !strncmp (vcard_dbt.data, "BEGIN:VCARD", 11))
- if (e_book_backend_sexp_match_vcard(sexp, vcard_dbt.data)) {
+ if (e_book_backend_sexp_match_vcard (sexp, vcard_dbt.data)) {
contact = e_contact_new_from_vcard (vcard_dbt.data);
list = g_list_prepend (list, contact);
}
@@ -440,7 +440,7 @@ e_book_backend_db_cache_is_populated (DB *db)
gint db_error;
string_to_dbt ("populated", &uid_dbt);
- memset(&vcard_dbt, 0, sizeof(vcard_dbt));
+ memset (&vcard_dbt, 0, sizeof (vcard_dbt));
vcard_dbt.flags = DB_DBT_MALLOC;
db_error = db->get (db, NULL, &uid_dbt, &vcard_dbt, 0);
@@ -448,7 +448,7 @@ e_book_backend_db_cache_is_populated (DB *db)
return FALSE;
}
else {
- free(vcard_dbt.data);
+ free (vcard_dbt.data);
return TRUE;
}
}
diff --git a/addressbook/e-book-backend-db-cache.h b/addressbook/e-book-backend-db-cache.h
index b108f11..afc3581 100644
--- a/addressbook/e-book-backend-db-cache.h
+++ b/addressbook/e-book-backend-db-cache.h
@@ -26,11 +26,11 @@
#include "db.h"
EContact* e_book_backend_db_cache_get_contact (DB *db, const gchar *uid);
-void string_to_dbt(const gchar *str, DBT *dbt);
-gchar *e_book_backend_db_cache_get_filename(DB *db);
-void e_book_backend_db_cache_set_filename(DB *db, const gchar *filename);
-gchar *e_book_backend_db_cache_get_time(DB *db);
-void e_book_backend_db_cache_set_time(DB *db, const gchar *time);
+void string_to_dbt (const gchar *str, DBT *dbt);
+gchar *e_book_backend_db_cache_get_filename (DB *db);
+void e_book_backend_db_cache_set_filename (DB *db, const gchar *filename);
+gchar *e_book_backend_db_cache_get_time (DB *db);
+void e_book_backend_db_cache_set_time (DB *db, const gchar *time);
gboolean e_book_backend_db_cache_add_contact (DB *db,
EContact *contact);
gboolean e_book_backend_db_cache_remove_contact (DB *db,
diff --git a/addressbook/e-book-backend-exchange.c b/addressbook/e-book-backend-exchange.c
index 8128708..d2a3127 100644
--- a/addressbook/e-book-backend-exchange.c
+++ b/addressbook/e-book-backend-exchange.c
@@ -100,11 +100,11 @@ struct EBookBackendExchangePrivate {
typedef struct PropMapping PropMapping;
static void subscription_notify (E2kContext *ctx, const gchar *uri, E2kContextChangeType type, gpointer user_data);
-static void proppatch_address(PropMapping *prop_mapping, EContact *new_contact, EContact *cur_contact, E2kProperties *props);
-static void proppatch_email(PropMapping *prop_mapping, EContact *new_contact, EContact *cur_contact, E2kProperties *props);
-static void proppatch_date(PropMapping *prop_mapping, EContact *new_contact, EContact *cur_contact, E2kProperties *props);
-static void populate_address(EContactField field, EContact *new_contact, gpointer data);
-static void populate_date(EContactField field, EContact *new_contact, gpointer data);
+static void proppatch_address (PropMapping *prop_mapping, EContact *new_contact, EContact *cur_contact, E2kProperties *props);
+static void proppatch_email (PropMapping *prop_mapping, EContact *new_contact, EContact *cur_contact, E2kProperties *props);
+static void proppatch_date (PropMapping *prop_mapping, EContact *new_contact, EContact *cur_contact, E2kProperties *props);
+static void populate_address (EContactField field, EContact *new_contact, gpointer data);
+static void populate_date (EContactField field, EContact *new_contact, gpointer data);
static void proppatch_categories (PropMapping *prop_mapping, EContact *new_contact, EContact *cur_contact, E2kProperties *props);
static void populate_categories (EContactField field, EContact *new_contact, gpointer data);
static E2kRestriction *e_book_backend_exchange_build_restriction (const gchar *sexp,
@@ -512,7 +512,7 @@ e_contact_from_props (EBookBackendExchange *be, E2kResult *result)
}
data = e2k_properties_get_prop (result->props, E2K_PR_HTTPMAIL_HAS_ATTACHMENT);
- if (!data || !atoi(data))
+ if (!data || !atoi (data))
return contact;
/* Fetch the body and parse out the photo */
@@ -638,7 +638,7 @@ build_cache (EBookBackendExchange *be)
if (!contact)
continue;
e_book_backend_cache_add_contact (bepriv->cache, contact);
- g_object_unref(contact);
+ g_object_unref (contact);
}
e_book_backend_cache_set_populated (bepriv->cache);
bepriv->is_cache_ready=TRUE;
@@ -670,7 +670,7 @@ update_cache (EBookBackendExchange *be)
if (!contact)
continue;
e_book_backend_cache_add_contact (bepriv->cache, contact);
- g_object_unref(contact);
+ g_object_unref (contact);
}
e_book_backend_cache_set_populated (bepriv->cache);
bepriv->is_cache_ready=TRUE;
@@ -1006,7 +1006,7 @@ proppatch_date (PropMapping *prop_mapping,
}
if (new_dt) {
- memset (&then, 0, sizeof(then));
+ memset (&then, 0, sizeof (then));
then.tm_year = new_dt->year - 1900;
then.tm_mon = new_dt->month - 1;
then.tm_mday = new_dt->day;
@@ -1025,7 +1025,7 @@ proppatch_date (PropMapping *prop_mapping,
}
static void
-populate_date(EContactField field, EContact *new_contact, gpointer data)
+populate_date (EContactField field, EContact *new_contact, gpointer data)
{
gchar *date = (gchar *)data;
time_t tt;
@@ -1461,7 +1461,7 @@ build_message (const gchar *from_name, const gchar *from_email,
g_object_unref (multipart);
}
- buffer = g_byte_array_new();
+ buffer = g_byte_array_new ();
stream = camel_stream_mem_new ();
camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (stream), buffer);
camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (msg), stream, NULL);
@@ -2228,7 +2228,7 @@ e_book_backend_exchange_get_contact_list (EBookBackendSync *backend,
query);
temp = offline_contacts;
for (; offline_contacts != NULL;
- offline_contacts = g_list_next(offline_contacts)) {
+ offline_contacts = g_list_next (offline_contacts)) {
vcard_list = g_list_append (
vcard_list,
e_vcard_to_string (
@@ -2334,7 +2334,7 @@ e_book_backend_exchange_start_book_view (EBookBackend *backend,
contacts = e_book_backend_cache_get_contacts (bepriv->cache,
query);
temp_list = contacts;
- for (; contacts != NULL; contacts = g_list_next(contacts)) {
+ for (; contacts != NULL; contacts = g_list_next (contacts)) {
/* FIXME: Need muex here?
g_mutex_lock (closure->mutex);
stopped = closure->stopped;
@@ -2348,7 +2348,7 @@ e_book_backend_exchange_start_book_view (EBookBackend *backend,
}
*/
e_data_book_view_notify_update (book_view,
- E_CONTACT(contacts->data));
+ E_CONTACT (contacts->data));
g_object_unref (contacts->data);
}
//if (!stopped)
@@ -2756,7 +2756,7 @@ e_book_backend_exchange_get_supported_fields (EBookBackendSync *backend,
for (i = 0; i < G_N_ELEMENTS (prop_mappings); i++) {
if (prop_mappings[i].e_book_field) {
*methods = g_list_prepend (*methods,
- g_strdup (e_contact_field_name(prop_mappings[i].field)));
+ g_strdup (e_contact_field_name (prop_mappings[i].field)));
}
}
}
@@ -2850,7 +2850,7 @@ e_book_backend_exchange_load_source (EBookBackend *backend,
}
// writable property will be set in authenticate_user callback
- e_book_backend_set_is_writable (E_BOOK_BACKEND(backend), FALSE);
+ e_book_backend_set_is_writable (E_BOOK_BACKEND (backend), FALSE);
e_book_backend_set_is_loaded (E_BOOK_BACKEND (be), TRUE);
e_book_backend_notify_connection_status (E_BOOK_BACKEND (be), TRUE);
}
diff --git a/addressbook/e-book-backend-gal.c b/addressbook/e-book-backend-gal.c
index 353f3e6..27d127f 100644
--- a/addressbook/e-book-backend-gal.c
+++ b/addressbook/e-book-backend-gal.c
@@ -259,7 +259,7 @@ find_book_view (EBookBackendGAL *bl)
if (e_iterator_is_valid (iter)) {
/* just always use the first book view */
- EDataBookView *v = (EDataBookView*)e_iterator_get(iter);
+ EDataBookView *v = (EDataBookView*)e_iterator_get (iter);
if (v)
rv = v;
}
@@ -515,7 +515,7 @@ get_contact_handler (LDAPOp *op, LDAPMessage *res)
gchar *vcard;
g_mutex_lock (bl->priv->ldap_lock);
- e = ldap_first_entry(bl->priv->ldap, res);
+ e = ldap_first_entry (bl->priv->ldap, res);
g_mutex_unlock (bl->priv->ldap_lock);
if (!e) {
@@ -899,14 +899,14 @@ get_contact_list (EBookBackend *backend,
#define IS_RFC2254_CHAR(c) ((c) == '*' || (c) =='\\' || (c) == '(' || (c) == ')' || (c) == '\0')
static gchar *
-rfc2254_escape(gchar *str)
+rfc2254_escape (gchar *str)
{
gint i;
- gint len = strlen(str);
+ gint len = strlen (str);
gint newlen = 0;
for (i = 0; i < len; i++) {
- if (IS_RFC2254_CHAR(str[i]))
+ if (IS_RFC2254_CHAR (str[i]))
newlen += 3;
else
newlen++;
@@ -919,7 +919,7 @@ rfc2254_escape(gchar *str)
gchar *newstr = g_malloc0 (newlen + 1);
gint j = 0;
for (i = 0; i < len; i++) {
- if (IS_RFC2254_CHAR(str[i])) {
+ if (IS_RFC2254_CHAR (str[i])) {
sprintf (newstr + j, "\\%02x", str[i]);
j+= 3;
}
@@ -932,7 +932,7 @@ rfc2254_escape(gchar *str)
}
static ESExpResult *
-func_and(ESExp *f, gint argc, ESExpResult **argv, gpointer data)
+func_and (ESExp *f, gint argc, ESExpResult **argv, gpointer data)
{
ESExpResult *r;
GString *string;
@@ -942,30 +942,30 @@ func_and(ESExp *f, gint argc, ESExpResult **argv, gpointer data)
for (i = 0; i < argc; i++) {
if (argv[i]->type == ESEXP_RES_BOOL &&
argv[i]->value.boolean == FALSE) {
- r = e_sexp_result_new(f, ESEXP_RES_BOOL);
+ r = e_sexp_result_new (f, ESEXP_RES_BOOL);
r->value.boolean = FALSE;
return r;
} else if (argv[i]->type == ESEXP_RES_UNDEFINED)
- return e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
+ return e_sexp_result_new (f, ESEXP_RES_UNDEFINED);
}
string = g_string_new("(&");
for (i = 0; i < argc; i++) {
if (argv[i]->type != ESEXP_RES_STRING)
continue;
- g_string_append(string, argv[i]->value.string);
+ g_string_append (string, argv[i]->value.string);
}
g_string_append(string, ")");
- r = e_sexp_result_new(f, ESEXP_RES_STRING);
+ r = e_sexp_result_new (f, ESEXP_RES_STRING);
r->value.string = string->str;
- g_string_free(string, FALSE);
+ g_string_free (string, FALSE);
return r;
}
static ESExpResult *
-func_or(ESExp *f, gint argc, ESExpResult **argv, gpointer data)
+func_or (ESExp *f, gint argc, ESExpResult **argv, gpointer data)
{
ESExpResult *r;
GString *string;
@@ -975,44 +975,44 @@ func_or(ESExp *f, gint argc, ESExpResult **argv, gpointer data)
for (i = 0; i < argc; i++) {
if (argv[i]->type == ESEXP_RES_BOOL &&
argv[i]->value.boolean == TRUE) {
- r = e_sexp_result_new(f, ESEXP_RES_BOOL);
+ r = e_sexp_result_new (f, ESEXP_RES_BOOL);
r->value.boolean = TRUE;
return r;
} else if (argv[i]->type == ESEXP_RES_UNDEFINED)
- return e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
+ return e_sexp_result_new (f, ESEXP_RES_UNDEFINED);
}
string = g_string_new("(|");
for (i = 0; i < argc; i++) {
if (argv[i]->type != ESEXP_RES_STRING)
continue;
- g_string_append(string, argv[i]->value.string);
+ g_string_append (string, argv[i]->value.string);
}
g_string_append(string, ")");
- r = e_sexp_result_new(f, ESEXP_RES_STRING);
+ r = e_sexp_result_new (f, ESEXP_RES_STRING);
r->value.string = string->str;
- g_string_free(string, FALSE);
+ g_string_free (string, FALSE);
return r;
}
static ESExpResult *
-func_not(ESExp *f, gint argc, ESExpResult **argv, gpointer data)
+func_not (ESExp *f, gint argc, ESExpResult **argv, gpointer data)
{
ESExpResult *r;
if (argc != 1 ||
(argv[0]->type != ESEXP_RES_STRING &&
argv[0]->type != ESEXP_RES_BOOL))
- return e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
+ return e_sexp_result_new (f, ESEXP_RES_UNDEFINED);
if (argv[0]->type == ESEXP_RES_STRING) {
- r = e_sexp_result_new(f, ESEXP_RES_STRING);
+ r = e_sexp_result_new (f, ESEXP_RES_STRING);
r->value.string = g_strdup_printf ("(!%s)",
argv[0]->value.string);
} else {
- r = e_sexp_result_new(f, ESEXP_RES_BOOL);
+ r = e_sexp_result_new (f, ESEXP_RES_BOOL);
r->value.boolean = !argv[0]->value.boolean;
}
@@ -1035,7 +1035,7 @@ query_prop_to_ldap (const gchar *query_prop)
}
static ESExpResult *
-func_contains(ESExp *f, gint argc, ESExpResult **argv, gpointer data)
+func_contains (ESExp *f, gint argc, ESExpResult **argv, gpointer data)
{
ESExpResult *r;
const gchar *ldap_attr;
@@ -1044,7 +1044,7 @@ func_contains(ESExp *f, gint argc, ESExpResult **argv, gpointer data)
if (argc != 2 ||
argv[0]->type != ESEXP_RES_STRING ||
argv[1]->type != ESEXP_RES_STRING)
- return e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
+ return e_sexp_result_new (f, ESEXP_RES_UNDEFINED);
propname = argv[0]->value.string;
str = argv[1]->value.string;
@@ -1055,21 +1055,21 @@ func_contains(ESExp *f, gint argc, ESExpResult **argv, gpointer data)
* other "any field contains" searches should give an
* error.
*/
- if (strlen(str) == 0) {
- r = e_sexp_result_new(f, ESEXP_RES_BOOL);
+ if (strlen (str) == 0) {
+ r = e_sexp_result_new (f, ESEXP_RES_BOOL);
r->value.boolean = FALSE;
} else {
- r = e_sexp_result_new(f, ESEXP_RES_STRING);
+ r = e_sexp_result_new (f, ESEXP_RES_STRING);
r->value.string = g_strdup_printf ("(mailNickname=%s)", str);
}
return r;
}
- ldap_attr = query_prop_to_ldap(argv[0]->value.string);
+ ldap_attr = query_prop_to_ldap (argv[0]->value.string);
if (!ldap_attr) {
/* Attribute doesn't exist, so it can't possibly match */
- r = e_sexp_result_new(f, ESEXP_RES_BOOL);
+ r = e_sexp_result_new (f, ESEXP_RES_BOOL);
r->value.boolean = FALSE;
return r;
}
@@ -1077,22 +1077,22 @@ func_contains(ESExp *f, gint argc, ESExpResult **argv, gpointer data)
/* AD doesn't do substring indexes, so we only allow
* (contains FIELD ""), meaning "FIELD exists".
*/
- if (strlen(str) == 0) {
- r = e_sexp_result_new(f, ESEXP_RES_STRING);
+ if (strlen (str) == 0) {
+ r = e_sexp_result_new (f, ESEXP_RES_STRING);
r->value.string = g_strdup_printf ("(%s=*)", ldap_attr);
} else if (!strcmp(propname, "file_as")) {
- r = e_sexp_result_new(f, ESEXP_RES_STRING);
+ r = e_sexp_result_new (f, ESEXP_RES_STRING);
r->value.string = g_strdup_printf ("(|(displayName=*%s*)(sn=*%s*)(%s=*%s*))", str, str, ldap_attr, str);
} else if (g_str_equal (ldap_attr, "displayName")) {
- r = e_sexp_result_new(f, ESEXP_RES_STRING);
+ r = e_sexp_result_new (f, ESEXP_RES_STRING);
r->value.string = g_strdup_printf("(|(displayName=*%s*)(sn=*%s*)(givenName=*%s*))", str, str, str);
} else
- r = e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
+ r = e_sexp_result_new (f, ESEXP_RES_UNDEFINED);
return r;
}
static ESExpResult *
-func_is_or_begins_with(ESExp *f, gint argc, ESExpResult **argv, gboolean exact)
+func_is_or_begins_with (ESExp *f, gint argc, ESExpResult **argv, gboolean exact)
{
ESExpResult *r;
const gchar *star;
@@ -1102,15 +1102,15 @@ func_is_or_begins_with(ESExp *f, gint argc, ESExpResult **argv, gboolean exact)
if (argc != 2
|| argv[0]->type != ESEXP_RES_STRING
|| argv[1]->type != ESEXP_RES_STRING)
- return e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
+ return e_sexp_result_new (f, ESEXP_RES_UNDEFINED);
propname = argv[0]->value.string;
- str = rfc2254_escape(argv[1]->value.string);
+ str = rfc2254_escape (argv[1]->value.string);
star = exact ? "" : "*";
if (!exact && strlen (str) == 0 && strcmp(propname, "file_as")) {
/* Can't do (beginswith FIELD "") */
- return e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
+ return e_sexp_result_new (f, ESEXP_RES_UNDEFINED);
}
/* We use the query "(beginswith fileas "")" while building cache for
@@ -1125,12 +1125,12 @@ func_is_or_begins_with(ESExp *f, gint argc, ESExpResult **argv, gboolean exact)
goto done;
}
- ldap_attr = query_prop_to_ldap(propname);
+ ldap_attr = query_prop_to_ldap (propname);
if (!ldap_attr) {
g_free (str);
/* Property doesn't exist, so it can't ever match */
- r = e_sexp_result_new(f, ESEXP_RES_BOOL);
+ r = e_sexp_result_new (f, ESEXP_RES_BOOL);
r->value.boolean = FALSE;
return r;
}
@@ -1164,28 +1164,28 @@ func_is_or_begins_with(ESExp *f, gint argc, ESExpResult **argv, gboolean exact)
done:
g_free (str);
- r = e_sexp_result_new(f, ESEXP_RES_STRING);
+ r = e_sexp_result_new (f, ESEXP_RES_STRING);
r->value.string = filter;
return r;
}
static ESExpResult *
-func_is(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
+func_is (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
{
- return func_is_or_begins_with(f, argc, argv, TRUE);
+ return func_is_or_begins_with (f, argc, argv, TRUE);
}
static ESExpResult *
-func_beginswith(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
+func_beginswith (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
{
- return func_is_or_begins_with(f, argc, argv, FALSE);
+ return func_is_or_begins_with (f, argc, argv, FALSE);
}
static ESExpResult *
-func_endswith(struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
+func_endswith (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
{
/* We don't allow endswith searches */
- return e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
+ return e_sexp_result_new (f, ESEXP_RES_UNDEFINED);
}
/* 'builtin' functions */
@@ -1209,10 +1209,10 @@ build_query (EBookBackendGAL *bl, const gchar *query, const gchar *ldap_filter,
ESExpResult *r;
gint i;
- sexp = e_sexp_new();
+ sexp = e_sexp_new ();
for (i = 0; i < G_N_ELEMENTS (symbols); i++) {
- e_sexp_add_function(sexp, 0, (gchar *) symbols[i].name,
+ e_sexp_add_function (sexp, 0, (gchar *) symbols[i].name,
symbols[i].func, NULL);
}
@@ -1256,12 +1256,12 @@ build_query (EBookBackendGAL *bl, const gchar *query, const gchar *ldap_filter,
g_propagate_error (perror, EDB_ERROR (QUERY_REFUSED));
}
- e_sexp_result_free(sexp, r);
+ e_sexp_result_free (sexp, r);
e_sexp_unref (sexp);
}
static void
-manager_populate(EContact *contact, gchar **values, EBookBackendGAL *bl, E2kOperation *op)
+manager_populate (EContact *contact, gchar **values, EBookBackendGAL *bl, E2kOperation *op)
{
E2kGlobalCatalogEntry *entry;
E2kGlobalCatalogStatus status;
@@ -1329,21 +1329,21 @@ get_time_stamp (gchar *serv_time_str, time_t *mtime)
*/
/* FIXME : Add a check for proper input string */
- year = G_STRNDUP(input_str, 4)
- month = G_STRNDUP(input_str, 2)
- date = G_STRNDUP(input_str, 2)
- hour = G_STRNDUP(input_str, 2)
- minute = G_STRNDUP(input_str, 2)
- second = G_STRNDUP(input_str, 2)
+ year = G_STRNDUP (input_str, 4)
+ month = G_STRNDUP (input_str, 2)
+ date = G_STRNDUP (input_str, 2)
+ hour = G_STRNDUP (input_str, 2)
+ minute = G_STRNDUP (input_str, 2)
+ second = G_STRNDUP (input_str, 2)
input_str++; // parse over the dot
- zone = G_STRNDUP(input_str, 1)
-
- mytime.tm_year = atoi(year)-1900;
- mytime.tm_mon = atoi(month)-1;
- mytime.tm_mday = atoi(date);
- mytime.tm_hour = atoi(hour);
- mytime.tm_min = atoi(minute);
- mytime.tm_sec = atoi(second);
+ zone = G_STRNDUP (input_str, 1)
+
+ mytime.tm_year = atoi (year)-1900;
+ mytime.tm_mon = atoi (month)-1;
+ mytime.tm_mday = atoi (date);
+ mytime.tm_hour = atoi (hour);
+ mytime.tm_min = atoi (minute);
+ mytime.tm_sec = atoi (second);
mytime.tm_isdst = 0;
*mtime = mktime(&mytime);
@@ -1480,7 +1480,7 @@ build_contact_from_entry (EBookBackendGAL *bl, LDAPMessage *e, GList **existing_
else if (info->prop_type & PROP_TYPE_COMPLEX) {
/* if it's a list call the contact-populate function,
which calls g_object_set to set the property */
- info->populate_contact_func(contact, values, bl, NULL);
+ info->populate_contact_func (contact, values, bl, NULL);
}
else if (is_group && (info->prop_type & PROP_TYPE_GROUP)) {
gchar *grpattrs[3];
@@ -1546,7 +1546,7 @@ build_contact_from_entry (EBookBackendGAL *bl, LDAPMessage *e, GList **existing_
if (ldap_error != LDAP_SUCCESS) {
book_view_notify_status (book_view,
- ldap_err2string(ldap_error));
+ ldap_err2string (ldap_error));
continue;
}
}
@@ -1636,7 +1636,7 @@ poll_ldap (EBookBackendGAL *bl)
protected by the lock? */
g_static_rec_mutex_unlock (&bl->priv->op_hash_mutex);
- ldap_msgfree(res);
+ ldap_msgfree (res);
}
}
@@ -1953,7 +1953,7 @@ start_book_view (EBookBackend *backend,
if (ldap_err != LDAP_SUCCESS) {
d(printf("%s:%s: error\n", G_STRLOC, G_STRFUNC));
- book_view_notify_status (view, ldap_err2string(ldap_err));
+ book_view_notify_status (view, ldap_err2string (ldap_err));
return;
}
else if (search_msgid == -1) {
@@ -2023,15 +2023,15 @@ static gint npagedpartial;
/* Set server controls. Add controls extra_c[0..count-1], if set. */
static void
-tool_server_controls( LDAP *ld, LDAPControl *extra_c, gint count )
+tool_server_controls ( LDAP *ld, LDAPControl *extra_c, gint count )
{
gint i = 0, j, crit = 0, err;
LDAPControl c[3], **ctrls;
- ctrls = (LDAPControl**) malloc(sizeof(c) + (count+1)*sizeof(LDAPControl*));
+ ctrls = (LDAPControl**) malloc (sizeof (c) + (count+1)*sizeof (LDAPControl*));
if (ctrls == NULL) {
fprintf( stderr, "No memory\n" );
- exit( EXIT_FAILURE );
+ exit ( EXIT_FAILURE );
}
while (count--) {
@@ -2039,7 +2039,7 @@ tool_server_controls( LDAP *ld, LDAPControl *extra_c, gint count )
}
ctrls[i] = NULL;
- err = ldap_set_option( ld, LDAP_OPT_SERVER_CONTROLS, ctrls );
+ err = ldap_set_option ( ld, LDAP_OPT_SERVER_CONTROLS, ctrls );
if (err != LDAP_SUCCESS) {
for (j = 0; j < i; j++) {
@@ -2049,19 +2049,19 @@ tool_server_controls( LDAP *ld, LDAPControl *extra_c, gint count )
crit ? "critical " : "" );
}
- free( ctrls );
+ free ( ctrls );
if (crit) {
- exit( EXIT_FAILURE );
+ exit ( EXIT_FAILURE );
}
}
#if defined (SUNLDAP) || defined (G_OS_WIN32)
static struct berval *
-ber_dupbv( struct berval *dst, struct berval *src )
+ber_dupbv ( struct berval *dst, struct berval *src )
{
struct berval *tmp;
- tmp = ber_bvdup(src);
+ tmp = ber_bvdup (src);
if (!tmp)
return NULL;
@@ -2076,7 +2076,7 @@ ber_dupbv( struct berval *dst, struct berval *src )
#endif
static gint
-parse_page_control(
+parse_page_control (
LDAP *ld,
LDAPMessage *result,
struct berval *cookie )
@@ -2089,12 +2089,12 @@ parse_page_control(
ber_tag_t tag;
struct berval servercookie = { 0, NULL };
- rc = ldap_parse_result( ld, result,
+ rc = ldap_parse_result ( ld, result,
&err, NULL, NULL, NULL, &ctrl, 0 );
if (rc != LDAP_SUCCESS) {
ldap_perror(ld, "ldap_parse_result");
- exit( EXIT_FAILURE );
+ exit ( EXIT_FAILURE );
}
if (err != LDAP_SUCCESS) {
@@ -2110,28 +2110,28 @@ parse_page_control(
* }
*/
ctrlp = *ctrl;
- ber = ber_init( &ctrlp->ldctl_value );
+ ber = ber_init ( &ctrlp->ldctl_value );
if (ber == NULL) {
fprintf( stderr, "Internal error.\n");
return EXIT_FAILURE;
}
tag = ber_scanf( ber, "{im}", &entriesLeft, &servercookie );
- ber_dupbv( cookie, &servercookie );
- (void) ber_free( ber, 1 );
+ ber_dupbv ( cookie, &servercookie );
+ (void) ber_free ( ber, 1 );
if (tag == LBER_ERROR) {
- fprintf( stderr,
+ fprintf ( stderr,
"Paged results response control could not be decoded.\n");
return EXIT_FAILURE;
}
if (entriesLeft < 0) {
- fprintf( stderr,
+ fprintf ( stderr,
"Invalid entries estimate in paged results response.\n");
return EXIT_FAILURE;
}
- ldap_controls_free( ctrl );
+ ldap_controls_free ( ctrl );
} else {
morePagedResults = 0;
@@ -2146,7 +2146,7 @@ parse_page_control(
return err;
}
-static gint dosearch(
+static gint dosearch (
EBookBackendGAL *bl,
const gchar *base,
gint scope,
@@ -2168,7 +2168,7 @@ static gint dosearch(
gint size = 0;
if (ssize && *ssize)
- size = atoi(ssize);
+ size = atoi (ssize);
g_mutex_lock (bl->priv->ldap_lock);
rc = ldap_search_ext (bl->priv->ldap, base, scope, value, attrs, attrsonly,
@@ -2176,7 +2176,7 @@ static gint dosearch(
g_mutex_unlock (bl->priv->ldap_lock);
if (rc != LDAP_SUCCESS) {
- return( rc );
+ return ( rc );
}
res = NULL;
@@ -2193,7 +2193,7 @@ static gint dosearch(
EContact *contact;
const gchar *uid;
- switch (ldap_msgtype( msg )) {
+ switch (ldap_msgtype ( msg )) {
case LDAP_RES_SEARCH_ENTRY:
count++;
g_mutex_unlock (bl->priv->ldap_lock);
@@ -2229,7 +2229,7 @@ static gint dosearch(
}
- ldap_msgfree( res );
+ ldap_msgfree ( res );
}
g_mutex_unlock (bl->priv->ldap_lock);
@@ -2237,12 +2237,12 @@ static gint dosearch(
g_mutex_lock (bl->priv->ldap_lock);
ldap_perror (bl->priv->ldap, "ldap_result");
g_mutex_unlock (bl->priv->ldap_lock);
- return( rc );
+ return ( rc );
}
done:
- ldap_msgfree( res );
- return( rc );
+ ldap_msgfree ( res );
+ return ( rc );
}
static void
@@ -2262,8 +2262,8 @@ generate_cache (EBookBackendGAL *book_backend_gal, const gchar * changed_filter)
cachetime = e_book_backend_db_cache_get_time (priv->file_db);
- priv->cache_time = cachetime ? atoi(cachetime) : 0;
- g_free(cachetime);
+ priv->cache_time = cachetime ? atoi (cachetime) : 0;
+ g_free (cachetime);
npagedresponses = npagedentries = npagedreferences =
npagedextended = npagedpartial = 0;
@@ -2279,21 +2279,21 @@ getNextPage:
#ifdef G_OS_WIN32
struct berval **tmpBVPtr = NULL;
#endif
- if (( prber = ber_alloc_t(LBER_USE_DER)) == NULL ) {
+ if (( prber = ber_alloc_t (LBER_USE_DER)) == NULL ) {
return;
}
ber_printf( prber, "{iO}", pageSize, &cookie );
#ifdef G_OS_WIN32
- if (ber_flatten( prber, tmpBVPtr) == -1) {
- ber_free( prber, 1 );
- ber_bvfree(*tmpBVPtr);
+ if (ber_flatten ( prber, tmpBVPtr) == -1) {
+ ber_free ( prber, 1 );
+ ber_bvfree (*tmpBVPtr);
return;
}
c[i].ldctl_value = **tmpBVPtr;
- ber_free( prber, 1 );
- ber_bvfree(*tmpBVPtr);
+ ber_free ( prber, 1 );
+ ber_bvfree (*tmpBVPtr);
#else
- if (ber_flatten2( prber, &c[i].ldctl_value, 0 ) == -1) {
+ if (ber_flatten2 ( prber, &c[i].ldctl_value, 0 ) == -1) {
return;
}
#endif
@@ -2304,7 +2304,7 @@ getNextPage:
}
g_mutex_lock (priv->ldap_lock);
- tool_server_controls( priv->ldap, c, i );
+ tool_server_controls ( priv->ldap, c, i );
g_mutex_unlock (priv->ldap_lock);
ber_free (prber, 1);
@@ -2365,7 +2365,7 @@ update_cache (EBookBackendGAL *gal)
filter = g_strdup_printf ("|(whenCreated>=%s)(whenChanged>=%s)", galtime, galtime);
- g_free(galtime);
+ g_free (galtime);
printf("Filter %s: Time %d\n", filter, (gint) t1);
/* Download New contacts */
generate_cache (gal, filter);
@@ -2389,7 +2389,7 @@ authenticate_user (EBookBackend *backend,
ExchangeAccount *account = NULL;
GError *err = NULL;
#if defined(ENABLE_CACHE) && ENABLE_CACHE
- GConfClient *gc = gconf_client_get_default();
+ GConfClient *gc = gconf_client_get_default ();
gint interval = gconf_client_get_int (gc, "/apps/evolution/addressbook/gal_cache_interval", NULL);
g_object_unref (gc);
@@ -2452,7 +2452,7 @@ authenticate_user (EBookBackend *backend,
}
else {
d(printf("Cache not there, generate cache\n"));
- generate_cache(be, NULL);
+ generate_cache (be, NULL);
}
}
#endif
@@ -2472,11 +2472,11 @@ authenticate_user (EBookBackend *backend,
#ifdef SUNLDAP
static gint
-ber_flatten2( BerElement *ber, struct berval *bv, gint alloc )
+ber_flatten2 ( BerElement *ber, struct berval *bv, gint alloc )
{
struct berval *tmp;
- if (ber_flatten( ber, &tmp) == -1) {
+ if (ber_flatten ( ber, &tmp) == -1) {
return;
}
bv->bv_len = tmp->bv_len;
@@ -2490,7 +2490,7 @@ ber_flatten2( BerElement *ber, struct berval *bv, gint alloc )
#endif
static void
-ldap_cancel_op(gpointer key, gpointer value, gpointer data)
+ldap_cancel_op (gpointer key, gpointer value, gpointer data)
{
EBookBackendGAL *bl = data;
LDAPOp *op = value;
@@ -2714,8 +2714,8 @@ load_source (EBookBackend *backend,
env->close (env, 0);
g_warning ("db_env_open failed with %d", db_error);
g_static_mutex_unlock (&global_env_lock);
- g_free(dirname);
- g_free(filename);
+ g_free (dirname);
+ g_free (filename);
g_propagate_error (error, EDB_ERROR (OTHER_ERROR));
return;
}
@@ -2724,7 +2724,7 @@ load_source (EBookBackend *backend,
global_env.env = env;
global_env.ref_count = 1;
}
- g_static_mutex_unlock(&global_env_lock);
+ g_static_mutex_unlock (&global_env_lock);
bl->priv->env = env;
db_error = db_create (&db, env, 0);
@@ -2796,7 +2796,7 @@ load_source (EBookBackend *backend,
}
#endif
/* Online */
- e_book_backend_set_is_writable (E_BOOK_BACKEND(backend), FALSE);
+ e_book_backend_set_is_writable (E_BOOK_BACKEND (backend), FALSE);
e_book_backend_set_is_loaded (E_BOOK_BACKEND (backend), TRUE);
e_book_backend_notify_writable (backend, FALSE);
@@ -2892,7 +2892,7 @@ dispose (GObject *object)
global_env.env->close (global_env.env, 0);
global_env.env = NULL;
}
- g_static_mutex_unlock(&global_env_lock);
+ g_static_mutex_unlock (&global_env_lock);
#endif
if (bl->priv->ldap_lock)
diff --git a/addressbook/e-book-backend-gal.h b/addressbook/e-book-backend-gal.h
index 456e7af..541e0a2 100644
--- a/addressbook/e-book-backend-gal.h
+++ b/addressbook/e-book-backend-gal.h
@@ -66,18 +66,18 @@
# ifdef UNICODE
# define ldap_compare_ext(ld,dn,a,v,sc,cc,msg) \
- ldap_compare_extW(ld,dn,a,0,v,sc,cc,msg)
+ ldap_compare_extW (ld,dn,a,0,v,sc,cc,msg)
# define ldap_search_ext(ld,base,scope,f,a,o,sc,cc,(t),s,msg) \
- ldap_search_extW(ld,base,scope,f,a,o,sc,cc,((PLDAP_TIMEVAL)t)?((PLDAP_TIMEVAL)t)->tv_sec:0,s,msg)
+ ldap_search_extW (ld,base,scope,f,a,o,sc,cc,((PLDAP_TIMEVAL)t)?((PLDAP_TIMEVAL)t)->tv_sec:0,s,msg)
# define ldap_start_tls_s(ld,sc,cc) \
- ldap_start_tls_sW(ld,0,0,sc,cc)
+ ldap_start_tls_sW (ld,0,0,sc,cc)
# else /* !UNICODE */
# define ldap_compare_ext(ld,dn,a,v,sc,cc,msg) \
- ldap_compare_extA(ld,dn,a,0,v,sc,cc,msg)
+ ldap_compare_extA (ld,dn,a,0,v,sc,cc,msg)
# define ldap_search_ext(ld,base,scope,f,a,o,sc,cc,t,s,msg) \
- ldap_search_extA(ld,base,scope,f,a,o,sc,cc,((PLDAP_TIMEVAL)t)?((PLDAP_TIMEVAL)t)->tv_sec:0,s,msg)
+ ldap_search_extA (ld,base,scope,f,a,o,sc,cc,((PLDAP_TIMEVAL)t)?((PLDAP_TIMEVAL)t)->tv_sec:0,s,msg)
# define ldap_start_tls_s(ld,sc,cc) \
- ldap_start_tls_sA(ld,0,0,sc,cc)
+ ldap_start_tls_sA (ld,0,0,sc,cc)
# endif /* UNICODE */
#endif /* G_OS_WIN32 */
diff --git a/calendar/e-cal-backend-exchange-calendar.c b/calendar/e-cal-backend-exchange-calendar.c
index f3d2ae5..fd05afe 100644
--- a/calendar/e-cal-backend-exchange-calendar.c
+++ b/calendar/e-cal-backend-exchange-calendar.c
@@ -797,7 +797,7 @@ create_object (ECalBackendSync *backend, EDataCal *cal,
#endif
/* Delegated calendar */
- if (g_ascii_strcasecmp(e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (cbex->account)))
+ if (g_ascii_strcasecmp (e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (cbex->account)))
process_delegated_cal_object (icalcomp, e_cal_backend_exchange_get_owner_name (backend), e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (cbex->account));
/* Send options */
@@ -881,7 +881,7 @@ create_object (ECalBackendSync *backend, EDataCal *cal,
body_crlf = icalcomponent_as_ical_string_r (cbdata->vcal_comp);
date = e_cal_backend_exchange_make_timestamp_rfc822 (time (NULL));
- if (!g_ascii_strcasecmp(e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (cbex->account)))
+ if (!g_ascii_strcasecmp (e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (cbex->account)))
from = e_cal_backend_exchange_get_from_string (backend, comp);
else
from = e_cal_backend_exchange_get_sender_string (backend, comp);
@@ -926,7 +926,7 @@ create_object (ECalBackendSync *backend, EDataCal *cal,
http_status = e_folder_exchange_put_new (E_CAL_BACKEND_EXCHANGE (cbexc)->folder, NULL, summary,
NULL, NULL, "message/rfc822",
- msg, strlen(msg), &location, &ru_header);
+ msg, strlen (msg), &location, &ru_header);
if ((http_status == E2K_HTTP_CREATED) && send_options) {
e2kctx = exchange_account_get_context (E_CAL_BACKEND_EXCHANGE (cbexc)->account);
@@ -1085,7 +1085,7 @@ modify_object (ECalBackendSync *backend, EDataCal *cal,
#define e_return_data_cal_error_and_val_if_fail(expr, _code, _val) \
G_STMT_START { \
- if (G_LIKELY(expr)) { \
+ if (G_LIKELY (expr)) { \
} else { \
g_log (G_LOG_DOMAIN, \
G_LOG_LEVEL_CRITICAL, \
@@ -1247,7 +1247,7 @@ modify_object_with_href (ECalBackendSync *backend, EDataCal *cal,
}
/* Delegated calendar */
- if (g_ascii_strcasecmp(e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (cbex->account)))
+ if (g_ascii_strcasecmp (e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (cbex->account)))
process_delegated_cal_object (updated_icalcomp, e_cal_backend_exchange_get_owner_name (backend), e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (cbex->account));
/* send options */
@@ -1418,7 +1418,7 @@ modify_object_with_href (ECalBackendSync *backend, EDataCal *cal,
body_crlf = icalcomponent_as_ical_string_r (cbdata->vcal_comp);
date = e_cal_backend_exchange_make_timestamp_rfc822 (time (NULL));
- if (!g_ascii_strcasecmp(e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (cbex->account)))
+ if (!g_ascii_strcasecmp (e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (cbex->account)))
from = e_cal_backend_exchange_get_from_string (backend, updated_ecomp);
else
from = e_cal_backend_exchange_get_sender_string (backend, updated_ecomp);
diff --git a/calendar/e-cal-backend-exchange-tasks.c b/calendar/e-cal-backend-exchange-tasks.c
index 2192edc..0776fd5 100644
--- a/calendar/e-cal-backend-exchange-tasks.c
+++ b/calendar/e-cal-backend-exchange-tasks.c
@@ -72,7 +72,7 @@ static ECalBackendExchange *parent_class = NULL;
static void
get_from (ECalBackendSync *backend, ECalComponent *comp, gchar **from_name, gchar **from_addr)
{
- if (!g_ascii_strcasecmp(e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (E_CAL_BACKEND_EXCHANGE (backend)->account)))
+ if (!g_ascii_strcasecmp (e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (E_CAL_BACKEND_EXCHANGE (backend)->account)))
e_cal_backend_exchange_get_from (backend, comp, from_name, from_addr);
else
e_cal_backend_exchange_get_sender (backend, comp, from_name, from_addr);
@@ -421,7 +421,7 @@ get_uid (ECalComponent *comp)
{
const gchar *uid;
- e_cal_component_get_uid (E_CAL_COMPONENT(comp), &uid);
+ e_cal_component_get_uid (E_CAL_COMPONENT (comp), &uid);
return uid;
}
@@ -430,7 +430,7 @@ get_summary (ECalComponent *comp)
{
ECalComponentText summary;
- e_cal_component_get_summary(E_CAL_COMPONENT (comp), &summary);
+ e_cal_component_get_summary (E_CAL_COMPONENT (comp), &summary);
return summary.value;
}
@@ -791,7 +791,7 @@ get_changed_tasks (ECalBackendExchange *cbex)
/* Set LAST MODIFIED */
if ((str = e2k_properties_get_prop (result->props,
E2K_PR_CALENDAR_LAST_MODIFIED))) {
- itt = icaltime_from_timet (e2k_parse_timestamp(str), 0);
+ itt = icaltime_from_timet (e2k_parse_timestamp (str), 0);
if (!icaltime_is_null_time (itt)) {
e_cal_backend_exchange_ensure_utc_zone (E_CAL_BACKEND (cbex), &itt);
e_cal_component_set_last_modified (ecal, &itt);
@@ -1111,7 +1111,7 @@ create_task_object (ECalBackendSync *backend, EDataCal *cal,
e_cal_backend_exchange_cache_unlock (ecalbex);
/* Delegated calendar */
- if (g_ascii_strcasecmp(e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (ecalbex->account)))
+ if (g_ascii_strcasecmp (e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (ecalbex->account)))
process_delegated_cal_object (icalcomp, e_cal_backend_exchange_get_owner_name (backend), e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (ecalbex->account));
summary = icalcomponent_get_summary (icalcomp);
@@ -1177,7 +1177,7 @@ create_task_object (ECalBackendSync *backend, EDataCal *cal,
props, &location, NULL );
if (E2K_HTTP_STATUS_IS_SUCCESSFUL (status)) {
- status = put_body(comp, e2kctx, NULL, location, from_name, from_addr,
+ status = put_body (comp, e2kctx, NULL, location, from_name, from_addr,
attach_body_crlf, boundary, NULL);
if (E2K_HTTP_STATUS_IS_SUCCESSFUL (status)) {
e_cal_backend_exchange_cache_lock (ecalbex);
@@ -1269,7 +1269,7 @@ modify_task_object (ECalBackendSync *backend, EDataCal *cal,
e_cal_backend_exchange_cache_unlock (ecalbex);
/* Delegated calendar */
- if (g_ascii_strcasecmp(e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (ecalbex->account)))
+ if (g_ascii_strcasecmp (e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (ecalbex->account)))
process_delegated_cal_object (icalcomp, e_cal_backend_exchange_get_owner_name (backend), e_cal_backend_exchange_get_owner_email (backend), exchange_account_get_email_id (ecalbex->account));
summary = icalcomponent_get_summary (icalcomp);
@@ -1312,7 +1312,7 @@ modify_task_object (ECalBackendSync *backend, EDataCal *cal,
icalcomp = icalparser_parse_string (comp_str);
g_free (comp_str);
if (E2K_HTTP_STATUS_IS_SUCCESSFUL (status)) {
- status = put_body(new_comp, e2kctx, NULL, ecalbexcomp->href, from_name, from_addr,
+ status = put_body (new_comp, e2kctx, NULL, ecalbexcomp->href, from_name, from_addr,
attach_body_crlf, boundary, NULL);
if (E2K_HTTP_STATUS_IS_SUCCESSFUL (status)) {
e_cal_backend_exchange_cache_lock (ecalbex);
diff --git a/calendar/e-cal-backend-exchange.c b/calendar/e-cal-backend-exchange.c
index 23fd1ab..384a55f 100644
--- a/calendar/e-cal-backend-exchange.c
+++ b/calendar/e-cal-backend-exchange.c
@@ -201,7 +201,7 @@ load_cache (ECalBackendExchange *cbex, E2kUri *e2kuri, GError **perror)
user_cache_dir, "calendar", mangled_uri, NULL);
storage_dir = g_path_get_dirname (cbex->priv->object_cache_file);
- if (g_lstat(cbex->priv->local_attachment_store , &buf) < 0) {
+ if (g_lstat (cbex->priv->local_attachment_store , &buf) < 0) {
#ifdef G_OS_UNIX
if (symlink (storage_dir, cbex->priv->local_attachment_store) < 0)
g_warning ("%s: symlink() failed: %s", G_STRFUNC, g_strerror (errno));
@@ -1454,7 +1454,7 @@ set_mode (ECalBackend *backend, CalMode mode)
priv->mode = CAL_MODE_REMOTE;
if (is_loaded (backend) && re_open)
- e_cal_backend_notify_auth_required(backend);
+ e_cal_backend_notify_auth_required (backend);
break;
case CAL_MODE_LOCAL:
@@ -1844,7 +1844,7 @@ process_delegated_cal_object (icalcomponent *icalcomp, const gchar *delegator_na
if (text && (!g_ascii_strcasecmp (delegatee_email, text) || !g_ascii_strcasecmp (delegator_email, text))) {
icalproperty_set_organizer (prop, g_strdup_printf ("MAILTO:%s", delegator_email));
icalproperty_remove_parameter_by_kind (prop, ICAL_CN_PARAMETER);
- icalproperty_add_parameter (prop, icalparameter_new_cn (g_strdup(delegator_name)));
+ icalproperty_add_parameter (prop, icalparameter_new_cn (g_strdup (delegator_name)));
icalproperty_remove_parameter_by_kind (prop, ICAL_SENTBY_PARAMETER);
icalproperty_add_parameter (prop, icalparameter_new_sentby (g_strdup_printf("MAILTO:%s", delegatee_email)));
}
@@ -1870,7 +1870,7 @@ process_delegated_cal_object (icalcomponent *icalcomp, const gchar *delegator_na
text = g_strstrip (text);
if (text && !g_ascii_strcasecmp (delegator_email, text)) {
icalproperty_remove_parameter_by_kind (prop, ICAL_CN_PARAMETER);
- icalproperty_add_parameter (prop, icalparameter_new_cn (g_strdup(delegator_name)));
+ icalproperty_add_parameter (prop, icalparameter_new_cn (g_strdup (delegator_name)));
icalproperty_remove_parameter_by_kind (prop, ICAL_SENTBY_PARAMETER);
icalproperty_add_parameter (prop, icalparameter_new_sentby (g_strdup_printf("MAILTO:%s", delegatee_email)));
g_free (text);
@@ -1985,7 +1985,7 @@ build_msg ( ECalBackendExchange *cbex, ECalComponent *comp, const gchar *subject
gchar *fname, *file_contents = NULL, *filename, *dest_url, *mime_filename, *attach_file;
gint len = 0;
- if (!g_ascii_strcasecmp(e_cal_backend_exchange_get_owner_email (E_CAL_BACKEND_SYNC (cbex)), exchange_account_get_email_id (cbex->account)))
+ if (!g_ascii_strcasecmp (e_cal_backend_exchange_get_owner_email (E_CAL_BACKEND_SYNC (cbex)), exchange_account_get_email_id (cbex->account)))
e_cal_backend_exchange_get_from (E_CAL_BACKEND_SYNC (cbex), comp, &from_name, &from_email);
else
e_cal_backend_exchange_get_sender (E_CAL_BACKEND_SYNC (cbex), comp, &from_name, &from_email);
@@ -2012,7 +2012,7 @@ build_msg ( ECalBackendExchange *cbex, ECalComponent *comp, const gchar *subject
if (!strncmp ((gchar *)l->data, "file://", 7)) {
fname = g_filename_from_uri ((gchar *)l->data, NULL, NULL);
filename = g_path_get_basename (fname);
- mime_filename = g_strdup (filename + strlen(uid) + 1);
+ mime_filename = g_strdup (filename + strlen (uid) + 1);
g_free (filename);
attach_file = fname;
} else {
diff --git a/camel/camel-exchange-folder.c b/camel/camel-exchange-folder.c
index 9597d48..f064089 100644
--- a/camel/camel-exchange-folder.c
+++ b/camel/camel-exchange-folder.c
@@ -239,14 +239,14 @@ exchange_folder_transfer_messages_the_hard_way (CamelFolder *source,
ba = exchange_folder_get_message_data (
source, uids->pdata[i], error);
if (!ba) {
- camel_message_info_free(info);
+ camel_message_info_free (info);
success = FALSE;
break;
}
success = exchange_folder_append_message_data (
dest, ba, NULL, info, &ret_uid, error);
- camel_message_info_free(info);
+ camel_message_info_free (info);
g_byte_array_free (ba, TRUE);
if (!success)
@@ -441,7 +441,7 @@ exchange_folder_append_message (CamelFolder *folder,
substitution of \t and \n with blank.
*/
- old_subject = g_strdup(camel_mime_message_get_subject (message));
+ old_subject = g_strdup (camel_mime_message_get_subject (message));
if (old_subject) {
len = strlen (old_subject);
@@ -818,7 +818,7 @@ camel_exchange_folder_add_message (CamelExchangeFolder *exch,
info = camel_folder_summary_uid (folder->summary, uid);
if (info) {
- camel_message_info_free(info);
+ camel_message_info_free (info);
return;
}
@@ -840,8 +840,8 @@ camel_exchange_folder_add_message (CamelExchangeFolder *exch,
parent = find_parent (exch, einfo->thread_index);
if (parent && einfo->info.references == NULL) {
- einfo->info.references = g_malloc(sizeof(CamelSummaryReferences));
- memcpy(&einfo->info.references->references[0], parent, sizeof(*parent));
+ einfo->info.references = g_malloc (sizeof (CamelSummaryReferences));
+ memcpy (&einfo->info.references->references[0], parent, sizeof (*parent));
einfo->info.references->size = 1;
}
}
@@ -1119,7 +1119,7 @@ camel_exchange_folder_construct (CamelFolder *folder,
g_memdup (&einfo->info.message_id, sizeof (CamelSummaryMessageID)));
}
- camel_message_info_free(info);
+ camel_message_info_free (info);
}
if (parent_store != NULL) {
diff --git a/camel/camel-exchange-store.c b/camel/camel-exchange-store.c
index d1abdb0..5dfb5a6 100644
--- a/camel/camel-exchange-store.c
+++ b/camel/camel-exchange-store.c
@@ -43,7 +43,7 @@
/* Even if we are disconnected, we need to exchange_store_connect()
to get the offline data */
#define RETURN_VAL_IF_NOT_CONNECTED(store, ex, val)\
- if (!camel_exchange_store_connected(store, ex) && \
+ if (!camel_exchange_store_connected (store, ex) && \
!exchange_store_connect (CAMEL_SERVICE (store), ex)) \
return val;
diff --git a/camel/camel-exchange-summary.c b/camel/camel-exchange-summary.c
index b9d08a9..5bbb62a 100644
--- a/camel/camel-exchange-summary.c
+++ b/camel/camel-exchange-summary.c
@@ -359,7 +359,7 @@ exchange_summary_info_set_flags (CamelMessageInfo *info,
camel_exchange_utils_set_message_flags (
CAMEL_SERVICE (parent_store),
full_name, info->uid, set, flags, NULL);
- return folder_summary_class->info_set_flags(info, flags, set);
+ return folder_summary_class->info_set_flags (info, flags, set);
}
}
}
@@ -372,7 +372,7 @@ exchange_summary_info_set_flags (CamelMessageInfo *info,
CamelExchangeFolder *exchange_folder = (CamelExchangeFolder *) folder;
CamelExchangeJournal *journal = (CamelExchangeJournal *) exchange_folder->journal;
camel_exchange_journal_delete (journal, info->uid, flags, set, NULL);
- return folder_summary_class->info_set_flags(info, flags, set);
+ return folder_summary_class->info_set_flags (info, flags, set);
}
}
}
@@ -393,7 +393,7 @@ exchange_summary_info_set_user_tag (CamelMessageInfo *info,
folder_summary_class = CAMEL_FOLDER_SUMMARY_CLASS (
camel_exchange_summary_parent_class);
- res = folder_summary_class->info_set_user_tag(info, name, value);
+ res = folder_summary_class->info_set_user_tag (info, name, value);
if (res && info->summary->folder && info->uid) {
CamelFolder *folder = info->summary->folder;
CamelStore *parent_store;
@@ -567,20 +567,20 @@ camel_exchange_summary_add_offline (CamelFolderSummary *summary,
mi = (CamelMessageInfoBase *)camel_folder_summary_info_new_from_message (summary, message, NULL);
/* Copy flags 'n' tags */
- mi->flags = camel_message_info_flags(info);
+ mi->flags = camel_message_info_flags (info);
- flag = camel_message_info_user_flags(info);
+ flag = camel_message_info_user_flags (info);
while (flag) {
- camel_message_info_set_user_flag((CamelMessageInfo *)mi, flag->name, TRUE);
+ camel_message_info_set_user_flag ((CamelMessageInfo *)mi, flag->name, TRUE);
flag = flag->next;
}
- tag = camel_message_info_user_tags(info);
+ tag = camel_message_info_user_tags (info);
while (tag) {
- camel_message_info_set_user_tag((CamelMessageInfo *)mi, tag->name, tag->value);
+ camel_message_info_set_user_tag ((CamelMessageInfo *)mi, tag->name, tag->value);
tag = tag->next;
}
- mi->size = camel_message_info_size(info);
+ mi->size = camel_message_info_size (info);
mi->uid = camel_pstring_strdup (uid);
camel_folder_summary_add (summary, (CamelMessageInfo *)mi);
}
@@ -602,7 +602,7 @@ camel_exchange_summary_add_offline_uncached (CamelFolderSummary *summary,
CamelMessageInfo *mi;
/* Create summary entry */
- mi = camel_message_info_clone(info);
+ mi = camel_message_info_clone (info);
/* Set uid and add to summary */
mi->uid = camel_pstring_strdup (uid);
diff --git a/camel/camel-exchange-utils.c b/camel/camel-exchange-utils.c
index cd07333..464672a 100644
--- a/camel/camel-exchange-utils.c
+++ b/camel/camel-exchange-utils.c
@@ -953,8 +953,8 @@ get_folder_contents_online (ExchangeFolder *mfld, GError **error)
/* Put the index/uid as key/value in the rm_idx_uid hashtable.
This hashtable will be used to sync with mfld->messages.
*/
- g_hash_table_insert (rm_idx_uid, GUINT_TO_POINTER(m),
- GUINT_TO_POINTER(mmsg_cpy->seq));
+ g_hash_table_insert (rm_idx_uid, GUINT_TO_POINTER (m),
+ GUINT_TO_POINTER (mmsg_cpy->seq));
g_free (mmsg_cpy->uid);
g_free (mmsg_cpy->href);
g_free (mmsg_cpy);
@@ -1065,8 +1065,8 @@ get_folder_contents_online (ExchangeFolder *mfld, GError **error)
/* Put the index/uid as key/value in the rm_idx_uid hashtable.
This hashtable will be used to sync with mfld->messages.
*/
- g_hash_table_insert (rm_idx_uid, GUINT_TO_POINTER(m),
- GUINT_TO_POINTER(mmsg_cpy->seq));
+ g_hash_table_insert (rm_idx_uid, GUINT_TO_POINTER (m),
+ GUINT_TO_POINTER (mmsg_cpy->seq));
}
/* Remove mmsg from our msgs_copy array */
diff --git a/camel/mail-utils.c b/camel/mail-utils.c
index c2cf971..54bca75 100644
--- a/camel/mail-utils.c
+++ b/camel/mail-utils.c
@@ -361,7 +361,7 @@ mail_util_demangle_meeting_related_message (GString *body,
modify_prop = TRUE;
/* We do not really need to set the CN parameter. However, setting it might improve usability. */
icalproperty_remove_parameter_by_kind (prop, ICAL_CN_PARAMETER);
- icalproperty_add_parameter (prop, icalparameter_new_cn (g_strdup(owner_cn)));
+ icalproperty_add_parameter (prop, icalparameter_new_cn (g_strdup (owner_cn)));
icalproperty_remove_parameter_by_kind (prop, ICAL_SENTBY_PARAMETER);
icalproperty_add_parameter (prop,
icalparameter_new_sentby (g_strdup_printf("MAILTO:%s", subscriber_email)));
@@ -400,7 +400,7 @@ mail_util_demangle_meeting_related_message (GString *body,
if (modify_prop) {
/* We do not really need to set the CN parameter. However, setting it might improve usability. */
icalproperty_remove_parameter_by_kind (prop, ICAL_CN_PARAMETER);
- icalproperty_add_parameter (prop, icalparameter_new_cn (g_strdup(owner_cn)));
+ icalproperty_add_parameter (prop, icalparameter_new_cn (g_strdup (owner_cn)));
icalproperty_remove_parameter_by_kind (prop, ICAL_SENTBY_PARAMETER);
icalproperty_add_parameter (prop,
icalparameter_new_sentby (g_strdup_printf("MAILTO:%s", subscriber_email)));
diff --git a/eplugin/exchange-account-setup.c b/eplugin/exchange-account-setup.c
index 59f845a..17fc2ce 100644
--- a/eplugin/exchange-account-setup.c
+++ b/eplugin/exchange-account-setup.c
@@ -46,9 +46,9 @@
#include "exchange-change-password.h"
#include "exchange-folder-size-display.h"
-GtkWidget* org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data);
-GtkWidget *org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data);
-gboolean org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData *data);
+GtkWidget* org_gnome_exchange_settings (EPlugin *epl, EConfigHookItemFactoryData *data);
+GtkWidget *org_gnome_exchange_owa_url (EPlugin *epl, EConfigHookItemFactoryData *data);
+gboolean org_gnome_exchange_check_options (EPlugin *epl, EConfigHookPageCheckData *data);
GtkWidget *org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data);
void org_gnome_exchange_commit (EPlugin *epl, EMConfigTargetAccount *target_account);
GtkWidget* org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactoryData *data);
@@ -167,7 +167,7 @@ btn_fsize_clicked (GtkButton *button, gpointer data)
/* only used in editor */
GtkWidget *
-org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
+org_gnome_exchange_settings (EPlugin *epl, EConfigHookItemFactoryData *data)
{
EMConfigTargetAccount *target_account;
ExchangeAccount *account = NULL;
@@ -212,16 +212,16 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
target_account = (EMConfigTargetAccount *)data->config->target;
source_url = e_account_get_string (target_account->account, E_ACCOUNT_SOURCE_URL);
- url = camel_url_new(source_url, NULL);
+ url = camel_url_new (source_url, NULL);
if (url == NULL
|| strcmp(url->protocol, "exchange") != 0) {
if (url)
- camel_url_free(url);
+ camel_url_free (url);
return NULL;
}
if (data->old) {
- camel_url_free(url);
+ camel_url_free (url);
return data->old;
}
if (url)
@@ -441,7 +441,7 @@ gal_auth_to_string (E2kAutoconfigGalAuthPref ad_auth)
}
static void
-owa_authenticate_user(GtkWidget *button, EConfig *config)
+owa_authenticate_user (GtkWidget *button, EConfig *config)
{
EMConfigTargetAccount *target_account = (EMConfigTargetAccount *)config->target;
E2kAutoconfigResult result;
@@ -465,13 +465,13 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
source_url = e_account_get_string (target_account->account, E_ACCOUNT_SOURCE_URL);
if (source_url && source_url[0] != '\0')
- url = camel_url_new(source_url, NULL);
+ url = camel_url_new (source_url, NULL);
if (url && url->user == NULL) {
id_name = e_account_get_string (target_account->account, E_ACCOUNT_ID_ADDRESS);
if (id_name) {
- at = strchr(id_name, '@');
- user = g_alloca(at-id_name+1);
- memcpy(user, id_name, at-id_name);
+ at = strchr (id_name, '@');
+ user = g_alloca (at-id_name+1);
+ memcpy (user, id_name, at-id_name);
user[at-id_name] = 0;
camel_url_set_user (url, user);
}
@@ -493,7 +493,7 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
key = camel_url_to_string (url, CAMEL_URL_HIDE_PASSWORD | CAMEL_URL_HIDE_PARAMS);
/* Supress the trailing slash */
- key[strlen(key) -1] = 0;
+ key[strlen (key) -1] = 0;
/* set the mailbox before function call to let it use our, not create one */
exchange_params->mailbox = g_strdup (camel_url_get_param (url, "mailbox"));
@@ -539,7 +539,7 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
}
static void
-owa_editor_entry_changed(GtkWidget *entry, EConfig *config)
+owa_editor_entry_changed (GtkWidget *entry, EConfig *config)
{
const gchar *ssl = NULL;
CamelURL *url, *owaurl = NULL;
@@ -550,35 +550,35 @@ owa_editor_entry_changed(GtkWidget *entry, EConfig *config)
/* NB: we set the button active only if we have a parsable uri entered */
- const gchar * target_url = e_account_get_string(target->account, E_ACCOUNT_SOURCE_URL);
+ const gchar * target_url = e_account_get_string (target->account, E_ACCOUNT_SOURCE_URL);
if (target_url && target_url[0] != '\0')
- url = camel_url_new(target_url, NULL);
+ url = camel_url_new (target_url, NULL);
else url = NULL;
- uri = g_strdup (gtk_entry_get_text((GtkEntry *)entry));
+ uri = g_strdup (gtk_entry_get_text ((GtkEntry *)entry));
g_strstrip (uri);
if (uri && uri[0]) {
camel_url_set_param(url, "owa_url", uri);
- owaurl = camel_url_new(uri, NULL);
+ owaurl = camel_url_new (uri, NULL);
if (owaurl) {
active = TRUE;
/* Reading the owa url and setting use_ssl paramemter */
if (!strcmp(owaurl->protocol, "https"))
ssl = "always";
- camel_url_free(owaurl);
+ camel_url_free (owaurl);
}
} else {
camel_url_set_param(url, "owa_url", NULL);
}
camel_url_set_param(url, "use_ssl", ssl);
- gtk_widget_set_sensitive(button, active);
+ gtk_widget_set_sensitive (button, active);
- url_string = camel_url_to_string(url, 0);
- e_account_set_string(target->account, E_ACCOUNT_SOURCE_URL, url_string);
- g_free(url_string);
+ url_string = camel_url_to_string (url, 0);
+ e_account_set_string (target->account, E_ACCOUNT_SOURCE_URL, url_string);
+ g_free (url_string);
camel_url_free (url);
g_free (uri);
}
@@ -679,7 +679,7 @@ construct_owa_url (CamelURL *url)
/* used by editor and assistant - same code */
GtkWidget *
-org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
+org_gnome_exchange_owa_url (EPlugin *epl, EConfigHookItemFactoryData *data)
{
EMConfigTargetAccount *target_account;
const gchar *source_url;
@@ -692,17 +692,17 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
target_account = (EMConfigTargetAccount *)data->config->target;
source_url = e_account_get_string (target_account->account, E_ACCOUNT_SOURCE_URL);
if (source_url && source_url[0] != '\0')
- url = camel_url_new(source_url, NULL);
+ url = camel_url_new (source_url, NULL);
else
url = NULL;
if (url == NULL
|| strcmp(url->protocol, "exchange") != 0) {
if (url)
- camel_url_free(url);
+ camel_url_free (url);
if (data->old
&& (label = g_object_get_data((GObject *)data->old, "authenticate-label")))
- gtk_widget_destroy(label);
+ gtk_widget_destroy (label);
/* TODO: we could remove 'owa-url' from the url,
but that will lose it if we come back. Maybe a commit callback could do it */
@@ -711,7 +711,7 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
}
if (data->old) {
- camel_url_free(url);
+ camel_url_free (url);
return data->old;
}
@@ -724,18 +724,18 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
gchar *uri;
camel_url_set_host(url, "");
- uri = camel_url_to_string(url, 0);
- e_account_set_string(target_account->account, E_ACCOUNT_SOURCE_URL, uri);
- g_free(uri);
+ uri = camel_url_to_string (url, 0);
+ e_account_set_string (target_account->account, E_ACCOUNT_SOURCE_URL, uri);
+ g_free (uri);
}
g_object_get (data->parent, "n-rows", &row, NULL);
hbox = gtk_hbox_new (FALSE, 6);
label = gtk_label_new_with_mnemonic(_("_OWA URL:"));
- gtk_widget_show(label);
+ gtk_widget_show (label);
- owa_entry = gtk_entry_new();
+ owa_entry = gtk_entry_new ();
if (!owa_url) {
if (url->host[0] != 0) {
@@ -748,22 +748,22 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
*/
owa_url = construct_owa_url (url);
camel_url_set_param (url, "owa_url", owa_url);
- uri = camel_url_to_string(url, 0);
- e_account_set_string(target_account->account, E_ACCOUNT_SOURCE_URL, uri);
- g_free(uri);
+ uri = camel_url_to_string (url, 0);
+ e_account_set_string (target_account->account, E_ACCOUNT_SOURCE_URL, uri);
+ g_free (uri);
}
}
camel_url_free (url);
if (owa_url)
- gtk_entry_set_text(GTK_ENTRY (owa_entry), owa_url);
- gtk_label_set_mnemonic_widget((GtkLabel *)label, owa_entry);
+ gtk_entry_set_text (GTK_ENTRY (owa_entry), owa_url);
+ gtk_label_set_mnemonic_widget ((GtkLabel *)label, owa_entry);
button = gtk_button_new_with_mnemonic (_("A_uthenticate"));
gtk_widget_set_sensitive (button, owa_url && owa_url[0]);
gtk_box_pack_start (GTK_BOX (hbox), owa_entry, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
- gtk_widget_show_all(hbox);
+ gtk_widget_show_all (hbox);
gtk_table_attach (GTK_TABLE (data->parent), label, 0, 1, row, row+1, 0, 0, 0, 0);
gtk_table_attach (GTK_TABLE (data->parent), hbox, 1, 2, row, row+1, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
@@ -820,13 +820,13 @@ org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data)
}
gboolean
-org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData *data)
+org_gnome_exchange_check_options (EPlugin *epl, EConfigHookPageCheckData *data)
{
EMConfigTargetAccount *target = (EMConfigTargetAccount *)data->config->target;
gint status = TRUE;
/* We assume that if the host is set, then the setting is valid.
- The host gets set when the provider validate() call is made */
+ The host gets set when the provider validate () call is made */
/* We do this check for receive page also, so that user can
* proceed with the account set up only after user is validated,
* and host name is reset by validate() call
@@ -836,9 +836,9 @@ org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData *data)
strcmp (data->pageid, "20.receive_options") == 0) {
CamelURL *url;
- const gchar * target_url = e_account_get_string(target->account, E_ACCOUNT_SOURCE_URL);
+ const gchar * target_url = e_account_get_string (target->account, E_ACCOUNT_SOURCE_URL);
if (target_url && target_url[0] != '\0')
- url = camel_url_new(target_url, NULL);
+ url = camel_url_new (target_url, NULL);
else
url = NULL;
/* Note: we only care about exchange url's, we WILL get called on all other url's too. */
@@ -848,7 +848,7 @@ org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData *data)
status = FALSE;
if (url)
- camel_url_free(url);
+ camel_url_free (url);
}
return status;
@@ -928,7 +928,7 @@ static void
exchange_authtype_changed (GtkComboBox *dropdown, EConfig *config)
{
EMConfigTargetAccount *target = (EMConfigTargetAccount *)config->target;
- gint id = gtk_combo_box_get_active(dropdown);
+ gint id = gtk_combo_box_get_active (dropdown);
GtkTreeModel *model;
GtkTreeIter iter;
CamelServiceAuthType *authtype;
@@ -947,27 +947,27 @@ exchange_authtype_changed (GtkComboBox *dropdown, EConfig *config)
E_ACCOUNT_TRANSPORT_URL);
url_transport = camel_url_new (transport_url, NULL);
- model = gtk_combo_box_get_model(dropdown);
- if (gtk_tree_model_iter_nth_child(model, &iter, NULL, id)) {
- gtk_tree_model_get(model, &iter, 1, &authtype, -1);
+ model = gtk_combo_box_get_model (dropdown);
+ if (gtk_tree_model_iter_nth_child (model, &iter, NULL, id)) {
+ gtk_tree_model_get (model, &iter, 1, &authtype, -1);
if (authtype) {
- camel_url_set_authmech(url_source, authtype->authproto);
- camel_url_set_authmech(url_transport, authtype->authproto);
+ camel_url_set_authmech (url_source, authtype->authproto);
+ camel_url_set_authmech (url_transport, authtype->authproto);
}
else {
- camel_url_set_authmech(url_source, NULL);
- camel_url_set_authmech(url_transport, NULL);
+ camel_url_set_authmech (url_source, NULL);
+ camel_url_set_authmech (url_transport, NULL);
}
- source_url_string = camel_url_to_string(url_source, 0);
- transport_url_string = camel_url_to_string(url_transport, 0);
- e_account_set_string(target->account, E_ACCOUNT_SOURCE_URL, source_url_string);
- e_account_set_string(target->account, E_ACCOUNT_TRANSPORT_URL, transport_url_string);
- g_free(source_url_string);
- g_free(transport_url_string);
+ source_url_string = camel_url_to_string (url_source, 0);
+ transport_url_string = camel_url_to_string (url_transport, 0);
+ e_account_set_string (target->account, E_ACCOUNT_SOURCE_URL, source_url_string);
+ e_account_set_string (target->account, E_ACCOUNT_TRANSPORT_URL, transport_url_string);
+ g_free (source_url_string);
+ g_free (transport_url_string);
}
- camel_url_free(url_source);
- camel_url_free(url_transport);
+ camel_url_free (url_source);
+ camel_url_free (url_transport);
}
GtkWidget *
@@ -998,7 +998,7 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
}
if (data->old) {
- camel_url_free(url);
+ camel_url_free (url);
return data->old;
}
@@ -1026,15 +1026,15 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
authtypes = g_list_prepend (g_list_prepend (NULL, &camel_exchange_password_authtype),
&camel_exchange_ntlm_authtype);
- store = gtk_list_store_new(3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN);
+ store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_BOOLEAN);
for (i=0, l=authtypes; l; l=l->next, i++) {
CamelServiceAuthType *authtype = l->data;
gint avail = TRUE;
if (authtypes) {
- for (ll = authtypes; ll; ll = g_list_next(ll))
- if (!strcmp(authtype->authproto,
+ for (ll = authtypes; ll; ll = g_list_next (ll))
+ if (!strcmp (authtype->authproto,
((CamelServiceAuthType *)ll->data)->authproto))
break;
avail = ll != NULL;
@@ -1043,7 +1043,7 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
gtk_list_store_set (store, &iter, 0, authtype->name, 1,
authtype, 2, !avail, -1);
- if (url && url->authmech && !strcmp(url->authmech, authtype->authproto)) {
+ if (url && url->authmech && !strcmp (url->authmech, authtype->authproto)) {
active = i;
}
else if (url && exchange_account_authtype &&
@@ -1061,7 +1061,7 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
gtk_combo_box_set_active (dropdown, -1);
if (auth_changed_id == 0) {
- GtkCellRenderer *cell = gtk_cell_renderer_text_new();
+ GtkCellRenderer *cell = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start ((GtkCellLayout *)dropdown, cell, TRUE);
gtk_cell_layout_set_attributes ((GtkCellLayout *)dropdown, cell,
@@ -1073,11 +1073,11 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
data->config);
g_signal_connect (button,
"clicked",
- G_CALLBACK(exchange_check_authtype),
+ G_CALLBACK (exchange_check_authtype),
data->config);
}
- gtk_combo_box_set_active(dropdown, active);
+ gtk_combo_box_set_active (dropdown, active);
gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (dropdown), FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
@@ -1090,7 +1090,7 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
gtk_box_pack_start (GTK_BOX (data->parent), vbox, TRUE, TRUE, 0);
if (url)
- camel_url_free(url);
+ camel_url_free (url);
g_list_free (authtypes);
g_free (exchange_account_authtype);
diff --git a/eplugin/exchange-calendar.c b/eplugin/exchange-calendar.c
index 7a42b7b..4662845 100644
--- a/eplugin/exchange-calendar.c
+++ b/eplugin/exchange-calendar.c
@@ -126,8 +126,8 @@ e_exchange_calendar_pcalendar_on_change (GtkTreeView *treeview, ESource *source)
if (!account)
return;
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
- gtk_tree_selection_get_selected(selection, &model, &iter);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
+ gtk_tree_selection_get_selected (selection, &model, &iter);
gtk_tree_model_get (model, &iter, CALENDARRURI_COL, &ruri, -1);
es_ruri = g_strconcat (account->account_filename, "/;", ruri, NULL);
diff --git a/eplugin/exchange-config-listener.c b/eplugin/exchange-config-listener.c
index 6a0c09f..da44780 100644
--- a/eplugin/exchange-config-listener.c
+++ b/eplugin/exchange-config-listener.c
@@ -637,7 +637,7 @@ change_passwd_cb (GtkWidget *button, ExchangeAccount *account)
{
gchar *current_passwd, *new_passwd;
- gtk_widget_hide (gtk_widget_get_toplevel(button));
+ gtk_widget_hide (gtk_widget_get_toplevel (button));
current_passwd = exchange_account_get_password (account);
new_passwd = exchange_get_new_password (current_passwd, TRUE);
exchange_account_set_password (account, current_passwd, new_passwd);
diff --git a/eplugin/exchange-contacts.c b/eplugin/exchange-contacts.c
index e1a36d9..baa1d37 100644
--- a/eplugin/exchange-contacts.c
+++ b/eplugin/exchange-contacts.c
@@ -113,8 +113,8 @@ e_exchange_contacts_pcontacts_on_change (GtkTreeView *treeview, ESource *source)
if (!account)
return;
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
- gtk_tree_selection_get_selected(selection, &model, &iter);
+ selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
+ gtk_tree_selection_get_selected (selection, &model, &iter);
gtk_tree_model_get (model, &iter, CONTACTSRURI_COL, &ruri, -1);
es_ruri = g_strconcat (account->account_filename, "/;", ruri, NULL);
diff --git a/eplugin/exchange-delegates-user.c b/eplugin/exchange-delegates-user.c
index e66d012..468ce6f 100644
--- a/eplugin/exchange-delegates-user.c
+++ b/eplugin/exchange-delegates-user.c
@@ -442,7 +442,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
for (i = 0; i < EXCHANGE_DELEGATES_LAST; i++) {
combobox = comboboxes[i];
role = e_dialog_combo_box_get (combobox, exchange_perm_map);
- role_name = g_strdup (map_to_full_role_name(role));
+ role_name = g_strdup (map_to_full_role_name (role));
g_string_append_printf (
role_name_final,
"<tr><td>%s:</td><td>%s</td></tr>",
diff --git a/eplugin/exchange-folder-size-display.c b/eplugin/exchange-folder-size-display.c
index bd755a9..a5ae33a 100644
--- a/eplugin/exchange-folder-size-display.c
+++ b/eplugin/exchange-folder-size-display.c
@@ -47,7 +47,7 @@ get_folder_size_func (GtkTreeModel *model,
gdouble folder_size;
gchar *folder_name;
- gtk_tree_model_get(model, iter, COLUMN_SIZE, &folder_size, COLUMN_NAME, &folder_name, -1);
+ gtk_tree_model_get (model, iter, COLUMN_SIZE, &folder_size, COLUMN_NAME, &folder_name, -1);
g_hash_table_insert (info, g_strdup (folder_name), g_strdup_printf ("%.2f", folder_size));
return FALSE;
@@ -87,7 +87,7 @@ format_size_func (GtkTreeViewColumn *col,
gdouble folder_size;
gchar * new_text;
- gtk_tree_model_get(model, iter, COLUMN_SIZE, &folder_size, -1);
+ gtk_tree_model_get (model, iter, COLUMN_SIZE, &folder_size, -1);
if (folder_size)
new_text = g_strdup_printf ("%.2f", folder_size);
diff --git a/eplugin/exchange-mail-send-options.c b/eplugin/exchange-mail-send-options.c
index 97263a1..3d7729b 100644
--- a/eplugin/exchange-mail-send-options.c
+++ b/eplugin/exchange-mail-send-options.c
@@ -92,7 +92,7 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
if (dialog->options->send_as_del_enabled &&
dialog->options->delegate_address &&
- g_ascii_strcasecmp(addr->v.addr, sender_addr->v.addr)) {
+ g_ascii_strcasecmp (addr->v.addr, sender_addr->v.addr)) {
e_msg_composer_modify_header (composer, "Sender" , sender_id);
diff --git a/eplugin/exchange-operations.c b/eplugin/exchange-operations.c
index 9d320e0..719f7d9 100644
--- a/eplugin/exchange-operations.c
+++ b/eplugin/exchange-operations.c
@@ -101,7 +101,7 @@ exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *pare
gchar *uri;
gboolean status, found;
- exchange_operations_tokenize_string (&luri, nodename, '/', sizeof(nodename));
+ exchange_operations_tokenize_string (&luri, nodename, '/', sizeof (nodename));
if (!nodename[0]) {
return TRUE;
@@ -157,7 +157,7 @@ exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter
if (!luri)
return;
- exchange_operations_tokenize_string (&luri, nodename, '/', sizeof(nodename));
+ exchange_operations_tokenize_string (&luri, nodename, '/', sizeof (nodename));
if (!nodename[0]) {
return;
}
@@ -211,7 +211,7 @@ exchange_operations_get_exchange_account (void)
return account;
} else {
/* Try authenticating */
- result = exchange_config_listener_authenticate(exchange_global_config_listener, account);
+ result = exchange_config_listener_authenticate (exchange_global_config_listener, account);
if (result != EXCHANGE_ACCOUNT_CONNECT_SUCCESS) {
exchange_operations_report_error (account, result);
return NULL;
diff --git a/eplugin/exchange-send-options.c b/eplugin/exchange-send-options.c
index cfe0de5..31b6a56 100644
--- a/eplugin/exchange-send-options.c
+++ b/eplugin/exchange-send-options.c
@@ -109,7 +109,7 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
/* The temporary variables address, email, and name are needed to fetch the list items.
Only the valid one is then copied into the storage variables. The "count" variable
- helps us keep a count of the exact number of items in the list. The g_list_length(GList *)
+ helps us keep a count of the exact number of items in the list. The g_list_length (GList *)
produced ambiguous results. Hence count is used :)
*/
for (; tmp != NULL; tmp = g_list_next (tmp)) {
@@ -484,9 +484,9 @@ exchange_sendoptions_dialog_run (ExchangeSendOptionsDialog *sod, GtkWidget *pare
g_signal_connect (name_selector_dialog, "response",
G_CALLBACK (addressbook_dialog_response), sod);
g_signal_connect (GTK_DIALOG (priv->main), "response",
- G_CALLBACK(exchange_send_options_cb), sod);
+ G_CALLBACK (exchange_send_options_cb), sod);
g_signal_connect ((GtkCheckButton *) priv->delegate_enabled, "toggled",
- G_CALLBACK(delegate_option_toggled), sod);
+ G_CALLBACK (delegate_option_toggled), sod);
name_selector_entry = e_name_selector_peek_section_entry (priv->proxy_name_selector,
"Add User");
diff --git a/server/lib/e2k-autoconfig.c b/server/lib/e2k-autoconfig.c
index 989d58e..9af274f 100644
--- a/server/lib/e2k-autoconfig.c
+++ b/server/lib/e2k-autoconfig.c
@@ -1730,7 +1730,7 @@ try_auth_again:
username = g_strdup (usernames[0]);
g_strfreev (usernames);
try++;
- memset(*user, 0, strlen(*user));
+ memset (*user, 0, strlen (*user));
g_free (*user);
*user = g_strdup (username);
g_free (username);
diff --git a/server/lib/e2k-global-catalog.c b/server/lib/e2k-global-catalog.c
index c94d55b..3a0d5bf 100644
--- a/server/lib/e2k-global-catalog.c
+++ b/server/lib/e2k-global-catalog.c
@@ -670,21 +670,21 @@ get_quota_values (E2kGlobalCatalog *gc, E2kOperation *op,
quota_limit_values = ldap_get_values (gc->priv->ldap, msg, "mDBStorageQuota");
if (quota_limit_values) {
- entry->quota_warn = atoi(quota_limit_values[0]);
+ entry->quota_warn = atoi (quota_limit_values[0]);
E2K_GC_DEBUG_MSG(("GC: mDBStorageQuota %s\n", quota_limit_values[0]));
ldap_value_free (quota_limit_values);
}
quota_limit_values = ldap_get_values (gc->priv->ldap, msg, "mDBOverQuotaLimit");
if (quota_limit_values) {
- entry->quota_nosend = atoi(quota_limit_values[0]);
+ entry->quota_nosend = atoi (quota_limit_values[0]);
E2K_GC_DEBUG_MSG(("GC: mDBOverQuotaLimit %s\n", quota_limit_values[0]));
ldap_value_free (quota_limit_values);
}
quota_limit_values = ldap_get_values (gc->priv->ldap, msg, "mDBOverHardQuotaLimit");
if (quota_limit_values) {
- entry->quota_norecv = atoi(quota_limit_values[0]);
+ entry->quota_norecv = atoi (quota_limit_values[0]);
E2K_GC_DEBUG_MSG(("GC: mDBHardQuotaLimit %s\n", quota_limit_values[0]));
ldap_value_free (quota_limit_values);
}
@@ -698,7 +698,7 @@ get_account_control_values (E2kGlobalCatalog *gc, E2kOperation *op,
values = ldap_get_values (gc->priv->ldap, msg, "userAccountControl");
if (values) {
- entry->user_account_control = atoi(values[0]);
+ entry->user_account_control = atoi (values[0]);
E2K_GC_DEBUG_MSG(("GC: userAccountControl %s\n", values[0]));
entry->mask |= E2K_GLOBAL_CATALOG_LOOKUP_ACCOUNT_CONTROL;
ldap_value_free (values);
@@ -1047,7 +1047,7 @@ find_domain_dn (gchar *domain)
sub_domain = strtok (NULL, ".");
}
if (dn_value->str[0])
- dn = g_strndup (dn_value->str, strlen(dn_value->str) - 1);
+ dn = g_strndup (dn_value->str, strlen (dn_value->str) - 1);
else
dn = NULL;
g_string_free (dn_value, TRUE);
diff --git a/server/lib/e2k-properties.h b/server/lib/e2k-properties.h
index 7f8df28..d4dde90 100644
--- a/server/lib/e2k-properties.h
+++ b/server/lib/e2k-properties.h
@@ -90,7 +90,7 @@ void e2k_properties_foreach_removed (E2kProperties *props,
E2kPropertiesForeachFunc callback,
gpointer user_data);
-typedef void(*E2kPropertiesForeachNamespaceFunc)(const gchar *namespace,
+typedef void (*E2kPropertiesForeachNamespaceFunc)(const gchar *namespace,
gchar abbrev,
gpointer user_data);
void e2k_properties_foreach_namespace (E2kProperties *props,
diff --git a/server/lib/e2k-security-descriptor.c b/server/lib/e2k-security-descriptor.c
index 3eaa817..9697d44 100644
--- a/server/lib/e2k-security-descriptor.c
+++ b/server/lib/e2k-security-descriptor.c
@@ -95,29 +95,29 @@ typedef struct {
#define LE(x) (GUINT32_TO_LE (x))
static E2kPermissionsMap permissions_map[] = {
{ E2K_PERMISSION_READ_ANY,
- LE(0x000000), LE(0x000000), LE(0x1208a9), LE(0x0008a9) },
+ LE (0x000000), LE (0x000000), LE (0x1208a9), LE (0x0008a9) },
{ E2K_PERMISSION_CREATE,
- LE(0x000002), LE(0x000002), LE(0x000000), LE(0x000000) },
+ LE (0x000002), LE (0x000002), LE (0x000000), LE (0x000000) },
{ E2K_PERMISSION_CREATE_SUBFOLDER,
- LE(0x000004), LE(0x000004), LE(0x000000), LE(0x000000) },
+ LE (0x000004), LE (0x000004), LE (0x000000), LE (0x000000) },
{ E2K_PERMISSION_EDIT_OWNED,
- LE(0x000000), LE(0x000000), LE(0x000200), LE(0x000000) },
+ LE (0x000000), LE (0x000000), LE (0x000200), LE (0x000000) },
{ E2K_PERMISSION_DELETE_OWNED,
- LE(0x000000), LE(0x000000), LE(0x000400), LE(0x000000) },
+ LE (0x000000), LE (0x000000), LE (0x000400), LE (0x000000) },
{ E2K_PERMISSION_EDIT_ANY,
- LE(0x000000), LE(0x000000), LE(0x0c0116), LE(0x1e0316) },
+ LE (0x000000), LE (0x000000), LE (0x0c0116), LE (0x1e0316) },
{ E2K_PERMISSION_DELETE_ANY,
- LE(0x000000), LE(0x000000), LE(0x010000), LE(0x010400) },
+ LE (0x000000), LE (0x000000), LE (0x010000), LE (0x010400) },
{ E2K_PERMISSION_OWNER,
- LE(0x0d4110), LE(0x0d4110), LE(0x000000), LE(0x000000) },
+ LE (0x0d4110), LE (0x0d4110), LE (0x000000), LE (0x000000) },
{ E2K_PERMISSION_CONTACT,
- LE(0x008000), LE(0x008000), LE(0x000000), LE(0x000000) },
+ LE (0x008000), LE (0x008000), LE (0x000000), LE (0x000000) },
{ E2K_PERMISSION_FOLDER_VISIBLE,
- LE(0x1208a9), LE(0x1200a9), LE(0x000000), LE(0x000000) }
+ LE (0x1208a9), LE (0x1200a9), LE (0x000000), LE (0x000000) }
};
-static const guint32 container_permissions_all = LE(0x1fc9bf);
-static const guint32 object_permissions_all = LE(0x1f0fbf);
+static const guint32 container_permissions_all = LE (0x1fc9bf);
+static const guint32 object_permissions_all = LE (0x1f0fbf);
#undef LE
#define PARENT_TYPE G_TYPE_OBJECT
diff --git a/server/lib/e2k-types.h b/server/lib/e2k-types.h
index 68ebe13..a843b86 100644
--- a/server/lib/e2k-types.h
+++ b/server/lib/e2k-types.h
@@ -32,7 +32,7 @@ typedef struct _E2kSidPrivate E2kSidPrivate;
typedef struct _E2kSidClass E2kSidClass;
#define E2K_MAKE_TYPE(type_name,TypeName,class_init,init,parent) \
-GType type_name##_get_type(void) \
+GType type_name##_get_type (void) \
{ \
static volatile gsize type_id__volatile = 0; \
if (g_once_init_enter (&type_id__volatile)) { \
@@ -57,7 +57,7 @@ GType type_name##_get_type(void) \
}
#define E2K_MAKE_TYPE_WITH_IFACE(type_name,TypeName,class_init,init,parent,iface_init,iparent) \
-GType type_name##_get_type(void) \
+GType type_name##_get_type (void) \
{ \
static volatile gsize type_id__volatile = 0; \
if (g_once_init_enter (&type_id__volatile)) { \
diff --git a/server/lib/e2k-uri.c b/server/lib/e2k-uri.c
index 93c0f2a..e46d78a 100644
--- a/server/lib/e2k-uri.c
+++ b/server/lib/e2k-uri.c
@@ -86,7 +86,7 @@ e2k_uri_new (const gchar *uri_string)
colon = at;
}
- semi = strchr(uri_string, ';');
+ semi = strchr (uri_string, ';');
if (semi && semi < colon &&
!g_ascii_strncasecmp (semi, ";auth=", 6)) {
uri->authmech = g_strndup (semi + 6,
diff --git a/server/lib/e2k-xml-utils.c b/server/lib/e2k-xml-utils.c
index adfb86e..75b98b3 100644
--- a/server/lib/e2k-xml-utils.c
+++ b/server/lib/e2k-xml-utils.c
@@ -52,7 +52,7 @@ e2k_parse_xml (const gchar *buf, gint len)
g_return_val_if_fail (buf != NULL, NULL);
if (!sax) {
- xmlInitParser();
+ xmlInitParser ();
sax = xmlMalloc (sizeof (xmlSAXHandler));
#if LIBXML_VERSION > 20600
xmlSAXVersion (sax, 2);
@@ -115,7 +115,7 @@ e2k_parse_html (const gchar *buf, gint len)
g_return_val_if_fail (buf != NULL, NULL);
if (!sax) {
- xmlInitParser();
+ xmlInitParser ();
sax = xmlMalloc (sizeof (htmlSAXHandler));
memcpy (sax, &htmlDefaultSAXHandler, sizeof (xmlSAXHandlerV1));
sax->warning = my_xml_parser_error_handler;
diff --git a/server/lib/ebrowse.c b/server/lib/ebrowse.c
index 1a469ee..1f6363c 100644
--- a/server/lib/ebrowse.c
+++ b/server/lib/ebrowse.c
@@ -323,7 +323,7 @@ get_property (E2kContext *ctx, gchar *uri, gchar *prop)
}
static void
-get_fav_properties(E2kContext *ctx, gchar *uri)
+get_fav_properties (E2kContext *ctx, gchar *uri)
{
E2kRestriction *rn;
E2kResultIter *iter;
@@ -342,11 +342,11 @@ get_fav_properties(E2kContext *ctx, gchar *uri)
e2k_restriction_unref (rn);
while ((result = e2k_result_iter_next (iter))) {
- strcpy(fav_uri, uri);
+ strcpy (fav_uri, uri);
eml_str = strstr(result->href, "Shortcuts");
eml_str = eml_str + strlen("Shortcuts");
- strcat(fav_uri, eml_str);
+ strcat (fav_uri, eml_str);
printf("\nNAME:\n");
get_property (ctx, fav_uri, PR_FAV_DISPLAY_NAME);
@@ -366,7 +366,7 @@ get_fav_properties(E2kContext *ctx, gchar *uri)
get_property (ctx, fav_uri, PR_FAV_DEL_SUBS);
printf("\n\t\t=================================================\n");
- memset(fav_uri, 0, 1024);
+ memset (fav_uri, 0, 1024);
}
status = e2k_result_iter_free (iter);
e2k_operation_free (&op);
@@ -704,7 +704,7 @@ test_main (gint argc, gchar **argv)
break;
case 'f':
- get_fav_properties(ctx, uri);
+ get_fav_properties (ctx, uri);
break;
default:
diff --git a/server/storage/exchange-folder-size.c b/server/storage/exchange-folder-size.c
index c041e7d..1f522ba 100644
--- a/server/storage/exchange-folder-size.c
+++ b/server/storage/exchange-folder-size.c
@@ -168,7 +168,7 @@ exchange_folder_size_update (ExchangeFolderSize *fsize,
return;
}
} else {
- f_info = g_new0(folder_info, 1);
+ f_info = g_new0 (folder_info, 1);
f_info->folder_name = g_strdup (folder_name);
f_info->folder_size = folder_size;
g_hash_table_insert (folder_gsizeable, f_info->folder_name, f_info);
diff --git a/server/storage/exchange-hierarchy-webdav.c b/server/storage/exchange-hierarchy-webdav.c
index 378df62..71df3a3 100644
--- a/server/storage/exchange-hierarchy-webdav.c
+++ b/server/storage/exchange-hierarchy-webdav.c
@@ -375,7 +375,7 @@ remove_folder (ExchangeHierarchy *hier, EFolder *folder)
/* update the folder size info */
exchange_account_folder_size_remove (hier->account,
- e_folder_get_name(folder));
+ e_folder_get_name (folder));
return EXCHANGE_ACCOUNT_FOLDER_OK;
} else
return EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR;
diff --git a/server/storage/exchange-oof.c b/server/storage/exchange-oof.c
index 9398169..5b9a80f 100644
--- a/server/storage/exchange-oof.c
+++ b/server/storage/exchange-oof.c
@@ -42,8 +42,8 @@ find_str_case (const gchar *haystack, const gchar *needle, const gchar *end)
g_return_val_if_fail (haystack != NULL, NULL);
g_return_val_if_fail (needle != NULL, NULL);
- len = strlen(needle);
- if (len > strlen(haystack))
+ len = strlen (needle);
+ if (len > strlen (haystack))
return NULL;
if (len == 0)
diff --git a/server/xntlm/xntlm-des.c b/server/xntlm/xntlm-des.c
index 8d00169..b965184 100644
--- a/server/xntlm/xntlm-des.c
+++ b/server/xntlm/xntlm-des.c
@@ -172,7 +172,7 @@ static guint32 Spbox[8][64] = {
}
/* Encrypt or decrypt a block of data in ECB mode */
void
-xntlm_des(XNTLM_DES_KS ks, guchar block[8])
+xntlm_des (XNTLM_DES_KS ks, guchar block[8])
{
guint32 left,right,work;
@@ -215,22 +215,22 @@ xntlm_des(XNTLM_DES_KS ks, guchar block[8])
left = (left << 1) | (left >> 31);
/* Now do the 16 rounds */
- F(left,right,ks[0]);
- F(right,left,ks[1]);
- F(left,right,ks[2]);
- F(right,left,ks[3]);
- F(left,right,ks[4]);
- F(right,left,ks[5]);
- F(left,right,ks[6]);
- F(right,left,ks[7]);
- F(left,right,ks[8]);
- F(right,left,ks[9]);
- F(left,right,ks[10]);
- F(right,left,ks[11]);
- F(left,right,ks[12]);
- F(right,left,ks[13]);
- F(left,right,ks[14]);
- F(right,left,ks[15]);
+ F (left,right,ks[0]);
+ F (right,left,ks[1]);
+ F (left,right,ks[2]);
+ F (right,left,ks[3]);
+ F (left,right,ks[4]);
+ F (right,left,ks[5]);
+ F (left,right,ks[6]);
+ F (right,left,ks[7]);
+ F (left,right,ks[8]);
+ F (right,left,ks[9]);
+ F (left,right,ks[10]);
+ F (right,left,ks[11]);
+ F (left,right,ks[12]);
+ F (right,left,ks[13]);
+ F (left,right,ks[14]);
+ F (right,left,ks[15]);
/* Inverse permutation, also from Hoey via Outerbridge and Schneier */
right = (right << 31) | (right >> 1);
@@ -305,7 +305,7 @@ static gint bytebit[] = {
* depending on the value of "decrypt"
*/
void
-xntlm_deskey(XNTLM_DES_KS k, const guchar *key, gint decrypt)
+xntlm_deskey (XNTLM_DES_KS k, const guchar *key, gint decrypt)
{
guchar pc1m[56]; /* place to modify pc1 into */
guchar pcr[56]; /* place to rotate pc1 into */
@@ -321,7 +321,7 @@ xntlm_deskey(XNTLM_DES_KS k, const guchar *key, gint decrypt)
? 1 : 0; /* and store 1-bit result */
}
for (i=0; i<16; i++) { /* key chunk for each iteration */
- memset(ks,0,sizeof(ks)); /* Clear key schedule */
+ memset (ks,0,sizeof (ks)); /* Clear key schedule */
for (j=0; j<56; j++) /* rotate pc1 the right amount */
pcr[j] = pc1m[(l=j+totrot[decrypt? 15-i : i])<(j<28? 28 : 56) ? l: l-28];
/* rotate left and right halves independently */
diff --git a/server/xntlm/xntlm-md4.c b/server/xntlm/xntlm-md4.c
index 382f984..a71d0d5 100644
--- a/server/xntlm/xntlm-md4.c
+++ b/server/xntlm/xntlm-md4.c
@@ -53,56 +53,56 @@ md4sum_round (const guchar *M,
C = *CC;
D = *DD;
- A = ROT (A + F(B, C, D) + X[0], 3);
- D = ROT (D + F(A, B, C) + X[1], 7);
- C = ROT (C + F(D, A, B) + X[2], 11);
- B = ROT (B + F(C, D, A) + X[3], 19);
- A = ROT (A + F(B, C, D) + X[4], 3);
- D = ROT (D + F(A, B, C) + X[5], 7);
- C = ROT (C + F(D, A, B) + X[6], 11);
- B = ROT (B + F(C, D, A) + X[7], 19);
- A = ROT (A + F(B, C, D) + X[8], 3);
- D = ROT (D + F(A, B, C) + X[9], 7);
- C = ROT (C + F(D, A, B) + X[10], 11);
- B = ROT (B + F(C, D, A) + X[11], 19);
- A = ROT (A + F(B, C, D) + X[12], 3);
- D = ROT (D + F(A, B, C) + X[13], 7);
- C = ROT (C + F(D, A, B) + X[14], 11);
- B = ROT (B + F(C, D, A) + X[15], 19);
-
- A = ROT (A + G(B, C, D) + X[0] + 0x5A827999, 3);
- D = ROT (D + G(A, B, C) + X[4] + 0x5A827999, 5);
- C = ROT (C + G(D, A, B) + X[8] + 0x5A827999, 9);
- B = ROT (B + G(C, D, A) + X[12] + 0x5A827999, 13);
- A = ROT (A + G(B, C, D) + X[1] + 0x5A827999, 3);
- D = ROT (D + G(A, B, C) + X[5] + 0x5A827999, 5);
- C = ROT (C + G(D, A, B) + X[9] + 0x5A827999, 9);
- B = ROT (B + G(C, D, A) + X[13] + 0x5A827999, 13);
- A = ROT (A + G(B, C, D) + X[2] + 0x5A827999, 3);
- D = ROT (D + G(A, B, C) + X[6] + 0x5A827999, 5);
- C = ROT (C + G(D, A, B) + X[10] + 0x5A827999, 9);
- B = ROT (B + G(C, D, A) + X[14] + 0x5A827999, 13);
- A = ROT (A + G(B, C, D) + X[3] + 0x5A827999, 3);
- D = ROT (D + G(A, B, C) + X[7] + 0x5A827999, 5);
- C = ROT (C + G(D, A, B) + X[11] + 0x5A827999, 9);
- B = ROT (B + G(C, D, A) + X[15] + 0x5A827999, 13);
-
- A = ROT (A + H(B, C, D) + X[0] + 0x6ED9EBA1, 3);
- D = ROT (D + H(A, B, C) + X[8] + 0x6ED9EBA1, 9);
- C = ROT (C + H(D, A, B) + X[4] + 0x6ED9EBA1, 11);
- B = ROT (B + H(C, D, A) + X[12] + 0x6ED9EBA1, 15);
- A = ROT (A + H(B, C, D) + X[2] + 0x6ED9EBA1, 3);
- D = ROT (D + H(A, B, C) + X[10] + 0x6ED9EBA1, 9);
- C = ROT (C + H(D, A, B) + X[6] + 0x6ED9EBA1, 11);
- B = ROT (B + H(C, D, A) + X[14] + 0x6ED9EBA1, 15);
- A = ROT (A + H(B, C, D) + X[1] + 0x6ED9EBA1, 3);
- D = ROT (D + H(A, B, C) + X[9] + 0x6ED9EBA1, 9);
- C = ROT (C + H(D, A, B) + X[5] + 0x6ED9EBA1, 11);
- B = ROT (B + H(C, D, A) + X[13] + 0x6ED9EBA1, 15);
- A = ROT (A + H(B, C, D) + X[3] + 0x6ED9EBA1, 3);
- D = ROT (D + H(A, B, C) + X[11] + 0x6ED9EBA1, 9);
- C = ROT (C + H(D, A, B) + X[7] + 0x6ED9EBA1, 11);
- B = ROT (B + H(C, D, A) + X[15] + 0x6ED9EBA1, 15);
+ A = ROT (A + F (B, C, D) + X[0], 3);
+ D = ROT (D + F (A, B, C) + X[1], 7);
+ C = ROT (C + F (D, A, B) + X[2], 11);
+ B = ROT (B + F (C, D, A) + X[3], 19);
+ A = ROT (A + F (B, C, D) + X[4], 3);
+ D = ROT (D + F (A, B, C) + X[5], 7);
+ C = ROT (C + F (D, A, B) + X[6], 11);
+ B = ROT (B + F (C, D, A) + X[7], 19);
+ A = ROT (A + F (B, C, D) + X[8], 3);
+ D = ROT (D + F (A, B, C) + X[9], 7);
+ C = ROT (C + F (D, A, B) + X[10], 11);
+ B = ROT (B + F (C, D, A) + X[11], 19);
+ A = ROT (A + F (B, C, D) + X[12], 3);
+ D = ROT (D + F (A, B, C) + X[13], 7);
+ C = ROT (C + F (D, A, B) + X[14], 11);
+ B = ROT (B + F (C, D, A) + X[15], 19);
+
+ A = ROT (A + G (B, C, D) + X[0] + 0x5A827999, 3);
+ D = ROT (D + G (A, B, C) + X[4] + 0x5A827999, 5);
+ C = ROT (C + G (D, A, B) + X[8] + 0x5A827999, 9);
+ B = ROT (B + G (C, D, A) + X[12] + 0x5A827999, 13);
+ A = ROT (A + G (B, C, D) + X[1] + 0x5A827999, 3);
+ D = ROT (D + G (A, B, C) + X[5] + 0x5A827999, 5);
+ C = ROT (C + G (D, A, B) + X[9] + 0x5A827999, 9);
+ B = ROT (B + G (C, D, A) + X[13] + 0x5A827999, 13);
+ A = ROT (A + G (B, C, D) + X[2] + 0x5A827999, 3);
+ D = ROT (D + G (A, B, C) + X[6] + 0x5A827999, 5);
+ C = ROT (C + G (D, A, B) + X[10] + 0x5A827999, 9);
+ B = ROT (B + G (C, D, A) + X[14] + 0x5A827999, 13);
+ A = ROT (A + G (B, C, D) + X[3] + 0x5A827999, 3);
+ D = ROT (D + G (A, B, C) + X[7] + 0x5A827999, 5);
+ C = ROT (C + G (D, A, B) + X[11] + 0x5A827999, 9);
+ B = ROT (B + G (C, D, A) + X[15] + 0x5A827999, 13);
+
+ A = ROT (A + H (B, C, D) + X[0] + 0x6ED9EBA1, 3);
+ D = ROT (D + H (A, B, C) + X[8] + 0x6ED9EBA1, 9);
+ C = ROT (C + H (D, A, B) + X[4] + 0x6ED9EBA1, 11);
+ B = ROT (B + H (C, D, A) + X[12] + 0x6ED9EBA1, 15);
+ A = ROT (A + H (B, C, D) + X[2] + 0x6ED9EBA1, 3);
+ D = ROT (D + H (A, B, C) + X[10] + 0x6ED9EBA1, 9);
+ C = ROT (C + H (D, A, B) + X[6] + 0x6ED9EBA1, 11);
+ B = ROT (B + H (C, D, A) + X[14] + 0x6ED9EBA1, 15);
+ A = ROT (A + H (B, C, D) + X[1] + 0x6ED9EBA1, 3);
+ D = ROT (D + H (A, B, C) + X[9] + 0x6ED9EBA1, 9);
+ C = ROT (C + H (D, A, B) + X[5] + 0x6ED9EBA1, 11);
+ B = ROT (B + H (C, D, A) + X[13] + 0x6ED9EBA1, 15);
+ A = ROT (A + H (B, C, D) + X[3] + 0x6ED9EBA1, 3);
+ D = ROT (D + H (A, B, C) + X[11] + 0x6ED9EBA1, 9);
+ C = ROT (C + H (D, A, B) + X[7] + 0x6ED9EBA1, 11);
+ B = ROT (B + H (C, D, A) + X[15] + 0x6ED9EBA1, 15);
*AA += A;
*BB += B;
diff --git a/tools/exchange-autoconfig-wizard.c b/tools/exchange-autoconfig-wizard.c
index f147f30..ee8a8fb 100644
--- a/tools/exchange-autoconfig-wizard.c
+++ b/tools/exchange-autoconfig-wizard.c
@@ -574,7 +574,7 @@ autoconfig_gui_apply (ExchangeAutoconfigGUI *gui)
}
account = NULL;
}
- g_object_unref(iter);
+ g_object_unref (iter);
if (found)
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
