[evolution-data-server] Coding style and whitespace cleanups.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Coding style and whitespace cleanups.
- Date: Sat, 11 Sep 2010 18:13:30 +0000 (UTC)
commit a977da4197c9533b7a78b3d723f6941e421fc10a
Author: Matthew Barnes <mbarnes redhat com>
Date: Sat Sep 11 11:48:35 2010 -0400
Coding style and whitespace cleanups.
.../backends/groupwise/e-book-backend-groupwise.c | 2 +-
addressbook/backends/ldap/e-book-backend-ldap.c | 10 ++--
addressbook/libebook/e-book-view.c | 2 +-
addressbook/libebook/e-book.c | 18 +++---
addressbook/libebook/e-contact.c | 8 +-
addressbook/libebook/e-contact.h | 2 +-
addressbook/libebook/e-destination.c | 34 +++++-----
addressbook/libebook/e-name-western.c | 4 +-
addressbook/libebook/e-vcard.c | 6 +-
addressbook/libedata-book/e-book-backend-summary.c | 2 +-
calendar/backends/caldav/e-cal-backend-caldav.c | 10 +--
calendar/backends/file/e-cal-backend-file.c | 72 +++++++++----------
.../groupwise/e-cal-backend-groupwise-utils.c | 2 +-
.../backends/groupwise/e-cal-backend-groupwise.c | 14 ++--
calendar/backends/http/e-cal-backend-http.c | 9 +--
calendar/backends/weather/e-cal-backend-weather.c | 14 ++--
calendar/backends/weather/e-weather-source-ccf.c | 6 +-
calendar/libecal/e-cal-component.c | 4 +-
calendar/libecal/e-cal-recur.c | 2 +-
calendar/libecal/e-cal-recur.h | 2 +-
calendar/libecal/e-cal-util.c | 6 +-
calendar/libecal/e-cal.c | 13 ++--
calendar/libedata-cal/e-cal-backend-file-store.c | 19 +++---
calendar/libedata-cal/e-cal-backend-intervaltree.c | 74 +++++++++----------
calendar/libedata-cal/e-cal-backend-intervaltree.h | 2 +-
calendar/libedata-cal/e-cal-backend-sexp.c | 4 +-
calendar/libedata-cal/e-cal-backend-store.c | 9 +--
calendar/libedata-cal/e-cal-backend-store.h | 8 +-
calendar/libedata-cal/e-cal-backend-sync.c | 4 +-
calendar/libedata-cal/test-intervaltree.c | 4 -
camel/camel-db.c | 42 ++++++------
camel/camel-filter-driver.c | 6 +-
camel/camel-folder-search.c | 6 +-
camel/camel-folder-summary.c | 50 +++++++-------
camel/camel-folder.c | 8 +-
camel/camel-mime-utils.c | 8 +-
camel/camel-sasl-ntlm.c | 14 ++--
camel/providers/groupwise/camel-groupwise-folder.c | 20 +++---
.../providers/groupwise/camel-groupwise-provider.c | 2 +-
camel/providers/imap/camel-imap-folder.c | 4 +-
camel/providers/imap/camel-imap-store-summary.c | 2 +-
camel/providers/imap/camel-imap-utils.c | 2 +-
camel/providers/imapx/camel-imapx-server.c | 4 +-
camel/providers/imapx/camel-imapx-stream.c | 1 -
camel/providers/imapx/camel-imapx-utils.c | 70 +++++++++---------
camel/providers/imapx/test-imapx.c | 4 +-
libedataserver/e-account-list.c | 2 +-
libedataserver/e-data-server-util.c | 8 +-
libedataserver/e-debug-log.h | 10 ++--
libedataserver/e-iterator.c | 6 +-
libedataserver/e-sexp.c | 13 ++--
libedataserver/e-source-group.c | 2 +-
libedataserver/e-source.c | 4 +-
libedataserver/e-time-utils.c | 12 ++--
libedataserverui/e-categories-dialog.c | 2 +-
libedataserverui/e-category-completion.c | 2 +-
libedataserverui/e-contact-store.c | 2 +-
libedataserverui/e-destination-store.c | 12 ++--
libedataserverui/e-name-selector-entry.c | 40 +++++-----
libedataserverui/e-name-selector-model.c | 6 +-
libedataserverui/e-tree-model-generator.c | 16 ++--
libedataserverui/test-contact-store.c | 2 +-
libedataserverui/test-source-combo-box.c | 2 +-
libedataserverui/test-source-selector.c | 2 +-
servers/groupwise/e-gw-item.c | 14 ++--
servers/groupwise/e-gw-recur-utils.c | 2 +-
servers/groupwise/e-gw-recur-utils.h | 2 +-
67 files changed, 373 insertions(+), 397 deletions(-)
---
diff --git a/addressbook/backends/groupwise/e-book-backend-groupwise.c b/addressbook/backends/groupwise/e-book-backend-groupwise.c
index 0ef6d68..75cd78d 100644
--- a/addressbook/backends/groupwise/e-book-backend-groupwise.c
+++ b/addressbook/backends/groupwise/e-book-backend-groupwise.c
@@ -135,7 +135,7 @@ static const struct field_element_mapping {
void (*set_value_in_gw_item) (EGwItem *item, gpointer data);
void (*set_changes) (EGwItem *new_item, EGwItem *old_item);
-} mappings [] = {
+} mappings[] = {
{ E_CONTACT_UID, ELEMENT_TYPE_SIMPLE, "id"},
{ E_CONTACT_FILE_AS, ELEMENT_TYPE_SIMPLE, "name" },
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index ea1f6b4..5a6ec78 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -2774,10 +2774,10 @@ member_populate (EContact *contact, gchar **values)
member_info = g_strsplit (values [i], ";", -1);
attr = e_vcard_attribute_new (NULL, EVC_EMAIL);
- e_vcard_attribute_add_param_with_value (attr, e_vcard_attribute_param_new (EVC_X_DEST_CONTACT_UID), member_info [1]);
+ e_vcard_attribute_add_param_with_value (attr, e_vcard_attribute_param_new (EVC_X_DEST_CONTACT_UID), member_info[1]);
- if (member_info [2]) {
- gint len = strlen (member_info [2]);
+ if (member_info[2]) {
+ gint len = strlen (member_info[2]);
gchar *value;
if (member_info [2][0] == '\"' && member_info [2][len - 1] == '\"')
@@ -2788,7 +2788,7 @@ member_populate (EContact *contact, gchar **values)
e_vcard_attribute_add_value (attr, value);
g_free (value);
} else {
- e_vcard_attribute_add_value (attr, member_info [0]);
+ e_vcard_attribute_add_value (attr, member_info[0]);
}
e_vcard_add_attribute (E_VCARD (contact), attr);
@@ -4190,7 +4190,7 @@ build_contact_from_entry (EBookBackendLDAP *bl,
printf ("cn = %s \n", cn_values[0]);
*(member_info + j) =
g_strconcat (*(member_info + j),
- cn_values [0], NULL);
+ cn_values[0], NULL);
ldap_value_free (cn_values);
}
}
diff --git a/addressbook/libebook/e-book-view.c b/addressbook/libebook/e-book-view.c
index d8ef2fb..2d1bab4 100644
--- a/addressbook/libebook/e-book-view.c
+++ b/addressbook/libebook/e-book-view.c
@@ -51,7 +51,7 @@ enum {
LAST_SIGNAL
};
-static guint signals [LAST_SIGNAL];
+static guint signals[LAST_SIGNAL];
static void
contacts_added_cb (EGdbusBookView *object, const gchar * const *vcards, EBookView *book_view)
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index 727acf4..fa8fa8d 100644
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -65,7 +65,7 @@ enum {
LAST_SIGNAL
};
-static guint e_book_signals [LAST_SIGNAL];
+static guint e_book_signals[LAST_SIGNAL];
struct _EBookPrivate {
EGdbusBook *gdbus_book;
@@ -136,7 +136,7 @@ gdbus_book_closed_cb (GDBusConnection *connection, gboolean remote_peer_vanished
UNLOCK_FACTORY ();
- g_signal_emit (G_OBJECT (book), e_book_signals [BACKEND_DIED], 0);
+ g_signal_emit (G_OBJECT (book), e_book_signals[BACKEND_DIED], 0);
}
static void
@@ -199,7 +199,7 @@ e_book_class_init (EBookClass *e_book_class)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (e_book_class);
- e_book_signals [WRITABLE_STATUS] =
+ e_book_signals[WRITABLE_STATUS] =
g_signal_new ("writable_status",
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST,
@@ -209,7 +209,7 @@ e_book_class_init (EBookClass *e_book_class)
G_TYPE_NONE, 1,
G_TYPE_BOOLEAN);
- e_book_signals [CONNECTION_STATUS] =
+ e_book_signals[CONNECTION_STATUS] =
g_signal_new ("connection_status",
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST,
@@ -219,7 +219,7 @@ e_book_class_init (EBookClass *e_book_class)
G_TYPE_NONE, 1,
G_TYPE_BOOLEAN);
- e_book_signals [AUTH_REQUIRED] =
+ e_book_signals[AUTH_REQUIRED] =
g_signal_new ("auth_required",
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST,
@@ -228,7 +228,7 @@ e_book_class_init (EBookClass *e_book_class)
e_book_marshal_NONE__NONE,
G_TYPE_NONE, 0);
- e_book_signals [BACKEND_DIED] =
+ e_book_signals[BACKEND_DIED] =
g_signal_new ("backend_died",
G_OBJECT_CLASS_TYPE (gobject_class),
G_SIGNAL_RUN_LAST,
@@ -352,7 +352,7 @@ writable_cb (EGdbusBook *object, gboolean writable, EBook *book)
book->priv->writable = writable;
- g_signal_emit (G_OBJECT (book), e_book_signals [WRITABLE_STATUS], 0, writable);
+ g_signal_emit (G_OBJECT (book), e_book_signals[WRITABLE_STATUS], 0, writable);
}
static void
@@ -362,7 +362,7 @@ connection_cb (EGdbusBook *object, gboolean connected, EBook *book)
book->priv->connected = connected;
- g_signal_emit (G_OBJECT (book), e_book_signals [CONNECTION_STATUS], 0, connected);
+ g_signal_emit (G_OBJECT (book), e_book_signals[CONNECTION_STATUS], 0, connected);
}
static void
@@ -370,7 +370,7 @@ auth_required_cb (EGdbusBook *object, EBook *book)
{
g_return_if_fail (E_IS_BOOK (book));
- g_signal_emit (G_OBJECT (book), e_book_signals [AUTH_REQUIRED], 0);
+ g_signal_emit (G_OBJECT (book), e_book_signals[AUTH_REQUIRED], 0);
}
/**
diff --git a/addressbook/libebook/e-contact.c b/addressbook/libebook/e-contact.c
index 85fd67c..d3a74b2 100644
--- a/addressbook/libebook/e-contact.c
+++ b/addressbook/libebook/e-contact.c
@@ -44,7 +44,7 @@
G_DEFINE_TYPE (EContact, e_contact, E_TYPE_VCARD)
struct _EContactPrivate {
- gchar *cached_strings [E_CONTACT_FIELD_LAST];
+ gchar *cached_strings[E_CONTACT_FIELD_LAST];
};
#define E_CONTACT_FIELD_TYPE_STRING 0x00000001 /* used for simple single valued attributes */
@@ -652,7 +652,7 @@ date_getter (EContact *contact, EVCardAttribute *attr)
GList *p = e_vcard_attribute_get_values (attr);
EContactDate *date;
- if (p && p->data && ((gchar *) p->data) [0])
+ if (p && p->data && ((gchar *) p->data)[0])
date = e_contact_date_from_string ((gchar *) p->data);
else
date = NULL;
@@ -1229,7 +1229,7 @@ e_contact_new_from_vcard (const gchar *vcard)
EContactName *name;
const gchar *org;
gchar *file_as_new = NULL;
- gchar *strings [4];
+ gchar *strings[4];
gchar **strings_p = strings;
name = e_contact_get (contact, E_CONTACT_NAME);
@@ -1589,7 +1589,7 @@ e_contact_get_const (EContact *contact, EContactField field_id)
gpointer value = NULL;
g_return_val_if_fail (E_IS_CONTACT (contact), NULL);
- g_return_val_if_fail (field_info [field_id].t & E_CONTACT_FIELD_TYPE_STRING, NULL);
+ g_return_val_if_fail (field_info[field_id].t & E_CONTACT_FIELD_TYPE_STRING, NULL);
value = contact->priv->cached_strings[field_id];
diff --git a/addressbook/libebook/e-contact.h b/addressbook/libebook/e-contact.h
index 3eafa42..78f34f1 100644
--- a/addressbook/libebook/e-contact.h
+++ b/addressbook/libebook/e-contact.h
@@ -143,7 +143,7 @@ typedef enum {
E_CONTACT_IM_ICQ_WORK_3, /* Synthetic string field */
/* Convenience field for getting a name from the contact.
- Returns the first one of [File-As, Full Name, Org, Email1]
+ Returns the first one of[File-As, Full Name, Org, Email1]
to be set */
E_CONTACT_REV, /* string field to hold time of last update to this vcard*/
E_CONTACT_NAME_OR_ORG,
diff --git a/addressbook/libebook/e-destination.c b/addressbook/libebook/e-destination.c
index 0538b72..b6f6c4a 100644
--- a/addressbook/libebook/e-destination.c
+++ b/addressbook/libebook/e-destination.c
@@ -88,7 +88,7 @@ enum {
LAST_SIGNAL
};
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
static GObjectClass *parent_class;
@@ -138,7 +138,7 @@ e_destination_class_init (EDestinationClass *klass)
parent_class = g_type_class_ref (G_TYPE_OBJECT);
- signals [CHANGED] =
+ signals[CHANGED] =
g_signal_new ("changed",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
@@ -426,7 +426,7 @@ e_destination_set_contact (EDestination *dest, EContact *contact, gint email_num
/* is there anything to do here? */
}
- g_signal_emit (dest, signals [CHANGED], 0);
+ g_signal_emit (dest, signals[CHANGED], 0);
} else if (dest->priv->email_num != email_num) {
/* Splitting here would help the contact lists not rebuiding, so that it remembers ignored values */
g_object_ref (contact);
@@ -439,7 +439,7 @@ e_destination_set_contact (EDestination *dest, EContact *contact, gint email_num
dest->priv->email_num = email_num;
- g_signal_emit (dest, signals [CHANGED], 0);
+ g_signal_emit (dest, signals[CHANGED], 0);
}
}
@@ -466,7 +466,7 @@ e_destination_set_book (EDestination *dest, EBook *book)
e_destination_clear (dest);
dest->priv->source_uid = g_strdup (e_source_peek_uid (source));
- g_signal_emit (dest, signals [CHANGED], 0);
+ g_signal_emit (dest, signals[CHANGED], 0);
}
}
@@ -501,7 +501,7 @@ e_destination_set_contact_uid (EDestination *dest, const gchar *uid, gint email_
dest->priv->contact = NULL;
}
- g_signal_emit (dest, signals [CHANGED], 0);
+ g_signal_emit (dest, signals[CHANGED], 0);
}
}
@@ -517,7 +517,7 @@ e_destination_set_source_uid (EDestination *dest, const gchar *uid)
g_free (dest->priv->source_uid);
dest->priv->source_uid = g_strdup (uid);
- g_signal_emit (dest, signals [CHANGED], 0);
+ g_signal_emit (dest, signals[CHANGED], 0);
}
}
@@ -553,7 +553,7 @@ e_destination_set_name (EDestination *dest, const gchar *name)
g_free (dest->priv->textrep);
dest->priv->textrep = NULL;
- g_signal_emit (dest, signals [CHANGED], 0);
+ g_signal_emit (dest, signals[CHANGED], 0);
}
}
@@ -589,7 +589,7 @@ e_destination_set_email (EDestination *dest, const gchar *email)
g_free (dest->priv->textrep);
dest->priv->textrep = NULL;
- g_signal_emit (dest, signals [CHANGED], 0);
+ g_signal_emit (dest, signals[CHANGED], 0);
}
}
@@ -634,7 +634,7 @@ e_destination_set_auto_recipient (EDestination *dest, gboolean value)
dest->priv->auto_recipient = value;
- g_signal_emit (dest, signals [CHANGED], 0);
+ g_signal_emit (dest, signals[CHANGED], 0);
}
/**
@@ -864,9 +864,9 @@ e_destination_get_address (const EDestination *dest)
while (iter) {
EDestination *list_dest = E_DESTINATION (iter->data);
-
+
if (!e_destination_empty (list_dest) && !list_dest->priv->ignored) {
- const char *name, *email;
+ const gchar *name, *email;
name = e_destination_get_name (list_dest);
email = e_destination_get_email (list_dest);
@@ -882,10 +882,10 @@ e_destination_get_address (const EDestination *dest)
}
priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
} else if (priv->raw) {
- if (camel_address_unformat (CAMEL_ADDRESS (addr), priv->raw))
- priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
+ if (camel_address_unformat (CAMEL_ADDRESS (addr), priv->raw))
+ priv->addr = camel_address_encode (CAMEL_ADDRESS (addr));
} else {
- const char *name, *email;
+ const gchar *name, *email;
name = e_destination_get_name (dest);
email = e_destination_get_email (dest);
@@ -923,7 +923,7 @@ e_destination_set_raw (EDestination *dest, const gchar *raw)
e_destination_clear (dest);
dest->priv->raw = g_strdup (raw);
- g_signal_emit (dest, signals [CHANGED], 0);
+ g_signal_emit (dest, signals[CHANGED], 0);
}
}
@@ -1063,7 +1063,7 @@ e_destination_set_html_mail_pref (EDestination *dest, gboolean flag)
if (dest->priv->wants_html_mail != flag) {
dest->priv->wants_html_mail = flag;
- g_signal_emit (dest, signals [CHANGED], 0);
+ g_signal_emit (dest, signals[CHANGED], 0);
}
}
diff --git a/addressbook/libebook/e-name-western.c b/addressbook/libebook/e-name-western.c
index 3c2c579..5d7c31a 100644
--- a/addressbook/libebook/e-name-western.c
+++ b/addressbook/libebook/e-name-western.c
@@ -173,7 +173,7 @@ e_name_western_get_one_prefix_at_str (gchar *str)
if (g_utf8_strlen (word, -1) > 2 &&
g_unichar_isalpha (g_utf8_get_char (word)) &&
g_unichar_isalpha (g_utf8_get_char (g_utf8_next_char (word))) &&
- word [strlen (word) - 1] == '.')
+ word[strlen (word) - 1] == '.')
return word;
g_free (word);
@@ -365,7 +365,7 @@ e_name_western_extract_middle (ENameWestern *name, ENameWesternIdxs *idxs)
/*
* Make sure we didn't just grab a cute nickname.
*/
- if (word [0] == '\"') {
+ if (word[0] == '\"') {
g_free (word);
return;
}
diff --git a/addressbook/libebook/e-vcard.c b/addressbook/libebook/e-vcard.c
index 7a75d54..d6719a9 100644
--- a/addressbook/libebook/e-vcard.c
+++ b/addressbook/libebook/e-vcard.c
@@ -859,12 +859,12 @@ e_vcard_to_string_vcard_30 (EVCard *evc)
g_string_append_c (attr_str, '"');
- for (i = 0; value [i]; i++) {
+ for (i = 0; value[i]; i++) {
/* skip quotes in quoted string; it is not allowed */
- if (value [i] == '\"')
+ if (value[i] == '\"')
continue;
- g_string_append_c (attr_str, value [i]);
+ g_string_append_c (attr_str, value[i]);
}
g_string_append_c (attr_str, '"');
diff --git a/addressbook/libedata-book/e-book-backend-summary.c b/addressbook/libedata-book/e-book-backend-summary.c
index af32e42..d83c3dc 100644
--- a/addressbook/libedata-book/e-book-backend-summary.c
+++ b/addressbook/libedata-book/e-book-backend-summary.c
@@ -240,7 +240,7 @@ e_book_backend_summary_init (EBookBackendSummary *summary)
static gboolean
e_book_backend_summary_check_magic (EBookBackendSummary *summary, FILE *fp)
{
- gchar buf [PAS_SUMMARY_MAGIC_LEN + 1];
+ gchar buf[PAS_SUMMARY_MAGIC_LEN + 1];
gint rv;
memset (buf, 0, sizeof (buf));
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index f67a7dc..ce3d9c7 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -268,21 +268,21 @@ caldav_debug_setup (SoupSession *session)
/* TODO Do not replicate this in every backend */
static icaltimezone *
-resolve_tzid (const char *tzid, gpointer user_data)
+resolve_tzid (const gchar *tzid, gpointer user_data)
{
icaltimezone *zone;
-
+
zone = (!strcmp (tzid, "UTC"))
? icaltimezone_get_utc_timezone ()
: icaltimezone_get_builtin_timezone_from_tzid (tzid);
-
+
if (!zone)
zone = e_cal_backend_internal_get_timezone (E_CAL_BACKEND (user_data), tzid);
return zone;
}
-static gboolean
+static gboolean
put_component_to_store (ECalBackendCalDAV *cbdav,
ECalComponent *comp)
{
@@ -298,7 +298,6 @@ put_component_to_store (ECalBackendCalDAV *cbdav,
return e_cal_backend_store_put_component_with_time_range (priv->store, comp, time_start, time_end);
}
-
static ECalBackendSyncClass *parent_class = NULL;
static icaltimezone *caldav_internal_get_default_timezone (ECalBackend *backend);
@@ -4085,7 +4084,6 @@ caldav_start_query (ECalBackend *backend,
&occur_start,
&occur_end);
-
bkend = E_CAL_BACKEND (backend);
list = prunning_by_time ?
diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index 41f179e..b35f7d5 100644
--- a/calendar/backends/file/e-cal-backend-file.c
+++ b/calendar/backends/file/e-cal-backend-file.c
@@ -133,7 +133,7 @@ e_cal_backend_file_add_timezone (ECalBackendSync *backend, EDataCal *cal, const
static void free_refresh_data (ECalBackendFile *cbfile);
static icaltimezone *
-e_cal_backend_file_internal_get_timezone (ECalBackend *backend, const char *tzid);
+e_cal_backend_file_internal_get_timezone (ECalBackend *backend, const gchar *tzid);
static icaltimezone *
e_cal_backend_file_internal_get_default_timezone (ECalBackend *backend);
@@ -519,7 +519,6 @@ get_rid_icaltime (ECalComponent *comp)
return tt;
}
-
/* Adds component to the interval tree
*/
static gboolean
@@ -545,11 +544,11 @@ add_component_to_intervaltree (ECalBackendFile *cbfile, ECalComponent *comp)
return FALSE;
}
-static gboolean
+static gboolean
remove_component_from_intervaltree (ECalBackendFile *cbfile, ECalComponent *comp)
{
time_t time_start = -1, time_end = -1;
- const char *uid = NULL;
+ const gchar *uid = NULL;
gchar *rid;
ECalBackendFilePrivate *priv;
@@ -562,7 +561,6 @@ remove_component_from_intervaltree (ECalBackendFile *cbfile, ECalComponent *comp
resolve_tzid, priv->icalcomp, priv->default_zone,
e_cal_backend_get_kind (E_CAL_BACKEND (cbfile)));
-
if (time_end != -1 && time_start > time_end) {
g_error ("Bogus component %s\n", e_cal_component_get_as_string (comp));
return FALSE;
@@ -1770,7 +1768,6 @@ match_object_sexp (gpointer key, gpointer value, gpointer data)
match_data);
}
-
/* Get_objects_in_range handler for the file backend */
static void
e_cal_backend_file_get_object_list (ECalBackendSync *backend, EDataCal *cal, const gchar *sexp, GList **objects, GError **perror)
@@ -1811,13 +1808,13 @@ e_cal_backend_file_get_object_list (ECalBackendSync *backend, EDataCal *cal, con
if (!prunning_by_time) {
g_hash_table_foreach (priv->comp_uid_hash, (GHFunc) match_object_sexp,
- &match_data);
+ &match_data);
} else {
objs_occuring_in_tw = e_intervaltree_search (priv->interval_tree,
occur_start, occur_end);
g_list_foreach(objs_occuring_in_tw, (GFunc) match_object_sexp_to_component,
- &match_data);
+ &match_data);
}
g_static_rec_mutex_unlock (&priv->idle_save_rmutex);
@@ -1883,7 +1880,7 @@ e_cal_backend_file_start_query (ECalBackend *backend, EDataCalView *query)
if (!prunning_by_time) {
/* full scan */
g_hash_table_foreach (priv->comp_uid_hash, (GHFunc) match_object_sexp,
- &match_data);
+ &match_data);
e_debug_log(FALSE, E_DEBUG_LOG_DOMAIN_CAL_QUERIES, "---;%p;QUERY-ITEMS;%s;%s;%d", query,
e_data_cal_view_get_text (query), G_OBJECT_TYPE_NAME (backend),
@@ -1894,7 +1891,7 @@ e_cal_backend_file_start_query (ECalBackend *backend, EDataCalView *query)
objs_occuring_in_tw = e_intervaltree_search (priv->interval_tree, occur_start, occur_end);
g_list_foreach(objs_occuring_in_tw, (GFunc) match_object_sexp_to_component,
- &match_data);
+ &match_data);
e_debug_log(FALSE, E_DEBUG_LOG_DOMAIN_CAL_QUERIES, "---;%p;QUERY-ITEMS;%s;%s;%d", query,
e_data_cal_view_get_text (query), G_OBJECT_TYPE_NAME (backend),
@@ -3417,7 +3414,7 @@ e_cal_backend_file_reload (ECalBackendFile *cbfile, GError **perror)
#include <glib.h>
static void
-test_query_by_scanning_all_objects (ECalBackendFile* cbfile, const char *sexp, GList **objects)
+test_query_by_scanning_all_objects (ECalBackendFile* cbfile, const gchar *sexp, GList **objects)
{
MatchObjectData match_data;
ECalBackendFilePrivate *priv;
@@ -3446,7 +3443,7 @@ test_query_by_scanning_all_objects (ECalBackendFile* cbfile, const char *sexp, G
}
g_hash_table_foreach (priv->comp_uid_hash, (GHFunc) match_object_sexp,
- &match_data);
+ &match_data);
g_static_rec_mutex_unlock (&priv->idle_save_rmutex);
@@ -3462,9 +3459,9 @@ write_list (GList* list)
for (l = list; l; l = l->next)
{
- const char *str = l->data;
+ const gchar *str = l->data;
ECalComponent *comp = e_cal_component_new_from_string (str);
- const char *uid;
+ const gchar *uid;
e_cal_component_get_uid (comp, &uid);
g_print ("%s\n", uid);
}
@@ -3475,17 +3472,17 @@ get_difference_of_lists (ECalBackendFile* cbfile, GList* smaller, GList* bigger)
{
GList *l, *lsmaller;
- for (l = bigger ; l; l = l->next) {
- char *str = l->data;
- const char *uid;
+ for (l = bigger; l; l = l->next) {
+ gchar *str = l->data;
+ const gchar *uid;
ECalComponent *comp = e_cal_component_new_from_string (str);
gboolean found = FALSE;
e_cal_component_get_uid (comp, &uid);
for (lsmaller = smaller; lsmaller && !found; lsmaller = lsmaller->next)
{
- char *strsmaller = lsmaller->data;
- const char *uidsmaller;
+ gchar *strsmaller = lsmaller->data;
+ const gchar *uidsmaller;
ECalComponent *compsmaller = e_cal_component_new_from_string (strsmaller);
e_cal_component_get_uid (compsmaller, &uidsmaller);
@@ -3513,7 +3510,7 @@ get_difference_of_lists (ECalBackendFile* cbfile, GList* smaller, GList* bigger)
}
static void
-test_query (ECalBackendFile* cbfile, const char* query)
+test_query (ECalBackendFile* cbfile, const gchar * query)
{
GList *objects = NULL, *all_objects = NULL;
@@ -3543,7 +3540,6 @@ test_query (ECalBackendFile* cbfile, const char* query)
exit (-1);
}
-
g_list_foreach(objects, (GFunc) g_free, NULL);
g_list_free (objects);
g_list_foreach(all_objects, (GFunc) g_free, NULL);
@@ -3551,7 +3547,7 @@ test_query (ECalBackendFile* cbfile, const char* query)
}
static void
-execute_query (ECalBackendFile* cbfile, const char* query)
+execute_query (ECalBackendFile* cbfile, const gchar * query)
{
GList *objects = NULL;
@@ -3559,7 +3555,7 @@ execute_query (ECalBackendFile* cbfile, const char* query)
d (g_print ("Query %s\n", query));
e_cal_backend_file_get_object_list (E_CAL_BACKEND_SYNC (cbfile), NULL, query, &objects, NULL);
- if(objects == NULL)
+ if (objects == NULL)
{
g_message (G_STRLOC " failed to get objects\n");
exit(0);
@@ -3573,7 +3569,7 @@ static gchar *fname = NULL;
static gboolean only_execute = FALSE;
static gchar *calendar_fname = NULL;
-static GOptionEntry entries[] =
+static GOptionEntry entries[] =
{
{ "test-file", 't', 0, G_OPTION_ARG_STRING, &fname, "File with prepared queries", NULL },
{ "only-execute", 'e', 0, G_OPTION_ARG_NONE, &only_execute, "Only execute, do not test query", NULL },
@@ -3584,11 +3580,11 @@ static GOptionEntry entries[] =
/* Always add at least this many bytes when extending the buffer. */
#define MIN_CHUNK 64
-static int
-private_getline (char **lineptr, size_t *n, FILE *stream)
+static gint
+private_getline (gchar **lineptr, gsize *n, FILE *stream)
{
- int nchars_avail;
- char *read_pos;
+ gint nchars_avail;
+ gchar *read_pos;
if (!lineptr || !n || !stream)
return -1;
@@ -3600,11 +3596,11 @@ private_getline (char **lineptr, size_t *n, FILE *stream)
return -1;
}
- nchars_avail = (int) *n;
+ nchars_avail = (gint) *n;
read_pos = *lineptr;
for (;;) {
- int c = getc (stream);
+ gint c = getc (stream);
if (nchars_avail < 2) {
if (*n > MIN_CHUNK)
@@ -3612,7 +3608,7 @@ private_getline (char **lineptr, size_t *n, FILE *stream)
else
*n += MIN_CHUNK;
- nchars_avail = (int)(*n + *lineptr - read_pos);
+ nchars_avail = (gint)(*n + *lineptr - read_pos);
*lineptr = (char *)realloc (*lineptr, *n);
if (!*lineptr)
return -1;
@@ -3636,17 +3632,17 @@ private_getline (char **lineptr, size_t *n, FILE *stream)
*read_pos = '\0';
- return (int)(read_pos - (*lineptr));
+ return (gint)(read_pos - (*lineptr));
}
-int
-main(int argc, char **argv)
+gint
+main(gint argc, gchar **argv)
{
- char * line = NULL;
- size_t len = 0;
- ssize_t read;
+ gchar * line = NULL;
+ gsize len = 0;
+ gssize read;
ECalBackendFile* cbfile;
- int num = 0;
+ gint num = 0;
GError *error = NULL;
GOptionContext *context;
FILE* fin = NULL;
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c b/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
index ae314d7..9a24381 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
@@ -1126,7 +1126,7 @@ e_gw_item_to_cal_component (EGwItem *item, ECalBackendGroupwise *cbgw)
t = e_gw_connection_get_date_from_string (reply_within);
temp = ctime (&t);
- temp [strlen (temp)-1] = '\0';
+ temp[strlen (temp)-1] = '\0';
value = g_strconcat (N_("Reply Requested: by "), temp, "\n\n", mess ? mess : "", NULL);
e_gw_item_set_message (item, (const gchar *) value);
g_free (value);
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise.c b/calendar/backends/groupwise/e-cal-backend-groupwise.c
index a4fcaa5..b4b2978 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise.c
@@ -196,14 +196,14 @@ get_element_type (icalcomponent_kind kind)
/* TODO Do not replicate this in every backend */
static icaltimezone *
-resolve_tzid (const char *tzid, gpointer user_data)
+resolve_tzid (const gchar *tzid, gpointer user_data)
{
icaltimezone *zone;
-
+
zone = (!strcmp (tzid, "UTC"))
? icaltimezone_get_utc_timezone ()
: icaltimezone_get_builtin_timezone_from_tzid (tzid);
-
+
if (!zone)
zone = e_cal_backend_internal_get_timezone (E_CAL_BACKEND (user_data), tzid);
@@ -405,7 +405,7 @@ get_deltas (gpointer handle)
GList *item_list = NULL, *total_list = NULL, *l;
GSList *cache_ids = NULL, *ls;
GPtrArray *uid_array = NULL;
- gchar t_str [26];
+ gchar t_str[26];
const gchar *local_utc_time = NULL, *time_string = NULL, *serv_time, *position;
gchar *attempts;
icaltimetype current;
@@ -550,7 +550,7 @@ get_deltas (gpointer handle)
dur = icaltime_subtract (current, old_local);
server_utc = icaltime_from_string (time_string);
icaltime_adjust (&server_utc, dur.days, dur.hours, dur.minutes, dur.seconds);
-
+
current_time = icaltime_as_timet_with_zone (server_utc, icaltimezone_get_utc_timezone ());
gmtime_r (¤t_time, &tm);
@@ -561,7 +561,7 @@ get_deltas (gpointer handle)
}
priv->first_delta_fetch = FALSE;
-
+
current_time = icaltime_as_timet_with_zone (current, icaltimezone_get_utc_timezone ());
gmtime_r (¤t_time, &tm);
strftime (t_str, 26, "%Y-%m-%dT%H:%M:%SZ", &tm);
@@ -1652,7 +1652,7 @@ e_cal_backend_groupwise_get_object_list (ECalBackendSync *backend, EDataCal *cal
}
*objects = NULL;
-
+
prunning_by_time = e_cal_backend_sexp_evaluate_occur_times(cbsexp,
&occur_start,
&occur_end);
diff --git a/calendar/backends/http/e-cal-backend-http.c b/calendar/backends/http/e-cal-backend-http.c
index d485bc6..36e9465 100644
--- a/calendar/backends/http/e-cal-backend-http.c
+++ b/calendar/backends/http/e-cal-backend-http.c
@@ -276,14 +276,14 @@ empty_cache (ECalBackendHttp *cbhttp)
/* TODO Do not replicate this in every backend */
static icaltimezone *
-resolve_tzid (const char *tzid, gpointer user_data)
+resolve_tzid (const gchar *tzid, gpointer user_data)
{
icaltimezone *zone;
-
+
zone = (!strcmp (tzid, "UTC"))
? icaltimezone_get_utc_timezone ()
: icaltimezone_get_builtin_timezone_from_tzid (tzid);
-
+
if (!zone)
zone = e_cal_backend_internal_get_timezone (E_CAL_BACKEND (user_data), tzid);
@@ -306,7 +306,6 @@ put_component_to_store (ECalBackendHttp *cb,
e_cal_backend_store_put_component_with_time_range (priv->store, comp, time_start, time_end);
}
-
static void
retrieval_done (SoupSession *session, SoupMessage *msg, ECalBackendHttp *cbhttp)
{
@@ -983,7 +982,7 @@ e_cal_backend_http_start_query (ECalBackend *backend, EDataCalView *query)
GList *objects = NULL;
ECalBackendSExp *cbsexp;
time_t occur_start = -1, occur_end = -1;
- gboolean prunning_by_time;
+ gboolean prunning_by_time;
cbhttp = E_CAL_BACKEND_HTTP (backend);
priv = cbhttp->priv;
diff --git a/calendar/backends/weather/e-cal-backend-weather.c b/calendar/backends/weather/e-cal-backend-weather.c
index 98d86f2..fd3891f 100644
--- a/calendar/backends/weather/e-cal-backend-weather.c
+++ b/calendar/backends/weather/e-cal-backend-weather.c
@@ -141,14 +141,14 @@ maybe_start_reload_timeout (ECalBackendWeather *cbw)
/* TODO Do not replicate this in every backend */
static icaltimezone *
-resolve_tzid (const char *tzid, gpointer user_data)
+resolve_tzid (const gchar *tzid, gpointer user_data)
{
icaltimezone *zone;
-
+
zone = (!strcmp (tzid, "UTC"))
? icaltimezone_get_utc_timezone ()
: icaltimezone_get_builtin_timezone_from_tzid (tzid);
-
+
if (!zone)
zone = e_cal_backend_internal_get_timezone (E_CAL_BACKEND (user_data), tzid);
@@ -301,10 +301,10 @@ getCategory (WeatherInfo *report)
if (!icon_name)
return NULL;
- for (i = 0; categories [i].description; i++) {
- if (!g_ascii_strncasecmp (categories [i].icon_name,
+ for (i = 0; categories[i].description; i++) {
+ if (!g_ascii_strncasecmp (categories[i].icon_name,
icon_name, strlen(icon_name)))
- return _(categories [i].description);
+ return _(categories[i].description);
}
return NULL;
@@ -789,7 +789,7 @@ static void e_cal_backend_weather_start_query (ECalBackend *backend, EDataCalVie
: e_cal_backend_store_get_components (priv->store);
for (l = components; l != NULL; l = g_slist_next (l)) {
- if (e_cal_backend_sexp_match_comp (sexp, E_CAL_COMPONENT (l->data), backend))
+ if (e_cal_backend_sexp_match_comp (sexp, E_CAL_COMPONENT (l->data), backend))
objects = g_list_append (objects, e_cal_component_get_as_string (l->data));
}
diff --git a/calendar/backends/weather/e-weather-source-ccf.c b/calendar/backends/weather/e-weather-source-ccf.c
index a9b6ba1..896c71b 100644
--- a/calendar/backends/weather/e-weather-source-ccf.c
+++ b/calendar/backends/weather/e-weather-source-ccf.c
@@ -93,15 +93,15 @@ find_location (const gchar *code_name, gboolean is_old)
ids = g_strsplit (code_name, "/", 2);
- if (!ids || !ids [0] || !ids [1])
+ if (!ids || !ids[0] || !ids[1])
goto done;
model = gweather_xml_load_locations ();
if (!model)
goto done;
- search.code = ids [0];
- search.name = ids [1];
+ search.code = ids[0];
+ search.name = ids[1];
search.is_old = is_old;
search.location = NULL;
diff --git a/calendar/libecal/e-cal-component.c b/calendar/libecal/e-cal-component.c
index d11b9a2..9346992 100644
--- a/calendar/libecal/e-cal-component.c
+++ b/calendar/libecal/e-cal-component.c
@@ -392,10 +392,10 @@ e_cal_component_gen_uid (void)
if (!hostname) {
#ifndef G_OS_WIN32
- static gchar buffer [512];
+ static gchar buffer[512];
if ((gethostname (buffer, sizeof (buffer) - 1) == 0) &&
- (buffer [0] != 0))
+ (buffer[0] != 0))
hostname = buffer;
else
hostname = "localhost";
diff --git a/calendar/libecal/e-cal-recur.c b/calendar/libecal/e-cal-recur.c
index 6cad7e4..1d9fdb5 100644
--- a/calendar/libecal/e-cal-recur.c
+++ b/calendar/libecal/e-cal-recur.c
@@ -148,7 +148,7 @@ typedef struct {
/* For BYDAY modifier. A list of GINT_TO_POINTERs, in pairs.
The first of each pair is the weekday, 0 = Monday to 6 = Sunday.
- The second of each pair is the week number [+-]0-53. */
+ The second of each pair is the week number[+-]0-53. */
GList *byday;
/* For BYHOUR modifier. A list of GINT_TO_POINTERs, 0-23. */
diff --git a/calendar/libecal/e-cal-recur.h b/calendar/libecal/e-cal-recur.h
index 1665140..665f958 100644
--- a/calendar/libecal/e-cal-recur.h
+++ b/calendar/libecal/e-cal-recur.h
@@ -56,7 +56,7 @@ e_cal_recur_ensure_end_dates (ECalComponent *comp,
gboolean refresh,
ECalRecurResolveTimezoneFn tz_cb,
gpointer tz_cb_data);
-
+
/* Localized nth-day-of-month strings. (Use with _() ) */
#ifdef G_OS_WIN32
extern const gchar **e_cal_get_recur_nth (void);
diff --git a/calendar/libecal/e-cal-util.c b/calendar/libecal/e-cal-util.c
index f67e1fc..0e96504 100644
--- a/calendar/libecal/e-cal-util.c
+++ b/calendar/libecal/e-cal-util.c
@@ -425,7 +425,6 @@ add_alarm_occurrences_cb (ECalComponent *comp, time_t start, time_t end, gpointe
return TRUE;
}
-
/* Generates the absolute triggers for a component */
static void
generate_absolute_triggers (ECalComponent *comp, struct alarm_occurrence_data *aod,
@@ -1188,7 +1187,6 @@ componenttime_to_utc_timet (const ECalComponentDateTime* dt_time,
timet = icaltime_as_timet_with_zone (*dt_time->value, zone ? zone : default_zone);
}
-
return timet;
}
@@ -1218,7 +1216,7 @@ e_cal_util_get_component_occur_times (ECalComponent *comp,
g_return_if_fail (end != NULL);
e_cal_recur_ensure_end_dates (comp, FALSE, tz_cb, tz_cb_data);
-
+
/* Get dtstart of the component and convert it to UTC */
e_cal_component_get_dtstart (comp, &dt_start);
@@ -1245,7 +1243,7 @@ e_cal_util_get_component_occur_times (ECalComponent *comp,
}
e_cal_component_get_due (comp, &dt_due);
- if(dt_due.value != NULL)
+ if (dt_due.value != NULL)
due_time = componenttime_to_utc_timet (&dt_due, tz_cb, tz_cb_data,
default_timezone);
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index c2d8f15..efdc7c4 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -116,7 +116,7 @@ struct _ECalPrivate {
icaltimezone *default_zone;
gchar *local_attachment_store;
-
+
/* For locking the operation while localling cache values like
static capabilities, cal address etc. */
GStaticRecMutex cache_lock;
@@ -314,7 +314,7 @@ e_cal_source_type_enum_get_type (void)
if (g_once_init_enter (&enum_type__volatile)) {
GType enum_type;
- static GEnumValue values [] = {
+ static GEnumValue values[] = {
{ E_CAL_SOURCE_TYPE_EVENT, "Event", NULL},
{ E_CAL_SOURCE_TYPE_TODO, "ToDo", NULL},
{ E_CAL_SOURCE_TYPE_JOURNAL, "Journal", NULL},
@@ -343,7 +343,7 @@ e_cal_set_mode_status_enum_get_type (void)
if (g_once_init_enter (&enum_type__volatile)) {
GType enum_type;
- static GEnumValue values [] = {
+ static GEnumValue values[] = {
{ E_CAL_SET_MODE_SUCCESS, "ECalSetModeSuccess", "success" },
{ E_CAL_SET_MODE_ERROR, "ECalSetModeError", "error" },
{ E_CAL_SET_MODE_NOT_SUPPORTED, "ECalSetModeNotSupported", "unsupported" },
@@ -371,7 +371,7 @@ cal_mode_enum_get_type (void)
if (g_once_init_enter (&enum_type__volatile)) {
GType enum_type;
- static GEnumValue values [] = {
+ static GEnumValue values[] = {
{ CAL_MODE_INVALID, "CalModeInvalid", "invalid" },
{ CAL_MODE_LOCAL, "CalModeLocal", "local" },
{ CAL_MODE_REMOTE, "CalModeRemote", "remote" },
@@ -459,7 +459,7 @@ gdbus_cal_closed_cb (GDBusConnection *connection, gboolean remote_peer_vanished,
UNLOCK_FACTORY ();
- g_signal_emit (G_OBJECT (ecal), e_cal_signals [BACKEND_DIED], 0);
+ g_signal_emit (G_OBJECT (ecal), e_cal_signals[BACKEND_DIED], 0);
}
static void
@@ -1810,13 +1810,12 @@ load_static_capabilities (ECal *ecal, GError **error)
priv = ecal->priv;
e_return_error_if_fail (priv->gdbus_cal, E_CALENDAR_STATUS_REPOSITORY_OFFLINE);
-
if (priv->load_state != E_CAL_LOAD_LOADED) {
E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_URI_NOT_LOADED, error);
}
LOCK_CACHE();
-
+
if (priv->capabilities) {
UNLOCK_CACHE();
E_CALENDAR_CHECK_STATUS (E_CALENDAR_STATUS_OK, error);
diff --git a/calendar/libedata-cal/e-cal-backend-file-store.c b/calendar/libedata-cal/e-cal-backend-file-store.c
index 20df8d8..fd07797 100644
--- a/calendar/libedata-cal/e-cal-backend-file-store.c
+++ b/calendar/libedata-cal/e-cal-backend-file-store.c
@@ -118,7 +118,7 @@ put_component (ECalBackendFileStore *fstore, ECalComponent *comp)
g_warning ("The component does not have a valid uid \n");
return FALSE;
}
-
+
g_static_rw_lock_writer_lock (&priv->lock);
obj = g_hash_table_lookup (priv->comp_uid_hash, uid);
if (obj == NULL) {
@@ -154,7 +154,7 @@ remove_component (ECalBackendFileStore *fstore, const gchar *uid, const gchar *r
priv = E_CAL_BACKEND_FILE_STORE_GET_PRIVATE (fstore);
g_static_rw_lock_writer_lock (&priv->lock);
-
+
obj = g_hash_table_lookup (priv->comp_uid_hash, uid);
if (obj == NULL) {
ret_val = FALSE;
@@ -171,12 +171,12 @@ remove_component (ECalBackendFileStore *fstore, const gchar *uid, const gchar *r
if (remove_completely)
g_hash_table_remove (priv->comp_uid_hash, uid);
-
+
end:
g_static_rw_lock_writer_unlock (&priv->lock);
-
+
return ret_val;
-
+
}
static ECalComponent *
@@ -613,14 +613,14 @@ add_timezone (ECalBackendFileStore *fstore, icalcomponent *vtzcomp)
}
static icaltimezone *
-resolve_tzid (const char *tzid, gpointer user_data)
+resolve_tzid (const gchar *tzid, gpointer user_data)
{
icaltimezone *zone;
-
+
zone = (!strcmp (tzid, "UTC"))
? icaltimezone_get_utc_timezone ()
: icaltimezone_get_builtin_timezone_from_tzid (tzid);
-
+
if (!zone)
zone = (icaltimezone *) e_cal_backend_store_get_timezone (E_CAL_BACKEND_STORE (user_data), tzid);
@@ -641,7 +641,6 @@ get_zone (icalcomponent *icalcomp)
return zone;
} */
-
static void
scan_vcalendar (ECalBackendStore *store, icalcomponent *top_icalcomp)
{
@@ -680,7 +679,7 @@ scan_vcalendar (ECalBackendStore *store, icalcomponent *top_icalcomp)
g_object_unref (comp);
continue;
}
-
+
dzone = e_cal_backend_store_get_default_timezone (store);
e_cal_util_get_component_occur_times (comp, &time_start, &time_end,
resolve_tzid, store, dzone, kind);
diff --git a/calendar/libedata-cal/e-cal-backend-intervaltree.c b/calendar/libedata-cal/e-cal-backend-intervaltree.c
index 56d2b83..c1485f7 100644
--- a/calendar/libedata-cal/e-cal-backend-intervaltree.c
+++ b/calendar/libedata-cal/e-cal-backend-intervaltree.c
@@ -45,7 +45,7 @@ G_DEFINE_TYPE (EIntervalTree, e_intervaltree, G_TYPE_OBJECT)
typedef struct _EIntervalNode EIntervalNode;
-static EIntervalNode*
+static EIntervalNode*
intervaltree_node_next (EIntervalTree *tree, EIntervalNode *x);
struct _EIntervalNode
@@ -70,13 +70,12 @@ struct _EIntervalNode
EIntervalNode* parent;
};
-
struct _EIntervalTreePrivate
{
EIntervalNode *root;
EIntervalNode *nil;
GHashTable *id_node_hash;
- GStaticRecMutex mutex;
+ GStaticRecMutex mutex;
};
static inline gint
@@ -120,7 +119,7 @@ compare_intervals (time_t x_start, time_t x_end, time_t y_start, time_t y_end)
return -1;
/* x is right of y */
- if (y_end < x_start)
+ if (y_end < x_start)
return 1;
/* x and y overlap */
@@ -135,7 +134,7 @@ compare_intervals (time_t x_start, time_t x_end, time_t y_start, time_t y_end)
* Carry out left rotation on the node @x in tree @tree.
* Caller should hold the lock
**/
-static void
+static void
left_rotate (EIntervalTree *tree, EIntervalNode *x)
{
EIntervalTreePrivate *priv = tree->priv;
@@ -151,7 +150,7 @@ left_rotate (EIntervalTree *tree, EIntervalNode *x)
if (y->left != nil)
y->left->parent = x;
- y->parent = x->parent;
+ y->parent = x->parent;
/* instead of checking if x->parent is the root as in the book, we */
/* count on the root sentinel to implicitly take care of this case */
@@ -240,7 +239,7 @@ binary_tree_insert (EIntervalTree *tree, EIntervalNode *z)
y = priv->root;
x = priv->root->left;
- while( x != nil)
+ while ( x != nil)
{
y = x;
@@ -278,14 +277,14 @@ e_intervaltree_insert (EIntervalTree *tree, time_t start, time_t end, ECalCompon
EIntervalNode *x;
EIntervalNode *newNode;
const gchar *uid;
- gchar *rid;
+ gchar *rid;
g_return_val_if_fail (tree != NULL, FALSE);
g_return_val_if_fail (comp != NULL, FALSE);
g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE);
g_static_rec_mutex_lock (&priv->mutex);
-
- x = g_new (EIntervalNode, 1);
+
+ x = g_new (EIntervalNode, 1);
x->min = x->start = start;
x->max = x->end = end;
x->comp = g_object_ref (comp);
@@ -319,9 +318,9 @@ e_intervaltree_insert (EIntervalTree *tree, time_t start, time_t end, ECalCompon
x->parent->red = FALSE;
x->parent->parent->red = TRUE;
right_rotate (tree, x->parent->parent);
- }
+ }
}
- else
+ else
{ /* case for x->parent == x->parent->parent->right */
y = x->parent->parent->left;
@@ -343,7 +342,7 @@ e_intervaltree_insert (EIntervalTree *tree, time_t start, time_t end, ECalCompon
x->parent->red = FALSE;
x->parent->parent->red = TRUE;
left_rotate (tree, x->parent->parent);
- }
+ }
}
}
@@ -358,10 +357,10 @@ e_intervaltree_insert (EIntervalTree *tree, time_t start, time_t end, ECalCompon
return TRUE;
}
-static EIntervalNode*
+static EIntervalNode*
intervaltree_node_next (EIntervalTree *tree, EIntervalNode *x)
{
- EIntervalTreePrivate *priv = tree->priv;
+ EIntervalTreePrivate *priv = tree->priv;
EIntervalNode *y;
EIntervalNode *nil = priv->nil;
EIntervalNode *root = priv->root;
@@ -371,7 +370,7 @@ intervaltree_node_next (EIntervalTree *tree, EIntervalNode *x)
g_return_val_if_fail (x != priv->nil, NULL);
if (nil != (y = x->right))
- {
+ {
/* find out minimum of right subtree of x (assignment to y is ok) */
while (y->left != nil)
y = y->left;
@@ -403,7 +402,7 @@ void
e_intervaltree_destroy (EIntervalTree *tree)
{
EIntervalTreePrivate *priv = tree->priv;
- EIntervalNode *node;
+ EIntervalNode *node;
GList *stack_start = NULL, *pos;
g_return_if_fail (tree != NULL);
@@ -452,13 +451,13 @@ e_intervaltree_fixup_deletion (EIntervalTree *tree, EIntervalNode *x)
w = x->parent->right;
}
- if ( (!w->right->red) && (!w->left->red) )
- {
+ if ((!w->right->red) && (!w->left->red))
+ {
w->red = TRUE;
x = x->parent;
}
else
- {
+ {
if (!w->right->red)
{
w->left->red = FALSE;
@@ -484,8 +483,8 @@ e_intervaltree_fixup_deletion (EIntervalTree *tree, EIntervalNode *x)
w = x->parent->left;
}
- if ( (!w->right->red) && (!w->left->red) )
- {
+ if ((!w->right->red) && (!w->left->red))
+ {
w->red = TRUE;
x = x->parent;
}
@@ -524,15 +523,15 @@ e_intervaltree_fixup_deletion (EIntervalTree *tree, EIntervalNode *x)
GList*
e_intervaltree_search (EIntervalTree *tree, time_t start, time_t end)
{
- EIntervalTreePrivate *priv = tree->priv;
- EIntervalNode *node;
+ EIntervalTreePrivate *priv = tree->priv;
+ EIntervalNode *node;
GList *list = NULL;
GList *stack_start = NULL, *pos;
g_return_val_if_fail (tree != NULL, NULL);
g_static_rec_mutex_lock (&priv->mutex);
-
+
stack_start = pos = g_list_insert (stack_start, priv->root->left, -1);
while (pos != NULL)
@@ -569,7 +568,7 @@ static void
e_intervaltree_node_dump (EIntervalTree *tree, EIntervalNode *node, gint indent)
{
/*
- char start_time[32] = {0}, end_time[32] = {0};
+ gchar start_time[32] = {0}, end_time[32] = {0};
struct tm tm_start_time, tm_end_time;
localtime_r (&node->start, &tm_start_time);
@@ -592,7 +591,6 @@ e_intervaltree_node_dump (EIntervalTree *tree, EIntervalNode *node, gint indent)
e_intervaltree_node_dump (tree, node->right, indent + 2);
}
-
void
e_intervaltree_dump (EIntervalTree *tree)
{
@@ -602,7 +600,6 @@ e_intervaltree_dump (EIntervalTree *tree)
}
#endif
-
/**
* Caller should hold the lock.
**/
@@ -645,8 +642,8 @@ e_intervaltree_remove (EIntervalTree *tree,
EIntervalNode *root = priv->root;
g_return_val_if_fail (tree != NULL, FALSE);
-
- g_static_rec_mutex_lock (&priv->mutex);
+
+ g_static_rec_mutex_lock (&priv->mutex);
z = e_intervaltree_search_component (tree, uid, rid);
@@ -686,7 +683,7 @@ e_intervaltree_remove (EIntervalTree *tree,
z->left->parent = z->right->parent = y;
if (z == z->parent->left)
- z->parent->left = y;
+ z->parent->left = y;
else
z->parent->right = y;
@@ -698,10 +695,10 @@ e_intervaltree_remove (EIntervalTree *tree,
e_intervaltree_fixup_deletion (tree, x);
}
else
- y->red = z->red;
+ y->red = z->red;
}
else
- {
+ {
/* z is the node to be spliced out */
fixup_min_max_fields (tree, x->parent);
@@ -723,17 +720,17 @@ static void
e_intervaltree_finalize (GObject *object)
{
EIntervalTreePrivate *priv = E_INTERVALTREE_GET_PRIVATE (object);
-
+
if (priv->root) {
g_free (priv->root);
priv->root = NULL;
}
-
+
if (priv->nil) {
g_free (priv->nil);
priv->nil = NULL;
}
-
+
if (priv->id_node_hash) {
g_hash_table_destroy (priv->id_node_hash);
priv->id_node_hash = NULL;
@@ -741,7 +738,7 @@ e_intervaltree_finalize (GObject *object)
g_static_rec_mutex_free (&priv->mutex);
- G_OBJECT_CLASS (e_intervaltree_parent_class)->finalize (object);
+ G_OBJECT_CLASS (e_intervaltree_parent_class)->finalize (object);
}
static void
@@ -752,7 +749,6 @@ e_intervaltree_class_init (EIntervalTreeClass *klass)
object_class->finalize = e_intervaltree_finalize;
}
-
static void
e_intervaltree_init (EIntervalTree *tree)
{
@@ -792,6 +788,6 @@ EIntervalTree*
e_intervaltree_new (void)
{
EIntervalTree *tree;
- tree = g_object_new (E_TYPE_INTERVALTREE, NULL);
+ tree = g_object_new (E_TYPE_INTERVALTREE, NULL);
return tree;
}
diff --git a/calendar/libedata-cal/e-cal-backend-intervaltree.h b/calendar/libedata-cal/e-cal-backend-intervaltree.h
index 78ce86f..2d6da9f 100644
--- a/calendar/libedata-cal/e-cal-backend-intervaltree.h
+++ b/calendar/libedata-cal/e-cal-backend-intervaltree.h
@@ -58,7 +58,7 @@ typedef struct _EIntervalTreePrivate EIntervalTreePrivate;
struct _EIntervalTree
{
GObject parent;
- EIntervalTreePrivate *priv;
+ EIntervalTreePrivate *priv;
};
struct _EIntervalTreeClass
diff --git a/calendar/libedata-cal/e-cal-backend-sexp.c b/calendar/libedata-cal/e-cal-backend-sexp.c
index d107a84..da2dc12 100644
--- a/calendar/libedata-cal/e-cal-backend-sexp.c
+++ b/calendar/libedata-cal/e-cal-backend-sexp.c
@@ -1468,7 +1468,7 @@ e_cal_backend_sexp_init (ECalBackendSExp *sexp)
}
#ifdef TESTER
static void
-test_query (const char* query)
+test_query (const gchar * query)
{
ECalBackendSExp *sexp = e_cal_backend_sexp_new (query);
time_t start, end;
@@ -1482,7 +1482,7 @@ test_query (const char* query)
}
}
-int main(int argc, char **argv)
+gint main(gint argc, gchar **argv)
{
g_type_init();
diff --git a/calendar/libedata-cal/e-cal-backend-store.c b/calendar/libedata-cal/e-cal-backend-store.c
index 0ef6aa5..4818396 100644
--- a/calendar/libedata-cal/e-cal-backend-store.c
+++ b/calendar/libedata-cal/e-cal-backend-store.c
@@ -204,7 +204,7 @@ e_cal_backend_store_clean (ECalBackendStore *store)
if (priv->intervaltree) {
e_intervaltree_destroy (priv->intervaltree);
priv->intervaltree = e_intervaltree_new ();
- }
+ }
return (E_CAL_BACKEND_STORE_GET_CLASS (store))->clean (store);
}
@@ -287,7 +287,7 @@ e_cal_backend_store_remove_component (ECalBackendStore *store, const gchar *uid,
ECalBackendStorePrivate *priv;
g_return_val_if_fail (E_IS_CAL_BACKEND_STORE (store), FALSE);
g_return_val_if_fail (uid != NULL, FALSE);
-
+
priv = E_CAL_BACKEND_STORE_GET_PRIVATE (store);
if ((E_CAL_BACKEND_STORE_GET_CLASS (store))->remove_component (store, uid, rid)) {
@@ -416,13 +416,13 @@ e_cal_backend_store_get_components_occuring_in_range (ECalBackendStore *store, t
g_return_val_if_fail (store != NULL, NULL);
g_return_val_if_fail (E_IS_CAL_BACKEND_STORE (store), NULL);
-
+
priv = E_CAL_BACKEND_STORE_GET_PRIVATE (store);
if (!(l = e_intervaltree_search (priv->intervaltree, start, end)))
return NULL;
- for ( ; l != NULL; l = g_list_next (l)) {
+ for (; l != NULL; l = g_list_next (l)) {
ECalComponent *comp = l->data;
icalcomp = e_cal_component_get_icalcomponent (comp);
if (icalcomp) {
@@ -438,7 +438,6 @@ e_cal_backend_store_get_components_occuring_in_range (ECalBackendStore *store, t
return list;
}
-
/**
* e_cal_backend_store_get_component_ids:
*
diff --git a/calendar/libedata-cal/e-cal-backend-store.h b/calendar/libedata-cal/e-cal-backend-store.h
index c823e9d..56a2883 100644
--- a/calendar/libedata-cal/e-cal-backend-store.h
+++ b/calendar/libedata-cal/e-cal-backend-store.h
@@ -149,9 +149,9 @@ GSList * e_cal_backend_store_get_components_by_uid
const gchar *uid);
GSList * e_cal_backend_store_get_components
(ECalBackendStore *store);
-GSList * e_cal_backend_store_get_components_occuring_in_range
- (ECalBackendStore *store,
- time_t start,
+GSList * e_cal_backend_store_get_components_occuring_in_range
+ (ECalBackendStore *store,
+ time_t start,
time_t end);
GSList * e_cal_backend_store_get_component_ids
(ECalBackendStore *store);
@@ -166,7 +166,7 @@ void e_cal_backend_store_thaw_changes(ECalBackendStore *store);
void e_cal_backend_store_freeze_changes
(ECalBackendStore *store);
void e_cal_backend_store_interval_tree_add_comp
- (ECalBackendStore *store,
+ (ECalBackendStore *store,
ECalComponent *comp,
time_t start,
time_t end);
diff --git a/calendar/libedata-cal/e-cal-backend-sync.c b/calendar/libedata-cal/e-cal-backend-sync.c
index a3b81fc..8264719 100644
--- a/calendar/libedata-cal/e-cal-backend-sync.c
+++ b/calendar/libedata-cal/e-cal-backend-sync.c
@@ -788,8 +788,8 @@ _e_cal_backend_get_timezone (ECalBackend *backend, EDataCal *cal, EServerMethodC
/* fallback if tzid contains only the location of timezone */
gint i, slashes = 0;
- for (i = 0; tzid [i]; i++) {
- if (tzid [i] == '/')
+ for (i = 0; tzid[i]; i++) {
+ if (tzid[i] == '/')
slashes++;
}
diff --git a/calendar/libedata-cal/test-intervaltree.c b/calendar/libedata-cal/test-intervaltree.c
index 8b63614..9b17177 100644
--- a/calendar/libedata-cal/test-intervaltree.c
+++ b/calendar/libedata-cal/test-intervaltree.c
@@ -117,7 +117,6 @@ compare_interval_lists (GList *list1, GList *list2)
i1 = (EInterval*) list1->data;
c1 = i1->comp;
-
while (!found && l2 != NULL)
{
c2 = (ECalComponent*) l2->data;
@@ -292,7 +291,6 @@ random_test()
l1 = e_intervaltree_search (tree, start, end);
-
l2 = search_in_list (list, start, end);
if (!compare_interval_lists (l2, l1))
@@ -321,7 +319,6 @@ random_test()
l1 = e_intervaltree_search (tree, start, end);
-
l2 = search_in_list (list, start, end);
if (!compare_interval_lists (l2, l1))
@@ -370,7 +367,6 @@ random_test()
exit(-1);
}
-
g_free (rid);
g_object_unref (interval->comp);
g_free (l1->data);
diff --git a/camel/camel-db.c b/camel/camel-db.c
index ceee93e..265c56a 100644
--- a/camel/camel-db.c
+++ b/camel/camel-db.c
@@ -1102,9 +1102,9 @@ read_uids_flags_callback (gpointer ref, gint ncol, gchar ** cols, gchar ** name)
gint i;
for (i = 0; i < ncol; ++i) {
if (!strcmp (name [i], "uid"))
- g_ptr_array_add (data->uids, (gchar *) (camel_pstring_strdup(cols [i])));
+ g_ptr_array_add (data->uids, (gchar *) (camel_pstring_strdup(cols[i])));
else if (!strcmp (name [i], "flags"))
- g_ptr_array_add (data->flags, GUINT_TO_POINTER(strtoul (cols [i], NULL, 10)));
+ g_ptr_array_add (data->flags, GUINT_TO_POINTER(strtoul (cols[i], NULL, 10)));
}
return 0;
@@ -1156,10 +1156,10 @@ read_uids_callback (gpointer ref, gint ncol, gchar ** cols, gchar ** name)
gint i;
for (i = 0; i < ncol; ++i) {
if (!strcmp (name [i], "uid"))
- g_ptr_array_add (array, (gchar *) (camel_pstring_strdup(cols [i])));
+ g_ptr_array_add (array, (gchar *) (camel_pstring_strdup(cols[i])));
}
#else
- g_ptr_array_add (array, (gchar *) (camel_pstring_strdup(cols [0])));
+ g_ptr_array_add (array, (gchar *) (camel_pstring_strdup(cols[0])));
#endif
return 0;
@@ -1253,7 +1253,7 @@ read_preview_callback (gpointer ref, gint ncol, gchar ** cols, gchar ** name)
for (i = 0; i < ncol; ++i) {
if (!strcmp (name [i], "uid"))
- uid = camel_pstring_strdup(cols [i]);
+ uid = camel_pstring_strdup(cols[i]);
else if (!strcmp (name [i], "preview"))
msg = g_strdup(cols[i]);
}
@@ -1323,10 +1323,10 @@ read_vuids_callback (gpointer ref, gint ncol, gchar ** cols, gchar ** name)
for (i = 0; i < ncol; ++i) {
if (!strcmp (name [i], "vuid"))
- g_ptr_array_add (array, (gchar *) (camel_pstring_strdup(cols [i]+8)));
+ g_ptr_array_add (array, (gchar *) (camel_pstring_strdup(cols[i]+8)));
}
#else
- g_ptr_array_add (array, (gchar *) (camel_pstring_strdup(cols [0]+8)));
+ g_ptr_array_add (array, (gchar *) (camel_pstring_strdup(cols[0]+8)));
#endif
return 0;
@@ -1807,45 +1807,45 @@ read_fir_callback (gpointer ref, gint ncol, gchar ** cols, gchar ** name)
d(g_print ("\nread_fir_callback called \n"));
#if 0
- record->folder_name = cols [0];
- record->version = cols [1];
+ record->folder_name = cols[0];
+ record->version = cols[1];
/* Just a sequential mapping of struct members to columns is enough I guess.
Needs some checking */
#else
for (i = 0; i < ncol; ++i) {
if (!strcmp (name [i], "folder_name"))
- record->folder_name = g_strdup(cols [i]);
+ record->folder_name = g_strdup(cols[i]);
else if (!strcmp (name [i], "version"))
- record->version = cols [i] ? strtoul (cols [i], NULL, 10) : 0;
+ record->version = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
else if (!strcmp (name [i], "flags"))
- record->flags = cols [i] ? strtoul (cols [i], NULL, 10) : 0;
+ record->flags = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
else if (!strcmp (name [i], "nextuid"))
- record->nextuid = cols [i] ? strtoul (cols [i], NULL, 10) : 0;
+ record->nextuid = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
else if (!strcmp (name [i], "time"))
- record->time = cols [i] ? strtoul (cols [i], NULL, 10) : 0;
+ record->time = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
else if (!strcmp (name [i], "saved_count"))
- record->saved_count = cols [i] ? strtoul (cols [i], NULL, 10) : 0;
+ record->saved_count = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
else if (!strcmp (name [i], "unread_count"))
- record->unread_count = cols [i] ? strtoul (cols [i], NULL, 10) : 0;
+ record->unread_count = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
else if (!strcmp (name [i], "deleted_count"))
- record->deleted_count = cols [i] ? strtoul (cols [i], NULL, 10) : 0;
+ record->deleted_count = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
else if (!strcmp (name [i], "junk_count"))
- record->junk_count = cols [i] ? strtoul (cols [i], NULL, 10) : 0;
+ record->junk_count = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
else if (!strcmp (name [i], "visible_count"))
- record->visible_count = cols [i] ? strtoul (cols [i], NULL, 10) : 0;
+ record->visible_count = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
else if (!strcmp (name [i], "jnd_count"))
- record->jnd_count = cols [i] ? strtoul (cols [i], NULL, 10) : 0;
+ record->jnd_count = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
else if (!strcmp (name [i], "bdata"))
- record->bdata = g_strdup (cols [i]);
+ record->bdata = g_strdup (cols[i]);
}
#endif
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
index ee16619..3539278 100644
--- a/camel/camel-filter-driver.c
+++ b/camel/camel-filter-driver.c
@@ -619,9 +619,9 @@ do_label (struct _ESExp *f, gint argc, struct _ESExpResult **argv, CamelFilterDr
label = argv[0]->value.string;
- for (i = 0; new_labels [i]; i++) {
- if (label && strcmp (new_labels [i] + 6, label) == 0) {
- label = new_labels [i];
+ for (i = 0; new_labels[i]; i++) {
+ if (label && strcmp (new_labels[i] + 6, label) == 0) {
+ label = new_labels[i];
break;
}
}
diff --git a/camel/camel-folder-search.c b/camel/camel-folder-search.c
index 6b1ae41..4007074 100644
--- a/camel/camel-folder-search.c
+++ b/camel/camel-folder-search.c
@@ -559,8 +559,8 @@ do_search_in_memory (const gchar *expr)
if (!expr)
return FALSE;
- for (i = 0; in_memory_tokens [i]; i++) {
- if (strstr (expr, in_memory_tokens [i]))
+ for (i = 0; in_memory_tokens[i]; i++) {
+ if (strstr (expr, in_memory_tokens[i]))
return TRUE;
}
@@ -1811,7 +1811,7 @@ read_uid_callback (gpointer ref, gint ncol, gchar ** cols, gchar **name)
matches = (GPtrArray *) ref;
- g_ptr_array_add (matches, (gpointer) camel_pstring_strdup (cols [0]));
+ g_ptr_array_add (matches, (gpointer) camel_pstring_strdup (cols[0]));
return 0;
}
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 6e297e9..2fb8c9a 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -1860,56 +1860,56 @@ mir_from_cols (CamelMIRecord *mir, CamelFolderSummary *s, gint ncol, gchar ** co
for (i = 0; i < ncol; ++i) {
if (!strcmp (name [i], "uid"))
- mir->uid = (gchar *) camel_pstring_strdup (cols [i]);
+ mir->uid = (gchar *) camel_pstring_strdup (cols[i]);
else if (!strcmp (name [i], "flags"))
- mir->flags = cols [i] ? strtoul (cols [i], NULL, 10) : 0;
+ mir->flags = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
else if (!strcmp (name [i], "read"))
- mir->read = (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
+ mir->read = (cols[i]) ? ( ((strtoul (cols[i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
else if (!strcmp (name [i], "deleted"))
- mir->deleted = (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
+ mir->deleted = (cols[i]) ? ( ((strtoul (cols[i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
else if (!strcmp (name [i], "replied"))
- mir->replied = (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
+ mir->replied = (cols[i]) ? ( ((strtoul (cols[i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
else if (!strcmp (name [i], "important"))
- mir->important = (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
+ mir->important = (cols[i]) ? ( ((strtoul (cols[i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
else if (!strcmp (name [i], "junk"))
- mir->junk = (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
+ mir->junk = (cols[i]) ? ( ((strtoul (cols[i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
else if (!strcmp (name [i], "attachment"))
- mir->attachment = (cols [i]) ? ( ((strtoul (cols [i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
+ mir->attachment = (cols[i]) ? ( ((strtoul (cols[i], NULL, 10)) ? TRUE : FALSE)) : FALSE;
else if (!strcmp (name [i], "size"))
- mir->size = cols [i] ? strtoul (cols [i], NULL, 10) : 0;
+ mir->size = cols[i] ? strtoul (cols[i], NULL, 10) : 0;
else if (!strcmp (name [i], "dsent"))
- mir->dsent = cols [i] ? strtol (cols [i], NULL, 10) : 0;
+ mir->dsent = cols[i] ? strtol (cols[i], NULL, 10) : 0;
else if (!strcmp (name [i], "dreceived"))
- mir->dreceived = cols [i] ? strtol (cols [i], NULL, 10) : 0;
+ mir->dreceived = cols[i] ? strtol (cols[i], NULL, 10) : 0;
else if (!strcmp (name [i], "subject"))
- mir->subject = (gchar *) camel_pstring_strdup (cols [i]);
+ mir->subject = (gchar *) camel_pstring_strdup (cols[i]);
else if (!strcmp (name [i], "mail_from"))
- mir->from = (gchar *) camel_pstring_strdup (cols [i]);
+ mir->from = (gchar *) camel_pstring_strdup (cols[i]);
else if (!strcmp (name [i], "mail_to"))
- mir->to = (gchar *) camel_pstring_strdup (cols [i]);
+ mir->to = (gchar *) camel_pstring_strdup (cols[i]);
else if (!strcmp (name [i], "mail_cc"))
- mir->cc = (gchar *) camel_pstring_strdup(cols [i]);
+ mir->cc = (gchar *) camel_pstring_strdup(cols[i]);
else if (!strcmp (name [i], "mlist"))
- mir->mlist = (gchar *) camel_pstring_strdup (cols [i]);
+ mir->mlist = (gchar *) camel_pstring_strdup (cols[i]);
else if (!strcmp (name [i], "followup_flag"))
- mir->followup_flag = (gchar *) camel_pstring_strdup(cols [i]);
+ mir->followup_flag = (gchar *) camel_pstring_strdup(cols[i]);
else if (!strcmp (name [i], "followup_completed_on"))
- mir->followup_completed_on = (gchar *) camel_pstring_strdup(cols [i]);
+ mir->followup_completed_on = (gchar *) camel_pstring_strdup(cols[i]);
else if (!strcmp (name [i], "followup_due_by"))
- mir->followup_due_by = (gchar *) camel_pstring_strdup(cols [i]);
+ mir->followup_due_by = (gchar *) camel_pstring_strdup(cols[i]);
else if (!strcmp (name [i], "part"))
- mir->part = g_strdup (cols [i]);
+ mir->part = g_strdup (cols[i]);
else if (!strcmp (name [i], "labels"))
- mir->labels = g_strdup (cols [i]);
+ mir->labels = g_strdup (cols[i]);
else if (!strcmp (name [i], "usertags"))
- mir->usertags = g_strdup (cols [i]);
+ mir->usertags = g_strdup (cols[i]);
else if (!strcmp (name [i], "cinfo"))
- mir->cinfo = g_strdup(cols [i]);
+ mir->cinfo = g_strdup(cols[i]);
else if (!strcmp (name [i], "bdata"))
- mir->bdata = g_strdup(cols [i]);
+ mir->bdata = g_strdup(cols[i]);
/* Evolution itself doesn't yet use this, ignoring
else if (!strcmp (name [i], "bodystructure"))
- mir->bodystructure = g_strdup(cols [i]); */
+ mir->bodystructure = g_strdup(cols[i]); */
}
}
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index dedcd58..d27f658 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -823,19 +823,19 @@ folder_changed (CamelFolder *folder,
guint32 flags;
for (i = 0; i < info->uid_changed->len; i++) {
- flags = camel_folder_get_message_flags (folder, info->uid_changed->pdata [i]);
+ flags = camel_folder_get_message_flags (folder, info->uid_changed->pdata[i]);
if (flags & CAMEL_MESSAGE_JUNK_LEARN) {
if (flags & CAMEL_MESSAGE_JUNK) {
if (!junk)
junk = g_ptr_array_new ();
- g_ptr_array_add (junk, g_strdup (info->uid_changed->pdata [i]));
+ g_ptr_array_add (junk, g_strdup (info->uid_changed->pdata[i]));
} else {
if (!notjunk)
notjunk = g_ptr_array_new ();
- g_ptr_array_add (notjunk, g_strdup (info->uid_changed->pdata [i]));
+ g_ptr_array_add (notjunk, g_strdup (info->uid_changed->pdata[i]));
}
/* reset junk learn flag so that we don't process it again*/
- camel_folder_set_message_flags (folder, info->uid_changed->pdata [i], CAMEL_MESSAGE_JUNK_LEARN, 0);
+ camel_folder_set_message_flags (folder, info->uid_changed->pdata[i], CAMEL_MESSAGE_JUNK_LEARN, 0);
}
}
}
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index 11332cd..4b00513 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -2352,7 +2352,7 @@ header_decode_addrspec(const gchar **in)
word *('.' word) @ domain |
*(word) '<' [ *('@' domain ) ':' ] word *( '.' word) @ domain |
- 1*word ':' [ word ... etc (mailbox, as above) ] ';'
+ 1*word ':'[ word ... etc (mailbox, as above) ] ';'
*/
/* mailbox:
@@ -3589,7 +3589,7 @@ static guchar camel_datetok_table[256] = {
static struct {
const gchar *name;
gint offset;
-} tz_offsets [] = {
+} tz_offsets[] = {
{ "UT", 0 },
{ "GMT", 0 },
{ "EST", -500 }, /* these are all US timezones. bloody yanks */
@@ -3607,12 +3607,12 @@ static struct {
{ "Y", 1200 },
};
-static const gchar tm_months [][4] = {
+static const gchar tm_months[][4] = {
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
};
-static const gchar tm_days [][4] = {
+static const gchar tm_days[][4] = {
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
};
diff --git a/camel/camel-sasl-ntlm.c b/camel/camel-sasl-ntlm.c
index c2c87ac..e35e758 100644
--- a/camel/camel-sasl-ntlm.c
+++ b/camel/camel-sasl-ntlm.c
@@ -133,15 +133,15 @@ static void setup_schedule (const guchar *key_56, DES_KS ks);
static void
ntlm_lanmanager_hash (const gchar *password, gchar hash[21])
{
- guchar lm_password [15];
+ guchar lm_password[15];
DES_KS ks;
gint i;
- for (i = 0; i < 14 && password [i]; i++)
- lm_password [i] = toupper ((guchar) password [i]);
+ for (i = 0; i < 14 && password[i]; i++)
+ lm_password[i] = toupper ((guchar) password[i]);
for (; i < 15; i++)
- lm_password [i] = '\0';
+ lm_password[i] = '\0';
memcpy (hash, LM_PASSWORD_MAGIC, 21);
@@ -182,14 +182,14 @@ setup_schedule (const guchar *key_56, DES_KS ks)
gint i, c, bit;
for (i = 0; i < 8; i++) {
- key [i] = KEYBITS (key_56, i * 7);
+ key[i] = KEYBITS (key_56, i * 7);
/* Fix parity */
for (c = bit = 0; bit < 8; bit++)
- if (key [i] & (1 << bit))
+ if (key[i] & (1 << bit))
c++;
if (!(c & 1))
- key [i] ^= 0x01;
+ key[i] ^= 0x01;
}
deskey (ks, key, 0);
diff --git a/camel/providers/groupwise/camel-groupwise-folder.c b/camel/providers/groupwise/camel-groupwise-folder.c
index ab5dafd..bc6b016 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.c
+++ b/camel/providers/groupwise/camel-groupwise-folder.c
@@ -275,14 +275,14 @@ groupwise_set_mail_mi_dates (CamelGroupwiseMessageInfo *mi, EGwItem *item)
if (sent_date) {
actual_time = e_gw_connection_get_date_from_string (sent_date);
mi->info.date_sent = actual_time;
- }
-
+ }
+
if (received_date) {
actual_time = e_gw_connection_get_date_from_string (received_date);
mi->info.date_received = actual_time;
} else
mi->info.date_received = actual_time;
-
+
if (!sent_date)
mi->info.date_sent = actual_time;
}
@@ -618,7 +618,7 @@ update_junk_list (CamelStore *store, CamelMessageInfo *info, gint flag)
email = g_strsplit_set (from, "<>", -1);
- if (from [0] == '<') {
+ if (from[0] == '<') {
/* g_strsplit_set will add a dummy empty string as the first string if the first character in the
original string is one of the delimiters that you want to suppress.
Refer to g_strsplit_set documentation */
@@ -1604,7 +1604,7 @@ groupwise_folder_set_threading_data (CamelGroupwiseMessageInfo *mi, EGwItem *ite
while (scan) {
digest = get_md5_digest ((const guchar *) scan->id);
- memcpy(mi->info.references->references [count].id.hash, digest, sizeof(mi->info.message_id.id.hash));
+ memcpy(mi->info.references->references[count].id.hash, digest, sizeof(mi->info.message_id.id.hash));
count++;
scan = scan->next;
@@ -1800,7 +1800,7 @@ gw_update_cache (CamelFolder *folder, GList *list, GError **error, gboolean uid_
camel_pstring_free(mi->info.to);
mi->info.to = camel_pstring_strdup (str_to->str);
mi->info.cc = camel_pstring_strdup (str_cc->str);
-
+
g_string_truncate (str_to, 0);
g_string_truncate (str_cc, 0);
}
@@ -1813,7 +1813,7 @@ gw_update_cache (CamelFolder *folder, GList *list, GError **error, gboolean uid_
time_t actual_time = e_gw_connection_get_date_from_string (temp_date);
mi->info.date_sent = mi->info.date_received = actual_time;
}
- } else
+ } else
groupwise_set_mail_mi_dates (mi, item);
mi->info.dirty = TRUE;
@@ -1885,7 +1885,7 @@ get_from_from_org (EGwItemOrganizer *org)
org->display_name = g_strdelimit (org->display_name, "<>", ' ');
str = g_string_append (str, org->display_name);
str = g_string_append (str, " ");
- } else if (org->email && org->email [0]) {
+ } else if (org->email && org->email[0]) {
str = g_string_append (str, org->email);
str = g_string_append (str, " ");
}
@@ -2048,7 +2048,7 @@ gw_update_summary (CamelFolder *folder, GList *list,GError **error)
time_t actual_time = e_gw_connection_get_date_from_string (temp_date);
mi->info.date_sent = mi->info.date_received = actual_time;
}
- } else
+ } else
groupwise_set_mail_mi_dates (mi, item);
mi->info.uid = camel_pstring_strdup(e_gw_item_get_id(item));
@@ -2247,7 +2247,7 @@ groupwise_folder_item_to_msg( CamelFolder *folder,
t = e_gw_connection_get_date_from_string (reply_within);
temp = ctime (&t);
- temp [strlen (temp)-1] = '\0';
+ temp[strlen (temp)-1] = '\0';
value = g_strconcat (N_("Reply Requested: by "), temp, "\n\n", mess ? mess : "", NULL);
e_gw_item_set_message (item, (const gchar *) value);
g_free (value);
diff --git a/camel/providers/groupwise/camel-groupwise-provider.c b/camel/providers/groupwise/camel-groupwise-provider.c
index 511a3df..f36f2aa 100644
--- a/camel/providers/groupwise/camel-groupwise-provider.c
+++ b/camel/providers/groupwise/camel-groupwise-provider.c
@@ -132,7 +132,7 @@ camel_provider_module_init(void)
groupwise_provider.translation_domain = GETTEXT_PACKAGE;
if (use_imap)
- groupwise_provider.object_types[CAMEL_PROVIDER_STORE] = imap_provider->object_types [CAMEL_PROVIDER_STORE];
+ groupwise_provider.object_types[CAMEL_PROVIDER_STORE] = imap_provider->object_types[CAMEL_PROVIDER_STORE];
else {
groupwise_provider.object_types[CAMEL_PROVIDER_STORE] = camel_groupwise_store_get_type ();
groupwise_provider.object_types[CAMEL_PROVIDER_TRANSPORT] = camel_groupwise_transport_get_type ();
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 7bbf5d5..86a3f9f 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -876,8 +876,8 @@ merge_custom_flags (CamelMessageInfo *mi, const gchar *custom_flags)
server = g_hash_table_new (g_str_hash, g_str_equal);
cflags = g_strsplit (custom_flags, " ", -1);
- for (i = 0; cflags [i]; i++) {
- gchar *name = cflags [i];
+ for (i = 0; cflags[i]; i++) {
+ gchar *name = cflags[i];
if (name && *name) {
g_hash_table_insert (server, name, name);
diff --git a/camel/providers/imap/camel-imap-store-summary.c b/camel/providers/imap/camel-imap-store-summary.c
index b4e0680..c2061ee 100644
--- a/camel/providers/imap/camel-imap-store-summary.c
+++ b/camel/providers/imap/camel-imap-store-summary.c
@@ -355,7 +355,7 @@ namespace_find (CamelImapStoreNamespace *ns, const gchar *full_name, gchar dir_s
if ((g_ascii_strcasecmp (ns->full_name, full_name) == 0 ||
(g_ascii_strncasecmp (ns->full_name, full_name, len) == 0
- && len + 1 == strlen (full_name) && full_name [len] == ns->sep))&& (!dir_sep || ns->sep == dir_sep)) {
+ && len + 1 == strlen (full_name) && full_name[len] == ns->sep))&& (!dir_sep || ns->sep == dir_sep)) {
break;
}
ns = ns->next;
diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c
index 16480a1..de0551b 100644
--- a/camel/providers/imap/camel-imap-utils.c
+++ b/camel/providers/imap/camel-imap-utils.c
@@ -483,7 +483,7 @@ rename_label_flag (const gchar *flag, gint len, gboolean server_to_evo)
for (i = 0 + (server_to_evo ? 0 : 1); labels[i]; i = i + 2) {
if (!g_ascii_strncasecmp (flag, labels[i], len))
- return labels [i + (server_to_evo ? 1 : -1)];
+ return labels[i + (server_to_evo ? 1 : -1)];
}
return "";
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 58d78c6..1b7992f 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -3283,7 +3283,7 @@ imapx_command_copy_messages_step_done (CamelIMAPXServer *is, CamelIMAPXCommand *
gint j;
for (j = job->u.copy_messages.last_index; j < i; j++)
- camel_folder_delete_message (job->folder, uids->pdata [j]);
+ camel_folder_delete_message (job->folder, uids->pdata[j]);
}
/* TODO copy the summary and cached messages to the new folder. We might need a sorted insert to avoid refreshing the dest folder */
@@ -4050,7 +4050,7 @@ imapx_command_expunge_done (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
changes = camel_folder_change_info_new ();
for (i = 0; i < uids->len; i++) {
- gchar *uid = uids->pdata [i];
+ gchar *uid = uids->pdata[i];
CamelMessageInfo *mi = camel_folder_summary_uid (folder->summary, uid);
if (mi) {
diff --git a/camel/providers/imapx/camel-imapx-stream.c b/camel/providers/imapx/camel-imapx-stream.c
index 65d5359..5f9a235 100644
--- a/camel/providers/imapx/camel-imapx-stream.c
+++ b/camel/providers/imapx/camel-imapx-stream.c
@@ -37,7 +37,6 @@
#define t(x) camel_imapx_debug(token, x)
#define io(x) camel_imapx_debug(io, x)
-
G_DEFINE_TYPE (CamelIMAPXStream, camel_imapx_stream, CAMEL_TYPE_STREAM)
static gint
diff --git a/camel/providers/imapx/camel-imapx-utils.c b/camel/providers/imapx/camel-imapx-utils.c
index 7455c26..0e78c6c 100644
--- a/camel/providers/imapx/camel-imapx-utils.c
+++ b/camel/providers/imapx/camel-imapx-utils.c
@@ -152,7 +152,7 @@ rename_label_flag (const gchar *flag, gint len, gboolean server_to_evo)
for (i = 0 + (server_to_evo ? 0 : 1); labels[i]; i = i + 2) {
if (!g_ascii_strncasecmp (flag, labels[i], len))
- return labels [i + (server_to_evo ? 1 : -1)];
+ return labels[i + (server_to_evo ? 1 : -1)];
}
return flag;
@@ -400,7 +400,7 @@ imapx_update_store_summary (CamelFolder *folder)
/*
capability_data ::= "CAPABILITY" SPACE [1#capability SPACE] "IMAP4rev1"
- [SPACE 1#capability]
+ [SPACE 1#capability]
;; IMAP4rev1 servers which offer RFC 1730
;; compatibility MUST list "IMAP4" as the first
;; capability.
@@ -532,7 +532,7 @@ imapx_parse_namespace_list (CamelIMAPXStream *stream, GError **error)
node->sep = *token;
} else {
if (*token)
- node->sep = node->path [strlen (node->path) - 1];
+ node->sep = node->path[strlen (node->path) - 1];
else
node->sep = '\0';
}
@@ -549,11 +549,11 @@ imapx_parse_namespace_list (CamelIMAPXStream *stream, GError **error)
tail->next = node;
tail = node;
- if (*node->path && node->path [strlen (node->path) -1] == node->sep)
- node->path [strlen (node->path) - 1] = '\0';
+ if (*node->path && node->path[strlen (node->path) -1] == node->sep)
+ node->path[strlen (node->path) - 1] = '\0';
if (!g_ascii_strncasecmp (node->path, "INBOX", 5) &&
- (node->path [6] == '\0' || node->path [6] == node->sep ))
+ (node->path[6] == '\0' || node->path[6] == node->sep ))
memcpy (node->path, "INBOX", 5);
/* TODO remove full_name later. not required */
@@ -574,7 +574,7 @@ imapx_parse_namespace_list (CamelIMAPXStream *stream, GError **error)
}
} else if (tok == IMAPX_TOK_TOKEN && !strcmp ((gchar *) token, "NIL")) {
- namespaces [n] = NULL;
+ namespaces[n] = NULL;
} else {
g_set_error (error, CAMEL_IMAPX_ERROR, 1, "namespace: expected either a '(' or NIL");
goto exception;
@@ -584,15 +584,15 @@ imapx_parse_namespace_list (CamelIMAPXStream *stream, GError **error)
n++;
} while (n < 3);
- nsl->personal = namespaces [0];
- nsl->shared = namespaces [1];
- nsl->other = namespaces [2];
+ nsl->personal = namespaces[0];
+ nsl->shared = namespaces[1];
+ nsl->other = namespaces[2];
return nsl;
exception:
g_free (nsl);
for (i=0; i < 3; i++)
- imapx_namespace_clear (&namespaces [i]);
+ imapx_namespace_clear (&namespaces[i]);
return NULL;
}
@@ -608,15 +608,15 @@ body_extension ::= nstring / number / "(" 1#body_extension ")"
;; future standard or standards-track
;; revisions of this specification.
-body_ext_1part ::= body_fld_md5 [SPACE body_fld_dsp
- [SPACE body_fld_lang
- [SPACE 1#body_extension]]]
+body_ext_1part ::= body_fld_md5[SPACE body_fld_dsp
+ [SPACE body_fld_lang
+ [SPACE 1#body_extension]]]
;; MUST NOT be returned on non-extensible
;; "BODY" fetch
body_ext_mpart ::= body_fld_param
- [SPACE body_fld_dsp SPACE body_fld_lang
- [SPACE 1#body_extension]]
+ [SPACE body_fld_dsp SPACE body_fld_lang
+ [SPACE 1#body_extension]]
;; MUST NOT be returned on non-extensible
;; "BODY" fetch
@@ -644,13 +644,13 @@ body_fld_octets ::= number
body_fld_param ::= "(" 1#(string SPACE string) ")" / nil
body_type_1part ::= (body_type_basic / body_type_msg / body_type_text)
- [SPACE body_ext_1part]
+ [SPACE body_ext_1part]
body_type_basic ::= media_basic SPACE body_fields
;; MESSAGE subtype MUST NOT be "RFC822"
body_type_mpart ::= 1*body SPACE media_subtype
- [SPACE body_ext_mpart]
+ [SPACE body_ext_mpart]
body_type_msg ::= media_message SPACE body_fields SPACE envelope
SPACE body SPACE body_fld_lines
@@ -685,19 +685,19 @@ env_to ::= "(" 1*address ")" / nil
media_basic ::= (<"> ("APPLICATION" / "AUDIO" / "IMAGE" /
"MESSAGE" / "VIDEO") <">) / string)
SPACE media_subtype
- ;; Defined in [MIME-IMT]
+ ;; Defined in[MIME-IMT]
media_message ::= <"> "MESSAGE" <"> SPACE <"> "RFC822" <">
- ;; Defined in [MIME-IMT]
+ ;; Defined in[MIME-IMT]
media_subtype ::= string
- ;; Defined in [MIME-IMT]
+ ;; Defined in[MIME-IMT]
media_text ::= <"> "TEXT" <"> SPACE media_subtype
- ;; Defined in [MIME-IMT]
+ ;; Defined in[MIME-IMT]
( "type" "subtype" body_fields [envelope body body_fld_lines]
- [body_fld_lines]
+ [body_fld_lines]
(("TEXT" "PLAIN" ("CHARSET"
"US-ASCII") NIL NIL "7BIT" 1152 23)("TEXT" "PLAIN"
@@ -778,14 +778,14 @@ imapx_parse_ext_optional(CamelIMAPXStream *is, GError **error)
/* although the grammars are different, they can be parsed the same way */
/* body_ext_1part ::= body_fld_md5 [SPACE body_fld_dsp
- [SPACE body_fld_lang
- [SPACE 1#body_extension]]]
+ [SPACE body_fld_lang
+ [SPACE 1#body_extension]]]
;; MUST NOT be returned on non-extensible
;; "BODY" fetch */
/* body_ext_mpart ::= body_fld_param
- [SPACE body_fld_dsp SPACE body_fld_lang
- [SPACE 1#body_extension]]
+ [SPACE body_fld_dsp SPACE body_fld_lang
+ [SPACE 1#body_extension]]
;; MUST NOT be returned on non-extensible
;; "BODY" fetch */
@@ -1138,7 +1138,7 @@ imapx_parse_body(CamelIMAPXStream *is, GError **error)
camel_imapx_stream_ungettoken(is, tok, token, len);
if (tok == '(') {
/* body_type_mpart ::= 1*body SPACE media_subtype
- [SPACE body_ext_mpart] */
+ [SPACE body_ext_mpart] */
cinfo = g_malloc0(sizeof(*cinfo));
last = (struct _CamelMessageContentInfo *)&cinfo->childs;
@@ -1157,8 +1157,8 @@ imapx_parse_body(CamelIMAPXStream *is, GError **error)
cinfo->type = camel_content_type_new("multipart", (gchar *) token);
/* body_ext_mpart ::= body_fld_param
- [SPACE body_fld_dsp SPACE body_fld_lang
- [SPACE 1#body_extension]]
+ [SPACE body_fld_dsp SPACE body_fld_lang
+ [SPACE 1#body_extension]]
;; MUST NOT be returned on non-extensible
;; "BODY" fetch */
@@ -1182,7 +1182,7 @@ imapx_parse_body(CamelIMAPXStream *is, GError **error)
}
} else {
/* body_type_1part ::= (body_type_basic / body_type_msg / body_type_text)
- [SPACE body_ext_1part]
+ [SPACE body_ext_1part]
body_type_basic ::= media_basic SPACE body_fields
body_type_text ::= media_text SPACE body_fields SPACE body_fld_lines
@@ -1219,8 +1219,8 @@ imapx_parse_body(CamelIMAPXStream *is, GError **error)
camel_imapx_stream_ungettoken(is, tok, token, len);
/* body_ext_1part ::= body_fld_md5 [SPACE body_fld_dsp
- [SPACE body_fld_lang
- [SPACE 1#body_extension]]]
+ [SPACE body_fld_lang
+ [SPACE 1#body_extension]]]
;; MUST NOT be returned on non-extensible
;; "BODY" fetch */
@@ -1631,8 +1631,8 @@ imapx_parse_uids (CamelIMAPXStream *is, GError **error)
for (i = 0; i < str_len; i++) {
if (g_strstr_len (splits [i], -1, ":")) {
gchar **seq = g_strsplit (splits [i], ":", -1);
- guint32 uid1 = strtoul ((gchar *) seq [0], NULL, 10);
- guint32 uid2 = strtoul ((gchar *) seq [1], NULL, 10);
+ guint32 uid1 = strtoul ((gchar *) seq[0], NULL, 10);
+ guint32 uid2 = strtoul ((gchar *) seq[1], NULL, 10);
generate_uids_from_sequence (uids, uid1, uid2);
g_strfreev (seq);
diff --git a/camel/providers/imapx/test-imapx.c b/camel/providers/imapx/test-imapx.c
index be80df5..7d7f3d0 100644
--- a/camel/providers/imapx/test-imapx.c
+++ b/camel/providers/imapx/test-imapx.c
@@ -4,7 +4,7 @@
#include <camel/camel.h>
gint
-main (gint argc, gchar *argv [])
+main (gint argc, gchar *argv[])
{
CamelSession *session;
gchar *uri = NULL;
@@ -16,7 +16,7 @@ main (gint argc, gchar *argv [])
return -1;
}
- uri = argv [1];
+ uri = argv[1];
g_thread_init (NULL);
system ("rm -rf /tmp/test-camel-imapx");
camel_init ("/tmp/test-camel-imapx", TRUE);
diff --git a/libedataserver/e-account-list.c b/libedataserver/e-account-list.c
index eec8592..bdec502 100644
--- a/libedataserver/e-account-list.c
+++ b/libedataserver/e-account-list.c
@@ -38,7 +38,7 @@ enum {
LAST_SIGNAL
};
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
static void dispose (GObject *);
static void finalize (GObject *);
diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c
index 9da775d..b72a906 100644
--- a/libedataserver/e-data-server-util.c
+++ b/libedataserver/e-data-server-util.c
@@ -397,16 +397,16 @@ e_util_utf8_remove_accents (const gchar *str)
if (!res)
return g_strdup (str);
- for (i = 0, j = 0; res [i]; i++) {
- if ((guchar)res[i] != 0xCC || res [i + 1] == 0) {
- res [j] = res [i];
+ for (i = 0, j = 0; res[i]; i++) {
+ if ((guchar)res[i] != 0xCC || res[i + 1] == 0) {
+ res[j] = res[i];
j++;
} else {
i++;
}
}
- res [j] = 0;
+ res[j] = 0;
return res;
}
diff --git a/libedataserver/e-debug-log.h b/libedataserver/e-debug-log.h
index 374b24f..5777dad 100644
--- a/libedataserver/e-debug-log.h
+++ b/libedataserver/e-debug-log.h
@@ -1,24 +1,24 @@
/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*-
e-debug-log.h: Ring buffer for logging debug messages
-
+
Copyright (C) 2006, 2007 Novell, Inc.
-
+
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of the
License, or (at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
-
+
You should have received a copy of the GNU General Public
License along with this program; if not, write to the
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
-
+
Author: Federico Mena-Quintero <federico novell com>
*/
diff --git a/libedataserver/e-iterator.c b/libedataserver/e-iterator.c
index fbc7e16..2adbd3f 100644
--- a/libedataserver/e-iterator.c
+++ b/libedataserver/e-iterator.c
@@ -15,7 +15,7 @@ enum {
LAST_SIGNAL
};
-static guint e_iterator_signals [LAST_SIGNAL] = { 0, };
+static guint e_iterator_signals[LAST_SIGNAL] = { 0, };
G_DEFINE_TYPE (EIterator, e_iterator, G_TYPE_OBJECT)
@@ -26,7 +26,7 @@ e_iterator_class_init (EIteratorClass *klass)
object_class = G_OBJECT_CLASS(klass);
- e_iterator_signals [INVALIDATE] =
+ e_iterator_signals[INVALIDATE] =
g_signal_new ("invalidate",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
@@ -140,5 +140,5 @@ e_iterator_invalidate (EIterator *iterator)
g_return_if_fail (iterator != NULL);
g_return_if_fail (E_IS_ITERATOR (iterator));
- g_signal_emit (iterator, e_iterator_signals [INVALIDATE], 0);
+ g_signal_emit (iterator, e_iterator_signals[INVALIDATE], 0);
}
diff --git a/libedataserver/e-sexp.c b/libedataserver/e-sexp.c
index de82ccc..1d6a680 100644
--- a/libedataserver/e-sexp.c
+++ b/libedataserver/e-sexp.c
@@ -119,7 +119,6 @@ typedef gboolean (ESOperatorFunc) (gint argc, struct _ESExpResult **argv, struct
/* FIXME: constant _TIME_MAX used in different files, move it somewhere */
#define _TIME_MAX ((time_t) INT_MAX) /* Max valid time_t */
-
static const GScannerConfig scanner_config =
{
( (gchar *) " \t\r\n") /* cset_skip_characters */,
@@ -910,10 +909,10 @@ and_operator(gint argc, struct _ESExpResult **argv, struct _ESExpResult *r)
/*
A B A and B
---- ---- ------- -
- norm(0) norm(0) norm(0)
- gen(1) norm(0) gen(1)
- norm(0) gen(1) gen(1)
- gen(1) gen(1) gen(1)
+ norm(0) norm(0) norm(0)
+ gen(1) norm(0) gen(1)
+ norm(0) gen(1) gen(1)
+ gen(1) gen(1) gen(1)
*/
g_return_val_if_fail (r != NULL, FALSE);
@@ -938,7 +937,6 @@ static const struct {
const gint operators_count = sizeof(operators) / sizeof(operators[0]);
-
static ESOperatorFunc*
get_operator_function(const gchar *fname)
{
@@ -1010,7 +1008,7 @@ e_sexp_term_evaluate_occur_times(struct _ESExp *f, struct _ESExpTerm *t, time_t
{
ESGeneratorFunc *generator = NULL;
ESOperatorFunc *operator = NULL;
-
+
r(printf(" (function \"%s\"\n", t->value.func.sym->name));
r = e_sexp_result_new(f, ESEXP_RES_UNDEFINED);
@@ -1060,7 +1058,6 @@ e_sexp_term_evaluate_occur_times(struct _ESExp *f, struct _ESExpTerm *t, time_t
return r;
}
-
/*
PARSER
*/
diff --git a/libedataserver/e-source-group.c b/libedataserver/e-source-group.c
index 219dd3f..1f70d5e 100644
--- a/libedataserver/e-source-group.c
+++ b/libedataserver/e-source-group.c
@@ -800,7 +800,7 @@ e_source_group_to_xml (ESourceGroup *group)
returned_buffer = g_malloc (xml_buffer_size + 1);
memcpy (returned_buffer, xml_buffer, xml_buffer_size);
- returned_buffer [xml_buffer_size] = '\0';
+ returned_buffer[xml_buffer_size] = '\0';
xmlFree (xml_buffer);
return returned_buffer;
diff --git a/libedataserver/e-source.c b/libedataserver/e-source.c
index 911c6dc..990e78d 100644
--- a/libedataserver/e-source.c
+++ b/libedataserver/e-source.c
@@ -326,7 +326,7 @@ e_source_update_from_xml_node (ESource *source,
g_str_has_suffix (source->priv->absolute_uri, source->priv->relative_uri)) {
gchar *tmp = source->priv->absolute_uri;
- tmp [strlen (tmp) - strlen (source->priv->relative_uri)] = 0;
+ tmp[strlen (tmp) - strlen (source->priv->relative_uri)] = 0;
source->priv->absolute_uri = g_strconcat (tmp, (gchar *)relative_uri, NULL);
g_free (tmp);
@@ -751,7 +751,7 @@ e_source_to_standalone_xml (ESource *source)
returned_buffer = g_malloc (xml_buffer_size + 1);
memcpy (returned_buffer, xml_buffer, xml_buffer_size);
- returned_buffer [xml_buffer_size] = '\0';
+ returned_buffer[xml_buffer_size] = '\0';
xmlFree (xml_buffer);
return returned_buffer;
diff --git a/libedataserver/e-time-utils.c b/libedataserver/e-time-utils.c
index 5599972..891e0d0 100644
--- a/libedataserver/e-time-utils.c
+++ b/libedataserver/e-time-utils.c
@@ -1759,7 +1759,7 @@ e_time_parse_date_ex (const gchar *value, struct tm *result, gboolean *two_digit
format [0] = ("%x");
/* according to the current locale with forced 4-digit year*/
- format [1] = e_time_get_d_fmt_with_4digit_year ();
+ format[1] = e_time_get_d_fmt_with_4digit_year ();
/* strptime format of a weekday and a date. */
format [2] = _("%a %m/%d/%Y");
@@ -1771,9 +1771,9 @@ e_time_parse_date_ex (const gchar *value, struct tm *result, gboolean *two_digit
/* when we need to know about two digit year, then always first try
full year, because for example nl_NL have format %d-%m-%y and it
changes from two year itself, which isn't what we want */
- const gchar *tmp = format [1];
- format [1] = format [0];
- format [0] = tmp;
+ const gchar *tmp = format[1];
+ format[1] = format[0];
+ format[0] = tmp;
*two_digit_year = FALSE;
}
@@ -1787,9 +1787,9 @@ e_time_parse_date_ex (const gchar *value, struct tm *result, gboolean *two_digit
}
if (two_digit_year)
- g_free ((gchar *)format [0]);
+ g_free ((gchar *)format[0]);
else
- g_free ((gchar *)format [1]);
+ g_free ((gchar *)format[1]);
return status;
}
diff --git a/libedataserverui/e-categories-dialog.c b/libedataserverui/e-categories-dialog.c
index 1dee654..fba2731 100644
--- a/libedataserverui/e-categories-dialog.c
+++ b/libedataserverui/e-categories-dialog.c
@@ -735,7 +735,7 @@ e_categories_dialog_get_categories (ECategoriesDialog *dialog)
if (text) {
gint len = strlen (text), old_len = len;
- while (len > 0 && (text [len -1] == ' ' || text [len - 1] == ','))
+ while (len > 0 && (text[len -1] == ' ' || text[len - 1] == ','))
len--;
if (old_len != len) {
diff --git a/libedataserverui/e-category-completion.c b/libedataserverui/e-category-completion.c
index 755f113..463d955 100644
--- a/libedataserverui/e-category-completion.c
+++ b/libedataserverui/e-category-completion.c
@@ -306,7 +306,7 @@ category_completion_sanitize_suffix (GtkEntry *entry, GdkEventFocus *event, GtkE
if (text) {
gint len = strlen (text), old_len = len;
- while (len > 0 && (text [len -1] == ' ' || text [len - 1] == ','))
+ while (len > 0 && (text[len -1] == ' ' || text[len - 1] == ','))
len--;
if (old_len != len) {
diff --git a/libedataserverui/e-contact-store.c b/libedataserverui/e-contact-store.c
index de98248..c955e02 100644
--- a/libedataserverui/e-contact-store.c
+++ b/libedataserverui/e-contact-store.c
@@ -598,7 +598,7 @@ view_contacts_changed (EContactStore *contact_store, const GList *contacts, EBoo
/* Update cached contact */
if (cached_contact != contact) {
g_object_unref (cached_contact);
- cached_contacts->pdata [n] = g_object_ref (contact);
+ cached_contacts->pdata[n] = g_object_ref (contact);
}
/* Emit changes for current view only */
diff --git a/libedataserverui/e-destination-store.c b/libedataserverui/e-destination-store.c
index 611c0fc..03c2bce 100644
--- a/libedataserverui/e-destination-store.c
+++ b/libedataserverui/e-destination-store.c
@@ -47,16 +47,16 @@ struct _EDestinationStorePrivate {
gint stamp;
};
-static GType column_types [E_DESTINATION_STORE_NUM_COLUMNS];
+static GType column_types[E_DESTINATION_STORE_NUM_COLUMNS];
static void e_destination_store_tree_model_init (GtkTreeModelIface *iface);
G_DEFINE_TYPE_EXTENDED (
EDestinationStore, e_destination_store, G_TYPE_OBJECT, 0,
G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_MODEL, e_destination_store_tree_model_init);
- column_types [E_DESTINATION_STORE_COLUMN_NAME] = G_TYPE_STRING;
- column_types [E_DESTINATION_STORE_COLUMN_EMAIL] = G_TYPE_STRING;
- column_types [E_DESTINATION_STORE_COLUMN_ADDRESS] = G_TYPE_STRING;
+ column_types[E_DESTINATION_STORE_COLUMN_NAME] = G_TYPE_STRING;
+ column_types[E_DESTINATION_STORE_COLUMN_EMAIL] = G_TYPE_STRING;
+ column_types[E_DESTINATION_STORE_COLUMN_ADDRESS] = G_TYPE_STRING;
)
static GtkTreeModelFlags e_destination_store_get_flags (GtkTreeModel *tree_model);
@@ -508,7 +508,7 @@ e_destination_store_get_column_type (GtkTreeModel *tree_model,
g_return_val_if_fail (E_IS_DESTINATION_STORE (tree_model), G_TYPE_INVALID);
g_return_val_if_fail (index >= 0 && index < E_DESTINATION_STORE_NUM_COLUMNS, G_TYPE_INVALID);
- return column_types [index];
+ return column_types[index];
}
static gboolean
@@ -666,7 +666,7 @@ e_destination_store_get_value (GtkTreeModel *tree_model,
g_return_if_fail (column < E_DESTINATION_STORE_NUM_COLUMNS);
g_return_if_fail (ITER_IS_VALID (destination_store, iter));
- g_value_init (value, column_types [column]);
+ g_value_init (value, column_types[column]);
array = destination_store->priv->destinations;
diff --git a/libedataserverui/e-name-selector-entry.c b/libedataserverui/e-name-selector-entry.c
index c95e53e..4f021c4 100644
--- a/libedataserverui/e-name-selector-entry.c
+++ b/libedataserverui/e-name-selector-entry.c
@@ -295,7 +295,7 @@ get_utf8_string_context (const gchar *string, gint position, gunichar *unichars,
gint char_pos = position - gap + i;
if (char_pos < 0 || char_pos >= len) {
- unichars [i] = '\0';
+ unichars[i] = '\0';
continue;
}
@@ -304,7 +304,7 @@ get_utf8_string_context (const gchar *string, gint position, gunichar *unichars,
else
p = g_utf8_offset_to_pointer (string, char_pos);
- unichars [i] = g_utf8_get_char (p);
+ unichars[i] = g_utf8_get_char (p);
}
}
@@ -496,7 +496,7 @@ name_style_query (const gchar *field, const gchar *value)
strv = g_strsplit (spaced_str, " ", 0);
- if (strv [0] && strv [1]) {
+ if (strv[0] && strv[1]) {
g_string_append (out, "(or ");
comma_str = g_strjoinv (", ", strv);
} else {
@@ -710,7 +710,7 @@ static gboolean
contact_match_cue (EContact *contact, const gchar *cue_str,
EContactField *matched_field, gint *matched_field_rank)
{
- EContactField fields [] = { E_CONTACT_FULL_NAME, E_CONTACT_NICKNAME, E_CONTACT_FILE_AS,
+ EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_NICKNAME, E_CONTACT_FILE_AS,
E_CONTACT_EMAIL_1, E_CONTACT_EMAIL_2, E_CONTACT_EMAIL_3,
E_CONTACT_EMAIL_4 };
gchar *email;
@@ -740,11 +740,11 @@ contact_match_cue (EContact *contact, const gchar *cue_str,
/* Don't match e-mail addresses in contact lists */
if (e_contact_get (contact, E_CONTACT_IS_LIST) &&
- fields [i] >= E_CONTACT_FIRST_EMAIL_ID &&
- fields [i] <= E_CONTACT_LAST_EMAIL_ID)
+ fields[i] >= E_CONTACT_FIRST_EMAIL_ID &&
+ fields[i] <= E_CONTACT_LAST_EMAIL_ID)
continue;
- value = e_contact_get (contact, fields [i]);
+ value = e_contact_get (contact, fields[i]);
if (!value)
continue;
@@ -934,8 +934,8 @@ type_ahead_complete (ENameSelectorEntry *name_selector_entry)
gint i;
/* keep character's case as user types */
- for (i = 0; textrep [i] && cue_str [i]; i++)
- textrep [i] = cue_str [i];
+ for (i = 0; textrep[i] && cue_str[i]; i++)
+ textrep[i] = cue_str[i];
gtk_editable_delete_text (GTK_EDITABLE (name_selector_entry), range_start, range_end);
gtk_editable_insert_text (GTK_EDITABLE (name_selector_entry), textrep, -1, &pos);
@@ -1189,8 +1189,8 @@ static gint
insert_unichar (ENameSelectorEntry *name_selector_entry, gint *pos, gunichar c)
{
const gchar *text;
- gunichar str_context [4];
- gchar buf [7];
+ gunichar str_context[4];
+ gchar buf[7];
gint len;
text = gtk_entry_get_text (GTK_ENTRY (name_selector_entry));
@@ -1200,7 +1200,7 @@ insert_unichar (ENameSelectorEntry *name_selector_entry, gint *pos, gunichar c)
* - Before or after another space.
* - At start of string. */
- if (c == ' ' && (str_context [1] == ' ' || str_context [1] == '\0' || str_context [2] == ' '))
+ if (c == ' ' && (str_context[1] == ' ' || str_context[1] == '\0' || str_context[2] == ' '))
return 0;
/* Comma is not allowed:
@@ -1213,7 +1213,7 @@ insert_unichar (ENameSelectorEntry *name_selector_entry, gint *pos, gunichar c)
gboolean at_start = FALSE;
gboolean at_end = FALSE;
- if (str_context [1] == ',' || str_context [1] == '\0')
+ if (str_context[1] == ',' || str_context[1] == '\0')
return 0;
/* We do this so we can avoid disturbing destinations with completed contacts
@@ -1256,7 +1256,7 @@ insert_unichar (ENameSelectorEntry *name_selector_entry, gint *pos, gunichar c)
/* Generic case. Allowed spaces also end up here. */
len = g_unichar_to_utf8 (c, buf);
- buf [len] = '\0';
+ buf[len] = '\0';
gtk_editable_insert_text (GTK_EDITABLE (name_selector_entry), buf, -1, pos);
@@ -1324,7 +1324,7 @@ user_delete_text (ENameSelectorEntry *name_selector_entry, gint start_pos, gint
const gchar *text;
gint index_start, index_end;
gint selection_start, selection_end;
- gunichar str_context [2], str_b_context [2];
+ gunichar str_context[2], str_b_context[2];
gint len;
gint i;
gboolean del_space = FALSE, del_comma = FALSE;
@@ -1478,7 +1478,7 @@ user_delete_text (ENameSelectorEntry *name_selector_entry, gint start_pos, gint
addresses.
*/
- if (str_b_context [1] == '"') {
+ if (str_b_context[1] == '"') {
const gchar *p;
gint j;
p = text + end_pos;
@@ -1546,7 +1546,7 @@ completion_match_selected (ENameSelectorEntry *name_selector_entry, GtkTreeModel
g_signal_handlers_block_by_func (name_selector_entry, user_insert_text, name_selector_entry);
gtk_editable_insert_text (GTK_EDITABLE (name_selector_entry), ", ", -1, &cursor_pos);
g_signal_handlers_unblock_by_func (name_selector_entry, user_insert_text, name_selector_entry);
-
+
/* Place cursor at end of address */
gtk_editable_set_position (GTK_EDITABLE (name_selector_entry), cursor_pos);
@@ -2049,7 +2049,7 @@ destination_row_changed (ENameSelectorEntry *name_selector_entry, GtkTreePath *p
gint range_start, range_end;
gint n;
- n = gtk_tree_path_get_indices (path) [0];
+ n = gtk_tree_path_get_indices (path)[0];
destination = e_destination_store_get_destination (name_selector_entry->priv->destination_store, iter);
if (!destination)
@@ -2091,7 +2091,7 @@ destination_row_inserted (ENameSelectorEntry *name_selector_entry, GtkTreePath *
gint insert_pos;
gint n;
- n = gtk_tree_path_get_indices (path) [0];
+ n = gtk_tree_path_get_indices (path)[0];
destination = e_destination_store_get_destination (name_selector_entry->priv->destination_store, iter);
g_assert (n >= 0);
@@ -2142,7 +2142,7 @@ destination_row_deleted (ENameSelectorEntry *name_selector_entry, GtkTreePath *p
gchar *p0;
gint n;
- n = gtk_tree_path_get_indices (path) [0];
+ n = gtk_tree_path_get_indices (path)[0];
g_assert (n >= 0);
text = gtk_entry_get_text (GTK_ENTRY (name_selector_entry));
diff --git a/libedataserverui/e-name-selector-model.c b/libedataserverui/e-name-selector-model.c
index 40064b2..0cd9e61 100644
--- a/libedataserverui/e-name-selector-model.c
+++ b/libedataserverui/e-name-selector-model.c
@@ -67,7 +67,7 @@ enum {
LAST_SIGNAL
};
-static guint signals [LAST_SIGNAL] = { 0 };
+static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE (ENameSelectorModel, e_name_selector_model, G_TYPE_OBJECT)
@@ -479,7 +479,7 @@ e_name_selector_model_add_section (ENameSelectorModel *name_selector_model,
g_array_append_val (name_selector_model->priv->sections, section);
destinations_changed (name_selector_model);
- g_signal_emit (name_selector_model, signals [SECTION_ADDED], 0, name);
+ g_signal_emit (name_selector_model, signals[SECTION_ADDED], 0, name);
}
/**
@@ -507,7 +507,7 @@ e_name_selector_model_remove_section (ENameSelectorModel *name_selector_model, c
g_array_remove_index_fast (name_selector_model->priv->sections, n); /* Order doesn't matter */
destinations_changed (name_selector_model);
- g_signal_emit (name_selector_model, signals [SECTION_REMOVED], 0, name);
+ g_signal_emit (name_selector_model, signals[SECTION_REMOVED], 0, name);
}
/**
diff --git a/libedataserverui/e-tree-model-generator.c b/libedataserverui/e-tree-model-generator.c
index ce2a489..5537528 100644
--- a/libedataserverui/e-tree-model-generator.c
+++ b/libedataserverui/e-tree-model-generator.c
@@ -452,7 +452,7 @@ get_node_by_child_path (ETreeModelGenerator *tree_model_generator, GtkTreePath *
break;
}
- index = gtk_tree_path_get_indices (path) [depth];
+ index = gtk_tree_path_get_indices (path)[depth];
node = &g_array_index (group, Node, index);
if (depth + 1 < gtk_tree_path_get_depth (path))
@@ -487,7 +487,7 @@ create_node_at_child_path (ETreeModelGenerator *tree_model_generator, GtkTreePat
node->child_nodes = g_array_new (FALSE, FALSE, sizeof (Node));
group = node->child_nodes;
- parent_index = gtk_tree_path_get_indices (parent_path) [gtk_tree_path_get_depth (parent_path) - 1];
+ parent_index = gtk_tree_path_get_indices (parent_path)[gtk_tree_path_get_depth (parent_path) - 1];
} else {
if (!tree_model_generator->priv->root_nodes)
tree_model_generator->priv->root_nodes = g_array_new (FALSE, FALSE, sizeof (Node));
@@ -498,7 +498,7 @@ create_node_at_child_path (ETreeModelGenerator *tree_model_generator, GtkTreePat
gtk_tree_path_free (parent_path);
- index = gtk_tree_path_get_indices (path) [gtk_tree_path_get_depth (path) - 1];
+ index = gtk_tree_path_get_indices (path)[gtk_tree_path_get_depth (path) - 1];
ETMG_DEBUG (g_print ("Inserting index %d into group of length %d\n", index, group->len));
index = MIN (index, group->len);
@@ -583,7 +583,7 @@ delete_node_at_child_path (ETreeModelGenerator *tree_model_generator, GtkTreePat
if (!group)
return;
- index = gtk_tree_path_get_indices (path) [gtk_tree_path_get_depth (path) - 1];
+ index = gtk_tree_path_get_indices (path)[gtk_tree_path_get_depth (path) - 1];
if (index >= group->len)
return;
@@ -824,7 +824,7 @@ e_tree_model_generator_convert_child_path_to_path (ETreeModelGenerator *tree_mod
break;
}
- index = gtk_tree_path_get_indices (child_path) [depth];
+ index = gtk_tree_path_get_indices (child_path)[depth];
generated_index = child_offset_to_generated_offset (group, index);
node = &g_array_index (group, Node, index);
group = node->child_nodes;
@@ -865,7 +865,7 @@ e_tree_model_generator_convert_child_iter_to_iter (ETreeModelGenerator *tree_mod
for (depth = 0; depth < gtk_tree_path_get_depth (path); depth++) {
Node *node;
- index = gtk_tree_path_get_indices (path) [depth];
+ index = gtk_tree_path_get_indices (path)[depth];
node = &g_array_index (group, Node, index);
if (depth + 1 < gtk_tree_path_get_depth (path))
@@ -916,7 +916,7 @@ e_tree_model_generator_convert_path_to_child_path (ETreeModelGenerator *tree_mod
break;
}
- index = gtk_tree_path_get_indices (generator_path) [depth];
+ index = gtk_tree_path_get_indices (generator_path)[depth];
child_index = generated_offset_to_child_offset (group, index, NULL);
node = &g_array_index (group, Node, child_index);
group = node->child_nodes;
@@ -1034,7 +1034,7 @@ e_tree_model_generator_get_iter (GtkTreeModel *tree_model, GtkTreeIter *iter, Gt
Node *node;
gint child_index;
- index = gtk_tree_path_get_indices (path) [depth];
+ index = gtk_tree_path_get_indices (path)[depth];
child_index = generated_offset_to_child_offset (group, index, NULL);
if (child_index < 0)
return FALSE;
diff --git a/libedataserverui/test-contact-store.c b/libedataserverui/test-contact-store.c
index 727f0ed..707b2ab 100644
--- a/libedataserverui/test-contact-store.c
+++ b/libedataserverui/test-contact-store.c
@@ -125,7 +125,7 @@ main (gint argc, gchar **argv)
if (argc < 2)
gconf_path = "/apps/evolution/addressbook/sources";
else
- gconf_path = argv [1];
+ gconf_path = argv[1];
g_idle_add ((GSourceFunc) start_test, (gpointer) gconf_path);
diff --git a/libedataserverui/test-source-combo-box.c b/libedataserverui/test-source-combo-box.c
index 6d3044b..3cef377 100644
--- a/libedataserverui/test-source-combo-box.c
+++ b/libedataserverui/test-source-combo-box.c
@@ -73,7 +73,7 @@ main (gint argc, gchar **argv)
if (argc < 2)
gconf_path = "/apps/evolution/calendar/sources";
else
- gconf_path = argv [1];
+ gconf_path = argv[1];
g_idle_add ((GSourceFunc) on_idle_create_widget, (gpointer) gconf_path);
diff --git a/libedataserverui/test-source-selector.c b/libedataserverui/test-source-selector.c
index 70833e2..38d6258 100644
--- a/libedataserverui/test-source-selector.c
+++ b/libedataserverui/test-source-selector.c
@@ -116,7 +116,7 @@ main (gint argc, gchar **argv)
if (argc < 2)
gconf_path = "/apps/evolution/calendar/sources";
else
- gconf_path = argv [1];
+ gconf_path = argv[1];
g_idle_add ((GSourceFunc) on_idle_create_widget, (gpointer) gconf_path);
diff --git a/servers/groupwise/e-gw-item.c b/servers/groupwise/e-gw-item.c
index 66bc49a..d7e60ed 100644
--- a/servers/groupwise/e-gw-item.c
+++ b/servers/groupwise/e-gw-item.c
@@ -3163,13 +3163,13 @@ e_gw_item_set_calendar_item_elements (EGwItem *item, SoupSoapMessage *msg)
soup_soap_message_start_element (msg, "byDay", NULL, NULL);
max_elements = G_N_ELEMENTS (rrule->by_day);
/* expand into a sequence of 'day' here */
- for (i = 0; i < max_elements && rrule->by_day [i] != E_GW_ITEM_RECUR_END_MARKER; i++) {
- const gchar *dow = e_gw_recur_get_day_of_week (rrule->by_day [i]);
+ for (i = 0; i < max_elements && rrule->by_day[i] != E_GW_ITEM_RECUR_END_MARKER; i++) {
+ const gchar *dow = e_gw_recur_get_day_of_week (rrule->by_day[i]);
- if (rrule->by_setpos [i] == E_GW_ITEM_RECUR_END_MARKER)
+ if (rrule->by_setpos[i] == E_GW_ITEM_RECUR_END_MARKER)
e_gw_message_write_string_parameter (msg, "day", NULL, dow);
else {
- gchar occur [3];
+ gchar occur[3];
g_sprintf (occur, "%d", rrule->by_setpos [i]);
e_gw_message_write_string_parameter_with_attribute (msg, "day", NULL, dow, "occurrence", occur);
@@ -3186,7 +3186,7 @@ e_gw_item_set_calendar_item_elements (EGwItem *item, SoupSoapMessage *msg)
soup_soap_message_start_element (msg, "byMonthDay", NULL, NULL);
max_elements = G_N_ELEMENTS (rrule->by_month_day);
/* expand into a sequence of 'day' here */
- for (i = 0; i < max_elements && rrule->by_month_day [i] != E_GW_ITEM_RECUR_END_MARKER; i++) {
+ for (i = 0; i < max_elements && rrule->by_month_day[i] != E_GW_ITEM_RECUR_END_MARKER; i++) {
/*TODO occurence attribute */
g_sprintf (month_day, "%d", rrule->by_month_day [i]);
e_gw_message_write_string_parameter (msg, "day", NULL, month_day);
@@ -3201,7 +3201,7 @@ e_gw_item_set_calendar_item_elements (EGwItem *item, SoupSoapMessage *msg)
soup_soap_message_start_element (msg, "byYearDay", NULL, NULL);
max_elements = G_N_ELEMENTS (rrule->by_year_day);
/* expand into a sequence of 'day' here */
- for (i = 0; i < max_elements && rrule->by_year_day [i] != E_GW_ITEM_RECUR_END_MARKER; i++) {
+ for (i = 0; i < max_elements && rrule->by_year_day[i] != E_GW_ITEM_RECUR_END_MARKER; i++) {
/*TODO occurence attribute */
g_sprintf (year_day, "%d", rrule->by_year_day [i]);
e_gw_message_write_string_parameter (msg, "day", NULL, year_day);
@@ -3216,7 +3216,7 @@ e_gw_item_set_calendar_item_elements (EGwItem *item, SoupSoapMessage *msg)
soup_soap_message_start_element (msg, "byMonth", NULL, NULL);
max_elements = G_N_ELEMENTS (rrule->by_month);
/* expand into a sequence of 'month' here */
- for (i = 0; i < max_elements && rrule->by_month [i] != E_GW_ITEM_RECUR_END_MARKER; i++) {
+ for (i = 0; i < max_elements && rrule->by_month[i] != E_GW_ITEM_RECUR_END_MARKER; i++) {
/*TODO occurence attribute */
g_sprintf (month, "%d", rrule->by_month [i]);
e_gw_message_write_string_parameter (msg, "month", NULL, month);
diff --git a/servers/groupwise/e-gw-recur-utils.c b/servers/groupwise/e-gw-recur-utils.c
index 98658eb..7a98a6f 100644
--- a/servers/groupwise/e-gw-recur-utils.c
+++ b/servers/groupwise/e-gw-recur-utils.c
@@ -33,6 +33,6 @@ e_gw_recur_get_day_of_week (gshort day)
if (day < 1 || day > 7)
return "";
- return days_of_week [day-1];
+ return days_of_week[day-1];
}
diff --git a/servers/groupwise/e-gw-recur-utils.h b/servers/groupwise/e-gw-recur-utils.h
index 933962c..47239f1 100644
--- a/servers/groupwise/e-gw-recur-utils.h
+++ b/servers/groupwise/e-gw-recur-utils.h
@@ -61,7 +61,7 @@ typedef struct {
gshort by_month_day[E_GW_ITEM_BY_MONTHDAY_SIZE];
gshort by_year_day[E_GW_ITEM_BY_YEARDAY_SIZE];
gshort by_month[E_GW_ITEM_BY_MONTH_SIZE];
- gshort by_setpos [E_GW_ITEM_BY_SETPOS_SIZE];
+ gshort by_setpos[E_GW_ITEM_BY_SETPOS_SIZE];
} EGwItemRecurrenceRule;
#define E_GW_ITEM_RECUR_END_MARKER 0x7f7f
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
