[evolution-exchange] Whitespace cleanup.
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Subject: [evolution-exchange] Whitespace cleanup.
- Date: Thu, 28 May 2009 13:44:23 -0400 (EDT)
commit 584fb60f9b502de91b6969ced8ed0bb870d3bc92
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu May 28 13:38:35 2009 -0400
Whitespace cleanup.
---
addressbook/e-book-backend-db-cache.c | 2 +-
addressbook/e-book-backend-exchange.c | 44 ++--
addressbook/e-book-backend-gal.c | 330 ++++++++++++++--------------
calendar/e-cal-backend-exchange-calendar.c | 10 +-
calendar/e-cal-backend-exchange-tasks.c | 2 +-
calendar/e-cal-backend-exchange.c | 26 +-
calendar/e-cal-backend-exchange.h | 8 +-
camel/camel-exchange-folder.c | 10 +-
camel/camel-exchange-journal.c | 6 +-
camel/camel-exchange-journal.h | 2 +-
camel/camel-exchange-store.c | 6 +-
mail/mail-stub-exchange.c | 2 +-
mail/mail-stub.h | 2 +-
storage/exchange-component.c | 8 +-
storage/exchange-config-listener.c | 4 +-
storage/exchange-config-listener.h | 4 +-
storage/exchange-migrate.c | 30 ++--
storage/main.c | 4 +-
18 files changed, 250 insertions(+), 250 deletions(-)
diff --git a/addressbook/e-book-backend-db-cache.c b/addressbook/e-book-backend-db-cache.c
index f1c663c..cf9f505 100644
--- a/addressbook/e-book-backend-db-cache.c
+++ b/addressbook/e-book-backend-db-cache.c
@@ -293,7 +293,7 @@ e_book_backend_db_cache_check_contact (DB *db, const char *uid)
db_error = db->get (db, NULL, &uid_dbt, &vcard_dbt,0);
if (db_error != 0)
return FALSE;
- else {
+ else {
free (vcard_dbt.data);
return TRUE;
}
diff --git a/addressbook/e-book-backend-exchange.c b/addressbook/e-book-backend-exchange.c
index a00b626..ab6389d 100644
--- a/addressbook/e-book-backend-exchange.c
+++ b/addressbook/e-book-backend-exchange.c
@@ -71,7 +71,7 @@ static EBookBackendClass *parent_class;
struct EBookBackendExchangePrivate {
char *exchange_uri;
- char *original_uri;
+ char *original_uri;
EFolder *folder;
E2kRestriction *base_rn;
@@ -748,7 +748,7 @@ e_book_backend_exchange_connect (EBookBackendExchange *be)
bepriv->is_writable = ((access & MAPI_ACCESS_CREATE_CONTENTS) != 0);
e_book_backend_set_is_writable (E_BOOK_BACKEND (be),
- bepriv->is_writable);
+ bepriv->is_writable);
e_book_backend_notify_writable (E_BOOK_BACKEND (be),
bepriv->is_writable);
@@ -1745,7 +1745,7 @@ e_book_backend_exchange_create_contact (EBookBackendSync *backend,
static EBookBackendSyncStatus
e_book_backend_exchange_modify_contact (EBookBackendSync *backend,
EDataBook *book,
- guint32 opid,
+ guint32 opid,
const char *vcard,
EContact **contact)
{
@@ -1817,9 +1817,9 @@ e_book_backend_exchange_modify_contact (EBookBackendSync *backend,
new_photo = e_contact_get (*contact, E_CONTACT_PHOTO);
if ((old_note && !new_note) ||
- (new_note && !old_note) ||
- (old_note && new_note &&
- strcmp (old_note, new_note) != 0))
+ (new_note && !old_note) ||
+ (old_note && new_note &&
+ strcmp (old_note, new_note) != 0))
changed = TRUE;
else if ((old_photo && !new_photo) || (new_photo && !old_photo))
changed = TRUE;
@@ -1827,8 +1827,8 @@ e_book_backend_exchange_modify_contact (EBookBackendSync *backend,
if ((old_photo->type == new_photo->type) &&
old_photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
changed = ((old_photo->data.inlined.length == new_photo->data.inlined.length)
- && !memcmp (old_photo->data.inlined.data,
- new_photo->data.inlined.data,
+ && !memcmp (old_photo->data.inlined.data,
+ new_photo->data.inlined.data,
old_photo->data.inlined.length));
}
else if ((old_photo->type == new_photo->type) &&
@@ -1882,7 +1882,7 @@ e_book_backend_exchange_modify_contact (EBookBackendSync *backend,
static EBookBackendSyncStatus
e_book_backend_exchange_remove_contacts (EBookBackendSync *backend,
EDataBook *book,
- guint32 opid,
+ guint32 opid,
GList *id_list,
GList **removed_ids)
{
@@ -2197,7 +2197,7 @@ subscription_notify (E2kContext *ctx, const char *uri,
static EBookBackendSyncStatus
e_book_backend_exchange_get_contact_list (EBookBackendSync *backend,
EDataBook *book,
- guint32 opid,
+ guint32 opid,
const char *query,
GList **contacts)
{
@@ -2230,7 +2230,7 @@ e_book_backend_exchange_get_contact_list (EBookBackendSync *backend,
g_object_unref (offline_contacts->data);
}
- *contacts = vcard_list;
+ *contacts = vcard_list;
if (temp)
g_list_free (temp);
return GNOME_Evolution_Addressbook_Success;
@@ -2427,7 +2427,7 @@ find_deleted_ids (const char *id, const char *vcard, gpointer user_data)
static EBookBackendSyncStatus
e_book_backend_exchange_get_changes (EBookBackendSync *backend,
EDataBook *book,
- guint32 opid,
+ guint32 opid,
const char *change_id,
GList **changes)
{
@@ -2472,7 +2472,7 @@ e_book_backend_exchange_get_changes (EBookBackendSync *backend,
g_hash_table_insert (ctx->seen_ids,
g_strdup (result->href),
- GINT_TO_POINTER (1));
+ GINT_TO_POINTER (1));
/* Check what type of change has occurred, if any. */
switch (e_xmlhash_compare (ctx->ehash, result->href,
@@ -2512,7 +2512,7 @@ e_book_backend_exchange_get_changes (EBookBackendSync *backend,
*changes = ctx->changes;
ctx->changes = NULL;
- e_xmlhash_destroy (ctx->ehash);
+ e_xmlhash_destroy (ctx->ehash);
g_hash_table_destroy (ctx->seen_ids);
g_free (ctx);
@@ -2620,7 +2620,7 @@ e_book_backend_exchange_get_contact (EBookBackendSync *backend,
static void
e_book_backend_exchange_authenticate_user (EBookBackend *backend,
EDataBook *book,
- guint32 opid,
+ guint32 opid,
const char *user,
const char *password,
const char *auth_method)
@@ -2695,7 +2695,7 @@ e_book_backend_exchange_get_supported_auth_methods (EBookBackend *backend,
static EBookBackendSyncStatus
e_book_backend_exchange_get_supported_fields (EBookBackendSync *backend,
EDataBook *book,
- guint32 opid,
+ guint32 opid,
GList **methods)
{
int i;
@@ -2990,17 +2990,17 @@ e_book_backend_exchange_init (EBookBackendExchange *backend)
{
EBookBackendExchangePrivate *priv;
- priv = g_new0 (EBookBackendExchangePrivate, 1);
- priv->ops = g_hash_table_new (NULL, NULL);
- priv->is_cache_ready = FALSE;
+ priv = g_new0 (EBookBackendExchangePrivate, 1);
+ priv->ops = g_hash_table_new (NULL, NULL);
+ priv->is_cache_ready = FALSE;
priv->marked_for_offline= FALSE;
priv->cache = NULL;
- priv->original_uri = NULL;
- priv->is_writable = TRUE;
+ priv->original_uri = NULL;
+ priv->is_writable = TRUE;
priv->cache_lock = g_mutex_new ();
- backend->priv = priv;
+ backend->priv = priv;
}
E2K_MAKE_TYPE (e_book_backend_exchange, EBookBackendExchange, e_book_backend_exchange_class_init, e_book_backend_exchange_init, PARENT_TYPE)
diff --git a/addressbook/e-book-backend-gal.c b/addressbook/e-book-backend-gal.c
index 5ae2caa..888bc35 100644
--- a/addressbook/e-book-backend-gal.c
+++ b/addressbook/e-book-backend-gal.c
@@ -818,7 +818,7 @@ get_contact_list (EBookBackend *backend,
for (l = contacts; l ;l = g_list_next (l)) {
EContact *contact = l->data;
vcard_strings = g_list_prepend (vcard_strings, e_vcard_to_string (E_VCARD (contact),
- EVC_FORMAT_VCARD_30));
+ EVC_FORMAT_VCARD_30));
g_object_unref (contact);
}
@@ -1962,7 +1962,7 @@ stop_book_view (EBookBackend *backend,
static void
get_changes (EBookBackend *backend,
EDataBook *book,
- guint32 opid,
+ guint32 opid,
const char *change_id)
{
/* FIXME: implement */
@@ -2007,7 +2007,7 @@ tool_server_controls( LDAP *ld, LDAPControl *extra_c, int count )
crit ? "critical " : "" );
}
- free( ctrls );
+ free( ctrls );
if ( crit ) {
exit( EXIT_FAILURE );
}
@@ -2336,10 +2336,10 @@ authenticate_user (EBookBackend *backend,
int interval = gconf_client_get_int (gc, "/apps/evolution/addressbook/gal_cache_interval", NULL);
/* We should not be here */
-/* e_data_book_respond_authenticate_user (book, */
-/* opid, */
-/* GNOME_Evolution_Addressbook_UnsupportedAuthenticationMethod); */
-/* return; */
+/* e_data_book_respond_authenticate_user (book, */
+/* opid, */
+/* GNOME_Evolution_Addressbook_UnsupportedAuthenticationMethod); */
+/* return; */
d(printf("authenticate_user(%p, %p, %s, %s, %s)\n", backend, book, user, password, auth_method));
@@ -2501,7 +2501,7 @@ set_mode (EBookBackend *backend, int mode)
static void
get_supported_fields (EBookBackend *backend,
EDataBook *book,
- guint32 opid)
+ guint32 opid)
{
e_data_book_respond_get_supported_fields (book,
@@ -2573,23 +2573,23 @@ load_source (EBookBackend *backend,
if (strncmp (uri, "gal://", host - uri))
return GNOME_Evolution_Addressbook_OtherError;
- bl->priv->gal_uri = g_strdup (uri);
- tokens = g_strsplit (uri, ";", 2);
- g_free (uri);
- if (tokens[0])
- uri = g_strdup (tokens [0]);
- book_name = g_strdup (tokens[1]);
- if (book_name == NULL)
- return GNOME_Evolution_Addressbook_OtherError;
- g_strfreev (tokens);
-
- for (i=0; i< strlen (uri); i++) {
- switch (uri[i]) {
- case ':' :
- case '/' :
- uri[i] = '_';
- }
- }
+ bl->priv->gal_uri = g_strdup (uri);
+ tokens = g_strsplit (uri, ";", 2);
+ g_free (uri);
+ if (tokens[0])
+ uri = g_strdup (tokens [0]);
+ book_name = g_strdup (tokens[1]);
+ if (book_name == NULL)
+ return GNOME_Evolution_Addressbook_OtherError;
+ g_strfreev (tokens);
+
+ for (i=0; i< strlen (uri); i++) {
+ switch (uri[i]) {
+ case ':' :
+ case '/' :
+ uri[i] = '_';
+ }
+ }
#if ENABLE_CACHE
bl->priv->file_db = NULL;
#endif
@@ -2605,128 +2605,128 @@ load_source (EBookBackend *backend,
}
d(printf("offlin==============\n"));
#if ENABLE_CACHE
- if (bl->priv->marked_for_offline) {
- d(printf("offlin==============\n"));
- bl->priv->summary_file_name = g_build_filename (g_get_home_dir(), ".evolution/cache/addressbook" , uri, book_name, NULL);
- bl->priv->summary_file_name = g_build_filename (bl->priv->summary_file_name, "cache.summary", NULL);
- bl->priv->summary = e_book_backend_summary_new (bl->priv->summary_file_name,
- SUMMARY_FLUSH_TIMEOUT);
- e_book_backend_summary_load (bl->priv->summary);
-
- dirname = g_build_filename (g_get_home_dir(), ".evolution/cache/addressbook", uri, book_name, NULL);
- filename = g_build_filename (dirname, "cache.db", NULL);
-
- db_error = e_db3_utils_maybe_recover (filename);
- if (db_error != 0) {
- g_warning ("db recovery failed with %d", db_error);
- g_free (dirname);
- g_free (filename);
- return GNOME_Evolution_Addressbook_OtherError;
- }
-
- g_static_mutex_lock (&global_env_lock);
- if (global_env.ref_count > 0) {
- env = global_env.env;
- global_env.ref_count ++;
- }
- else {
- db_error = db_env_create (&env, 0);
- if (db_error != 0) {
- g_warning ("db_env_create failed with %d", db_error);
- g_static_mutex_unlock (&global_env_lock);
- g_free (dirname);
- g_free (filename);
- return GNOME_Evolution_Addressbook_OtherError;
- }
-
- db_error = (*env->open) (env, NULL, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_THREAD, 0);
- if (db_error != 0) {
- 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);
- return GNOME_Evolution_Addressbook_OtherError;
- }
-
- //env->set_errcall (env, file_errcall);
- global_env.env = env;
- global_env.ref_count = 1;
- }
- g_static_mutex_unlock(&global_env_lock);
-
- bl->priv->env = env;
- db_error = db_create (&db, env, 0);
- if (db_error != 0) {
- g_warning ("db_create failed with %d", db_error);
- g_free (dirname);
- g_free (filename);
- return GNOME_Evolution_Addressbook_OtherError;
- }
-
- db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666);
-
- if (db_error == DB_OLD_VERSION) {
- db_error = e_db3_utils_upgrade_format (filename);
-
- if (db_error != 0) {
- g_warning ("db format upgrade failed with %d", db_error);
- g_free (filename);
- g_free (dirname);
- return GNOME_Evolution_Addressbook_OtherError;
- }
-
- db_error = (*db->open) (db, NULL,filename, NULL, DB_HASH, DB_THREAD, 0666);
- }
-
- bl->priv->file_db = db;
- if (db_error != 0) {
- int rv;
-
- /* the database didn't exist, so we create the directory then the .db */
- rv= g_mkdir_with_parents (dirname, 0777);
- if (rv == -1 && errno != EEXIST) {
- g_warning ("failed to make directory %s: %s", dirname, strerror (errno));
- g_free (dirname);
- g_free (filename);
- if (errno == EACCES || errno == EPERM)
- return GNOME_Evolution_Addressbook_PermissionDenied;
- else
- return GNOME_Evolution_Addressbook_OtherError;
- }
-
- db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_CREATE | DB_THREAD, 0666);
- if (db_error != 0) {
- g_warning ("db->open (...DB_CREATE...) failed with %d", db_error);
- }
- }
-
- bl->priv->file_db = db;
-
- if (db_error != 0 || bl->priv->file_db == NULL) {
-
- g_free (filename);
- g_free (dirname);
- return GNOME_Evolution_Addressbook_OtherError;
- }
-
- e_book_backend_db_cache_set_filename (bl->priv->file_db, filename);
- g_free (filename);
- g_free (dirname);
- g_free (uri);
- }
+ if (bl->priv->marked_for_offline) {
+ d(printf("offlin==============\n"));
+ bl->priv->summary_file_name = g_build_filename (g_get_home_dir(), ".evolution/cache/addressbook" , uri, book_name, NULL);
+ bl->priv->summary_file_name = g_build_filename (bl->priv->summary_file_name, "cache.summary", NULL);
+ bl->priv->summary = e_book_backend_summary_new (bl->priv->summary_file_name,
+ SUMMARY_FLUSH_TIMEOUT);
+ e_book_backend_summary_load (bl->priv->summary);
+
+ dirname = g_build_filename (g_get_home_dir(), ".evolution/cache/addressbook", uri, book_name, NULL);
+ filename = g_build_filename (dirname, "cache.db", NULL);
+
+ db_error = e_db3_utils_maybe_recover (filename);
+ if (db_error != 0) {
+ g_warning ("db recovery failed with %d", db_error);
+ g_free (dirname);
+ g_free (filename);
+ return GNOME_Evolution_Addressbook_OtherError;
+ }
+
+ g_static_mutex_lock (&global_env_lock);
+ if (global_env.ref_count > 0) {
+ env = global_env.env;
+ global_env.ref_count ++;
+ }
+ else {
+ db_error = db_env_create (&env, 0);
+ if (db_error != 0) {
+ g_warning ("db_env_create failed with %d", db_error);
+ g_static_mutex_unlock (&global_env_lock);
+ g_free (dirname);
+ g_free (filename);
+ return GNOME_Evolution_Addressbook_OtherError;
+ }
+
+ db_error = (*env->open) (env, NULL, DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_THREAD, 0);
+ if (db_error != 0) {
+ 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);
+ return GNOME_Evolution_Addressbook_OtherError;
+ }
+
+ //env->set_errcall (env, file_errcall);
+ global_env.env = env;
+ global_env.ref_count = 1;
+ }
+ g_static_mutex_unlock(&global_env_lock);
+
+ bl->priv->env = env;
+ db_error = db_create (&db, env, 0);
+ if (db_error != 0) {
+ g_warning ("db_create failed with %d", db_error);
+ g_free (dirname);
+ g_free (filename);
+ return GNOME_Evolution_Addressbook_OtherError;
+ }
+
+ db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_THREAD, 0666);
+
+ if (db_error == DB_OLD_VERSION) {
+ db_error = e_db3_utils_upgrade_format (filename);
+
+ if (db_error != 0) {
+ g_warning ("db format upgrade failed with %d", db_error);
+ g_free (filename);
+ g_free (dirname);
+ return GNOME_Evolution_Addressbook_OtherError;
+ }
+
+ db_error = (*db->open) (db, NULL,filename, NULL, DB_HASH, DB_THREAD, 0666);
+ }
+
+ bl->priv->file_db = db;
+ if (db_error != 0) {
+ int rv;
+
+ /* the database didn't exist, so we create the directory then the .db */
+ rv= g_mkdir_with_parents (dirname, 0777);
+ if (rv == -1 && errno != EEXIST) {
+ g_warning ("failed to make directory %s: %s", dirname, strerror (errno));
+ g_free (dirname);
+ g_free (filename);
+ if (errno == EACCES || errno == EPERM)
+ return GNOME_Evolution_Addressbook_PermissionDenied;
+ else
+ return GNOME_Evolution_Addressbook_OtherError;
+ }
+
+ db_error = (*db->open) (db, NULL, filename, NULL, DB_HASH, DB_CREATE | DB_THREAD, 0666);
+ if (db_error != 0) {
+ g_warning ("db->open (...DB_CREATE...) failed with %d", db_error);
+ }
+ }
+
+ bl->priv->file_db = db;
+
+ if (db_error != 0 || bl->priv->file_db == NULL) {
+
+ g_free (filename);
+ g_free (dirname);
+ return GNOME_Evolution_Addressbook_OtherError;
+ }
+
+ e_book_backend_db_cache_set_filename (bl->priv->file_db, filename);
+ g_free (filename);
+ g_free (dirname);
+ g_free (uri);
+ }
#endif
- /* Online */
- 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);
+ /* Online */
+ 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);
- if (bl->priv->mode == GNOME_Evolution_Addressbook_MODE_LOCAL)
- e_book_backend_notify_connection_status (E_BOOK_BACKEND (backend), FALSE);
- else
- e_book_backend_notify_connection_status (E_BOOK_BACKEND (backend), TRUE);
+ if (bl->priv->mode == GNOME_Evolution_Addressbook_MODE_LOCAL)
+ e_book_backend_notify_connection_status (E_BOOK_BACKEND (backend), FALSE);
+ else
+ e_book_backend_notify_connection_status (E_BOOK_BACKEND (backend), TRUE);
- return GNOME_Evolution_Addressbook_Success;
+ return GNOME_Evolution_Addressbook_Success;
}
static void
@@ -2805,26 +2805,26 @@ dispose (GObject *object)
if (bl->priv->gc)
g_object_unref (bl->priv->gc);
- if (bl->priv->summary_file_name) {
- g_free (bl->priv->summary_file_name);
- bl->priv->summary_file_name = NULL;
- }
+ if (bl->priv->summary_file_name) {
+ g_free (bl->priv->summary_file_name);
+ bl->priv->summary_file_name = NULL;
+ }
- if (bl->priv->summary) {
- e_book_backend_summary_save (bl->priv->summary);
- g_object_unref (bl->priv->summary);
- bl->priv->summary = NULL;
- }
+ if (bl->priv->summary) {
+ e_book_backend_summary_save (bl->priv->summary);
+ g_object_unref (bl->priv->summary);
+ bl->priv->summary = NULL;
+ }
#if ENABLE_CACHE
- if (bl->priv->file_db)
- bl->priv->file_db->close (bl->priv->file_db, 0);
- g_static_mutex_lock (&global_env_lock);
- global_env.ref_count--;
- if (global_env.ref_count == 0) {
- global_env.env->close (global_env.env, 0);
- global_env.env = NULL;
- }
- g_static_mutex_unlock(&global_env_lock);
+ if (bl->priv->file_db)
+ bl->priv->file_db->close (bl->priv->file_db, 0);
+ g_static_mutex_lock (&global_env_lock);
+ global_env.ref_count--;
+ if (global_env.ref_count == 0) {
+ global_env.env->close (global_env.env, 0);
+ global_env.env = NULL;
+ }
+ g_static_mutex_unlock(&global_env_lock);
#endif
if (bl->priv->ldap_lock)
@@ -2863,7 +2863,7 @@ class_init (EBookBackendGALClass *klass)
backend_class->get_changes = get_changes;
backend_class->authenticate_user = authenticate_user;
backend_class->get_supported_fields = get_supported_fields;
- backend_class->set_mode = set_mode;
+ backend_class->set_mode = set_mode;
backend_class->get_required_fields = get_required_fields;
backend_class->get_supported_auth_methods = get_supported_auth_methods;
backend_class->cancel_operation = cancel_operation;
@@ -2891,8 +2891,8 @@ init (EBookBackendGAL *backend)
priv = g_new0 (EBookBackendGALPrivate, 1);
- priv->id_to_op = g_hash_table_new (g_int_hash, g_int_equal);
- priv->poll_timeout = -1;
+ priv->id_to_op = g_hash_table_new (g_int_hash, g_int_equal);
+ priv->poll_timeout = -1;
priv->ldap_lock = g_mutex_new ();
g_static_rec_mutex_init (&priv->op_hash_mutex);
diff --git a/calendar/e-cal-backend-exchange-calendar.c b/calendar/e-cal-backend-exchange-calendar.c
index d3b89b6..dad252a 100644
--- a/calendar/e-cal-backend-exchange-calendar.c
+++ b/calendar/e-cal-backend-exchange-calendar.c
@@ -948,7 +948,7 @@ create_object (ECalBackendSync *backend, EDataCal *cal,
return GNOME_Evolution_Calendar_Success;
}
-#define BUSYSTATUS 0x01
+#define BUSYSTATUS 0x01
#define INSTTYPE 0x02
#define ALLDAY 0x04
#define IMPORTANCE 0x08
@@ -992,7 +992,7 @@ update_x_properties (ECalBackendExchange *cbex, ECalComponent *comp)
importance = "1";
/* Go through the existing X-MICROSOFT-CDO- properties first */
- icalcomp = e_cal_component_get_icalcomponent (comp);
+ icalcomp = e_cal_component_get_icalcomponent (comp);
icalprop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY);
while (icalprop) {
x_name = icalproperty_get_x_name (icalprop);
@@ -1456,7 +1456,7 @@ modify_object_with_href (ECalBackendSync *backend, EDataCal *cal,
new_href = ecomp->href;
http_status = e2k_context_put (ctx, NULL, new_href, "message/rfc822",
- msg, strlen (msg), NULL);
+ msg, strlen (msg), NULL);
if ((E2K_HTTP_STATUS_IS_SUCCESSFUL (http_status)) && send_options)
http_status = e2k_context_proppatch (ctx, NULL, new_href, props, FALSE, NULL);
@@ -1470,7 +1470,7 @@ modify_object_with_href (ECalBackendSync *backend, EDataCal *cal,
if (!remove)
*new_object = e_cal_component_get_as_string (real_ecomp);
} else
- status = GNOME_Evolution_Calendar_OtherError;
+ status = GNOME_Evolution_Calendar_OtherError;
g_free (msg);
g_object_unref (real_ecomp);
@@ -2407,7 +2407,7 @@ class_init (ECalBackendExchangeCalendarClass *klass)
sync_class->remove_object_sync = remove_object;
sync_class->receive_objects_sync = receive_objects;
sync_class->send_objects_sync = send_objects;
- sync_class->get_freebusy_sync = get_free_busy;
+ sync_class->get_freebusy_sync = get_free_busy;
sync_class->discard_alarm_sync = discard_alarm;
object_class->dispose = dispose;
diff --git a/calendar/e-cal-backend-exchange-tasks.c b/calendar/e-cal-backend-exchange-tasks.c
index 13af899..34cecf0 100644
--- a/calendar/e-cal-backend-exchange-tasks.c
+++ b/calendar/e-cal-backend-exchange-tasks.c
@@ -704,7 +704,7 @@ get_changed_tasks (ECalBackendExchange *cbex)
text.altrep = result->href;
sl.data = &text;
sl.next = NULL;
- e_cal_component_set_description_list (E_CAL_COMPONENT (ecal), &sl);
+ e_cal_component_set_description_list (E_CAL_COMPONENT (ecal), &sl);
g_free ((char *)text.value);
}
diff --git a/calendar/e-cal-backend-exchange.c b/calendar/e-cal-backend-exchange.c
index a601b96..9be9236 100644
--- a/calendar/e-cal-backend-exchange.c
+++ b/calendar/e-cal-backend-exchange.c
@@ -467,14 +467,14 @@ open_calendar (ECalBackendSync *backend, EDataCal *cal, gboolean only_if_exists,
}
if (hier_to_rescan) {
- g_object_ref (hier_to_rescan->toplevel);
- e_folder_exchange_set_rescan_tree (hier_to_rescan->toplevel, TRUE);
- exchange_hierarchy_scan_subtree (hier_to_rescan, hier_to_rescan->toplevel, ONLINE_MODE);
- e_folder_exchange_set_rescan_tree (hier_to_rescan->toplevel, FALSE);
- g_object_unref (hier_to_rescan->toplevel);
-
- cbex->folder = exchange_account_get_folder (cbex->account, uristr);
- if (!cbex->folder)
+ g_object_ref (hier_to_rescan->toplevel);
+ e_folder_exchange_set_rescan_tree (hier_to_rescan->toplevel, TRUE);
+ exchange_hierarchy_scan_subtree (hier_to_rescan, hier_to_rescan->toplevel, ONLINE_MODE);
+ e_folder_exchange_set_rescan_tree (hier_to_rescan->toplevel, FALSE);
+ g_object_unref (hier_to_rescan->toplevel);
+
+ cbex->folder = exchange_account_get_folder (cbex->account, uristr);
+ if (!cbex->folder)
e_cal_backend_notify_error (E_CAL_BACKEND (cbex), _("Could not find the calendar"));
}
@@ -2231,14 +2231,14 @@ class_init (ECalBackendExchangeClass *klass)
sync_class->get_timezone_sync = get_timezone;
sync_class->add_timezone_sync = add_timezone;
sync_class->set_default_timezone_sync = set_default_timezone;
- sync_class->get_freebusy_sync = get_freebusy;
- sync_class->get_changes_sync = get_changes;
+ sync_class->get_freebusy_sync = get_freebusy;
+ sync_class->get_changes_sync = get_changes;
sync_class->create_object_sync = create_object;
sync_class->modify_object_sync = modify_object;
- backend_class->start_query = start_query;
- backend_class->get_mode = get_mode;
- backend_class->set_mode = set_mode;
+ backend_class->start_query = start_query;
+ backend_class->get_mode = get_mode;
+ backend_class->set_mode = set_mode;
backend_class->is_loaded = is_loaded;
backend_class->internal_get_default_timezone = internal_get_default_timezone;
backend_class->internal_get_timezone = internal_get_timezone;
diff --git a/calendar/e-cal-backend-exchange.h b/calendar/e-cal-backend-exchange.h
index 50988db..bbf0692 100644
--- a/calendar/e-cal-backend-exchange.h
+++ b/calendar/e-cal-backend-exchange.h
@@ -55,7 +55,7 @@ gboolean e_cal_backend_exchange_in_cache (ECalBackendExchange *cbex,
const char *uid,
const char *lastmod,
const char *href,
- const char *rid
+ const char *rid
);
void e_cal_backend_exchange_cache_sync_end (ECalBackendExchange *cbex);
@@ -77,9 +77,9 @@ ECalBackendSyncStatus e_cal_backend_exchange_add_timezone (ECalBackendExcha
icaltimezone * e_cal_backend_exchange_get_default_time_zone (ECalBackendSync *backend);
-char * e_cal_backend_exchange_lf_to_crlf (const char *in);
-char * e_cal_backend_exchange_make_timestamp_rfc822 (time_t when);
-ECalBackendSyncStatus get_timezone (ECalBackendSync *backend,
+char * e_cal_backend_exchange_lf_to_crlf (const char *in);
+char * e_cal_backend_exchange_make_timestamp_rfc822 (time_t when);
+ECalBackendSyncStatus get_timezone (ECalBackendSync *backend,
EDataCal *cal, const char *tzid, char **object);
/** lookup function for e_cal_check_timezones() */
diff --git a/camel/camel-exchange-folder.c b/camel/camel-exchange-folder.c
index 72acdf3..1f31c9f 100644
--- a/camel/camel-exchange-folder.c
+++ b/camel/camel-exchange-folder.c
@@ -63,7 +63,7 @@ static CamelMimeMessage *get_message (CamelFolder *folder,
static GPtrArray *search_by_expression (CamelFolder *folder,
const char *exp,
CamelException *ex);
-static guint32 count_by_expression (CamelFolder *folder,
+static guint32 count_by_expression (CamelFolder *folder,
const char *exp,
CamelException *ex);
@@ -176,16 +176,16 @@ refresh_info (CamelFolder *folder, CamelException *ex)
camel_stub_send (exch->stub, ex, CAMEL_STUB_CMD_REFRESH_FOLDER,
CAMEL_STUB_ARG_FOLDER, folder->full_name,
- CAMEL_STUB_ARG_END);
+ CAMEL_STUB_ARG_END);
}
/* sync up the counts now */
if (!camel_stub_send (exch->stub, ex, CAMEL_STUB_CMD_SYNC_COUNT,
CAMEL_STUB_ARG_FOLDER, folder->full_name,
CAMEL_STUB_ARG_RETURN,
- CAMEL_STUB_ARG_UINT32, &unread_count,
+ CAMEL_STUB_ARG_UINT32, &unread_count,
CAMEL_STUB_ARG_UINT32, &visible_count,
- CAMEL_STUB_ARG_END)){
+ CAMEL_STUB_ARG_END)){
g_print("\n Error syncing up the counts");
}
@@ -658,7 +658,7 @@ transfer_messages_to (CamelFolder *source, GPtrArray *uids,
break;
}
goto end;
- }
+ }
hier_len = strcspn (source->full_name, "/");
diff --git a/camel/camel-exchange-journal.c b/camel/camel-exchange-journal.c
index f55f180..1bec1ee 100644
--- a/camel/camel-exchange-journal.c
+++ b/camel/camel-exchange-journal.c
@@ -398,8 +398,8 @@ exchange_entry_play (CamelOfflineJournal *journal, CamelDListNode *entry, CamelE
switch (exchange_entry->type) {
case CAMEL_EXCHANGE_JOURNAL_ENTRY_APPEND:
return exchange_entry_play_append (journal, exchange_entry, ex);
- case CAMEL_EXCHANGE_JOURNAL_ENTRY_TRANSFER:
- return exchange_entry_play_transfer (journal, exchange_entry, ex);
+ case CAMEL_EXCHANGE_JOURNAL_ENTRY_TRANSFER:
+ return exchange_entry_play_transfer (journal, exchange_entry, ex);
case CAMEL_EXCHANGE_JOURNAL_ENTRY_DELETE:
return exchange_entry_play_delete (journal, exchange_entry, ex);
default:
@@ -425,7 +425,7 @@ camel_exchange_journal_new (CamelExchangeFolder *folder, const char *filename)
static gboolean
update_cache (CamelExchangeJournal *exchange_journal, CamelMimeMessage *message,
- const CamelMessageInfo *mi, char **updated_uid, CamelException *ex)
+ const CamelMessageInfo *mi, char **updated_uid, CamelException *ex)
{
CamelOfflineJournal *journal = (CamelOfflineJournal *) exchange_journal;
CamelExchangeFolder *exchange_folder = (CamelExchangeFolder *) journal->folder;
diff --git a/camel/camel-exchange-journal.h b/camel/camel-exchange-journal.h
index 812334f..b583663 100644
--- a/camel/camel-exchange-journal.h
+++ b/camel/camel-exchange-journal.h
@@ -51,7 +51,7 @@ typedef struct _CamelExchangeJournalEntry CamelExchangeJournalEntry;
enum {
CAMEL_EXCHANGE_JOURNAL_ENTRY_APPEND,
- CAMEL_EXCHANGE_JOURNAL_ENTRY_TRANSFER,
+ CAMEL_EXCHANGE_JOURNAL_ENTRY_TRANSFER,
CAMEL_EXCHANGE_JOURNAL_ENTRY_DELETE
};
diff --git a/camel/camel-exchange-store.c b/camel/camel-exchange-store.c
index 38e0419..552e092 100644
--- a/camel/camel-exchange-store.c
+++ b/camel/camel-exchange-store.c
@@ -77,10 +77,10 @@ static void exchange_rename_folder (CamelStore *store,
CamelException *ex);
static gboolean exchange_folder_subscribed (CamelStore *store,
const char *folder_name);
-static void exchange_subscribe_folder (CamelStore *store,
+static void exchange_subscribe_folder (CamelStore *store,
const char *folder_name,
CamelException *ex);
-static void exchange_unsubscribe_folder (CamelStore *store,
+static void exchange_unsubscribe_folder (CamelStore *store,
const char *folder_name,
CamelException *ex);
static gboolean exchange_can_refresh_folder (CamelStore *store, CamelFolderInfo *info, CamelException *ex);
@@ -248,7 +248,7 @@ exchange_path_to_physical (const char *prefix, const char *vpath)
/* Copy the mangled path. */
p = vpath;
- while (1) {
+ while (1) {
newp = strchr (p, '/');
if (newp == NULL) {
strcpy (dp, p);
diff --git a/mail/mail-stub-exchange.c b/mail/mail-stub-exchange.c
index 70a01e5..cd8cd43 100644
--- a/mail/mail-stub-exchange.c
+++ b/mail/mail-stub-exchange.c
@@ -2534,7 +2534,7 @@ get_message (MailStub *stub, const char *folder_name, const char *uid)
* we need to know who it is.
*/
status = unmangle_sender_field (mse, NULL,
- mmsg->href,
+ mmsg->href,
&body, &len);
if (!E2K_HTTP_STATUS_IS_SUCCESSFUL (status))
goto error;
diff --git a/mail/mail-stub.h b/mail/mail-stub.h
index 7b5c1d5..d994a41 100644
--- a/mail/mail-stub.h
+++ b/mail/mail-stub.h
@@ -42,7 +42,7 @@ struct _MailStubClass {
void (*get_trash_name) (MailStub *);
void (*sync_folder) (MailStub *, const char *folder_name);
void (*refresh_folder) (MailStub *, const char *folder_name);
- void (*sync_count) (MailStub *, const char *folder_name);
+ void (*sync_count) (MailStub *, const char *folder_name);
void (*expunge_uids) (MailStub *, const char *folder_name,
GPtrArray *uids);
void (*append_message) (MailStub *, const char *folder_name,
diff --git a/storage/exchange-component.c b/storage/exchange-component.c
index d2116d0..855af9c 100644
--- a/storage/exchange-component.c
+++ b/storage/exchange-component.c
@@ -148,9 +148,9 @@ impl_createView (PortableServer_Servant servant,
CORBA_Environment *ev)
{
EComponentView *component_view = e_component_view_new_controls (parent, "exchange",
- NULL,
NULL,
- NULL);
+ NULL,
+ NULL);
d(printf("createView...\n"));
return BONOBO_OBJREF(component_view);
@@ -434,7 +434,7 @@ exchange_component_class_init (ExchangeComponentClass *klass)
object_class->dispose = dispose;
object_class->finalize = finalize;
- epv->createView = impl_createView;
+ epv->createView = impl_createView;
epv->upgradeFromVersion = impl_upgradeFromVersion;
epv->requestQuit = impl_requestQuit;
epv->quit = impl_quit;
@@ -465,7 +465,7 @@ exchange_component_init (ExchangeComponent *component)
priv = component->priv = g_new0 (ExchangeComponentPrivate, 1);
- priv->config_listener = exchange_config_listener_new ();
+ priv->config_listener = exchange_config_listener_new ();
priv->comp_lock = g_mutex_new ();
g_signal_connect (priv->config_listener, "exchange_account_created",
diff --git a/storage/exchange-config-listener.c b/storage/exchange-config-listener.c
index 90fcbd8..7a8142b 100644
--- a/storage/exchange-config-listener.c
+++ b/storage/exchange-config-listener.c
@@ -287,7 +287,7 @@ ex_set_relative_uri (ESource *source, const char *url)
static void
migrate_account_esource (EAccount *account,
- FolderType folder_type)
+ FolderType folder_type)
{
ESourceGroup *group;
ESource *source = NULL;
@@ -449,7 +449,7 @@ requires_relogin (char *current_url, char *new_url)
if (current_uri->authmech || new_uri->authmech) {
if (current_uri->authmech && new_uri->authmech) {
- if (strcmp (current_uri->authmech, new_uri->authmech)) {
+ if (strcmp (current_uri->authmech, new_uri->authmech)) {
/* Auth mechanism has changed */
relogin = TRUE;
goto end;
diff --git a/storage/exchange-config-listener.h b/storage/exchange-config-listener.h
index 3d0b3a3..c0e0eaf 100644
--- a/storage/exchange-config-listener.h
+++ b/storage/exchange-config-listener.h
@@ -57,8 +57,8 @@ GSList *exchange_config_listener_get_accounts (ExchangeConfigLis
void exchange_config_listener_migrate_esources (ExchangeConfigListener *config_listener);
-void add_folder_esource (ExchangeAccount *account, FolderType folder_type, const char *folder_name, const char *physical_uri);
-void remove_folder_esource (ExchangeAccount *account, FolderType folder_type, const char *physical_uri);
+void add_folder_esource (ExchangeAccount *account, FolderType folder_type, const char *folder_name, const char *physical_uri);
+void remove_folder_esource (ExchangeAccount *account, FolderType folder_type, const char *physical_uri);
#ifdef __cplusplus
}
#endif /* __cplusplus */
diff --git a/storage/exchange-migrate.c b/storage/exchange-migrate.c
index 7e51f70..2bbe30c 100644
--- a/storage/exchange-migrate.c
+++ b/storage/exchange-migrate.c
@@ -99,11 +99,11 @@ show_error_dialog()
gchar *err_string;
err_string = g_strdup_printf ( _("Warning: Evolution could not migrate "
- "all the Exchange account data from "
- "the version %d.%d.%d. \nThe data "
- "hasn't been deleted, but will not be "
- "seen by this version of Evolution"),
- maj, min, rev);
+ "all the Exchange account data from "
+ "the version %d.%d.%d. \nThe data "
+ "hasn't been deleted, but will not be "
+ "seen by this version of Evolution"),
+ maj, min, rev);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
error_dialog = gtk_message_dialog_new (GTK_WINDOW (window),
@@ -164,7 +164,7 @@ cp (const char *src, const char *dest, gboolean show_progress)
struct utimbuf ut;
/* if the dest file exists and has content, abort - we don't
- * want to corrupt their existing data */
+ * want to corrupt their existing data */
if (stat (dest, &st) == 0 && st.st_size > 0)
goto ret;
@@ -201,7 +201,7 @@ cp (const char *src, const char *dest, gboolean show_progress)
total += nwritten;
if (show_progress)
- dialog_set_progress ((((double) total) /
+ dialog_set_progress ((((double) total) /
((double) st.st_size)));
} while (total < st.st_size);
@@ -262,7 +262,7 @@ cp_r (char *src, const char *dest)
while ((dent = readdir (dir))) {
if (!strcmp (dent->d_name, ".") || !strcmp (dent->d_name, ".."))
- continue;
+ continue;
g_string_truncate (srcpath, slen);
g_string_truncate (destpath, dlen);
@@ -377,11 +377,11 @@ migrate_contacts (gchar *src_path, const gchar *dest_path)
NULL);
/* Create destination dir, and copy the files */
- if (g_mkdir_with_parents (contacts_dir, 0777) == -1) {
+ if (g_mkdir_with_parents (contacts_dir, 0777) == -1) {
ret = FALSE;
g_free (dest_file);
g_free (contacts_dir);
- continue;
+ continue;
}
src_file = g_build_filename ( src_path,
@@ -474,14 +474,14 @@ exchange_migrate (const CORBA_short major,
return;
/* This is not needed if done by cp_r() */
- if (stat (base_dir, &st) == -1) {
+ if (stat (base_dir, &st) == -1) {
if (errno != ENOENT ||
g_mkdir_with_parents (base_dir, 0777) == -1) {
- printf ("Failed to create directory `%s': %s",
+ printf ("Failed to create directory `%s': %s",
base_dir, g_strerror (errno));
- return;
- }
- }
+ return;
+ }
+ }
src_path = g_build_filename (g_get_home_dir (),
"evolution",
diff --git a/storage/main.c b/storage/main.c
index 81d3214..c45b2cc 100644
--- a/storage/main.c
+++ b/storage/main.c
@@ -120,11 +120,11 @@ setup_calendar_factory (void)
e_data_cal_factory_register_backend (cal_factory,
(g_object_new (events_backend_exchange_factory_get_type(),
- NULL)));
+ NULL)));
e_data_cal_factory_register_backend (cal_factory,
(g_object_new (todos_backend_exchange_factory_get_type(),
- NULL)));
+ NULL)));
/* register the factory with bonobo */
if (!e_data_cal_factory_register_storage (cal_factory, EXCHANGE_CALENDAR_FACTORY_ID)) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
