[evolution-exchange] Coding style and whitespace cleanup.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-exchange] Coding style and whitespace cleanup.
- Date: Sun, 4 Sep 2011 11:50:10 +0000 (UTC)
commit 86be1f41da19db2e46286503472ac77b3bf64003
Author: Matthew Barnes <mbarnes redhat com>
Date: Mon Aug 22 21:15:53 2011 -0400
Coding style and whitespace cleanup.
addressbook/e-book-backend-db-cache.c | 25 +-
addressbook/e-book-backend-db-cache.h | 6 +-
addressbook/e-book-backend-exchange-factory.c | 3 +-
addressbook/e-book-backend-exchange.c | 249 ++++++++-----
addressbook/e-book-backend-gal.c | 308 ++++++++++------
addressbook/e-book-backend-gal.h | 4 +-
calendar/e-cal-backend-exchange-calendar.c | 173 ++++++---
calendar/e-cal-backend-exchange-factory.c | 13 +-
calendar/e-cal-backend-exchange-tasks.c | 117 +++++--
calendar/e-cal-backend-exchange.c | 254 +++++++++----
calendar/e2k-cal-query.c | 51 ++-
camel/camel-exchange-folder.c | 39 ++-
camel/camel-exchange-journal.c | 3 +-
camel/camel-exchange-provider.c | 6 +-
camel/camel-exchange-search.c | 6 +-
camel/camel-exchange-store.c | 22 +-
camel/camel-exchange-summary.c | 23 +-
camel/camel-exchange-utils.c | 367 +++++++++++--------
camel/mail-utils.c | 19 +-
eplugin/exchange-account-setup.c | 88 +++--
eplugin/exchange-calendar.c | 34 +-
eplugin/exchange-change-password.c | 6 +-
eplugin/exchange-config-listener.c | 67 ++--
eplugin/exchange-contacts.c | 24 +-
eplugin/exchange-delegates-user.c | 32 +-
eplugin/exchange-delegates.c | 51 ++-
eplugin/exchange-folder-permission.c | 50 ++-
eplugin/exchange-folder-size-display.c | 25 +-
eplugin/exchange-folder-subscription.c | 31 ++-
eplugin/exchange-folder.c | 20 +-
eplugin/exchange-mail-send-options.c | 18 +-
eplugin/exchange-operations.c | 38 ++-
eplugin/exchange-permissions-dialog.c | 39 ++-
eplugin/exchange-send-options.c | 50 ++-
eplugin/exchange-send-options.h | 2 +-
eplugin/exchange-user-dialog.c | 19 +-
server/lib/actest.c | 3 +-
server/lib/cptest.c | 6 +-
server/lib/davcat.c | 7 +-
server/lib/e2k-action.c | 66 +++--
server/lib/e2k-autoconfig.c | 66 +++--
server/lib/e2k-context.c | 479 +++++++++++++++++--------
server/lib/e2k-freebusy.c | 37 ++-
server/lib/e2k-global-catalog.c | 145 +++++---
server/lib/e2k-http-utils.c | 7 +-
server/lib/e2k-kerberos.c | 20 +-
server/lib/e2k-operation.c | 6 +-
server/lib/e2k-path.c | 16 +-
server/lib/e2k-path.h | 2 +-
server/lib/e2k-properties.c | 49 ++-
server/lib/e2k-restriction.c | 95 ++++--
server/lib/e2k-result.c | 59 ++-
server/lib/e2k-rule-xml.c | 38 ++-
server/lib/e2k-rule.c | 69 +++--
server/lib/e2k-security-descriptor.c | 45 ++-
server/lib/e2k-sid.c | 20 +-
server/lib/e2k-uri.c | 22 +-
server/lib/e2k-utils.c | 34 ++-
server/lib/e2k-xml-utils.c | 20 +-
server/lib/ebrowse.c | 70 +++--
server/lib/fbtest.c | 3 +-
server/lib/gctest.c | 17 +-
server/lib/ruletest.c | 3 +-
server/lib/test-utils.c | 6 +-
server/lib/urltest.c | 6 +-
server/storage/e-folder-exchange.c | 140 +++++---
server/storage/e-folder-tree.c | 40 +-
server/storage/e-folder-type-registry.c | 80 ++--
server/storage/e-folder.c | 56 ++--
server/storage/e-storage.c | 149 ++++----
server/storage/exchange-account.c | 187 ++++++----
server/storage/exchange-constants.h | 4 +-
server/storage/exchange-esource.c | 13 +-
server/storage/exchange-folder-size.c | 16 +-
server/storage/exchange-hierarchy-favorites.c | 26 +-
server/storage/exchange-hierarchy-foreign.c | 64 ++--
server/storage/exchange-hierarchy-gal.c | 4 +-
server/storage/exchange-hierarchy-somedav.c | 16 +-
server/storage/exchange-hierarchy-webdav.c | 107 ++++---
server/storage/exchange-hierarchy.c | 58 ++--
server/storage/exchange-oof.c | 12 +-
server/xntlm/xntlm-des.c | 11 +-
server/xntlm/xntlm-md4.c | 14 +-
server/xntlm/xntlm.c | 34 ++-
tools/exchange-autoconfig-wizard.c | 72 +++-
tools/exchange-share-config-listener.c | 35 ++-
tools/ximian-connector-setup.c | 5 +-
87 files changed, 3066 insertions(+), 1775 deletions(-)
---
diff --git a/addressbook/e-book-backend-db-cache.c b/addressbook/e-book-backend-db-cache.c
index 9402150..da4d9d8 100644
--- a/addressbook/e-book-backend-db-cache.c
+++ b/addressbook/e-book-backend-db-cache.c
@@ -30,7 +30,8 @@
#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));
dbt->data = (gpointer) str;
@@ -67,7 +68,8 @@ 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;
@@ -113,7 +115,8 @@ 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;
@@ -162,7 +165,8 @@ e_book_backend_db_cache_get_time (DB *db)
* Return value: A cached #EContact, or %NULL if @uid is not cached.
**/
EContact *
-e_book_backend_db_cache_get_contact (DB *db, const gchar *uid)
+e_book_backend_db_cache_get_contact (DB *db,
+ const gchar *uid)
{
DBT uid_dbt, vcard_dbt;
gint db_error;
@@ -197,7 +201,7 @@ e_book_backend_db_cache_get_contact (DB *db, const gchar *uid)
**/
gboolean
e_book_backend_db_cache_add_contact (DB *db,
- EContact *contact)
+ EContact *contact)
{
DBT uid_dbt, vcard_dbt;
gint db_error;
@@ -244,7 +248,7 @@ e_book_backend_db_cache_add_contact (DB *db,
**/
gboolean
e_book_backend_db_cache_remove_contact (DB *db,
- const gchar *uid)
+ const gchar *uid)
{
DBT uid_dbt;
@@ -274,7 +278,8 @@ e_book_backend_db_cache_remove_contact (DB *db,
* Return value: %TRUE if the cache contains the contact, %FALSE otherwise.
**/
gboolean
-e_book_backend_db_cache_check_contact (DB *db, const gchar *uid)
+e_book_backend_db_cache_check_contact (DB *db,
+ const gchar *uid)
{
DBT uid_dbt, vcard_dbt;
gint db_error;
@@ -306,7 +311,8 @@ e_book_backend_db_cache_check_contact (DB *db, const gchar *uid)
* Return value: A #GList of pointers to #EContact.
**/
GList *
-e_book_backend_db_cache_get_contacts (DB *db, const gchar *query)
+e_book_backend_db_cache_get_contacts (DB *db,
+ const gchar *query)
{
DBC *dbc;
DBT uid_dbt, vcard_dbt;
@@ -362,7 +368,8 @@ e_book_backend_db_cache_get_contacts (DB *db, const gchar *query)
* Return value: A #GPtrArray of pointers to contact ID strings.
**/
GPtrArray *
-e_book_backend_db_cache_search (DB *db, const gchar *query)
+e_book_backend_db_cache_search (DB *db,
+ const gchar *query)
{
GList *matching_contacts, *temp;
GPtrArray *ptr_array;
diff --git a/addressbook/e-book-backend-db-cache.h b/addressbook/e-book-backend-db-cache.h
index afc3581..68d5df4 100644
--- a/addressbook/e-book-backend-db-cache.h
+++ b/addressbook/e-book-backend-db-cache.h
@@ -25,7 +25,7 @@
#include <libebook/e-contact.h>
#include "db.h"
-EContact* e_book_backend_db_cache_get_contact (DB *db, const gchar *uid);
+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);
@@ -36,11 +36,11 @@ gboolean e_book_backend_db_cache_add_contact (DB *db,
gboolean e_book_backend_db_cache_remove_contact (DB *db,
const gchar *uid);
gboolean e_book_backend_db_cache_check_contact (DB *db, const gchar *uid);
-GList* e_book_backend_db_cache_get_contacts (DB *db, const gchar *query);
+GList * e_book_backend_db_cache_get_contacts (DB *db, const gchar *query);
gboolean e_book_backend_db_cache_exists (const gchar *uri);
void e_book_backend_db_cache_set_populated (DB *db);
gboolean e_book_backend_db_cache_is_populated (DB *db);
-GPtrArray* e_book_backend_db_cache_search (DB *db, const gchar *query);
+GPtrArray * e_book_backend_db_cache_search (DB *db, const gchar *query);
G_END_DECLS
diff --git a/addressbook/e-book-backend-exchange-factory.c b/addressbook/e-book-backend-exchange-factory.c
index c0257d5..886bb76 100644
--- a/addressbook/e-book-backend-exchange-factory.c
+++ b/addressbook/e-book-backend-exchange-factory.c
@@ -48,7 +48,8 @@ eds_module_shutdown (void)
}
void
-eds_module_list_types (const GType **types, gint *num_types)
+eds_module_list_types (const GType **types,
+ gint *num_types)
{
*types = exchange_types;
*num_types = G_N_ELEMENTS (exchange_types);
diff --git a/addressbook/e-book-backend-exchange.c b/addressbook/e-book-backend-exchange.c
index 7370bd7..6203f17 100644
--- a/addressbook/e-book-backend-exchange.c
+++ b/addressbook/e-book-backend-exchange.c
@@ -120,7 +120,8 @@ G_DEFINE_TYPE (
E_TYPE_BOOK_BACKEND_SYNC)
static void
-http_status_to_error (E2kHTTPStatus status, GError **perror)
+http_status_to_error (E2kHTTPStatus status,
+ GError **perror)
{
if (E2K_HTTP_STATUS_IS_SUCCESSFUL (status))
return;
@@ -248,16 +249,18 @@ e_book_backend_exchange_prop_to_exchange (const gchar *propname)
static void
get_email_field_from_props (ExchangeAccount *account,
- PropMapping *prop_mapping, E2kResult *result,
- EContact *contact, gchar *data)
+ PropMapping *prop_mapping,
+ E2kResult *result,
+ EContact *contact,
+ gchar *data)
{
gchar *emailtype;
const gchar *typeselector;
/* here's where we do the super involved
- conversion from local email addresses to
- internet addresses for display in
- evolution. */
+ * conversion from local email addresses to
+ * internet addresses for display in
+ * evolution. */
if (prop_mapping->field == E_CONTACT_EMAIL_1)
typeselector = E2K_PR_MAPI_EMAIL_1_ADDRTYPE;
else if (prop_mapping->field == E_CONTACT_EMAIL_2)
@@ -338,7 +341,8 @@ unixify (const gchar *string)
* If there are no members or any other error, the NULL is returned.
**/
static GSList *
-get_contact_list_members (E2kContext *ctx, const gchar *list_href)
+get_contact_list_members (E2kContext *ctx,
+ const gchar *list_href)
{
GSList *members = NULL;
@@ -415,7 +419,8 @@ free_members_list (GSList *list)
}
static EContact *
-e_contact_from_props (EBookBackendExchange *be, E2kResult *result)
+e_contact_from_props (EBookBackendExchange *be,
+ E2kResult *result)
{
EContact *contact;
gchar *data;
@@ -569,7 +574,8 @@ e_contact_from_props (EBookBackendExchange *be, E2kResult *result)
}
static gchar *
-vcard_from_props (EBookBackendExchange *be, E2kResult *result)
+vcard_from_props (EBookBackendExchange *be,
+ E2kResult *result)
{
EContact *contact;
gchar *vcard;
@@ -644,7 +650,7 @@ build_cache (EBookBackendExchange *be)
g_object_unref (contact);
}
e_book_backend_cache_set_populated (bepriv->cache);
- bepriv->is_cache_ready=TRUE;
+ bepriv->is_cache_ready = TRUE;
e_file_cache_thaw_changes (E_FILE_CACHE (bepriv->cache));
UNLOCK (bepriv);
@@ -679,7 +685,7 @@ update_cache (EBookBackendExchange *be)
g_object_unref (contact);
}
e_book_backend_cache_set_populated (bepriv->cache);
- bepriv->is_cache_ready=TRUE;
+ bepriv->is_cache_ready = TRUE;
e_file_cache_thaw_changes (E_FILE_CACHE (bepriv->cache));
UNLOCK (bepriv);
@@ -689,7 +695,8 @@ update_cache (EBookBackendExchange *be)
}
static gboolean
-e_book_backend_exchange_connect (EBookBackendExchange *be, GError **perror)
+e_book_backend_exchange_connect (EBookBackendExchange *be,
+ GError **perror)
{
EBookBackendExchangePrivate *bepriv = be->priv;
ExchangeHierarchy *hier;
@@ -833,7 +840,8 @@ e_book_backend_exchange_connect (EBookBackendExchange *be, GError **perror)
}
static gboolean
-value_changed (const gchar *old, const gchar *new)
+value_changed (const gchar *old,
+ const gchar *new)
{
if (old == NULL)
return new != NULL;
@@ -877,8 +885,9 @@ static const gchar **email_props[] = {
static void
proppatch_email (PropMapping *prop_mapping,
- EContact *new_contact, EContact *cur_contact,
- E2kProperties *props)
+ EContact *new_contact,
+ EContact *cur_contact,
+ E2kProperties *props)
{
gboolean changed;
gchar *new_email, *cur_email;
@@ -953,8 +962,9 @@ proppatch_email (PropMapping *prop_mapping,
static void
proppatch_categories (PropMapping *prop_mapping,
- EContact *new_contact, EContact *cur_contact,
- E2kProperties *props)
+ EContact *new_contact,
+ EContact *cur_contact,
+ E2kProperties *props)
{
GList *categories_list = NULL;
GList *l = NULL;
@@ -976,7 +986,9 @@ proppatch_categories (PropMapping *prop_mapping,
}
static void
-populate_categories (EContactField field, EContact *new_contact, gpointer data)
+populate_categories (EContactField field,
+ EContact *new_contact,
+ gpointer data)
{
GList *updated_list = NULL;
GPtrArray *categories_list = data;
@@ -993,8 +1005,9 @@ populate_categories (EContactField field, EContact *new_contact, gpointer data)
static void
proppatch_date (PropMapping *prop_mapping,
- EContact *new_contact, EContact *cur_contact,
- E2kProperties *props)
+ EContact *new_contact,
+ EContact *cur_contact,
+ E2kProperties *props)
{
gboolean changed;
EContactDate *new_dt, *cur_dt;
@@ -1035,7 +1048,9 @@ 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;
@@ -1092,8 +1107,9 @@ static const gchar *workaddrpropnames[] = {
static void
proppatch_address (PropMapping *prop_mapping,
- EContact *new_contact, EContact *cur_contact,
- E2kProperties *props)
+ EContact *new_contact,
+ EContact *cur_contact,
+ E2kProperties *props)
{
EContactAddress *new_address, *cur_address = NULL;
gchar *new_addrprops[ADDRPROP_LAST], *cur_addrprops[ADDRPROP_LAST];
@@ -1174,8 +1190,9 @@ proppatch_address (PropMapping *prop_mapping,
static void
proppatch_im (PropMapping *prop_mapping,
- EContact *new_contact, EContact *cur_contact,
- E2kProperties *props)
+ EContact *new_contact,
+ EContact *cur_contact,
+ E2kProperties *props)
{
GList *new_list;
@@ -1192,7 +1209,9 @@ proppatch_im (PropMapping *prop_mapping,
}
static void
-populate_im (EContactField field, EContact *new_contact, gpointer data)
+populate_im (EContactField field,
+ EContact *new_contact,
+ gpointer data)
{
GList *im_attr_list = NULL;
EVCardAttribute *attr;
@@ -1211,7 +1230,9 @@ populate_im (EContactField field, EContact *new_contact, gpointer data)
}
static void
-populate_address (EContactField field, EContact *new_contact, gpointer data)
+populate_address (EContactField field,
+ EContact *new_contact,
+ gpointer data)
{
EAddressWestern *waddr;
EContactAddress addr;
@@ -1262,8 +1283,8 @@ contact_name (EContact *contact)
static E2kProperties *
props_from_contact (EBookBackendExchange *be,
- EContact *contact,
- EContact *old_contact)
+ EContact *contact,
+ EContact *old_contact)
{
E2kProperties *props;
gint i;
@@ -1363,8 +1384,11 @@ props_from_contact (EBookBackendExchange *be,
}
static GByteArray *
-build_message (const gchar *from_name, const gchar *from_email,
- const gchar *subject, const gchar *note, EContactPhoto *photo)
+build_message (const gchar *from_name,
+ const gchar *from_email,
+ const gchar *subject,
+ const gchar *note,
+ EContactPhoto *photo)
{
CamelDataWrapper *wrapper = NULL;
CamelContentType *type;
@@ -1485,9 +1509,12 @@ build_message (const gchar *from_name, const gchar *from_email,
}
static E2kHTTPStatus
-do_put (EBookBackendExchange *be, EDataBook *book,
- const gchar *uri, const gchar *subject,
- const gchar *note, EContactPhoto *photo)
+do_put (EBookBackendExchange *be,
+ EDataBook *book,
+ const gchar *uri,
+ const gchar *subject,
+ const gchar *note,
+ EContactPhoto *photo)
{
ExchangeHierarchy *hier;
E2kHTTPStatus status;
@@ -1504,15 +1531,20 @@ do_put (EBookBackendExchange *be, EDataBook *book,
}
static gboolean
-test_name (E2kContext *ctx, const gchar *name, gpointer summary)
+test_name (E2kContext *ctx,
+ const gchar *name,
+ gpointer summary)
{
return !e_book_backend_summary_check_contact (summary, name);
}
/* Posts the command of the contactlist to the backend folder; the backend should be
- already connected in time of the call to this function. */
+ * already connected in time of the call to this function. */
static E2kHTTPStatus
-cl_post_command (EBookBackendExchange *be, GString *cmd, const gchar *uri, gchar **location)
+cl_post_command (EBookBackendExchange *be,
+ GString *cmd,
+ const gchar *uri,
+ gchar **location)
{
EBookBackendExchangePrivate *bepriv;
SoupMessage *msg;
@@ -1540,7 +1572,7 @@ cl_post_command (EBookBackendExchange *be, GString *cmd, const gchar *uri, gchar
gchar *p = strrchr (*location, '?');
/* the location can be in the form of http://server/folder/list.EML?Cmd=Edit ,
- thus strip the Cmd param from the location */
+ * thus strip the Cmd param from the location */
if (p && p > strrchr (*location, '/'))
*p = 0;
}
@@ -1562,7 +1594,9 @@ struct ContactListRemoveInfo
};
static void
-remove_member (gpointer key, struct ContactListMember *m, struct ContactListRemoveInfo *nfo)
+remove_member (gpointer key,
+ struct ContactListMember *m,
+ struct ContactListRemoveInfo *nfo)
{
g_return_if_fail (m != NULL);
g_return_if_fail (nfo != NULL);
@@ -1584,7 +1618,9 @@ remove_member (gpointer key, struct ContactListMember *m, struct ContactListRemo
}
static E2kHTTPStatus
-merge_contact_lists (EBookBackendExchange *be, const gchar *location, EContact *contact)
+merge_contact_lists (EBookBackendExchange *be,
+ const gchar *location,
+ EContact *contact)
{
E2kHTTPStatus status;
GSList *server, *s;
@@ -1630,7 +1666,7 @@ merge_contact_lists (EBookBackendExchange *be, const gchar *location, EContact *
if (on_server) {
/* contact list on the server already contains same member,
- thus remove it from the hash to not clear it later */
+ * thus remove it from the hash to not clear it later */
g_hash_table_remove (sh, eml);
} else {
/* it's new for the server, add it there */
@@ -1667,12 +1703,12 @@ merge_contact_lists (EBookBackendExchange *be, const gchar *location, EContact *
}
static void
-e_book_backend_exchange_create_contact (EBookBackendSync *backend,
- EDataBook *book,
- GCancellable *cancellable,
- const gchar *vcard,
- EContact **contact,
- GError **perror)
+e_book_backend_exchange_create_contact (EBookBackendSync *backend,
+ EDataBook *book,
+ GCancellable *cancellable,
+ const gchar *vcard,
+ EContact **contact,
+ GError **perror)
{
EBookBackendExchange *be = E_BOOK_BACKEND_EXCHANGE (backend);
EBookBackendExchangePrivate *bepriv = be->priv;
@@ -1758,12 +1794,12 @@ e_book_backend_exchange_create_contact (EBookBackendSync *backend,
}
static void
-e_book_backend_exchange_modify_contact (EBookBackendSync *backend,
- EDataBook *book,
- GCancellable *cancellable,
- const gchar *vcard,
- EContact **contact,
- GError **perror)
+e_book_backend_exchange_modify_contact (EBookBackendSync *backend,
+ EDataBook *book,
+ GCancellable *cancellable,
+ const gchar *vcard,
+ EContact **contact,
+ GError **perror)
{
EBookBackendExchange *be = E_BOOK_BACKEND_EXCHANGE (backend);
EBookBackendExchangePrivate *bepriv = be->priv;
@@ -1886,12 +1922,12 @@ e_book_backend_exchange_modify_contact (EBookBackendSync *backend,
}
static void
-e_book_backend_exchange_remove_contacts (EBookBackendSync *backend,
- EDataBook *book,
- GCancellable *cancellable,
- const GSList *id_list,
- GSList **removed_ids,
- GError **perror)
+e_book_backend_exchange_remove_contacts (EBookBackendSync *backend,
+ EDataBook *book,
+ GCancellable *cancellable,
+ const GSList *id_list,
+ GSList **removed_ids,
+ GError **perror)
{
EBookBackendExchange *be = E_BOOK_BACKEND_EXCHANGE (backend);
EBookBackendExchangePrivate *bepriv = be->priv;
@@ -1924,7 +1960,10 @@ e_book_backend_exchange_remove_contacts (EBookBackendSync *backend,
}
static ESExpResult *
-func_not (ESExp *f, gint argc, ESExpResult **argv, gpointer data)
+func_not (ESExp *f,
+ gint argc,
+ ESExpResult **argv,
+ gpointer data)
{
ESExpResult *r;
@@ -1941,7 +1980,10 @@ func_not (ESExp *f, gint argc, ESExpResult **argv, gpointer data)
}
static ESExpResult *
-func_and_or (ESExp *f, gint argc, ESExpResult **argv, gpointer and)
+func_and_or (ESExp *f,
+ gint argc,
+ ESExpResult **argv,
+ gpointer and)
{
ESExpResult *r;
E2kRestriction *rn;
@@ -1977,7 +2019,10 @@ func_and_or (ESExp *f, gint argc, ESExpResult **argv, gpointer and)
}
static ESExpResult *
-func_match (struct _ESExp *f, gint argc, struct _ESExpResult **argv, gpointer data)
+func_match (struct _ESExp *f,
+ gint argc,
+ struct _ESExpResult **argv,
+ gpointer data)
{
ESExpResult *r;
E2kRestriction *rn;
@@ -2087,7 +2132,7 @@ static struct {
static E2kRestriction *
e_book_backend_exchange_build_restriction (const gchar *query,
- E2kRestriction *base_rn)
+ E2kRestriction *base_rn)
{
ESExp *sexp;
ESExpResult *r;
@@ -2129,7 +2174,9 @@ e_book_backend_exchange_build_restriction (const gchar *query,
}
static void
-notify_remove (gpointer id, gpointer value, gpointer backend)
+notify_remove (gpointer id,
+ gpointer value,
+ gpointer backend)
{
EBookBackendExchange *be = backend;
@@ -2138,8 +2185,10 @@ notify_remove (gpointer id, gpointer value, gpointer backend)
}
static void
-subscription_notify (E2kContext *ctx, const gchar *uri,
- E2kContextChangeType type, gpointer user_data)
+subscription_notify (E2kContext *ctx,
+ const gchar *uri,
+ E2kContextChangeType type,
+ gpointer user_data)
{
EBookBackendExchange *be = user_data;
EBookBackendExchangePrivate *bepriv = be->priv;
@@ -2191,12 +2240,12 @@ subscription_notify (E2kContext *ctx, const gchar *uri,
}
static void
-e_book_backend_exchange_get_contact_list (EBookBackendSync *backend,
- EDataBook *book,
- GCancellable *cancellable,
- const gchar *query,
- GSList **contacts,
- GError **perror)
+e_book_backend_exchange_get_contact_list (EBookBackendSync *backend,
+ EDataBook *book,
+ GCancellable *cancellable,
+ const gchar *query,
+ GSList **contacts,
+ GError **perror)
{
EBookBackendExchange *be = E_BOOK_BACKEND_EXCHANGE (backend);
EBookBackendExchangePrivate *bepriv = be->priv;
@@ -2256,7 +2305,7 @@ e_book_backend_exchange_get_contact_list (EBookBackendSync *backend,
contact = e_contact_from_props (be, result);
if (contact) {
/* there is no suffix restriction, thus it's done by contains,
- thus check for contact validity against the query is required */
+ * thus check for contact validity against the query is required */
if (e_book_backend_sexp_match_contact (sexp, contact))
vcard = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
@@ -2281,8 +2330,8 @@ e_book_backend_exchange_get_contact_list (EBookBackendSync *backend,
}
static void
-e_book_backend_exchange_start_book_view (EBookBackend *backend,
- EDataBookView *book_view)
+e_book_backend_exchange_start_book_view (EBookBackend *backend,
+ EDataBookView *book_view)
{
EBookBackendExchange *be = E_BOOK_BACKEND_EXCHANGE (backend);
EBookBackendExchangePrivate *bepriv = be->priv;
@@ -2320,9 +2369,8 @@ e_book_backend_exchange_start_book_view (EBookBackend *backend,
stopped = closure->stopped;
g_mutex_unlock (closure->mutex);
if (stopped)
-
- for (;contacts != NULL;
- contacts = g_list_next (contacts))
+ *
+ for (; contacts != NULL; contacts = g_list_next (contacts))
g_object_unref (contacts->data);
break;
}
@@ -2362,7 +2410,7 @@ e_book_backend_exchange_start_book_view (EBookBackend *backend,
contact = e_contact_from_props (be, result);
if (contact) {
/* the function itself checks for validity of the contact against the query,
- thus no need to do it here too (because of no suffix restriction) */
+ * thus no need to do it here too (because of no suffix restriction) */
e_data_book_view_notify_update (book_view,
contact);
g_object_unref (contact);
@@ -2382,24 +2430,24 @@ e_book_backend_exchange_start_book_view (EBookBackend *backend,
}
static void
-e_book_backend_exchange_stop_book_view (EBookBackend *backend,
- EDataBookView *book_view)
+e_book_backend_exchange_stop_book_view (EBookBackend *backend,
+ EDataBookView *book_view)
{
d(printf("ebbe_stop_book_view(%p, %p)\n", backend, book_view));
}
static void
-e_book_backend_exchange_get_contact (EBookBackendSync *backend,
- EDataBook *book,
- GCancellable *cancellable,
- const gchar *id,
- gchar **vcard,
- GError **perror)
+e_book_backend_exchange_get_contact (EBookBackendSync *backend,
+ EDataBook *book,
+ GCancellable *cancellable,
+ const gchar *id,
+ gchar **vcard,
+ GError **perror)
{
EBookBackendExchange *be = E_BOOK_BACKEND_EXCHANGE (backend);
EBookBackendExchangePrivate *bepriv = be->priv;
EContact *contact;
- E2kResult *results=NULL;
+ E2kResult *results = NULL;
E2kHTTPStatus status;
gint nresults = 0;
@@ -2476,7 +2524,9 @@ e_book_backend_exchange_get_contact (EBookBackendSync *backend,
}
static void
-e_book_backend_exchange_authenticate_user (EBookBackend *backend, GCancellable *cancellable, ECredentials *credentials)
+e_book_backend_exchange_authenticate_user (EBookBackend *backend,
+ GCancellable *cancellable,
+ ECredentials *credentials)
{
EBookBackendExchange *be = E_BOOK_BACKEND_EXCHANGE (backend);
EBookBackendExchangePrivate *bepriv = be->priv;
@@ -2517,7 +2567,11 @@ e_book_backend_exchange_authenticate_user (EBookBackend *backend, GCancellable *
}
static void
-e_book_backend_exchange_open (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable, gboolean only_if_exists)
+e_book_backend_exchange_open (EBookBackend *backend,
+ EDataBook *book,
+ guint32 opid,
+ GCancellable *cancellable,
+ gboolean only_if_exists)
{
EBookBackendExchange *be = E_BOOK_BACKEND_EXCHANGE (backend);
EBookBackendExchangePrivate *bepriv = be->priv;
@@ -2580,7 +2634,10 @@ e_book_backend_exchange_open (EBookBackend *backend, EDataBook *book, guint32 op
}
static void
-e_book_backend_exchange_remove (EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, GError **perror)
+e_book_backend_exchange_remove (EBookBackendSync *backend,
+ EDataBook *book,
+ GCancellable *cancellable,
+ GError **perror)
{
EBookBackendExchange *be = E_BOOK_BACKEND_EXCHANGE (backend);
EBookBackendExchangePrivate *bepriv = be->priv;
@@ -2618,7 +2675,12 @@ e_book_backend_exchange_remove (EBookBackendSync *backend, EDataBook *book, GCan
}
static gboolean
-e_book_backend_exchange_get_backend_property (EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *prop_name, gchar **prop_value, GError **error)
+e_book_backend_exchange_get_backend_property (EBookBackendSync *backend,
+ EDataBook *book,
+ GCancellable *cancellable,
+ const gchar *prop_name,
+ gchar **prop_value,
+ GError **error)
{
gboolean processed = TRUE;
@@ -2651,7 +2713,8 @@ e_book_backend_exchange_get_backend_property (EBookBackendSync *backend, EDataBo
}
static void
-e_book_backend_exchange_set_online (EBookBackend *backend, gboolean is_online)
+e_book_backend_exchange_set_online (EBookBackend *backend,
+ gboolean is_online)
{
EBookBackendExchange *be = E_BOOK_BACKEND_EXCHANGE (backend);
EBookBackendExchangePrivate *bepriv = be->priv;
diff --git a/addressbook/e-book-backend-gal.c b/addressbook/e-book-backend-gal.c
index 22d436f..b3aa907 100644
--- a/addressbook/e-book-backend-gal.c
+++ b/addressbook/e-book-backend-gal.c
@@ -244,7 +244,8 @@ can_expand_groups (EBookBackend *backend)
}
static void
-book_view_notify_status (EDataBookView *view, const gchar *status)
+book_view_notify_status (EDataBookView *view,
+ const gchar *status)
{
if (!view)
return;
@@ -252,7 +253,8 @@ book_view_notify_status (EDataBookView *view, const gchar *status)
}
static gboolean
-pick_view_cb (EDataBookView *view, gpointer user_data)
+pick_view_cb (EDataBookView *view,
+ gpointer user_data)
{
EDataBookView **pick = user_data;
@@ -264,7 +266,7 @@ pick_view_cb (EDataBookView *view, gpointer user_data)
return view == NULL;
}
-static EDataBookView*
+static EDataBookView *
find_book_view (EBookBackendGAL *bl)
{
EDataBookView *pick = NULL;
@@ -275,7 +277,8 @@ find_book_view (EBookBackendGAL *bl)
}
static gboolean
-gal_connect (EBookBackendGAL *bl, GError **perror)
+gal_connect (EBookBackendGAL *bl,
+ GError **perror)
{
EBookBackendGALPrivate *blpriv = bl->priv;
gint ldap_error = 0;
@@ -323,30 +326,35 @@ gal_connect (EBookBackendGAL *bl, GError **perror)
}
static gboolean
-ldap_reconnect (EBookBackendGAL *bl, EDataBookView *book_view, LDAP **ldap, gint status) {
+ldap_reconnect (EBookBackendGAL *bl,
+ EDataBookView *book_view,
+ LDAP **ldap,
+ gint status) {
- if (!ldap || !*ldap)
- return FALSE;
+ if (!ldap || !*ldap)
+ return FALSE;
- if (status == LDAP_SERVER_DOWN) {
+ if (status == LDAP_SERVER_DOWN) {
- if (book_view)
+ if (book_view)
book_view_notify_status (book_view, _("Reconnecting to LDAP server..."));
- ldap_unbind (*ldap);
+ ldap_unbind (*ldap);
*ldap = e2k_global_catalog_get_ldap (bl->priv->gc, NULL, NULL);
- if (book_view)
+ if (book_view)
book_view_notify_status (book_view, "");
- if (*ldap)
- return TRUE;
- }
+ if (*ldap)
+ return TRUE;
+ }
- return FALSE;
+ return FALSE;
}
static gboolean
-gal_reconnect (EBookBackendGAL *bl, EDataBookView *book_view, gint ldap_status)
+gal_reconnect (EBookBackendGAL *bl,
+ EDataBookView *book_view,
+ gint ldap_status)
{
/* we need to reconnect if we were previously connected */
g_mutex_lock (bl->priv->ldap_lock);
@@ -376,7 +384,9 @@ gal_reconnect (EBookBackendGAL *bl, EDataBookView *book_view, gint ldap_status)
}
static gboolean
-find_by_cancellable_cb (gpointer key, gpointer ptrop, gpointer ptrcancellable)
+find_by_cancellable_cb (gpointer key,
+ gpointer ptrop,
+ gpointer ptrcancellable)
{
LDAPOp *op = ptrop;
GCancellable *cancellable = ptrcancellable;
@@ -385,7 +395,8 @@ find_by_cancellable_cb (gpointer key, gpointer ptrop, gpointer ptrcancellable)
}
static void
-cancelled_cb (GCancellable *cancellable, EBookBackendGAL *bl)
+cancelled_cb (GCancellable *cancellable,
+ EBookBackendGAL *bl)
{
LDAPOp *op;
@@ -405,11 +416,15 @@ cancelled_cb (GCancellable *cancellable, EBookBackendGAL *bl)
}
static void
-ldap_op_add (LDAPOp *op, EBookBackend *backend,
- EDataBook *book, GCancellable *cancellable, EDataBookView *view,
- gint opid,
- gint msgid,
- LDAPOpHandler handler, LDAPOpDtor dtor)
+ldap_op_add (LDAPOp *op,
+ EBookBackend *backend,
+ EDataBook *book,
+ GCancellable *cancellable,
+ EDataBookView *view,
+ gint opid,
+ gint msgid,
+ LDAPOpHandler handler,
+ LDAPOpDtor dtor)
{
EBookBackendGAL *bl = E_BOOK_BACKEND_GAL (backend);
@@ -498,10 +513,10 @@ ldap_error_to_response (gint ldap_error)
static void
create_contact (EBookBackend *backend,
- EDataBook *book,
- guint32 opid,
- GCancellable *cancellable,
- const gchar *vcard)
+ EDataBook *book,
+ guint32 opid,
+ GCancellable *cancellable,
+ const gchar *vcard)
{
e_data_book_respond_create (book, opid,
EDB_ERROR (PERMISSION_DENIED),
@@ -510,10 +525,10 @@ create_contact (EBookBackend *backend,
static void
remove_contacts (EBookBackend *backend,
- EDataBook *book,
- guint32 opid,
- GCancellable *cancellable,
- const GSList *ids)
+ EDataBook *book,
+ guint32 opid,
+ GCancellable *cancellable,
+ const GSList *ids)
{
e_data_book_respond_remove_contacts (book, opid,
EDB_ERROR (PERMISSION_DENIED),
@@ -522,10 +537,10 @@ remove_contacts (EBookBackend *backend,
static void
modify_contact (EBookBackend *backend,
- EDataBook *book,
- guint32 opid,
- GCancellable *cancellable,
- const gchar *vcard)
+ EDataBook *book,
+ guint32 opid,
+ GCancellable *cancellable,
+ const gchar *vcard)
{
e_data_book_respond_modify (book, opid,
EDB_ERROR (PERMISSION_DENIED),
@@ -537,7 +552,8 @@ typedef struct {
} LDAPGetContactOp;
static void
-get_contact_handler (LDAPOp *op, LDAPMessage *res)
+get_contact_handler (LDAPOp *op,
+ LDAPMessage *res)
{
EBookBackendGAL *bl = E_BOOK_BACKEND_GAL (op->backend);
gint msg_type;
@@ -553,8 +569,8 @@ get_contact_handler (LDAPOp *op, LDAPMessage *res)
g_mutex_unlock (bl->priv->ldap_lock);
/* the msg_type will be either SEARCH_ENTRY (if we're
- successful) or SEARCH_RESULT (if we're not), so we finish
- the op after either */
+ * successful) or SEARCH_RESULT (if we're not), so we finish
+ * the op after either */
msg_type = ldap_msgtype (res);
if (msg_type == LDAP_RES_SEARCH_ENTRY) {
LDAPMessage *e;
@@ -621,17 +637,17 @@ get_contact_handler (LDAPOp *op, LDAPMessage *res)
static void
get_contact_dtor (LDAPOp *op)
{
- LDAPGetContactOp *get_contact_op = (LDAPGetContactOp*) op;
+ LDAPGetContactOp *get_contact_op = (LDAPGetContactOp *) op;
g_free (get_contact_op);
}
static void
get_contact (EBookBackend *backend,
- EDataBook *book,
- guint32 opid,
- GCancellable *cancellable,
- const gchar *id)
+ EDataBook *book,
+ guint32 opid,
+ GCancellable *cancellable,
+ const gchar *id)
{
LDAPGetContactOp *get_contact_op;
EBookBackendGAL *bl = E_BOOK_BACKEND_GAL (backend);
@@ -710,7 +726,7 @@ get_contact (EBookBackend *backend,
} while (gal_reconnect (bl, book_view, ldap_error));
if (ldap_error == LDAP_SUCCESS) {
- ldap_op_add ((LDAPOp*) get_contact_op, backend, book, cancellable,
+ ldap_op_add ((LDAPOp *) get_contact_op, backend, book, cancellable,
book_view, opid, get_contact_msgid,
get_contact_handler, get_contact_dtor);
}
@@ -719,7 +735,7 @@ get_contact (EBookBackend *backend,
opid,
ldap_error_to_response (ldap_error),
"");
- get_contact_dtor ((LDAPOp*) get_contact_op);
+ get_contact_dtor ((LDAPOp *) get_contact_op);
}
#if defined(ENABLE_CACHE) && ENABLE_CACHE
}
@@ -733,9 +749,10 @@ typedef struct {
} LDAPGetContactListOp;
static void
-contact_list_handler (LDAPOp *op, LDAPMessage *res)
+contact_list_handler (LDAPOp *op,
+ LDAPMessage *res)
{
- LDAPGetContactListOp *contact_list_op = (LDAPGetContactListOp*) op;
+ LDAPGetContactListOp *contact_list_op = (LDAPGetContactListOp *) op;
EBookBackendGAL *bl = E_BOOK_BACKEND_GAL (op->backend);
LDAPMessage *e;
gint msg_type;
@@ -824,17 +841,17 @@ contact_list_handler (LDAPOp *op, LDAPMessage *res)
static void
contact_list_dtor (LDAPOp *op)
{
- LDAPGetContactListOp *contact_list_op = (LDAPGetContactListOp*) op;
+ LDAPGetContactListOp *contact_list_op = (LDAPGetContactListOp *) op;
g_free (contact_list_op);
}
static void
get_contact_list (EBookBackend *backend,
- EDataBook *book,
- guint32 opid,
- GCancellable *cancellable,
- const gchar *query)
+ EDataBook *book,
+ guint32 opid,
+ GCancellable *cancellable,
+ const gchar *query)
{
LDAPGetContactListOp *contact_list_op;
EBookBackendGAL *bl = E_BOOK_BACKEND_GAL (backend);
@@ -879,7 +896,7 @@ get_contact_list (EBookBackend *backend,
contacts = e_book_backend_db_cache_get_contacts (bl->priv->file_db, query);
- for (l = contacts; l;l = g_list_next (l)) {
+ for (l = contacts; l; l = g_list_next (l)) {
EContact *contact = l->data;
vcard_strings = g_slist_prepend (vcard_strings, e_vcard_to_string (E_VCARD (contact),
EVC_FORMAT_VCARD_30));
@@ -927,7 +944,7 @@ get_contact_list (EBookBackend *backend,
g_free (ldap_query);
if (ldap_error == LDAP_SUCCESS) {
- ldap_op_add ((LDAPOp*) contact_list_op, backend, book, cancellable,
+ ldap_op_add ((LDAPOp *) contact_list_op, backend, book, cancellable,
book_view, opid, contact_list_msgid,
contact_list_handler, contact_list_dtor);
}
@@ -936,7 +953,7 @@ get_contact_list (EBookBackend *backend,
opid,
ldap_error_to_response (ldap_error),
NULL);
- contact_list_dtor ((LDAPOp*) contact_list_op);
+ contact_list_dtor ((LDAPOp *) contact_list_op);
}
#if defined(ENABLE_CACHE) && ENABLE_CACHE
}
@@ -979,7 +996,10 @@ 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;
@@ -1012,7 +1032,10 @@ func_and (ESExp *f, gint argc, ESExpResult **argv, gpointer data)
}
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;
@@ -1045,7 +1068,10 @@ func_or (ESExp *f, gint argc, ESExpResult **argv, gpointer data)
}
static ESExpResult *
-func_not (ESExp *f, gint argc, ESExpResult **argv, gpointer data)
+func_not (ESExp *f,
+ gint argc,
+ ESExpResult **argv,
+ gpointer data)
{
ESExpResult *r;
@@ -1082,7 +1108,10 @@ 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;
@@ -1139,7 +1168,10 @@ func_contains (ESExp *f, gint argc, ESExpResult **argv, gpointer data)
}
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;
@@ -1217,19 +1249,28 @@ func_is_or_begins_with (ESExp *f, gint argc, ESExpResult **argv, gboolean exact)
}
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);
}
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);
}
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);
@@ -1250,7 +1291,11 @@ static struct {
};
static void
-build_query (EBookBackendGAL *bl, const gchar *query, const gchar *ldap_filter, gchar **ldap_query, GError **perror)
+build_query (EBookBackendGAL *bl,
+ const gchar *query,
+ const gchar *ldap_filter,
+ gchar **ldap_query,
+ GError **perror)
{
ESExp *sexp;
ESExpResult *r;
@@ -1308,7 +1353,10 @@ build_query (EBookBackendGAL *bl, const gchar *query, const gchar *ldap_filter,
}
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,7 +1377,10 @@ manager_populate (EContact *contact, gchar **values, EBookBackendGAL *bl, E2kOpe
str += len;
static void
-member_populate (EContact *contact, gchar **values, EBookBackendGAL *bl, E2kOperation *op)
+member_populate (EContact *contact,
+ gchar **values,
+ EBookBackendGAL *bl,
+ E2kOperation *op)
{
gint i;
gchar **member_info;
@@ -1337,7 +1388,7 @@ member_populate (EContact *contact, gchar **values, EBookBackendGAL *bl, E2kOper
e_contact_set (contact, E_CONTACT_IS_LIST, GINT_TO_POINTER (TRUE));
e_contact_set (contact, E_CONTACT_LIST_SHOW_ADDRESSES, GINT_TO_POINTER (TRUE));
- for (i=0; values[i]; i++) {
+ for (i = 0; values[i]; i++) {
EVCardAttribute *attr;
member_info = g_strsplit (values [i], ";", -1);
@@ -1365,7 +1416,8 @@ member_populate (EContact *contact, gchar **values, EBookBackendGAL *bl, E2kOper
}
static gchar *
-get_time_stamp (gchar *serv_time_str, time_t *mtime)
+get_time_stamp (gchar *serv_time_str,
+ time_t *mtime)
{
gchar *input_str = serv_time_str, *result_str = NULL;
gchar *year, *month, *date, *hour, *minute, *second, *zone;
@@ -1385,8 +1437,8 @@ get_time_stamp (gchar *serv_time_str, time_t *mtime)
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_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);
@@ -1411,8 +1463,10 @@ get_time_stamp (gchar *serv_time_str, time_t *mtime)
}
static void
-last_mod_time_populate (EContact *contact, gchar **values,
- EBookBackendGAL *bl, E2kOperation *op)
+last_mod_time_populate (EContact *contact,
+ gchar **values,
+ EBookBackendGAL *bl,
+ E2kOperation *op)
{
gchar *time_str;
time_t mtime = 0;
@@ -1441,7 +1495,9 @@ typedef struct {
} LDAPSearchOp;
static EContact *
-build_contact_from_entry (EBookBackendGAL *bl, LDAPMessage *e, GList **existing_objectclasses)
+build_contact_from_entry (EBookBackendGAL *bl,
+ LDAPMessage *e,
+ GList **existing_objectclasses)
{
LDAP *subldap = NULL;
EContact *contact = e_contact_new ();
@@ -1526,7 +1582,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 */
+ * which calls g_object_set to set the property */
info->populate_contact_func (contact, values, bl, NULL);
}
else if (is_group && (info->prop_type & PROP_TYPE_GROUP)) {
@@ -1552,9 +1608,9 @@ build_contact_from_entry (EBookBackendGAL *bl, LDAPMessage *e, GList **existing_
view_limit = bl->priv->gc->response_limit;
count = ldap_count_values (values);
- member_info = g_new0 (gchar *, count+1);
+ member_info = g_new0 (gchar *, count + 1);
d(printf ("Fetching members\n"));
- for (i=0; values[i]; i++) {
+ for (i = 0; values[i]; i++) {
/* get the email id for the given dn */
/* set base to DN and scope to base */
d(printf("value (dn) = %s \n", values [i]));
@@ -1600,8 +1656,8 @@ build_contact_from_entry (EBookBackendGAL *bl, LDAPMessage *e, GList **existing_
/* call populate function */
info->populate_contact_func (contact, member_info, bl, NULL);
- for (i=0; i<count; i++) {
- g_free (*(member_info+i));
+ for (i = 0; i < count; i++) {
+ g_free (*(member_info + i));
}
g_free (member_info);
}
@@ -1680,7 +1736,7 @@ poll_ldap (EBookBackendGAL *bl)
g_warning ("unknown operation, msgid = %d", msgid);
/* XXX should the call to op->handler be
- protected by the lock? */
+ * protected by the lock? */
g_static_rec_mutex_unlock (&bl->priv->op_hash_mutex);
ldap_msgfree (res);
@@ -1691,9 +1747,10 @@ poll_ldap (EBookBackendGAL *bl)
}
static void
-ldap_search_handler (LDAPOp *op, LDAPMessage *res)
+ldap_search_handler (LDAPOp *op,
+ LDAPMessage *res)
{
- LDAPSearchOp *search_op = (LDAPSearchOp*) op;
+ LDAPSearchOp *search_op = (LDAPSearchOp *) op;
EDataBookView *view = search_op->view;
EBookBackendGAL *bl = E_BOOK_BACKEND_GAL (op->backend);
LDAPMessage *e;
@@ -1781,7 +1838,7 @@ ldap_search_handler (LDAPOp *op, LDAPMessage *res)
static void
ldap_search_dtor (LDAPOp *op)
{
- LDAPSearchOp *search_op = (LDAPSearchOp*) op;
+ LDAPSearchOp *search_op = (LDAPSearchOp *) op;
d(printf ("ldap_search_dtor (%p)\n", search_op->view));
@@ -1798,9 +1855,9 @@ ldap_search_dtor (LDAPOp *op)
#if defined(ENABLE_CACHE) && ENABLE_CACHE
static void
get_contacts_from_cache (EBookBackendGAL *ebg,
- const gchar *query,
- GPtrArray *ids,
- EDataBookView *book_view)
+ const gchar *query,
+ GPtrArray *ids,
+ EDataBookView *book_view)
{
gint i;
@@ -1820,8 +1877,8 @@ get_contacts_from_cache (EBookBackendGAL *ebg,
#endif
static void
-start_book_view (EBookBackend *backend,
- EDataBookView *view)
+start_book_view (EBookBackend *backend,
+ EDataBookView *view)
{
EBookBackendGAL *bl = E_BOOK_BACKEND_GAL (backend);
#if defined(ENABLE_CACHE) && ENABLE_CACHE
@@ -1904,7 +1961,7 @@ start_book_view (EBookBackend *backend,
contacts = e_book_backend_db_cache_get_contacts (bl->priv->file_db,
e_data_book_view_get_card_query (view));
- for (l = contacts; l;l = g_list_next (l)) {
+ for (l = contacts; l; l = g_list_next (l)) {
EContact *contact = l->data;
e_data_book_view_notify_update (view, contact);
g_object_unref (contact);
@@ -2012,7 +2069,7 @@ start_book_view (EBookBackend *backend,
e_data_book_view_ref (view);
- ldap_op_add ((LDAPOp*) op, E_BOOK_BACKEND (bl), NULL, NULL, view,
+ ldap_op_add ((LDAPOp *) op, E_BOOK_BACKEND (bl), NULL, NULL, view,
0, search_msgid,
ldap_search_handler, ldap_search_dtor);
d(printf("start_book_view: Setting op %p in book %p\n", op, view));
@@ -2025,8 +2082,8 @@ start_book_view (EBookBackend *backend,
}
static void
-stop_book_view (EBookBackend *backend,
- EDataBookView *view)
+stop_book_view (EBookBackend *backend,
+ EDataBookView *view)
{
LDAPSearchOp *op;
@@ -2036,7 +2093,7 @@ stop_book_view (EBookBackend *backend,
d(printf("STOP BOOK VIEW: Getting op %p from view %p\n", op, view));
if (op) {
op->aborted = TRUE;
- ldap_op_finished ((LDAPOp*) op);
+ ldap_op_finished ((LDAPOp *) op);
g_free (op);
}
}
@@ -2055,12 +2112,14 @@ 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 );
@@ -2089,7 +2148,8 @@ tool_server_controls ( LDAP *ld, LDAPControl *extra_c, gint count )
#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;
@@ -2108,10 +2168,9 @@ ber_dupbv ( struct berval *dst, struct berval *src )
#endif
static gint
-parse_page_control (
- LDAP *ld,
- LDAPMessage *result,
- struct berval *cookie )
+parse_page_control (LDAP *ld,
+ LDAPMessage *result,
+ struct berval *cookie)
{
gint rc;
gint err;
@@ -2168,7 +2227,7 @@ parse_page_control (
} else {
morePagedResults = 0;
}
- if (cookie->bv_len>0) {
+ if (cookie->bv_len > 0) {
d(printf ("\n"));
}
else {
@@ -2204,7 +2263,7 @@ static gint dosearch (
g_mutex_lock (bl->priv->ldap_lock);
rc = ldap_search_ext (bl->priv->ldap, base, scope, value, attrs, attrsonly,
- sctrls, cctrls, timeout, size /*LDAP_NO_LIMIT*/, &msgid );
+ sctrls, cctrls, timeout, size /*LDAP_NO_LIMIT */, &msgid );
g_mutex_unlock (bl->priv->ldap_lock);
if (rc != LDAP_SUCCESS) {
@@ -2278,7 +2337,8 @@ done:
}
static void
-generate_cache (EBookBackendGAL *book_backend_gal, const gchar * changed_filter)
+generate_cache (EBookBackendGAL *book_backend_gal,
+ const gchar *changed_filter)
{
LDAPGetContactListOp *contact_list_op = g_new0 (LDAPGetContactListOp, 1);
EBookBackendGALPrivate *priv;
@@ -2386,7 +2446,7 @@ update_cache (EBookBackendGAL *gal)
if (t && *t)
t1 = atoi (t);
else
- t1=0;
+ t1 = 0;
if (t1 == 0) {
generate_cache (gal, NULL);
return;
@@ -2409,8 +2469,8 @@ update_cache (EBookBackendGAL *gal)
static void
authenticate_user (EBookBackend *backend,
- GCancellable *cancellable,
- ECredentials *credentials)
+ GCancellable *cancellable,
+ ECredentials *credentials)
{
EBookBackendGAL *be = E_BOOK_BACKEND_GAL (backend);
EBookBackendGALPrivate *bepriv = be->priv;
@@ -2462,7 +2522,7 @@ authenticate_user (EBookBackend *backend,
//if (t && *t)
// t1 = atoi (t);
//else
- // t1=0;
+ // t1 = 0;
//t2 = time (NULL);
//diff = interval * 24 * 60 *60;
/* We have a day specified, then we cache it. */
@@ -2479,13 +2539,15 @@ authenticate_user (EBookBackend *backend,
}
}
#endif
- e_book_backend_notify_opened (backend, NULL /* Success*/ );
+ e_book_backend_notify_opened (backend, NULL /* Success */ );
}
}
#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;
@@ -2503,7 +2565,9 @@ 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;
@@ -2526,7 +2590,8 @@ cancel_operations (EBookBackend *backend)
}
static void
-set_online (EBookBackend *backend, gboolean is_online)
+set_online (EBookBackend *backend,
+ gboolean is_online)
{
EBookBackendGAL *be = E_BOOK_BACKEND_GAL (backend);
EBookBackendGALPrivate *bepriv;
@@ -2556,7 +2621,11 @@ set_online (EBookBackend *backend, gboolean is_online)
}
static void
-gal_open (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable, gboolean only_if_exists)
+gal_open (EBookBackend *backend,
+ EDataBook *book,
+ guint32 opid,
+ GCancellable *cancellable,
+ gboolean only_if_exists)
{
EBookBackendGAL *bl = E_BOOK_BACKEND_GAL (backend);
ESource *source = e_book_backend_get_source (backend);
@@ -2604,7 +2673,7 @@ gal_open (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *ca
}
g_strfreev (tokens);
- for (i=0; i< strlen (uri); i++) {
+ for (i = 0; i< strlen (uri); i++) {
switch (uri[i]) {
case ':' :
case '/' :
@@ -2764,13 +2833,20 @@ gal_open (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *ca
}
static void
-gal_remove (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable)
+gal_remove (EBookBackend *backend,
+ EDataBook *book,
+ guint32 opid,
+ GCancellable *cancellable)
{
e_data_book_respond_remove (book, opid, EDB_ERROR (PERMISSION_DENIED));
}
static void
-gal_get_backend_property (EBookBackend *backend, EDataBook *book, guint32 opid, GCancellable *cancellable, const gchar *prop_name)
+gal_get_backend_property (EBookBackend *backend,
+ EDataBook *book,
+ guint32 opid,
+ GCancellable *cancellable,
+ const gchar *prop_name)
{
g_return_if_fail (backend != NULL);
g_return_if_fail (prop_name != NULL);
@@ -2820,7 +2896,9 @@ e_book_backend_gal_new (void)
}
static gboolean
-call_dtor (gint msgid, LDAPOp *op, gpointer data)
+call_dtor (gint msgid,
+ LDAPOp *op,
+ gpointer data)
{
EBookBackendGAL *bl = E_BOOK_BACKEND_GAL (op->backend);
diff --git a/addressbook/e-book-backend-gal.h b/addressbook/e-book-backend-gal.h
index aedad02..dde5d4c 100644
--- a/addressbook/e-book-backend-gal.h
+++ b/addressbook/e-book-backend-gal.h
@@ -68,14 +68,14 @@
# define ldap_compare_ext(ld,dn,a,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)
# else /* !UNICODE */
# define ldap_compare_ext(ld,dn,a,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)
# endif /* UNICODE */
diff --git a/calendar/e-cal-backend-exchange-calendar.c b/calendar/e-cal-backend-exchange-calendar.c
index 65d2229..c6dd264 100644
--- a/calendar/e-cal-backend-exchange-calendar.c
+++ b/calendar/e-cal-backend-exchange-calendar.c
@@ -69,7 +69,8 @@ G_DEFINE_TYPE (
E_TYPE_CAL_BACKEND_EXCHANGE)
static void
-add_timezones_from_comp (ECalBackendExchange *cbex, icalcomponent *icalcomp)
+add_timezones_from_comp (ECalBackendExchange *cbex,
+ icalcomponent *icalcomp)
{
icalcomponent *subcomp;
@@ -95,8 +96,9 @@ add_timezones_from_comp (ECalBackendExchange *cbex, icalcomponent *icalcomp)
static gboolean
add_vevent (ECalBackendExchange *cbex,
- const gchar *href, const gchar *lastmod,
- icalcomponent *icalcomp)
+ const gchar *href,
+ const gchar *lastmod,
+ icalcomponent *icalcomp)
{
icalproperty *prop, *transp;
gboolean res;
@@ -188,8 +190,13 @@ add_vevent (ECalBackendExchange *cbex,
/* Add the event to the cache, Notify the backend if it is sucessfully added */
static gboolean
-add_ical (ECalBackendExchange *cbex, const gchar *href, const gchar *lastmod,
- const gchar *uid, const gchar *body, gint len, gint receipts)
+add_ical (ECalBackendExchange *cbex,
+ const gchar *href,
+ const gchar *lastmod,
+ const gchar *uid,
+ const gchar *body,
+ gint len,
+ gint receipts)
{
const gchar *start, *end;
gchar *ical_body;
@@ -499,7 +506,7 @@ get_changed_events (ECalBackendExchange *cbex)
modtime = g_hash_table_lookup (modtimes, result->href);
uid = g_hash_table_lookup (attachments, result->href);
/* The icaldata already has the attachment. So no need to
- re-fetch it from the server. */
+ * re-fetch it from the server. */
add_ical (cbex, result->href, modtime, uid,
(gchar *) ical_data->data, ical_data->len, status_tracking);
}
@@ -564,8 +571,10 @@ get_changed_events (ECalBackendExchange *cbex)
/* folder subscription notify callback */
static void
-notify_changes (E2kContext *ctx, const gchar *uri,
- E2kContextChangeType type, gpointer user_data)
+notify_changes (E2kContext *ctx,
+ const gchar *uri,
+ E2kContextChangeType type,
+ gpointer user_data)
{
ECalBackendExchange *ecalbex = E_CAL_BACKEND_EXCHANGE (user_data);
@@ -578,7 +587,10 @@ notify_changes (E2kContext *ctx, const gchar *uri,
}
static void
-authenticate_user (ECalBackendSync *backend, GCancellable *cancellable, ECredentials *credentials, GError **perror)
+authenticate_user (ECalBackendSync *backend,
+ GCancellable *cancellable,
+ ECredentials *credentials,
+ GError **perror)
{
GThread *thread = NULL;
GError *error = NULL;
@@ -619,7 +631,10 @@ authenticate_user (ECalBackendSync *backend, GCancellable *cancellable, ECredent
}
static void
-refresh_calendar (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, GError **perror)
+refresh_calendar (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ GError **perror)
{
g_return_if_fail (E_IS_CAL_BACKEND_EXCHANGE (backend));
@@ -633,7 +648,8 @@ struct _cb_data {
};
static void
-add_timezone_cb (icalparameter *param, gpointer data)
+add_timezone_cb (icalparameter *param,
+ gpointer data)
{
struct _cb_data *cbdata = (struct _cb_data *) data;
icalcomponent *vtzcomp;
@@ -658,7 +674,8 @@ add_timezone_cb (icalparameter *param, gpointer data)
}
gboolean
-check_for_send_options (icalcomponent *icalcomp, E2kProperties *props)
+check_for_send_options (icalcomponent *icalcomp,
+ E2kProperties *props)
{
icalproperty *icalprop;
gboolean exists = FALSE;
@@ -693,7 +710,8 @@ check_for_send_options (icalcomponent *icalcomp, E2kProperties *props)
/* stolen from e-itip-control.c with some modifications */
static icalproperty *
-find_attendee_prop (icalcomponent *ical_comp, const gchar *address)
+find_attendee_prop (icalcomponent *ical_comp,
+ const gchar *address)
{
icalproperty *prop;
@@ -725,7 +743,7 @@ find_attendee_prop (icalcomponent *ical_comp, const gchar *address)
static gboolean
check_owner_partstatus_for_declined (ECalBackendSync *backend,
- icalcomponent *icalcomp)
+ icalcomponent *icalcomp)
{
icalproperty *icalprop;
icalparameter *param;
@@ -747,8 +765,13 @@ check_owner_partstatus_for_declined (ECalBackendSync *backend,
}
static void
-create_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar *calobj, gchar **uid, gchar **new_object, GError **error)
+create_object (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *calobj,
+ gchar **uid,
+ gchar **new_object,
+ GError **error)
{
/* FIXME : Return some value in uid */
ECalBackendExchangeCalendar *cbexc;
@@ -788,7 +811,7 @@ create_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellabl
}
/* check for permission denied:: priv->writable??
- ....
+ * ....
*/
icalcomp = icalparser_parse_string (calobj);
@@ -878,7 +901,7 @@ create_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellabl
/* Remove X parameters from properties */
/* This is specifically for X-EVOLUTION-END-DATE,
- but removing anything else is probably ok too */
+ * but removing anything else is probably ok too */
for (icalprop = icalcomponent_get_first_property (icalcomp, ICAL_ANY_PROPERTY);
icalprop != NULL;
icalprop = icalcomponent_get_next_property (icalcomp, ICAL_ANY_PROPERTY))
@@ -887,7 +910,7 @@ create_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellabl
}
/* add the timezones information and the component itself
- to the VCALENDAR object */
+ * to the VCALENDAR object */
e_cal_component_commit_sequence (comp);
*new_object = e_cal_component_get_as_string (comp);
if (!*new_object) {
@@ -990,7 +1013,8 @@ create_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellabl
#define IMPORTANCE 0x08
static void
-update_x_properties (ECalBackendExchange *cbex, ECalComponent *comp)
+update_x_properties (ECalBackendExchange *cbex,
+ ECalComponent *comp)
{
icalcomponent *icalcomp;
icalproperty *icalprop;
@@ -1062,7 +1086,7 @@ update_x_properties (ECalBackendExchange *cbex, ECalComponent *comp)
}
/* Remove all CDO-MODPROPS properties, else server would return error for the operation
- performed */
+ * performed */
for (l = props; l != NULL; l = l->next) {
icalprop = l->data;
icalcomponent_remove_property (icalcomp, icalprop);
@@ -1098,9 +1122,14 @@ update_x_properties (ECalBackendExchange *cbex, ECalComponent *comp)
}
static void
-modify_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar *calobj, CalObjModType mod,
- gchar **old_object, gchar **new_object, GError **perror)
+modify_object (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *calobj,
+ CalObjModType mod,
+ gchar **old_object,
+ gchar **new_object,
+ GError **perror)
{
d(printf ("ecbexc_modify_object(%p, %p, %d, %s)", backend, cal, mod, *old_object ? *old_object : NULL));
@@ -1123,9 +1152,16 @@ modify_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellabl
} G_STMT_END
static gboolean
-modify_object_with_href (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar *calobj, CalObjModType mod,
- gchar **old_object, gchar **new_object, const gchar *href, const gchar *rid_to_remove, GError **error)
+modify_object_with_href (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *calobj,
+ CalObjModType mod,
+ gchar **old_object,
+ gchar **new_object,
+ const gchar *href,
+ const gchar *rid_to_remove,
+ GError **error)
{
ECalBackendExchangeCalendar *cbexc;
ECalBackendExchangeComponent *ecomp;
@@ -1213,7 +1249,7 @@ modify_object_with_href (ECalBackendSync *backend, EDataCal *cal, GCancellable *
key_rid.zone = start.zone;
/* This means its a instance generated from master object. So replace
- the dates stored dates from the master object */
+ * the dates stored dates from the master object */
if (icaltime_compare_date_only (start, key_rid) == 0) {
icaltimetype m_end, m_start, end;
@@ -1279,7 +1315,7 @@ modify_object_with_href (ECalBackendSync *backend, EDataCal *cal, GCancellable *
/* Remove X parameters from properties */
/* This is specifically for X-EVOLUTION-END-DATE,
- but removing anything else is probably ok too */
+ * but removing anything else is probably ok too */
for (icalprop = icalcomponent_get_first_property (updated_icalcomp, ICAL_ANY_PROPERTY);
icalprop != NULL;
icalprop = icalcomponent_get_next_property (updated_icalcomp, ICAL_ANY_PROPERTY))
@@ -1374,7 +1410,7 @@ modify_object_with_href (ECalBackendSync *backend, EDataCal *cal, GCancellable *
}
/* add the timezones information and the component itself
- to the VCALENDAR object */
+ * to the VCALENDAR object */
e_cal_component_commit_sequence (real_ecomp);
real_comp_str = e_cal_component_get_as_string (real_ecomp);
if (!real_comp_str) {
@@ -1396,7 +1432,7 @@ modify_object_with_href (ECalBackendSync *backend, EDataCal *cal, GCancellable *
icalcomponent_add_component (cbdata->vcal_comp, real_icalcomp);
/* We need to add all the instances to the VCalendar component while sending to
- the server, so that we don't lose any detached instances */
+ * the server, so that we don't lose any detached instances */
if (ecomp->icomp && mod == CALOBJ_MOD_THIS && remove) {
icalcomponent_add_component (cbdata->vcal_comp, icalcomponent_new_clone (ecomp->icomp));
}
@@ -1538,9 +1574,15 @@ modify_object_with_href (ECalBackendSync *backend, EDataCal *cal, GCancellable *
}
static void
-remove_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar *uid, const gchar *rid, CalObjModType mod,
- gchar **old_object, gchar **object, GError **error)
+remove_object (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *uid,
+ const gchar *rid,
+ CalObjModType mod,
+ gchar **old_object,
+ gchar **object,
+ GError **error)
{
ECalBackendExchangeCalendar *cbexc;
ECalBackendExchange *cbex;
@@ -1552,8 +1594,8 @@ remove_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellabl
struct icaltimetype time_rid;
/* Will handle only CALOBJ_MOD_THIS and CALOBJ_MOD_ALL for mod.
- CALOBJ_MOD_THISANDPRIOR and CALOBJ_MOD_THISANDFUTURE are not
- handled. */
+ * CALOBJ_MOD_THISANDPRIOR and CALOBJ_MOD_THISANDFUTURE are not
+ * handled. */
cbexc = E_CAL_BACKEND_EXCHANGE_CALENDAR (backend);
cbex = E_CAL_BACKEND_EXCHANGE (backend);
@@ -1627,8 +1669,11 @@ remove_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellabl
}
static void
-receive_objects (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar *calobj, GError **error)
+receive_objects (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *calobj,
+ GError **error)
{
ECalBackendExchangeCalendar *cbexc;
ECalBackendExchange *cbex;
@@ -1830,12 +1875,12 @@ typedef enum {
/* start_time and end_time are in e2k_timestamp format. */
static ECalBackendExchangeBookingResult
book_resource (ECalBackendExchange *cbex,
- EDataCal *cal,
- const gchar *resource_email,
- ECalComponent *comp,
- icalproperty_method method,
- icalparameter *part_param,
- gboolean book_all)
+ EDataCal *cal,
+ const gchar *resource_email,
+ ECalComponent *comp,
+ icalproperty_method method,
+ icalparameter *part_param,
+ gboolean book_all)
{
E2kGlobalCatalog *gc;
E2kGlobalCatalogEntry *entry;
@@ -2044,7 +2089,7 @@ book_resource (ECalBackendExchange *cbex,
/* Use the PUT method to create the meeting item in the resource's calendar. */
if (modify_object_with_href (E_CAL_BACKEND_SYNC (cbex), cal, NULL, calobj, book_all ? CALOBJ_MOD_ALL : CALOBJ_MOD_THIS, &old_object, &new_object, href, NULL, NULL)) {
/* Need this to update the participation status of the resource
- in the organizer's calendar. */
+ * in the organizer's calendar. */
modify_ok = modify_object_with_href (E_CAL_BACKEND_SYNC (cbex), cal, NULL, calobj, book_all ? CALOBJ_MOD_ALL : CALOBJ_MOD_THIS, &old_object, &new_object, NULL, NULL, NULL);
} else {
retval = E_CAL_BACKEND_EXCHANGE_BOOKING_ERROR;
@@ -2084,9 +2129,13 @@ book_resource (ECalBackendExchange *cbex,
}
static void
-send_objects (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar *calobj,
- GSList **users, gchar **modified_calobj, GError **error)
+send_objects (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *calobj,
+ GSList **users,
+ gchar **modified_calobj,
+ GError **error)
{
ECalBackendExchange *cbex = (ECalBackendExchange *) backend;
ECalBackendExchangeBookingResult result;
@@ -2203,7 +2252,9 @@ send_objects (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable
#define E2K_FBCHAR_TO_BUSYSTATUS(ch) ((ch) - '0')
static icalproperty *
-create_freebusy_prop (E2kBusyStatus fbstatus, time_t start, time_t end)
+create_freebusy_prop (E2kBusyStatus fbstatus,
+ time_t start,
+ time_t end)
{
icaltimezone *utc = icaltimezone_get_utc_timezone ();
icalproperty *prop;
@@ -2236,7 +2287,9 @@ create_freebusy_prop (E2kBusyStatus fbstatus, time_t start, time_t end)
}
static void
-set_freebusy_info (icalcomponent *vfb, const gchar *data, time_t start)
+set_freebusy_info (icalcomponent *vfb,
+ const gchar *data,
+ time_t start)
{
const gchar *span_start, *span_end;
E2kBusyStatus busy;
@@ -2259,8 +2312,13 @@ set_freebusy_info (icalcomponent *vfb, const gchar *data, time_t start)
}
static void
-discard_alarm (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar *uid, const gchar *rid, const gchar *auid, GError **error)
+discard_alarm (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *uid,
+ const gchar *rid,
+ const gchar *auid,
+ GError **error)
{
ECalBackendExchange *cbex = NULL;
ECalBackendExchangeComponent *ecbexcomp;
@@ -2310,9 +2368,14 @@ discard_alarm (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellabl
}
static void
-get_free_busy (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const GSList *users, time_t start, time_t end,
- GSList **freebusy, GError **perror)
+get_free_busy (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const GSList *users,
+ time_t start,
+ time_t end,
+ GSList **freebusy,
+ GError **perror)
{
ECalBackendExchange *cbex = E_CAL_BACKEND_EXCHANGE (backend);
gchar *start_str, *end_str;
diff --git a/calendar/e-cal-backend-exchange-factory.c b/calendar/e-cal-backend-exchange-factory.c
index 1a4ec90..633d405 100644
--- a/calendar/e-cal-backend-exchange-factory.c
+++ b/calendar/e-cal-backend-exchange-factory.c
@@ -38,8 +38,9 @@ _get_protocol (ECalBackendFactory *factory)
return "exchange";
}
-static ECalBackend*
-_todos_new_backend (ECalBackendFactory *factory, ESource *source)
+static ECalBackend *
+_todos_new_backend (ECalBackendFactory *factory,
+ ESource *source)
{
return g_object_new (E_TYPE_CAL_BACKEND_EXCHANGE_TASKS,
"source", source,
@@ -52,8 +53,9 @@ _todos_get_kind (ECalBackendFactory *factory)
return ICAL_VTODO_COMPONENT;
}
-static ECalBackend*
-_events_new_backend (ECalBackendFactory *factory, ESource *source)
+static ECalBackend *
+_events_new_backend (ECalBackendFactory *factory,
+ ESource *source)
{
return g_object_new (E_TYPE_CAL_BACKEND_EXCHANGE_CALENDAR,
"source", source,
@@ -149,7 +151,8 @@ eds_module_shutdown (void)
}
void
-eds_module_list_types (const GType **types, gint *num_types)
+eds_module_list_types (const GType **types,
+ gint *num_types)
{
static GType module_types[2];
diff --git a/calendar/e-cal-backend-exchange-tasks.c b/calendar/e-cal-backend-exchange-tasks.c
index 9d59c01..278ce7f 100644
--- a/calendar/e-cal-backend-exchange-tasks.c
+++ b/calendar/e-cal-backend-exchange-tasks.c
@@ -51,10 +51,10 @@ struct _ECalBackendExchangeTasksPrivate {
icalcomponent *icalcomp;
/* All the objects in the calendar, hashed by UID. The
- * hash key *is* the uid returned by cal_component_get_uid(); it is not
- * copied, so don't free it when you remove an object from the hash
- * table. Each item in the hash table is a ECalBackendExchangeTasksObject.
- */
+ * * hash key *is* the uid returned by cal_component_get_uid(); it is not
+ * * copied, so don't free it when you remove an object from the hash
+ * * table. Each item in the hash table is a ECalBackendExchangeTasksObject.
+ * */
GHashTable *comp_uid_hash;
GList *comp;
@@ -72,7 +72,10 @@ G_DEFINE_TYPE (
E_TYPE_CAL_BACKEND_EXCHANGE)
static void
-get_from (ECalBackendSync *backend, ECalComponent *comp, gchar **from_name, gchar **from_addr)
+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)))
e_cal_backend_exchange_get_from (backend, comp, from_name, from_addr);
@@ -98,7 +101,8 @@ get_from (ECalBackendSync *backend, ECalComponent *comp, gchar **from_name, gcha
}
static void
-set_uid (E2kProperties *props, ECalComponent *comp)
+set_uid (E2kProperties *props,
+ ECalComponent *comp)
{
const gchar *uid;
@@ -107,7 +111,8 @@ set_uid (E2kProperties *props, ECalComponent *comp)
}
static void
-set_summary (E2kProperties *props, ECalComponent *comp)
+set_summary (E2kProperties *props,
+ ECalComponent *comp)
{
static ECalComponentText summary;
@@ -120,7 +125,8 @@ set_summary (E2kProperties *props, ECalComponent *comp)
}
static void
-set_priority (E2kProperties *props, ECalComponent *comp)
+set_priority (E2kProperties *props,
+ ECalComponent *comp)
{
gint *priority, value = 0;
@@ -140,7 +146,8 @@ set_priority (E2kProperties *props, ECalComponent *comp)
}
static void
-set_sensitivity (E2kProperties *props, ECalComponent *comp)
+set_sensitivity (E2kProperties *props,
+ ECalComponent *comp)
{
ECalComponentClassification classif;
gint sensitivity;
@@ -219,7 +226,8 @@ convert_to_utc (ECalComponentDateTime *dt)
}
static void
-set_dtstart (E2kProperties *props, ECalComponent *comp)
+set_dtstart (E2kProperties *props,
+ ECalComponent *comp)
{
ECalComponentDateTime dt;
gchar *dtstart_str;
@@ -237,7 +245,8 @@ set_dtstart (E2kProperties *props, ECalComponent *comp)
}
static void
-set_due_date (E2kProperties *props, ECalComponent *comp)
+set_due_date (E2kProperties *props,
+ ECalComponent *comp)
{
ECalComponentDateTime dt;
gchar *due_str;
@@ -266,7 +275,8 @@ icaltime_to_e2k_time (struct icaltimetype *itt)
}
static void
-set_date_completed (E2kProperties *props, ECalComponent *comp)
+set_date_completed (E2kProperties *props,
+ ECalComponent *comp)
{
struct icaltimetype *itt;
gchar *tstr;
@@ -287,7 +297,8 @@ set_date_completed (E2kProperties *props, ECalComponent *comp)
}
static void
-set_status (E2kProperties *props, ECalComponent *comp)
+set_status (E2kProperties *props,
+ ECalComponent *comp)
{
icalproperty_status ical_status;
gint status;
@@ -320,7 +331,8 @@ set_status (E2kProperties *props, ECalComponent *comp)
}
static void
-set_percent (E2kProperties *props, ECalComponent *comp)
+set_percent (E2kProperties *props,
+ ECalComponent *comp)
{
gint *percent;
gfloat res;
@@ -336,7 +348,8 @@ set_percent (E2kProperties *props, ECalComponent *comp)
}
static void
-set_categories (E2kProperties *props, ECalComponent *comp)
+set_categories (E2kProperties *props,
+ ECalComponent *comp)
{
GSList *categories;
GSList *sl;
@@ -361,7 +374,8 @@ set_categories (E2kProperties *props, ECalComponent *comp)
}
static void
-set_url (E2kProperties *props, ECalComponent *comp)
+set_url (E2kProperties *props,
+ ECalComponent *comp)
{
const gchar *url;
@@ -373,7 +387,8 @@ set_url (E2kProperties *props, ECalComponent *comp)
}
static void
-update_props (ECalComponent *comp, E2kProperties **properties)
+update_props (ECalComponent *comp,
+ E2kProperties **properties)
{
E2kProperties *props = *properties;
@@ -438,10 +453,15 @@ get_summary (ECalComponent *comp)
}
static gint
-put_body (ECalComponent *comp, E2kContext *ctx, E2kOperation *op,
- const gchar *uri, const gchar *from_name, const gchar *from_addr,
- const gchar *attach_body, const gchar *boundary,
- gchar **repl_uid)
+put_body (ECalComponent *comp,
+ E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *uri,
+ const gchar *from_name,
+ const gchar *from_addr,
+ const gchar *attach_body,
+ const gchar *boundary,
+ gchar **repl_uid)
{
GSList *desc_list;
@@ -981,8 +1001,10 @@ get_changed_tasks (ECalBackendExchange *cbex)
/* folder subscription notify callback */
static void
-notify_changes (E2kContext *ctx, const gchar *uri,
- E2kContextChangeType type, gpointer user_data)
+notify_changes (E2kContext *ctx,
+ const gchar *uri,
+ E2kContextChangeType type,
+ gpointer user_data)
{
ECalBackendExchange *ecalbex = E_CAL_BACKEND_EXCHANGE (user_data);
@@ -995,7 +1017,10 @@ notify_changes (E2kContext *ctx, const gchar *uri,
}
static void
-authenticate_user_task (ECalBackendSync *backend, GCancellable *cancellable, ECredentials *credentials, GError **perror)
+authenticate_user_task (ECalBackendSync *backend,
+ GCancellable *cancellable,
+ ECredentials *credentials,
+ GError **perror)
{
GThread *thread = NULL;
GError *error = NULL;
@@ -1035,7 +1060,10 @@ authenticate_user_task (ECalBackendSync *backend, GCancellable *cancellable, ECr
}
static void
-refresh_task (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, GError **perror)
+refresh_task (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ GError **perror)
{
g_return_if_fail (E_IS_CAL_BACKEND_EXCHANGE (backend));
@@ -1049,8 +1077,13 @@ struct _cb_data {
};
static void
-create_task_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar *calobj, gchar **return_uid, gchar **new_object, GError **error)
+create_task_object (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *calobj,
+ gchar **return_uid,
+ gchar **new_object,
+ GError **error)
{
ECalBackendExchange *ecalbex;
E2kProperties *props;
@@ -1218,9 +1251,14 @@ create_task_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cance
}
static void
-modify_task_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar *calobj, CalObjModType mod,
- gchar **old_object, gchar **new_object, GError **error)
+modify_task_object (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *calobj,
+ CalObjModType mod,
+ gchar **old_object,
+ gchar **new_object,
+ GError **error)
{
ECalBackendExchangeTasks *ecalbextask;
ECalBackendExchangeComponent *ecalbexcomp;
@@ -1346,8 +1384,11 @@ modify_task_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cance
}
static void
-receive_task_objects (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar *calobj, GError **error)
+receive_task_objects (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *calobj,
+ GError **error)
{
ECalBackendExchangeTasks *ecalbextask;
ECalBackendExchange *cbex;
@@ -1431,9 +1472,15 @@ receive_task_objects (ECalBackendSync *backend, EDataCal *cal, GCancellable *can
}
static void
-remove_task_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar *uid, const gchar *rid, CalObjModType mod,
- gchar **old_object, gchar **object, GError **error)
+remove_task_object (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *uid,
+ const gchar *rid,
+ CalObjModType mod,
+ gchar **old_object,
+ gchar **object,
+ GError **error)
{
ECalBackendExchange *ecalbex = E_CAL_BACKEND_EXCHANGE (backend);
ECalBackendExchangeComponent *ecalbexcomp;
diff --git a/calendar/e-cal-backend-exchange.c b/calendar/e-cal-backend-exchange.c
index 73b3460..340f2b3 100644
--- a/calendar/e-cal-backend-exchange.c
+++ b/calendar/e-cal-backend-exchange.c
@@ -86,7 +86,12 @@ G_DEFINE_TYPE (
E_TYPE_CAL_BACKEND_SYNC)
static gboolean
-get_backend_property (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, const gchar *prop_name, gchar **prop_value, GError **error)
+get_backend_property (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *prop_name,
+ gchar **prop_value,
+ GError **error)
{
gboolean processed = TRUE;
@@ -139,7 +144,8 @@ get_backend_property (ECalBackendSync *backend, EDataCal *cal, GCancellable *can
}
static void
-get_cal_owner (ECalBackendSync *backend, gchar **name)
+get_cal_owner (ECalBackendSync *backend,
+ gchar **name)
{
ECalBackendExchange *cbex = E_CAL_BACKEND_EXCHANGE (backend);
ExchangeHierarchy *hier;
@@ -151,7 +157,9 @@ get_cal_owner (ECalBackendSync *backend, gchar **name)
}
static gboolean
-load_cache (ECalBackendExchange *cbex, E2kUri *e2kuri, GError **perror)
+load_cache (ECalBackendExchange *cbex,
+ E2kUri *e2kuri,
+ GError **perror)
{
icalcomponent *vcalcomp, *comp, *tmp_comp;
struct icaltimetype comp_last_mod, folder_last_mod;
@@ -278,7 +286,9 @@ load_cache (ECalBackendExchange *cbex, E2kUri *e2kuri, GError **perror)
}
static void
-save_timezone (gpointer key, gpointer tz, gpointer vcalcomp)
+save_timezone (gpointer key,
+ gpointer tz,
+ gpointer vcalcomp)
{
icalcomponent *tzcomp;
@@ -287,7 +297,9 @@ save_timezone (gpointer key, gpointer tz, gpointer vcalcomp)
}
static void
-save_object (gpointer key, gpointer value, gpointer vcalcomp)
+save_object (gpointer key,
+ gpointer value,
+ gpointer vcalcomp)
{
ECalBackendExchangeComponent *ecomp = value;
icalcomponent *icalcomp;
@@ -356,7 +368,11 @@ save_cache (ECalBackendExchange *cbex)
}
static void
-open_calendar (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, gboolean only_if_exists, GError **perror)
+open_calendar (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ gboolean only_if_exists,
+ GError **perror)
{
ECalBackendExchange *cbex = E_CAL_BACKEND_EXCHANGE (backend);
const gchar *uristr;
@@ -440,7 +456,10 @@ open_calendar (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellabl
}
static void
-authenticate_user (ECalBackendSync *backend, GCancellable *cancellable, ECredentials *credentials, GError **perror)
+authenticate_user (ECalBackendSync *backend,
+ GCancellable *cancellable,
+ ECredentials *credentials,
+ GError **perror)
{
ECalBackendExchange *cbex = E_CAL_BACKEND_EXCHANGE (backend);
const gchar *uristr;
@@ -486,7 +505,7 @@ authenticate_user (ECalBackendSync *backend, GCancellable *cancellable, ECredent
cbex->folder = exchange_account_get_folder (cbex->account, uristr);
if (!cbex->folder) {
/* Folder is not known at the moment, thus try to rescan foreign
- folder, just in case we didn't scan it fully yet. */
+ * folder, just in case we didn't scan it fully yet. */
hier_to_rescan = exchange_account_get_hierarchy_by_email (cbex->account, email);
}
@@ -551,7 +570,10 @@ authenticate_user (ECalBackendSync *backend, GCancellable *cancellable, ECredent
}
static void
-remove_calendar (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable, GError **perror)
+remove_calendar (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ GError **perror)
{
ECalBackendExchange *cbex = E_CAL_BACKEND_EXCHANGE (backend);
ExchangeAccountFolderResult result;
@@ -560,7 +582,7 @@ remove_calendar (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancella
d(printf("ecbe_remove_calendar(%p, %p)\n", backend, cal));
/* If we do not have a folder, then that means there is no corresponding folder on the server,
- thus pretend we removed it successfully. It's not there anyway, thus should be fine. */
+ * thus pretend we removed it successfully. It's not there anyway, thus should be fine. */
if (!cbex->folder)
return;
@@ -581,7 +603,9 @@ remove_calendar (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancella
}
static void
-add_to_unseen (gpointer key, gpointer value, gpointer data)
+add_to_unseen (gpointer key,
+ gpointer value,
+ gpointer data)
{
ECalBackendExchange *cbex = data;
@@ -598,7 +622,10 @@ e_cal_backend_exchange_cache_sync_start (ECalBackendExchange *cbex)
}
static gboolean
-find_instance (ECalBackendExchange *cbex, ECalBackendExchangeComponent *ecomp, const gchar *rid, const gchar *lastmod)
+find_instance (ECalBackendExchange *cbex,
+ ECalBackendExchangeComponent *ecomp,
+ const gchar *rid,
+ const gchar *lastmod)
{
GList *l;
gboolean found = FALSE;
@@ -642,7 +669,8 @@ find_instance (ECalBackendExchange *cbex, ECalBackendExchangeComponent *ecomp, c
* @param itt What to convert to UTC, if required.
**/
void
-e_cal_backend_exchange_ensure_utc_zone (ECalBackend *cb, struct icaltimetype *itt)
+e_cal_backend_exchange_ensure_utc_zone (ECalBackend *cb,
+ struct icaltimetype *itt)
{
g_return_if_fail (cb != NULL);
g_return_if_fail (itt != NULL);
@@ -652,18 +680,17 @@ e_cal_backend_exchange_ensure_utc_zone (ECalBackend *cb, struct icaltimetype *it
if (!itt->zone)
icaltime_set_timezone (itt, icaltimezone_get_utc_timezone ());
- icaltimezone_convert_time (itt, (icaltimezone*) icaltime_get_timezone (*itt), icaltimezone_get_utc_timezone ());
+ icaltimezone_convert_time (itt, (icaltimezone *) icaltime_get_timezone (*itt), icaltimezone_get_utc_timezone ());
icaltime_set_timezone (itt, icaltimezone_get_utc_timezone ());
}
}
gboolean
e_cal_backend_exchange_in_cache (ECalBackendExchange *cbex,
- const gchar *uid,
- const gchar *lastmod,
- const gchar *href,
- const gchar *rid
- )
+ const gchar *uid,
+ const gchar *lastmod,
+ const gchar *href,
+ const gchar *rid)
{
ECalBackendExchangeComponent *ecomp;
@@ -693,7 +720,9 @@ e_cal_backend_exchange_in_cache (ECalBackendExchange *cbex,
}
static void
-uncache (gpointer key, gpointer value, gpointer data)
+uncache (gpointer key,
+ gpointer value,
+ gpointer data)
{
ECalBackendExchange *cbex = data;
ECalBackend *backend = E_CAL_BACKEND (cbex);
@@ -708,7 +737,7 @@ uncache (gpointer key, gpointer value, gpointer data)
if (ecomp->icomp) {
gchar *str = NULL;
/* FIXME somehow the query does not match with the component in some cases, so user needs to press a
- clear to get rid of the component from the view in that case*/
+ * clear to get rid of the component from the view in that case*/
str = icalcomponent_as_ical_string_r (ecomp->icomp);
e_cal_backend_notify_object_removed (backend, id, icalcomponent_as_ical_string_r (ecomp->icomp)
, NULL);
@@ -745,8 +774,9 @@ e_cal_backend_exchange_cache_sync_end (ECalBackendExchange *cbex)
**/
gboolean
e_cal_backend_exchange_add_object (ECalBackendExchange *cbex,
- const gchar *href, const gchar *lastmod,
- icalcomponent *comp)
+ const gchar *href,
+ const gchar *lastmod,
+ icalcomponent *comp)
{
ECalBackendExchangeComponent *ecomp;
gboolean is_instance;
@@ -812,7 +842,7 @@ e_cal_backend_exchange_add_object (ECalBackendExchange *cbex,
static void
discard_detached_instance (ECalBackendExchangeComponent *ecomp,
- struct icaltimetype rid)
+ struct icaltimetype rid)
{
GList *inst;
struct icaltimetype inst_rid;
@@ -845,9 +875,9 @@ discard_detached_instance (ECalBackendExchangeComponent *ecomp,
**/
gboolean
e_cal_backend_exchange_modify_object (ECalBackendExchange *cbex,
- icalcomponent *comp,
- CalObjModType mod,
- gboolean discard_detached)
+ icalcomponent *comp,
+ CalObjModType mod,
+ gboolean discard_detached)
{
ECalBackendExchangeComponent *ecomp;
const gchar *uid;
@@ -896,7 +926,8 @@ e_cal_backend_exchange_modify_object (ECalBackendExchange *cbex,
* Return value: %TRUE on success, %FALSE if @comp was not found.
**/
gboolean
-e_cal_backend_exchange_remove_object (ECalBackendExchange *cbex, const gchar *uid)
+e_cal_backend_exchange_remove_object (ECalBackendExchange *cbex,
+ const gchar *uid)
{
d(printf("ecbe_remove_object(%p, %s)\n", cbex, uid));
@@ -910,8 +941,13 @@ e_cal_backend_exchange_remove_object (ECalBackendExchange *cbex, const gchar *ui
}
static void
-discard_alarm (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar *uid, const gchar *rid, const gchar *auid, GError **perror)
+discard_alarm (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *uid,
+ const gchar *rid,
+ const gchar *auid,
+ GError **perror)
{
/* To be called from the Calendar derived class */
g_propagate_error (perror, EDC_ERROR (NotSupported));
@@ -919,16 +955,27 @@ discard_alarm (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellabl
/*To be overriden by Calendar and Task classes*/
static void
-create_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar *calobj, gchar **uid, gchar **new_object, GError **perror)
+create_object (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *calobj,
+ gchar **uid,
+ gchar **new_object,
+ GError **perror)
{
g_propagate_error (perror, EDC_ERROR (NotSupported));
}
/*To be overriden by Calendar and Task classes*/
static void
-modify_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar * calobj, CalObjModType mod, gchar **old_object, gchar **new_object, GError **perror)
+modify_object (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *calobj,
+ CalObjModType mod,
+ gchar **old_object,
+ gchar **new_object,
+ GError **perror)
{
g_propagate_error (perror, EDC_ERROR (NotSupported));
}
@@ -946,7 +993,8 @@ e_cal_backend_exchange_cache_unlock (ECalBackendExchange *cbex)
}
ECalBackendExchangeComponent *
-get_exchange_comp (ECalBackendExchange *cbex, const gchar *uid)
+get_exchange_comp (ECalBackendExchange *cbex,
+ const gchar *uid)
{
ECalBackendExchangeComponent *ecomp;
@@ -961,7 +1009,8 @@ get_exchange_comp (ECalBackendExchange *cbex, const gchar *uid)
}
static void
-add_instances_to_vcal (gpointer value, gpointer user_data)
+add_instances_to_vcal (gpointer value,
+ gpointer user_data)
{
icalcomponent *recurrence = value;
icalcomponent *vcalendar = user_data;
@@ -973,8 +1022,13 @@ add_instances_to_vcal (gpointer value, gpointer user_data)
}
static void
-get_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar *uid, const gchar *rid, gchar **object, GError **error)
+get_object (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *uid,
+ const gchar *rid,
+ gchar **object,
+ GError **error)
{
ECalBackendExchange *cbex = E_CAL_BACKEND_EXCHANGE (backend);
ECalBackendExchangeComponent *ecomp;
@@ -1066,8 +1120,9 @@ get_object (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
gboolean
e_cal_backend_exchange_extract_components (const gchar *calobj,
- icalproperty_method *method,
- GList **comp_list, GError **perror)
+ icalproperty_method *method,
+ GList **comp_list,
+ GError **perror)
{
icalcomponent *icalcomp, *comp = NULL;
icalcomponent *subcomp;
@@ -1131,9 +1186,13 @@ e_cal_backend_exchange_extract_components (const gchar *calobj,
}
static void
-send_objects (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar *calobj,
- GSList **users, gchar **modified_calobj, GError **perror)
+send_objects (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *calobj,
+ GSList **users,
+ gchar **modified_calobj,
+ GError **perror)
{
d(printf("ecbe_send_objects(%p, %p, %s)\n", backend, cal, calobj));
@@ -1149,7 +1208,8 @@ typedef struct {
} MatchObjectData;
static void
-match_recurrence_sexp (gpointer data, gpointer user_data)
+match_recurrence_sexp (gpointer data,
+ gpointer user_data)
{
icalcomponent *icomp = data;
MatchObjectData *match_data = user_data;
@@ -1174,16 +1234,18 @@ match_recurrence_sexp (gpointer data, gpointer user_data)
}
static void
-match_object_sexp (gpointer key, gpointer value, gpointer data)
+match_object_sexp (gpointer key,
+ gpointer value,
+ gpointer data)
{
ECalBackendExchangeComponent *ecomp = value;
MatchObjectData *match_data = data;
ECalComponent *comp;
/*
- In case of detached instances with no master object,
- ecomp->icomp will be NULL and hence should be skipped
- from matching.
+ * In case of detached instances with no master object,
+ * ecomp->icomp will be NULL and hence should be skipped
+ * from matching.
*/
if (!ecomp || !match_data)
return;
@@ -1207,8 +1269,12 @@ match_object_sexp (gpointer key, gpointer value, gpointer data)
}
static void
-get_object_list (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar *sexp, GSList **objects, GError **perror)
+get_object_list (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *sexp,
+ GSList **objects,
+ GError **perror)
{
ECalBackendExchange *cbex;
@@ -1243,7 +1309,8 @@ get_object_list (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancella
void
e_cal_backend_exchange_add_timezone (ECalBackendExchange *cbex,
- icalcomponent *vtzcomp, GError **perror)
+ icalcomponent *vtzcomp,
+ GError **perror)
{
icalproperty *prop;
icaltimezone *zone;
@@ -1274,8 +1341,11 @@ e_cal_backend_exchange_add_timezone (ECalBackendExchange *cbex,
}
static void
-add_timezone (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const gchar *tzobj, GError **perror)
+add_timezone (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const gchar *tzobj,
+ GError **perror)
{
ECalBackendExchange *cbex = E_CAL_BACKEND_EXCHANGE (backend);
icalcomponent *vtzcomp;
@@ -1307,7 +1377,8 @@ add_timezone (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable
}
static void
-start_view (ECalBackend *backend, EDataCalView *view)
+start_view (ECalBackend *backend,
+ EDataCalView *view)
{
const gchar *sexp = NULL;
GSList *objects = NULL;
@@ -1340,7 +1411,8 @@ start_view (ECalBackend *backend, EDataCalView *view)
}
static void
-set_online (ECalBackend *backend, gboolean is_online)
+set_online (ECalBackend *backend,
+ gboolean is_online)
{
ECalBackendExchange *cbex;
ECalBackendExchangePrivate *priv;
@@ -1368,9 +1440,14 @@ set_online (ECalBackend *backend, gboolean is_online)
}
static void
-get_freebusy (ECalBackendSync *backend, EDataCal *cal, GCancellable *cancellable,
- const GSList *users, time_t start, time_t end, GSList **freebusyobjs,
- GError **perror)
+get_freebusy (ECalBackendSync *backend,
+ EDataCal *cal,
+ GCancellable *cancellable,
+ const GSList *users,
+ time_t start,
+ time_t end,
+ GSList **freebusyobjs,
+ GError **perror)
{
d(printf("ecbe_get_free_busy(%p, %p)\n", backend, cal));
@@ -1409,8 +1486,10 @@ e_cal_backend_exchange_lf_to_crlf (const gchar *in)
}
void
-e_cal_backend_exchange_get_from (ECalBackendSync *backend, ECalComponent *comp,
- gchar **name, gchar **email)
+e_cal_backend_exchange_get_from (ECalBackendSync *backend,
+ ECalComponent *comp,
+ gchar **name,
+ gchar **email)
{
ECalComponentOrganizer org;
@@ -1427,8 +1506,10 @@ e_cal_backend_exchange_get_from (ECalBackendSync *backend, ECalComponent *comp,
}
void
-e_cal_backend_exchange_get_sender (ECalBackendSync *backend, ECalComponent *comp,
- gchar **name, gchar **email)
+e_cal_backend_exchange_get_sender (ECalBackendSync *backend,
+ ECalComponent *comp,
+ gchar **name,
+ gchar **email)
{
ECalBackendExchange *cbex;
@@ -1472,7 +1553,8 @@ e_cal_backend_exchange_make_timestamp_rfc822 (time_t when)
}
gchar *
-e_cal_backend_exchange_get_from_string (ECalBackendSync *backend, ECalComponent *comp)
+e_cal_backend_exchange_get_from_string (ECalBackendSync *backend,
+ ECalComponent *comp)
{
gchar *name = NULL, *addr = NULL, *from_string = NULL;
@@ -1484,7 +1566,8 @@ e_cal_backend_exchange_get_from_string (ECalBackendSync *backend, ECalComponent
}
gchar *
-e_cal_backend_exchange_get_sender_string (ECalBackendSync *backend, ECalComponent *comp)
+e_cal_backend_exchange_get_sender_string (ECalBackendSync *backend,
+ ECalComponent *comp)
{
gchar *name = NULL, *addr = NULL, *sender_string = NULL;
@@ -1517,7 +1600,9 @@ e_cal_backend_exchange_get_owner_name (ECalBackendSync *backend)
/* Attachments */
static gchar *
-save_attach_file (const gchar *dest_file, gchar *file_contents, gint len)
+save_attach_file (const gchar *dest_file,
+ gchar *file_contents,
+ gint len)
{
gchar *dest_url = NULL;
gint fd;
@@ -1558,8 +1643,10 @@ end :
}
GSList *
-get_attachment (ECalBackendExchange *cbex, const gchar *uid,
- const gchar *body, gint len)
+get_attachment (ECalBackendExchange *cbex,
+ const gchar *uid,
+ const gchar *body,
+ gint len)
{
CamelStream *stream;
CamelMimeMessage *msg;
@@ -1615,7 +1702,8 @@ get_attachment (ECalBackendExchange *cbex, const gchar *uid,
}
static gchar *
-get_attach_file_contents (const gchar *filename, gint *length)
+get_attach_file_contents (const gchar *filename,
+ gint *length)
{
gint fd, len = 0;
struct stat sb;
@@ -1651,7 +1739,10 @@ end :
}
void
-process_delegated_cal_object (icalcomponent *icalcomp, const gchar *delegator_name, const gchar *delegator_email, const gchar *delegatee_email)
+process_delegated_cal_object (icalcomponent *icalcomp,
+ const gchar *delegator_name,
+ const gchar *delegator_email,
+ const gchar *delegatee_email)
{
icalproperty *prop = NULL;
@@ -1663,7 +1754,7 @@ process_delegated_cal_object (icalcomponent *icalcomp, const gchar *delegator_na
organizer = icalproperty_get_value_as_string_r (prop);
if (organizer) {
if (!g_ascii_strncasecmp (organizer, "mailto:", 7))
- text = g_strdup (organizer+7);
+ text = g_strdup (organizer + 7);
text = g_strstrip (text);
if (text && (!g_ascii_strcasecmp (delegatee_email, text) || !g_ascii_strcasecmp (delegator_email, text))) {
@@ -1690,7 +1781,7 @@ process_delegated_cal_object (icalcomponent *icalcomp, const gchar *delegator_na
continue;
if (!g_ascii_strncasecmp (attendee, "mailto:", 7))
- text = g_strdup (attendee+7);
+ text = g_strdup (attendee + 7);
text = g_strstrip (text);
if (text && !g_ascii_strcasecmp (delegator_email, text)) {
@@ -1734,7 +1825,8 @@ get_mime_type (const gchar *uri)
/* copies attachments to the backend's attachment store and returns new list of attachment URLs */
GSList *
-receive_attachments (ECalBackendExchange *cbex, ECalComponent *comp)
+receive_attachments (ECalBackendExchange *cbex,
+ ECalComponent *comp)
{
GSList *attach_urls = NULL;
GSList *l, *attach_list = NULL;
@@ -1804,7 +1896,10 @@ receive_attachments (ECalBackendExchange *cbex, ECalComponent *comp)
}
gchar *
-build_msg ( ECalBackendExchange *cbex, ECalComponent *comp, const gchar *subject, gchar **boundary)
+build_msg (ECalBackendExchange *cbex,
+ ECalComponent *comp,
+ const gchar *subject,
+ gchar **boundary)
{
CamelMimeMessage *msg;
CamelMimePart *mime_part;
@@ -1864,7 +1959,7 @@ build_msg ( ECalBackendExchange *cbex, ECalComponent *comp, const gchar *subject
*/
continue;
}
- mime_filename = g_strdup (filename+1);
+ mime_filename = g_strdup (filename + 1);
attach_file = g_strdup_printf ("%s/%s-%s", cbex->priv->local_attachment_store, uid, filename);
}
@@ -1940,7 +2035,8 @@ build_msg ( ECalBackendExchange *cbex, ECalComponent *comp, const gchar *subject
}
static icaltimezone *
-internal_get_timezone (ECalBackend *backend, const gchar *tzid)
+internal_get_timezone (ECalBackend *backend,
+ const gchar *tzid)
{
ECalBackendExchange *cbex = E_CAL_BACKEND_EXCHANGE (backend);
icaltimezone *zone;
@@ -1960,14 +2056,14 @@ internal_get_timezone (ECalBackend *backend, const gchar *tzid)
icaltimezone *
e_cal_backend_exchange_lookup_timezone (const gchar *tzid,
- gconstpointer custom,
- GCancellable *cancellable,
- GError **error)
+ gconstpointer custom,
+ GCancellable *cancellable,
+ GError **error)
{
icaltimezone *zone = internal_get_timezone (E_CAL_BACKEND ((ECalBackendExchange *) custom), tzid);
/* The UTC timezone is a fallback, which is not supposed
- to be returned in call of e_cal_check_timezones, thus skip it */
+ * to be returned in call of e_cal_check_timezones, thus skip it */
if (zone && zone == icaltimezone_get_utc_timezone ())
zone = NULL;
diff --git a/calendar/e2k-cal-query.c b/calendar/e2k-cal-query.c
index 80b3bf2..0aa5925 100644
--- a/calendar/e2k-cal-query.c
+++ b/calendar/e2k-cal-query.c
@@ -33,7 +33,9 @@
/* E-Sexp functions */
static E2kRestriction **
-rns_array (ESExp *esexp, gint argc, ESExpResult **argv)
+rns_array (ESExp *esexp,
+ gint argc,
+ ESExpResult **argv)
{
E2kRestriction **rns;
gint i;
@@ -55,7 +57,10 @@ rns_array (ESExp *esexp, gint argc, ESExpResult **argv)
}
static ESExpResult *
-func_and (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data)
+func_and (ESExp *esexp,
+ gint argc,
+ ESExpResult **argv,
+ gpointer data)
{
ESExpResult *result;
E2kRestriction **rns;
@@ -71,7 +76,10 @@ func_and (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data)
}
static ESExpResult *
-func_or (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data)
+func_or (ESExp *esexp,
+ gint argc,
+ ESExpResult **argv,
+ gpointer data)
{
ESExpResult *result;
E2kRestriction **rns;
@@ -87,7 +95,10 @@ func_or (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data)
}
static ESExpResult *
-func_not (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data)
+func_not (ESExp *esexp,
+ gint argc,
+ ESExpResult **argv,
+ gpointer data)
{
ESExpResult *result;
@@ -113,7 +124,10 @@ func_not (ESExp *esexp, gint argc, ESExpResult **argv, gpointer data)
* specified time range.
*/
static ESExpResult *
-func_occur_in_time_range (ESExp *esexp, gint argc, ESExpResult **argv, gpointer user_data)
+func_occur_in_time_range (ESExp *esexp,
+ gint argc,
+ ESExpResult **argv,
+ gpointer user_data)
{
ECalBackend *backend = user_data;
gchar *start, *end;
@@ -185,7 +199,10 @@ func_occur_in_time_range (ESExp *esexp, gint argc, ESExpResult **argv, gpointer
* specified string.
*/
static ESExpResult *
-func_contains (ESExp *esexp, gint argc, ESExpResult **argv, gpointer user_data)
+func_contains (ESExp *esexp,
+ gint argc,
+ ESExpResult **argv,
+ gpointer user_data)
{
ESExpResult *result;
E2kRestriction *rn;
@@ -250,7 +267,10 @@ func_contains (ESExp *esexp, gint argc, ESExpResult **argv, gpointer user_data)
* Returns: a boolean indicating whether the component has alarms or not.
*/
static ESExpResult *
-func_has_alarms (ESExp *esexp, gint argc, ESExpResult **argv, gpointer user_data)
+func_has_alarms (ESExp *esexp,
+ gint argc,
+ ESExpResult **argv,
+ gpointer user_data)
{
ESExpResult *result;
@@ -278,7 +298,10 @@ func_has_alarms (ESExp *esexp, gint argc, ESExpResult **argv, gpointer user_data
* categories.
*/
static ESExpResult *
-func_has_categories (ESExp *esexp, gint argc, ESExpResult **argv, gpointer user_data)
+func_has_categories (ESExp *esexp,
+ gint argc,
+ ESExpResult **argv,
+ gpointer user_data)
{
ESExpResult *result;
@@ -295,7 +318,10 @@ func_has_categories (ESExp *esexp, gint argc, ESExpResult **argv, gpointer user_
* a COMPLETED property. This is really only useful for TODO components.
*/
static ESExpResult *
-func_is_completed (ESExp *esexp, gint argc, ESExpResult **argv, gpointer user_data)
+func_is_completed (ESExp *esexp,
+ gint argc,
+ ESExpResult **argv,
+ gpointer user_data)
{
ECalBackend *backend = user_data;
ESExpResult *result;
@@ -327,7 +353,10 @@ func_is_completed (ESExp *esexp, gint argc, ESExpResult **argv, gpointer user_da
* This is really only useful for TODO components.
*/
static ESExpResult *
-func_completed_before (ESExp *esexp, gint argc, ESExpResult **argv, gpointer user_data)
+func_completed_before (ESExp *esexp,
+ gint argc,
+ ESExpResult **argv,
+ gpointer user_data)
{
ECalBackend *backend = user_data;
ESExpResult *result;
@@ -387,7 +416,7 @@ static struct {
E2kRestriction *
e2k_cal_query_to_restriction (ECalBackendExchange *cbex,
- const gchar *sexp)
+ const gchar *sexp)
{
E2kRestriction *rn;
ESExp *esexp;
diff --git a/camel/camel-exchange-folder.c b/camel/camel-exchange-folder.c
index 4a74d2a..d9db9e4 100644
--- a/camel/camel-exchange-folder.c
+++ b/camel/camel-exchange-folder.c
@@ -448,11 +448,11 @@ exchange_folder_append_message_sync (CamelFolder *folder,
store = CAMEL_EXCHANGE_STORE (parent_store);
/*
- FIXME: We should add a top-level camel API camel_mime_message_prune_invalid_chars
- which each of the provider will have to implement to remove things
- that are invalid for their Transport mechanism. This will help in
- avoiding duplication of work. Now Sending and Importing both requires
- substitution of \t and \n with blank.
+ * FIXME: We should add a top-level camel API camel_mime_message_prune_invalid_chars
+ * which each of the provider will have to implement to remove things
+ * that are invalid for their Transport mechanism. This will help in
+ * avoiding duplication of work. Now Sending and Importing both requires
+ * substitution of \t and \n with blank.
*/
old_subject = g_strdup (camel_mime_message_get_subject (message));
@@ -811,7 +811,8 @@ camel_exchange_folder_init (CamelExchangeFolder *exchange_folder)
* base64 representation of this value.
*/
static CamelSummaryMessageID *
-find_parent (CamelExchangeFolder *exch, const gchar *thread_index)
+find_parent (CamelExchangeFolder *exch,
+ const gchar *thread_index)
{
CamelSummaryMessageID *msgid;
guchar *decoded;
@@ -847,9 +848,11 @@ find_parent (CamelExchangeFolder *exch, const gchar *thread_index)
**/
void
camel_exchange_folder_add_message (CamelExchangeFolder *exch,
- const gchar *uid, guint32 flags,
- guint32 size, const gchar *headers,
- const gchar *href)
+ const gchar *uid,
+ guint32 flags,
+ guint32 size,
+ const gchar *headers,
+ const gchar *href)
{
CamelFolder *folder = CAMEL_FOLDER (exch);
CamelMessageInfo *info;
@@ -919,7 +922,7 @@ camel_exchange_folder_add_message (CamelExchangeFolder *exch,
**/
void
camel_exchange_folder_remove_message (CamelExchangeFolder *exch,
- const gchar *uid)
+ const gchar *uid)
{
CamelFolderSummary *summary = CAMEL_FOLDER (exch)->summary;
CamelFolderChangeInfo *changes;
@@ -961,7 +964,7 @@ camel_exchange_folder_remove_message (CamelExchangeFolder *exch,
**/
void
camel_exchange_folder_uncache_message (CamelExchangeFolder *exch,
- const gchar *uid)
+ const gchar *uid)
{
camel_data_cache_remove (exch->cache, "cache", uid, NULL);
}
@@ -977,7 +980,8 @@ camel_exchange_folder_uncache_message (CamelExchangeFolder *exch,
**/
void
camel_exchange_folder_update_message_flags (CamelExchangeFolder *exch,
- const gchar *uid, guint32 flags)
+ const gchar *uid,
+ guint32 flags)
{
CamelFolder *folder = CAMEL_FOLDER (exch);
CamelMessageInfoBase *info;
@@ -1013,8 +1017,9 @@ camel_exchange_folder_update_message_flags (CamelExchangeFolder *exch,
**/
void
camel_exchange_folder_update_message_flags_ex (CamelExchangeFolder *exch,
- const gchar *uid, guint32 flags,
- guint32 mask)
+ const gchar *uid,
+ guint32 flags,
+ guint32 mask)
{
CamelFolder *folder = CAMEL_FOLDER (exch);
CamelMessageInfoBase *info;
@@ -1054,9 +1059,9 @@ camel_exchange_folder_update_message_flags_ex (CamelExchangeFolder *exch,
**/
void
camel_exchange_folder_update_message_tag (CamelExchangeFolder *exch,
- const gchar *uid,
- const gchar *name,
- const gchar *value)
+ const gchar *uid,
+ const gchar *name,
+ const gchar *value)
{
CamelFolder *folder = CAMEL_FOLDER (exch);
CamelMessageInfoBase *info;
diff --git a/camel/camel-exchange-journal.c b/camel/camel-exchange-journal.c
index e76380d..06e0196 100644
--- a/camel/camel-exchange-journal.c
+++ b/camel/camel-exchange-journal.c
@@ -391,7 +391,8 @@ camel_exchange_journal_init (CamelExchangeJournal *journal)
}
CamelOfflineJournal *
-camel_exchange_journal_new (CamelExchangeFolder *folder, const gchar *filename)
+camel_exchange_journal_new (CamelExchangeFolder *folder,
+ const gchar *filename)
{
CamelOfflineJournal *journal;
diff --git a/camel/camel-exchange-provider.c b/camel/camel-exchange-provider.c
index 3e13656..bce5e4a 100644
--- a/camel/camel-exchange-provider.c
+++ b/camel/camel-exchange-provider.c
@@ -225,7 +225,8 @@ exchange_url_hash (gconstpointer key)
}
static gboolean
-check_equal (const gchar *s1, const gchar *s2)
+check_equal (const gchar *s1,
+ const gchar *s2)
{
if (!s1)
return s2 == NULL;
@@ -236,7 +237,8 @@ check_equal (const gchar *s1, const gchar *s2)
}
static gint
-exchange_url_equal (gconstpointer a, gconstpointer b)
+exchange_url_equal (gconstpointer a,
+ gconstpointer b)
{
const CamelURL *u1 = a, *u2 = b;
diff --git a/camel/camel-exchange-search.c b/camel/camel-exchange-search.c
index a8636b5..d6cf4df 100644
--- a/camel/camel-exchange-search.c
+++ b/camel/camel-exchange-search.c
@@ -104,8 +104,8 @@ exchange_search_body_contains (struct _ESExp *f,
}
/* if we need to setup a hash of summary items, this way we get
- access to the summary memory which is locked for the duration of
- the search, and wont vanish on us */
+ * access to the summary memory which is locked for the duration of
+ * the search, and wont vanish on us */
if (uid_hash == NULL) {
gint i;
@@ -117,7 +117,7 @@ exchange_search_body_contains (struct _ESExp *f,
}
for (i = 0; i < found_uids->len; i++) {
- if (g_hash_table_lookup_extended (uid_hash, found_uids->pdata[i], (gpointer)&real_uid, (gpointer)&info))
+ if (g_hash_table_lookup_extended (uid_hash, found_uids->pdata[i], (gpointer) &real_uid, (gpointer) &info))
g_ptr_array_add (r->value.ptrarray, real_uid);
g_free (found_uids->pdata[i]);
}
diff --git a/camel/camel-exchange-store.c b/camel/camel-exchange-store.c
index 434ec29..3595c81 100644
--- a/camel/camel-exchange-store.c
+++ b/camel/camel-exchange-store.c
@@ -42,7 +42,7 @@
#define EXCHANGE_STOREINFO_VERSION 1
/* Even if we are disconnected, we need to exchange_store_connect()
- to get the offline data */
+ * to get the offline data */
#define RETURN_VAL_IF_NOT_CONNECTED(store, cancellable, ex, val)\
if (!camel_exchange_store_connected (store, cancellable, NULL) && \
!exchange_store_connect_sync (CAMEL_SERVICE (store), cancellable, ex)) \
@@ -86,16 +86,16 @@ make_folder_info (CamelExchangeStore *exch,
info->display_name = display_name;
/* Process the full-path and decode if required */
- temp = strrchr (path+2, '/');
+ temp = strrchr (path + 2, '/');
if (temp) {
/* info->full_name should not have encoded path */
- info->full_name = camel_url_decode_path (path+2);
+ info->full_name = camel_url_decode_path (path + 2);
} else {
/* If there are no sub-directories, decoded(name) will be
- equal to that of path+2.
- Ex: personal
+ * equal to that of path+2.
+ * Ex: personal
*/
- info->full_name = g_strdup (path+2);
+ info->full_name = g_strdup (path + 2);
}
info->unread = unread_count;
@@ -836,7 +836,7 @@ camel_exchange_store_init (CamelExchangeStore *exch)
}
/* Use this to ensure that the camel session is online and we are connected
- too. Also returns the current status of the store */
+ * too. Also returns the current status of the store */
gboolean
camel_exchange_store_connected (CamelExchangeStore *store,
GCancellable *cancellable,
@@ -862,7 +862,9 @@ camel_exchange_store_connected (CamelExchangeStore *store,
}
void
-camel_exchange_store_folder_created (CamelExchangeStore *estore, const gchar *name, const gchar *uri)
+camel_exchange_store_folder_created (CamelExchangeStore *estore,
+ const gchar *name,
+ const gchar *uri)
{
CamelFolderInfo *info;
@@ -878,7 +880,9 @@ camel_exchange_store_folder_created (CamelExchangeStore *estore, const gchar *na
}
void
-camel_exchange_store_folder_deleted (CamelExchangeStore *estore, const gchar *name, const gchar *uri)
+camel_exchange_store_folder_deleted (CamelExchangeStore *estore,
+ const gchar *name,
+ const gchar *uri)
{
CamelFolderInfo *info;
CamelFolder *folder;
diff --git a/camel/camel-exchange-summary.c b/camel/camel-exchange-summary.c
index de8ddd9..4005546 100644
--- a/camel/camel-exchange-summary.c
+++ b/camel/camel-exchange-summary.c
@@ -103,7 +103,7 @@ exchange_summary_header_load (CamelFolderSummary *summary,
return -1;
/* Old summary file - We need to migrate. Migration automagically happens when
- camel_folder_summary_save is called
+ * camel_folder_summary_save is called
*/
if (camel_file_util_decode_uint32 (in, &high_article_num) == -1) {
if (version > CAMEL_EXCHANGE_SUMMARY_VERSION)
@@ -111,7 +111,7 @@ exchange_summary_header_load (CamelFolderSummary *summary,
}
/* During migration we will not have high_article_num stored in the summary and
- essentially we will end up computing it atleast once.
+ * essentially we will end up computing it atleast once.
*/
exchange->readonly = readonly;
exchange->high_article_num = high_article_num;
@@ -174,7 +174,7 @@ exchange_summary_message_info_migrate (CamelFolderSummary *summary,
g_free (thread_index);
/* Old summary file - We need to migrate. Migration automagically happens when
- camel_folder_summary_save is called
+ * camel_folder_summary_save is called
*/
if (camel_file_util_decode_string (in, &href) == -1) {
if (CAMEL_EXCHANGE_SUMMARY (summary)->version > CAMEL_EXCHANGE_SUMMARY_VERSION)
@@ -437,7 +437,8 @@ camel_exchange_summary_init (CamelExchangeSummary *summary)
* Return value: the summary object.
**/
CamelFolderSummary *
-camel_exchange_summary_new (struct _CamelFolder *folder, const gchar *filename)
+camel_exchange_summary_new (struct _CamelFolder *folder,
+ const gchar *filename)
{
CamelFolderSummary *summary;
GError *local_error = NULL;
@@ -485,7 +486,7 @@ camel_exchange_summary_get_readonly (CamelFolderSummary *summary)
**/
void
camel_exchange_summary_set_readonly (CamelFolderSummary *summary,
- gboolean readonly)
+ gboolean readonly)
{
CamelExchangeSummary *es;
@@ -522,7 +523,7 @@ camel_exchange_summary_get_article_num (CamelFolderSummary *summary)
**/
void
camel_exchange_summary_set_article_num (CamelFolderSummary *summary,
- guint32 article_num)
+ guint32 article_num)
{
CamelExchangeSummary *es;
@@ -546,9 +547,9 @@ camel_exchange_summary_set_article_num (CamelFolderSummary *summary,
**/
void
camel_exchange_summary_add_offline (CamelFolderSummary *summary,
- const gchar *uid,
- CamelMimeMessage *message,
- CamelMessageInfo *info)
+ const gchar *uid,
+ CamelMimeMessage *message,
+ CamelMessageInfo *info)
{
CamelMessageInfoBase *mi;
const CamelFlag *flag;
@@ -587,8 +588,8 @@ camel_exchange_summary_add_offline (CamelFolderSummary *summary,
**/
void
camel_exchange_summary_add_offline_uncached (CamelFolderSummary *summary,
- const gchar *uid,
- CamelMessageInfo *info)
+ const gchar *uid,
+ CamelMessageInfo *info)
{
CamelMessageInfo *mi;
diff --git a/camel/camel-exchange-utils.c b/camel/camel-exchange-utils.c
index 3b6b4a7..47f91a3 100644
--- a/camel/camel-exchange-utils.c
+++ b/camel/camel-exchange-utils.c
@@ -163,7 +163,8 @@ static void free_folder (gpointer value);
G_LOCK_DEFINE_STATIC (edies);
static void
-estore_gone_cb (gpointer edies_ptr, GObject *gone_eservice)
+estore_gone_cb (gpointer edies_ptr,
+ GObject *gone_eservice)
{
GSList **edies_lst_ptr = edies_ptr, *l;
@@ -250,7 +251,8 @@ is_online (ExchangeData *ed)
}
static void
-set_exception (GError **error, const gchar *err)
+set_exception (GError **error,
+ const gchar *err)
{
g_return_if_fail (err != NULL);
@@ -282,7 +284,8 @@ folder_changed (ExchangeFolder *mfld)
}
static gint
-find_message_index (ExchangeFolder *mfld, gint seq)
+find_message_index (ExchangeFolder *mfld,
+ gint seq)
{
ExchangeMessage *mmsg;
gint low, high, mid;
@@ -305,19 +308,24 @@ find_message_index (ExchangeFolder *mfld, gint seq)
}
static inline ExchangeMessage *
-find_message (ExchangeFolder *mfld, const gchar *uid)
+find_message (ExchangeFolder *mfld,
+ const gchar *uid)
{
return g_hash_table_lookup (mfld->messages_by_uid, uid);
}
static inline ExchangeMessage *
-find_message_by_href (ExchangeFolder *mfld, const gchar *href)
+find_message_by_href (ExchangeFolder *mfld,
+ const gchar *href)
{
return g_hash_table_lookup (mfld->messages_by_href, href);
}
static ExchangeMessage *
-new_message (const gchar *uid, const gchar *uri, guint32 seq, guint32 flags)
+new_message (const gchar *uid,
+ const gchar *uri,
+ guint32 seq,
+ guint32 flags)
{
ExchangeMessage *mmsg;
@@ -331,7 +339,9 @@ new_message (const gchar *uid, const gchar *uri, guint32 seq, guint32 flags)
}
static void
-message_remove_at_index (ExchangeFolder *mfld, CamelFolder *folder, gint index)
+message_remove_at_index (ExchangeFolder *mfld,
+ CamelFolder *folder,
+ gint index)
{
ExchangeMessage *mmsg;
CamelMessageInfo *info;
@@ -376,7 +386,9 @@ message_remove_at_index (ExchangeFolder *mfld, CamelFolder *folder, gint index)
}
static void
-message_removed (ExchangeFolder *mfld, CamelFolder *folder, const gchar *href)
+message_removed (ExchangeFolder *mfld,
+ CamelFolder *folder,
+ const gchar *href)
{
ExchangeMessage *mmsg;
guint index;
@@ -419,7 +431,8 @@ struct refresh_message {
};
static gint
-refresh_message_compar (gconstpointer a, gconstpointer b)
+refresh_message_compar (gconstpointer a,
+ gconstpointer b)
{
const struct refresh_message *rma = a, *rmb = b;
@@ -427,7 +440,10 @@ refresh_message_compar (gconstpointer a, gconstpointer b)
}
static void
-change_flags (ExchangeFolder *mfld, CamelFolder *folder, ExchangeMessage *mmsg, guint32 new_flags)
+change_flags (ExchangeFolder *mfld,
+ CamelFolder *folder,
+ ExchangeMessage *mmsg,
+ guint32 new_flags)
{
if ((mmsg->flags ^ new_flags) & CAMEL_MESSAGE_SEEN) {
if (mmsg->flags & CAMEL_MESSAGE_SEEN)
@@ -784,7 +800,7 @@ sync_deletions (ExchangeFolder *mfld)
mmsg = find_message_by_href (mfld, result->href);
if (!mmsg) {
/* oops, message from the server not found in our list;
- return failure to possibly do full resync again? */
+ * return failure to possibly do full resync again? */
g_message ("%s: Oops, message %s not found in %s", G_STRFUNC, result->href, mfld->name);
continue;
}
@@ -819,7 +835,8 @@ sync_deletions (ExchangeFolder *mfld)
}
static void
-storage_folder_changed (EFolder *folder, gpointer user_data)
+storage_folder_changed (EFolder *folder,
+ gpointer user_data)
{
ExchangeFolder *mfld = user_data;
@@ -867,7 +884,9 @@ free_folder (gpointer value)
}
static void
-got_folder_error (ExchangeFolder *mfld, GError **error, const gchar *err)
+got_folder_error (ExchangeFolder *mfld,
+ GError **error,
+ const gchar *err)
{
set_exception (error, err);
@@ -881,7 +900,9 @@ got_folder_error (ExchangeFolder *mfld, GError **error, const gchar *err)
}
static void
-mfld_get_folder_online_sync_updates (gpointer key, gpointer value, gpointer user_data)
+mfld_get_folder_online_sync_updates (gpointer key,
+ gpointer value,
+ gpointer user_data)
{
guint index, seq, i;
ExchangeFolder *mfld = (ExchangeFolder *) user_data;
@@ -893,7 +914,7 @@ mfld_get_folder_online_sync_updates (gpointer key, gpointer value, gpointer user
g_static_rec_mutex_lock (&mfld->ed->changed_msgs_mutex);
/* Camel DB Summary changes are not fetching all the messages at start-up.
- Use this else it would crash badly.
+ * Use this else it would crash badly.
*/
if (index >= mfld->messages->len) {
g_static_rec_mutex_unlock (&mfld->ed->changed_msgs_mutex);
@@ -920,7 +941,8 @@ mfld_get_folder_online_sync_updates (gpointer key, gpointer value, gpointer user
}
static gint
-exchange_message_uid_cmp (gconstpointer a, gconstpointer b)
+exchange_message_uid_cmp (gconstpointer a,
+ gconstpointer b)
{
ExchangeMessage **mmsg1, **mmsg2;
@@ -931,7 +953,8 @@ exchange_message_uid_cmp (gconstpointer a, gconstpointer b)
}
static gboolean
-get_folder_contents_online (ExchangeFolder *mfld, GError **error)
+get_folder_contents_online (ExchangeFolder *mfld,
+ GError **error)
{
static const gchar *open_folder_sync_props[] = {
E2K_PR_REPL_UID,
@@ -1020,7 +1043,7 @@ get_folder_contents_online (ExchangeFolder *mfld, GError **error)
g_ptr_array_remove_index (msgs_copy, m);
/* Put the index/uid as key/value in the rm_idx_uid hashtable.
- This hashtable will be used to sync with mfld->messages.
+ * 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));
@@ -1046,12 +1069,12 @@ get_folder_contents_online (ExchangeFolder *mfld, GError **error)
mmsg = mfld->messages->pdata[m];
/* Validate mmsg == mmsg_cpy - this may fail if user has deleted some messages,
- while we were updating in a separate thread.
+ * while we were updating in a separate thread.
*/
if (mmsg->seq != mmsg_cpy->seq) {
/* We don't want to scan all of mfld->messages, as some new messages
- would have got added to the array and hence restrict to the original
- array of messages that we loaded from summary.
+ * would have got added to the array and hence restrict to the original
+ * array of messages that we loaded from summary.
*/
for (i = 0; i < msgs_copy->len; i++) {
mmsg = mfld->messages->pdata[i];
@@ -1124,12 +1147,12 @@ get_folder_contents_online (ExchangeFolder *mfld, GError **error)
}
/* Discard remaining messages that no longer exist.
- Do not increment 'i', because the remove_index is decrementing array length. */
+ * Do not increment 'i', because the remove_index is decrementing array length. */
for (i = 0; i < msgs_copy->len;) {
mmsg_cpy = msgs_copy->pdata[i];
if (!mmsg_cpy->href) {
/* Put the index/uid as key/value in the rm_idx_uid hashtable.
- This hashtable will be used to sync with mfld->messages.
+ * 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));
@@ -1185,7 +1208,10 @@ timeout_sync_deletions (gpointer user_data)
}
static void
-notify_cb (E2kContext *ctx, const gchar *uri, E2kContextChangeType type, gpointer user_data)
+notify_cb (E2kContext *ctx,
+ const gchar *uri,
+ E2kContextChangeType type,
+ gpointer user_data)
{
ExchangeFolder *mfld = user_data;
time_t now;
@@ -1248,7 +1274,8 @@ notify_cb (E2kContext *ctx, const gchar *uri, E2kContextChangeType type, gpointe
}
static gboolean
-get_folder_online (ExchangeFolder *mfld, GError **error)
+get_folder_online (ExchangeFolder *mfld,
+ GError **error)
{
static const gchar *open_folder_props[] = {
PR_ACCESS,
@@ -1296,11 +1323,11 @@ get_folder_online (ExchangeFolder *mfld, GError **error)
mfld->deleted_count = atoi (prop);
/*
- TODO: Varadhan - June 16, 2007 - Compare deleted_count with
- that of CamelFolder and appropriately sync mfld->messages.
- Also, sync flags and camel_flags of all messages - No reliable
- way to fetch only changed messages as Read/UnRead flags do not
- change the PR_LAST_MODIFICATION_TIME property of a message.
+ * TODO: Varadhan - June 16, 2007 - Compare deleted_count with
+ * that of CamelFolder and appropriately sync mfld->messages.
+ * Also, sync flags and camel_flags of all messages - No reliable
+ * way to fetch only changed messages as Read/UnRead flags do not
+ * change the PR_LAST_MODIFICATION_TIME property of a message.
*/
if (g_hash_table_size (mfld->messages_by_href) < 1) {
if (!get_folder_contents_online (mfld, error))
@@ -1330,7 +1357,10 @@ get_folder_online (ExchangeFolder *mfld, GError **error)
}
static ExchangeFolder *
-folder_from_name (ExchangeData *ed, const gchar *folder_name, guint32 perms, GError **error)
+folder_from_name (ExchangeData *ed,
+ const gchar *folder_name,
+ guint32 perms,
+ GError **error)
{
ExchangeFolder *mfld;
@@ -1367,7 +1397,9 @@ folder_from_name (ExchangeData *ed, const gchar *folder_name, guint32 perms, GEr
}
static void
-mark_one_read (E2kContext *ctx, const gchar *uri, gboolean read)
+mark_one_read (E2kContext *ctx,
+ const gchar *uri,
+ gboolean read)
{
E2kProperties *props;
E2kHTTPStatus status;
@@ -1382,7 +1414,9 @@ mark_one_read (E2kContext *ctx, const gchar *uri, gboolean read)
}
static void
-mark_read (EFolder *folder, GPtrArray *hrefs, gboolean read)
+mark_read (EFolder *folder,
+ GPtrArray *hrefs,
+ gboolean read)
{
E2kProperties *props;
E2kResultIter *iter;
@@ -1594,10 +1628,10 @@ process_flags (gpointer user_data)
deleted, TRUE);
} else {
/* This is for public folder hierarchy. We cannot move
- a mail item deleted from a public folder to the
- deleted items folder. This code updates the UI to
- show the mail folder again if the deletion fails in
- such public folder */
+ * a mail item deleted from a public folder to the
+ * deleted items folder. This code updates the UI to
+ * show the mail folder again if the deletion fails in
+ * such public folder */
iter = e_folder_exchange_bdelete_start (mfld->folder, NULL,
(const gchar **) deleted->pdata,
deleted->len);
@@ -1640,7 +1674,11 @@ process_flags (gpointer user_data)
}
static E2kHTTPStatus
-get_stickynote (E2kContext *ctx, E2kOperation *op, const gchar *uri, gchar **body, gint *len)
+get_stickynote (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *uri,
+ gchar **body,
+ gint *len)
{
static const gchar *stickynote_props[] = {
E2K_PR_MAILHEADER_SUBJECT,
@@ -1672,7 +1710,11 @@ get_stickynote (E2kContext *ctx, E2kOperation *op, const gchar *uri, gchar **bod
}
static E2kHTTPStatus
-build_message_from_document (E2kContext *ctx, E2kOperation *op, const gchar *uri, gchar **body, gint *len)
+build_message_from_document (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *uri,
+ gchar **body,
+ gint *len)
{
E2kHTTPStatus status;
E2kResult *results;
@@ -1702,7 +1744,11 @@ build_message_from_document (E2kContext *ctx, E2kOperation *op, const gchar *uri
}
static E2kHTTPStatus
-unmangle_delegated_meeting_request (ExchangeData *ed, E2kOperation *op, const gchar *uri, gchar **body, gint *len)
+unmangle_delegated_meeting_request (ExchangeData *ed,
+ E2kOperation *op,
+ const gchar *uri,
+ gchar **body,
+ gint *len)
{
const gchar *prop = PR_RCVD_REPRESENTING_EMAIL_ADDRESS;
GString *message;
@@ -1777,7 +1823,9 @@ unmangle_delegated_meeting_request (ExchangeData *ed, E2kOperation *op, const gc
}
static gboolean
-is_foreign_folder (ExchangeData *ed, const gchar *folder_name, gchar **owner_email)
+is_foreign_folder (ExchangeData *ed,
+ const gchar *folder_name,
+ gchar **owner_email)
{
EFolder *folder;
ExchangeHierarchy *hier;
@@ -1807,7 +1855,10 @@ is_foreign_folder (ExchangeData *ed, const gchar *folder_name, gchar **owner_ema
}
static E2kHTTPStatus
-unmangle_meeting_request_in_subscribed_inbox (ExchangeData *ed, const gchar *delegator_email, gchar **body, gint *len)
+unmangle_meeting_request_in_subscribed_inbox (ExchangeData *ed,
+ const gchar *delegator_email,
+ gchar **body,
+ gint *len)
{
GString *message;
gchar *delegator_uri, *delegator_folder_physical_uri = NULL;
@@ -1863,7 +1914,11 @@ unmangle_meeting_request_in_subscribed_inbox (ExchangeData *ed, const gchar *del
}
static E2kHTTPStatus
-unmangle_sender_field (ExchangeData *ed, E2kOperation *op, const gchar *uri, gchar **body, gint *len)
+unmangle_sender_field (ExchangeData *ed,
+ E2kOperation *op,
+ const gchar *uri,
+ gchar **body,
+ gint *len)
{
const gchar *props[] = { PR_SENT_REPRESENTING_EMAIL_ADDRESS, PR_SENDER_EMAIL_ADDRESS };
GString *message;
@@ -1950,7 +2005,9 @@ unmangle_sender_field (ExchangeData *ed, E2kOperation *op, const gchar *uri, gch
}
static void
-foreign_new_folder_cb (ExchangeAccount *account, EFolder *folder, GPtrArray *folders)
+foreign_new_folder_cb (ExchangeAccount *account,
+ EFolder *folder,
+ GPtrArray *folders)
{
g_return_if_fail (folder != NULL);
g_return_if_fail (folders != NULL);
@@ -1959,7 +2016,14 @@ foreign_new_folder_cb (ExchangeAccount *account, EFolder *folder, GPtrArray *fol
}
static void
-get_folder_info_data (ExchangeData *ed, const gchar *top, guint32 store_flags, GHashTable *known_uris, GPtrArray **names, GPtrArray **uris, GArray **unread, GArray **flags)
+get_folder_info_data (ExchangeData *ed,
+ const gchar *top,
+ guint32 store_flags,
+ GHashTable *known_uris,
+ GPtrArray **names,
+ GPtrArray **uris,
+ GArray **unread,
+ GArray **flags)
{
GPtrArray *folders = NULL;
ExchangeHierarchy *hier;
@@ -2059,7 +2123,7 @@ get_folder_info_data (ExchangeData *ed, const gchar *top, guint32 store_flags, G
switch (hier->type) {
case EXCHANGE_HIERARCHY_FAVORITES:
/* folder_flags will be set only if the type
- is noselect and we need to include it */
+ * is noselect and we need to include it */
if (strcmp (type, "mail") && !folder_flags)
continue;
/* selectable */
@@ -2074,8 +2138,8 @@ get_folder_info_data (ExchangeData *ed, const gchar *top, guint32 store_flags, G
case EXCHANGE_HIERARCHY_FOREIGN:
if ((folder_flags & CAMEL_FOLDER_NOSELECT) != 0 && ed->new_folder_id == 0) {
/* Rescan the hierarchy - as we don't rescan
- foreign hierarchies anywhere for mailer and
- only when we are starting up
+ * foreign hierarchies anywhere for mailer and
+ * only when we are starting up
*/
exchange_hierarchy_scan_subtree (hier, hier->toplevel, mode);
}
@@ -2153,7 +2217,9 @@ struct update_linestatus
};
static void
-folder_update_linestatus (gpointer key, gpointer value, gpointer data)
+folder_update_linestatus (gpointer key,
+ gpointer value,
+ gpointer data)
{
ExchangeFolder *mfld = (ExchangeFolder *) value;
struct update_linestatus *ul = (struct update_linestatus *) data;
@@ -2180,9 +2246,9 @@ folder_update_linestatus (gpointer key, gpointer value, gpointer data)
gboolean
camel_exchange_utils_connect (CamelService *service,
- const gchar *pwd,
- guint32 *status, /* out */
- GError **error)
+ const gchar *pwd,
+ guint32 *status, /* out */
+ GError **error)
{
ExchangeData *ed = get_data_for_service (service);
ExchangeAccount *account;
@@ -2232,7 +2298,7 @@ camel_exchange_utils_connect (CamelService *service,
ed->sent_items = exchange_account_get_folder (account, uri);
/* Will be used for offline->online transition to initialize things for
- the first time */
+ * the first time */
ul.estore = ed->estore;
ul.error = error;
@@ -2247,16 +2313,16 @@ camel_exchange_utils_connect (CamelService *service,
gboolean
camel_exchange_utils_get_folder (CamelService *service,
- const gchar *name,
- gboolean create,
- GPtrArray *uids,
- GByteArray *flags,
- GPtrArray *hrefs,
- guint32 high_article_num,
- guint32 *folder_flags, /* out */
- gchar **folder_uri, /* out */
- gboolean *readonly, /* out */
- GError **error)
+ const gchar *name,
+ gboolean create,
+ GPtrArray *uids,
+ GByteArray *flags,
+ GPtrArray *hrefs,
+ guint32 high_article_num,
+ guint32 *folder_flags, /* out */
+ gchar **folder_uri, /* out */
+ gboolean *readonly, /* out */
+ GError **error)
{
CamelSettings *settings;
ExchangeData *ed = get_data_for_service (service);
@@ -2377,8 +2443,8 @@ camel_exchange_utils_get_folder (CamelService *service,
gboolean
camel_exchange_utils_get_trash_name (CamelService *service,
- gchar **trash_name, /* out */
- GError **error)
+ gchar **trash_name, /* out */
+ GError **error)
{
ExchangeData *ed = get_data_for_service (service);
@@ -2418,10 +2484,10 @@ camel_exchange_utils_refresh_folder (CamelService *service,
gboolean
camel_exchange_utils_sync_count (CamelService *service,
- const gchar *folder_name,
- guint32 *unread_count, /* out */
- guint32 *visible_count, /* out */
- GError **error)
+ const gchar *folder_name,
+ guint32 *unread_count, /* out */
+ guint32 *visible_count, /* out */
+ GError **error)
{
ExchangeData *ed = get_data_for_service (service);
ExchangeFolder *mfld;
@@ -2526,19 +2592,21 @@ camel_exchange_utils_expunge_uids (CamelService *service,
}
static gboolean
-test_uri (E2kContext *ctx, const gchar *test_name, gpointer messages_by_href)
+test_uri (E2kContext *ctx,
+ const gchar *test_name,
+ gpointer messages_by_href)
{
return g_hash_table_lookup (messages_by_href, test_name) == NULL;
}
gboolean
camel_exchange_utils_append_message (CamelService *service,
- const gchar *folder_name,
- guint32 flags,
- const gchar *subject,
- const GByteArray *message,
- gchar **new_uid, /* out */
- GError **error)
+ const gchar *folder_name,
+ guint32 flags,
+ const gchar *subject,
+ const GByteArray *message,
+ gchar **new_uid, /* out */
+ GError **error)
{
ExchangeData *ed = get_data_for_service (service);
ExchangeFolder *mfld;
@@ -2588,13 +2656,14 @@ camel_exchange_utils_append_message (CamelService *service,
}
static void
-change_message (ExchangeFolder *mfld, ExchangeMessage *mmsg)
+change_message (ExchangeFolder *mfld,
+ ExchangeMessage *mmsg)
{
gint i;
g_static_rec_mutex_lock (&mfld->ed->changed_msgs_mutex);
- for (i=0; i<mfld->changed_messages->len; i++) {
+ for (i = 0; i < mfld->changed_messages->len; i++) {
if (mfld->changed_messages->pdata[i] == mmsg)
break;
}
@@ -2612,11 +2681,11 @@ change_message (ExchangeFolder *mfld, ExchangeMessage *mmsg)
gboolean
camel_exchange_utils_set_message_flags (CamelService *service,
- const gchar *folder_name,
- const gchar *uid,
- guint32 flags,
- guint32 mask,
- GError **error)
+ const gchar *folder_name,
+ const gchar *uid,
+ guint32 flags,
+ guint32 mask,
+ GError **error)
{
ExchangeData *ed = get_data_for_service (service);
ExchangeFolder *mfld;
@@ -2661,8 +2730,8 @@ camel_exchange_utils_set_message_flags (CamelService *service,
#if 0
/* If we allow camel utils to delete these messages hard way, it may
- fail to delete a mail because of permissions, but will append
- a mail in deleted items */
+ * fail to delete a mail because of permissions, but will append
+ * a mail in deleted items */
if (mask & flags & CAMEL_MESSAGE_DELETED) {
ExchangeHierarchy *hier;
@@ -2688,11 +2757,11 @@ camel_exchange_utils_set_message_flags (CamelService *service,
gboolean
camel_exchange_utils_set_message_tag (CamelService *service,
- const gchar *folder_name,
- const gchar *uid,
- const gchar *name,
- const gchar *value,
- GError **error)
+ const gchar *folder_name,
+ const gchar *uid,
+ const gchar *name,
+ const gchar *value,
+ GError **error)
{
ExchangeData *ed = get_data_for_service (service);
ExchangeFolder *mfld;
@@ -2717,10 +2786,10 @@ camel_exchange_utils_set_message_tag (CamelService *service,
gboolean
camel_exchange_utils_get_message (CamelService *service,
- const gchar *folder_name,
- const gchar *uid,
- GByteArray **message_bytes, /* out */
- GError **error)
+ const gchar *folder_name,
+ const gchar *uid,
+ GByteArray **message_bytes, /* out */
+ GError **error)
{
ExchangeData *ed = get_data_for_service (service);
ExchangeFolder *mfld;
@@ -2834,10 +2903,10 @@ camel_exchange_utils_get_message (CamelService *service,
gboolean
camel_exchange_utils_search (CamelService *service,
- const gchar *folder_name,
- const gchar *text,
- GPtrArray **found_uids, /* out */
- GError **error)
+ const gchar *folder_name,
+ const gchar *text,
+ GPtrArray **found_uids, /* out */
+ GError **error)
{
ExchangeData *ed = get_data_for_service (service);
ExchangeFolder *mfld;
@@ -2885,12 +2954,12 @@ camel_exchange_utils_search (CamelService *service,
gboolean
camel_exchange_utils_transfer_messages (CamelService *service,
- const gchar *source_name,
- const gchar *dest_name,
- GPtrArray *uids,
- gboolean delete_originals,
- GPtrArray **ret_uids, /* out */
- GError **error)
+ const gchar *source_name,
+ const gchar *dest_name,
+ GPtrArray *uids,
+ gboolean delete_originals,
+ GPtrArray **ret_uids, /* out */
+ GError **error)
{
ExchangeData *ed = get_data_for_service (service);
ExchangeFolder *source, *dest;
@@ -2995,7 +3064,9 @@ camel_exchange_utils_transfer_messages (CamelService *service,
}
static void
-account_new_folder (ExchangeAccount *account, EFolder *folder, gpointer user_data)
+account_new_folder (ExchangeAccount *account,
+ EFolder *folder,
+ gpointer user_data)
{
ExchangeData *ed = user_data;
ExchangeHierarchy *hier;
@@ -3020,7 +3091,9 @@ account_new_folder (ExchangeAccount *account, EFolder *folder, gpointer user_dat
}
static void
-account_removed_folder (ExchangeAccount *account, EFolder *folder, gpointer user_data)
+account_removed_folder (ExchangeAccount *account,
+ EFolder *folder,
+ gpointer user_data)
{
ExchangeData *ed = user_data;
ExchangeHierarchy *hier;
@@ -3046,13 +3119,13 @@ account_removed_folder (ExchangeAccount *account, EFolder *folder, gpointer user
gboolean
camel_exchange_utils_get_folder_info (CamelService *service,
- const gchar *top,
- guint32 store_flags,
- GPtrArray **folder_names, /* out */
- GPtrArray **folder_uris, /* out */
- GArray **unread_counts, /* out */
- GArray **folder_flags, /* out */
- GError **error)
+ const gchar *top,
+ guint32 store_flags,
+ GPtrArray **folder_names, /* out */
+ GPtrArray **folder_uris, /* out */
+ GArray **unread_counts, /* out */
+ GArray **folder_flags, /* out */
+ GError **error)
{
ExchangeData *ed = get_data_for_service (service);
GHashTable *known_uris;
@@ -3064,8 +3137,8 @@ camel_exchange_utils_get_folder_info (CamelService *service,
g_return_val_if_fail (folder_flags != NULL, FALSE);
/* use lock here to have done scanning of foreign hierarchy
- only once, and to not call get_folder_info_data simultaneously
- from more than one thread */
+ * only once, and to not call get_folder_info_data simultaneously
+ * from more than one thread */
g_static_rec_mutex_lock (&ed->changed_msgs_mutex);
*folder_names = NULL;
@@ -3090,10 +3163,10 @@ camel_exchange_utils_get_folder_info (CamelService *service,
gboolean
camel_exchange_utils_send_message (CamelService *service,
- const gchar *from,
- GPtrArray *recipients,
- const GByteArray *message,
- GError **error)
+ const gchar *from,
+ GPtrArray *recipients,
+ const GByteArray *message,
+ GError **error)
{
ExchangeData *ed = get_data_for_service (service);
SoupMessage *msg;
@@ -3104,9 +3177,9 @@ camel_exchange_utils_send_message (CamelService *service,
gboolean res = FALSE;
/* This function is called from a transport service, thus it has no idea
- about underlying folders and such. The check for estore != NULL is
- necessary to be sure the transport service was called after the connect,
- because the estore is used in other functions. */
+ * about underlying folders and such. The check for estore != NULL is
+ * necessary to be sure the transport service was called after the connect,
+ * because the estore is used in other functions. */
g_return_val_if_fail (ed != NULL, FALSE);
g_return_val_if_fail (ed->estore != NULL, FALSE);
@@ -3170,12 +3243,12 @@ camel_exchange_utils_send_message (CamelService *service,
gboolean
camel_exchange_utils_create_folder (CamelService *service,
- const gchar *parent_name,
- const gchar *folder_name,
- gchar **folder_uri, /* out */
- guint32 *unread_count, /* out */
- guint32 *flags, /* out */
- GError **error)
+ const gchar *parent_name,
+ const gchar *folder_name,
+ gchar **folder_uri, /* out */
+ guint32 *unread_count, /* out */
+ guint32 *flags, /* out */
+ GError **error)
{
ExchangeData *ed = get_data_for_service (service);
ExchangeAccountFolderResult result;
@@ -3219,8 +3292,8 @@ camel_exchange_utils_create_folder (CamelService *service,
gboolean
camel_exchange_utils_delete_folder (CamelService *service,
- const gchar *folder_name,
- GError **error)
+ const gchar *folder_name,
+ GError **error)
{
ExchangeData *ed = get_data_for_service (service);
ExchangeAccountFolderResult result;
@@ -3267,13 +3340,13 @@ camel_exchange_utils_delete_folder (CamelService *service,
gboolean
camel_exchange_utils_rename_folder (CamelService *service,
- const gchar *old_name,
- const gchar *new_name,
- GPtrArray **folder_names, /* out */
- GPtrArray **folder_uris, /* out */
- GArray **unread_counts, /* out */
- GArray **folder_flags, /* out */
- GError **error)
+ const gchar *old_name,
+ const gchar *new_name,
+ GPtrArray **folder_names, /* out */
+ GPtrArray **folder_uris, /* out */
+ GArray **unread_counts, /* out */
+ GArray **folder_flags, /* out */
+ GError **error)
{
ExchangeData *ed = get_data_for_service (service);
ExchangeFolder *mfld;
@@ -3364,7 +3437,7 @@ camel_exchange_utils_rename_folder (CamelService *service,
mfld = g_hash_table_lookup (ed->folders_by_name, old_name_remove);
/* If the lookup for the ExchangeFolder doesn't succeed then do
- not modify the corresponding entry in the hash table*/
+ not modify the corresponding entry in the hash table */
if (!mfld) {
g_free (old_name_remove);
goto cont_free;
@@ -3432,8 +3505,8 @@ camel_exchange_utils_rename_folder (CamelService *service,
gboolean
camel_exchange_utils_subscribe_folder (CamelService *service,
- const gchar *folder_name,
- GError **error)
+ const gchar *folder_name,
+ GError **error)
{
ExchangeData *ed = get_data_for_service (service);
ExchangeAccountFolderResult result;
@@ -3484,8 +3557,8 @@ camel_exchange_utils_subscribe_folder (CamelService *service,
gboolean
camel_exchange_utils_unsubscribe_folder (CamelService *service,
- const gchar *folder_name,
- GError **error)
+ const gchar *folder_name,
+ GError **error)
{
ExchangeData *ed = get_data_for_service (service);
ExchangeAccountFolderResult result;
@@ -3505,8 +3578,8 @@ camel_exchange_utils_unsubscribe_folder (CamelService *service,
g_object_ref (folder);
/* if (e_folder_exchange_get_hierarchy (folder)->type != EXCHANGE_HIERARCHY_FAVORITES) {
- Should use above check, but the internal uri is the same for both
- public and favorite hierarchies and any of them can be used for the check */
+ * Should use above check, but the internal uri is the same for both
+ * public and favorite hierarchies and any of them can be used for the check */
if (!exchange_account_is_favorite_folder (ed->account, folder)) {
g_object_unref (folder);
return TRUE;
@@ -3554,9 +3627,9 @@ camel_exchange_utils_unsubscribe_folder (CamelService *service,
gboolean
camel_exchange_utils_is_subscribed_folder (CamelService *service,
- const gchar *folder_name,
- gboolean *is_subscribed, /* out */
- GError **error)
+ const gchar *folder_name,
+ gboolean *is_subscribed, /* out */
+ GError **error)
{
ExchangeData *ed = get_data_for_service (service);
EFolder *folder;
diff --git a/camel/mail-utils.c b/camel/mail-utils.c
index 54bca75..8cb5e0e 100644
--- a/camel/mail-utils.c
+++ b/camel/mail-utils.c
@@ -112,7 +112,8 @@ mail_util_mapi_to_smtp_headers (E2kProperties *props)
* Return value: the message flags
**/
guint32
-mail_util_props_to_camel_flags (E2kProperties *props, gboolean obey_read_flag)
+mail_util_props_to_camel_flags (E2kProperties *props,
+ gboolean obey_read_flag)
{
const gchar *prop;
guint32 flags;
@@ -309,11 +310,11 @@ mail_util_stickynote_to_rfc822 (E2kProperties *props)
**/
gboolean
mail_util_demangle_meeting_related_message (GString *body,
- const gchar *owner_cn,
- const gchar *owner_email,
- const gchar *owner_cal_uri,
- const gchar *subscriber_email,
- MailUtilDemangleType unmangle_type)
+ const gchar *owner_cn,
+ const gchar *owner_email,
+ const gchar *owner_cal_uri,
+ const gchar *subscriber_email,
+ MailUtilDemangleType unmangle_type)
{
icalcomponent *vcal_comp, *event_comp;
icalproperty *prop = NULL;
@@ -329,7 +330,7 @@ mail_util_demangle_meeting_related_message (GString *body,
if (!vend)
return FALSE;
vend += 13;
- while (isspace ((guchar)*vend))
+ while (isspace ((guchar) * vend))
vend++;
oldlen = vend - vstart;
@@ -354,7 +355,7 @@ mail_util_demangle_meeting_related_message (GString *body,
continue;
if (!g_ascii_strncasecmp (attendee, "mailto:", 7))
- text = g_strdup (attendee+7);
+ text = g_strdup (attendee + 7);
text = g_strstrip (text);
if (text && !g_ascii_strcasecmp (owner_email, text)) {
@@ -379,7 +380,7 @@ mail_util_demangle_meeting_related_message (GString *body,
organizer = icalproperty_get_value_as_string_r (prop);
if (organizer) {
if (!g_ascii_strncasecmp (organizer, "mailto:", 7))
- text = g_strdup (organizer+7);
+ text = g_strdup (organizer + 7);
text = g_strstrip (text);
diff --git a/eplugin/exchange-account-setup.c b/eplugin/exchange-account-setup.c
index b34e2d0..91554c7 100644
--- a/eplugin/exchange-account-setup.c
+++ b/eplugin/exchange-account-setup.c
@@ -46,12 +46,12 @@
#include "exchange-change-password.h"
#include "exchange-folder-size-display.h"
-GtkWidget* org_gnome_exchange_settings (EPlugin *epl, EConfigHookItemFactoryData *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);
+GtkWidget * org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactoryData *data);
CamelServiceAuthType camel_exchange_ntlm_authtype = {
/* i18n: "Secure Password Authentication" is an Outlookism */
@@ -84,7 +84,8 @@ typedef struct {
static OOFData *oof_data = NULL;
static void
-update_state (GtkTextBuffer *buffer, gpointer data)
+update_state (GtkTextBuffer *buffer,
+ gpointer data)
{
if (gtk_text_buffer_get_modified (buffer)) {
GtkTextIter start, end;
@@ -98,7 +99,8 @@ update_state (GtkTextBuffer *buffer, gpointer data)
}
static void
-toggled_state (GtkToggleButton *button, gpointer data)
+toggled_state (GtkToggleButton *button,
+ gpointer data)
{
gboolean current_oof_state = gtk_toggle_button_get_active (button);
@@ -110,7 +112,8 @@ toggled_state (GtkToggleButton *button, gpointer data)
#ifdef HAVE_KRB5
static void
-btn_chpass_clicked (GtkButton *button, gpointer data)
+btn_chpass_clicked (GtkButton *button,
+ gpointer data)
{
ExchangeAccount *account;
gchar *old_password, *new_password;
@@ -141,7 +144,8 @@ btn_chpass_clicked (GtkButton *button, gpointer data)
#endif
static void
-btn_dass_clicked (GtkButton *button, gpointer data)
+btn_dass_clicked (GtkButton *button,
+ gpointer data)
{
ExchangeAccount *account;
account = exchange_operations_get_exchange_account ();
@@ -151,7 +155,8 @@ btn_dass_clicked (GtkButton *button, gpointer data)
}
static void
-btn_fsize_clicked (GtkButton *button, gpointer data)
+btn_fsize_clicked (GtkButton *button,
+ gpointer data)
{
ExchangeAccount *account;
GtkListStore *model;
@@ -167,7 +172,8 @@ 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 *ex_account = NULL;
@@ -382,7 +388,9 @@ org_gnome_exchange_settings (EPlugin *epl, EConfigHookItemFactoryData *data)
}
static void
-print_error (GtkWidget *parent, const gchar *owa_url, E2kAutoconfigResult result)
+print_error (GtkWidget *parent,
+ const gchar *owa_url,
+ E2kAutoconfigResult result)
{
const gchar *err_msg = NULL;
@@ -437,7 +445,7 @@ owa_authenticate_user (GtkWidget *button,
{
EMConfigTargetAccount *target_account = (EMConfigTargetAccount *) config->target;
E2kAutoconfigResult result;
- CamelURL *url=NULL;
+ CamelURL *url = NULL;
gboolean remember_password;
gchar *url_string, *key;
const gchar *source_url, *id_name, *owa_url;
@@ -462,19 +470,19 @@ owa_authenticate_user (GtkWidget *button,
id_name = e_account_get_string (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);
- user[at-id_name] = 0;
+ 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);
}
}
/* validate_user() CALLS GTK!!!
-
- THIS IS TOTALLY UNNACCEPTABLE!!!!!!!!
-
- It must use camel_session_ask_password, and it should return an exception for any problem,
- which should then be shown using e-alert */
+ *
+ * THIS IS TOTALLY UNNACCEPTABLE!!!!!!!!
+ *
+ * It must use camel_session_ask_password, and it should return an exception for any problem,
+ * which should then be shown using e-alert */
/* Note we're not referencing CamelSettings here. */
exchange_params->settings = settings;
@@ -534,7 +542,8 @@ owa_authenticate_user (GtkWidget *button,
}
static void
-owa_editor_entry_changed (GtkWidget *entry, EConfig *config)
+owa_editor_entry_changed (GtkWidget *entry,
+ EConfig *config)
{
CamelURL *owaurl = NULL;
gchar *uri;
@@ -624,7 +633,8 @@ 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;
@@ -655,7 +665,7 @@ org_gnome_exchange_owa_url (EPlugin *epl, EConfigHookItemFactoryData *data)
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 */
+ * but that will lose it if we come back. Maybe a commit callback could do it */
return NULL;
}
@@ -729,8 +739,8 @@ org_gnome_exchange_owa_url (EPlugin *epl, EConfigHookItemFactoryData *data)
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
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);
+ 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);
g_signal_connect (owa_entry, "changed", G_CALLBACK(owa_editor_entry_changed), data->config);
g_object_set_data((GObject *)owa_entry, "authenticate-button", button);
@@ -746,7 +756,7 @@ org_gnome_exchange_owa_url (EPlugin *epl, EConfigHookItemFactoryData *data)
want_mailbox_check = gtk_check_button_new_with_mnemonic (
_("Mailbox name is _different from username"));
gtk_widget_show (want_mailbox_check);
- gtk_table_attach (GTK_TABLE (data->parent), want_mailbox_check, 1, 2, row, row+1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_table_attach (GTK_TABLE (data->parent), want_mailbox_check, 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);
if (!username || !*username || !mailbox || !*mailbox ||
g_ascii_strcasecmp (username, mailbox) == 0 ||
(strchr (username, '/') && g_ascii_strcasecmp (strchr (username, '/') + 1, mailbox) == 0)) {
@@ -781,8 +791,8 @@ org_gnome_exchange_owa_url (EPlugin *epl, EConfigHookItemFactoryData *data)
gtk_widget_set_sensitive (mailbox_entry, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (want_mailbox_check)));
- gtk_table_attach (GTK_TABLE (data->parent), label, 0, 1, row, row+1, 0, 0, 0, 0);
- gtk_table_attach (GTK_TABLE (data->parent), mailbox_entry, 1, 2, row, row+1, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_table_attach (GTK_TABLE (data->parent), label, 0, 1, row, row + 1, 0, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (data->parent), mailbox_entry, 1, 2, row, row + 1, GTK_FILL | GTK_EXPAND, GTK_FILL, 0, 0);
g_free (owa_url);
g_free (mailbox);
@@ -792,13 +802,14 @@ 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
@@ -859,7 +870,8 @@ destroy_oof_data (void)
}
void
-org_gnome_exchange_commit (EPlugin *epl, EMConfigTargetAccount *target_account)
+org_gnome_exchange_commit (EPlugin *epl,
+ EMConfigTargetAccount *target_account)
{
EAccount *account;
CamelURL *url;
@@ -897,13 +909,15 @@ org_gnome_exchange_commit (EPlugin *epl, EMConfigTargetAccount *target_account)
}
static void
-exchange_check_authtype (GtkWidget *w, EConfig *config)
+exchange_check_authtype (GtkWidget *w,
+ EConfig *config)
{
return;
}
static void
-exchange_authtype_changed (GtkComboBox *dropdown, EConfig *config)
+exchange_authtype_changed (GtkComboBox *dropdown,
+ EConfig *config)
{
EMConfigTargetAccount *target = (EMConfigTargetAccount *) config->target;
gint id = gtk_combo_box_get_active (dropdown);
@@ -950,7 +964,8 @@ exchange_authtype_changed (GtkComboBox *dropdown, EConfig *config)
}
GtkWidget *
-org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
+org_gnome_exchange_auth_section (EPlugin *epl,
+ EConfigHookItemFactoryData *data)
{
EMConfigTargetAccount *target_account;
const gchar *source_url;
@@ -961,7 +976,7 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
GtkTreeIter iter;
GtkListStore *store;
EAccount *account;
- gint i, active=0, auth_changed_id = 0;
+ gint i, active = 0, auth_changed_id = 0;
GList *authtypes, *l, *ll;
ExchangeAccount *ex_account;
@@ -1009,7 +1024,7 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
&camel_exchange_ntlm_authtype);
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++) {
+ for (i = 0, l = authtypes; l; l = l->next, i++) {
CamelServiceAuthType *authtype = l->data;
gint avail = TRUE;
@@ -1079,7 +1094,8 @@ org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
}
GtkWidget *
-org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactoryData *data)
+org_gnome_exchange_show_folder_size_factory (EPlugin *epl,
+ EConfigHookItemFactoryData *data)
{
EMConfigTargetFolder *target= (EMConfigTargetFolder *) data->config->target;
CamelFolder *cml_folder = target->folder;
@@ -1122,7 +1138,7 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor
else
folder_size = g_strdup (_("0 KB"));
- hbx_size = (GtkHBox*) gtk_hbox_new (FALSE, 0);
+ hbx_size = (GtkHBox *) gtk_hbox_new (FALSE, 0);
vbx = (GtkVBox *) gtk_notebook_get_nth_page (GTK_NOTEBOOK (data->parent), 0);
lbl_size = gtk_label_new_with_mnemonic (_("Size:"));
diff --git a/eplugin/exchange-calendar.c b/eplugin/exchange-calendar.c
index 04754d7..30486cf 100644
--- a/eplugin/exchange-calendar.c
+++ b/eplugin/exchange-calendar.c
@@ -93,14 +93,14 @@ e_exchange_calendar_get_calendars (ECalClientSourceType ftype)
exchange_account_rescan_tree (account);
folder_array = exchange_account_get_folders (account);
- for (i=0; i<folder_array->len; ++i) {
+ for (i = 0; i < folder_array->len; ++i) {
folder = g_ptr_array_index (folder_array, i);
type = (gchar *) e_folder_get_type_string (folder);
if (!strcmp (type, tstring)) {
tmp = (gchar *) e_folder_get_physical_uri (folder);
if (g_str_has_prefix (tmp, uri_prefix)) {
- ruri = g_strdup (tmp+prefix_len);
+ ruri = g_strdup (tmp + prefix_len);
g_ptr_array_add (calendar_list, ruri);
}
}
@@ -114,7 +114,8 @@ e_exchange_calendar_get_calendars (ECalClientSourceType ftype)
}
void
-e_exchange_calendar_pcalendar_on_change (GtkTreeView *treeview, ESource *source)
+e_exchange_calendar_pcalendar_on_change (GtkTreeView *treeview,
+ ESource *source)
{
GtkTreeSelection *selection;
GtkTreeModel *model;
@@ -137,7 +138,8 @@ e_exchange_calendar_pcalendar_on_change (GtkTreeView *treeview, ESource *source)
}
GtkWidget *
-e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
+e_exchange_calendar_pcalendar (EPlugin *epl,
+ EConfigHookItemFactoryData *data)
{
static GtkWidget *lbl_pcalendar, *scrw_pcalendar, *tv_pcalendar, *lbl_size, *lbl_size_val;
static GtkWidget *hidden = NULL;
@@ -191,14 +193,14 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
&offline_status);
if (offline_status == OFFLINE_MODE) {
/* Evolution is in offline mode; we will not be able to create
- new folders or modify existing folders. */
+ * new folders or modify existing folders. */
offline_msg = g_markup_printf_escaped ("<b>%s</b>",
_("Evolution is in offline mode. You cannot create or modify folders now.\nPlease switch to online mode for such operations."));
lbl_offline_msg = gtk_label_new ("");
gtk_label_set_markup (GTK_LABEL (lbl_offline_msg), offline_msg);
g_free (offline_msg);
gtk_widget_show (lbl_offline_msg);
- gtk_table_attach (GTK_TABLE (parent), lbl_offline_msg, 0, 2, row, row+1, GTK_FILL|GTK_EXPAND, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (parent), lbl_offline_msg, 0, 2, row, row + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
g_free (uri_text);
return lbl_offline_msg;
}
@@ -239,15 +241,15 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
gtk_widget_show (lbl_size_val);
gtk_misc_set_alignment (GTK_MISC (lbl_size), 0.0, 0.5);
gtk_misc_set_alignment (GTK_MISC (lbl_size_val), 0.0, 0.5);
- gtk_table_attach (GTK_TABLE (parent), lbl_size, 0, 2, row, row+1, GTK_FILL|GTK_EXPAND, 0, 0, 0);
- gtk_table_attach (GTK_TABLE (parent), lbl_size_val, 1, 3, row, row+1, GTK_FILL|GTK_EXPAND, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (parent), lbl_size, 0, 2, row, row + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (parent), lbl_size_val, 1, 3, row, row + 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
g_free (folder_size);
}
lbl_pcalendar = gtk_label_new_with_mnemonic (_("_Location:"));
gtk_widget_show (lbl_pcalendar);
gtk_misc_set_alignment (GTK_MISC (lbl_pcalendar), 0.0, 0.5);
- gtk_table_attach (GTK_TABLE (parent), lbl_pcalendar, 0, 2, row+1, row+2, GTK_FILL|GTK_EXPAND, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (parent), lbl_pcalendar, 0, 2, row + 1, row + 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
ts_pcalendar = gtk_tree_store_new (NUM_COLS, G_TYPE_STRING, G_TYPE_STRING);
@@ -276,7 +278,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
gtk_label_set_mnemonic_widget (GTK_LABEL (lbl_pcalendar), tv_pcalendar);
g_signal_connect (G_OBJECT (tv_pcalendar), "cursor-changed", G_CALLBACK (e_exchange_calendar_pcalendar_on_change), t->source);
- gtk_table_attach (GTK_TABLE (parent), scrw_pcalendar, 0, 2, row+2, row+3, GTK_EXPAND|GTK_FILL, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (parent), scrw_pcalendar, 0, 2, row + 2, row + 3, GTK_EXPAND | GTK_FILL, 0, 0, 0);
gtk_widget_show_all (scrw_pcalendar);
if (calendar_src_exists) {
@@ -290,7 +292,7 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
tmpruri = (gchar *) rel_uri;
if (g_str_has_prefix (tmpruri, uri_prefix)) {
- sruri = g_strdup (tmpruri+prefix_len);
+ sruri = g_strdup (tmpruri + prefix_len);
}
else {
sruri = NULL;
@@ -308,7 +310,8 @@ e_exchange_calendar_pcalendar (EPlugin *epl, EConfigHookItemFactoryData *data)
}
gboolean
-e_exchange_calendar_check (EPlugin *epl, EConfigHookPageCheckData *data)
+e_exchange_calendar_check (EPlugin *epl,
+ EConfigHookPageCheckData *data)
{
/* FIXME - check pageid */
ECalConfigTargetSource *t = (ECalConfigTargetSource *) data->target;
@@ -375,11 +378,12 @@ e_exchange_calendar_check (EPlugin *epl, EConfigHookPageCheckData *data)
}
void
-e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
+e_exchange_calendar_commit (EPlugin *epl,
+ EConfigTarget *target)
{
ECalConfigTargetSource *t = (ECalConfigTargetSource *) target;
ESource *source = t->source;
- gchar *uri_text, *gruri, *gname, *ruri, *ftype, *path, *path_prefix, *oldpath=NULL;
+ gchar *uri_text, *gruri, *gname, *ruri, *ftype, *path, *path_prefix, *oldpath = NULL;
gchar *username, *windows_domain, *authtype;
gint prefix_len;
ExchangeAccount *account;
@@ -491,7 +495,7 @@ e_exchange_calendar_commit (EPlugin *epl, EConfigTarget *target)
if (authtype) {
e_source_set_property (source, "auth-type", authtype);
g_free (authtype);
- authtype=NULL;
+ authtype = NULL;
}
e_source_set_property (source, "auth", "1");
if (rename) {
diff --git a/eplugin/exchange-change-password.c b/eplugin/exchange-change-password.c
index f86c8e7..80a117f 100644
--- a/eplugin/exchange-change-password.c
+++ b/eplugin/exchange-change-password.c
@@ -32,7 +32,8 @@
#include <gtk/gtk.h>
static void
-entry_changed (GtkEntry *entry, gpointer user_data)
+entry_changed (GtkEntry *entry,
+ gpointer user_data)
{
GtkEntry *new_entry, *confirm_entry;
GtkDialog *pass_dialog;
@@ -66,7 +67,8 @@ entry_changed (GtkEntry *entry, gpointer user_data)
* Prompt the user for a new password.
*/
gchar *
-exchange_get_new_password (const gchar *existing_password, gboolean voluntary)
+exchange_get_new_password (const gchar *existing_password,
+ gboolean voluntary)
{
GtkResponseType response;
gchar *new_pass;
diff --git a/eplugin/exchange-config-listener.c b/eplugin/exchange-config-listener.c
index e0d3d0e..fdf86c9 100644
--- a/eplugin/exchange-config-listener.c
+++ b/eplugin/exchange-config-listener.c
@@ -177,7 +177,8 @@ finalize (GObject *object)
#define EVOLUTION_URI_PREFIX_LEN (sizeof (EVOLUTION_URI_PREFIX) - 1)
static EFolder *
-standard_folder (ExchangeAccount *account, const gchar *folder_type)
+standard_folder (ExchangeAccount *account,
+ const gchar *folder_type)
{
const gchar *uri;
@@ -188,8 +189,9 @@ standard_folder (ExchangeAccount *account, const gchar *folder_type)
}
static void
-set_special_mail_folder (ExchangeAccount *account, const gchar *folder_type,
- gchar **folder_uri)
+set_special_mail_folder (ExchangeAccount *account,
+ const gchar *folder_type,
+ gchar **folder_uri)
{
EFolder *folder;
const gchar *physical_uri;
@@ -218,8 +220,8 @@ set_special_mail_folder (ExchangeAccount *account, const gchar *folder_type,
static void
add_defaults_for_account (ExchangeConfigListener *config_listener,
- E2kContext *ctx,
- ExchangeAccount *account)
+ E2kContext *ctx,
+ ExchangeAccount *account)
{
EAccount *eaccount;
gboolean save = FALSE;
@@ -259,7 +261,7 @@ is_active_exchange_account (EAccount *account)
#if 0 /* Not using the following code anywhere for the moment */
static void
add_account_esources (ExchangeAccount *account,
- GSList *folders)
+ GSList *folders)
{
ESource *source = NULL;
ESourceGroup *cal_source_group = NULL;
@@ -272,7 +274,7 @@ add_account_esources (ExchangeAccount *account,
GConfClient *client;
gint mode;
ESourceList *cal_source_list, *tasks_source_list, *contacts_source_list;
- FolderInfo *folder=NULL;
+ FolderInfo *folder = NULL;
gboolean offline_mode = FALSE;
client = gconf_client_get_default ();
@@ -501,7 +503,7 @@ add_sources (ExchangeAccount *account)
static void
remove_account_esource (ExchangeAccount *account,
- FolderType folder_type)
+ FolderType folder_type)
{
ESourceGroup *group;
ESource *source = NULL;
@@ -627,7 +629,8 @@ get_new_exchange_password (ExchangeAccount *account)
#ifdef HAVE_KRB5
static void
-change_passwd_cb (GtkWidget *button, ExchangeAccount *account)
+change_passwd_cb (GtkWidget *button,
+ ExchangeAccount *account)
{
gchar *current_passwd, *new_passwd;
@@ -641,7 +644,8 @@ change_passwd_cb (GtkWidget *button, ExchangeAccount *account)
#endif
static void
-display_passwd_expiry_message (gint max_passwd_age, ExchangeAccount *account)
+display_passwd_expiry_message (gint max_passwd_age,
+ ExchangeAccount *account)
{
GtkWidget *passwd_exp_dialog;
GtkWidget *dialog_vbox1;
@@ -803,7 +807,8 @@ run_oof_dialog (void)
}
ExchangeAccountResult
-exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener, ExchangeAccount *account)
+exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
+ ExchangeAccount *account)
{
ExchangeConfigListenerPrivate *priv;
ExchangeAccountResult result;
@@ -824,7 +829,7 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
oldremember = remember = exchange_account_is_save_password (account);
title = g_strdup_printf (_("Enter Password for %s"), account->account_name);
password = e_passwords_ask_password (title, NULL, key, title,
- E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET,
+ E_PASSWORDS_REMEMBER_FOREVER | E_PASSWORDS_SECRET,
&remember, NULL);
if (remember != oldremember) {
exchange_account_set_save_password (account, remember);
@@ -927,7 +932,8 @@ exchange_config_listener_authenticate (ExchangeConfigListener *ex_conf_listener,
}
static void
-account_added (EAccountList *account_list, EAccount *account)
+account_added (EAccountList *account_list,
+ EAccount *account)
{
ExchangeConfigListener *config_listener;
ExchangeAccount *exchange_account;
@@ -986,7 +992,8 @@ struct account_update_data {
};
static void
-configured_account_destroyed (gpointer user_data, GObject *where_account_was)
+configured_account_destroyed (gpointer user_data,
+ GObject *where_account_was)
{
struct account_update_data *aud = user_data;
@@ -999,11 +1006,12 @@ configured_account_destroyed (gpointer user_data, GObject *where_account_was)
}
static gboolean
-requires_relogin (gchar *current_url, gchar *new_url)
+requires_relogin (gchar *current_url,
+ gchar *new_url)
{
E2kUri *current_uri, *new_uri;
const gchar *current_param_val, *new_param_val;
- const gchar *params [] = {
+ const gchar *params[] = {
"owa-url",
"gc-server-name",
"security-method" };
@@ -1035,7 +1043,7 @@ requires_relogin (gchar *current_url, gchar *new_url)
}
}
- for (i=0; i<n_params; i++) {
+ for (i = 0; i < n_params; i++) {
current_param_val = e2k_uri_get_param (current_uri, params[i]);
new_param_val = e2k_uri_get_param (new_uri, params[i]);
@@ -1059,7 +1067,8 @@ end:
}
static void
-account_changed (EAccountList *account_list, EAccount *account)
+account_changed (EAccountList *account_list,
+ EAccount *account)
{
ExchangeConfigListener *config_listener =
EXCHANGE_CONFIG_LISTENER (account_list);
@@ -1152,7 +1161,8 @@ account_changed (EAccountList *account_list, EAccount *account)
}
static void
-account_removed (EAccountList *account_list, EAccount *account)
+account_removed (EAccountList *account_list,
+ EAccount *account)
{
ExchangeConfigListener *config_listener =
EXCHANGE_CONFIG_LISTENER (account_list);
@@ -1195,7 +1205,7 @@ idle_construct (gpointer data)
ExchangeConfigListenerStatus
exchange_config_listener_get_offline_status (ExchangeConfigListener *excl,
- gint *mode)
+ gint *mode)
{
ExchangeConfigListenerPrivate *priv;
GConfValue *value;
@@ -1273,8 +1283,8 @@ exchange_config_listener_get_accounts (ExchangeConfigListener *config_listener)
**/
void
exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl,
- const gchar *old_name,
- const gchar *new_name)
+ const gchar *old_name,
+ const gchar *new_name)
{
GConfClient *client;
ESourceGroup *group;
@@ -1339,9 +1349,10 @@ exchange_config_listener_modify_esource_group_name (ExchangeConfigListener *excl
*
**/
static void
-exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *account)
+exchange_add_autocompletion_folders (GConfClient *gc_client,
+ ExchangeAccount *account)
{
- ESourceList *sl=NULL;
+ ESourceList *sl = NULL;
ESource *source;
GSList *groups;
@@ -1390,7 +1401,8 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac
*
**/
static gboolean
-exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2)
+exchange_camel_urls_is_equal (const gchar *url1,
+ const gchar *url2)
{
CamelURL *curl1, *curl2;
gchar *param1, *param2;
@@ -1436,7 +1448,8 @@ exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2)
* selection list
**/
static void
-remove_selected_non_offline_esources (ExchangeAccount *account, const gchar *gconf_key)
+remove_selected_non_offline_esources (ExchangeAccount *account,
+ const gchar *gconf_key)
{
ESourceGroup *group;
ESource *source = NULL;
@@ -1446,7 +1459,7 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const gchar *gco
const gchar *source_uid;
GConfClient *client;
ESourceList *source_list = NULL;
- const gchar *offline_mode=NULL;
+ const gchar *offline_mode = NULL;
gchar *selected_gconf_key;
if (gconf_key && !strcmp (gconf_key, CONF_KEY_CAL)) {
diff --git a/eplugin/exchange-contacts.c b/eplugin/exchange-contacts.c
index a7a29d9..c4e6bab 100644
--- a/eplugin/exchange-contacts.c
+++ b/eplugin/exchange-contacts.c
@@ -80,14 +80,14 @@ e_exchange_contacts_get_contacts (void)
exchange_account_rescan_tree (account);
folder_array = exchange_account_get_folders (account);
- for (i=0; i<folder_array->len; ++i) {
+ for (i = 0; i < folder_array->len; ++i) {
gchar *type, *tmp;
folder = g_ptr_array_index (folder_array, i);
type = (gchar *) e_folder_get_type_string (folder);
if (!strcmp (type, "contacts")) {
tmp = (gchar *) e_folder_get_physical_uri (folder);
if (g_str_has_prefix (tmp, uri_prefix)) {
- ruri = g_strdup (tmp+prefix_len);
+ ruri = g_strdup (tmp + prefix_len);
g_ptr_array_add (contacts_list, ruri);
}
}
@@ -100,7 +100,8 @@ e_exchange_contacts_get_contacts (void)
}
void
-e_exchange_contacts_pcontacts_on_change (GtkTreeView *treeview, ESource *source)
+e_exchange_contacts_pcontacts_on_change (GtkTreeView *treeview,
+ ESource *source)
{
GtkTreeSelection *selection;
GtkTreeModel *model;
@@ -125,7 +126,8 @@ e_exchange_contacts_pcontacts_on_change (GtkTreeView *treeview, ESource *source)
}
GtkWidget *
-e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
+e_exchange_contacts_pcontacts (EPlugin *epl,
+ EConfigHookItemFactoryData *data)
{
static GtkWidget *lbl_pcontacts, *scrw_pcontacts, *tv_pcontacts, *vb_pcontacts, *lbl_size, *lbl_size_val, *hbx_size;
GtkTreeStore *ts_pcontacts;
@@ -165,7 +167,7 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
&offline_status);
if (offline_status == OFFLINE_MODE) {
/* Evolution is in offline mode; we will not be able to create
- new folders or modify existing folders. */
+ * new folders or modify existing folders. */
offline_msg = g_markup_printf_escaped ("<b>%s</b>",
_("Evolution is in offline mode. You cannot create or modify folders now.\nPlease switch to online mode for such operations."));
vb_offline_msg = gtk_vbox_new (FALSE, 6);
@@ -282,7 +284,7 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
prefix_len = strlen (uri_prefix);
if (g_str_has_prefix (tmpruri, uri_prefix)) {
- sruri = g_strdup (tmpruri+prefix_len);
+ sruri = g_strdup (tmpruri + prefix_len);
}
else {
sruri = NULL;
@@ -305,7 +307,8 @@ e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data)
}
gboolean
-e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
+e_exchange_contacts_check (EPlugin *epl,
+ EConfigHookPageCheckData *data)
{
/* FIXME - check pageid */
EABConfigTargetSource *t = (EABConfigTargetSource *) data->target;
@@ -405,11 +408,12 @@ e_exchange_contacts_check (EPlugin *epl, EConfigHookPageCheckData *data)
}
void
-e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
+e_exchange_contacts_commit (EPlugin *epl,
+ EConfigTarget *target)
{
EABConfigTargetSource *t = (EABConfigTargetSource *) target;
ESource *source = t->source;
- gchar *uri_text, *gname, *gruri, *ruri = NULL, *path = NULL, *path_prefix, *oldpath=NULL;
+ gchar *uri_text, *gname, *gruri, *ruri = NULL, *path = NULL, *path_prefix, *oldpath = NULL;
gchar *username, *windows_domain, *authtype;
gint prefix_len;
ExchangeAccount *account;
@@ -501,7 +505,7 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
if (authtype) {
e_source_set_property (source, "auth-type", authtype);
g_free (authtype);
- authtype=NULL;
+ authtype = NULL;
}
e_source_set_property (source, "auth", "plain/password");
if (rename) {
diff --git a/eplugin/exchange-delegates-user.c b/eplugin/exchange-delegates-user.c
index d822585..648cab2 100644
--- a/eplugin/exchange-delegates-user.c
+++ b/eplugin/exchange-delegates-user.c
@@ -65,7 +65,7 @@ const gchar *exchange_delegates_user_folder_names[] = {
};
/* To translators: The folder names to be displayed in the message being
- sent to the delegatee.
+ * sent to the delegatee.
*/
static const gchar *folder_names_for_display[] = {
N_("Calendar"), N_("Tasks"), N_("Inbox"), N_("Contacts")
@@ -134,7 +134,8 @@ is_delegate_role (E2kPermissionsRole role)
}
static void
-set_perms (GtkWidget *combobox, E2kPermissionsRole role)
+set_perms (GtkWidget *combobox,
+ E2kPermissionsRole role)
{
if (!is_delegate_role (role)) {
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _("Custom"));
@@ -145,7 +146,8 @@ set_perms (GtkWidget *combobox, E2kPermissionsRole role)
}
static void
-parent_window_destroyed (gpointer dialog, GObject *where_parent_window_was)
+parent_window_destroyed (gpointer dialog,
+ GObject *where_parent_window_was)
{
gtk_dialog_response (dialog, GTK_RESPONSE_CANCEL);
}
@@ -182,7 +184,9 @@ map_to_full_role_name (E2kPermissionsRole role_nam)
}
static void
-em_utils_delegates_done (GObject *source_object, GAsyncResult *res, gpointer user_data)
+em_utils_delegates_done (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
{
EShell *shell;
EShellBackend *shell_backend;
@@ -209,8 +213,8 @@ em_utils_delegates_done (GObject *source_object, GAsyncResult *res, gpointer use
**/
gboolean
exchange_delegates_user_edit (ExchangeAccount *account,
- ExchangeDelegatesUser *user,
- GtkWidget *parent_window)
+ ExchangeDelegatesUser *user,
+ GtkWidget *parent_window)
{
gchar *title;
gint button, i;
@@ -238,7 +242,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
delegate_permissions = gtk_dialog_new_with_buttons (
/* Translators: "Delegate Permissions" refers to the permissions on the delegator's folders
- that the delegatee would receive */
+ * that the delegatee would receive */
_("Delegate Permissions"),
NULL,
GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -376,11 +380,11 @@ exchange_delegates_user_edit (ExchangeAccount *account,
g_object_weak_ref (G_OBJECT (parent_window),
parent_window_destroyed, delegate_permissions);
g_object_add_weak_pointer (G_OBJECT (parent_window),
- (gpointer*)&parent_window);
+ (gpointer *) &parent_window);
button = gtk_dialog_run (GTK_DIALOG (delegate_permissions));
if (parent_window) {
g_object_remove_weak_pointer (G_OBJECT (parent_window),
- (gpointer *)&parent_window);
+ (gpointer *) &parent_window);
g_object_weak_unref (G_OBJECT (parent_window),
parent_window_destroyed, delegate_permissions);
}
@@ -404,7 +408,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
}
/* The following piece of code is used to construct a mail message to be sent to a Delegate
- summarizing all the permissions set for him on the user's various folders.
+ * summarizing all the permissions set for him on the user's various folders.
*/
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (delegate_mail)) == TRUE) {
if (button == GTK_RESPONSE_OK) {
@@ -443,7 +447,7 @@ exchange_delegates_user_edit (ExchangeAccount *account,
camel_content_type_unref (type);
/* To translators: This is a part of the message to be sent to the delegatee
- summarizing the permissions assigned to him.
+ * summarizing the permissions assigned to him.
*/
msg_part1 = _("This message was sent automatically by Evolution to inform you that you have been "
"designated as a delegate. You can now send messages on my behalf.");
@@ -621,8 +625,8 @@ exchange_delegates_user_new (const gchar *display_name)
**/
ExchangeDelegatesUser *
exchange_delegates_user_new_from_gc (E2kGlobalCatalog *gc,
- const gchar *email,
- GByteArray *creator_entryid)
+ const gchar *email,
+ GByteArray *creator_entryid)
{
E2kGlobalCatalogStatus status;
E2kGlobalCatalogEntry *entry;
@@ -649,7 +653,7 @@ exchange_delegates_user_new_from_gc (E2kGlobalCatalog *gc,
p--;
g_byte_array_append (user->entryid, creator_entryid->data,
p - creator_entryid->data + 1);
- g_byte_array_append (user->entryid, (guint8*) entry->legacy_exchange_dn,
+ g_byte_array_append (user->entryid, (guint8 *) entry->legacy_exchange_dn,
strlen (entry->legacy_exchange_dn));
g_byte_array_append (user->entryid, (guint8*)"", 1);
diff --git a/eplugin/exchange-delegates.c b/eplugin/exchange-delegates.c
index 8253957..9adeb7a 100644
--- a/eplugin/exchange-delegates.c
+++ b/eplugin/exchange-delegates.c
@@ -75,8 +75,8 @@ static void set_perms_for_user (ExchangeDelegatesUser *user, gpointer user_data)
static void
set_sd_for_href (ExchangeDelegates *delegates,
- const gchar *href,
- E2kSecurityDescriptor *sd)
+ const gchar *href,
+ E2kSecurityDescriptor *sd)
{
gint i;
@@ -126,12 +126,12 @@ fill_in_sids (ExchangeDelegates *delegates)
*/
for (u = 0; u < delegates->users->len; u++) {
user = delegates->users->pdata[u];
- if (user->sid == (E2kSid *)-1)
+ if (user->sid == (E2kSid *) - 1)
continue;
for (u2 = u + 1; u2 < delegates->users->len; u2++) {
user2 = delegates->users->pdata[u2];
if (!strcmp (user->display_name, user2->display_name))
- user->sid = user2->sid = (E2kSid *)-1;
+ user->sid = user2->sid = (E2kSid *) - 1;
}
if (!user->sid)
needed_sids++;
@@ -163,7 +163,7 @@ fill_in_sids (ExchangeDelegates *delegates)
gc = exchange_account_get_global_catalog (delegates->account);
for (u = 0; u < delegates->users->len; u++) {
user = delegates->users->pdata[u];
- if (user->sid && user->sid != (E2kSid *)-1)
+ if (user->sid && user->sid != (E2kSid *) - 1)
continue;
status = e2k_global_catalog_lookup (
@@ -352,7 +352,8 @@ get_user_list (ExchangeDelegates *delegates)
*/
static void
add_remove_user (ExchangeDelegatesUser *user,
- GPtrArray *to_array, GPtrArray *from_array)
+ GPtrArray *to_array,
+ GPtrArray *from_array)
{
ExchangeDelegatesUser *match;
gint i;
@@ -372,7 +373,8 @@ add_remove_user (ExchangeDelegatesUser *user,
}
static void
-set_perms_for_user (ExchangeDelegatesUser *user, gpointer user_data)
+set_perms_for_user (ExchangeDelegatesUser *user,
+ gpointer user_data)
{
ExchangeDelegates *delegates = user_data;
gint i, role;
@@ -392,7 +394,8 @@ set_perms_for_user (ExchangeDelegatesUser *user, gpointer user_data)
}
static void
-add_button_clicked_cb (GtkWidget *widget, gpointer data)
+add_button_clicked_cb (GtkWidget *widget,
+ gpointer data)
{
ExchangeDelegates *delegates = data;
E2kGlobalCatalog *gc;
@@ -469,7 +472,8 @@ add_button_clicked_cb (GtkWidget *widget, gpointer data)
}
static gint
-get_selected_row (GtkWidget *tree_view, GtkTreeIter *iter)
+get_selected_row (GtkWidget *tree_view,
+ GtkTreeIter *iter)
{
GtkTreeSelection *selection;
GtkTreeModel *model;
@@ -489,7 +493,8 @@ get_selected_row (GtkWidget *tree_view, GtkTreeIter *iter)
}
static void
-edit_button_clicked_cb (GtkWidget *widget, gpointer data)
+edit_button_clicked_cb (GtkWidget *widget,
+ gpointer data)
{
ExchangeDelegates *delegates = data;
GtkWidget *parent_window;
@@ -509,7 +514,8 @@ edit_button_clicked_cb (GtkWidget *widget, gpointer data)
}
const gchar *
-email_look_up (const gchar *delegate_legacy, ExchangeAccount *account)
+email_look_up (const gchar *delegate_legacy,
+ ExchangeAccount *account)
{
E2kGlobalCatalog *gc;
E2kGlobalCatalogEntry *entry;
@@ -531,7 +537,9 @@ email_look_up (const gchar *delegate_legacy, ExchangeAccount *account)
}
static gboolean
-table_click_cb (GtkWidget *widget, GdkEventButton *event, gpointer data)
+table_click_cb (GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer data)
{
ExchangeDelegates *delegates = data;
GtkWidget *parent_window;
@@ -555,7 +563,8 @@ table_click_cb (GtkWidget *widget, GdkEventButton *event, gpointer data)
}
static void
-remove_button_clicked_cb (GtkWidget *widget, gpointer data)
+remove_button_clicked_cb (GtkWidget *widget,
+ gpointer data)
{
ExchangeDelegates *delegates = data;
ExchangeDelegatesUser *user;
@@ -599,7 +608,8 @@ remove_button_clicked_cb (GtkWidget *widget, gpointer data)
}
static gboolean
-proppatch_sd (E2kContext *ctx, ExchangeDelegatesFolder *folder)
+proppatch_sd (E2kContext *ctx,
+ ExchangeDelegatesFolder *folder)
{
GByteArray *binsd;
E2kProperties *props;
@@ -630,7 +640,8 @@ proppatch_sd (E2kContext *ctx, ExchangeDelegatesFolder *folder)
}
static gboolean
-get_user_dn (E2kGlobalCatalog *gc, ExchangeDelegatesUser *user)
+get_user_dn (E2kGlobalCatalog *gc,
+ ExchangeDelegatesUser *user)
{
E2kGlobalCatalogEntry *entry;
E2kGlobalCatalogStatus status;
@@ -879,7 +890,9 @@ delegates_destroy (ExchangeDelegates *delegates)
}
static void
-dialog_response (GtkDialog *dialog, gint response, gpointer user_data)
+dialog_response (GtkDialog *dialog,
+ gint response,
+ gpointer user_data)
{
ExchangeDelegates *delegates = user_data;
@@ -889,7 +902,8 @@ dialog_response (GtkDialog *dialog, gint response, gpointer user_data)
}
static void
-parent_destroyed (gpointer user_data, GObject *ex_parent)
+parent_destroyed (gpointer user_data,
+ GObject *ex_parent)
{
ExchangeDelegates *delegates = user_data;
@@ -898,7 +912,8 @@ parent_destroyed (gpointer user_data, GObject *ex_parent)
}
void
-exchange_delegates (ExchangeAccount *account, GtkWidget *parent)
+exchange_delegates (ExchangeAccount *account,
+ GtkWidget *parent)
{
GtkWidget *dialog_vbox1;
GtkWidget *vbox2;
diff --git a/eplugin/exchange-folder-permission.c b/eplugin/exchange-folder-permission.c
index 8744a9d..439d384 100644
--- a/eplugin/exchange-folder-permission.c
+++ b/eplugin/exchange-folder-permission.c
@@ -99,7 +99,8 @@ call_folder_permissions (const gchar *uri)
}
static gboolean
-is_eex_folder_selected (EShellView *shell_view, gchar **puri)
+is_eex_folder_selected (EShellView *shell_view,
+ gchar **puri)
{
ExchangeAccount *account = NULL;
EShellSidebar *shell_sidebar;
@@ -199,7 +200,8 @@ is_eex_store_available (EShellView *shell_view)
}
static void
-eex_mail_folder_permissions_cb (GtkAction *action, EShellView *shell_view)
+eex_mail_folder_permissions_cb (GtkAction *action,
+ EShellView *shell_view)
{
gchar *uri = NULL;
@@ -210,7 +212,8 @@ eex_mail_folder_permissions_cb (GtkAction *action, EShellView *shell_view)
}
static void
-eex_folder_subscribe_cb (GtkAction *action, EShellView *shell_view)
+eex_folder_subscribe_cb (GtkAction *action,
+ EShellView *shell_view)
{
const gchar *name;
@@ -224,7 +227,8 @@ eex_folder_subscribe_cb (GtkAction *action, EShellView *shell_view)
}
static void
-eex_mail_folder_inbox_unsubscribe_cb (GtkAction *action, EShellView *shell_view)
+eex_mail_folder_inbox_unsubscribe_cb (GtkAction *action,
+ EShellView *shell_view)
{
gchar *uri = NULL;
@@ -259,7 +263,8 @@ static GtkActionEntry mail_entries[] = {
};
static void
-update_mail_entries_cb (EShellView *shell_view, gpointer user_data)
+update_mail_entries_cb (EShellView *shell_view,
+ gpointer user_data)
{
GtkActionGroup *action_group;
EShellWindow *shell_window;
@@ -276,8 +281,8 @@ update_mail_entries_cb (EShellView *shell_view, gpointer user_data)
action_group = e_shell_window_get_action_group (shell_window, "mail");
/* index 0 ... Permissions
- index 1 ... Subscribe to
- index 2 ... Unsubscribe */
+ * index 1 ... Subscribe to
+ * index 2 ... Unsubscribe */
for (i = 0; i < G_N_ELEMENTS (mail_entries); i++) {
gboolean visible = is_eex_avail;
@@ -297,7 +302,8 @@ update_mail_entries_cb (EShellView *shell_view, gpointer user_data)
}
gboolean
-eex_ui_mail_init (GtkUIManager *ui_manager, EShellView *shell_view)
+eex_ui_mail_init (GtkUIManager *ui_manager,
+ EShellView *shell_view)
{
EShellWindow *shell_window;
@@ -313,7 +319,8 @@ eex_ui_mail_init (GtkUIManager *ui_manager, EShellView *shell_view)
}
static gboolean
-is_eex_source_selected (EShellView *shell_view, gchar **puri)
+is_eex_source_selected (EShellView *shell_view,
+ gchar **puri)
{
gint mode;
ExchangeAccount *account = NULL;
@@ -399,7 +406,8 @@ is_eex_source_available (EShellView *shell_view)
#define NUM_ENTRIES 3
static void
-update_source_entries_cb (EShellView *shell_view, GtkActionEntry *entries)
+update_source_entries_cb (EShellView *shell_view,
+ GtkActionEntry *entries)
{
GtkActionGroup *action_group;
EShellWindow *shell_window;
@@ -425,8 +433,8 @@ update_source_entries_cb (EShellView *shell_view, GtkActionEntry *entries)
action_group = e_shell_window_get_action_group (shell_window, group);
/* index 0 ... Permissions
- index 1 ... Subscribe to
- index 2 ... Unsubscribe */
+ * index 1 ... Subscribe to
+ * index 2 ... Unsubscribe */
for (i = 0; i < NUM_ENTRIES; i++) {
gboolean visible = is_eex_avail;
@@ -446,7 +454,8 @@ update_source_entries_cb (EShellView *shell_view, GtkActionEntry *entries)
}
static void
-setup_source_actions (EShellView *shell_view, GtkActionEntry *entries)
+setup_source_actions (EShellView *shell_view,
+ GtkActionEntry *entries)
{
EShellWindow *shell_window;
const gchar *group;
@@ -471,7 +480,8 @@ setup_source_actions (EShellView *shell_view, GtkActionEntry *entries)
}
static void
-source_permissions_cb (GtkAction *action, EShellView *shell_view)
+source_permissions_cb (GtkAction *action,
+ EShellView *shell_view)
{
gchar *uri = NULL;
@@ -484,7 +494,8 @@ source_permissions_cb (GtkAction *action, EShellView *shell_view)
}
static void
-eex_folder_unsubscribe_cb (GtkAction *action, EShellView *shell_view)
+eex_folder_unsubscribe_cb (GtkAction *action,
+ EShellView *shell_view)
{
gchar *uri = NULL;
const gchar *name;
@@ -538,7 +549,8 @@ static GtkActionEntry calendar_entries[] = {
};
gboolean
-eex_ui_calendar_permissions (GtkUIManager *ui_manager, EShellView *shell_view)
+eex_ui_calendar_permissions (GtkUIManager *ui_manager,
+ EShellView *shell_view)
{
g_return_val_if_fail (G_N_ELEMENTS (calendar_entries) == NUM_ENTRIES, FALSE);
@@ -572,7 +584,8 @@ static GtkActionEntry tasks_entries[] = {
};
gboolean
-eex_ui_tasks_permissions (GtkUIManager *ui_manager, EShellView *shell_view)
+eex_ui_tasks_permissions (GtkUIManager *ui_manager,
+ EShellView *shell_view)
{
g_return_val_if_fail (G_N_ELEMENTS (tasks_entries) == NUM_ENTRIES, FALSE);
@@ -606,7 +619,8 @@ static GtkActionEntry addressbook_entries[] = {
};
gboolean
-eex_ui_addressbook_permissions (GtkUIManager *ui_manager, EShellView *shell_view)
+eex_ui_addressbook_permissions (GtkUIManager *ui_manager,
+ EShellView *shell_view)
{
g_return_val_if_fail (G_N_ELEMENTS (addressbook_entries) == NUM_ENTRIES, FALSE);
diff --git a/eplugin/exchange-folder-size-display.c b/eplugin/exchange-folder-size-display.c
index 3c82857..b26968e 100644
--- a/eplugin/exchange-folder-size-display.c
+++ b/eplugin/exchange-folder-size-display.c
@@ -39,9 +39,9 @@ enum {
static gboolean
get_folder_size_func (GtkTreeModel *model,
- GtkTreePath *path,
- GtkTreeIter *iter,
- gpointer user_data)
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer user_data)
{
GHashTable *info = (GHashTable *) user_data;
gdouble folder_size;
@@ -54,7 +54,8 @@ get_folder_size_func (GtkTreeModel *model,
}
gchar *
-exchange_folder_size_get_val (GtkListStore *model, const gchar *folder_name)
+exchange_folder_size_get_val (GtkListStore *model,
+ const gchar *folder_name)
{
GHashTable *finfo;
gchar *folder_size, *fsize;
@@ -78,10 +79,10 @@ exchange_folder_size_get_val (GtkListStore *model, const gchar *folder_name)
static void
format_size_func (GtkTreeViewColumn *col,
- GtkCellRenderer *renderer,
- GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer user_data)
+ GtkCellRenderer *renderer,
+ GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer user_data)
{
GtkCellRendererText *cell = (GtkCellRendererText *) renderer;
gdouble folder_size;
@@ -99,7 +100,10 @@ format_size_func (GtkTreeViewColumn *col,
}
static gboolean
-calc_folder_size_func (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
+calc_folder_size_func (GtkTreeModel *model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
+ gpointer user_data)
{
gdouble *total_size = user_data;
gdouble folder_size;
@@ -115,7 +119,8 @@ calc_folder_size_func (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter
}
void
-exchange_folder_size_display (GtkListStore *model, GtkWidget *parent)
+exchange_folder_size_display (GtkListStore *model,
+ GtkWidget *parent)
{
GtkTreeViewColumn *column;
GtkTreeSortable *sortable;
diff --git a/eplugin/exchange-folder-subscription.c b/eplugin/exchange-folder-subscription.c
index 7393f85..3c2615a 100644
--- a/eplugin/exchange-folder-subscription.c
+++ b/eplugin/exchange-folder-subscription.c
@@ -40,13 +40,16 @@
#include "exchange-operations.h"
static void
-user_response (ENameSelectorDialog *name_selector_dialog, gint response, gpointer data)
+user_response (ENameSelectorDialog *name_selector_dialog,
+ gint response,
+ gpointer data)
{
gtk_widget_hide (GTK_WIDGET (name_selector_dialog));
}
static void
-user_clicked (GtkWidget *button, ENameSelector *name_selector)
+user_clicked (GtkWidget *button,
+ ENameSelector *name_selector)
{
ENameSelectorDialog *name_selector_dialog;
@@ -56,7 +59,9 @@ user_clicked (GtkWidget *button, ENameSelector *name_selector)
}
static GtkWidget *
-setup_name_selector (GtkWidget *placeholder, GtkWidget *button_user, ENameSelector **name_selector_ret)
+setup_name_selector (GtkWidget *placeholder,
+ GtkWidget *button_user,
+ ENameSelector **name_selector_ret)
{
ENameSelector *name_selector;
ENameSelectorModel *name_selector_model;
@@ -87,7 +92,8 @@ setup_name_selector (GtkWidget *placeholder, GtkWidget *button_user, ENameSelect
}
static void
-setup_folder_name_combo (GtkWidget *widget, const gchar *fname)
+setup_folder_name_combo (GtkWidget *widget,
+ const gchar *fname)
{
GtkComboBoxText *combo;
const gchar *strings[] = {
@@ -125,7 +131,8 @@ folder_name_entry_changed_callback (GtkEditable *editable,
}
static void
-user_name_entry_changed_callback (GtkEditable *editable, gpointer data)
+user_name_entry_changed_callback (GtkEditable *editable,
+ gpointer data)
{
GtkDialog *dialog = GTK_DIALOG (data);
const gchar *user_name_text = gtk_entry_get_text (GTK_ENTRY (editable));
@@ -137,7 +144,8 @@ user_name_entry_changed_callback (GtkEditable *editable, gpointer data)
}
static void
-setup_server_combobox (GtkWidget *widget, gchar *mail_account)
+setup_server_combobox (GtkWidget *widget,
+ gchar *mail_account)
{
g_return_if_fail (GTK_IS_COMBO_BOX_TEXT (widget));
@@ -167,7 +175,9 @@ destroy_subscription_info (SubscriptionInfo *subscription_info)
}
static void
-subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
+subscribe_to_folder (GtkWidget *dialog,
+ gint response,
+ gpointer data)
{
SubscriptionInfo *subscription_info = data;
gchar *user_email_address = NULL, *folder_name = NULL, *path = NULL;
@@ -280,7 +290,8 @@ subscribe_to_folder (GtkWidget *dialog, gint response, gpointer data)
}
gboolean
-create_folder_subscription_dialog (ExchangeAccount *account, const gchar *fname)
+create_folder_subscription_dialog (ExchangeAccount *account,
+ const gchar *fname)
{
ENameSelector *name_selector;
GtkWidget *dialog;
@@ -374,8 +385,8 @@ create_folder_subscription_dialog (ExchangeAccount *account, const gchar *fname)
gtk_widget_show (dialog);
/* Connect the callback to set the OK button insensitive when there is
- no text in the folder_name_entry. Notice that we put a value there
- by default so the OK button is sensitive by default. */
+ * no text in the folder_name_entry. Notice that we put a value there
+ * by default so the OK button is sensitive by default. */
g_signal_connect (subscription_info->folder_name_entry, "changed",
G_CALLBACK (folder_name_entry_changed_callback), dialog);
diff --git a/eplugin/exchange-folder.c b/eplugin/exchange-folder.c
index 619c74a..a545a11 100644
--- a/eplugin/exchange-folder.c
+++ b/eplugin/exchange-folder.c
@@ -67,7 +67,9 @@ ex_create_folder_info (CamelStore *store,
}
static void
-exchange_get_folder (GObject *source_object, GAsyncResult *result, gpointer data)
+exchange_get_folder (GObject *source_object,
+ GAsyncResult *result,
+ gpointer data)
{
CamelStore *store;
CamelFolderInfo *info;
@@ -145,8 +147,8 @@ eex_folder_inbox_unsubscribe (const gchar *uri)
target_uri = g_strdup (uri);
path = g_strdup (uri + strlen ("exchange://") + strlen (account->account_filename));
/* User will be able to unsubscribe by doing a right click on
- any one of this two-<other user's>Inbox or the
- <other user's folder> tree.
+ * any one of this two-<other user's>Inbox or the
+ * <other user's folder> tree.
*/
stored_path = strrchr (path + 1, '/');
@@ -208,7 +210,9 @@ eex_folder_inbox_unsubscribe (const gchar *uri)
}
static void
-unsubscribe_dialog_ab_response (GtkDialog *dialog, gint response, ESource *source)
+unsubscribe_dialog_ab_response (GtkDialog *dialog,
+ gint response,
+ ESource *source)
{
if (response == GTK_RESPONSE_OK) {
@@ -249,7 +253,9 @@ unsubscribe_dialog_ab_response (GtkDialog *dialog, gint response, ESource *sourc
}
static void
-unsubscribe_dialog_response (GtkDialog *dialog, gint response, ESource *source)
+unsubscribe_dialog_response (GtkDialog *dialog,
+ gint response,
+ ESource *source)
{
if (response == GTK_RESPONSE_OK) {
@@ -449,7 +455,9 @@ call_folder_subscribe (const gchar *folder_name)
}
void
-call_folder_unsubscribe (const gchar *folder_type, const gchar *uri, ESource *source)
+call_folder_unsubscribe (const gchar *folder_type,
+ const gchar *uri,
+ ESource *source)
{
g_return_if_fail (folder_type != NULL);
g_return_if_fail (uri != NULL);
diff --git a/eplugin/exchange-mail-send-options.c b/eplugin/exchange-mail-send-options.c
index 85fb5d5..d6f499d 100644
--- a/eplugin/exchange-mail-send-options.c
+++ b/eplugin/exchange-mail-send-options.c
@@ -36,10 +36,12 @@
gboolean eex_ui_composer_actions (GtkUIManager *manager, EMsgComposer *composer);
-static ExchangeSendOptionsDialog *dialog=NULL;
+static ExchangeSendOptionsDialog *dialog = NULL;
static void
-append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
+append_to_header (ExchangeSendOptionsDialog *dialog,
+ gint state,
+ gpointer data)
{
EMsgComposer *composer;
CamelAddress *sender_address;
@@ -151,7 +153,8 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
}
static void
-send_options_commit (EMsgComposer *comp, gpointer user_data)
+send_options_commit (EMsgComposer *comp,
+ gpointer user_data)
{
if (!user_data && !EXCHANGE_IS_SENDOPTIONS_DIALOG (user_data))
return;
@@ -176,7 +179,8 @@ account_is_exchange (EAccount *account)
}
static void
-from_changed_cb (EComposerFromHeader *header, EMsgComposer *composer)
+from_changed_cb (EComposerFromHeader *header,
+ EMsgComposer *composer)
{
GtkActionGroup *group;
GtkAction *action;
@@ -194,7 +198,8 @@ from_changed_cb (EComposerFromHeader *header, EMsgComposer *composer)
}
static void
-action_send_options_cb (GtkAction *action, EMsgComposer *composer)
+action_send_options_cb (GtkAction *action,
+ EMsgComposer *composer)
{
g_return_if_fail (action != NULL);
g_return_if_fail (composer != NULL);
@@ -212,7 +217,8 @@ action_send_options_cb (GtkAction *action, EMsgComposer *composer)
}
gboolean
-eex_ui_composer_actions (GtkUIManager *manager, EMsgComposer *composer)
+eex_ui_composer_actions (GtkUIManager *manager,
+ EMsgComposer *composer)
{
static GtkActionEntry entries[] = {
{ "eex-send-options",
diff --git a/eplugin/exchange-operations.c b/eplugin/exchange-operations.c
index 74eb0da..c204c7f 100644
--- a/eplugin/exchange-operations.c
+++ b/eplugin/exchange-operations.c
@@ -29,7 +29,7 @@
#include <e-util/e-alert-dialog.h>
#include <shell/e-shell.h>
-ExchangeConfigListener *exchange_global_config_listener=NULL;
+ExchangeConfigListener *exchange_global_config_listener = NULL;
static const gchar *error_ids[] = {
"config-error",
@@ -59,7 +59,8 @@ free_exchange_listener (void)
}
gint
-e_plugin_lib_enable (EPlugin *eplib, gint enable)
+e_plugin_lib_enable (EPlugin *eplib,
+ gint enable)
{
if (!exchange_global_config_listener) {
exchange_global_config_listener = exchange_config_listener_new ();
@@ -76,27 +77,32 @@ exchange_is_offline (gint *mode)
/* FIXME: See if a GLib variant of this function available */
gboolean
-exchange_operations_tokenize_string (gchar **string, gchar *token, gchar delimit, guint maxsize)
+exchange_operations_tokenize_string (gchar **string,
+ gchar *token,
+ gchar delimit,
+ guint maxsize)
{
- guint i=0;
+ guint i = 0;
gchar *str=*string;
- while (*str!=delimit && *str!='\0' && i<maxsize-1) {
+ while (*str != delimit && *str != '\0' && i < maxsize - 1) {
token[i++]=*str++;
}
- while (*str==delimit)
+ while (*str == delimit)
str++;
token[i]='\0';
*string = str;
- if (i==0)
+ if (i == 0)
return FALSE;
return TRUE;
}
gboolean
-exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *ruri)
+exchange_operations_cta_add_node_to_tree (GtkTreeStore *store,
+ GtkTreeIter *parent,
+ const gchar *ruri)
{
GtkTreeIter iter;
- gchar *luri=(gchar *) ruri;
+ gchar *luri = (gchar *) ruri;
gchar nodename[80];
gchar *uri;
gboolean status, found;
@@ -147,9 +153,13 @@ exchange_operations_cta_add_node_to_tree (GtkTreeStore *store, GtkTreeIter *pare
}
void
-exchange_operations_cta_select_node_from_tree (GtkTreeStore *store, GtkTreeIter *parent, const gchar *nuri, const gchar *ruri, GtkTreeSelection *selection)
+exchange_operations_cta_select_node_from_tree (GtkTreeStore *store,
+ GtkTreeIter *parent,
+ const gchar *nuri,
+ const gchar *ruri,
+ GtkTreeSelection *selection)
{
- gchar *luri=(gchar *) nuri;
+ gchar *luri = (gchar *) nuri;
gchar nodename[80];
GtkTreeIter iter;
gboolean status;
@@ -225,7 +235,8 @@ exchange_operations_get_exchange_account (void)
}
void
-exchange_operations_report_error (ExchangeAccount *account, ExchangeAccountResult result)
+exchange_operations_report_error (ExchangeAccount *account,
+ ExchangeAccountResult result)
{
gchar *error_string;
gchar *quota_value;
@@ -289,7 +300,8 @@ void exchange_operations_update_child_esources (ESource *source, const gchar *ol
}
gboolean
-is_exchange_personal_folder (ExchangeAccount *account, gchar *uri)
+is_exchange_personal_folder (ExchangeAccount *account,
+ gchar *uri)
{
ExchangeHierarchy *hier;
EFolder *folder;
diff --git a/eplugin/exchange-permissions-dialog.c b/eplugin/exchange-permissions-dialog.c
index 671a122..b413003 100644
--- a/eplugin/exchange-permissions-dialog.c
+++ b/eplugin/exchange-permissions-dialog.c
@@ -139,8 +139,8 @@ static const gchar *sd_props[] = {
**/
void
exchange_permissions_dialog_new (ExchangeAccount *account,
- EFolder *folder,
- GtkWidget *parent)
+ EFolder *folder,
+ GtkWidget *parent)
{
ExchangePermissionsDialog *dialog;
const gchar *base_uri, *folder_uri, *folder_path;
@@ -222,8 +222,9 @@ exchange_permissions_dialog_new (ExchangeAccount *account,
}
static void
-dialog_response (ExchangePermissionsDialog *dialog, gint response,
- gpointer user_data)
+dialog_response (ExchangePermissionsDialog *dialog,
+ gint response,
+ gpointer user_data)
{
E2kContext *ctx;
GByteArray *binsd;
@@ -256,7 +257,7 @@ dialog_response (ExchangePermissionsDialog *dialog, gint response,
* folder hierarchy. #29726
*/
iter = e2k_context_bproppatch_start (ctx, NULL, dialog->priv->base_uri,
- (const gchar **)&dialog->priv->folder_path, 1,
+ (const gchar **) &dialog->priv->folder_path, 1,
props, FALSE);
e2k_properties_free (props);
@@ -281,7 +282,8 @@ dialog_response (ExchangePermissionsDialog *dialog, gint response,
}
static void
-set_permissions (ExchangePermissionsDialog *dialog, guint32 perms)
+set_permissions (ExchangePermissionsDialog *dialog,
+ guint32 perms)
{
dialog->priv->selected_perms = perms;
dialog->priv->selected_role = e2k_permissions_role_find (perms);
@@ -295,7 +297,8 @@ set_permissions (ExchangePermissionsDialog *dialog, guint32 perms)
/* User list functions */
static void
-list_view_selection_changed (GtkTreeSelection *selection, gpointer user_data)
+list_view_selection_changed (GtkTreeSelection *selection,
+ gpointer user_data)
{
ExchangePermissionsDialog *dialog = user_data;
GtkTreeModel *model;
@@ -325,7 +328,9 @@ list_view_selection_changed (GtkTreeSelection *selection, gpointer user_data)
}
static void
-add_user_to_list (ExchangePermissionsDialog *dialog, E2kSid *sid, gboolean select)
+add_user_to_list (ExchangePermissionsDialog *dialog,
+ E2kSid *sid,
+ gboolean select)
{
guint32 perms;
E2kPermissionsRole role;
@@ -354,7 +359,8 @@ add_user_to_list (ExchangePermissionsDialog *dialog, E2kSid *sid, gboolean selec
}
static void
-add_clicked (GtkButton *button, gpointer user_data)
+add_clicked (GtkButton *button,
+ gpointer user_data)
{
ExchangePermissionsDialog *dialog = user_data;
E2kGlobalCatalog *gc;
@@ -441,7 +447,8 @@ add_clicked (GtkButton *button, gpointer user_data)
}
static void
-remove_clicked (GtkButton *button, gpointer user_data)
+remove_clicked (GtkButton *button,
+ gpointer user_data)
{
ExchangePermissionsDialog *dialog = user_data;
E2kSid *sid;
@@ -499,7 +506,8 @@ setup_user_list (ExchangePermissionsDialog *dialog)
/* Role option menu functions */
static void
-role_changed (GtkWidget *role_combo, gpointer user_data)
+role_changed (GtkWidget *role_combo,
+ gpointer user_data)
{
ExchangePermissionsDialog *dialog = user_data;
gint role;
@@ -556,7 +564,8 @@ display_role (ExchangePermissionsDialog *dialog)
/* Toggle buttons */
static void
-check_toggled (GtkToggleButton *toggle, gpointer user_data)
+check_toggled (GtkToggleButton *toggle,
+ gpointer user_data)
{
ExchangePermissionsDialog *dialog = user_data;
ExchangePermissionsDialogPrivate *priv = dialog->priv;
@@ -580,7 +589,8 @@ check_toggled (GtkToggleButton *toggle, gpointer user_data)
}
static void
-radio_toggled (GtkToggleButton *toggle, gpointer user_data)
+radio_toggled (GtkToggleButton *toggle,
+ gpointer user_data)
{
ExchangePermissionsDialog *dialog = user_data;
ExchangePermissionsDialogPrivate *priv = dialog->priv;
@@ -601,7 +611,8 @@ radio_toggled (GtkToggleButton *toggle, gpointer user_data)
}
static void
-rv_toggle (GtkToggleButton *toggled, gpointer user_data)
+rv_toggle (GtkToggleButton *toggled,
+ gpointer user_data)
{
ExchangePermissionsDialog *dialog = user_data;
GtkToggleButton *visible = dialog->priv->folder_visible_check;
diff --git a/eplugin/exchange-send-options.c b/eplugin/exchange-send-options.c
index 404a21e..209dd20 100644
--- a/eplugin/exchange-send-options.c
+++ b/eplugin/exchange-send-options.c
@@ -77,7 +77,7 @@ enum {
static guint signals[LAST_SIGNAL] = {0};
/* exchange_send_options_get_widgets_data(ExchangeSendOptionsDialog *sod)
- Return Value:This function returns a -1 if an error occurs. In case of error-free operation a 1 is returned.
+ * Return Value:This function returns a -1 if an error occurs. In case of error-free operation a 1 is returned.
*/
static gint
exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
@@ -86,7 +86,7 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
ExchangeSendOptions *options;
const gchar *address, *email, *name;
- guint count=0;
+ guint count = 0;
ENameSelectorEntry *name_selector_entry;
EDestinationStore *destination_store;
GList *destinations, *tmp;
@@ -95,7 +95,7 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
options = sod->options;
/* This block helps us fetch the address of the delegator(s). If no delegator is selected or more
- than one delegatee has been selected then an info dialog is popped up to help the user.
+ * than one delegatee has been selected then an info dialog is popped up to help the user.
*/
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->delegate_enabled))) {
@@ -107,9 +107,9 @@ exchange_send_options_get_widgets_data (ExchangeSendOptionsDialog *sod)
email = NULL;
/* 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 *)
- produced ambiguous results. Hence count is used :)
+ * 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 *)
+ * produced ambiguous results. Hence count is used :)
*/
for (; tmp != NULL; tmp = g_list_next (tmp)) {
address = g_strdup ((gchar *) e_destination_get_address (tmp->data));
@@ -204,7 +204,8 @@ exchange_send_options_fill_widgets_with_data (ExchangeSendOptionsDialog *sod)
}
ExchangeSendOptionsDialog *
-exchange_sendoptions_dialog_new (void) {
+exchange_sendoptions_dialog_new (void)
+{
ExchangeSendOptionsDialog *sod;
sod = g_object_new (EXCHANGE_TYPE_SENDOPTIONS_DIALOG, NULL);
@@ -212,7 +213,10 @@ exchange_sendoptions_dialog_new (void) {
return sod;
}
-static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
+static void
+exchange_send_options_cb (GtkDialog *dialog,
+ gint state,
+ gpointer func_data)
{
ExchangeSendOptionsDialogPrivate *priv;
ExchangeSendOptionsDialog *sod;
@@ -239,17 +243,18 @@ static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer fu
}
/* This function acts as a listener for the toggling of "send_as_a_delegate" button. This is needed to
- sensitize the name_selector_entry and the User Button
+ * sensitize the name_selector_entry and the User Button
*/
static void
-delegate_option_toggled (GtkCheckButton *button, gpointer func_data)
+delegate_option_toggled (GtkCheckButton *button,
+ gpointer func_data)
{
ExchangeSendOptionsDialogPrivate *priv;
ExchangeSendOptionsDialog *sod;
ENameSelectorEntry *name_selector_entry;
- sod=func_data;
- priv=sod->priv;
+ sod = func_data;
+ priv = sod->priv;
name_selector_entry = e_name_selector_peek_section_entry (priv->proxy_name_selector, "Add User");
@@ -266,35 +271,40 @@ delegate_option_toggled (GtkCheckButton *button, gpointer func_data)
}
static void
-addressbook_dialog_response (ENameSelectorDialog *name_selector_dialog, gint response, gpointer user_data)
+addressbook_dialog_response (ENameSelectorDialog *name_selector_dialog,
+ gint response,
+ gpointer user_data)
{
gtk_widget_hide (GTK_WIDGET (name_selector_dialog));
}
static void
-addressbook_entry_changed (GtkWidget *entry, gpointer user_data)
+addressbook_entry_changed (GtkWidget *entry,
+ gpointer user_data)
{
}
/* This function invokes the name selector dialog
*/
static void
-address_button_clicked (GtkButton *button, gpointer func_data)
+address_button_clicked (GtkButton *button,
+ gpointer func_data)
{
ExchangeSendOptionsDialogPrivate *priv;
ExchangeSendOptionsDialog *sod;
ENameSelectorDialog *name_selector_dialog;
- sod=func_data;
- priv=sod->priv;
+ sod = func_data;
+ priv = sod->priv;
name_selector_dialog = e_name_selector_peek_dialog (priv->proxy_name_selector);
gtk_widget_show (GTK_WIDGET (name_selector_dialog));
}
gboolean
-exchange_sendoptions_dialog_run (ExchangeSendOptionsDialog *sod, GtkWidget *parent)
+exchange_sendoptions_dialog_run (ExchangeSendOptionsDialog *sod,
+ GtkWidget *parent)
{
ExchangeSendOptionsDialogPrivate *priv;
ExchangeSendOptions *options;
@@ -374,7 +384,7 @@ exchange_sendoptions_dialog_run (ExchangeSendOptionsDialog *sod, GtkWidget *pare
gtk_misc_set_alignment (GTK_MISC (importance_label), 0, 0.49);
/* Translators: Here's set a message sensitivity, which means for exchange
- one of Normal, Personal, Private, Confidential. */
+ * one of Normal, Personal, Private, Confidential. */
sensitivity_label = gtk_label_new_with_mnemonic (_("_Sensitivity: "));
gtk_widget_show (sensitivity_label);
gtk_table_attach (GTK_TABLE (msg_settings_table), sensitivity_label, 0, 1, 1, 2,
@@ -490,7 +500,7 @@ exchange_sendoptions_dialog_run (ExchangeSendOptionsDialog *sod, GtkWidget *pare
g_signal_connect (name_selector_entry, "changed", G_CALLBACK (addressbook_entry_changed), sod);
/* The name box is just a container. The name_selector_entry is added to it. This Widget
- is created dynamically*/
+ * is created dynamically*/
gtk_container_add ((GtkContainer *) del_name_box, (GtkWidget *) name_selector_entry);
gtk_widget_show ((GtkWidget *) name_selector_entry);
gtk_widget_grab_focus ((GtkWidget *) name_selector_entry);
diff --git a/eplugin/exchange-send-options.h b/eplugin/exchange-send-options.h
index 131fee0..1de6cfa 100644
--- a/eplugin/exchange-send-options.h
+++ b/eplugin/exchange-send-options.h
@@ -50,7 +50,7 @@ typedef enum {
} ExchangeSendOptionsSensitivity;
/* We require the delegate_email and delegate_name to store the address of the delegator selected into
- the destination store.
+ * the destination store.
*/
typedef struct {
ExchangeSendOptionsImp importance;
diff --git a/eplugin/exchange-user-dialog.c b/eplugin/exchange-user-dialog.c
index 9eb7485..c167084 100644
--- a/eplugin/exchange-user-dialog.c
+++ b/eplugin/exchange-user-dialog.c
@@ -91,7 +91,8 @@ e2k_user_dialog_init (E2kUserDialog *dialog)
}
static void
-parent_window_destroyed (gpointer user_data, GObject *where_parent_window_was)
+parent_window_destroyed (gpointer user_data,
+ GObject *where_parent_window_was)
{
E2kUserDialog *dialog = user_data;
@@ -100,13 +101,16 @@ parent_window_destroyed (gpointer user_data, GObject *where_parent_window_was)
}
static void
-addressbook_dialog_response (ENameSelectorDialog *name_selector_dialog, gint response, gpointer data)
+addressbook_dialog_response (ENameSelectorDialog *name_selector_dialog,
+ gint response,
+ gpointer data)
{
gtk_widget_hide (GTK_WIDGET (name_selector_dialog));
}
static void
-addressbook_clicked_cb (GtkWidget *widget, gpointer data)
+addressbook_clicked_cb (GtkWidget *widget,
+ gpointer data)
{
E2kUserDialog *dialog = data;
E2kUserDialogPrivate *priv;
@@ -121,9 +125,9 @@ addressbook_clicked_cb (GtkWidget *widget, gpointer data)
static gboolean
e2k_user_dialog_construct (E2kUserDialog *dialog,
- GtkWidget *parent_window,
- const gchar *label_text,
- const gchar *section_name)
+ GtkWidget *parent_window,
+ const gchar *label_text,
+ const gchar *section_name)
{
E2kUserDialogPrivate *priv;
GtkWidget *hbox, *vbox, *label, *button;
@@ -196,7 +200,8 @@ e2k_user_dialog_construct (E2kUserDialog *dialog,
**/
GtkWidget *
e2k_user_dialog_new (GtkWidget *parent_window,
- const gchar *label_text, const gchar *section_name)
+ const gchar *label_text,
+ const gchar *section_name)
{
E2kUserDialog *dialog;
diff --git a/server/lib/actest.c b/server/lib/actest.c
index 0fdc4c7..b15e6ff 100644
--- a/server/lib/actest.c
+++ b/server/lib/actest.c
@@ -53,7 +53,8 @@ quit (gint sig)
}
void
-test_main (gint argc, gchar **argv)
+test_main (gint argc,
+ gchar **argv)
{
E2kAutoconfig *ac;
E2kAutoconfigResult result;
diff --git a/server/lib/cptest.c b/server/lib/cptest.c
index 91c0349..ad6c2e0 100644
--- a/server/lib/cptest.c
+++ b/server/lib/cptest.c
@@ -34,7 +34,8 @@
const gchar *test_program_name = "cptest";
static void
-krb_error (E2kKerberosResult result, const gchar *failed)
+krb_error (E2kKerberosResult result,
+ const gchar *failed)
{
switch (result) {
case E2K_KERBEROS_USER_UNKNOWN:
@@ -75,7 +76,8 @@ krb_error (E2kKerberosResult result, const gchar *failed)
}
void
-test_main (gint argc, gchar **argv)
+test_main (gint argc,
+ gchar **argv)
{
gchar *domain, *at, *prompt, *password;
gchar *newpass1, *newpass2;
diff --git a/server/lib/davcat.c b/server/lib/davcat.c
index cb1754e..f74562d 100644
--- a/server/lib/davcat.c
+++ b/server/lib/davcat.c
@@ -37,7 +37,9 @@
#include "test-utils.h"
static void
-print_header (gpointer name, gpointer value, gpointer data)
+print_header (gpointer name,
+ gpointer value,
+ gpointer data)
{
gboolean *isxml = data;
@@ -50,7 +52,8 @@ print_header (gpointer name, gpointer value, gpointer data)
const gchar *test_program_name = "davcat";
void
-test_main (gint argc, gchar **argv)
+test_main (gint argc,
+ gchar **argv)
{
E2kContext *ctx;
SoupMessage *msg;
diff --git a/server/lib/e2k-action.c b/server/lib/e2k-action.c
index 6662f34..21ddc78 100644
--- a/server/lib/e2k-action.c
+++ b/server/lib/e2k-action.c
@@ -49,8 +49,9 @@ copy_bytearray (GByteArray *ba)
}
static E2kAction *
-xfer_action (E2kActionType type, GByteArray *store_entryid,
- GByteArray *folder_source_key)
+xfer_action (E2kActionType type,
+ GByteArray *store_entryid,
+ GByteArray *folder_source_key)
{
E2kAction *act;
@@ -72,7 +73,8 @@ xfer_action (E2kActionType type, GByteArray *store_entryid,
* Return value: the new rule action
**/
E2kAction *
-e2k_action_move (GByteArray *store_entryid, GByteArray *folder_source_key)
+e2k_action_move (GByteArray *store_entryid,
+ GByteArray *folder_source_key)
{
return xfer_action (E2K_ACTION_MOVE, store_entryid, folder_source_key);
}
@@ -87,14 +89,16 @@ e2k_action_move (GByteArray *store_entryid, GByteArray *folder_source_key)
* Return value: the new rule action
**/
E2kAction *
-e2k_action_copy (GByteArray *store_entryid, GByteArray *folder_source_key)
+e2k_action_copy (GByteArray *store_entryid,
+ GByteArray *folder_source_key)
{
return xfer_action (E2K_ACTION_COPY, store_entryid, folder_source_key);
}
static E2kAction *
-reply_action (E2kActionType type, GByteArray *template_entryid,
- guint8 template_guid[16])
+reply_action (E2kActionType type,
+ GByteArray *template_entryid,
+ guint8 template_guid[16])
{
E2kAction *act;
@@ -117,7 +121,8 @@ reply_action (E2kActionType type, GByteArray *template_entryid,
* Return value: the new rule action
**/
E2kAction *
-e2k_action_reply (GByteArray *template_entryid, guint8 template_guid[16])
+e2k_action_reply (GByteArray *template_entryid,
+ guint8 template_guid[16])
{
return reply_action (E2K_ACTION_REPLY, template_entryid, template_guid);
}
@@ -133,7 +138,8 @@ e2k_action_reply (GByteArray *template_entryid, guint8 template_guid[16])
* Return value: the new rule action
**/
E2kAction *
-e2k_action_oof_reply (GByteArray *template_entryid, guint8 template_guid[16])
+e2k_action_oof_reply (GByteArray *template_entryid,
+ guint8 template_guid[16])
{
return reply_action (E2K_ACTION_OOF_REPLY, template_entryid, template_guid);
}
@@ -179,7 +185,8 @@ e2k_action_bounce (E2kActionBounceCode bounce_code)
}
static E2kAction *
-forward_action (E2kActionType type, E2kAddrList *list)
+forward_action (E2kActionType type,
+ E2kAddrList *list)
{
E2kAction *act;
@@ -235,7 +242,9 @@ e2k_action_delegate (E2kAddrList *list)
* Return value: the new rule action
**/
E2kAction *
-e2k_action_tag (const gchar *propname, E2kPropType type, gpointer value)
+e2k_action_tag (const gchar *propname,
+ E2kPropType type,
+ gpointer value)
{
E2kAction *act;
@@ -289,9 +298,11 @@ e2k_addr_list_new (gint nentries)
}
static void
-addr_entry_set_core (E2kPropValue *pv, GByteArray *entryid,
- const gchar *display_name, const gchar *email_type,
- const gchar *email_addr)
+addr_entry_set_core (E2kPropValue *pv,
+ GByteArray *entryid,
+ const gchar *display_name,
+ const gchar *email_type,
+ const gchar *email_addr)
{
e2k_rule_prop_set (&pv[0].prop, PR_ENTRYID);
pv[0].type = E2K_PROP_TYPE_BINARY;
@@ -346,10 +357,11 @@ addr_entry_set_core (E2kPropValue *pv, GByteArray *entryid,
* local Exchange user.
**/
void
-e2k_addr_list_set_local (E2kAddrList *list, gint entry_num,
- const gchar *display_name,
- const gchar *exchange_dn,
- const gchar *email)
+e2k_addr_list_set_local (E2kAddrList *list,
+ gint entry_num,
+ const gchar *display_name,
+ const gchar *exchange_dn,
+ const gchar *email)
{
E2kPropValue *pv;
@@ -379,8 +391,10 @@ e2k_addr_list_set_local (E2kAddrList *list, gint entry_num,
* "one-off" SMTP user.
**/
void
-e2k_addr_list_set_oneoff (E2kAddrList *list, gint entry_num,
- const gchar *display_name, const gchar *email)
+e2k_addr_list_set_oneoff (E2kAddrList *list,
+ gint entry_num,
+ const gchar *display_name,
+ const gchar *email)
{
E2kPropValue *pv;
@@ -485,7 +499,9 @@ e2k_actions_free (GPtrArray *actions)
}
static gboolean
-extract_action (guint8 **data, gint *len, E2kAction **act_ret)
+extract_action (guint8 **data,
+ gint *len,
+ E2kAction **act_ret)
{
gint my_len;
guint8 *my_data;
@@ -656,7 +672,9 @@ extract_action (guint8 **data, gint *len, E2kAction **act_ret)
* Return value: success or failure
**/
gboolean
-e2k_actions_extract (guint8 **data, gint *len, GPtrArray **actions)
+e2k_actions_extract (guint8 **data,
+ gint *len,
+ GPtrArray **actions)
{
GPtrArray *acts;
E2kAction *act;
@@ -686,7 +704,8 @@ e2k_actions_extract (guint8 **data, gint *len, GPtrArray **actions)
}
static void
-append_action (GByteArray *ba, E2kAction *act)
+append_action (GByteArray *ba,
+ E2kAction *act)
{
gint actlen_offset, actlen;
gchar type;
@@ -783,7 +802,8 @@ append_action (GByteArray *ba, E2kAction *act)
* Appends @actions to @ba as part of a server-side rule.
**/
void
-e2k_actions_append (GByteArray *ba, GPtrArray *actions)
+e2k_actions_append (GByteArray *ba,
+ GPtrArray *actions)
{
gint actlen_offset, actlen, i;
diff --git a/server/lib/e2k-autoconfig.c b/server/lib/e2k-autoconfig.c
index b68e936..722b334 100644
--- a/server/lib/e2k-autoconfig.c
+++ b/server/lib/e2k-autoconfig.c
@@ -92,8 +92,10 @@ static void set_account_uri_string (E2kAutoconfig *ac);
* Return value: an autoconfig context
**/
E2kAutoconfig *
-e2k_autoconfig_new (const gchar *owa_uri, const gchar *username,
- const gchar *password, E2kAutoconfigAuthPref auth_pref)
+e2k_autoconfig_new (const gchar *owa_uri,
+ const gchar *username,
+ const gchar *password,
+ E2kAutoconfigAuthPref auth_pref)
{
E2kAutoconfig *ac;
@@ -208,7 +210,8 @@ reset_owa_derived (E2kAutoconfig *ac)
* the old value of #owa_uri.
**/
void
-e2k_autoconfig_set_owa_uri (E2kAutoconfig *ac, const gchar *owa_uri)
+e2k_autoconfig_set_owa_uri (E2kAutoconfig *ac,
+ const gchar *owa_uri)
{
reset_owa_derived (ac);
if (ac->gc_server_autodetected)
@@ -237,8 +240,10 @@ e2k_autoconfig_set_owa_uri (E2kAutoconfig *ac, const gchar *owa_uri)
* of #gc_server.
**/
void
-e2k_autoconfig_set_gc_server (E2kAutoconfig *ac, const gchar *gc_server,
- gint gal_limit, E2kAutoconfigGalAuthPref gal_auth)
+e2k_autoconfig_set_gc_server (E2kAutoconfig *ac,
+ const gchar *gc_server,
+ gint gal_limit,
+ E2kAutoconfigGalAuthPref gal_auth)
{
const gchar *default_gal_limit;
@@ -270,7 +275,8 @@ e2k_autoconfig_set_gc_server (E2kAutoconfig *ac, const gchar *gc_server,
* set based on the old value of #username.
**/
void
-e2k_autoconfig_set_username (E2kAutoconfig *ac, const gchar *username)
+e2k_autoconfig_set_username (E2kAutoconfig *ac,
+ const gchar *username)
{
gint dlen;
@@ -299,14 +305,16 @@ e2k_autoconfig_set_username (E2kAutoconfig *ac, const gchar *username)
* Sets or clears @ac's #password field.
**/
void
-e2k_autoconfig_set_password (E2kAutoconfig *ac, const gchar *password)
+e2k_autoconfig_set_password (E2kAutoconfig *ac,
+ const gchar *password)
{
g_free (ac->password);
ac->password = g_strdup (password);
}
static void
-get_ctx_auth_handler (SoupMessage *msg, gpointer user_data)
+get_ctx_auth_handler (SoupMessage *msg,
+ gpointer user_data)
{
E2kAutoconfig *ac = user_data;
GSList *headers;
@@ -388,8 +396,9 @@ get_ctx_auth_handler (SoupMessage *msg, gpointer user_data)
* (If you change this comment, see the note at the top of this file.)
**/
E2kContext *
-e2k_autoconfig_get_context (E2kAutoconfig *ac, E2kOperation *op,
- E2kAutoconfigResult *result)
+e2k_autoconfig_get_context (E2kAutoconfig *ac,
+ E2kOperation *op,
+ E2kAutoconfigResult *result)
{
E2kContext *ctx;
SoupMessage *msg;
@@ -645,7 +654,8 @@ static const gchar *home_properties[] = {
* (If you change this comment, see the note at the top of this file.)
**/
E2kAutoconfigResult
-e2k_autoconfig_check_exchange (E2kAutoconfig *ac, E2kOperation *op)
+e2k_autoconfig_check_exchange (E2kAutoconfig *ac,
+ E2kOperation *op)
{
xmlDoc *doc;
xmlNode *node;
@@ -892,7 +902,8 @@ find_global_catalog (E2kAutoconfig *ac)
* wasn't provided and couldn't be autodetected.
*/
E2kGlobalCatalog *
-e2k_autoconfig_get_global_catalog (E2kAutoconfig *ac, E2kOperation *op)
+e2k_autoconfig_get_global_catalog (E2kAutoconfig *ac,
+ E2kOperation *op)
{
if (!ac->gc_server) {
find_global_catalog (ac);
@@ -931,7 +942,8 @@ e2k_autoconfig_get_global_catalog (E2kAutoconfig *ac, E2kOperation *op)
* (If you change this comment, see the note at the top of this file.)
*/
E2kAutoconfigResult
-e2k_autoconfig_check_global_catalog (E2kAutoconfig *ac, E2kOperation *op)
+e2k_autoconfig_check_global_catalog (E2kAutoconfig *ac,
+ E2kOperation *op)
{
E2kGlobalCatalog *gc;
E2kGlobalCatalogEntry *entry;
@@ -1432,7 +1444,7 @@ read_config (void)
p = config_data;
while (1) {
- for (name = p; isspace ((guchar)*name); name++)
+ for (name = p; isspace ((guchar) * name); name++)
;
p = strchr (name, ':');
@@ -1473,7 +1485,11 @@ e2k_autoconfig_lookup_option (const gchar *option)
}
static gboolean
-validate (const gchar *owa_url, gchar *user, gchar *password, ExchangeParams *exchange_params, E2kAutoconfigResult *result)
+validate (const gchar *owa_url,
+ gchar *user,
+ gchar *password,
+ ExchangeParams *exchange_params,
+ E2kAutoconfigResult *result)
{
E2kAutoconfig *ac;
E2kOperation op; /* FIXME */
@@ -1585,9 +1601,9 @@ validate (const gchar *owa_url, gchar *user, gchar *password, ExchangeParams *ex
/* SURF : e_notice (NULL, GTK_MESSAGE_ERROR,
_("Could not connect to the Exchange "
- "server.\nMake sure the URL is correct "
- "(try \"%s\" instead of \"%s\"?) "
- "and try again."), new, old);
+ * "server.\nMake sure the URL is correct "
+ * "(try \"%s\" instead of \"%s\"?) "
+ * "and try again."), new, old);
*/
valid = FALSE;
break;
@@ -1676,11 +1692,15 @@ validate (const gchar *owa_url, gchar *user, gchar *password, ExchangeParams *ex
}
gboolean
-e2k_validate_user (const gchar *owa_url, gchar *pkey, gchar **user,
- ExchangeParams *exchange_params, gboolean *remember_password,
- E2kAutoconfigResult *result, GtkWindow *parent)
+e2k_validate_user (const gchar *owa_url,
+ gchar *pkey,
+ gchar **user,
+ ExchangeParams *exchange_params,
+ gboolean *remember_password,
+ E2kAutoconfigResult *result,
+ GtkWindow *parent)
{
- gboolean valid = FALSE, remember=FALSE;
+ gboolean valid = FALSE, remember = FALSE;
gchar *key, *password, *prompt;
gchar *username;
gchar **usernames;
@@ -1706,7 +1726,7 @@ try_auth_again:
prompt = g_strdup_printf (_("Enter password for %s"), username);
password = e_passwords_ask_password (_("Enter password"),
NULL, key, prompt,
- E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET,
+ E_PASSWORDS_REMEMBER_FOREVER | E_PASSWORDS_SECRET,
&remember, parent);
g_free (prompt);
if (!password) {
diff --git a/server/lib/e2k-context.c b/server/lib/e2k-context.c
index 15190f5..59932c0 100644
--- a/server/lib/e2k-context.c
+++ b/server/lib/e2k-context.c
@@ -101,7 +101,7 @@ struct _E2kContextPrivate {
/* Forms-based authentication */
gchar *cookie;
gboolean cookie_verified;
- EProxy* proxy;
+ EProxy * proxy;
};
/* For operations with progress */
@@ -139,10 +139,11 @@ G_DEFINE_TYPE (
G_TYPE_OBJECT)
static void
-proxy_settings_changed (EProxy *proxy, gpointer user_data)
+proxy_settings_changed (EProxy *proxy,
+ gpointer user_data)
{
SoupURI *proxy_uri = NULL;
- E2kContext* ctx = (E2kContext *) user_data;
+ E2kContext * ctx = (E2kContext *) user_data;
if (!ctx || !ctx->priv ||
(!ctx->priv->session && !ctx->priv->async_session) ||
(!ctx->priv->owa_uri))
@@ -162,7 +163,9 @@ proxy_settings_changed (EProxy *proxy, gpointer user_data)
}
static void
-destroy_sub_list (gpointer uri, gpointer sub_list, gpointer ctx)
+destroy_sub_list (gpointer uri,
+ gpointer sub_list,
+ gpointer ctx)
{
unsubscribe_internal (ctx, uri, sub_list, TRUE);
g_list_free (sub_list);
@@ -271,7 +274,9 @@ e2k_context_init (E2kContext *ctx)
}
static void
-renew_sub_list (gpointer key, gpointer value, gpointer data)
+renew_sub_list (gpointer key,
+ gpointer value,
+ gpointer data)
{
GList *sub_list;
@@ -280,7 +285,9 @@ renew_sub_list (gpointer key, gpointer value, gpointer data)
}
static void
-got_connection (SoupSocket *sock, guint status, gpointer user_data)
+got_connection (SoupSocket *sock,
+ guint status,
+ gpointer user_data)
{
E2kContext *ctx = user_data;
SoupAddress *addr;
@@ -310,7 +317,7 @@ got_connection (SoupSocket *sock, guint status, gpointer user_data)
if (port < 1024)
port += 1024;
sin.sin_port = htons (port);
- ret = bind (s, (struct sockaddr *)&sin, sizeof (sin));
+ ret = bind (s, (struct sockaddr *) &sin, sizeof (sin));
} while (STATUS_IS_SOCKET_ERROR (ret) && BIND_STATUS_IS_ADDRINUSE ());
if (ret == -1) {
@@ -384,8 +391,11 @@ e2k_context_new (const gchar *uri)
}
static void
-session_authenticate (SoupSession *session, SoupMessage *msg,
- SoupAuth *auth, gboolean retrying, gpointer user_data)
+session_authenticate (SoupSession *session,
+ SoupMessage *msg,
+ SoupAuth *auth,
+ gboolean retrying,
+ gpointer user_data)
{
E2kContext *ctx = user_data;
@@ -418,12 +428,14 @@ e2k_context_soup_thread (gpointer user_data)
* side effect of cancelling any pending requests on @ctx.
**/
void
-e2k_context_set_auth (E2kContext *ctx, const gchar *username,
- const gchar *domain, const gchar *authmech,
- const gchar *password)
+e2k_context_set_auth (E2kContext *ctx,
+ const gchar *username,
+ const gchar *domain,
+ const gchar *authmech,
+ const gchar *password)
{
guint timeout = E2K_SOUP_SESSION_TIMEOUT;
- SoupURI* uri = NULL;
+ SoupURI * uri = NULL;
E2kContextPrivate *priv = ctx->priv;
#ifdef E2K_DEBUG
SoupLogger *logger;
@@ -454,7 +466,7 @@ e2k_context_set_auth (E2kContext *ctx, const gchar *username,
g_object_unref (ctx->priv->async_session);
/* Set a default timeout value of 30 seconds.
- FIXME: Make timeout configurable
+ * FIXME: Make timeout configurable
*/
if (g_getenv ("SOUP_SESSION_TIMEOUT"))
timeout = atoi (g_getenv ("SOUP_SESSION_TIMEOUT"));
@@ -537,8 +549,9 @@ e2k_context_get_last_timestamp (E2kContext *ctx)
* meaning we want to show most, but not all, bodies.
*/
static SoupLoggerLogLevel
-e2k_debug_request_filter (SoupLogger *logger, SoupMessage *msg,
- gpointer user_data)
+e2k_debug_request_filter (SoupLogger *logger,
+ SoupMessage *msg,
+ gpointer user_data)
{
if (msg->method == SOUP_METHOD_POST)
return SOUP_LOGGER_LOG_HEADERS;
@@ -547,8 +560,9 @@ e2k_debug_request_filter (SoupLogger *logger, SoupMessage *msg,
}
static SoupLoggerLogLevel
-e2k_debug_response_filter (SoupLogger *logger, SoupMessage *msg,
- gpointer user_data)
+e2k_debug_response_filter (SoupLogger *logger,
+ SoupMessage *msg,
+ gpointer user_data)
{
const gchar *content_type;
@@ -579,7 +593,8 @@ e2k_debug_response_filter (SoupLogger *logger, SoupMessage *msg,
* succeeded, in which case @failed_msg can be requeued.
**/
gboolean
-e2k_context_fba (E2kContext *ctx, SoupMessage *failed_msg)
+e2k_context_fba (E2kContext *ctx,
+ SoupMessage *failed_msg)
{
static gboolean in_fba_auth = FALSE;
gint status, len;
@@ -657,9 +672,9 @@ e2k_context_fba (E2kContext *ctx, SoupMessage *failed_msg)
location = soup_message_headers_get (failed_msg->response_headers,
"Location");
- if (location != NULL) {/*Make sure we can get absolute path*/
+ if (location != NULL) {/*Make sure we can get absolute path */
suri = soup_uri_new (location);
- if (suri != NULL) {/*Valid URI*/
+ if (suri != NULL) {/*Valid URI */
if (!suri->path || strchr (suri->path, '/') == NULL)
goto failed;
@@ -774,7 +789,8 @@ e2k_context_fba (E2kContext *ctx, SoupMessage *failed_msg)
}
static void
-fba_timeout_handler (SoupMessage *msg, gpointer user_data)
+fba_timeout_handler (SoupMessage *msg,
+ gpointer user_data)
{
E2kContext *ctx = user_data;
@@ -785,7 +801,8 @@ fba_timeout_handler (SoupMessage *msg, gpointer user_data)
}
static void
-timestamp_handler (SoupMessage *msg, gpointer user_data)
+timestamp_handler (SoupMessage *msg,
+ gpointer user_data)
{
E2kContext *ctx = user_data;
const gchar *date;
@@ -796,7 +813,8 @@ timestamp_handler (SoupMessage *msg, gpointer user_data)
}
static void
-redirect_handler (SoupMessage *msg, gpointer user_data)
+redirect_handler (SoupMessage *msg,
+ gpointer user_data)
{
E2kContext *ctx = user_data;
const gchar *new_uri;
@@ -818,8 +836,10 @@ redirect_handler (SoupMessage *msg, gpointer user_data)
}
static void
-setup_message (SoupSession *session, SoupMessage *msg,
- SoupSocket *socket, gpointer user_data)
+setup_message (SoupSession *session,
+ SoupMessage *msg,
+ SoupSocket *socket,
+ gpointer user_data)
{
E2kContext *ctx = user_data;
@@ -857,7 +877,9 @@ setup_message (SoupSession *session, SoupMessage *msg,
* Return value: a new %SoupMessage, set up for connector use
**/
SoupMessage *
-e2k_soup_message_new (E2kContext *ctx, const gchar *uri, const gchar *method)
+e2k_soup_message_new (E2kContext *ctx,
+ const gchar *uri,
+ const gchar *method)
{
SoupMessage *msg;
@@ -892,10 +914,13 @@ e2k_soup_message_new (E2kContext *ctx, const gchar *uri, const gchar *method)
* connector use
**/
SoupMessage *
-e2k_soup_message_new_full (E2kContext *ctx, const gchar *uri,
- const gchar *method, const gchar *content_type,
- SoupMemoryUse use, const gchar *body,
- gsize length)
+e2k_soup_message_new_full (E2kContext *ctx,
+ const gchar *uri,
+ const gchar *method,
+ const gchar *content_type,
+ SoupMemoryUse use,
+ const gchar *body,
+ gsize length)
{
SoupMessage *msg;
@@ -946,9 +971,10 @@ e2k_trigger_queue_request (struct _e2k_queue_data *data)
* Asynchronously queues @msg in @ctx's session.
**/
void
-e2k_context_queue_message (E2kContext *ctx, SoupMessage *msg,
- SoupSessionCallback callback,
- gpointer user_data)
+e2k_context_queue_message (E2kContext *ctx,
+ SoupMessage *msg,
+ SoupSessionCallback callback,
+ gpointer user_data)
{
struct _e2k_queue_data *queue_data;
@@ -964,7 +990,9 @@ e2k_context_queue_message (E2kContext *ctx, SoupMessage *msg,
}
static void
-context_canceller (E2kOperation *op, gpointer owner, gpointer data)
+context_canceller (E2kOperation *op,
+ gpointer owner,
+ gpointer data)
{
E2kContext *ctx = owner;
SoupMessage *msg = data;
@@ -984,7 +1012,9 @@ context_canceller (E2kOperation *op, gpointer owner, gpointer data)
* Return value: the HTTP status of the message
**/
E2kHTTPStatus
-e2k_context_send_message (E2kContext *ctx, E2kOperation *op, SoupMessage *msg)
+e2k_context_send_message (E2kContext *ctx,
+ E2kOperation *op,
+ SoupMessage *msg)
{
E2kHTTPStatus status;
@@ -1003,9 +1033,13 @@ e2k_context_send_message (E2kContext *ctx, E2kOperation *op, SoupMessage *msg)
}
static void
-update_unique_uri (E2kContext *ctx, SoupMessage *msg,
- const gchar *folder_uri, const gchar *encoded_name, gint *count,
- E2kContextTestCallback test_callback, gpointer user_data)
+update_unique_uri (E2kContext *ctx,
+ SoupMessage *msg,
+ const gchar *folder_uri,
+ const gchar *encoded_name,
+ gint *count,
+ E2kContextTestCallback test_callback,
+ gpointer user_data)
{
SoupURI *suri;
gchar *uri = NULL;
@@ -1031,7 +1065,10 @@ update_unique_uri (E2kContext *ctx, SoupMessage *msg,
/* GET */
static SoupMessage *
-get_msg (E2kContext *ctx, const gchar *uri, gboolean owa, gboolean claim_ie)
+get_msg (E2kContext *ctx,
+ const gchar *uri,
+ gboolean owa,
+ gboolean claim_ie)
{
SoupMessage *msg;
@@ -1065,8 +1102,11 @@ get_msg (E2kContext *ctx, const gchar *uri, gboolean owa, gboolean claim_ie)
* Return value: the HTTP status
**/
E2kHTTPStatus
-e2k_context_get (E2kContext *ctx, E2kOperation *op, const gchar *uri,
- gchar **content_type, SoupBuffer **response)
+e2k_context_get (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *uri,
+ gchar **content_type,
+ SoupBuffer **response)
{
SoupMessage *msg;
E2kHTTPStatus status;
@@ -1106,9 +1146,11 @@ e2k_context_get (E2kContext *ctx, E2kOperation *op, const gchar *uri,
* Return value: the HTTP status
**/
E2kHTTPStatus
-e2k_context_get_owa (E2kContext *ctx, E2kOperation *op,
- const gchar *uri, gboolean claim_ie,
- SoupBuffer **response)
+e2k_context_get_owa (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *uri,
+ gboolean claim_ie,
+ SoupBuffer **response)
{
SoupMessage *msg;
E2kHTTPStatus status;
@@ -1131,8 +1173,12 @@ e2k_context_get_owa (E2kContext *ctx, E2kOperation *op,
/* PUT / POST */
static SoupMessage *
-put_msg (E2kContext *ctx, const gchar *uri, const gchar *content_type,
- SoupMemoryUse buffer_type, const gchar *body, gint length)
+put_msg (E2kContext *ctx,
+ const gchar *uri,
+ const gchar *content_type,
+ SoupMemoryUse buffer_type,
+ const gchar *body,
+ gint length)
{
SoupMessage *msg;
@@ -1144,8 +1190,12 @@ put_msg (E2kContext *ctx, const gchar *uri, const gchar *content_type,
}
static SoupMessage *
-post_msg (E2kContext *ctx, const gchar *uri, const gchar *content_type,
- SoupMemoryUse buffer_type, const gchar *body, gint length)
+post_msg (E2kContext *ctx,
+ const gchar *uri,
+ const gchar *content_type,
+ SoupMemoryUse buffer_type,
+ const gchar *body,
+ gint length)
{
SoupMessage *msg;
@@ -1157,7 +1207,9 @@ post_msg (E2kContext *ctx, const gchar *uri, const gchar *content_type,
}
static void
-extract_put_results (SoupMessage *msg, gchar **location, gchar **repl_uid)
+extract_put_results (SoupMessage *msg,
+ gchar **location,
+ gchar **repl_uid)
{
const gchar *header;
@@ -1192,9 +1244,13 @@ extract_put_results (SoupMessage *msg, gchar **location, gchar **repl_uid)
* Return value: the HTTP status
**/
E2kHTTPStatus
-e2k_context_put (E2kContext *ctx, E2kOperation *op, const gchar *uri,
- const gchar *content_type, const gchar *body, gint length,
- gchar **repl_uid)
+e2k_context_put (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *uri,
+ const gchar *content_type,
+ const gchar *body,
+ gint length,
+ gchar **repl_uid)
{
SoupMessage *msg;
E2kHTTPStatus status;
@@ -1238,11 +1294,17 @@ e2k_context_put (E2kContext *ctx, E2kOperation *op, const gchar *uri,
* Return value: the HTTP status
**/
E2kHTTPStatus
-e2k_context_put_new (E2kContext *ctx, E2kOperation *op,
- const gchar *folder_uri, const gchar *object_name,
- E2kContextTestCallback test_callback, gpointer user_data,
- const gchar *content_type, const gchar *body, gint length,
- gchar **location, gchar **repl_uid)
+e2k_context_put_new (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *folder_uri,
+ const gchar *object_name,
+ E2kContextTestCallback test_callback,
+ gpointer user_data,
+ const gchar *content_type,
+ const gchar *body,
+ gint length,
+ gchar **location,
+ gchar **repl_uid)
{
SoupMessage *msg;
E2kHTTPStatus status;
@@ -1300,9 +1362,14 @@ e2k_context_put_new (E2kContext *ctx, E2kOperation *op,
* Return value: the HTTP status
**/
E2kHTTPStatus
-e2k_context_post (E2kContext *ctx, E2kOperation *op, const gchar *uri,
- const gchar *content_type, const gchar *body, gint length,
- gchar **location, gchar **repl_uid)
+e2k_context_post (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *uri,
+ const gchar *content_type,
+ const gchar *body,
+ gint length,
+ gchar **location,
+ gchar **repl_uid)
{
SoupMessage *msg;
E2kHTTPStatus status;
@@ -1325,7 +1392,9 @@ e2k_context_post (E2kContext *ctx, E2kOperation *op, const gchar *uri,
/* PROPPATCH */
static void
-add_namespaces (const gchar *namespace, gchar abbrev, gpointer user_data)
+add_namespaces (const gchar *namespace,
+ gchar abbrev,
+ gpointer user_data)
{
GString *propxml = user_data;
@@ -1333,8 +1402,11 @@ add_namespaces (const gchar *namespace, gchar abbrev, gpointer user_data)
}
static void
-write_prop (GString *xml, const gchar *propertyname,
- E2kPropType type, gpointer value, gboolean set)
+write_prop (GString *xml,
+ const gchar *propertyname,
+ E2kPropType type,
+ gpointer value,
+ gboolean set)
{
const gchar *namespace, *name, *typestr;
gchar *encoded, abbrev;
@@ -1353,7 +1425,7 @@ write_prop (GString *xml, const gchar *propertyname,
g_string_append_printf (xml, "<%c:%s", abbrev, name);
if (!set) {
/* This means we are removing the property, so just return
- with ending tag */
+ * with ending tag */
g_string_append (xml, "/>");
return;
}
@@ -1441,8 +1513,10 @@ write_prop (GString *xml, const gchar *propertyname,
}
static void
-add_set_props (const gchar *propertyname, E2kPropType type,
- gpointer value, gpointer user_data)
+add_set_props (const gchar *propertyname,
+ E2kPropType type,
+ gpointer value,
+ gpointer user_data)
{
GString **props = user_data;
@@ -1453,8 +1527,10 @@ add_set_props (const gchar *propertyname, E2kPropType type,
}
static void
-add_remove_props (const gchar *propertyname, E2kPropType type,
- gpointer value, gpointer user_data)
+add_remove_props (const gchar *propertyname,
+ E2kPropType type,
+ gpointer value,
+ gpointer user_data)
{
GString **props = user_data;
@@ -1465,9 +1541,13 @@ add_remove_props (const gchar *propertyname, E2kPropType type,
}
static SoupMessage *
-patch_msg (E2kContext *ctx, const gchar *uri, const gchar *method,
- const gchar **hrefs, gint nhrefs, E2kProperties *props,
- gboolean create)
+patch_msg (E2kContext *ctx,
+ const gchar *uri,
+ const gchar *method,
+ const gchar **hrefs,
+ gint nhrefs,
+ E2kProperties *props,
+ gboolean create)
{
SoupMessage *msg;
GString *propxml, *subxml;
@@ -1545,9 +1625,12 @@ patch_msg (E2kContext *ctx, const gchar *uri, const gchar *method,
* Return value: the HTTP status
**/
E2kHTTPStatus
-e2k_context_proppatch (E2kContext *ctx, E2kOperation *op,
- const gchar *uri, E2kProperties *props,
- gboolean create, gchar **repl_uid)
+e2k_context_proppatch (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *uri,
+ E2kProperties *props,
+ gboolean create,
+ gchar **repl_uid)
{
SoupMessage *msg;
E2kHTTPStatus status;
@@ -1583,16 +1666,19 @@ e2k_context_proppatch (E2kContext *ctx, E2kOperation *op,
* with each URI that is considered for the object so that the caller
* can check its summary data to see if that URI is in use
* (potentially saving one or more round-trips to the server).
-
+ *
* Return value: the HTTP status
**/
E2kHTTPStatus
-e2k_context_proppatch_new (E2kContext *ctx, E2kOperation *op,
- const gchar *folder_uri, const gchar *object_name,
- E2kContextTestCallback test_callback,
- gpointer user_data,
- E2kProperties *props,
- gchar **location, gchar **repl_uid)
+e2k_context_proppatch_new (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *folder_uri,
+ const gchar *object_name,
+ E2kContextTestCallback test_callback,
+ gpointer user_data,
+ E2kProperties *props,
+ gchar **location,
+ gchar **repl_uid)
{
SoupMessage *msg;
E2kHTTPStatus status;
@@ -1630,10 +1716,13 @@ e2k_context_proppatch_new (E2kContext *ctx, E2kOperation *op,
static E2kHTTPStatus
bproppatch_fetch (E2kResultIter *iter,
- E2kContext *ctx, E2kOperation *op,
- E2kResult **results, gint *nresults,
- gint *first, gint *total,
- gpointer user_data)
+ E2kContext *ctx,
+ E2kOperation *op,
+ E2kResult **results,
+ gint *nresults,
+ gint *first,
+ gint *total,
+ gpointer user_data)
{
SoupMessage *msg = user_data;
E2kHTTPStatus status;
@@ -1653,7 +1742,8 @@ bproppatch_fetch (E2kResultIter *iter,
}
static void
-bproppatch_free (E2kResultIter *iter, gpointer msg)
+bproppatch_free (E2kResultIter *iter,
+ gpointer msg)
{
g_object_unref (msg);
}
@@ -1673,9 +1763,13 @@ bproppatch_free (E2kResultIter *iter, gpointer msg)
* Return value: an iterator for getting the results of the BPROPPATCH
**/
E2kResultIter *
-e2k_context_bproppatch_start (E2kContext *ctx, E2kOperation *op,
- const gchar *uri, const gchar **hrefs, gint nhrefs,
- E2kProperties *props, gboolean create)
+e2k_context_bproppatch_start (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *uri,
+ const gchar **hrefs,
+ gint nhrefs,
+ E2kProperties *props,
+ gboolean create)
{
SoupMessage *msg;
@@ -1692,8 +1786,12 @@ e2k_context_bproppatch_start (E2kContext *ctx, E2kOperation *op,
/* PROPFIND */
static SoupMessage *
-propfind_msg (E2kContext *ctx, const gchar *base_uri,
- const gchar **props, gint nprops, const gchar **hrefs, gint nhrefs)
+propfind_msg (E2kContext *ctx,
+ const gchar *base_uri,
+ const gchar **props,
+ gint nprops,
+ const gchar **hrefs,
+ gint nhrefs)
{
SoupMessage *msg;
GString *propxml;
@@ -1766,9 +1864,13 @@ propfind_msg (E2kContext *ctx, const gchar *base_uri,
* Return value: the HTTP status
**/
E2kHTTPStatus
-e2k_context_propfind (E2kContext *ctx, E2kOperation *op,
- const gchar *uri, const gchar **props, gint nprops,
- E2kResult **results, gint *nresults)
+e2k_context_propfind (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *uri,
+ const gchar **props,
+ gint nprops,
+ E2kResult **results,
+ gint *nresults)
{
SoupMessage *msg;
E2kHTTPStatus status;
@@ -1788,10 +1890,13 @@ e2k_context_propfind (E2kContext *ctx, E2kOperation *op,
static E2kHTTPStatus
bpropfind_fetch (E2kResultIter *iter,
- E2kContext *ctx, E2kOperation *op,
- E2kResult **results, gint *nresults,
- gint *first, gint *total,
- gpointer user_data)
+ E2kContext *ctx,
+ E2kOperation *op,
+ E2kResult **results,
+ gint *nresults,
+ gint *first,
+ gint *total,
+ gpointer user_data)
{
GSList **msgs = user_data;
E2kHTTPStatus status;
@@ -1812,7 +1917,8 @@ bpropfind_fetch (E2kResultIter *iter,
}
static void
-bpropfind_free (E2kResultIter *iter, gpointer user_data)
+bpropfind_free (E2kResultIter *iter,
+ gpointer user_data)
{
GSList **msgs = user_data, *m;
@@ -1837,9 +1943,13 @@ bpropfind_free (E2kResultIter *iter, gpointer user_data)
* Return value: an iterator for getting the results
**/
E2kResultIter *
-e2k_context_bpropfind_start (E2kContext *ctx, E2kOperation *op,
- const gchar *uri, const gchar **hrefs, gint nhrefs,
- const gchar **props, gint nprops)
+e2k_context_bpropfind_start (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *uri,
+ const gchar **hrefs,
+ gint nhrefs,
+ const gchar **props,
+ gint nprops)
{
SoupMessage *msg;
GSList **msgs;
@@ -1865,9 +1975,13 @@ e2k_context_bpropfind_start (E2kContext *ctx, E2kOperation *op,
/* SEARCH */
static SoupMessage *
-search_msg (E2kContext *ctx, const gchar *uri,
- SoupMemoryUse buffer_type, const gchar *searchxml,
- gint size, gboolean ascending, gint offset)
+search_msg (E2kContext *ctx,
+ const gchar *uri,
+ SoupMemoryUse buffer_type,
+ const gchar *searchxml,
+ gint size,
+ gboolean ascending,
+ gint offset)
{
SoupMessage *msg;
@@ -1893,8 +2007,10 @@ search_msg (E2kContext *ctx, const gchar *uri,
}
static gchar *
-search_xml (const gchar **props, gint nprops,
- E2kRestriction *rn, const gchar *orderby)
+search_xml (const gchar **props,
+ gint nprops,
+ E2kRestriction *rn,
+ const gchar *orderby)
{
GString *xml;
gchar *ret, *where;
@@ -1938,7 +2054,9 @@ search_xml (const gchar **props, gint nprops,
}
static gboolean
-search_result_get_range (SoupMessage *msg, gint *first, gint *total)
+search_result_get_range (SoupMessage *msg,
+ gint *first,
+ gint *total)
{
const gchar *range, *p;
@@ -1972,10 +2090,13 @@ typedef struct {
static E2kHTTPStatus
search_fetch (E2kResultIter *iter,
- E2kContext *ctx, E2kOperation *op,
- E2kResult **results, gint *nresults,
- gint *first, gint *total,
- gpointer user_data)
+ E2kContext *ctx,
+ E2kOperation *op,
+ E2kResult **results,
+ gint *nresults,
+ gint *first,
+ gint *total,
+ gpointer user_data)
{
E2kSearchData *search_data = user_data;
E2kHTTPStatus status;
@@ -2019,7 +2140,8 @@ search_fetch (E2kResultIter *iter,
}
static void
-search_free (E2kResultIter *iter, gpointer user_data)
+search_free (E2kResultIter *iter,
+ gpointer user_data)
{
E2kSearchData *search_data = user_data;
@@ -2044,9 +2166,14 @@ search_free (E2kResultIter *iter, gpointer user_data)
* Return value: an iterator for returning the search results
**/
E2kResultIter *
-e2k_context_search_start (E2kContext *ctx, E2kOperation *op, const gchar *uri,
- const gchar **props, gint nprops, E2kRestriction *rn,
- const gchar *orderby, gboolean ascending)
+e2k_context_search_start (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *uri,
+ const gchar **props,
+ gint nprops,
+ E2kRestriction *rn,
+ const gchar *orderby,
+ gboolean ascending)
{
E2kSearchData *search_data;
@@ -2069,7 +2196,8 @@ e2k_context_search_start (E2kContext *ctx, E2kOperation *op, const gchar *uri,
/* DELETE */
static SoupMessage *
-delete_msg (E2kContext *ctx, const gchar *uri)
+delete_msg (E2kContext *ctx,
+ const gchar *uri)
{
return e2k_soup_message_new (ctx, uri, "DELETE");
}
@@ -2085,7 +2213,9 @@ delete_msg (E2kContext *ctx, const gchar *uri)
* Return value: the HTTP status
**/
E2kHTTPStatus
-e2k_context_delete (E2kContext *ctx, E2kOperation *op, const gchar *uri)
+e2k_context_delete (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *uri)
{
SoupMessage *msg;
E2kHTTPStatus status;
@@ -2103,7 +2233,10 @@ e2k_context_delete (E2kContext *ctx, E2kOperation *op, const gchar *uri)
/* BDELETE */
static SoupMessage *
-bdelete_msg (E2kContext *ctx, const gchar *uri, const gchar **hrefs, gint nhrefs)
+bdelete_msg (E2kContext *ctx,
+ const gchar *uri,
+ const gchar **hrefs,
+ gint nhrefs)
{
SoupMessage *msg;
GString *xml;
@@ -2129,10 +2262,13 @@ bdelete_msg (E2kContext *ctx, const gchar *uri, const gchar **hrefs, gint nhrefs
static E2kHTTPStatus
bdelete_fetch (E2kResultIter *iter,
- E2kContext *ctx, E2kOperation *op,
- E2kResult **results, gint *nresults,
- gint *first, gint *total,
- gpointer user_data)
+ E2kContext *ctx,
+ E2kOperation *op,
+ E2kResult **results,
+ gint *nresults,
+ gint *first,
+ gint *total,
+ gpointer user_data)
{
GSList **msgs = user_data;
E2kHTTPStatus status;
@@ -2153,7 +2289,8 @@ bdelete_fetch (E2kResultIter *iter,
}
static void
-bdelete_free (E2kResultIter *iter, gpointer user_data)
+bdelete_free (E2kResultIter *iter,
+ gpointer user_data)
{
GSList **msgs = user_data, *m;
@@ -2176,8 +2313,11 @@ bdelete_free (E2kResultIter *iter, gpointer user_data)
* Return value: an iterator for returning the results
**/
E2kResultIter *
-e2k_context_bdelete_start (E2kContext *ctx, E2kOperation *op,
- const gchar *uri, const gchar **hrefs, gint nhrefs)
+e2k_context_bdelete_start (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *uri,
+ const gchar **hrefs,
+ gint nhrefs)
{
GSList **msgs;
gint i, batchsize;
@@ -2222,9 +2362,11 @@ e2k_context_bdelete_start (E2kContext *ctx, E2kOperation *op,
* Return value: the HTTP status
**/
E2kHTTPStatus
-e2k_context_mkcol (E2kContext *ctx, E2kOperation *op,
- const gchar *uri, E2kProperties *props,
- gchar **permanent_url)
+e2k_context_mkcol (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *uri,
+ E2kProperties *props,
+ gchar **permanent_url)
{
SoupMessage *msg;
E2kHTTPStatus status;
@@ -2254,9 +2396,11 @@ e2k_context_mkcol (E2kContext *ctx, E2kOperation *op,
static SoupMessage *
transfer_msg (E2kContext *ctx,
- const gchar *source_uri, const gchar *dest_uri,
- const gchar **source_hrefs, gint nhrefs,
- gboolean delete_originals)
+ const gchar *source_uri,
+ const gchar *dest_uri,
+ const gchar **source_hrefs,
+ gint nhrefs,
+ gboolean delete_originals)
{
SoupMessage *msg;
GString *xml;
@@ -2288,10 +2432,13 @@ transfer_msg (E2kContext *ctx,
static E2kHTTPStatus
transfer_next (E2kResultIter *iter,
- E2kContext *ctx, E2kOperation *op,
- E2kResult **results, gint *nresults,
- gint *first, gint *total,
- gpointer user_data)
+ E2kContext *ctx,
+ E2kOperation *op,
+ E2kResult **results,
+ gint *nresults,
+ gint *first,
+ gint *total,
+ gpointer user_data)
{
GSList **msgs = user_data;
SoupMessage *msg;
@@ -2312,7 +2459,8 @@ transfer_next (E2kResultIter *iter,
}
static void
-transfer_free (E2kResultIter *iter, gpointer user_data)
+transfer_free (E2kResultIter *iter,
+ gpointer user_data)
{
GSList **msgs = user_data, *m;
@@ -2343,9 +2491,12 @@ transfer_free (E2kResultIter *iter, gpointer user_data)
* Return value: the iterator for the results
**/
E2kResultIter *
-e2k_context_transfer_start (E2kContext *ctx, E2kOperation *op,
- const gchar *source_folder, const gchar *dest_folder,
- GPtrArray *source_hrefs, gboolean delete_originals)
+e2k_context_transfer_start (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *source_folder,
+ const gchar *dest_folder,
+ GPtrArray *source_hrefs,
+ gboolean delete_originals)
{
GSList **msgs;
SoupMessage *msg;
@@ -2395,10 +2546,12 @@ e2k_context_transfer_start (E2kContext *ctx, E2kOperation *op,
* Return value: the HTTP status
**/
E2kHTTPStatus
-e2k_context_transfer_dir (E2kContext *ctx, E2kOperation *op,
- const gchar *source_href, const gchar *dest_href,
- gboolean delete_original,
- gchar **permanent_url)
+e2k_context_transfer_dir (E2kContext *ctx,
+ E2kOperation *op,
+ const gchar *source_href,
+ const gchar *dest_href,
+ gboolean delete_original,
+ gchar **permanent_url)
{
SoupMessage *msg;
E2kHTTPStatus status;
@@ -2473,7 +2626,9 @@ maybe_notification (E2kSubscription *sub)
}
static void
-polled (SoupSession *session, SoupMessage *msg, gpointer user_data)
+polled (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data)
{
E2kSubscription *sub = user_data;
E2kContext *ctx = sub->ctx;
@@ -2548,7 +2703,9 @@ timeout_notification (gpointer user_data)
}
static gboolean
-do_notification (GIOChannel *source, GIOCondition condition, gpointer data)
+do_notification (GIOChannel *source,
+ GIOCondition condition,
+ gpointer data)
{
E2kContext *ctx = data;
E2kSubscription *sub;
@@ -2608,7 +2765,9 @@ do_notification (GIOChannel *source, GIOCondition condition, gpointer data)
}
static void
-renew_cb (SoupSession *session, SoupMessage *msg, gpointer user_data)
+renew_cb (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data)
{
E2kSubscription *sub = user_data;
@@ -2710,10 +2869,12 @@ renew_subscription (gpointer user_data)
* and the server, it is possible that all notifications will be lost.
**/
void
-e2k_context_subscribe (E2kContext *ctx, const gchar *uri,
- E2kContextChangeType type, gint min_interval,
- E2kContextChangeCallback callback,
- gpointer user_data)
+e2k_context_subscribe (E2kContext *ctx,
+ const gchar *uri,
+ E2kContextChangeType type,
+ gint min_interval,
+ E2kContextChangeCallback callback,
+ gpointer user_data)
{
E2kSubscription *sub;
GList *sub_list;
@@ -2769,13 +2930,18 @@ free_subscription (E2kSubscription *sub)
}
static void
-unsubscribed (SoupSession *session, SoupMessage *msg, gpointer user_data)
+unsubscribed (SoupSession *session,
+ SoupMessage *msg,
+ gpointer user_data)
{
;
}
static void
-unsubscribe_internal (E2kContext *ctx, const gchar *puri, GList *sub_list, gboolean destrying)
+unsubscribe_internal (E2kContext *ctx,
+ const gchar *puri,
+ GList *sub_list,
+ gboolean destrying)
{
GList *l;
E2kSubscription *sub;
@@ -2788,7 +2954,7 @@ unsubscribe_internal (E2kContext *ctx, const gchar *puri, GList *sub_list, gbool
sub = l->data;
if (sub->id) {
/* do not send messages when destroying, because they are server on idle,
- when the context itself already gone */
+ * when the context itself already gone */
if (!destrying) {
if (!subscription_ids)
subscription_ids = g_string_new (sub->id);
@@ -2824,7 +2990,8 @@ unsubscribe_internal (E2kContext *ctx, const gchar *puri, GList *sub_list, gbool
* Unsubscribes to all notifications on @ctx for @uri.
**/
void
-e2k_context_unsubscribe (E2kContext *ctx, const gchar *uri)
+e2k_context_unsubscribe (E2kContext *ctx,
+ const gchar *uri)
{
GList *sub_list;
diff --git a/server/lib/e2k-freebusy.c b/server/lib/e2k-freebusy.c
index 1f5cdc6..fa4862f 100644
--- a/server/lib/e2k-freebusy.c
+++ b/server/lib/e2k-freebusy.c
@@ -54,7 +54,8 @@ e2k_freebusy_destroy (E2kFreebusy *fb)
}
static gchar *
-fb_uri_for_dn (const gchar *public_uri, const gchar *dn)
+fb_uri_for_dn (const gchar *public_uri,
+ const gchar *dn)
{
gchar *uri, *div, *org;
GString *str;
@@ -103,7 +104,10 @@ merge_events (GArray *events)
}
static void
-add_data_for_status (E2kFreebusy *fb, GPtrArray *monthyears, GPtrArray *fbdatas, GArray *events)
+add_data_for_status (E2kFreebusy *fb,
+ GPtrArray *monthyears,
+ GPtrArray *fbdatas,
+ GArray *events)
{
E2kFreebusyEvent evt;
gint i, monthyear;
@@ -169,7 +173,9 @@ static const gchar *public_freebusy_props[] = {
* Return value: the freebusy information
**/
E2kFreebusy *
-e2k_freebusy_new (E2kContext *ctx, const gchar *public_uri, const gchar *dn)
+e2k_freebusy_new (E2kContext *ctx,
+ const gchar *public_uri,
+ const gchar *dn)
{
E2kFreebusy *fb;
gchar *uri, *time;
@@ -244,7 +250,8 @@ e2k_freebusy_new (E2kContext *ctx, const gchar *public_uri, const gchar *dn)
* to a span of @nmonths around the current date.
**/
void
-e2k_freebusy_reset (E2kFreebusy *fb, gint nmonths)
+e2k_freebusy_reset (E2kFreebusy *fb,
+ gint nmonths)
{
time_t now;
struct tm tm;
@@ -281,8 +288,10 @@ e2k_freebusy_reset (E2kFreebusy *fb, gint nmonths)
* This adds an interval of type @busystatus to @fb.
**/
void
-e2k_freebusy_add_interval (E2kFreebusy *fb, E2kBusyStatus busystatus,
- time_t start, time_t end)
+e2k_freebusy_add_interval (E2kFreebusy *fb,
+ E2kBusyStatus busystatus,
+ time_t start,
+ time_t end)
{
E2kFreebusyEvent evt, *events;
gint i;
@@ -335,7 +344,9 @@ e2k_freebusy_add_interval (E2kFreebusy *fb, E2kBusyStatus busystatus,
* This removes any events between @start and @end in @fb.
**/
void
-e2k_freebusy_clear_interval (E2kFreebusy *fb, time_t start, time_t end)
+e2k_freebusy_clear_interval (E2kFreebusy *fb,
+ time_t start,
+ time_t end)
{
E2kFreebusyEvent *evt;
gint busystatus, i;
@@ -382,8 +393,10 @@ static const gchar *freebusy_props[] = {
* Return value: an HTTP status code.
**/
E2kHTTPStatus
-e2k_freebusy_add_from_calendar_uri (E2kFreebusy *fb, const gchar *uri,
- time_t start_tt, time_t end_tt)
+e2k_freebusy_add_from_calendar_uri (E2kFreebusy *fb,
+ const gchar *uri,
+ time_t start_tt,
+ time_t end_tt)
{
gchar *start, *end, *busystatus;
E2kBusyStatus busy;
@@ -443,8 +456,10 @@ e2k_freebusy_add_from_calendar_uri (E2kFreebusy *fb, const gchar *uri,
}
static void
-add_events (GArray *events_array, E2kProperties *props,
- const gchar *month_list_prop, const gchar *data_list_prop)
+add_events (GArray *events_array,
+ E2kProperties *props,
+ const gchar *month_list_prop,
+ const gchar *data_list_prop)
{
E2kFreebusyEvent *events = (E2kFreebusyEvent *) events_array->data;
gint i, evt_start, evt_end, monthyear;
diff --git a/server/lib/e2k-global-catalog.c b/server/lib/e2k-global-catalog.c
index 1e02474..d9129ee 100644
--- a/server/lib/e2k-global-catalog.c
+++ b/server/lib/e2k-global-catalog.c
@@ -123,7 +123,9 @@ free_entry (E2kGlobalCatalogEntry *entry)
}
static void
-free_server (gpointer key, gpointer value, gpointer data)
+free_server (gpointer key,
+ gpointer value,
+ gpointer data)
{
g_free (key);
g_free (value);
@@ -167,8 +169,10 @@ finalize (GObject *object)
}
static gint
-gc_ldap_result (LDAP *ldap, E2kOperation *op,
- gint msgid, LDAPMessage **msg)
+gc_ldap_result (LDAP *ldap,
+ E2kOperation *op,
+ gint msgid,
+ LDAPMessage **msg)
{
struct timeval tv;
gint status, ldap_error;
@@ -193,9 +197,13 @@ gc_ldap_result (LDAP *ldap, E2kOperation *op,
}
static gint
-gc_search (E2kGlobalCatalog *gc, E2kOperation *op,
- const gchar *base, gint scope, const gchar *filter,
- const gchar **attrs, LDAPMessage **msg)
+gc_search (E2kGlobalCatalog *gc,
+ E2kOperation *op,
+ const gchar *base,
+ gint scope,
+ const gchar *filter,
+ const gchar **attrs,
+ LDAPMessage **msg)
{
gint ldap_error, msgid, try;
@@ -226,7 +234,9 @@ gc_search (E2kGlobalCatalog *gc, E2kOperation *op,
#ifdef HAVE_LDAP_NTLM_BIND
static gint
-ntlm_bind (E2kGlobalCatalog *gc, E2kOperation *op, LDAP *ldap)
+ntlm_bind (E2kGlobalCatalog *gc,
+ E2kOperation *op,
+ LDAP *ldap)
{
LDAPMessage *msg;
gint ldap_error, msgid, err;
@@ -302,7 +312,9 @@ ntlm_bind (E2kGlobalCatalog *gc, E2kOperation *op, LDAP *ldap)
#endif
static gint
-connect_ldap (E2kGlobalCatalog *gc, E2kOperation *op, LDAP *ldap)
+connect_ldap (E2kGlobalCatalog *gc,
+ E2kOperation *op,
+ LDAP *ldap)
{
gint ldap_error;
gchar *nt_name;
@@ -362,9 +374,11 @@ connect_ldap (E2kGlobalCatalog *gc, E2kOperation *op, LDAP *ldap)
}
static gint
-get_ldap_connection (E2kGlobalCatalog *gc, E2kOperation *op,
- const gchar *server, gint port,
- LDAP **ldap)
+get_ldap_connection (E2kGlobalCatalog *gc,
+ E2kOperation *op,
+ const gchar *server,
+ gint port,
+ LDAP **ldap)
{
gint ldap_opt, ldap_error;
@@ -395,7 +409,8 @@ get_ldap_connection (E2kGlobalCatalog *gc, E2kOperation *op,
}
static gint
-get_gc_connection (E2kGlobalCatalog *gc, E2kOperation *op)
+get_gc_connection (E2kGlobalCatalog *gc,
+ E2kOperation *op)
{
gint err;
@@ -424,7 +439,9 @@ get_gc_connection (E2kGlobalCatalog *gc, E2kOperation *op)
* Return value: an LDAP handle, or %NULL if it can't connect
**/
LDAP *
-e2k_global_catalog_get_ldap (E2kGlobalCatalog *gc, E2kOperation *op, gint *ldap_error)
+e2k_global_catalog_get_ldap (E2kGlobalCatalog *gc,
+ E2kOperation *op,
+ gint *ldap_error)
{
LDAP *ldap;
gint err;
@@ -454,9 +471,12 @@ e2k_global_catalog_get_ldap (E2kGlobalCatalog *gc, E2kOperation *op, gint *ldap_
* If the passed-in data is bad, it will fail on a later call.)
**/
E2kGlobalCatalog *
-e2k_global_catalog_new (const gchar *server, gint response_limit,
- const gchar *user, const gchar *domain,
- const gchar *password, E2kAutoconfigGalAuthPref use_auth)
+e2k_global_catalog_new (const gchar *server,
+ gint response_limit,
+ const gchar *user,
+ const gchar *domain,
+ const gchar *password,
+ E2kAutoconfigGalAuthPref use_auth)
{
E2kGlobalCatalog *gc;
@@ -472,7 +492,9 @@ e2k_global_catalog_new (const gchar *server, gint response_limit,
}
static const gchar *
-lookup_mta (E2kGlobalCatalog *gc, E2kOperation *op, const gchar *mta_dn)
+lookup_mta (E2kGlobalCatalog *gc,
+ E2kOperation *op,
+ const gchar *mta_dn)
{
gchar *hostname, **values;
const gchar *attrs[2];
@@ -530,8 +552,10 @@ lookup_mta (E2kGlobalCatalog *gc, E2kOperation *op, const gchar *mta_dn)
}
static void
-get_sid_values (E2kGlobalCatalog *gc, E2kOperation *op,
- LDAPMessage *msg, E2kGlobalCatalogEntry *entry)
+get_sid_values (E2kGlobalCatalog *gc,
+ E2kOperation *op,
+ LDAPMessage *msg,
+ E2kGlobalCatalogEntry *entry)
{
gchar **values;
struct berval **bsid_values;
@@ -571,8 +595,10 @@ get_sid_values (E2kGlobalCatalog *gc, E2kOperation *op,
}
static void
-get_mail_values (E2kGlobalCatalog *gc, E2kOperation *op,
- LDAPMessage *msg, E2kGlobalCatalogEntry *entry)
+get_mail_values (E2kGlobalCatalog *gc,
+ E2kOperation *op,
+ LDAPMessage *msg,
+ E2kGlobalCatalogEntry *entry)
{
gchar **values, **mtavalues;
@@ -612,8 +638,10 @@ get_mail_values (E2kGlobalCatalog *gc, E2kOperation *op,
}
static void
-get_delegation_values (E2kGlobalCatalog *gc, E2kOperation *op,
- LDAPMessage *msg, E2kGlobalCatalogEntry *entry)
+get_delegation_values (E2kGlobalCatalog *gc,
+ E2kOperation *op,
+ LDAPMessage *msg,
+ E2kGlobalCatalogEntry *entry)
{
gchar **values;
gint i;
@@ -645,8 +673,10 @@ get_delegation_values (E2kGlobalCatalog *gc, E2kOperation *op,
}
static void
-get_quota_values (E2kGlobalCatalog *gc, E2kOperation *op,
- LDAPMessage *msg, E2kGlobalCatalogEntry *entry)
+get_quota_values (E2kGlobalCatalog *gc,
+ E2kOperation *op,
+ LDAPMessage *msg,
+ E2kGlobalCatalogEntry *entry)
{
gchar **quota_setting_values, **quota_limit_values;
@@ -689,8 +719,10 @@ get_quota_values (E2kGlobalCatalog *gc, E2kOperation *op,
}
static void
-get_account_control_values (E2kGlobalCatalog *gc, E2kOperation *op,
- LDAPMessage *msg, E2kGlobalCatalogEntry *entry)
+get_account_control_values (E2kGlobalCatalog *gc,
+ E2kOperation *op,
+ LDAPMessage *msg,
+ E2kGlobalCatalogEntry *entry)
{
gchar **values;
@@ -720,11 +752,11 @@ get_account_control_values (E2kGlobalCatalog *gc, E2kOperation *op,
**/
E2kGlobalCatalogStatus
e2k_global_catalog_lookup (E2kGlobalCatalog *gc,
- E2kOperation *op,
- E2kGlobalCatalogLookupType type,
- const gchar *key,
- E2kGlobalCatalogLookupFlags flags,
- E2kGlobalCatalogEntry **entry_p)
+ E2kOperation *op,
+ E2kGlobalCatalogLookupType type,
+ const gchar *key,
+ E2kGlobalCatalogLookupFlags flags,
+ E2kGlobalCatalogEntry **entry_p)
{
E2kGlobalCatalogEntry *entry;
GPtrArray *attrs;
@@ -927,12 +959,12 @@ do_lookup_thread (gpointer user_data)
**/
void
e2k_global_catalog_async_lookup (E2kGlobalCatalog *gc,
- E2kOperation *op,
- E2kGlobalCatalogLookupType type,
- const gchar *key,
- E2kGlobalCatalogLookupFlags flags,
- E2kGlobalCatalogCallback callback,
- gpointer user_data)
+ E2kOperation *op,
+ E2kGlobalCatalogLookupType type,
+ const gchar *key,
+ E2kGlobalCatalogLookupFlags flags,
+ E2kGlobalCatalogCallback callback,
+ gpointer user_data)
{
struct async_lookup_data *ald;
GThread *thread;
@@ -957,8 +989,9 @@ e2k_global_catalog_async_lookup (E2kGlobalCatalog *gc,
}
static const gchar *
-lookup_controlling_ad_server (E2kGlobalCatalog *gc, E2kOperation *op,
- const gchar *dn)
+lookup_controlling_ad_server (E2kGlobalCatalog *gc,
+ E2kOperation *op,
+ const gchar *dn)
{
gchar *hostname, **values, *ad_dn;
const gchar *attrs[2];
@@ -1035,7 +1068,7 @@ find_domain_dn (gchar *domain)
{
GString *dn_value = g_string_new (NULL);
gchar *dn;
- gchar *sub_domain=NULL;
+ gchar *sub_domain = NULL;
sub_domain = strtok (domain, ".");
while (sub_domain != NULL) {
@@ -1053,15 +1086,16 @@ find_domain_dn (gchar *domain)
}
gdouble
-lookup_passwd_max_age (E2kGlobalCatalog *gc, E2kOperation *op)
+lookup_passwd_max_age (E2kGlobalCatalog *gc,
+ E2kOperation *op)
{
- gchar **values = NULL, *filter = NULL, *val=NULL;
+ gchar **values = NULL, *filter = NULL, *val = NULL;
const gchar *attrs[2];
LDAP *ldap;
- LDAPMessage *msg=NULL;
+ LDAPMessage *msg = NULL;
gint ldap_error, msgid;
- gdouble maxAge=0;
- gchar *dn=NULL;
+ gdouble maxAge = 0;
+ gchar *dn = NULL;
attrs[0] = "maxPwdAge";
attrs[1] = NULL;
@@ -1119,8 +1153,11 @@ lookup_passwd_max_age (E2kGlobalCatalog *gc, E2kOperation *op)
}
static E2kGlobalCatalogStatus
-do_delegate_op (E2kGlobalCatalog *gc, E2kOperation *op, gint deleg_op,
- const gchar *self_dn, const gchar *delegate_dn)
+do_delegate_op (E2kGlobalCatalog *gc,
+ E2kOperation *op,
+ gint deleg_op,
+ const gchar *self_dn,
+ const gchar *delegate_dn)
{
LDAP *ldap;
LDAPMod *mods[2], mod;
@@ -1217,9 +1254,9 @@ do_delegate_op (E2kGlobalCatalog *gc, E2kOperation *op, gint deleg_op,
**/
E2kGlobalCatalogStatus
e2k_global_catalog_add_delegate (E2kGlobalCatalog *gc,
- E2kOperation *op,
- const gchar *self_dn,
- const gchar *delegate_dn)
+ E2kOperation *op,
+ const gchar *self_dn,
+ const gchar *delegate_dn)
{
E2K_GC_DEBUG_MSG(("\nGC: adding %s as delegate for %s\n", delegate_dn, self_dn));
@@ -1242,9 +1279,9 @@ e2k_global_catalog_add_delegate (E2kGlobalCatalog *gc,
**/
E2kGlobalCatalogStatus
e2k_global_catalog_remove_delegate (E2kGlobalCatalog *gc,
- E2kOperation *op,
- const gchar *self_dn,
- const gchar *delegate_dn)
+ E2kOperation *op,
+ const gchar *self_dn,
+ const gchar *delegate_dn)
{
E2K_GC_DEBUG_MSG(("\nGC: removing %s as delegate for %s\n", delegate_dn, self_dn));
diff --git a/server/lib/e2k-http-utils.c b/server/lib/e2k-http-utils.c
index 252fd13..a7e21c4 100644
--- a/server/lib/e2k-http-utils.c
+++ b/server/lib/e2k-http-utils.c
@@ -159,7 +159,9 @@ typedef struct {
} GetHeadersData;
static void
-maybe_append_header (const gchar *header_name, const gchar *value, gpointer data)
+maybe_append_header (const gchar *header_name,
+ const gchar *value,
+ gpointer data)
{
GetHeadersData *ghd = data;
@@ -173,7 +175,8 @@ maybe_append_header (const gchar *header_name, const gchar *value, gpointer data
* be doing this...
*/
GSList *
-e2k_http_get_headers (SoupMessageHeaders *hdrs, const gchar *header_name)
+e2k_http_get_headers (SoupMessageHeaders *hdrs,
+ const gchar *header_name)
{
GetHeadersData ghd;
diff --git a/server/lib/e2k-kerberos.c b/server/lib/e2k-kerberos.c
index ce004d5..2dea019 100644
--- a/server/lib/e2k-kerberos.c
+++ b/server/lib/e2k-kerberos.c
@@ -79,8 +79,11 @@ krb5_result_to_e2k_kerberos_result (gint result)
}
static E2kKerberosResult
-get_init_cred (krb5_context ctx, const gchar *usr_name, const gchar *passwd,
- const gchar *in_tkt_service, krb5_creds *cred)
+get_init_cred (krb5_context ctx,
+ const gchar *usr_name,
+ const gchar *passwd,
+ const gchar *in_tkt_service,
+ krb5_creds *cred)
{
krb5_principal principal;
krb5_get_init_creds_opt opt;
@@ -91,7 +94,7 @@ get_init_cred (krb5_context ctx, const gchar *usr_name, const gchar *passwd,
return E2K_KERBEROS_USER_UNKNOWN;
krb5_get_init_creds_opt_init (&opt);
- krb5_get_init_creds_opt_set_tkt_life (&opt, 5*60);
+ krb5_get_init_creds_opt_set_tkt_life (&opt, 5 *60);
krb5_get_init_creds_opt_set_renew_life (&opt, 0);
krb5_get_init_creds_opt_set_forwardable (&opt, 0);
krb5_get_init_creds_opt_set_proxiable (&opt, 0);
@@ -117,8 +120,10 @@ get_init_cred (krb5_context ctx, const gchar *usr_name, const gchar *passwd,
* Return value: an #E2kKerberosResult
**/
E2kKerberosResult
-e2k_kerberos_change_password (const gchar *user, const gchar *domain,
- const gchar *old_password, const gchar *new_password)
+e2k_kerberos_change_password (const gchar *user,
+ const gchar *domain,
+ const gchar *old_password,
+ const gchar *new_password)
{
krb5_context ctx;
krb5_creds creds;
@@ -165,8 +170,9 @@ e2k_kerberos_change_password (const gchar *user, const gchar *domain,
* or %E2K_KERBEROS_FAILED (for unknown errors)
**/
E2kKerberosResult
-e2k_kerberos_check_password (const gchar *user, const gchar *domain,
- const gchar *password)
+e2k_kerberos_check_password (const gchar *user,
+ const gchar *domain,
+ const gchar *password)
{
krb5_context ctx;
krb5_creds creds;
diff --git a/server/lib/e2k-operation.c b/server/lib/e2k-operation.c
index 4046773..0ab2589 100644
--- a/server/lib/e2k-operation.c
+++ b/server/lib/e2k-operation.c
@@ -82,9 +82,9 @@ e2k_operation_free (E2kOperation *op)
**/
void
e2k_operation_start (E2kOperation *op,
- E2kOperationCancelFunc canceller,
- gpointer owner,
- gpointer data)
+ E2kOperationCancelFunc canceller,
+ gpointer owner,
+ gpointer data)
{
if (!op)
return;
diff --git a/server/lib/e2k-path.c b/server/lib/e2k-path.c
index 7cfcbba..6b2d943 100644
--- a/server/lib/e2k-path.c
+++ b/server/lib/e2k-path.c
@@ -49,7 +49,8 @@
* Return value: the expanded path
**/
gchar *
-e_path_to_physical (const gchar *prefix, const gchar *vpath)
+e_path_to_physical (const gchar *prefix,
+ const gchar *vpath)
{
const gchar *p, *newp;
gchar *dp;
@@ -124,8 +125,10 @@ e_path_to_physical (const gchar *prefix, const gchar *vpath)
}
static gboolean
-find_folders_recursive (const gchar *physical_path, const gchar *path,
- EPathFindFoldersCallback callback, gpointer data)
+find_folders_recursive (const gchar *physical_path,
+ const gchar *path,
+ EPathFindFoldersCallback callback,
+ gpointer data)
{
GDir *dir;
gchar *subfolder_directory_path;
@@ -198,8 +201,8 @@ find_folders_recursive (const gchar *physical_path, const gchar *path,
**/
gboolean
e_path_find_folders (const gchar *prefix,
- EPathFindFoldersCallback callback,
- gpointer data)
+ EPathFindFoldersCallback callback,
+ gpointer data)
{
return find_folders_recursive (prefix, "", callback, data);
}
@@ -218,7 +221,8 @@ e_path_find_folders (const gchar *prefix,
* the parent directory.
**/
gint
-e_path_rmdir (const gchar *prefix, const gchar *vpath)
+e_path_rmdir (const gchar *prefix,
+ const gchar *vpath)
{
gchar *physical_path, *p;
diff --git a/server/lib/e2k-path.h b/server/lib/e2k-path.h
index c6d43c6..5189773 100644
--- a/server/lib/e2k-path.h
+++ b/server/lib/e2k-path.h
@@ -23,7 +23,7 @@
#include <glib.h>
/* FIXME: deprecated
- This is used exclusively for the legacy imap cache code. DO NOT use this in any new code */
+ * This is used exclusively for the legacy imap cache code. DO NOT use this in any new code */
typedef gboolean (*EPathFindFoldersCallback) (const gchar *physical_path,
const gchar *path,
diff --git a/server/lib/e2k-properties.c b/server/lib/e2k-properties.c
index 2b2c774..46157ca 100644
--- a/server/lib/e2k-properties.c
+++ b/server/lib/e2k-properties.c
@@ -67,7 +67,9 @@ e2k_properties_new (void)
}
static void
-copy_prop (gpointer key, gpointer value, gpointer data)
+copy_prop (gpointer key,
+ gpointer value,
+ gpointer data)
{
const gchar *name = key;
GHashTable *props_copy = data;
@@ -153,7 +155,8 @@ e2k_properties_copy (E2kProperties *props)
}
static void
-free_prop (E2kPropInfo *pi, gpointer value)
+free_prop (E2kPropInfo *pi,
+ gpointer value)
{
if (!value)
return;
@@ -198,7 +201,9 @@ free_prop (E2kPropInfo *pi, gpointer value)
}
static void
-properties_free_cb (gpointer key, gpointer value, gpointer data)
+properties_free_cb (gpointer key,
+ gpointer value,
+ gpointer data)
{
E2kPropInfo *pi;
@@ -238,7 +243,8 @@ e2k_properties_free (E2kProperties *props)
* @props.
**/
gpointer
-e2k_properties_get_prop (E2kProperties *props, const gchar *propname)
+e2k_properties_get_prop (E2kProperties *props,
+ const gchar *propname)
{
g_return_val_if_fail (props != NULL, NULL);
@@ -265,7 +271,8 @@ e2k_properties_empty (E2kProperties *props)
extern gchar e2k_des_key[8];
static E2kPropInfo *
-get_propinfo (const gchar *propname, E2kPropType type)
+get_propinfo (const gchar *propname,
+ E2kPropType type)
{
E2kPropInfo *pi;
@@ -447,9 +454,9 @@ E2K_PROPERTIES_SETTER (date, gchar *, DATE, value)
#define E2K_PROPERTIES_SETTER_AS(fname, valuetype) \
void \
e2k_properties_set_type_as_ ## fname (E2kProperties *props, \
- const gchar *propname, \
- E2kPropType type, \
- valuetype value) \
+ const gchar *propname, \
+ E2kPropType type, \
+ valuetype value) \
{ \
E2kPropInfo *pi; \
\
@@ -473,7 +480,8 @@ E2K_PROPERTIES_SETTER_AS (string_array, GPtrArray *)
* this frees the old value.
**/
void
-e2k_properties_remove (E2kProperties *props, const gchar *propname)
+e2k_properties_remove (E2kProperties *props,
+ const gchar *propname)
{
E2kPropInfo *pi;
@@ -489,7 +497,9 @@ struct foreach_data {
};
static void
-foreach_callback (gpointer key, gpointer value, gpointer data)
+foreach_callback (gpointer key,
+ gpointer value,
+ gpointer data)
{
struct foreach_data *fd = data;
E2kPropInfo *pi;
@@ -513,8 +523,8 @@ foreach_callback (gpointer key, gpointer value, gpointer data)
**/
void
e2k_properties_foreach (E2kProperties *props,
- E2kPropertiesForeachFunc callback,
- gpointer user_data)
+ E2kPropertiesForeachFunc callback,
+ gpointer user_data)
{
struct foreach_data fd;
@@ -538,8 +548,8 @@ e2k_properties_foreach (E2kProperties *props,
**/
void
e2k_properties_foreach_removed (E2kProperties *props,
- E2kPropertiesForeachFunc callback,
- gpointer user_data)
+ E2kPropertiesForeachFunc callback,
+ gpointer user_data)
{
struct foreach_data fd;
@@ -559,7 +569,9 @@ struct foreach_namespace_data {
};
static void
-foreach_namespace_callback (gpointer key, gpointer value, gpointer data)
+foreach_namespace_callback (gpointer key,
+ gpointer value,
+ gpointer data)
{
struct foreach_namespace_data *fnd = data;
E2kPropInfo *pi;
@@ -611,8 +623,8 @@ foreach_namespace_callback (gpointer key, gpointer value, gpointer data)
**/
void
e2k_properties_foreach_namespace (E2kProperties *props,
- E2kPropertiesForeachNamespaceFunc callback,
- gpointer user_data)
+ E2kPropertiesForeachNamespaceFunc callback,
+ gpointer user_data)
{
struct foreach_namespace_data fnd;
@@ -651,7 +663,8 @@ get_div (const gchar *propname)
}
static gint
-prop_equal (gconstpointer v1, gconstpointer v2)
+prop_equal (gconstpointer v1,
+ gconstpointer v2)
{
const gchar *s1 = (const gchar *) v1, *s2 = (const gchar *) v2;
const gchar *d1 = get_div (s1), *d2 = get_div (s2);
diff --git a/server/lib/e2k-restriction.c b/server/lib/e2k-restriction.c
index d165cac..0c8d63d 100644
--- a/server/lib/e2k-restriction.c
+++ b/server/lib/e2k-restriction.c
@@ -31,7 +31,10 @@
#include <string.h>
static E2kRestriction *
-conjoin (E2kRestrictionType type, gint nrns, E2kRestriction **rns, gboolean unref)
+conjoin (E2kRestrictionType type,
+ gint nrns,
+ E2kRestriction **rns,
+ gboolean unref)
{
E2kRestriction *ret = g_new0 (E2kRestriction, 1);
gint i;
@@ -65,7 +68,9 @@ conjoin (E2kRestrictionType type, gint nrns, E2kRestriction **rns, gboolean unre
* Return value: the new restriction
**/
E2kRestriction *
-e2k_restriction_and (gint nrns, E2kRestriction **rns, gboolean unref)
+e2k_restriction_and (gint nrns,
+ E2kRestriction **rns,
+ gboolean unref)
{
return conjoin (E2K_RESTRICTION_AND, nrns, rns, unref);
}
@@ -82,13 +87,17 @@ e2k_restriction_and (gint nrns, E2kRestriction **rns, gboolean unref)
* Return value: the new restriction
**/
E2kRestriction *
-e2k_restriction_or (gint nrns, E2kRestriction **rns, gboolean unref)
+e2k_restriction_or (gint nrns,
+ E2kRestriction **rns,
+ gboolean unref)
{
return conjoin (E2K_RESTRICTION_OR, nrns, rns, unref);
}
static E2kRestriction *
-conjoinv (E2kRestrictionType type, E2kRestriction *rn, va_list ap)
+conjoinv (E2kRestrictionType type,
+ E2kRestriction *rn,
+ va_list ap)
{
E2kRestriction *ret = g_new0 (E2kRestriction, 1);
GPtrArray *rns;
@@ -158,7 +167,8 @@ e2k_restriction_orv (E2kRestriction *rn, ...)
* Return value: the new restriction
**/
E2kRestriction *
-e2k_restriction_not (E2kRestriction *rn, gboolean unref)
+e2k_restriction_not (E2kRestriction *rn,
+ gboolean unref)
{
E2kRestriction *ret = g_new0 (E2kRestriction, 1);
@@ -193,8 +203,8 @@ e2k_restriction_not (E2kRestriction *rn, gboolean unref)
**/
E2kRestriction *
e2k_restriction_content (const gchar *propname,
- E2kRestrictionFuzzyLevel fuzzy_level,
- const gchar *value)
+ E2kRestrictionFuzzyLevel fuzzy_level,
+ const gchar *value)
{
E2kRestriction *ret = g_new0 (E2kRestriction, 1);
@@ -219,8 +229,9 @@ e2k_restriction_content (const gchar *propname,
* Return value: the new restriction
**/
E2kRestriction *
-e2k_restriction_prop_bool (const gchar *propname, E2kRestrictionRelop relop,
- gboolean value)
+e2k_restriction_prop_bool (const gchar *propname,
+ E2kRestrictionRelop relop,
+ gboolean value)
{
E2kRestriction *ret = g_new0 (E2kRestriction, 1);
@@ -245,8 +256,9 @@ e2k_restriction_prop_bool (const gchar *propname, E2kRestrictionRelop relop,
* Return value: the new restriction
**/
E2kRestriction *
-e2k_restriction_prop_int (const gchar *propname, E2kRestrictionRelop relop,
- gint value)
+e2k_restriction_prop_int (const gchar *propname,
+ E2kRestrictionRelop relop,
+ gint value)
{
E2kRestriction *ret = g_new0 (E2kRestriction, 1);
@@ -271,8 +283,9 @@ e2k_restriction_prop_int (const gchar *propname, E2kRestrictionRelop relop,
* Return value: the new restriction
**/
E2kRestriction *
-e2k_restriction_prop_date (const gchar *propname, E2kRestrictionRelop relop,
- const gchar *value)
+e2k_restriction_prop_date (const gchar *propname,
+ E2kRestrictionRelop relop,
+ const gchar *value)
{
E2kRestriction *ret = g_new0 (E2kRestriction, 1);
@@ -299,8 +312,9 @@ e2k_restriction_prop_date (const gchar *propname, E2kRestrictionRelop relop,
* Return value: the new restriction
**/
E2kRestriction *
-e2k_restriction_prop_string (const gchar *propname, E2kRestrictionRelop relop,
- const gchar *value)
+e2k_restriction_prop_string (const gchar *propname,
+ E2kRestrictionRelop relop,
+ const gchar *value)
{
E2kRestriction *ret = g_new0 (E2kRestriction, 1);
@@ -326,8 +340,10 @@ e2k_restriction_prop_string (const gchar *propname, E2kRestrictionRelop relop,
* Return value: the new restriction
**/
E2kRestriction *
-e2k_restriction_prop_binary (const gchar *propname, E2kRestrictionRelop relop,
- gconstpointer data, gint len)
+e2k_restriction_prop_binary (const gchar *propname,
+ E2kRestrictionRelop relop,
+ gconstpointer data,
+ gint len)
{
E2kRestriction *ret = g_new0 (E2kRestriction, 1);
@@ -354,8 +370,9 @@ e2k_restriction_prop_binary (const gchar *propname, E2kRestrictionRelop relop,
* Return value: the new restriction
**/
E2kRestriction *
-e2k_restriction_compare (const gchar *propname1, E2kRestrictionRelop relop,
- const gchar *propname2)
+e2k_restriction_compare (const gchar *propname1,
+ E2kRestrictionRelop relop,
+ const gchar *propname2)
{
E2kRestriction *ret = g_new0 (E2kRestriction, 1);
@@ -382,8 +399,9 @@ e2k_restriction_compare (const gchar *propname1, E2kRestrictionRelop relop,
* Return value: the new restriction
**/
E2kRestriction *
-e2k_restriction_bitmask (const gchar *propname, E2kRestrictionBitop bitop,
- guint32 mask)
+e2k_restriction_bitmask (const gchar *propname,
+ E2kRestrictionBitop bitop,
+ guint32 mask)
{
E2kRestriction *ret = g_new0 (E2kRestriction, 1);
@@ -414,8 +432,9 @@ e2k_restriction_bitmask (const gchar *propname, E2kRestrictionBitop bitop,
* Return value: the new restriction
**/
E2kRestriction *
-e2k_restriction_size (const gchar *propname, E2kRestrictionRelop relop,
- guint32 size)
+e2k_restriction_size (const gchar *propname,
+ E2kRestrictionRelop relop,
+ guint32 size)
{
E2kRestriction *ret = g_new0 (E2kRestriction, 1);
@@ -468,7 +487,9 @@ e2k_restriction_exist (const gchar *propname)
* Return value: the new restriction
**/
E2kRestriction *
-e2k_restriction_sub (const gchar *subtable, E2kRestriction *rn, gboolean unref)
+e2k_restriction_sub (const gchar *subtable,
+ E2kRestriction *rn,
+ gboolean unref)
{
E2kRestriction *ret = g_new0 (E2kRestriction, 1);
@@ -542,7 +563,10 @@ static const gchar *sql_relops[] = { "<", "<=", ">", ">=", "=", "!=" };
static const gint n_sql_relops = G_N_ELEMENTS (sql_relops);
static gboolean
-rns_to_sql (E2kRestrictionType type, E2kRestriction **rns, gint nrns, GString *sql)
+rns_to_sql (E2kRestrictionType type,
+ E2kRestriction **rns,
+ gint nrns,
+ GString *sql)
{
gint i;
gboolean need_op = FALSE;
@@ -563,7 +587,8 @@ rns_to_sql (E2kRestrictionType type, E2kRestriction **rns, gint nrns, GString *s
}
static void
-append_sql_quoted (GString *sql, const gchar *string)
+append_sql_quoted (GString *sql,
+ const gchar *string)
{
while (*string) {
if (*string == '\'')
@@ -575,7 +600,9 @@ append_sql_quoted (GString *sql, const gchar *string)
}
static gboolean
-rn_to_sql (E2kRestriction *rn, GString *sql, E2kRestrictionType inside)
+rn_to_sql (E2kRestriction *rn,
+ GString *sql,
+ E2kRestrictionType inside)
{
E2kPropValue *pv;
@@ -729,7 +756,9 @@ e2k_restriction_to_sql (E2kRestriction *rn)
/* Binary import/export */
static gboolean
-extract_restriction (guint8 **data, gint *len, E2kRestriction **rn)
+extract_restriction (guint8 **data,
+ gint *len,
+ E2kRestriction **rn)
{
gint type;
@@ -934,7 +963,9 @@ extract_restriction (guint8 **data, gint *len, E2kRestriction **rn)
* Return value: success or failure
**/
gboolean
-e2k_restriction_extract (guint8 **data, gint *len, E2kRestriction **rn)
+e2k_restriction_extract (guint8 **data,
+ gint *len,
+ E2kRestriction **rn)
{
guint32 rnlen;
@@ -961,7 +992,8 @@ e2k_restriction_extract (guint8 **data, gint *len, E2kRestriction **rn)
}
static void
-append_restriction (GByteArray *ba, E2kRestriction *rn)
+append_restriction (GByteArray *ba,
+ E2kRestriction *rn)
{
gint i;
@@ -1040,7 +1072,8 @@ append_restriction (GByteArray *ba, E2kRestriction *rn)
* Appends @rn to @ba as part of a server-side rule.
**/
void
-e2k_restriction_append (GByteArray *ba, E2kRestriction *rn)
+e2k_restriction_append (GByteArray *ba,
+ E2kRestriction *rn)
{
gint rnlen_offset, rnlen;
diff --git a/server/lib/e2k-result.c b/server/lib/e2k-result.c
index 738852d..415980b 100644
--- a/server/lib/e2k-result.c
+++ b/server/lib/e2k-result.c
@@ -34,7 +34,9 @@
#include <libxml/xmlmemory.h>
static void
-prop_get_binary_array (E2kResult *result, const gchar *propname, xmlNode *node)
+prop_get_binary_array (E2kResult *result,
+ const gchar *propname,
+ xmlNode *node)
{
GPtrArray *array;
@@ -59,8 +61,10 @@ prop_get_binary_array (E2kResult *result, const gchar *propname, xmlNode *node)
}
static void
-prop_get_string_array (E2kResult *result, const gchar *propname,
- E2kPropType real_type, xmlNode *node)
+prop_get_string_array (E2kResult *result,
+ const gchar *propname,
+ E2kPropType real_type,
+ xmlNode *node)
{
GPtrArray *array;
@@ -77,7 +81,9 @@ prop_get_string_array (E2kResult *result, const gchar *propname,
}
static void
-prop_get_binary (E2kResult *result, const gchar *propname, xmlNode *node)
+prop_get_binary (E2kResult *result,
+ const gchar *propname,
+ xmlNode *node)
{
GByteArray *byte_array;
@@ -96,8 +102,10 @@ prop_get_binary (E2kResult *result, const gchar *propname, xmlNode *node)
}
static void
-prop_get_string (E2kResult *result, const gchar *propname,
- E2kPropType real_type, xmlNode *node)
+prop_get_string (E2kResult *result,
+ const gchar *propname,
+ E2kPropType real_type,
+ xmlNode *node)
{
gchar *content;
@@ -111,14 +119,17 @@ prop_get_string (E2kResult *result, const gchar *propname,
}
static void
-prop_get_xml (E2kResult *result, const gchar *propname, xmlNode *node)
+prop_get_xml (E2kResult *result,
+ const gchar *propname,
+ xmlNode *node)
{
e2k_properties_set_xml (result->props, propname,
xmlCopyNode (node, TRUE));
}
static void
-prop_parse (xmlNode *node, E2kResult *result)
+prop_parse (xmlNode *node,
+ E2kResult *result)
{
gchar *name;
xmlChar *type;
@@ -170,7 +181,8 @@ prop_parse (xmlNode *node, E2kResult *result)
}
static void
-propstat_parse (xmlNode *node, E2kResult *result)
+propstat_parse (xmlNode *node,
+ E2kResult *result)
{
node = node->xmlChildrenNode;
if (!E2K_IS_NODE (node, "DAV:", "status"))
@@ -219,7 +231,8 @@ e2k_results_array_new (void)
* and makes libxml choke. So we preprocess them to fix that.
*/
static gchar *
-sanitize_bad_multistatus (const gchar *buf, gint len)
+sanitize_bad_multistatus (const gchar *buf,
+ gint len)
{
GString *body;
const gchar *p;
@@ -291,7 +304,7 @@ sanitize_bad_multistatus (const gchar *buf, gint len)
**/
void
e2k_results_array_add_from_multistatus (GArray *results_array,
- SoupMessage *msg)
+ SoupMessage *msg)
{
xmlDoc *doc;
xmlNode *node, *rnode;
@@ -360,7 +373,8 @@ e2k_results_array_add_from_multistatus (GArray *results_array,
* Frees @results_array, and optionally its contents
**/
void
-e2k_results_array_free (GArray *results_array, gboolean free_results)
+e2k_results_array_free (GArray *results_array,
+ gboolean free_results)
{
if (free_results) {
e2k_results_free ((E2kResult *) results_array->data,
@@ -380,7 +394,8 @@ e2k_results_array_free (GArray *results_array, gboolean free_results)
**/
void
e2k_results_from_multistatus (SoupMessage *msg,
- E2kResult **results, gint *nresults)
+ E2kResult **results,
+ gint *nresults)
{
GArray *results_array;
@@ -402,7 +417,8 @@ e2k_results_from_multistatus (SoupMessage *msg,
* Return value: a copy of @results.
**/
E2kResult *
-e2k_results_copy (E2kResult *results, gint nresults)
+e2k_results_copy (E2kResult *results,
+ gint nresults)
{
GArray *results_array = NULL;
E2kResult result, *new_results;
@@ -430,7 +446,8 @@ e2k_results_copy (E2kResult *results, gint nresults)
* Frees the data in @results.
**/
void
-e2k_results_free (E2kResult *results, gint nresults)
+e2k_results_free (E2kResult *results,
+ gint nresults)
{
gint i;
@@ -505,11 +522,13 @@ iter_fetch (E2kResultIter *iter)
* Return value: the new iterator
**/
E2kResultIter *
-e2k_result_iter_new (E2kContext *ctx, E2kOperation *op,
- gboolean ascending, gint total,
- E2kResultIterFetchFunc fetch_func,
- E2kResultIterFreeFunc free_func,
- gpointer user_data)
+e2k_result_iter_new (E2kContext *ctx,
+ E2kOperation *op,
+ gboolean ascending,
+ gint total,
+ E2kResultIterFetchFunc fetch_func,
+ E2kResultIterFreeFunc free_func,
+ gpointer user_data)
{
E2kResultIter *iter;
diff --git a/server/lib/e2k-rule-xml.c b/server/lib/e2k-rule-xml.c
index 519e92e..ea4a494 100644
--- a/server/lib/e2k-rule-xml.c
+++ b/server/lib/e2k-rule-xml.c
@@ -38,8 +38,10 @@ static const gchar *subject_types[] = { "is", "contains", "starts with", NULL, "
#if 0
static gboolean
-fuzzy_level_from_name (const gchar *name, const gchar *map[],
- gint *fuzzy_level, gboolean *negated)
+fuzzy_level_from_name (const gchar *name,
+ const gchar *map[],
+ gint *fuzzy_level,
+ gboolean *negated)
{
gint i;
@@ -56,7 +58,9 @@ fuzzy_level_from_name (const gchar *name, const gchar *map[],
#endif
static inline const gchar *
-fuzzy_level_to_name (gint fuzzy_level, gboolean negated, const gchar *map[])
+fuzzy_level_to_name (gint fuzzy_level,
+ gboolean negated,
+ const gchar *map[])
{
fuzzy_level = E2K_FL_MATCH_TYPE (fuzzy_level);
if (negated)
@@ -71,8 +75,9 @@ static const gchar *gsizeypes[] = { "less than", "less than", "greater than", "g
#if 0
static gboolean
-relop_from_name (const gchar *name, const gchar *map[],
- E2kRestrictionRelop *relop)
+relop_from_name (const gchar *name,
+ const gchar *map[],
+ E2kRestrictionRelop *relop)
{
gint i;
@@ -88,7 +93,9 @@ relop_from_name (const gchar *name, const gchar *map[],
#endif
static inline const gchar *
-relop_to_name (E2kRestrictionRelop relop, gboolean negated, const gchar *map[])
+relop_to_name (E2kRestrictionRelop relop,
+ gboolean negated,
+ const gchar *map[])
{
static const gint negate_map[] = {
E2K_RELOP_GE, E2K_RELOP_GT, E2K_RELOP_LE, E2K_RELOP_LT,
@@ -262,7 +269,9 @@ message_is (const xmlChar *name,
}
static xmlNode *
-address_is (E2kRestriction *comment_rn, gboolean recipients, gboolean negated)
+address_is (E2kRestriction *comment_rn,
+ gboolean recipients,
+ gboolean negated)
{
xmlNode *part;
E2kRestriction *rn;
@@ -331,8 +340,10 @@ address_is (E2kRestriction *comment_rn, gboolean recipients, gboolean negated)
}
static gboolean
-restriction_to_xml (E2kRestriction *rn, xmlNode *partset,
- E2kRestrictionType wrap_type, gboolean negated)
+restriction_to_xml (E2kRestriction *rn,
+ xmlNode *partset,
+ E2kRestrictionType wrap_type,
+ gboolean negated)
{
xmlNode *part, *value, *node;
E2kPropValue *pv;
@@ -658,7 +669,8 @@ restriction_to_xml (E2kRestriction *rn, xmlNode *partset,
}
static gchar *
-stringify_entryid (guint8 *data, gint len)
+stringify_entryid (guint8 *data,
+ gint len)
{
GString *string;
gchar *ret;
@@ -679,7 +691,8 @@ stringify_entryid (guint8 *data, gint len)
}
static gboolean
-action_to_xml (E2kAction *act, xmlNode *actionset)
+action_to_xml (E2kAction *act,
+ xmlNode *actionset)
{
xmlNode *part, *value;
gchar *entryid;
@@ -834,7 +847,8 @@ action_to_xml (E2kAction *act, xmlNode *actionset)
}
static gboolean
-rule_to_xml (E2kRule *rule, xmlNode *ruleset)
+rule_to_xml (E2kRule *rule,
+ xmlNode *ruleset)
{
xmlNode *top, *set;
E2kRestriction *rn;
diff --git a/server/lib/e2k-rule.c b/server/lib/e2k-rule.c
index 6c84048..88545a3 100644
--- a/server/lib/e2k-rule.c
+++ b/server/lib/e2k-rule.c
@@ -38,7 +38,8 @@
* fields of @prop.
**/
void
-e2k_rule_prop_set (E2kRuleProp *prop, const gchar *propname)
+e2k_rule_prop_set (E2kRuleProp *prop,
+ const gchar *propname)
{
prop->name = propname;
prop->proptag = e2k_prop_proptag (propname);
@@ -52,7 +53,8 @@ e2k_rule_prop_set (E2kRuleProp *prop, const gchar *propname)
* Writes @val into the rule at @ptr
**/
void
-e2k_rule_write_uint32 (guint8 *ptr, guint32 val)
+e2k_rule_write_uint32 (guint8 *ptr,
+ guint32 val)
{
*ptr++ = ( val & 0xFF);
*ptr++ = ((val >> 8) & 0xFF);
@@ -68,7 +70,8 @@ e2k_rule_write_uint32 (guint8 *ptr, guint32 val)
* Appends @val to the rule in @ba
**/
void
-e2k_rule_append_uint32 (GByteArray *ba, guint32 val)
+e2k_rule_append_uint32 (GByteArray *ba,
+ guint32 val)
{
g_byte_array_set_size (ba, ba->len + 4);
e2k_rule_write_uint32 (ba->data + ba->len - 4, val);
@@ -100,7 +103,9 @@ e2k_rule_read_uint32 (guint8 *ptr)
* Return value: success or failure
**/
gboolean
-e2k_rule_extract_uint32 (guint8 **ptr, gint *len, guint32 *val)
+e2k_rule_extract_uint32 (guint8 **ptr,
+ gint *len,
+ guint32 *val)
{
if (*len < 4)
return FALSE;
@@ -120,7 +125,8 @@ e2k_rule_extract_uint32 (guint8 **ptr, gint *len, guint32 *val)
* Writes @val into the rule at @ptr
**/
void
-e2k_rule_write_uint16 (guint8 *ptr, guint16 val)
+e2k_rule_write_uint16 (guint8 *ptr,
+ guint16 val)
{
*ptr++ = ( val & 0xFF);
*ptr++ = ((val >> 8) & 0xFF);
@@ -134,7 +140,8 @@ e2k_rule_write_uint16 (guint8 *ptr, guint16 val)
* Appends @val to the rule in @ba
**/
void
-e2k_rule_append_uint16 (GByteArray *ba, guint16 val)
+e2k_rule_append_uint16 (GByteArray *ba,
+ guint16 val)
{
g_byte_array_set_size (ba, ba->len + 2);
e2k_rule_write_uint16 (ba->data + ba->len - 2, val);
@@ -166,7 +173,9 @@ e2k_rule_read_uint16 (guint8 *ptr)
* Return value: success or failure
**/
gboolean
-e2k_rule_extract_uint16 (guint8 **ptr, gint *len, guint16 *val)
+e2k_rule_extract_uint16 (guint8 **ptr,
+ gint *len,
+ guint16 *val)
{
if (*len < 2)
return FALSE;
@@ -186,7 +195,8 @@ e2k_rule_extract_uint16 (guint8 **ptr, gint *len, guint16 *val)
* Appends @val to the rule in @ba
**/
void
-e2k_rule_append_byte (GByteArray *ba, guint8 val)
+e2k_rule_append_byte (GByteArray *ba,
+ guint8 val)
{
g_byte_array_append (ba, &val, 1);
}
@@ -203,7 +213,9 @@ e2k_rule_append_byte (GByteArray *ba, guint8 val)
* Return value: success or failure
**/
gboolean
-e2k_rule_extract_byte (guint8 **ptr, gint *len, guint8 *val)
+e2k_rule_extract_byte (guint8 **ptr,
+ gint *len,
+ guint8 *val)
{
if (*len < 1)
return FALSE;
@@ -223,7 +235,8 @@ e2k_rule_extract_byte (guint8 **ptr, gint *len, guint8 *val)
* Appends @str to the rule in @ba
**/
void
-e2k_rule_append_string (GByteArray *ba, const gchar *str)
+e2k_rule_append_string (GByteArray *ba,
+ const gchar *str)
{
/* FIXME: verify encoding */
g_byte_array_append (ba, (guint8 *) str, strlen (str) + 1);
@@ -241,7 +254,9 @@ e2k_rule_append_string (GByteArray *ba, const gchar *str)
* Return value: success or failure
**/
gboolean
-e2k_rule_extract_string (guint8 **ptr, gint *len, gchar **str)
+e2k_rule_extract_string (guint8 **ptr,
+ gint *len,
+ gchar **str)
{
gint slen;
@@ -265,7 +280,8 @@ e2k_rule_extract_string (guint8 **ptr, gint *len, gchar **str)
* Appends @str to the rule in @ba
**/
void
-e2k_rule_append_unicode (GByteArray *ba, const gchar *str)
+e2k_rule_append_unicode (GByteArray *ba,
+ const gchar *str)
{
gunichar2 *utf16;
gint i;
@@ -291,7 +307,9 @@ e2k_rule_append_unicode (GByteArray *ba, const gchar *str)
* Return value: success or failure
**/
gboolean
-e2k_rule_extract_unicode (guint8 **ptr, gint *len, gchar **str)
+e2k_rule_extract_unicode (guint8 **ptr,
+ gint *len,
+ gchar **str)
{
guint8 *start, *end;
gunichar2 *utf16;
@@ -321,7 +339,8 @@ e2k_rule_extract_unicode (guint8 **ptr, gint *len, gchar **str)
* Appends @data (with a 2-byte length prefix) to the rule in @ba
**/
void
-e2k_rule_append_binary (GByteArray *ba, GByteArray *data)
+e2k_rule_append_binary (GByteArray *ba,
+ GByteArray *data)
{
e2k_rule_append_uint16 (ba, data->len);
g_byte_array_append (ba, data->data, data->len);
@@ -339,7 +358,9 @@ e2k_rule_append_binary (GByteArray *ba, GByteArray *data)
* Return value: success or failure
**/
gboolean
-e2k_rule_extract_binary (guint8 **ptr, gint *len, GByteArray **data)
+e2k_rule_extract_binary (guint8 **ptr,
+ gint *len,
+ GByteArray **data)
{
guint16 datalen;
@@ -367,7 +388,8 @@ e2k_rule_extract_binary (guint8 **ptr, gint *len, GByteArray **data)
* Appends a representation of @prop to the rule in @ba
**/
void
-e2k_rule_append_proptag (GByteArray *ba, E2kRuleProp *prop)
+e2k_rule_append_proptag (GByteArray *ba,
+ E2kRuleProp *prop)
{
guint32 proptag = prop->proptag;
@@ -390,7 +412,9 @@ e2k_rule_append_proptag (GByteArray *ba, E2kRuleProp *prop)
* Return value: success or failure
**/
gboolean
-e2k_rule_extract_proptag (guint8 **ptr, gint *len, E2kRuleProp *prop)
+e2k_rule_extract_proptag (guint8 **ptr,
+ gint *len,
+ E2kRuleProp *prop)
{
if (!e2k_rule_extract_uint32 (ptr, len, &prop->proptag))
return FALSE;
@@ -411,7 +435,8 @@ e2k_rule_extract_proptag (guint8 **ptr, gint *len, E2kRuleProp *prop)
* rule in @ba
**/
void
-e2k_rule_append_propvalue (GByteArray *ba, E2kPropValue *pv)
+e2k_rule_append_propvalue (GByteArray *ba,
+ E2kPropValue *pv)
{
g_return_if_fail (pv->prop.proptag != 0);
@@ -453,7 +478,9 @@ e2k_rule_append_propvalue (GByteArray *ba, E2kPropValue *pv)
* Return value: success or failure
**/
gboolean
-e2k_rule_extract_propvalue (guint8 **ptr, gint *len, E2kPropValue *pv)
+e2k_rule_extract_propvalue (guint8 **ptr,
+ gint *len,
+ E2kPropValue *pv)
{
if (!e2k_rule_extract_proptag (ptr, len, &pv->prop))
return FALSE;
@@ -462,11 +489,11 @@ e2k_rule_extract_propvalue (guint8 **ptr, gint *len, E2kPropValue *pv)
case E2K_PT_UNICODE:
case E2K_PT_STRING8:
pv->type = E2K_PROP_TYPE_STRING;
- return e2k_rule_extract_unicode (ptr, len, (gchar **)&pv->value);
+ return e2k_rule_extract_unicode (ptr, len, (gchar **) &pv->value);
case E2K_PT_BINARY:
pv->type = E2K_PROP_TYPE_BINARY;
- return e2k_rule_extract_binary (ptr, len, (GByteArray **)&pv->value);
+ return e2k_rule_extract_binary (ptr, len, (GByteArray **) &pv->value);
case E2K_PT_SYSTIME:
{
diff --git a/server/lib/e2k-security-descriptor.c b/server/lib/e2k-security-descriptor.c
index 26a73cd..91fca58 100644
--- a/server/lib/e2k-security-descriptor.c
+++ b/server/lib/e2k-security-descriptor.c
@@ -148,7 +148,9 @@ e2k_security_descriptor_init (E2kSecurityDescriptor *sd)
}
static void
-free_sid (gpointer key, gpointer sid, gpointer data)
+free_sid (gpointer key,
+ gpointer sid,
+ gpointer data)
{
g_object_unref (sid);
}
@@ -179,7 +181,9 @@ dispose (GObject *object)
* See docs/security for details.
*/
static gint
-ace_compar (E2k_ACE *ace1, E2k_ACE *ace2, E2kSecurityDescriptor *sd)
+ace_compar (E2k_ACE *ace1,
+ E2k_ACE *ace2,
+ E2kSecurityDescriptor *sd)
{
E2kSidType t1;
E2kSidType t2;
@@ -274,7 +278,8 @@ ace_compar (E2k_ACE *ace1, E2k_ACE *ace2, E2kSecurityDescriptor *sd)
}
static xmlNode *
-find_child (xmlNode *node, const xmlChar *name)
+find_child (xmlNode *node,
+ const xmlChar *name)
{
for (node = node->xmlChildrenNode; node; node = node->next) {
if (node->name && !xmlStrcmp (node->name, name))
@@ -284,7 +289,8 @@ find_child (xmlNode *node, const xmlChar *name)
}
static void
-extract_sids (E2kSecurityDescriptor *sd, xmlNodePtr node)
+extract_sids (E2kSecurityDescriptor *sd,
+ xmlNodePtr node)
{
xmlNodePtr string_sid_node, type_node, display_name_node;
xmlChar *string_sid, *content, *display_name;
@@ -342,8 +348,10 @@ extract_sids (E2kSecurityDescriptor *sd, xmlNodePtr node)
}
static gboolean
-parse_sid (E2kSecurityDescriptor *sd, GByteArray *binsd, guint16 *off,
- E2kSid **sid)
+parse_sid (E2kSecurityDescriptor *sd,
+ GByteArray *binsd,
+ guint16 *off,
+ E2kSid **sid)
{
gint sid_len;
@@ -360,7 +368,9 @@ parse_sid (E2kSecurityDescriptor *sd, GByteArray *binsd, guint16 *off,
}
static gboolean
-parse_acl (E2kSecurityDescriptor *sd, GByteArray *binsd, guint16 *off)
+parse_acl (E2kSecurityDescriptor *sd,
+ GByteArray *binsd,
+ guint16 *off)
{
E2k_ACL aclbuf;
E2k_ACE acebuf;
@@ -429,7 +439,8 @@ parse_acl (E2kSecurityDescriptor *sd, GByteArray *binsd, guint16 *off)
* not be parsed.
**/
E2kSecurityDescriptor *
-e2k_security_descriptor_new (xmlNodePtr xml_form, GByteArray *binary_form)
+e2k_security_descriptor_new (xmlNodePtr xml_form,
+ GByteArray *binary_form)
{
E2kSecurityDescriptor *sd;
E2k_SECURITY_DESCRIPTOR_RELATIVE sdbuf;
@@ -537,7 +548,7 @@ e2k_security_descriptor_to_binary (E2kSecurityDescriptor *sd)
bsid = e2k_sid_get_binary_sid (sd->priv->owner);
off += E2K_SID_BINARY_SID_LEN (bsid);
sdbuf.Group = GUINT32_TO_LE (off);
- g_byte_array_append (binsd, (gpointer)&sdbuf, sizeof (sdbuf));
+ g_byte_array_append (binsd, (gpointer) &sdbuf, sizeof (sdbuf));
/* ACL header */
aclbuf.AclRevision = E2K_ACL_REVISION;
@@ -545,7 +556,7 @@ e2k_security_descriptor_to_binary (E2kSecurityDescriptor *sd)
aclbuf.AclSize = GUINT16_TO_LE (acl_size);
aclbuf.AceCount = GUINT16_TO_LE (ace_count);
aclbuf.Sbz2 = 0;
- g_byte_array_append (binsd, (gpointer)&aclbuf, sizeof (aclbuf));
+ g_byte_array_append (binsd, (gpointer) &aclbuf, sizeof (aclbuf));
/* ACEs */
for (ace = 0; ace < sd->priv->aces->len; ace++) {
@@ -560,7 +571,7 @@ e2k_security_descriptor_to_binary (E2kSecurityDescriptor *sd)
}
}
- g_byte_array_append (binsd, (gpointer)&aces[ace],
+ g_byte_array_append (binsd, (gpointer) &aces[ace],
sizeof (aces[ace].Header) +
sizeof (aces[ace].Mask));
bsid = e2k_sid_get_binary_sid (aces[ace].Sid);
@@ -643,7 +654,7 @@ e2k_security_descriptor_get_sids (E2kSecurityDescriptor *sd)
**/
void
e2k_security_descriptor_remove_sid (E2kSecurityDescriptor *sd,
- E2kSid *sid)
+ E2kSid *sid)
{
E2k_ACE *aces;
gint ace;
@@ -685,7 +696,7 @@ e2k_security_descriptor_remove_sid (E2kSecurityDescriptor *sd,
**/
guint32
e2k_security_descriptor_get_permissions (E2kSecurityDescriptor *sd,
- E2kSid *sid)
+ E2kSid *sid)
{
E2k_ACE *aces;
guint32 mapi_perms, checkperm;
@@ -730,7 +741,8 @@ e2k_security_descriptor_get_permissions (E2kSecurityDescriptor *sd,
* mask will be changed.
*/
static void
-set_ace (E2kSecurityDescriptor *sd, E2k_ACE *ace)
+set_ace (E2kSecurityDescriptor *sd,
+ E2k_ACE *ace)
{
E2k_ACE *aces = (E2k_ACE *) sd->priv->aces->data;
gint low, mid = 0, high, cmp = -1;
@@ -766,7 +778,8 @@ set_ace (E2kSecurityDescriptor *sd, E2k_ACE *ace)
**/
void
e2k_security_descriptor_set_permissions (E2kSecurityDescriptor *sd,
- E2kSid *sid, guint32 perms)
+ E2kSid *sid,
+ guint32 perms)
{
E2k_ACE ace;
guint32 object_allowed, object_denied;
@@ -839,7 +852,7 @@ static struct {
guint32 perms;
} roles[E2K_PERMISSIONS_ROLE_NUM_ROLES] = {
/* i18n: These are Outlook's words for the default roles in
- the folder permissions dialog. */
+ * the folder permissions dialog. */
{ N_("Owner"), (E2K_PERMISSION_FOLDER_VISIBLE |
E2K_PERMISSION_READ_ANY |
E2K_PERMISSION_CREATE |
diff --git a/server/lib/e2k-sid.c b/server/lib/e2k-sid.c
index ecfa2a2..a499d5d 100644
--- a/server/lib/e2k-sid.c
+++ b/server/lib/e2k-sid.c
@@ -86,8 +86,10 @@ dispose (GObject *object)
}
static E2kSid *
-sid_new_internal (E2kSidType type, const gchar *display_name,
- const gchar *string_sid, const guint8 *binary_sid)
+sid_new_internal (E2kSidType type,
+ const gchar *display_name,
+ const gchar *string_sid,
+ const guint8 *binary_sid)
{
E2kSid *sid;
@@ -128,8 +130,9 @@ sid_new_internal (E2kSidType type, const gchar *display_name,
* Return value: the new SID
**/
E2kSid *
-e2k_sid_new_from_string_sid (E2kSidType type, const gchar *string_sid,
- const gchar *display_name)
+e2k_sid_new_from_string_sid (E2kSidType type,
+ const gchar *string_sid,
+ const gchar *display_name)
{
g_return_val_if_fail (string_sid != NULL, NULL);
@@ -151,9 +154,9 @@ e2k_sid_new_from_string_sid (E2kSidType type, const gchar *string_sid,
* Return value: the new SID
**/
E2kSid *
-e2k_sid_new_from_binary_sid (E2kSidType type,
- const guint8 *binary_sid,
- const gchar *display_name)
+e2k_sid_new_from_binary_sid (E2kSidType type,
+ const guint8 *binary_sid,
+ const gchar *display_name)
{
g_return_val_if_fail (binary_sid != NULL, NULL);
@@ -283,7 +286,8 @@ e2k_sid_get_display_name (E2kSid *sid)
* Return value: %TRUE or %FALSE
**/
gint
-e2k_sid_binary_sid_equal (gconstpointer a, gconstpointer b)
+e2k_sid_binary_sid_equal (gconstpointer a,
+ gconstpointer b)
{
const guint8 *bsida = (const guint8 *) a;
const guint8 *bsidb = (const guint8 *) b;
diff --git a/server/lib/e2k-uri.c b/server/lib/e2k-uri.c
index abe862e..24ea0fc 100644
--- a/server/lib/e2k-uri.c
+++ b/server/lib/e2k-uri.c
@@ -55,7 +55,7 @@ e2k_uri_new (const gchar *uri_string)
/* Find protocol: initial [a-z+.-]* substring until ":" */
p = uri_string;
- while (p < end && (isalnum ((guchar)*p) ||
+ while (p < end && (isalnum ((guchar) * p) ||
*p == '.' || *p == '+' || *p == '-'))
p++;
@@ -209,7 +209,8 @@ e2k_uri_free (E2kUri *uri)
* Return value: the value of @name, or %NULL if it is not set
**/
const gchar *
-e2k_uri_get_param (E2kUri *uri, const gchar *name)
+e2k_uri_get_param (E2kUri *uri,
+ const gchar *name)
{
return g_datalist_get_data (&uri->params, name);
}
@@ -276,8 +277,10 @@ static const gint uri_encoded_char[] = {
* e2k_uri_append_encoded() will encode any "/"s passed in.
**/
void
-e2k_uri_append_encoded (GString *str, const gchar *in,
- gboolean wss_encode, const gchar *extra_enc_chars)
+e2k_uri_append_encoded (GString *str,
+ const gchar *in,
+ gboolean wss_encode,
+ const gchar *extra_enc_chars)
{
const guchar *s = (const guchar *) in;
@@ -327,8 +330,9 @@ e2k_uri_append_encoded (GString *str, const gchar *in,
* Return value: the encoded string
**/
gchar *
-e2k_uri_encode (const gchar *in, gboolean wss_encode,
- const gchar *extra_enc_chars)
+e2k_uri_encode (const gchar *in,
+ gboolean wss_encode,
+ const gchar *extra_enc_chars)
{
GString *string;
gchar *out;
@@ -381,7 +385,8 @@ e2k_uri_path (const gchar *uri_string)
* Return value: the new URI
**/
gchar *
-e2k_uri_concat (const gchar *uri_prefix, const gchar *tail)
+e2k_uri_concat (const gchar *uri_prefix,
+ const gchar *tail)
{
const gchar *p;
@@ -404,7 +409,8 @@ e2k_uri_concat (const gchar *uri_prefix, const gchar *tail)
* Return value: the relative URI
**/
const gchar *
-e2k_uri_relative (const gchar *uri_prefix, const gchar *uri)
+e2k_uri_relative (const gchar *uri_prefix,
+ const gchar *uri)
{
gint prefix_len = strlen (uri_prefix);
diff --git a/server/lib/e2k-utils.c b/server/lib/e2k-utils.c
index 82a7923..4477f69 100644
--- a/server/lib/e2k-utils.c
+++ b/server/lib/e2k-utils.c
@@ -58,22 +58,22 @@ e2k_parse_timestamp (const gchar *timestamp)
{
struct tm tm;
- tm.tm_year = strtoul (timestamp, (gchar **)×tamp, 10) - 1900;
+ tm.tm_year = strtoul (timestamp, (gchar **) ×tamp, 10) - 1900;
if (*timestamp++ != '-')
return -1;
- tm.tm_mon = strtoul (timestamp, (gchar **)×tamp, 10) - 1;
+ tm.tm_mon = strtoul (timestamp, (gchar **) ×tamp, 10) - 1;
if (*timestamp++ != '-')
return -1;
- tm.tm_mday = strtoul (timestamp, (gchar **)×tamp, 10);
+ tm.tm_mday = strtoul (timestamp, (gchar **) ×tamp, 10);
if (*timestamp++ != 'T')
return -1;
- tm.tm_hour = strtoul (timestamp, (gchar **)×tamp, 10);
+ tm.tm_hour = strtoul (timestamp, (gchar **) ×tamp, 10);
if (*timestamp++ != ':')
return -1;
- tm.tm_min = strtoul (timestamp, (gchar **)×tamp, 10);
+ tm.tm_min = strtoul (timestamp, (gchar **) ×tamp, 10);
if (*timestamp++ != ':')
return -1;
- tm.tm_sec = strtoul (timestamp, (gchar **)×tamp, 10);
+ tm.tm_sec = strtoul (timestamp, (gchar **) ×tamp, 10);
if (*timestamp != '.' && *timestamp != 'Z')
return -1;
@@ -306,7 +306,8 @@ e2k_entryid_to_dn (GByteArray *entryid)
}
static void
-append_permanenturl_section (GString *url, guint8 *entryid)
+append_permanenturl_section (GString *url,
+ guint8 *entryid)
{
gint i = 0;
@@ -343,7 +344,8 @@ append_permanenturl_section (GString *url, guint8 *entryid)
* Return value: the permanenturl, which the caller must free.
**/
gchar *
-e2k_entryid_to_permanenturl (GByteArray *entryid, const gchar *base_uri)
+e2k_entryid_to_permanenturl (GByteArray *entryid,
+ const gchar *base_uri)
{
GString *url;
gchar *ret;
@@ -370,7 +372,8 @@ e2k_entryid_to_permanenturl (GByteArray *entryid, const gchar *base_uri)
#define HEXVAL(c) (isdigit (c) ? (c) - '0' : g_ascii_tolower (c) - 'a' + 10)
static gboolean
-append_entryid_section (GByteArray *entryid, const gchar **permanenturl)
+append_entryid_section (GByteArray *entryid,
+ const gchar **permanenturl)
{
const gchar *p;
guint8 buf[44], byte;
@@ -442,7 +445,8 @@ e2k_permanenturl_to_entryid (const gchar *permanenturl)
* equal, %FALSE if not.
**/
gint
-e2k_ascii_strcase_equal (gconstpointer v, gconstpointer v2)
+e2k_ascii_strcase_equal (gconstpointer v,
+ gconstpointer v2)
{
return !g_ascii_strcasecmp (v, v2);
}
@@ -545,7 +549,9 @@ static const gchar MAPI_ONE_OFF_UID[] = {
* Return value: the recipient ENTRYID
**/
GByteArray *
-e2k_entryid_generate_oneoff (const gchar *display_name, const gchar *email, gboolean unicode)
+e2k_entryid_generate_oneoff (const gchar *display_name,
+ const gchar *email,
+ gboolean unicode)
{
GByteArray *entryid;
@@ -621,7 +627,8 @@ static const gchar MAPI_CONTACT_UID[] = {
* Return value: the recipient ENTRYID
**/
GByteArray *
-e2k_entryid_generate_contact (GByteArray *contact_entryid, gint nth_address)
+e2k_entryid_generate_contact (GByteArray *contact_entryid,
+ gint nth_address)
{
GByteArray *entryid;
@@ -648,7 +655,8 @@ e2k_entryid_generate_contact (GByteArray *contact_entryid, gint nth_address)
* Return value: the search key
**/
GByteArray *
-e2k_search_key_generate (const gchar *addrtype, const gchar *address)
+e2k_search_key_generate (const gchar *addrtype,
+ const gchar *address)
{
GByteArray *search_key;
guint8 *p;
diff --git a/server/lib/e2k-xml-utils.c b/server/lib/e2k-xml-utils.c
index 2f2d955..75efc76 100644
--- a/server/lib/e2k-xml-utils.c
+++ b/server/lib/e2k-xml-utils.c
@@ -28,7 +28,9 @@
#include <libxml/xmlmemory.h>
static void
-my_xml_parser_error_handler (gpointer ctx, const gchar *msg, ...)
+my_xml_parser_error_handler (gpointer ctx,
+ const gchar *msg,
+ ...)
{
;
}
@@ -43,7 +45,8 @@ my_xml_parser_error_handler (gpointer ctx, const gchar *msg, ...)
* Return value: a pointer to an #xmlDoc
**/
xmlDoc *
-e2k_parse_xml (const gchar *buf, gint len)
+e2k_parse_xml (const gchar *buf,
+ gint len)
{
static xmlSAXHandler *sax;
xmlParserCtxtPtr ctxt;
@@ -105,7 +108,8 @@ e2k_parse_xml (const gchar *buf, gint len)
* Return value: a pointer to an #xmlDoc
**/
xmlDoc *
-e2k_parse_html (const gchar *buf, gint len)
+e2k_parse_html (const gchar *buf,
+ gint len)
{
xmlDoc *doc;
#if LIBXML_VERSION > 20600
@@ -158,7 +162,8 @@ e2k_parse_html (const gchar *buf, gint len)
* unencoded in XML text (eg, "<").
**/
void
-e2k_g_string_append_xml_escaped (GString *string, const gchar *value)
+e2k_g_string_append_xml_escaped (GString *string,
+ const gchar *value)
{
while (*value) {
switch (*value) {
@@ -200,7 +205,8 @@ e2k_g_string_append_xml_escaped (GString *string, const gchar *value)
* there are no more matches.
**/
xmlNode *
-e2k_xml_find (xmlNode *node, const gchar *name)
+e2k_xml_find (xmlNode *node,
+ const gchar *name)
{
return e2k_xml_find_in (node, NULL, name);
}
@@ -225,7 +231,9 @@ e2k_xml_find (xmlNode *node, const gchar *name)
* there are no more matches.
**/
xmlNode *
-e2k_xml_find_in (xmlNode *node, xmlNode *top, const gchar *name)
+e2k_xml_find_in (xmlNode *node,
+ xmlNode *top,
+ const gchar *name)
{
g_return_val_if_fail (name != NULL, NULL);
diff --git a/server/lib/ebrowse.c b/server/lib/ebrowse.c
index 0cb2207..c30a356 100644
--- a/server/lib/ebrowse.c
+++ b/server/lib/ebrowse.c
@@ -57,7 +57,8 @@ static const gchar *folder_tree_props[] = {
};
static void
-display_folder_tree (E2kContext *ctx, gchar *top)
+display_folder_tree (E2kContext *ctx,
+ gchar *top)
{
E2kRestriction *rn;
E2kResultIter *iter;
@@ -91,7 +92,9 @@ display_folder_tree (E2kContext *ctx, gchar *top)
}
static void
-list_contents (E2kContext *ctx, gchar *top, gboolean reverse)
+list_contents (E2kContext *ctx,
+ gchar *top,
+ gboolean reverse)
{
E2kRestriction *rn;
E2kResultIter *iter;
@@ -121,7 +124,8 @@ list_contents (E2kContext *ctx, gchar *top, gboolean reverse)
}
static gint
-mp_compar (gconstpointer k, gconstpointer m)
+mp_compar (gconstpointer k,
+ gconstpointer m)
{
const gchar *key = k;
struct mapi_proptag *mp = (gpointer) m;
@@ -172,7 +176,8 @@ typedef struct {
} EBrowseProp;
static gint
-prop_compar (gconstpointer a, gconstpointer b)
+prop_compar (gconstpointer a,
+ gconstpointer b)
{
EBrowseProp **pa = (gpointer) a;
EBrowseProp **pb = (gpointer) b;
@@ -225,7 +230,10 @@ print_prop (EBrowseProp *prop)
}
static void
-add_prop (const gchar *propname, E2kPropType type, gpointer value, gpointer props)
+add_prop (const gchar *propname,
+ E2kPropType type,
+ gpointer value,
+ gpointer props)
{
EBrowseProp *prop;
@@ -237,7 +245,8 @@ add_prop (const gchar *propname, E2kPropType type, gpointer value, gpointer prop
}
static void
-print_properties (E2kResult *results, gint nresults)
+print_properties (E2kResult *results,
+ gint nresults)
{
GPtrArray *props;
gint i;
@@ -260,7 +269,8 @@ print_properties (E2kResult *results, gint nresults)
}
static void
-got_all_properties (SoupMessage *msg, gpointer ctx)
+got_all_properties (SoupMessage *msg,
+ gpointer ctx)
{
E2kResult *results;
gint nresults;
@@ -282,7 +292,8 @@ got_all_properties (SoupMessage *msg, gpointer ctx)
"</propfind>"
static void
-get_all_properties (E2kContext *ctx, gchar *uri)
+get_all_properties (E2kContext *ctx,
+ gchar *uri)
{
SoupMessage *msg;
@@ -296,7 +307,9 @@ get_all_properties (E2kContext *ctx, gchar *uri)
}
static void
-get_property (E2kContext *ctx, gchar *uri, gchar *prop)
+get_property (E2kContext *ctx,
+ gchar *uri,
+ gchar *prop)
{
E2kHTTPStatus status;
E2kResult *results;
@@ -314,7 +327,7 @@ get_property (E2kContext *ctx, gchar *uri, gchar *prop)
e2k_operation_init (&op);
status = e2k_context_propfind (ctx, &op, uri,
- (const gchar **)&prop, 1,
+ (const gchar **) &prop, 1,
&results, &nresults);
e2k_operation_free (&op);
test_abort_if_http_error (status);
@@ -323,7 +336,8 @@ 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;
@@ -376,7 +390,8 @@ get_fav_properties (E2kContext *ctx, gchar *uri)
}
static void
-get_sd (E2kContext *ctx, gchar *uri)
+get_sd (E2kContext *ctx,
+ gchar *uri)
{
const gchar *props[] = {
E2K_PR_EXCHANGE_SD_BINARY,
@@ -442,7 +457,8 @@ get_sd (E2kContext *ctx, gchar *uri)
}
static void
-get_body (E2kContext *ctx, gchar *uri)
+get_body (E2kContext *ctx,
+ gchar *uri)
{
E2kHTTPStatus status;
gchar *body;
@@ -458,7 +474,8 @@ get_body (E2kContext *ctx, gchar *uri)
}
static void
-delete (E2kContext *ctx, gchar *uri)
+delete (E2kContext *ctx,
+ gchar *uri)
{
E2kHTTPStatus status;
@@ -470,8 +487,10 @@ delete (E2kContext *ctx, gchar *uri)
}
static void
-notify (E2kContext *ctx, const gchar *uri,
- E2kContextChangeType type, gpointer user_data)
+notify (E2kContext *ctx,
+ const gchar *uri,
+ E2kContextChangeType type,
+ gpointer user_data)
{
switch (type) {
case E2K_CONTEXT_OBJECT_CHANGED:
@@ -490,7 +509,8 @@ notify (E2kContext *ctx, const gchar *uri,
}
static void
-subscribe (E2kContext *ctx, gchar *uri)
+subscribe (E2kContext *ctx,
+ gchar *uri)
{
e2k_context_subscribe (ctx, uri,
E2K_CONTEXT_OBJECT_CHANGED, 0,
@@ -507,7 +527,10 @@ subscribe (E2kContext *ctx, gchar *uri)
}
static void
-move (E2kContext *ctx, gchar *from, gchar *to, gboolean delete)
+move (E2kContext *ctx,
+ gchar *from,
+ gchar *to,
+ gboolean delete)
{
GPtrArray *source_hrefs;
E2kResultIter *iter;
@@ -540,7 +563,9 @@ move (E2kContext *ctx, gchar *from, gchar *to, gboolean delete)
}
static void
-name (E2kContext *ctx, gchar *alias, gchar *uri_prefix)
+name (E2kContext *ctx,
+ gchar *alias,
+ gchar *uri_prefix)
{
E2kHTTPStatus status;
gchar *uri, *body;
@@ -578,7 +603,9 @@ name (E2kContext *ctx, gchar *alias, gchar *uri_prefix)
}
static void
-put (E2kContext *ctx, const gchar *file, const gchar *uri)
+put (E2kContext *ctx,
+ const gchar *file,
+ const gchar *uri)
{
struct stat st;
gchar *buf;
@@ -644,7 +671,8 @@ usage (void)
const gchar *test_program_name = "ebrowse";
void
-test_main (gint argc, gchar **argv)
+test_main (gint argc,
+ gchar **argv)
{
gchar *uri;
diff --git a/server/lib/fbtest.c b/server/lib/fbtest.c
index 1adcebb..4938d82 100644
--- a/server/lib/fbtest.c
+++ b/server/lib/fbtest.c
@@ -36,7 +36,8 @@
const gchar *test_program_name = "fbtest";
void
-test_main (gint argc, gchar **argv)
+test_main (gint argc,
+ gchar **argv)
{
E2kGlobalCatalog *gc;
E2kGlobalCatalogStatus status;
diff --git a/server/lib/gctest.c b/server/lib/gctest.c
index c4f8eaa..106fafc 100644
--- a/server/lib/gctest.c
+++ b/server/lib/gctest.c
@@ -37,7 +37,8 @@ E2kGlobalCatalog *gc;
E2kOperation op;
static void
-do_lookup (E2kGlobalCatalog *gc, const gchar *user)
+do_lookup (E2kGlobalCatalog *gc,
+ const gchar *user)
{
E2kGlobalCatalogStatus status;
E2kGlobalCatalogEntry *entry;
@@ -120,7 +121,7 @@ do_lookup (E2kGlobalCatalog *gc, const gchar *user)
maxAge = lookup_passwd_max_age (gc, &op);
printf("Password max age is %f \n", maxAge);
- pwd_exp_days = (maxAge * 0.000000100)/86400;
+ pwd_exp_days = (maxAge * 0.000000100) / 86400;
printf("Password expiery period is %d \n", pwd_exp_days);
e2k_operation_free (&op);
@@ -130,7 +131,8 @@ do_lookup (E2kGlobalCatalog *gc, const gchar *user)
}
static gchar *
-lookup_dn (E2kGlobalCatalog *gc, const gchar *id)
+lookup_dn (E2kGlobalCatalog *gc,
+ const gchar *id)
{
E2kGlobalCatalogEntry *entry;
E2kGlobalCatalogLookupType type;
@@ -168,8 +170,10 @@ lookup_dn (E2kGlobalCatalog *gc, const gchar *id)
}
static void
-do_modify (E2kGlobalCatalog *gc, const gchar *user,
- gint deleg_op, const gchar *delegate)
+do_modify (E2kGlobalCatalog *gc,
+ const gchar *user,
+ gint deleg_op,
+ const gchar *delegate)
{
gchar *self_dn, *deleg_dn;
E2kGlobalCatalogStatus status;
@@ -226,7 +230,8 @@ quit (gint sig)
const gchar *test_program_name = "gctest";
void
-test_main (gint argc, gchar **argv)
+test_main (gint argc,
+ gchar **argv)
{
const gchar *server;
diff --git a/server/lib/ruletest.c b/server/lib/ruletest.c
index c5ea6d0..ca20ebc 100644
--- a/server/lib/ruletest.c
+++ b/server/lib/ruletest.c
@@ -39,7 +39,8 @@ static const gchar *rules_props[] = {
};
void
-test_main (gint argc, gchar **argv)
+test_main (gint argc,
+ gchar **argv)
{
const gchar *url;
E2kContext *ctx;
diff --git a/server/lib/test-utils.c b/server/lib/test-utils.c
index 5bd1558..af7b940 100644
--- a/server/lib/test-utils.c
+++ b/server/lib/test-utils.c
@@ -89,7 +89,8 @@ test_ask_password (const gchar *prompt)
* Return value: the password, or %NULL if it could not be determined.
**/
const gchar *
-test_get_password (const gchar *user, const gchar *host)
+test_get_password (const gchar *user,
+ const gchar *host)
{
static gchar *password = NULL;
gchar *prompt;
@@ -244,7 +245,8 @@ idle_run (gpointer data)
}
gint
-main (gint argc, gchar **argv)
+main (gint argc,
+ gchar **argv)
{
gtk_init (&argc, &argv);
diff --git a/server/lib/urltest.c b/server/lib/urltest.c
index c500a2d..adc176a 100644
--- a/server/lib/urltest.c
+++ b/server/lib/urltest.c
@@ -36,7 +36,8 @@
const gchar *test_program_name = "urltest";
static void
-dump_uri (E2kUri *euri) {
+dump_uri (E2kUri *euri)
+{
const gchar *temp;
printf ("URI contents \n");
@@ -85,7 +86,8 @@ dump_uri (E2kUri *euri) {
}
void
-test_main (gint argc, gchar **argv)
+test_main (gint argc,
+ gchar **argv)
{
const gchar *url;
E2kUri *euri;
diff --git a/server/storage/e-folder-exchange.c b/server/storage/e-folder-exchange.c
index 819220d..f0e3248 100644
--- a/server/storage/e-folder-exchange.c
+++ b/server/storage/e-folder-exchange.c
@@ -146,9 +146,12 @@ sanitize_path (const gchar *path)
* Return value: a new #EFolderExchange
**/
EFolder *
-e_folder_exchange_new (ExchangeHierarchy *hier, const gchar *name,
- const gchar *type, const gchar *outlook_class,
- const gchar *physical_uri, const gchar *internal_uri)
+e_folder_exchange_new (ExchangeHierarchy *hier,
+ const gchar *name,
+ const gchar *type,
+ const gchar *outlook_class,
+ const gchar *physical_uri,
+ const gchar *internal_uri)
{
EFolderExchange *efe;
EFolder *ef;
@@ -237,7 +240,8 @@ e_folder_exchange_get_internal_uri (EFolder *folder)
* from the server.
**/
void
-e_folder_exchange_set_internal_uri (EFolder *folder, const gchar *internal_uri)
+e_folder_exchange_set_internal_uri (EFolder *folder,
+ const gchar *internal_uri)
{
EFolderExchange *efe;
@@ -289,7 +293,8 @@ e_folder_exchange_get_permanent_uri (EFolder *folder)
* previously been unset).
**/
void
-e_folder_exchange_set_permanent_uri (EFolder *folder, const gchar *permanent_uri)
+e_folder_exchange_set_permanent_uri (EFolder *folder,
+ const gchar *permanent_uri)
{
EFolderExchange *efe;
@@ -326,7 +331,8 @@ e_folder_exchange_get_folder_size (EFolder *folder)
* Sets @folder's folder_size
**/
void
-e_folder_exchange_set_folder_size (EFolder *folder, gint64 folder_size)
+e_folder_exchange_set_folder_size (EFolder *folder,
+ gint64 folder_size)
{
EFolderExchange *efe;
@@ -360,7 +366,7 @@ e_folder_exchange_get_has_subfolders (EFolder *folder)
**/
void
e_folder_exchange_set_has_subfolders (EFolder *folder,
- gboolean has_subfolders)
+ gboolean has_subfolders)
{
g_return_if_fail (E_IS_FOLDER_EXCHANGE (folder));
@@ -390,7 +396,7 @@ e_folder_exchange_get_rescan_tree (EFolder *folder)
**/
void
e_folder_exchange_set_rescan_tree (EFolder *folder,
- gboolean rescan_tree)
+ gboolean rescan_tree)
{
g_return_if_fail (E_IS_FOLDER_EXCHANGE (folder));
@@ -436,7 +442,8 @@ e_folder_exchange_get_hierarchy (EFolder *folder)
* Return value: the full filename, which must be freed.
**/
gchar *
-e_folder_exchange_get_storage_file (EFolder *folder, const gchar *filename)
+e_folder_exchange_get_storage_file (EFolder *folder,
+ const gchar *filename)
{
EFolderExchange *efe;
gchar *path;
@@ -466,7 +473,8 @@ e_folder_exchange_get_storage_file (EFolder *folder, const gchar *filename)
* Return value: success or failure
**/
gboolean
-e_folder_exchange_save_to_file (EFolder *folder, const gchar *filename)
+e_folder_exchange_save_to_file (EFolder *folder,
+ const gchar *filename)
{
xmlDoc *doc;
xmlNode *root;
@@ -548,7 +556,8 @@ e_folder_exchange_save_to_file (EFolder *folder, const gchar *filename)
* Return value: the folder, or %NULL on a failed load.
**/
EFolder *
-e_folder_exchange_new_from_file (ExchangeHierarchy *hier, const gchar *filename)
+e_folder_exchange_new_from_file (ExchangeHierarchy *hier,
+ const gchar *filename)
{
EFolder *folder = NULL;
xmlDoc *doc;
@@ -661,9 +670,12 @@ e_folder_exchange_new_from_file (ExchangeHierarchy *hier, const gchar *filename)
* Return value: the HTTP status
**/
E2kHTTPStatus
-e_folder_exchange_propfind (EFolder *folder, E2kOperation *op,
- const gchar **props, gint nprops,
- E2kResult **results, gint *nresults)
+e_folder_exchange_propfind (EFolder *folder,
+ E2kOperation *op,
+ const gchar **props,
+ gint nprops,
+ E2kResult **results,
+ gint *nresults)
{
g_return_val_if_fail (E_IS_FOLDER_EXCHANGE (folder), E2K_HTTP_MALFORMED);
@@ -689,9 +701,12 @@ e_folder_exchange_propfind (EFolder *folder, E2kOperation *op,
* Return value: an iterator for getting the results
**/
E2kResultIter *
-e_folder_exchange_bpropfind_start (EFolder *folder, E2kOperation *op,
- const gchar **hrefs, gint nhrefs,
- const gchar **props, gint nprops)
+e_folder_exchange_bpropfind_start (EFolder *folder,
+ E2kOperation *op,
+ const gchar **hrefs,
+ gint nhrefs,
+ const gchar **props,
+ gint nprops)
{
g_return_val_if_fail (E_IS_FOLDER_EXCHANGE (folder), NULL);
@@ -717,10 +732,13 @@ e_folder_exchange_bpropfind_start (EFolder *folder, E2kOperation *op,
* Return value: an iterator for returning the search results
**/
E2kResultIter *
-e_folder_exchange_search_start (EFolder *folder, E2kOperation *op,
- const gchar **props, gint nprops,
- E2kRestriction *rn, const gchar *orderby,
- gboolean ascending)
+e_folder_exchange_search_start (EFolder *folder,
+ E2kOperation *op,
+ const gchar **props,
+ gint nprops,
+ E2kRestriction *rn,
+ const gchar *orderby,
+ gboolean ascending)
{
g_return_val_if_fail (E_IS_FOLDER_EXCHANGE (folder), NULL);
@@ -746,9 +764,10 @@ e_folder_exchange_search_start (EFolder *folder, E2kOperation *op,
**/
void
e_folder_exchange_subscribe (EFolder *folder,
- E2kContextChangeType type, gint min_interval,
- E2kContextChangeCallback callback,
- gpointer user_data)
+ E2kContextChangeType type,
+ gint min_interval,
+ E2kContextChangeCallback callback,
+ gpointer user_data)
{
g_return_if_fail (E_IS_FOLDER_EXCHANGE (folder));
@@ -795,9 +814,11 @@ e_folder_exchange_unsubscribe (EFolder *folder)
* Return value: the iterator for the results
**/
E2kResultIter *
-e_folder_exchange_transfer_start (EFolder *source, E2kOperation *op,
- EFolder *dest, GPtrArray *source_hrefs,
- gboolean delete_originals)
+e_folder_exchange_transfer_start (EFolder *source,
+ E2kOperation *op,
+ EFolder *dest,
+ GPtrArray *source_hrefs,
+ gboolean delete_originals)
{
g_return_val_if_fail (E_IS_FOLDER_EXCHANGE (source), NULL);
@@ -829,13 +850,15 @@ e_folder_exchange_transfer_start (EFolder *source, E2kOperation *op,
**/
E2kHTTPStatus
e_folder_exchange_put_new (EFolder *folder,
- E2kOperation *op,
- const gchar *object_name,
- E2kContextTestCallback test_callback,
- gpointer user_data,
- const gchar *content_type,
- const gchar *body, gint length,
- gchar **location, gchar **repl_uid)
+ E2kOperation *op,
+ const gchar *object_name,
+ E2kContextTestCallback test_callback,
+ gpointer user_data,
+ const gchar *content_type,
+ const gchar *body,
+ gint length,
+ gchar **location,
+ gchar **repl_uid)
{
g_return_val_if_fail (E_IS_FOLDER_EXCHANGE (folder), E2K_HTTP_MALFORMED);
@@ -862,16 +885,18 @@ e_folder_exchange_put_new (EFolder *folder,
* PROPPATCHes data into @folder with a new name based on
* @object_name. This is a convenience wrapper around
* e2k_context_proppatch_new(), qv.
-
+ *
* Return value: the HTTP status
**/
E2kHTTPStatus
-e_folder_exchange_proppatch_new (EFolder *folder, E2kOperation *op,
- const gchar *object_name,
- E2kContextTestCallback test_callback,
- gpointer user_data,
- E2kProperties *props,
- gchar **location, gchar **repl_uid)
+e_folder_exchange_proppatch_new (EFolder *folder,
+ E2kOperation *op,
+ const gchar *object_name,
+ E2kContextTestCallback test_callback,
+ gpointer user_data,
+ E2kProperties *props,
+ gchar **location,
+ gchar **repl_uid)
{
g_return_val_if_fail (E_IS_FOLDER_EXCHANGE (folder), E2K_HTTP_MALFORMED);
@@ -898,9 +923,12 @@ e_folder_exchange_proppatch_new (EFolder *folder, E2kOperation *op,
* Return value: an iterator for getting the results of the BPROPPATCH
**/
E2kResultIter *
-e_folder_exchange_bproppatch_start (EFolder *folder, E2kOperation *op,
- const gchar **hrefs, gint nhrefs,
- E2kProperties *props, gboolean create)
+e_folder_exchange_bproppatch_start (EFolder *folder,
+ E2kOperation *op,
+ const gchar **hrefs,
+ gint nhrefs,
+ E2kProperties *props,
+ gboolean create)
{
g_return_val_if_fail (E_IS_FOLDER_EXCHANGE (folder), NULL);
@@ -923,8 +951,10 @@ e_folder_exchange_bproppatch_start (EFolder *folder, E2kOperation *op,
* Return value: an iterator for returning the results
**/
E2kResultIter *
-e_folder_exchange_bdelete_start (EFolder *folder, E2kOperation *op,
- const gchar **hrefs, gint nhrefs)
+e_folder_exchange_bdelete_start (EFolder *folder,
+ E2kOperation *op,
+ const gchar **hrefs,
+ gint nhrefs)
{
g_return_val_if_fail (E_IS_FOLDER_EXCHANGE (folder), NULL);
@@ -948,9 +978,10 @@ e_folder_exchange_bdelete_start (EFolder *folder, E2kOperation *op,
* Return value: the HTTP status
**/
E2kHTTPStatus
-e_folder_exchange_mkcol (EFolder *folder, E2kOperation *op,
- E2kProperties *props,
- gchar **permanent_url)
+e_folder_exchange_mkcol (EFolder *folder,
+ E2kOperation *op,
+ E2kProperties *props,
+ gchar **permanent_url)
{
g_return_val_if_fail (E_IS_FOLDER_EXCHANGE (folder), E2K_HTTP_MALFORMED);
@@ -970,7 +1001,8 @@ e_folder_exchange_mkcol (EFolder *folder, E2kOperation *op,
* Return value: the HTTP status
**/
E2kHTTPStatus
-e_folder_exchange_delete (EFolder *folder, E2kOperation *op)
+e_folder_exchange_delete (EFolder *folder,
+ E2kOperation *op)
{
ExchangeHierarchy *hier;
const gchar *folder_type, *physical_uri;
@@ -1024,9 +1056,11 @@ e_folder_exchange_delete (EFolder *folder, E2kOperation *op)
* Return value: the HTTP status
**/
E2kHTTPStatus
-e_folder_exchange_transfer_dir (EFolder *source, E2kOperation *op,
- EFolder *dest, gboolean delete_original,
- gchar **permanent_url)
+e_folder_exchange_transfer_dir (EFolder *source,
+ E2kOperation *op,
+ EFolder *dest,
+ gboolean delete_original,
+ gchar **permanent_url)
{
g_return_val_if_fail (E_IS_FOLDER_EXCHANGE (source), E2K_HTTP_MALFORMED);
diff --git a/server/storage/e-folder-tree.c b/server/storage/e-folder-tree.c
index 1725655..2998e11 100644
--- a/server/storage/e-folder-tree.c
+++ b/server/storage/e-folder-tree.c
@@ -64,9 +64,9 @@ get_parent_path (const gchar *path)
static void
traverse_subtree (EFolderTree *tree,
- Folder *root_folder,
- EFolderTreeForeachFunc foreach_func,
- gpointer data)
+ Folder *root_folder,
+ EFolderTreeForeachFunc foreach_func,
+ gpointer data)
{
GList *p;
@@ -86,7 +86,7 @@ traverse_subtree (EFolderTree *tree,
static Folder *
folder_new (const gchar *path,
- gpointer data)
+ gpointer data)
{
Folder *folder;
@@ -99,7 +99,7 @@ folder_new (const gchar *path,
static void
folder_remove_subfolder (Folder *folder,
- Folder *subfolder)
+ Folder *subfolder)
{
folder->subfolders = g_list_remove (folder->subfolders, subfolder);
subfolder->parent = NULL;
@@ -107,7 +107,7 @@ folder_remove_subfolder (Folder *folder,
static void
folder_add_subfolder (Folder *folder,
- Folder *subfolder)
+ Folder *subfolder)
{
folder->subfolders = g_list_prepend (folder->subfolders, subfolder);
subfolder->parent = folder;
@@ -128,7 +128,7 @@ folder_destroy (Folder *folder)
static void
remove_folder (EFolderTree *folder_tree,
- Folder *folder)
+ Folder *folder)
{
if (folder->subfolders != NULL) {
GList *p;
@@ -168,7 +168,7 @@ remove_folder (EFolderTree *folder_tree,
**/
EFolderTree *
e_folder_tree_new (EFolderDestroyNotify folder_destroy_notify,
- gpointer closure)
+ gpointer closure)
{
EFolderTree *new;
@@ -219,8 +219,8 @@ e_folder_tree_destroy (EFolderTree *folder_tree)
**/
gboolean
e_folder_tree_add (EFolderTree *folder_tree,
- const gchar *path,
- gpointer data)
+ const gchar *path,
+ gpointer data)
{
Folder *parent_folder;
Folder *folder;
@@ -293,7 +293,7 @@ e_folder_tree_add (EFolderTree *folder_tree,
**/
gboolean
e_folder_tree_remove (EFolderTree *folder_tree,
- const gchar *path)
+ const gchar *path)
{
Folder *folder;
@@ -311,9 +311,9 @@ e_folder_tree_remove (EFolderTree *folder_tree,
static void
count_nodes (EFolderTree *tree,
- const gchar *path,
- gpointer data,
- gpointer closure)
+ const gchar *path,
+ gpointer data,
+ gpointer closure)
{
gint *count = closure;
@@ -349,7 +349,7 @@ e_folder_tree_get_count (EFolderTree *folder_tree)
**/
gpointer
e_folder_tree_get_folder (EFolderTree *folder_tree,
- const gchar *path)
+ const gchar *path)
{
Folder *folder;
@@ -376,7 +376,7 @@ e_folder_tree_get_folder (EFolderTree *folder_tree,
**/
GList *
e_folder_tree_get_subfolders (EFolderTree *folder_tree,
- const gchar *path)
+ const gchar *path)
{
Folder *folder;
GList *list;
@@ -412,8 +412,8 @@ e_folder_tree_get_subfolders (EFolderTree *folder_tree,
**/
void
e_folder_tree_foreach (EFolderTree *folder_tree,
- EFolderTreeForeachFunc foreach_func,
- gpointer data)
+ EFolderTreeForeachFunc foreach_func,
+ gpointer data)
{
Folder *root_node;
@@ -439,8 +439,8 @@ e_folder_tree_foreach (EFolderTree *folder_tree,
* Return value: The path for the folder that holds that @data.
**/
const gchar *
-e_folder_tree_get_path_for_data (EFolderTree *folder_tree,
- gconstpointer data)
+e_folder_tree_get_path_for_data (EFolderTree *folder_tree,
+ gconstpointer data)
{
g_return_val_if_fail (folder_tree != NULL, NULL);
g_return_val_if_fail (data != NULL, NULL);
diff --git a/server/storage/e-folder-type-registry.c b/server/storage/e-folder-type-registry.c
index cb3d2e5..5cf1315 100644
--- a/server/storage/e-folder-type-registry.c
+++ b/server/storage/e-folder-type-registry.c
@@ -54,12 +54,12 @@ struct EFolderTypeRegistryPrivate {
static FolderType *
folder_type_new (const gchar *name,
- const gchar *icon_name,
- const gchar *display_name,
- const gchar *description,
- gboolean user_creatable,
- gint num_accepted_dnd_types,
- const gchar **accepted_dnd_types)
+ const gchar *icon_name,
+ const gchar *display_name,
+ const gchar *description,
+ gboolean user_creatable,
+ gint num_accepted_dnd_types,
+ const gchar **accepted_dnd_types)
{
FolderType *new;
gint i;
@@ -100,7 +100,7 @@ folder_type_free (FolderType *folder_type)
static FolderType *
get_folder_type (EFolderTypeRegistry *folder_type_registry,
- const gchar *type_name)
+ const gchar *type_name)
{
EFolderTypeRegistryPrivate *priv;
@@ -111,13 +111,13 @@ get_folder_type (EFolderTypeRegistry *folder_type_registry,
static gboolean
register_folder_type (EFolderTypeRegistry *folder_type_registry,
- const gchar *name,
- const gchar *icon_name,
- const gchar *display_name,
- const gchar *description,
- gboolean user_creatable,
- gint num_accepted_dnd_types,
- const gchar **accepted_dnd_types)
+ const gchar *name,
+ const gchar *icon_name,
+ const gchar *display_name,
+ const gchar *description,
+ gboolean user_creatable,
+ gint num_accepted_dnd_types,
+ const gchar **accepted_dnd_types)
{
EFolderTypeRegistryPrivate *priv;
FolderType *folder_type;
@@ -139,8 +139,8 @@ register_folder_type (EFolderTypeRegistry *folder_type_registry,
static gboolean
set_handler (EFolderTypeRegistry *folder_type_registry,
- const gchar *name,
- GObject *handler)
+ const gchar *name,
+ GObject *handler)
{
FolderType *folder_type;
@@ -160,8 +160,8 @@ set_handler (EFolderTypeRegistry *folder_type_registry,
static void
hash_forall_free_folder_type (gpointer key,
- gpointer value,
- gpointer data)
+ gpointer value,
+ gpointer data)
{
FolderType *folder_type;
@@ -216,13 +216,13 @@ e_folder_type_registry_new (void)
gboolean
e_folder_type_registry_register_type (EFolderTypeRegistry *folder_type_registry,
- const gchar *type_name,
- const gchar *icon_name,
- const gchar *display_name,
- const gchar *description,
- gboolean user_creatable,
- gint num_accepted_dnd_types,
- const gchar **accepted_dnd_types)
+ const gchar *type_name,
+ const gchar *icon_name,
+ const gchar *display_name,
+ const gchar *description,
+ gboolean user_creatable,
+ gint num_accepted_dnd_types,
+ const gchar **accepted_dnd_types)
{
g_return_val_if_fail (E_IS_FOLDER_TYPE_REGISTRY (folder_type_registry), FALSE);
g_return_val_if_fail (type_name != NULL, FALSE);
@@ -234,9 +234,9 @@ e_folder_type_registry_register_type (EFolderTypeRegistry *folder_type_registry,
}
gboolean
-e_folder_type_registry_set_handler_for_type (EFolderTypeRegistry *folder_type_registry,
- const gchar *type_name,
- GObject *handler)
+e_folder_type_registry_set_handler_for_type (EFolderTypeRegistry *folder_type_registry,
+ const gchar *type_name,
+ GObject *handler)
{
g_return_val_if_fail (E_IS_FOLDER_TYPE_REGISTRY (folder_type_registry), FALSE);
/* g_return_val_if_fail (EVOLUTION_IS_SHELL_COMPONENT_CLIENT (handler), FALSE); */
@@ -245,8 +245,8 @@ e_folder_type_registry_set_handler_for_type (EFolderTypeRegistry *folder_type_r
}
gboolean
-e_folder_type_registry_type_registered (EFolderTypeRegistry *folder_type_registry,
- const gchar *type_name)
+e_folder_type_registry_type_registered (EFolderTypeRegistry *folder_type_registry,
+ const gchar *type_name)
{
g_return_val_if_fail (E_IS_FOLDER_TYPE_REGISTRY (folder_type_registry), FALSE);
g_return_val_if_fail (type_name != NULL, FALSE);
@@ -259,7 +259,7 @@ e_folder_type_registry_type_registered (EFolderTypeRegistry *folder_type_regist
void
e_folder_type_registry_unregister_type (EFolderTypeRegistry *folder_type_registry,
- const gchar *type_name)
+ const gchar *type_name)
{
EFolderTypeRegistryPrivate *priv;
FolderType *folder_type;
@@ -279,8 +279,8 @@ e_folder_type_registry_unregister_type (EFolderTypeRegistry *folder_type_registr
static void
get_type_names_hash_forall (gpointer key,
- gpointer value,
- gpointer data)
+ gpointer value,
+ gpointer data)
{
GList **type_name_list;
@@ -307,7 +307,7 @@ e_folder_type_registry_get_type_names (EFolderTypeRegistry *folder_type_registry
const gchar *
e_folder_type_registry_get_icon_name_for_type (EFolderTypeRegistry *folder_type_registry,
- const gchar *type_name)
+ const gchar *type_name)
{
const FolderType *folder_type;
@@ -323,7 +323,7 @@ e_folder_type_registry_get_icon_name_for_type (EFolderTypeRegistry *folder_type_
GObject *
e_folder_type_registry_get_handler_for_type (EFolderTypeRegistry *folder_type_registry,
- const gchar *type_name)
+ const gchar *type_name)
{
const FolderType *folder_type;
@@ -338,8 +338,8 @@ e_folder_type_registry_get_handler_for_type (EFolderTypeRegistry *folder_type_re
}
gboolean
-e_folder_type_registry_type_is_user_creatable (EFolderTypeRegistry *folder_type_registry,
- const gchar *type_name)
+e_folder_type_registry_type_is_user_creatable (EFolderTypeRegistry *folder_type_registry,
+ const gchar *type_name)
{
const FolderType *folder_type;
@@ -355,7 +355,7 @@ e_folder_type_registry_type_is_user_creatable (EFolderTypeRegistry *folder_type
const gchar *
e_folder_type_registry_get_display_name_for_type (EFolderTypeRegistry *folder_type_registry,
- const gchar *type_name)
+ const gchar *type_name)
{
const FolderType *folder_type;
@@ -371,7 +371,7 @@ e_folder_type_registry_get_display_name_for_type (EFolderTypeRegistry *folder_ty
const gchar *
e_folder_type_registry_get_description_for_type (EFolderTypeRegistry *folder_type_registry,
- const gchar *type_name)
+ const gchar *type_name)
{
const FolderType *folder_type;
@@ -387,7 +387,7 @@ e_folder_type_registry_get_description_for_type (EFolderTypeRegistry *folder_typ
GList *
e_folder_type_registry_get_accepted_dnd_types_for_type (EFolderTypeRegistry *folder_type_registry,
- const gchar *type_name)
+ const gchar *type_name)
{
const FolderType *folder_type;
diff --git a/server/storage/e-folder.c b/server/storage/e-folder.c
index 7413530..423ca85 100644
--- a/server/storage/e-folder.c
+++ b/server/storage/e-folder.c
@@ -45,10 +45,10 @@ struct EFolderPrivate {
gint unread_count;
/* Folders have a default sorting priority of zero; when deciding the
- sort order in the Evolution folder tree, folders with the same
- priority value are compared by name, while folders with a higher
- priority number always come after the folders with a lower priority
- number. */
+ * sort order in the Evolution folder tree, folders with the same
+ * priority value are compared by name, while folders with a higher
+ * priority number always come after the folders with a lower priority
+ * number. */
gint sorting_priority;
guint self_highlight : 1;
@@ -57,7 +57,7 @@ struct EFolderPrivate {
guint has_subfolders : 1;
/* Custom icon for this folder; if NULL the folder will just use the
- icon for its type. */
+ * icon for its type. */
gchar *custom_icon_name;
};
@@ -72,9 +72,10 @@ static guint signals[LAST_SIGNAL] = { 0 };
/* EFolder methods. */
static gboolean
-accept_drop (EFolder *folder, GdkDragContext *context,
- const gchar *target_type,
- GtkSelectionData *selection_data)
+accept_drop (EFolder *folder,
+ GdkDragContext *context,
+ const gchar *target_type,
+ GtkSelectionData *selection_data)
{
return FALSE;
}
@@ -141,9 +142,9 @@ e_folder_init (EFolder *folder)
void
e_folder_construct (EFolder *folder,
- const gchar *name,
- const gchar *type,
- const gchar *description)
+ const gchar *name,
+ const gchar *type,
+ const gchar *description)
{
EFolderPrivate *priv;
@@ -160,8 +161,8 @@ e_folder_construct (EFolder *folder,
EFolder *
e_folder_new (const gchar *name,
- const gchar *type,
- const gchar *description)
+ const gchar *type,
+ const gchar *description)
{
EFolder *folder;
@@ -281,7 +282,7 @@ e_folder_get_sorting_priority (EFolder *folder)
void
e_folder_set_name (EFolder *folder,
- const gchar *name)
+ const gchar *name)
{
g_return_if_fail (E_IS_FOLDER (folder));
g_return_if_fail (name != NULL);
@@ -298,7 +299,7 @@ e_folder_set_name (EFolder *folder,
void
e_folder_set_type_string (EFolder *folder,
- const gchar *type)
+ const gchar *type)
{
g_return_if_fail (E_IS_FOLDER (folder));
g_return_if_fail (type != NULL);
@@ -311,7 +312,7 @@ e_folder_set_type_string (EFolder *folder,
void
e_folder_set_description (EFolder *folder,
- const gchar *description)
+ const gchar *description)
{
g_return_if_fail (E_IS_FOLDER (folder));
g_return_if_fail (description != NULL);
@@ -324,7 +325,7 @@ e_folder_set_description (EFolder *folder,
void
e_folder_set_physical_uri (EFolder *folder,
- const gchar *physical_uri)
+ const gchar *physical_uri)
{
g_return_if_fail (E_IS_FOLDER (folder));
g_return_if_fail (physical_uri != NULL);
@@ -340,7 +341,7 @@ e_folder_set_physical_uri (EFolder *folder,
void
e_folder_set_unread_count (EFolder *folder,
- gint unread_count)
+ gint unread_count)
{
g_return_if_fail (E_IS_FOLDER (folder));
@@ -351,7 +352,7 @@ e_folder_set_unread_count (EFolder *folder,
void
e_folder_set_child_highlight (EFolder *folder,
- gboolean highlighted)
+ gboolean highlighted)
{
g_return_if_fail (E_IS_FOLDER (folder));
@@ -365,7 +366,7 @@ e_folder_set_child_highlight (EFolder *folder,
void
e_folder_set_is_stock (EFolder *folder,
- gboolean is_stock)
+ gboolean is_stock)
{
g_return_if_fail (E_IS_FOLDER (folder));
@@ -376,7 +377,7 @@ e_folder_set_is_stock (EFolder *folder,
void
e_folder_set_can_sync_offline (EFolder *folder,
- gboolean can_sync_offline)
+ gboolean can_sync_offline)
{
g_return_if_fail (E_IS_FOLDER (folder));
@@ -387,7 +388,7 @@ e_folder_set_can_sync_offline (EFolder *folder,
void
e_folder_set_has_subfolders (EFolder *folder,
- gboolean has_subfolders)
+ gboolean has_subfolders)
{
g_return_if_fail (E_IS_FOLDER (folder));
@@ -407,7 +408,7 @@ e_folder_set_has_subfolders (EFolder *folder,
**/
void
e_folder_set_custom_icon (EFolder *folder,
- const gchar *icon_name)
+ const gchar *icon_name)
{
g_return_if_fail (E_IS_FOLDER (folder));
@@ -436,7 +437,7 @@ e_folder_set_custom_icon (EFolder *folder,
**/
void
e_folder_set_sorting_priority (EFolder *folder,
- gint sorting_priority)
+ gint sorting_priority)
{
g_return_if_fail (E_IS_FOLDER (folder));
@@ -449,9 +450,10 @@ e_folder_set_sorting_priority (EFolder *folder,
}
gboolean
-e_folder_accept_drop (EFolder *folder, GdkDragContext *context,
- const gchar *target_type,
- GtkSelectionData *selection_data)
+e_folder_accept_drop (EFolder *folder,
+ GdkDragContext *context,
+ const gchar *target_type,
+ GtkSelectionData *selection_data)
{
g_return_val_if_fail (E_IS_FOLDER (folder), FALSE);
g_return_val_if_fail (context != NULL, FALSE);
diff --git a/server/storage/e-storage.c b/server/storage/e-storage.c
index 8cc2ef8..e0b6ced 100644
--- a/server/storage/e-storage.c
+++ b/server/storage/e-storage.c
@@ -59,9 +59,9 @@ static guint signals[LAST_SIGNAL] = { 0 };
static void
folder_destroy_notify (EFolderTree *tree,
- const gchar *path,
- gpointer data,
- gpointer closure)
+ const gchar *path,
+ gpointer data,
+ gpointer closure)
{
EFolder *e_folder;
@@ -78,7 +78,7 @@ folder_destroy_notify (EFolderTree *tree,
static void
folder_changed_cb (EFolder *folder,
- gpointer data)
+ gpointer data)
{
EStorage *storage;
EStoragePrivate *priv;
@@ -137,7 +137,7 @@ impl_finalize (GObject *object)
static GList *
impl_get_subfolder_paths (EStorage *storage,
- const gchar *path)
+ const gchar *path)
{
EStoragePrivate *priv;
@@ -148,7 +148,7 @@ impl_get_subfolder_paths (EStorage *storage,
static EFolder *
impl_get_folder (EStorage *storage,
- const gchar *path)
+ const gchar *path)
{
EStoragePrivate *priv;
EFolder *e_folder;
@@ -168,47 +168,47 @@ impl_get_name (EStorage *storage)
static void
impl_async_create_folder (EStorage *storage,
- const gchar *path,
- const gchar *type,
- EStorageResultCallback callback,
- gpointer data)
+ const gchar *path,
+ const gchar *type,
+ EStorageResultCallback callback,
+ gpointer data)
{
(* callback) (storage, E_STORAGE_NOTIMPLEMENTED, data);
}
static void
impl_async_remove_folder (EStorage *storage,
- const gchar *path,
- EStorageResultCallback callback,
- gpointer data)
+ const gchar *path,
+ EStorageResultCallback callback,
+ gpointer data)
{
(* callback) (storage, E_STORAGE_NOTIMPLEMENTED, data);
}
static void
impl_async_xfer_folder (EStorage *storage,
- const gchar *source_path,
- const gchar *destination_path,
- gboolean remove_source,
- EStorageResultCallback callback,
- gpointer data)
+ const gchar *source_path,
+ const gchar *destination_path,
+ gboolean remove_source,
+ EStorageResultCallback callback,
+ gpointer data)
{
(* callback) (storage, E_STORAGE_NOTIMPLEMENTED, data);
}
static void
impl_async_open_folder (EStorage *storage,
- const gchar *path,
- EStorageDiscoveryCallback callback,
- gpointer data)
+ const gchar *path,
+ EStorageDiscoveryCallback callback,
+ gpointer data)
{
(* callback) (storage, E_STORAGE_NOTIMPLEMENTED, NULL, data);
}
static gboolean
impl_will_accept_folder (EStorage *storage,
- EFolder *new_parent,
- EFolder *source)
+ EFolder *new_parent,
+ EFolder *source)
{
EStoragePrivate *priv = storage->priv;
const gchar *parent_path, *source_path;
@@ -238,19 +238,19 @@ impl_will_accept_folder (EStorage *storage,
static void
impl_async_discover_shared_folder (EStorage *storage,
- const gchar *owner,
- const gchar *folder_name,
- EStorageDiscoveryCallback callback,
- gpointer data)
+ const gchar *owner,
+ const gchar *folder_name,
+ EStorageDiscoveryCallback callback,
+ gpointer data)
{
(* callback) (storage, E_STORAGE_NOTIMPLEMENTED, NULL, data);
}
static void
impl_async_remove_shared_folder (EStorage *storage,
- const gchar *path,
- EStorageResultCallback callback,
- gpointer data)
+ const gchar *path,
+ EStorageResultCallback callback,
+ gpointer data)
{
(* callback) (storage, E_STORAGE_NOTIMPLEMENTED, data);
}
@@ -323,8 +323,8 @@ e_storage_init (EStorage *storage)
void
e_storage_construct (EStorage *storage,
- const gchar *name,
- EFolder *root_folder)
+ const gchar *name,
+ EFolder *root_folder)
{
EStoragePrivate *priv;
@@ -339,7 +339,7 @@ e_storage_construct (EStorage *storage,
EStorage *
e_storage_new (const gchar *name,
- EFolder *root_folder)
+ EFolder *root_folder)
{
EStorage *new;
@@ -368,7 +368,7 @@ e_storage_path_is_relative (const gchar *path)
GList *
e_storage_get_subfolder_paths (EStorage *storage,
- const gchar *path)
+ const gchar *path)
{
g_return_val_if_fail (E_IS_STORAGE (storage), NULL);
g_return_val_if_fail (path != NULL, NULL);
@@ -379,7 +379,7 @@ e_storage_get_subfolder_paths (EStorage *storage,
EFolder *
e_storage_get_folder (EStorage *storage,
- const gchar *path)
+ const gchar *path)
{
g_return_val_if_fail (E_IS_STORAGE (storage), NULL);
g_return_val_if_fail (path != NULL, NULL);
@@ -400,10 +400,10 @@ e_storage_get_name (EStorage *storage)
void
e_storage_async_create_folder (EStorage *storage,
- const gchar *path,
- const gchar *type,
- EStorageResultCallback callback,
- gpointer data)
+ const gchar *path,
+ const gchar *type,
+ EStorageResultCallback callback,
+ gpointer data)
{
g_return_if_fail (E_IS_STORAGE (storage));
g_return_if_fail (path != NULL);
@@ -415,10 +415,10 @@ e_storage_async_create_folder (EStorage *storage,
}
void
-e_storage_async_remove_folder (EStorage *storage,
- const gchar *path,
- EStorageResultCallback callback,
- void *data)
+e_storage_async_remove_folder (EStorage *storage,
+ const gchar *path,
+ EStorageResultCallback callback,
+ gpointer data)
{
g_return_if_fail (E_IS_STORAGE (storage));
g_return_if_fail (path != NULL);
@@ -430,11 +430,11 @@ e_storage_async_remove_folder (EStorage *storage,
void
e_storage_async_xfer_folder (EStorage *storage,
- const gchar *source_path,
- const gchar *destination_path,
- const gboolean remove_source,
- EStorageResultCallback callback,
- gpointer data)
+ const gchar *source_path,
+ const gchar *destination_path,
+ const gboolean remove_source,
+ EStorageResultCallback callback,
+ gpointer data)
{
g_return_if_fail (E_IS_STORAGE (storage));
g_return_if_fail (source_path != NULL);
@@ -467,9 +467,9 @@ e_storage_async_xfer_folder (EStorage *storage,
void
e_storage_async_open_folder (EStorage *storage,
- const gchar *path,
- EStorageDiscoveryCallback callback,
- gpointer data)
+ const gchar *path,
+ EStorageDiscoveryCallback callback,
+ gpointer data)
{
EStoragePrivate *priv;
EFolder *folder;
@@ -496,7 +496,8 @@ e_storage_async_open_folder (EStorage *storage,
gboolean
e_storage_will_accept_folder (EStorage *storage,
- EFolder *new_parent, EFolder *source)
+ EFolder *new_parent,
+ EFolder *source)
{
g_return_val_if_fail (E_IS_STORAGE (storage), FALSE);
g_return_val_if_fail (E_IS_FOLDER (new_parent), FALSE);
@@ -509,10 +510,10 @@ e_storage_will_accept_folder (EStorage *storage,
void
e_storage_async_discover_shared_folder (EStorage *storage,
- const gchar *owner,
- const gchar *folder_name,
- EStorageDiscoveryCallback callback,
- gpointer data)
+ const gchar *owner,
+ const gchar *folder_name,
+ EStorageDiscoveryCallback callback,
+ gpointer data)
{
g_return_if_fail (E_IS_STORAGE (storage));
g_return_if_fail (owner != NULL);
@@ -523,8 +524,8 @@ e_storage_async_discover_shared_folder (EStorage *storage,
void
e_storage_cancel_discover_shared_folder (EStorage *storage,
- const gchar *owner,
- const gchar *folder_name)
+ const gchar *owner,
+ const gchar *folder_name)
{
g_return_if_fail (E_IS_STORAGE (storage));
g_return_if_fail (owner != NULL);
@@ -536,9 +537,9 @@ e_storage_cancel_discover_shared_folder (EStorage *storage,
void
e_storage_async_remove_shared_folder (EStorage *storage,
- const gchar *path,
- EStorageResultCallback callback,
- gpointer data)
+ const gchar *path,
+ EStorageResultCallback callback,
+ gpointer data)
{
g_return_if_fail (E_IS_STORAGE (storage));
g_return_if_fail (path != NULL);
@@ -597,9 +598,9 @@ typedef struct {
static void
get_path_for_physical_uri_foreach (EFolderTree *folder_tree,
- const gchar *path,
- gpointer path_data,
- gpointer user_data)
+ const gchar *path,
+ gpointer path_data,
+ gpointer user_data)
{
GetPathForPhysicalUriForeachData *foreach_data;
const gchar *physical_uri;
@@ -634,7 +635,7 @@ get_path_for_physical_uri_foreach (EFolderTree *folder_tree,
**/
gchar *
e_storage_get_path_for_physical_uri (EStorage *storage,
- const gchar *physical_uri)
+ const gchar *physical_uri)
{
GetPathForPhysicalUriForeachData foreach_data;
EStoragePrivate *priv;
@@ -655,10 +656,12 @@ e_storage_get_path_for_physical_uri (EStorage *storage,
/* Protected functions. */
/* These functions are used by subclasses to add and remove folders from the
- state stored in the storage object. */
+ * state stored in the storage object. */
static void
-remove_subfolders_except (EStorage *storage, const gchar *path, const gchar *except)
+remove_subfolders_except (EStorage *storage,
+ const gchar *path,
+ const gchar *except)
{
EStoragePrivate *priv;
GList *subfolders, *f;
@@ -680,8 +683,8 @@ remove_subfolders_except (EStorage *storage, const gchar *path, const gchar *exc
gboolean
e_storage_new_folder (EStorage *storage,
- const gchar *path,
- EFolder *e_folder)
+ const gchar *path,
+ EFolder *e_folder)
{
EStoragePrivate *priv;
gchar *parent_path, *p;
@@ -729,8 +732,8 @@ e_storage_new_folder (EStorage *storage,
*/
gboolean
e_storage_declare_has_subfolders (EStorage *storage,
- const gchar *path,
- const gchar *message)
+ const gchar *path,
+ const gchar *message)
{
EStoragePrivate *priv;
EFolder *parent, *pseudofolder;
@@ -772,7 +775,7 @@ e_storage_declare_has_subfolders (EStorage *storage,
gboolean
e_storage_get_has_subfolders (EStorage *storage,
- const gchar *path)
+ const gchar *path)
{
EStoragePrivate *priv;
EFolder *folder;
@@ -790,7 +793,7 @@ e_storage_get_has_subfolders (EStorage *storage,
gboolean
e_storage_removed_folder (EStorage *storage,
- const gchar *path)
+ const gchar *path)
{
EStoragePrivate *priv;
EFolder *folder;
diff --git a/server/storage/exchange-account.c b/server/storage/exchange-account.c
index 33f0ec6..d24c9c5 100644
--- a/server/storage/exchange-account.c
+++ b/server/storage/exchange-account.c
@@ -166,13 +166,17 @@ exchange_account_init (ExchangeAccount *account)
}
static void
-free_name (gpointer name, gpointer value, gpointer data)
+free_name (gpointer name,
+ gpointer value,
+ gpointer data)
{
g_free (name);
}
static void
-free_folder (gpointer key, gpointer folder, gpointer data)
+free_folder (gpointer key,
+ gpointer folder,
+ gpointer data)
{
g_object_unref (folder);
}
@@ -242,7 +246,9 @@ dispose (GObject *object)
}
static void
-free_uri (gpointer name, gpointer uri, gpointer data)
+free_uri (gpointer name,
+ gpointer uri,
+ gpointer data)
{
g_free (name);
g_free (uri);
@@ -338,8 +344,9 @@ exchange_account_rescan_tree (ExchangeAccount *account)
*/
static void
-hierarchy_new_folder (ExchangeHierarchy *hier, EFolder *folder,
- ExchangeAccount *account)
+hierarchy_new_folder (ExchangeHierarchy *hier,
+ EFolder *folder,
+ ExchangeAccount *account)
{
gint table_updated = 0;
const gchar *permanent_uri =
@@ -376,8 +383,8 @@ hierarchy_new_folder (ExchangeHierarchy *hier, EFolder *folder,
key = (gchar *) e_folder_exchange_get_internal_uri (folder);
if (!g_hash_table_lookup (account->priv->folders, key)) {
/* The internal_uri for public folders and favorites folder
- is same !!! Without this check the folder value could
- overwrite the previously added folder. */
+ * is same !!! Without this check the folder value could
+ * overwrite the previously added folder. */
g_object_ref (folder);
g_hash_table_insert (account->priv->folders,
key,
@@ -407,8 +414,9 @@ hierarchy_new_folder (ExchangeHierarchy *hier, EFolder *folder,
}
static void
-hierarchy_removed_folder (ExchangeHierarchy *hier, EFolder *folder,
- ExchangeAccount *account)
+hierarchy_removed_folder (ExchangeHierarchy *hier,
+ EFolder *folder,
+ ExchangeAccount *account)
{
gint unref_count = 0;
@@ -448,8 +456,10 @@ hierarchy_removed_folder (ExchangeHierarchy *hier, EFolder *folder,
}
static gboolean
-get_folder (ExchangeAccount *account, const gchar *path,
- EFolder **folder, ExchangeHierarchy **hier)
+get_folder (ExchangeAccount *account,
+ const gchar *path,
+ EFolder **folder,
+ ExchangeHierarchy **hier)
{
g_static_rec_mutex_lock (&account->priv->folders_lock);
*folder = g_hash_table_lookup (account->priv->folders, path);
@@ -466,8 +476,10 @@ get_folder (ExchangeAccount *account, const gchar *path,
}
static gboolean
-get_parent_and_name (ExchangeAccount *account, const gchar **path,
- EFolder **parent, ExchangeHierarchy **hier)
+get_parent_and_name (ExchangeAccount *account,
+ const gchar **path,
+ EFolder **parent,
+ ExchangeHierarchy **hier)
{
gchar *name, *parent_path;
@@ -497,7 +509,8 @@ get_parent_and_name (ExchangeAccount *account, const gchar **path,
ExchangeAccountFolderResult
exchange_account_create_folder (ExchangeAccount *account,
- const gchar *path, const gchar *type)
+ const gchar *path,
+ const gchar *type)
{
ExchangeHierarchy *hier;
EFolder *parent;
@@ -512,7 +525,9 @@ exchange_account_create_folder (ExchangeAccount *account,
}
static gboolean
-check_if_sf (gpointer key, gpointer value, gpointer user_data)
+check_if_sf (gpointer key,
+ gpointer value,
+ gpointer user_data)
{
gchar *sf_href = (gchar *) value;
gchar *int_uri = (gchar *) user_data;
@@ -524,7 +539,8 @@ check_if_sf (gpointer key, gpointer value, gpointer user_data)
}
ExchangeAccountFolderResult
-exchange_account_remove_folder (ExchangeAccount *account, const gchar *path)
+exchange_account_remove_folder (ExchangeAccount *account,
+ const gchar *path)
{
ExchangeHierarchy *hier;
EFolder *folder;
@@ -550,9 +566,9 @@ exchange_account_remove_folder (ExchangeAccount *account, const gchar *path)
ExchangeAccountFolderResult
exchange_account_xfer_folder (ExchangeAccount *account,
- const gchar *source_path,
- const gchar *dest_path,
- gboolean remove_source)
+ const gchar *source_path,
+ const gchar *dest_path,
+ gboolean remove_source)
{
EFolder *source, *dest_parent;
ExchangeHierarchy *source_hier, *dest_hier;
@@ -583,7 +599,8 @@ exchange_account_xfer_folder (ExchangeAccount *account,
}
static void
-remove_hierarchy (ExchangeAccount *account, ExchangeHierarchy *hier)
+remove_hierarchy (ExchangeAccount *account,
+ ExchangeHierarchy *hier)
{
gint i;
@@ -601,7 +618,8 @@ remove_hierarchy (ExchangeAccount *account, ExchangeHierarchy *hier)
}
static void
-setup_hierarchy (ExchangeAccount *account, ExchangeHierarchy *hier)
+setup_hierarchy (ExchangeAccount *account,
+ ExchangeHierarchy *hier)
{
g_ptr_array_add (account->priv->hierarchies, hier);
@@ -614,7 +632,8 @@ setup_hierarchy (ExchangeAccount *account, ExchangeHierarchy *hier)
}
static void
-setup_hierarchy_foreign (ExchangeAccount *account, ExchangeHierarchy *hier)
+setup_hierarchy_foreign (ExchangeAccount *account,
+ ExchangeHierarchy *hier)
{
g_hash_table_insert (account->priv->foreign_hierarchies,
(gchar *) hier->owner_email, hier);
@@ -627,7 +646,8 @@ struct discover_data {
};
static ExchangeHierarchy *
-get_hierarchy_for (ExchangeAccount *account, E2kGlobalCatalogEntry *entry)
+get_hierarchy_for (ExchangeAccount *account,
+ E2kGlobalCatalogEntry *entry)
{
ExchangeHierarchy *hier;
gchar *hierarchy_name, *source;
@@ -639,7 +659,7 @@ get_hierarchy_for (ExchangeAccount *account, E2kGlobalCatalogEntry *entry)
return hier;
/* i18n: This is the title of an "other user's folders"
- hierarchy. Eg, "John Doe's Folders". */
+ * hierarchy. Eg, "John Doe's Folders". */
hierarchy_name = g_strdup_printf (_("%s's Folders"),
entry->display_name);
source = g_strdup_printf ("exchange://%s %s/", entry->mailbox,
@@ -666,9 +686,9 @@ get_hierarchy_for (ExchangeAccount *account, E2kGlobalCatalogEntry *entry)
ExchangeAccountFolderResult
exchange_account_discover_shared_folder (ExchangeAccount *account,
- const gchar *user,
- const gchar *folder_name,
- EFolder **folder)
+ const gchar *user,
+ const gchar *folder_name,
+ EFolder **folder)
{
struct discover_data dd;
ExchangeHierarchy *hier;
@@ -731,8 +751,8 @@ exchange_account_discover_shared_folder (ExchangeAccount *account,
void
exchange_account_cancel_discover_shared_folder (ExchangeAccount *account,
- const gchar *user,
- const gchar *folder_name)
+ const gchar *user,
+ const gchar *folder_name)
{
struct discover_data *dd;
GList *dds;
@@ -765,7 +785,7 @@ exchange_account_cancel_discover_shared_folder (ExchangeAccount *account,
ExchangeAccountFolderResult
exchange_account_remove_shared_folder (ExchangeAccount *account,
- const gchar *path)
+ const gchar *path)
{
ExchangeHierarchy *hier;
EFolder *folder;
@@ -782,7 +802,8 @@ exchange_account_remove_shared_folder (ExchangeAccount *account,
}
ExchangeAccountFolderResult
-exchange_account_open_folder (ExchangeAccount *account, const gchar *path)
+exchange_account_open_folder (ExchangeAccount *account,
+ const gchar *path)
{
ExchangeHierarchy *hier;
EFolder *folder;
@@ -812,7 +833,7 @@ exchange_account_open_folder (ExchangeAccount *account, const gchar *path)
ExchangeAccountFolderResult
exchange_account_add_favorite (ExchangeAccount *account,
- EFolder *folder)
+ EFolder *folder)
{
g_return_val_if_fail (EXCHANGE_IS_ACCOUNT (account), EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR);
g_return_val_if_fail (E_IS_FOLDER (folder), EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR);
@@ -824,7 +845,7 @@ exchange_account_add_favorite (ExchangeAccount *account,
ExchangeAccountFolderResult
exchange_account_remove_favorite (ExchangeAccount *account,
- EFolder *folder)
+ EFolder *folder)
{
g_return_val_if_fail (EXCHANGE_IS_ACCOUNT (account), EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR);
g_return_val_if_fail (E_IS_FOLDER (folder), EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR);
@@ -836,7 +857,7 @@ exchange_account_remove_favorite (ExchangeAccount *account,
gboolean
exchange_account_is_favorite_folder (ExchangeAccount *account,
- EFolder *folder)
+ EFolder *folder)
{
g_return_val_if_fail (EXCHANGE_IS_ACCOUNT (account), EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR);
g_return_val_if_fail (E_IS_FOLDER (folder), EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR);
@@ -847,9 +868,11 @@ exchange_account_is_favorite_folder (ExchangeAccount *account,
}
static void
-context_redirect (E2kContext *ctx, E2kHTTPStatus status,
- const gchar *old_uri, const gchar *new_uri,
- ExchangeAccount *account)
+context_redirect (E2kContext *ctx,
+ E2kHTTPStatus status,
+ const gchar *old_uri,
+ const gchar *new_uri,
+ ExchangeAccount *account)
{
EFolder *folder;
@@ -870,8 +893,10 @@ context_redirect (E2kContext *ctx, E2kHTTPStatus status,
}
static void
-set_sf_prop (const gchar *propname, E2kPropType type,
- gpointer phref, gpointer user_data)
+set_sf_prop (const gchar *propname,
+ E2kPropType type,
+ gpointer phref,
+ gpointer user_data)
{
ExchangeAccount *account = user_data;
const gchar *href = (const gchar *) phref;
@@ -912,7 +937,8 @@ static const gchar *mailbox_info_props[] = {
static const gint n_mailbox_info_props = G_N_ELEMENTS (mailbox_info_props);
static gboolean
-account_moved (ExchangeAccount *account, E2kAutoconfig *ac)
+account_moved (ExchangeAccount *account,
+ E2kAutoconfig *ac)
{
E2kAutoconfigResult result;
EAccount *eaccount;
@@ -941,7 +967,9 @@ account_moved (ExchangeAccount *account, E2kAutoconfig *ac)
#if 0
static gboolean
-get_password (ExchangeAccount *account, E2kAutoconfig *ac, ExchangeAccountResult error)
+get_password (ExchangeAccount *account,
+ E2kAutoconfig *ac,
+ ExchangeAccountResult error)
{
gchar *password;
@@ -964,7 +992,7 @@ get_password (ExchangeAccount *account, E2kAutoconfig *ac, ExchangeAccountResult
NULL,
account->priv->password_key,
prompt,
- E_PASSWORDS_REMEMBER_FOREVER|E_PASSWORDS_SECRET,
+ E_PASSWORDS_REMEMBER_FOREVER | E_PASSWORDS_SECRET,
&remember,
NULL);
if (remember != oldremember) {
@@ -1007,7 +1035,8 @@ get_password (ExchangeAccount *account, E2kAutoconfig *ac, ExchangeAccountResult
*/
#ifdef HAVE_KRB5
static gboolean
-is_password_expired (ExchangeAccount *account, E2kAutoconfig *ac)
+is_password_expired (ExchangeAccount *account,
+ E2kAutoconfig *ac)
{
gchar *domain;
E2kKerberosResult result;
@@ -1066,7 +1095,7 @@ find_passwd_exp_period (ExchangeAccount *account,
/* Check for password expiry period */
/* This needs to be invoked after is_password_expired(), i.e.,
- only if password is not expired */
+ * only if password is not expired */
/* Check for account control value for a user */
@@ -1117,7 +1146,9 @@ exchange_account_forget_password (ExchangeAccount *account)
}
ExchangeAccountResult
-exchange_account_set_password (ExchangeAccount *account, gchar *old_pass, gchar *new_pass)
+exchange_account_set_password (ExchangeAccount *account,
+ gchar *old_pass,
+ gchar *new_pass)
{
#ifdef HAVE_KRB5
E2kKerberosResult result;
@@ -1172,7 +1203,8 @@ exchange_account_set_password (ExchangeAccount *account, gchar *old_pass, gchar
}
void
-exchange_account_set_save_password (ExchangeAccount *account, gboolean save_password)
+exchange_account_set_save_password (ExchangeAccount *account,
+ gboolean save_password)
{
account->priv->account->source->save_passwd = save_password;
}
@@ -1241,7 +1273,8 @@ exchange_account_set_online (ExchangeAccount *account)
* Return value: Returns TRUE if account is offline
**/
void
-exchange_account_is_offline (ExchangeAccount *account, gint *state)
+exchange_account_is_offline (ExchangeAccount *account,
+ gint *state)
{
g_return_if_fail (EXCHANGE_IS_ACCOUNT (account));
@@ -1385,8 +1418,9 @@ hierarchies_created:
* failed.
**/
E2kContext *
-exchange_account_connect (ExchangeAccount *account, const gchar *pword,
- ExchangeAccountResult *info_result)
+exchange_account_connect (ExchangeAccount *account,
+ const gchar *pword,
+ ExchangeAccountResult *info_result)
{
E2kAutoconfig *ac;
E2kAutoconfigResult result;
@@ -1673,7 +1707,8 @@ skip_quota:
* Return value: TRUE if offline_sync is set for @account and FALSE if not.
*/
void
-exchange_account_is_offline_sync_set (ExchangeAccount *account, gint *mode)
+exchange_account_is_offline_sync_set (ExchangeAccount *account,
+ gint *mode)
{
CamelSettings *settings;
gboolean stay_synchronized;
@@ -1765,7 +1800,8 @@ exchange_account_fetch (ExchangeAccount *acct)
* defined on @account.
**/
const gchar *
-exchange_account_get_standard_uri (ExchangeAccount *account, const gchar *item)
+exchange_account_get_standard_uri (ExchangeAccount *account,
+ const gchar *item)
{
g_return_val_if_fail (EXCHANGE_IS_ACCOUNT (account), NULL);
@@ -1788,8 +1824,8 @@ exchange_account_get_standard_uri (ExchangeAccount *account, const gchar *item)
**/
gchar *
exchange_account_get_standard_uri_for (ExchangeAccount *account,
- const gchar *home_uri,
- const gchar *std_uri_prop)
+ const gchar *home_uri,
+ const gchar *std_uri_prop)
{
gchar *foreign_uri, *prop;
E2kHTTPStatus status;
@@ -1832,8 +1868,8 @@ exchange_account_get_standard_uri_for (ExchangeAccount *account,
**/
gchar *
exchange_account_get_foreign_uri (ExchangeAccount *account,
- E2kGlobalCatalogEntry *entry,
- const gchar *std_uri_prop)
+ E2kGlobalCatalogEntry *entry,
+ const gchar *std_uri_prop)
{
gchar *home_uri, *foreign_uri;
@@ -1867,7 +1903,8 @@ exchange_account_get_foreign_uri (ExchangeAccount *account,
problem between exchange and evolution is fixed. Exchange does not get to know
if an user's folder is subscribed from evolution */
void
-exchange_account_scan_foreign_hierarchy (ExchangeAccount *account, const gchar *user_email)
+exchange_account_scan_foreign_hierarchy (ExchangeAccount *account,
+ const gchar *user_email)
{
gchar *dir;
ExchangeHierarchy *hier;
@@ -1903,7 +1940,8 @@ exchange_account_scan_foreign_hierarchy (ExchangeAccount *account, const gchar *
**/
ExchangeHierarchy *
-exchange_account_get_hierarchy_by_email (ExchangeAccount *account, const gchar *email)
+exchange_account_get_hierarchy_by_email (ExchangeAccount *account,
+ const gchar *email)
{
gchar *dir;
ExchangeHierarchy *hier = NULL;
@@ -1966,7 +2004,7 @@ exchange_account_get_sanitized_path (const gchar *uri)
**/
EFolder *
exchange_account_get_folder (ExchangeAccount *account,
- const gchar *path_or_uri)
+ const gchar *path_or_uri)
{
EFolder *folder;
@@ -1982,7 +2020,8 @@ exchange_account_get_folder (ExchangeAccount *account,
}
static gint
-folder_comparator (gconstpointer a, gconstpointer b)
+folder_comparator (gconstpointer a,
+ gconstpointer b)
{
EFolder **fa = (EFolder **) a;
EFolder **fb = (EFolder **) b;
@@ -1997,7 +2036,9 @@ struct _folders_tree {
};
static void
-add_folder (gpointer key, gpointer value, gpointer folders)
+add_folder (gpointer key,
+ gpointer value,
+ gpointer folders)
{
EFolder *folder = value;
@@ -2013,7 +2054,9 @@ add_folder (gpointer key, gpointer value, gpointer folders)
}
static void
-add_folder_tree (gpointer key, gpointer value, gpointer folders)
+add_folder_tree (gpointer key,
+ gpointer value,
+ gpointer folders)
{
EFolder *folder = value;
struct _folders_tree *fld_tree = (struct _folders_tree *) folders;
@@ -2068,7 +2111,8 @@ exchange_account_get_folders (ExchangeAccount *account)
* g_ptr_array_free().
**/
GPtrArray *
-exchange_account_get_folder_tree (ExchangeAccount *account, gchar * path)
+exchange_account_get_folder_tree (ExchangeAccount *account,
+ gchar *path)
{
GPtrArray *folders = NULL;
EFolder *folder = NULL;
@@ -2180,8 +2224,8 @@ exchange_account_get_email_id (ExchangeAccount *account)
**/
void
exchange_account_folder_size_add (ExchangeAccount *account,
- const gchar *folder_name,
- gdouble size)
+ const gchar *folder_name,
+ gdouble size)
{
g_return_if_fail (EXCHANGE_IS_ACCOUNT (account));
@@ -2199,7 +2243,7 @@ exchange_account_folder_size_add (ExchangeAccount *account,
**/
void
exchange_account_folder_size_remove (ExchangeAccount *account,
- const gchar *folder_name)
+ const gchar *folder_name)
{
g_return_if_fail (EXCHANGE_IS_ACCOUNT (account));
@@ -2219,8 +2263,8 @@ exchange_account_folder_size_remove (ExchangeAccount *account,
**/
void
exchange_account_folder_size_rename (ExchangeAccount *account,
- const gchar *old_name,
- const gchar *new_name)
+ const gchar *old_name,
+ const gchar *new_name)
{
gdouble cached_size;
@@ -2275,7 +2319,8 @@ exchange_account_get_authtype (ExchangeAccount *account)
* Return value: a new #ExchangeAccount corresponding to @adata
**/
ExchangeAccount *
-exchange_account_new (EAccountList *account_list, EAccount *adata)
+exchange_account_new (EAccountList *account_list,
+ EAccount *adata)
{
ExchangeAccount *account;
gchar *enc_user, *mailbox;
@@ -2416,9 +2461,9 @@ exchange_account_new (EAccountList *account_list, EAccount *adata)
* Return value: Returns the hierarchy pointer for the requested type
**/
-ExchangeHierarchy*
-exchange_account_get_hierarchy_by_type (ExchangeAccount* acct,
- ExchangeHierarchyType type)
+ExchangeHierarchy *
+exchange_account_get_hierarchy_by_type (ExchangeAccount *acct,
+ ExchangeHierarchyType type)
{
gint i;
diff --git a/server/storage/exchange-constants.h b/server/storage/exchange-constants.h
index b9dd618..c117be1 100644
--- a/server/storage/exchange-constants.h
+++ b/server/storage/exchange-constants.h
@@ -17,8 +17,8 @@ typedef enum {
}FolderType;
/* This flag indicates that its other user's folder. We encode this flag
- with the FolderType to identify the same. We are doing this to
- avoid ABI/API break. */
+ * with the FolderType to identify the same. We are doing this to
+ * avoid ABI/API break. */
#define FORIEGN_FOLDER_FLAG 0x0100
#endif
diff --git a/server/storage/exchange-esource.c b/server/storage/exchange-esource.c
index ec10e33..882e71c 100644
--- a/server/storage/exchange-esource.c
+++ b/server/storage/exchange-esource.c
@@ -33,7 +33,8 @@
static gboolean is_offline (void);
static ESourceGroup *
-find_account_group (ESourceList *source_list, ExchangeAccount *exa)
+find_account_group (ESourceList *source_list,
+ ExchangeAccount *exa)
{
ESourceGroup *group;
EAccount *account;
@@ -69,9 +70,9 @@ find_account_group (ESourceList *source_list, ExchangeAccount *exa)
void
add_folder_esource (ExchangeAccount *account,
- FolderType folder_type,
- const gchar *folder_name,
- const gchar *physical_uri)
+ FolderType folder_type,
+ const gchar *folder_name,
+ const gchar *physical_uri)
{
ESource *source = NULL;
ESourceGroup *source_group = NULL;
@@ -345,8 +346,8 @@ add_folder_esource (ExchangeAccount *account,
void
remove_folder_esource (ExchangeAccount *account,
- FolderType folder_type,
- const gchar *physical_uri)
+ FolderType folder_type,
+ const gchar *physical_uri)
{
ESourceGroup *group;
ESource *source;
diff --git a/server/storage/exchange-folder-size.c b/server/storage/exchange-folder-size.c
index ff65ca8..2321c9c 100644
--- a/server/storage/exchange-folder-size.c
+++ b/server/storage/exchange-folder-size.c
@@ -55,7 +55,9 @@ enum {
};
static gboolean
-free_fgsizeable (gpointer key, gpointer value, gpointer data)
+free_fgsizeable (gpointer key,
+ gpointer value,
+ gpointer data)
{
folder_info *f_info = (folder_info *) value;
@@ -66,7 +68,9 @@ free_fgsizeable (gpointer key, gpointer value, gpointer data)
}
static gboolean
-free_row_refs (gpointer key, gpointer value, gpointer user_data)
+free_row_refs (gpointer key,
+ gpointer value,
+ gpointer user_data)
{
g_free (key);
gtk_tree_row_reference_free (value);
@@ -135,8 +139,8 @@ exchange_folder_size_new (void)
void
exchange_folder_size_update (ExchangeFolderSize *fsize,
- const gchar *folder_name,
- gdouble folder_size)
+ const gchar *folder_name,
+ gdouble folder_size)
{
folder_info *f_info, *cached_info;
ExchangeFolderSizePrivate *priv;
@@ -189,7 +193,7 @@ exchange_folder_size_update (ExchangeFolderSize *fsize,
void
exchange_folder_size_remove (ExchangeFolderSize *fsize,
- const gchar *folder_name)
+ const gchar *folder_name)
{
ExchangeFolderSizePrivate *priv;
GHashTable *folder_gsizeable;
@@ -219,7 +223,7 @@ exchange_folder_size_remove (ExchangeFolderSize *fsize,
gdouble
exchange_folder_size_get (ExchangeFolderSize *fsize,
- const gchar *folder_name)
+ const gchar *folder_name)
{
ExchangeFolderSizePrivate *priv;
GHashTable *folder_gsizeable;
diff --git a/server/storage/exchange-hierarchy-favorites.c b/server/storage/exchange-hierarchy-favorites.c
index cb00801..93e8dfb 100644
--- a/server/storage/exchange-hierarchy-favorites.c
+++ b/server/storage/exchange-hierarchy-favorites.c
@@ -93,7 +93,9 @@ finalize (GObject *object)
}
static void
-add_hrefs (ExchangeHierarchy *hier, EFolder *folder, gpointer hrefs)
+add_hrefs (ExchangeHierarchy *hier,
+ EFolder *folder,
+ gpointer hrefs)
{
g_ptr_array_add (hrefs, (gchar *) e2k_uri_path (e_folder_exchange_get_internal_uri (folder)));
}
@@ -180,7 +182,8 @@ get_hrefs (ExchangeHierarchySomeDAV *hsd)
**/
gboolean
-exchange_hierarchy_favorites_is_added (ExchangeHierarchy *hier, EFolder *folder)
+exchange_hierarchy_favorites_is_added (ExchangeHierarchy *hier,
+ EFolder *folder)
{
ExchangeHierarchyFavorites *hfav =
EXCHANGE_HIERARCHY_FAVORITES (hier);
@@ -193,7 +196,8 @@ exchange_hierarchy_favorites_is_added (ExchangeHierarchy *hier, EFolder *folder)
}
static ExchangeAccountFolderResult
-remove_folder (ExchangeHierarchy *hier, EFolder *folder)
+remove_folder (ExchangeHierarchy *hier,
+ EFolder *folder)
{
ExchangeHierarchyFavorites *hfav =
EXCHANGE_HIERARCHY_FAVORITES (hier);
@@ -250,7 +254,7 @@ remove_folder (ExchangeHierarchy *hier, EFolder *folder)
**/
ExchangeAccountFolderResult
exchange_hierarchy_favorites_add_folder (ExchangeHierarchy *hier,
- EFolder *folder)
+ EFolder *folder)
{
ExchangeHierarchyFavorites *hfav;
E2kProperties *props;
@@ -308,13 +312,13 @@ exchange_hierarchy_favorites_add_folder (ExchangeHierarchy *hier,
**/
ExchangeHierarchy *
exchange_hierarchy_favorites_new (ExchangeAccount *account,
- const gchar *hierarchy_name,
- const gchar *physical_uri_prefix,
- const gchar *home_uri,
- const gchar *public_uri,
- const gchar *owner_name,
- const gchar *owner_email,
- const gchar *source_uri)
+ const gchar *hierarchy_name,
+ const gchar *physical_uri_prefix,
+ const gchar *home_uri,
+ const gchar *public_uri,
+ const gchar *owner_name,
+ const gchar *owner_email,
+ const gchar *source_uri)
{
ExchangeHierarchy *hier;
ExchangeHierarchyFavorites *hfav;
diff --git a/server/storage/exchange-hierarchy-foreign.c b/server/storage/exchange-hierarchy-foreign.c
index 4dad96e..42f2394 100644
--- a/server/storage/exchange-hierarchy-foreign.c
+++ b/server/storage/exchange-hierarchy-foreign.c
@@ -183,7 +183,9 @@ check_hide_private (ExchangeHierarchy *hier)
}
static void
-remove_all_cb (ExchangeHierarchy *hier, EFolder *folder, gpointer user_data)
+remove_all_cb (ExchangeHierarchy *hier,
+ EFolder *folder,
+ gpointer user_data)
{
exchange_hierarchy_removed_folder (hier, folder);
}
@@ -211,7 +213,9 @@ static const gchar *folder_props[] = {
};
static ExchangeAccountFolderResult
-find_folder (ExchangeHierarchy *hier, const gchar *uri, EFolder **folder_out)
+find_folder (ExchangeHierarchy *hier,
+ const gchar *uri,
+ EFolder **folder_out)
{
ExchangeHierarchyWebDAV *hwd = EXCHANGE_HIERARCHY_WEBDAV (hier);
E2kContext *ctx = exchange_account_get_context (hier->account);
@@ -268,8 +272,11 @@ static struct {
{ N_("Tasks"), E2K_PR_STD_FOLDER_TASKS }
};
static ExchangeAccountFolderResult
-create_internal (ExchangeHierarchy *hier, EFolder *parent,
- const gchar *name, const gchar *type, EFolder **folder_out)
+create_internal (ExchangeHierarchy *hier,
+ EFolder *parent,
+ const gchar *name,
+ const gchar *type,
+ EFolder **folder_out)
{
ExchangeAccountFolderResult result;
gchar *literal_uri = NULL, *standard_uri = NULL;
@@ -334,14 +341,17 @@ create_internal (ExchangeHierarchy *hier, EFolder *parent,
}
static ExchangeAccountFolderResult
-create_folder (ExchangeHierarchy *hier, EFolder *parent,
- const gchar *name, const gchar *type)
+create_folder (ExchangeHierarchy *hier,
+ EFolder *parent,
+ const gchar *name,
+ const gchar *type)
{
return create_internal (hier, parent, name, type, NULL);
}
static ExchangeAccountFolderResult
-remove_folder (ExchangeHierarchy *hier, EFolder *folder)
+remove_folder (ExchangeHierarchy *hier,
+ EFolder *folder)
{
const gchar *folder_type, *physical_uri;
@@ -375,7 +385,9 @@ remove_folder (ExchangeHierarchy *hier, EFolder *folder)
}
static ExchangeAccountFolderResult
-scan_subtree (ExchangeHierarchy *hier, EFolder *folder, gint mode)
+scan_subtree (ExchangeHierarchy *hier,
+ EFolder *folder,
+ gint mode)
{
ExchangeAccountFolderResult folder_result;
@@ -390,7 +402,9 @@ scan_subtree (ExchangeHierarchy *hier, EFolder *folder, gint mode)
}
static void
-add_href (ExchangeHierarchy *hier, EFolder *folder, gpointer hrefs)
+add_href (ExchangeHierarchy *hier,
+ EFolder *folder,
+ gpointer hrefs)
{
gchar *uri = g_strdup (e_folder_exchange_get_internal_uri (folder));
@@ -419,8 +433,8 @@ get_hrefs (ExchangeHierarchySomeDAV *hsd)
**/
ExchangeAccountFolderResult
exchange_hierarchy_foreign_add_folder (ExchangeHierarchy *hier,
- const gchar *folder_name,
- EFolder **folder)
+ const gchar *folder_name,
+ EFolder **folder)
{
ExchangeAccountFolderResult result;
const gchar *folder_type = NULL;
@@ -431,7 +445,7 @@ exchange_hierarchy_foreign_add_folder (ExchangeHierarchy *hier,
result = create_internal (hier, hier->toplevel, folder_name, NULL, folder);
/* Add the esource even if the folder already exists since evolution client process would
- not know it and it might just exist in exchange process */
+ * not know it and it might just exist in exchange process */
if (result == EXCHANGE_ACCOUNT_FOLDER_OK || result == EXCHANGE_ACCOUNT_FOLDER_ALREADY_EXISTS) {
/* Add the esources */
folder_type = e_folder_get_type_string (*folder);
@@ -471,12 +485,12 @@ exchange_hierarchy_foreign_add_folder (ExchangeHierarchy *hier,
static ExchangeHierarchy *
hierarchy_foreign_new (ExchangeAccount *account,
- const gchar *hierarchy_name,
- const gchar *physical_uri_prefix,
- const gchar *internal_uri_prefix,
- const gchar *owner_name,
- const gchar *owner_email,
- const gchar *source_uri)
+ const gchar *hierarchy_name,
+ const gchar *physical_uri_prefix,
+ const gchar *internal_uri_prefix,
+ const gchar *owner_name,
+ const gchar *owner_email,
+ const gchar *source_uri)
{
ExchangeHierarchyForeign *hfor;
@@ -514,12 +528,12 @@ hierarchy_foreign_new (ExchangeAccount *account,
**/
ExchangeHierarchy *
exchange_hierarchy_foreign_new (ExchangeAccount *account,
- const gchar *hierarchy_name,
- const gchar *physical_uri_prefix,
- const gchar *internal_uri_prefix,
- const gchar *owner_name,
- const gchar *owner_email,
- const gchar *source_uri)
+ const gchar *hierarchy_name,
+ const gchar *physical_uri_prefix,
+ const gchar *internal_uri_prefix,
+ const gchar *owner_name,
+ const gchar *owner_email,
+ const gchar *source_uri)
{
ExchangeHierarchy *hier;
gchar *mf_path;
@@ -566,7 +580,7 @@ exchange_hierarchy_foreign_new (ExchangeAccount *account,
**/
ExchangeHierarchy *
exchange_hierarchy_foreign_new_from_dir (ExchangeAccount *account,
- const gchar *folder_path)
+ const gchar *folder_path)
{
ExchangeHierarchy *hier;
gchar *mf_path;
diff --git a/server/storage/exchange-hierarchy-gal.c b/server/storage/exchange-hierarchy-gal.c
index 6ce0a02..d255079 100644
--- a/server/storage/exchange-hierarchy-gal.c
+++ b/server/storage/exchange-hierarchy-gal.c
@@ -50,8 +50,8 @@ exchange_hierarchy_gal_init (ExchangeHierarchyGAL *hierarchy)
ExchangeHierarchy *
exchange_hierarchy_gal_new (ExchangeAccount *account,
- const gchar *hierarchy_name,
- const gchar *physical_uri_prefix)
+ const gchar *hierarchy_name,
+ const gchar *physical_uri_prefix)
{
ExchangeHierarchy *hier;
EFolder *toplevel;
diff --git a/server/storage/exchange-hierarchy-somedav.c b/server/storage/exchange-hierarchy-somedav.c
index a9d880d..219786f 100644
--- a/server/storage/exchange-hierarchy-somedav.c
+++ b/server/storage/exchange-hierarchy-somedav.c
@@ -116,21 +116,23 @@ static const gchar *folder_props[] = {
};
static ExchangeAccountFolderResult
-scan_subtree (ExchangeHierarchy *hier, EFolder *folder, gint mode)
+scan_subtree (ExchangeHierarchy *hier,
+ EFolder *folder,
+ gint mode)
{
ExchangeHierarchySomeDAV *hsd = EXCHANGE_HIERARCHY_SOMEDAV (hier);
GPtrArray *hrefs;
E2kResultIter *iter;
E2kResult *result;
- gint folders_returned=0, folders_added=0, i;
+ gint folders_returned = 0, folders_added = 0, i;
E2kHTTPStatus status;
ExchangeAccountFolderResult folder_result;
EFolder *iter_folder = NULL;
/* FIXME : Temporarily allow a rescan of the hierarchy. The proper fix
- is to handle the folder list either in ExchangeAccount or in the
- plugins/exchange backend separately by listening to signals.
- if (hsd->priv->scanned || folder != hier->toplevel) */
+ * is to handle the folder list either in ExchangeAccount or in the
+ * plugins/exchange backend separately by listening to signals.
+ * if (hsd->priv->scanned || folder != hier->toplevel) */
if (folder != hier->toplevel)
return EXCHANGE_ACCOUNT_FOLDER_OK;
hsd->priv->scanned = TRUE;
@@ -199,7 +201,7 @@ exchange_hierarchy_somedav_get_hrefs (ExchangeHierarchySomeDAV *hsd)
void
exchange_hierarchy_somedav_href_unreadable (ExchangeHierarchySomeDAV *hsd,
- const gchar *href)
+ const gchar *href)
{
g_return_if_fail (EXCHANGE_IS_HIERARCHY_SOMEDAV (hsd));
g_return_if_fail (href != NULL);
@@ -209,7 +211,7 @@ exchange_hierarchy_somedav_href_unreadable (ExchangeHierarchySomeDAV *hsd,
ExchangeAccountFolderResult
exchange_hierarchy_somedav_add_folder (ExchangeHierarchySomeDAV *hsd,
- const gchar *uri)
+ const gchar *uri)
{
ExchangeHierarchyWebDAV *hwd;
ExchangeHierarchy *hier;
diff --git a/server/storage/exchange-hierarchy-webdav.c b/server/storage/exchange-hierarchy-webdav.c
index 10ff6ff..d640b07 100644
--- a/server/storage/exchange-hierarchy-webdav.c
+++ b/server/storage/exchange-hierarchy-webdav.c
@@ -166,8 +166,9 @@ folder_type_map_init (void)
* remove its folders by just calling exchange_hierarchy_removed_folder.)
*/
static void
-hierarchy_new_folder (ExchangeHierarchy *hier, EFolder *folder,
- gpointer user_data)
+hierarchy_new_folder (ExchangeHierarchy *hier,
+ EFolder *folder,
+ gpointer user_data)
{
const gchar *internal_uri;
gchar *mf_path;
@@ -191,8 +192,9 @@ hierarchy_new_folder (ExchangeHierarchy *hier, EFolder *folder,
}
static void
-hierarchy_removed_folder (ExchangeHierarchy *hier, EFolder *folder,
- gpointer user_data)
+hierarchy_removed_folder (ExchangeHierarchy *hier,
+ EFolder *folder,
+ gpointer user_data)
{
const gchar *internal_uri = e_folder_exchange_get_internal_uri (folder);
gchar *mf_path;
@@ -218,10 +220,14 @@ is_empty (ExchangeHierarchy *hier)
}
static EFolder *
-e_folder_webdav_new (ExchangeHierarchy *hier, const gchar *internal_uri,
- EFolder *parent, const gchar *name, const gchar *type,
- const gchar *outlook_class, gint unread,
- gboolean offline_supported)
+e_folder_webdav_new (ExchangeHierarchy *hier,
+ const gchar *internal_uri,
+ EFolder *parent,
+ const gchar *name,
+ const gchar *type,
+ const gchar *outlook_class,
+ gint unread,
+ gboolean offline_supported)
{
EFolder *folder;
gchar *real_type, *http_uri, *physical_uri, *fixed_name = NULL;
@@ -255,10 +261,10 @@ e_folder_webdav_new (ExchangeHierarchy *hier, const gchar *internal_uri,
len = strlen (name);
/* appending "/" here, so that hash table lookup in rescan() succeeds */
- if (name[len-1] != '/') {
+ if (name[len - 1] != '/') {
encoded_name = e2k_uri_encode (name, FALSE, URI_ENCODE_CHARS);
} else {
- temp_name = g_strndup (name, len-1);
+ temp_name = g_strndup (name, len - 1);
encoded_name = e2k_uri_encode (temp_name, FALSE, URI_ENCODE_CHARS);
g_free (temp_name);
}
@@ -290,8 +296,10 @@ e_folder_webdav_new (ExchangeHierarchy *hier, const gchar *internal_uri,
}
static ExchangeAccountFolderResult
-create_folder (ExchangeHierarchy *hier, EFolder *parent,
- const gchar *name, const gchar *type)
+create_folder (ExchangeHierarchy *hier,
+ EFolder *parent,
+ const gchar *name,
+ const gchar *type)
{
EFolder *dest;
E2kProperties *props;
@@ -345,7 +353,8 @@ create_folder (ExchangeHierarchy *hier, EFolder *parent,
}
static ExchangeAccountFolderResult
-remove_folder (ExchangeHierarchy *hier, EFolder *folder)
+remove_folder (ExchangeHierarchy *hier,
+ EFolder *folder)
{
E2kHTTPStatus status;
gint mode;
@@ -371,9 +380,11 @@ remove_folder (ExchangeHierarchy *hier, EFolder *folder)
}
static ExchangeAccountFolderResult
-xfer_folder (ExchangeHierarchy *hier, EFolder *source,
- EFolder *dest_parent, const gchar *dest_name,
- gboolean remove_source)
+xfer_folder (ExchangeHierarchy *hier,
+ EFolder *source,
+ EFolder *dest_parent,
+ const gchar *dest_name,
+ gboolean remove_source)
{
E2kHTTPStatus status;
EFolder *dest;
@@ -422,7 +433,7 @@ xfer_folder (ExchangeHierarchy *hier, EFolder *source,
* update the hash table with new name
*/
exchange_account_folder_size_rename (hier->account,
- source_folder_name+1, dest_name);
+ source_folder_name + 1, dest_name);
}
g_free (source_parent);
} else {
@@ -467,7 +478,9 @@ xfer_folder (ExchangeHierarchy *hier, EFolder *source,
}
static void
-add_href (gpointer path, gpointer folder, gpointer hrefs)
+add_href (gpointer path,
+ gpointer folder,
+ gpointer hrefs)
{
const gchar *folder_type;
@@ -543,7 +556,7 @@ rescan (ExchangeHierarchy *hier)
if (folder_size) {
folder_name = e_folder_get_name (folder);
- fsize_d = g_ascii_strtod (folder_size, NULL)/1024;
+ fsize_d = g_ascii_strtod (folder_size, NULL) / 1024;
exchange_account_folder_size_add (hier->account,
folder_name, fsize_d);
if (personal)
@@ -578,8 +591,8 @@ exchange_hierarchy_webdav_get_total_folder_size (ExchangeHierarchyWebDAV *hwd)
EFolder *
exchange_hierarchy_webdav_parse_folder (ExchangeHierarchyWebDAV *hwd,
- EFolder *parent,
- E2kResult *result)
+ EFolder *parent,
+ E2kResult *result)
{
EFolder *folder;
ExchangeFolderType *folder_type;
@@ -656,7 +669,9 @@ exchange_hierarchy_webdav_parse_folder (ExchangeHierarchyWebDAV *hwd,
}
static void
-add_folders (ExchangeHierarchy *hier, EFolder *folder, gpointer folders)
+add_folders (ExchangeHierarchy *hier,
+ EFolder *folder,
+ gpointer folders)
{
g_object_ref (folder);
g_ptr_array_add (folders, folder);
@@ -679,7 +694,9 @@ static const gchar *pub_folder_props[] = {
};
static ExchangeAccountFolderResult
-scan_subtree (ExchangeHierarchy *hier, EFolder *parent, gint mode)
+scan_subtree (ExchangeHierarchy *hier,
+ EFolder *parent,
+ gint mode)
{
static E2kRestriction *folders_rn;
ExchangeHierarchyWebDAV *hwd = EXCHANGE_HIERARCHY_WEBDAV (hier);
@@ -753,7 +770,7 @@ scan_subtree (ExchangeHierarchy *hier, EFolder *parent, gint mode)
E2K_PR_EXCHANGE_FOLDER_SIZE);
/* FIXME : Find a better way of doing this */
- fsize_d = g_ascii_strtod (folder_size, NULL)/1024;
+ fsize_d = g_ascii_strtod (folder_size, NULL) / 1024;
exchange_account_folder_size_add (hier->account, name, fsize_d);
}
@@ -797,7 +814,9 @@ struct scan_offline_data {
};
static gboolean
-scan_offline_cb (const gchar *physical_path, const gchar *path, gpointer data)
+scan_offline_cb (const gchar *physical_path,
+ const gchar *path,
+ gpointer data)
{
struct scan_offline_data *sod = data;
EFolder *folder;
@@ -832,8 +851,8 @@ scan_offline_cb (const gchar *physical_path, const gchar *path, gpointer data)
**/
void
exchange_hierarchy_webdav_offline_scan_subtree (ExchangeHierarchy *hier,
- ExchangeHierarchyWebDAVScanCallback callback,
- gpointer user_data)
+ ExchangeHierarchyWebDAVScanCallback callback,
+ gpointer user_data)
{
struct scan_offline_data sod;
const gchar *path;
@@ -866,15 +885,15 @@ exchange_hierarchy_webdav_offline_scan_subtree (ExchangeHierarchy *hier,
void
exchange_hierarchy_webdav_construct (ExchangeHierarchyWebDAV *hwd,
- ExchangeAccount *account,
- ExchangeHierarchyType type,
- const gchar *hierarchy_name,
- const gchar *physical_uri_prefix,
- const gchar *internal_uri_prefix,
- const gchar *owner_name,
- const gchar *owner_email,
- const gchar *source_uri,
- gboolean deep_searchable)
+ ExchangeAccount *account,
+ ExchangeHierarchyType type,
+ const gchar *hierarchy_name,
+ const gchar *physical_uri_prefix,
+ const gchar *internal_uri_prefix,
+ const gchar *owner_name,
+ const gchar *owner_email,
+ const gchar *source_uri,
+ gboolean deep_searchable)
{
EFolder *toplevel;
@@ -906,14 +925,14 @@ exchange_hierarchy_webdav_construct (ExchangeHierarchyWebDAV *hwd,
ExchangeHierarchy *
exchange_hierarchy_webdav_new (ExchangeAccount *account,
- ExchangeHierarchyType type,
- const gchar *hierarchy_name,
- const gchar *physical_uri_prefix,
- const gchar *internal_uri_prefix,
- const gchar *owner_name,
- const gchar *owner_email,
- const gchar *source_uri,
- gboolean deep_searchable)
+ ExchangeHierarchyType type,
+ const gchar *hierarchy_name,
+ const gchar *physical_uri_prefix,
+ const gchar *internal_uri_prefix,
+ const gchar *owner_name,
+ const gchar *owner_email,
+ const gchar *source_uri,
+ gboolean deep_searchable)
{
ExchangeHierarchy *hier;
diff --git a/server/storage/exchange-hierarchy.c b/server/storage/exchange-hierarchy.c
index 31d62c9..33506cf 100644
--- a/server/storage/exchange-hierarchy.c
+++ b/server/storage/exchange-hierarchy.c
@@ -142,7 +142,7 @@ finalize (GObject *object)
**/
void
exchange_hierarchy_new_folder (ExchangeHierarchy *hier,
- EFolder *folder)
+ EFolder *folder)
{
g_return_if_fail (EXCHANGE_IS_HIERARCHY (hier));
g_return_if_fail (E_IS_FOLDER (folder));
@@ -159,7 +159,7 @@ exchange_hierarchy_new_folder (ExchangeHierarchy *hier,
**/
void
exchange_hierarchy_removed_folder (ExchangeHierarchy *hier,
- EFolder *folder)
+ EFolder *folder)
{
g_return_if_fail (EXCHANGE_IS_HIERARCHY (hier));
g_return_if_fail (E_IS_FOLDER (folder));
@@ -182,22 +182,27 @@ exchange_hierarchy_is_empty (ExchangeHierarchy *hier)
}
static ExchangeAccountFolderResult
-create_folder (ExchangeHierarchy *hier, EFolder *parent,
- const gchar *name, const gchar *type)
+create_folder (ExchangeHierarchy *hier,
+ EFolder *parent,
+ const gchar *name,
+ const gchar *type)
{
return EXCHANGE_ACCOUNT_FOLDER_PERMISSION_DENIED;
}
static ExchangeAccountFolderResult
-remove_folder (ExchangeHierarchy *hier, EFolder *folder)
+remove_folder (ExchangeHierarchy *hier,
+ EFolder *folder)
{
return EXCHANGE_ACCOUNT_FOLDER_PERMISSION_DENIED;
}
static ExchangeAccountFolderResult
-xfer_folder (ExchangeHierarchy *hier, EFolder *source,
- EFolder *dest_parent, const gchar *dest_name,
- gboolean remove_source)
+xfer_folder (ExchangeHierarchy *hier,
+ EFolder *source,
+ EFolder *dest_parent,
+ const gchar *dest_name,
+ gboolean remove_source)
{
return EXCHANGE_ACCOUNT_FOLDER_PERMISSION_DENIED;
}
@@ -214,8 +219,10 @@ xfer_folder (ExchangeHierarchy *hier, EFolder *source,
* Return value: the result code
**/
ExchangeAccountFolderResult
-exchange_hierarchy_create_folder (ExchangeHierarchy *hier, EFolder *parent,
- const gchar *name, const gchar *type)
+exchange_hierarchy_create_folder (ExchangeHierarchy *hier,
+ EFolder *parent,
+ const gchar *name,
+ const gchar *type)
{
g_return_val_if_fail (EXCHANGE_IS_HIERARCHY (hier), EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR);
g_return_val_if_fail (E_IS_FOLDER (parent), EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR);
@@ -235,7 +242,8 @@ exchange_hierarchy_create_folder (ExchangeHierarchy *hier, EFolder *parent,
* Return value: the result code
**/
ExchangeAccountFolderResult
-exchange_hierarchy_remove_folder (ExchangeHierarchy *hier, EFolder *folder)
+exchange_hierarchy_remove_folder (ExchangeHierarchy *hier,
+ EFolder *folder)
{
g_return_val_if_fail (EXCHANGE_IS_HIERARCHY (hier), EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR);
g_return_val_if_fail (E_IS_FOLDER (folder), EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR);
@@ -256,9 +264,11 @@ exchange_hierarchy_remove_folder (ExchangeHierarchy *hier, EFolder *folder)
* Return value: the result code
**/
ExchangeAccountFolderResult
-exchange_hierarchy_xfer_folder (ExchangeHierarchy *hier, EFolder *source,
- EFolder *dest_parent, const gchar *dest_name,
- gboolean remove_source)
+exchange_hierarchy_xfer_folder (ExchangeHierarchy *hier,
+ EFolder *source,
+ EFolder *dest_parent,
+ const gchar *dest_name,
+ gboolean remove_source)
{
g_return_val_if_fail (EXCHANGE_IS_HIERARCHY (hier), EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR);
g_return_val_if_fail (E_IS_FOLDER (source), EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR);
@@ -291,7 +301,9 @@ exchange_hierarchy_rescan (ExchangeHierarchy *hier)
}
static ExchangeAccountFolderResult
-scan_subtree (ExchangeHierarchy *hier, EFolder *folder, gint mode)
+scan_subtree (ExchangeHierarchy *hier,
+ EFolder *folder,
+ gint mode)
{
return EXCHANGE_ACCOUNT_FOLDER_OK;
}
@@ -308,7 +320,9 @@ scan_subtree (ExchangeHierarchy *hier, EFolder *folder, gint mode)
* Return value: the result code
**/
ExchangeAccountFolderResult
-exchange_hierarchy_scan_subtree (ExchangeHierarchy *hier, EFolder *folder, gint mode)
+exchange_hierarchy_scan_subtree (ExchangeHierarchy *hier,
+ EFolder *folder,
+ gint mode)
{
g_return_val_if_fail (EXCHANGE_IS_HIERARCHY (hier), EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR);
g_return_val_if_fail (E_IS_FOLDER (folder), EXCHANGE_ACCOUNT_FOLDER_GENERIC_ERROR);
@@ -353,12 +367,12 @@ exchange_hierarchy_add_to_storage (ExchangeHierarchy *hier)
**/
void
exchange_hierarchy_construct (ExchangeHierarchy *hier,
- ExchangeAccount *account,
- ExchangeHierarchyType type,
- EFolder *toplevel,
- const gchar *owner_name,
- const gchar *owner_email,
- const gchar *source_uri)
+ ExchangeAccount *account,
+ ExchangeHierarchyType type,
+ EFolder *toplevel,
+ const gchar *owner_name,
+ const gchar *owner_email,
+ const gchar *source_uri)
{
g_return_if_fail (EXCHANGE_IS_HIERARCHY (hier));
g_return_if_fail (EXCHANGE_IS_ACCOUNT (account));
diff --git a/server/storage/exchange-oof.c b/server/storage/exchange-oof.c
index 5b9a80f..c518629 100644
--- a/server/storage/exchange-oof.c
+++ b/server/storage/exchange-oof.c
@@ -33,7 +33,9 @@
/* Taken from gal/util/e-util.c */
static gchar *
-find_str_case (const gchar *haystack, const gchar *needle, const gchar *end)
+find_str_case (const gchar *haystack,
+ const gchar *needle,
+ const gchar *end)
{
/* find the needle in the haystack neglecting case */
const gchar *ptr;
@@ -70,7 +72,9 @@ find_str_case (const gchar *haystack, const gchar *needle, const gchar *end)
* occurred.
**/
gboolean
-exchange_oof_get (ExchangeAccount *account, gboolean *oof, gchar **message)
+exchange_oof_get (ExchangeAccount *account,
+ gboolean *oof,
+ gchar **message)
{
E2kContext *ctx;
E2kHTTPStatus status;
@@ -166,7 +170,9 @@ exchange_oof_get (ExchangeAccount *account, gboolean *oof, gchar **message)
* error occurred.
**/
gboolean
-exchange_oof_set (ExchangeAccount *account, gboolean oof, const gchar *message)
+exchange_oof_set (ExchangeAccount *account,
+ gboolean oof,
+ const gchar *message)
{
E2kContext *ctx;
E2kHTTPStatus status;
diff --git a/server/xntlm/xntlm-des.c b/server/xntlm/xntlm-des.c
index 52ed354..dda4e90 100644
--- a/server/xntlm/xntlm-des.c
+++ b/server/xntlm/xntlm-des.c
@@ -172,7 +172,8 @@ 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;
@@ -305,7 +306,9 @@ 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 */
@@ -323,14 +326,14 @@ xntlm_deskey (XNTLM_DES_KS k, const guchar *key, gint decrypt)
for (i=0; i<16; i++) { /* key chunk for each iteration */
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];
+ pcr[j] = pc1m[(l = j + totrot[decrypt? 15 - i : i]) < (j < 28? 28 : 56) ? l: l - 28];
/* rotate left and right halves independently */
for (j=0; j<48; j++){ /* select bits individually */
/* check bit that goes to ks[j] */
if (pcr[pc2[j]-1]) {
/* mask it in if it's there */
l= j % 6;
- ks[j/6] |= bytebit[l] >> 2;
+ ks[j / 6] |= bytebit[l] >> 2;
}
}
/* Now convert to packed odd/even interleaved form */
diff --git a/server/xntlm/xntlm-md4.c b/server/xntlm/xntlm-md4.c
index f20399a..df5a5fa 100644
--- a/server/xntlm/xntlm-md4.c
+++ b/server/xntlm/xntlm-md4.c
@@ -37,15 +37,17 @@
static void
md4sum_round (const guchar *M,
- guint32 *AA, guint32 *BB,
- guint32 *CC, guint32 *DD)
+ guint32 *AA,
+ guint32 *BB,
+ guint32 *CC,
+ guint32 *DD)
{
guint32 A, B, C, D, X[16];
gint i;
for (i = 0; i < 16; i++) {
- X[i] = (M[i*4]) | (M[i*4 + 1] << 8) |
- (M[i*4 + 2] << 16) | (M[i*4 + 3] << 24);
+ X[i] = (M[i *4]) | (M[i *4 + 1] << 8) |
+ (M[i *4 + 2] << 16) | (M[i *4 + 3] << 24);
}
A = *AA;
@@ -119,7 +121,9 @@ md4sum_round (const guchar *M,
* Computes the MD4 checksum of @in and puts it in @digest.
**/
void
-xntlm_md4sum (const guchar *in, gint nbytes, guchar digest[16])
+xntlm_md4sum (const guchar *in,
+ gint nbytes,
+ guchar digest[16])
{
guchar M[128];
guint32 A, B, C, D;
diff --git a/server/xntlm/xntlm.c b/server/xntlm/xntlm.c
index c56956a..0f30a4d 100644
--- a/server/xntlm/xntlm.c
+++ b/server/xntlm/xntlm.c
@@ -58,7 +58,8 @@ xntlm_negotiate (void)
#define GET_SHORTY(p) ((p)[0] + ((p)[1] << 8))
static gchar *
-strip_dup (guchar *mem, gint len)
+strip_dup (guchar *mem,
+ gint len)
{
gchar *buf = g_malloc (len / 2 + 1), *p = buf;
@@ -102,8 +103,11 @@ strip_dup (guchar *mem, gint len)
* %FALSE otherwise.
**/
gboolean
-xntlm_parse_challenge (gpointer challenge, gint len, gchar **nonce,
- gchar **nt_domain, gchar **w2k_domain)
+xntlm_parse_challenge (gpointer challenge,
+ gint len,
+ gchar **nonce,
+ gchar **nt_domain,
+ gchar **w2k_domain)
{
guchar *chall = (guchar *) challenge;
gint off, dlen, doff, type;
@@ -149,7 +153,10 @@ xntlm_parse_challenge (gpointer challenge, gint len, gchar **nonce,
}
static void
-ntlm_set_string (GByteArray *ba, gint offset, const gchar *data, gint len)
+ntlm_set_string (GByteArray *ba,
+ gint offset,
+ const gchar *data,
+ gint len)
{
ba->data[offset ] = ba->data[offset + 2] = len & 0xFF;
ba->data[offset + 1] = ba->data[offset + 3] = (len >> 8) & 0xFF;
@@ -192,9 +199,11 @@ static guchar NTLM_RESPONSE_MESSAGE_HEADER[] = {
* Return value: the NTLM Type 3 message
**/
GByteArray *
-xntlm_authenticate (const gchar *nonce, const gchar *domain,
- const gchar *user, const gchar *password,
- const gchar *workstation)
+xntlm_authenticate (const gchar *nonce,
+ const gchar *domain,
+ const gchar *user,
+ const gchar *password,
+ const gchar *workstation)
{
GByteArray *message;
guchar hash[21], lm_resp[24], nt_resp[24];
@@ -229,7 +238,8 @@ xntlm_authenticate (const gchar *nonce, const gchar *domain,
}
static void
-setup_schedule (const guchar *key_56, XNTLM_DES_KS ks)
+setup_schedule (const guchar *key_56,
+ XNTLM_DES_KS ks)
{
guchar key[8];
gint i, c, bit;
@@ -262,7 +272,8 @@ static guchar LM_PASSWORD_MAGIC[] = {
};
static void
-ntlm_lanmanager_hash (const gchar *password, gchar hash[21])
+ntlm_lanmanager_hash (const gchar *password,
+ gchar hash[21])
{
guchar lm_password[15];
XNTLM_DES_KS ks;
@@ -284,7 +295,8 @@ ntlm_lanmanager_hash (const gchar *password, gchar hash[21])
}
static void
-ntlm_nt_hash (const gchar *password, gchar hash[21])
+ntlm_nt_hash (const gchar *password,
+ gchar hash[21])
{
guchar *buf, *p;
@@ -303,7 +315,7 @@ ntlm_nt_hash (const gchar *password, gchar hash[21])
static void
ntlm_calc_response (const guchar key[21], const guchar plaintext[8],
- guchar results[24])
+ guchar results[24])
{
XNTLM_DES_KS ks;
diff --git a/tools/exchange-autoconfig-wizard.c b/tools/exchange-autoconfig-wizard.c
index 42571e4..9a51e0e 100644
--- a/tools/exchange-autoconfig-wizard.c
+++ b/tools/exchange-autoconfig-wizard.c
@@ -90,7 +90,10 @@ check_field (GtkEntry *entry)
}
static void
-fill_failure_page (ExchangeAutoconfigGUI *gui, const gchar *url, const gchar *fmt, ...)
+fill_failure_page (ExchangeAutoconfigGUI *gui,
+ const gchar *url,
+ const gchar *fmt,
+ ...)
{
va_list ap;
gchar *text;
@@ -118,7 +121,13 @@ fill_failure_page (ExchangeAutoconfigGUI *gui, const gchar *url, const gchar *fm
#define CONNECT_CHANGE_SIGNAL(_where,_signal_name) g_signal_connect (_where, _signal_name, G_CALLBACK (assistant_page_content_changed), gui)
static GtkWidget *
-create_page_vbox (GtkAssistant *assistant, GdkPixbuf *logo, const gchar *page_title, const gchar *page_info, GtkAssistantPageType page_type, GtkWidget **page, gint *page_index)
+create_page_vbox (GtkAssistant *assistant,
+ GdkPixbuf *logo,
+ const gchar *page_title,
+ const gchar *page_info,
+ GtkAssistantPageType page_type,
+ GtkWidget **page,
+ gint *page_index)
{
GtkWidget *vbox;
gboolean is_edge = page_type == GTK_ASSISTANT_PAGE_INTRO || page_type == GTK_ASSISTANT_PAGE_CONFIRM;
@@ -153,7 +162,10 @@ create_page_vbox (GtkAssistant *assistant, GdkPixbuf *logo, const gchar *page_ti
}
static GtkWidget *
-add_table_row (GtkTable *table, gint row, const gchar *label_text, GtkWidget *action_widget)
+add_table_row (GtkTable *table,
+ gint row,
+ const gchar *label_text,
+ GtkWidget *action_widget)
{
GtkWidget *w;
@@ -169,7 +181,10 @@ add_table_row (GtkTable *table, gint row, const gchar *label_text, GtkWidget *ac
}
static void
-start_page_create (ExchangeAutoconfigGUI *gui, GdkPixbuf *logo, GtkWidget **page, gint *page_index)
+start_page_create (ExchangeAutoconfigGUI *gui,
+ GdkPixbuf *logo,
+ GtkWidget **page,
+ gint *page_index)
{
GtkWidget *vbox;
@@ -180,7 +195,10 @@ start_page_create (ExchangeAutoconfigGUI *gui, GdkPixbuf *logo, GtkWidget **page
}
static void
-owa_page_create (ExchangeAutoconfigGUI *gui, GdkPixbuf *logo, GtkWidget **page, gint *page_index)
+owa_page_create (ExchangeAutoconfigGUI *gui,
+ GdkPixbuf *logo,
+ GtkWidget **page,
+ gint *page_index)
{
GtkWidget *vbox, *w;
GtkTable *table;
@@ -353,7 +371,10 @@ owa_page_get_next (ExchangeAutoconfigGUI *gui)
}
static void
-gc_page_create (ExchangeAutoconfigGUI *gui, GdkPixbuf *logo, GtkWidget **page, gint *page_index)
+gc_page_create (ExchangeAutoconfigGUI *gui,
+ GdkPixbuf *logo,
+ GtkWidget **page,
+ gint *page_index)
{
GtkWidget *vbox, *w;
GtkTable *table;
@@ -414,7 +435,10 @@ gc_page_get_next (ExchangeAutoconfigGUI *gui)
}
static void
-failure_page_create (ExchangeAutoconfigGUI *gui, GdkPixbuf *logo, GtkWidget **page, gint *page_index)
+failure_page_create (ExchangeAutoconfigGUI *gui,
+ GdkPixbuf *logo,
+ GtkWidget **page,
+ gint *page_index)
{
GtkWidget *vbox, *w;
@@ -440,7 +464,10 @@ failure_page_check (ExchangeAutoconfigGUI *gui)
}
static void
-verify_page_create (ExchangeAutoconfigGUI *gui, GdkPixbuf *logo, GtkWidget **page, gint *page_index)
+verify_page_create (ExchangeAutoconfigGUI *gui,
+ GdkPixbuf *logo,
+ GtkWidget **page,
+ gint *page_index)
{
GtkWidget *vbox, *w;
GtkTable *table;
@@ -501,7 +528,10 @@ verify_page_check (ExchangeAutoconfigGUI *gui)
}
static void
-finish_page_create (ExchangeAutoconfigGUI *gui, GdkPixbuf *logo, GtkWidget **page, gint *page_index)
+finish_page_create (ExchangeAutoconfigGUI *gui,
+ GdkPixbuf *logo,
+ GtkWidget **page,
+ gint *page_index)
{
GtkWidget *vbox;
@@ -561,7 +591,7 @@ autoconfig_gui_apply (ExchangeAutoconfigGUI *gui)
/* Check if any account is already configured, and throw an error if so */
/* NOTE: This condition check needs to be removed when we start
- supporting multiple accounts */
+ * supporting multiple accounts */
for (iter = e_list_get_iterator ((EList *) list);
e_iterator_is_valid (iter);
e_iterator_next (iter)) {
@@ -637,7 +667,8 @@ static struct {
/* Autoconfig assistant */
static gint
-find_page (ExchangeAutoconfigGUI *gui, GtkWidget *page)
+find_page (ExchangeAutoconfigGUI *gui,
+ GtkWidget *page)
{
gint page_num;
@@ -650,7 +681,9 @@ find_page (ExchangeAutoconfigGUI *gui, GtkWidget *page)
}
static void
-assistant_prepare_cb (GtkAssistant *assistant, GtkWidget *page, ExchangeAutoconfigGUI *gui)
+assistant_prepare_cb (GtkAssistant *assistant,
+ GtkWidget *page,
+ ExchangeAutoconfigGUI *gui)
{
gint page_num = find_page (gui, page);
@@ -672,7 +705,8 @@ assistant_prepare_cb (GtkAssistant *assistant, GtkWidget *page, ExchangeAutoconf
}
static void
-assistant_page_content_changed (GtkWidget *sender, ExchangeAutoconfigGUI *gui)
+assistant_page_content_changed (GtkWidget *sender,
+ ExchangeAutoconfigGUI *gui)
{
gint page_num = gtk_assistant_get_current_page (GTK_ASSISTANT (gui->assistant));
@@ -692,25 +726,29 @@ assistant_page_content_changed (GtkWidget *sender, ExchangeAutoconfigGUI *gui)
}
static void
-assistant_apply_cb (GtkAssistant *assistant, ExchangeAutoconfigGUI *gui)
+assistant_apply_cb (GtkAssistant *assistant,
+ ExchangeAutoconfigGUI *gui)
{
autoconfig_gui_apply (gui);
}
static void
-assistant_cancel_cb (GtkAssistant *assistant, ExchangeAutoconfigGUI *gui)
+assistant_cancel_cb (GtkAssistant *assistant,
+ ExchangeAutoconfigGUI *gui)
{
gtk_widget_destroy (GTK_WIDGET (gui->assistant));
}
static void
-assistant_destroyed (gpointer gui, GObject *where_druid_was)
+assistant_destroyed (gpointer gui,
+ GObject *where_druid_was)
{
gtk_main_quit ();
}
static gint
-assistant_forward_func (gint current_page, gpointer user_data)
+assistant_forward_func (gint current_page,
+ gpointer user_data)
{
ExchangeAutoconfigGUI *gui = user_data;
gint next_page = current_page + 1;
diff --git a/tools/exchange-share-config-listener.c b/tools/exchange-share-config-listener.c
index bcab709..edbb034 100644
--- a/tools/exchange-share-config-listener.c
+++ b/tools/exchange-share-config-listener.c
@@ -176,7 +176,8 @@ is_active_exchange_account (EAccount *account)
}
static void
-update_foreign_uri (const gchar *path, const gchar *account_uri)
+update_foreign_uri (const gchar *path,
+ const gchar *account_uri)
{
gchar *file_path, *phy_uri, *foreign_uri, *new_phy_uri;
GHashTable *old_props = NULL;
@@ -248,7 +249,8 @@ migrate_foreign_hierarchy (ExchangeAccount *account)
}
static void
-ex_set_relative_uri (ESource *source, const gchar *url)
+ex_set_relative_uri (ESource *source,
+ const gchar *url)
{
const gchar *rel_uri = e_source_peek_relative_uri (source);
gchar *folder_name;
@@ -271,7 +273,7 @@ ex_set_relative_uri (ESource *source, const gchar *url)
static void
migrate_account_esource (EAccount *account,
- FolderType folder_type)
+ FolderType folder_type)
{
ESourceGroup *group;
ESource *source = NULL;
@@ -358,7 +360,8 @@ exchange_share_config_listener_migrate_esources (ExchangeShareConfigListener *co
}
static void
-account_added (EAccountList *account_list, EAccount *account)
+account_added (EAccountList *account_list,
+ EAccount *account)
{
ExchangeShareConfigListener *config_listener;
ExchangeAccount *exchange_account;
@@ -399,7 +402,8 @@ struct account_update_data {
};
static void
-configured_account_destroyed (gpointer user_data, GObject *where_account_was)
+configured_account_destroyed (gpointer user_data,
+ GObject *where_account_was)
{
struct account_update_data *aud = user_data;
@@ -412,11 +416,12 @@ configured_account_destroyed (gpointer user_data, GObject *where_account_was)
}
static gboolean
-requires_relogin (gchar *current_url, gchar *new_url)
+requires_relogin (gchar *current_url,
+ gchar *new_url)
{
E2kUri *current_uri, *new_uri;
const gchar *current_param_val, *new_param_val;
- const gchar *params [] = {
+ const gchar *params[] = {
"owa-url",
"gc-server-name",
"security-method" };
@@ -448,7 +453,7 @@ requires_relogin (gchar *current_url, gchar *new_url)
}
}
- for (i=0; i<n_params; i++) {
+ for (i = 0; i < n_params; i++) {
current_param_val = e2k_uri_get_param (current_uri, params[i]);
new_param_val = e2k_uri_get_param (new_uri, params[i]);
@@ -472,7 +477,8 @@ end:
}
static void
-account_changed (EAccountList *account_list, EAccount *account)
+account_changed (EAccountList *account_list,
+ EAccount *account)
{
ExchangeShareConfigListener *config_listener =
EXCHANGE_SHARE_CONFIG_LISTENER (account_list);
@@ -556,7 +562,8 @@ account_changed (EAccountList *account_list, EAccount *account)
}
static void
-account_removed (EAccountList *account_list, EAccount *account)
+account_removed (EAccountList *account_list,
+ EAccount *account)
{
ExchangeShareConfigListener *config_listener =
EXCHANGE_SHARE_CONFIG_LISTENER (account_list);
@@ -637,7 +644,8 @@ exchange_share_config_listener_get_accounts (ExchangeShareConfigListener *config
*
**/
static gboolean
-exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2)
+exchange_camel_urls_is_equal (const gchar *url1,
+ const gchar *url2)
{
CamelURL *curl1, *curl2;
const gchar *param1, *param2;
@@ -702,7 +710,7 @@ exchange_share_config_listener_get_global (void)
if (!excl) {
if (!g_main_context_is_owner (g_main_context_default ())) {
/* it is called from a thread, do the creation in a main thread;
- every other call will wait until it is done */
+ * every other call will wait until it is done */
struct create_excl_struct ces;
ces.excl = !
@@ -726,7 +734,8 @@ exchange_share_config_listener_get_global (void)
}
ExchangeAccount *
-exchange_share_config_listener_get_account_for_uri (ExchangeShareConfigListener *excl, const gchar *uri)
+exchange_share_config_listener_get_account_for_uri (ExchangeShareConfigListener *excl,
+ const gchar *uri)
{
GSList *accounts, *a;
ExchangeAccount *res = NULL;
diff --git a/tools/ximian-connector-setup.c b/tools/ximian-connector-setup.c
index 80b16ed..747028c 100644
--- a/tools/ximian-connector-setup.c
+++ b/tools/ximian-connector-setup.c
@@ -48,7 +48,8 @@
#endif
gint
-main (gint argc, gchar **argv)
+main (gint argc,
+ gchar **argv)
{
GError *error = NULL;
@@ -69,7 +70,7 @@ main (gint argc, gchar **argv)
p_SetProcessDEPPolicy = GetProcAddress (GetModuleHandle ("kernel32.dll"), "SetProcessDEPPolicy");
if (p_SetProcessDEPPolicy)
- (*p_SetProcessDEPPolicy) (PROCESS_DEP_ENABLE|PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION);
+ (*p_SetProcessDEPPolicy) (PROCESS_DEP_ENABLE | PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION);
}
#endif
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]