[evolution-data-server] Coding style and whitespace cleanup.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Coding style and whitespace cleanup.
- Date: Sat, 1 May 2010 22:21:02 +0000 (UTC)
commit cd82aa424f7aac1ac98223297df5467353bbf72c
Author: Matthew Barnes <mbarnes redhat com>
Date: Sat May 1 18:15:30 2010 -0400
Coding style and whitespace cleanup.
.../backends/google/e-book-backend-google.c | 16 ++++--
addressbook/backends/google/util.c | 58 +++++++++---------
.../backends/google/e-cal-backend-google-utils.c | 14 ++--
calendar/backends/google/e-cal-backend-google.c | 10 ++--
.../groupwise/e-cal-backend-groupwise-utils.c | 12 ++--
.../backends/groupwise/e-cal-backend-groupwise.c | 18 +++---
calendar/libecal/e-cal-system-timezone.c | 14 ++--
camel/camel-db.c | 4 +-
camel/camel-db.h | 48 ++++++++--------
camel/camel-filter-driver.c | 2 +-
camel/camel-folder-summary.c | 1 -
camel/camel-mempool.h | 8 +-
camel/camel-stream-vfs.h | 6 +-
camel/camel-vtrash-folder.c | 2 +-
camel/providers/groupwise/camel-groupwise-folder.c | 10 ++--
camel/providers/groupwise/camel-groupwise-store.c | 1 -
camel/providers/imapx/camel-imapx-folder.c | 6 +-
camel/providers/imapx/camel-imapx-folder.h | 4 +-
camel/providers/imapx/camel-imapx-provider.c | 6 +-
camel/providers/imapx/camel-imapx-server.c | 61 +++++++++----------
camel/providers/imapx/camel-imapx-store.c | 40 ++++++-------
camel/providers/imapx/camel-imapx-store.h | 4 +-
camel/providers/imapx/camel-imapx-tokenise.h | 16 +++---
camel/providers/imapx/camel-imapx-utils.c | 2 +-
libedataserver/e-categories.c | 2 +-
libedataserverui/e-passwords.c | 2 +-
26 files changed, 181 insertions(+), 186 deletions(-)
---
diff --git a/addressbook/backends/google/e-book-backend-google.c b/addressbook/backends/google/e-book-backend-google.c
index e05892b..06557c2 100644
--- a/addressbook/backends/google/e-book-backend-google.c
+++ b/addressbook/backends/google/e-book-backend-google.c
@@ -483,7 +483,7 @@ get_new_contacts_in_chunks (EBookBackend *backend, gint chunk_size, GError **err
GError *our_error = NULL;
gboolean rv = TRUE;
GTimeVal current_time;
- int results;
+ gint results;
__debug__ (G_STRFUNC);
g_return_val_if_fail (priv->service, FALSE);
@@ -641,8 +641,11 @@ e_book_backend_google_create_contact (EBookBackendSync *backend, EDataBook *book
g_free (xml);
/* Insert the entry on the server */
- new_entry = GDATA_ENTRY (gdata_contacts_service_insert_contact (GDATA_CONTACTS_SERVICE (priv->service), GDATA_CONTACTS_CONTACT (entry),
- NULL, &error));
+ new_entry = GDATA_ENTRY (
+ gdata_contacts_service_insert_contact (
+ GDATA_CONTACTS_SERVICE (priv->service),
+ GDATA_CONTACTS_CONTACT (entry),
+ NULL, &error));
g_object_unref (entry);
if (!new_entry) {
@@ -767,8 +770,11 @@ e_book_backend_google_modify_contact (EBookBackendSync *backend, EDataBook *book
g_free (xml);
/* Update the contact on the server */
- new_entry = GDATA_ENTRY (gdata_contacts_service_update_contact (GDATA_CONTACTS_SERVICE (priv->service), GDATA_CONTACTS_CONTACT (entry),
- NULL, &error));
+ new_entry = GDATA_ENTRY (
+ gdata_contacts_service_update_contact (
+ GDATA_CONTACTS_SERVICE (priv->service),
+ GDATA_CONTACTS_CONTACT (entry),
+ NULL, &error));
g_object_unref (entry);
if (!new_entry) {
diff --git a/addressbook/backends/google/util.c b/addressbook/backends/google/util.c
index 56e50f5..a5e1422 100644
--- a/addressbook/backends/google/util.c
+++ b/addressbook/backends/google/util.c
@@ -214,11 +214,11 @@ _e_contact_new_from_gdata_entry (GDataEntry *entry)
/* We just need to set the E_CONTACT_NAME field, and all the other name attribute values
* in the EContact will be populated automatically from that */
- name_struct.family = (gchar*) gdata_gd_name_get_family_name (name);
- name_struct.given = (gchar*) gdata_gd_name_get_given_name (name);
- name_struct.additional = (gchar*) gdata_gd_name_get_additional_name (name);
- name_struct.prefixes = (gchar*) gdata_gd_name_get_prefix (name);
- name_struct.suffixes = (gchar*) gdata_gd_name_get_suffix (name);
+ name_struct.family = (gchar *) gdata_gd_name_get_family_name (name);
+ name_struct.given = (gchar *) gdata_gd_name_get_given_name (name);
+ name_struct.additional = (gchar *) gdata_gd_name_get_additional_name (name);
+ name_struct.prefixes = (gchar *) gdata_gd_name_get_prefix (name);
+ name_struct.suffixes = (gchar *) gdata_gd_name_get_suffix (name);
e_contact_set (E_CONTACT (vcard), E_CONTACT_NAME, &name_struct);
}
@@ -704,10 +704,10 @@ gdata_gd_email_address_from_attribute (EVCardAttribute *attr, gboolean *have_pri
g_free (rel);
__debug__ ("New %semail entry %s (%s/%s)",
- gdata_gd_email_address_is_primary (email) ? "primary " : "",
- gdata_gd_email_address_get_address (email),
- gdata_gd_email_address_get_relation_type (email),
- gdata_gd_email_address_get_label (email));
+ gdata_gd_email_address_is_primary (email) ? "primary " : "",
+ gdata_gd_email_address_get_address (email),
+ gdata_gd_email_address_get_relation_type (email),
+ gdata_gd_email_address_get_label (email));
}
return email;
@@ -742,11 +742,11 @@ gdata_gd_im_address_from_attribute (EVCardAttribute *attr, gboolean *have_primar
g_free (protocol);
__debug__ ("New %s%s entry %s (%s/%s)",
- gdata_gd_im_address_is_primary (im) ? "primary " : "",
- gdata_gd_im_address_get_protocol (im),
- gdata_gd_im_address_get_address (im),
- gdata_gd_im_address_get_relation_type (im),
- gdata_gd_im_address_get_label (im));
+ gdata_gd_im_address_is_primary (im) ? "primary " : "",
+ gdata_gd_im_address_get_protocol (im),
+ gdata_gd_im_address_get_address (im),
+ gdata_gd_im_address_get_relation_type (im),
+ gdata_gd_im_address_get_label (im));
}
return im;
@@ -776,10 +776,10 @@ gdata_gd_phone_number_from_attribute (EVCardAttribute *attr, gboolean *have_prim
g_free (rel);
__debug__ ("New %sphone-number entry %s (%s/%s)",
- gdata_gd_phone_number_is_primary (number) ? "primary " : "",
- gdata_gd_phone_number_get_number (number),
- gdata_gd_phone_number_get_relation_type (number),
- gdata_gd_phone_number_get_label (number));
+ gdata_gd_phone_number_is_primary (number) ? "primary " : "",
+ gdata_gd_phone_number_get_number (number),
+ gdata_gd_phone_number_get_relation_type (number),
+ gdata_gd_phone_number_get_label (number));
}
return number;
@@ -809,40 +809,40 @@ gdata_gd_postal_address_from_attribute (EVCardAttribute *attr, gboolean *have_pr
g_free (rel);
__debug__ ("New %spostal address entry %s (%s/%s)",
- gdata_gd_postal_address_is_primary (address) ? "primary " : "",
- gdata_gd_postal_address_get_address (address),
- gdata_gd_postal_address_get_relation_type (address),
- gdata_gd_postal_address_get_label (address));
+ gdata_gd_postal_address_is_primary (address) ? "primary " : "",
+ gdata_gd_postal_address_get_address (address),
+ gdata_gd_postal_address_get_relation_type (address),
+ gdata_gd_postal_address_get_label (address));
/* Set the components of the address from the vCard's attribute values */
value = values;
if (!value)
return address;
- gdata_gd_postal_address_set_po_box (address, (*((gchar*) value->data) != '\0') ? value->data : NULL);
+ gdata_gd_postal_address_set_po_box (address, (*((gchar *) value->data) != '\0') ? value->data : NULL);
value = value->next;
if (!value)
return address;
- gdata_gd_postal_address_set_house_name (address, (*((gchar*) value->data) != '\0') ? value->data : NULL);
+ gdata_gd_postal_address_set_house_name (address, (*((gchar *) value->data) != '\0') ? value->data : NULL);
value = value->next;
if (!value)
return address;
- gdata_gd_postal_address_set_street (address, (*((gchar*) value->data) != '\0') ? value->data : NULL);
+ gdata_gd_postal_address_set_street (address, (*((gchar *) value->data) != '\0') ? value->data : NULL);
value = value->next;
if (!value)
return address;
- gdata_gd_postal_address_set_city (address, (*((gchar*) value->data) != '\0') ? value->data : NULL);
+ gdata_gd_postal_address_set_city (address, (*((gchar *) value->data) != '\0') ? value->data : NULL);
value = value->next;
if (!value)
return address;
- gdata_gd_postal_address_set_region (address, (*((gchar*) value->data) != '\0') ? value->data : NULL);
+ gdata_gd_postal_address_set_region (address, (*((gchar *) value->data) != '\0') ? value->data : NULL);
value = value->next;
if (!value)
return address;
- gdata_gd_postal_address_set_postcode (address, (*((gchar*) value->data) != '\0') ? value->data : NULL);
+ gdata_gd_postal_address_set_postcode (address, (*((gchar *) value->data) != '\0') ? value->data : NULL);
value = value->next;
if (!value)
return address;
- gdata_gd_postal_address_set_country (address, (*((gchar*) value->data) != '\0') ? value->data : NULL, NULL);
+ gdata_gd_postal_address_set_country (address, (*((gchar *) value->data) != '\0') ? value->data : NULL, NULL);
}
return address;
diff --git a/calendar/backends/google/e-cal-backend-google-utils.c b/calendar/backends/google/e-cal-backend-google-utils.c
index 053b6cb..25c9a28 100644
--- a/calendar/backends/google/e-cal-backend-google-utils.c
+++ b/calendar/backends/google/e-cal-backend-google-utils.c
@@ -156,7 +156,7 @@ e_cal_backend_google_utils_create_cache (ECalBackendGoogle *cbgo)
* @handle:
* Call this to update changes made to the calendar.
*
- * Returns: %TRUE if update is successful, %FALSE otherwise
+ * Returns: %TRUE if update is successful, %FALSE otherwise
**/
gpointer
e_cal_backend_google_utils_update (gpointer handle)
@@ -222,7 +222,7 @@ e_cal_backend_google_utils_update (gpointer handle)
for (iter_list = entries_list; iter_list != NULL; iter_list = iter_list->next) {
const gchar *id;
id = gdata_entry_get_id (GDATA_ENTRY (iter_list->data));
- ids_list = g_list_prepend (ids_list, (gchar*) id);
+ ids_list = g_list_prepend (ids_list, (gchar *) id);
}
/* Find the Removed Item */
@@ -494,10 +494,10 @@ e_gdata_event_to_cal_component (GDataCalendarEvent *event, ECalBackendGoogle *cb
org->value = g_strconcat ("MAILTO:", gdata_gd_who_get_email_address (go_attendee), NULL);
if (gdata_gd_who_get_value_string (go_attendee))
org->cn = g_strdup (gdata_gd_who_get_value_string (go_attendee));
- }
+ }
}
-
- attendee_list = g_slist_prepend (attendee_list, attendee);
+
+ attendee_list = g_slist_prepend (attendee_list, attendee);
}
e_cal_component_set_attendee_list (comp, attendee_list);
@@ -773,7 +773,7 @@ comp_date_time_as_ical_string (ECalComponentDateTime *dt, icaltimezone *default_
{
icaltimetype itt;
icalproperty *prop;
- char *buf;
+ gchar *buf;
itt = icaltime_convert_to_zone (*(dt->value), default_zone);
dt->value = &itt;
@@ -802,7 +802,7 @@ e_gdata_event_update_from_cal_component (ECalBackendGoogle *cbgo, GDataCalendarE
ECalComponentText *t;
GSList *attendee_list = NULL, *l = NULL;
GString *recur_string;
- char *buf;
+ gchar *buf;
priv = cbgo->priv;
diff --git a/calendar/backends/google/e-cal-backend-google.c b/calendar/backends/google/e-cal-backend-google.c
index 049dbec..f3a9709 100644
--- a/calendar/backends/google/e-cal-backend-google.c
+++ b/calendar/backends/google/e-cal-backend-google.c
@@ -73,7 +73,7 @@ struct _ECalBackendGooglePrivate {
gchar *username;
gchar *password;
gchar *uri;
- gchar *local_attachments_store;
+ gchar *local_attachments_store;
gboolean read_only;
gboolean mode_changed;
@@ -516,7 +516,7 @@ receive_object (ECalBackendGoogle *cbgo, EDataCal *cal, icalcomponent *icalcomp)
entry = GDATA_ENTRY (e_gdata_event_from_cal_component (cbgo, comp));
if (!GDATA_IS_ENTRY (entry))
- return GNOME_Evolution_Calendar_InvalidObject;
+ return GNOME_Evolution_Calendar_InvalidObject;
updated_entry = gdata_service_insert_entry (GDATA_SERVICE (priv->service), priv->uri, entry, NULL, NULL);
g_object_unref (entry);
@@ -886,7 +886,7 @@ e_cal_backend_google_modify_object (ECalBackendSync *backend, EDataCal *cal, con
updated_entry = gdata_service_update_entry (GDATA_SERVICE (priv->service), entry, NULL, NULL);
if (updated_entry) {
- /* FIXME Response from server contains additional info about GDataEntry
+ /* FIXME Response from server contains additional info about GDataEntry
* Store and use them later
*/
g_object_unref (updated_entry);
@@ -917,7 +917,7 @@ e_cal_backend_google_remove_object (ECalBackendSync *backend, EDataCal *cal,
GDataEntry *entry;
ECalBackendGooglePrivate *priv;
ECalComponent *comp = NULL;
- char *calobj = NULL;
+ gchar *calobj = NULL;
cbgo = E_CAL_BACKEND_GOOGLE (backend);
priv = cbgo->priv;
@@ -928,7 +928,7 @@ e_cal_backend_google_remove_object (ECalBackendSync *backend, EDataCal *cal,
ECalBackendSyncStatus status;
icalcomponent *icalcomp;
ECalComponentId *id;
- char *comp_str;
+ gchar *comp_str;
GDataFeed *feed;
status = e_cal_backend_google_get_object (backend, cal, uid, rid, &calobj);
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c b/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
index 6a92f44..4e68aec 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
@@ -826,7 +826,7 @@ e_gw_item_new_from_cal_component (const gchar *container, ECalBackendGroupwise *
g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), NULL);
e_cal_backend_groupwise_priv_lock (cbgw);
-
+
item = e_gw_item_new_empty ();
e_gw_item_set_container_id (item, container);
item = set_properties_from_cal_component (item, comp, cbgw);
@@ -1021,7 +1021,7 @@ get_cn_from_display_name (gchar *display_name)
}
static void
-sanitize_component (ECalComponent *comp, const gchar *server_uid, const char *container_id)
+sanitize_component (ECalComponent *comp, const gchar *server_uid, const gchar *container_id)
{
icalproperty *icalprop;
gint i;
@@ -1072,9 +1072,9 @@ e_gw_item_to_cal_component (EGwItem *item, ECalBackendGroupwise *cbgw)
EGwItemType item_type;
g_return_val_if_fail (E_IS_GW_ITEM (item), NULL);
-
+
e_cal_backend_groupwise_priv_lock (cbgw);
-
+
default_zone = e_cal_backend_groupwise_get_default_zone (cbgw);
categories_by_id = e_cal_backend_groupwise_get_categories_by_id (cbgw);
@@ -1782,7 +1782,7 @@ e_gw_connection_get_freebusy_info (ECalBackendGroupwise *cbgw, GList *users, tim
default_zone = e_cal_backend_groupwise_get_default_zone (cbgw);
cnc = e_cal_backend_groupwise_get_connection (cbgw);
-
+
g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_INVALID_CONNECTION);
/* Perform startFreeBusySession */
@@ -1861,7 +1861,7 @@ e_gw_connection_get_freebusy_info (ECalBackendGroupwise *cbgw, GList *users, tim
GSList *attendee_list = NULL;
icalcomponent *icalcomp = NULL;
icaltimetype start_time, end_time;
-
+
e_cal_backend_groupwise_priv_lock (cbgw);
tmp = soup_soap_parameter_get_first_child_by_name (subparam, "email");
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise.c b/calendar/backends/groupwise/e-cal-backend-groupwise.c
index f437017..a98e2b0 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise.c
@@ -153,8 +153,8 @@ e_cal_backend_groupwise_get_default_zone (ECalBackendGroupwise *cbgw) {
return cbgw->priv->default_zone;
}
-const char *
-e_cal_backend_groupwise_get_container_id (ECalBackendGroupwise *cbgw)
+const gchar *
+e_cal_backend_groupwise_get_container_id (ECalBackendGroupwise *cbgw)
{
return cbgw->priv->container_id;
}
@@ -214,7 +214,6 @@ populate_cache (ECalBackendGroupwise *cbgw)
kind = e_cal_backend_get_kind (E_CAL_BACKEND (cbgw));
total = priv->total_count;
-
type = get_element_type (kind);
/* Fetch the data with a bias to present, near past/future */
@@ -323,7 +322,7 @@ populate_cache (ECalBackendGroupwise *cbgw)
typedef struct
{
EGwItemCalId *calid;
- ECalBackendStore *store;
+ ECalBackendStore *store;
} CompareIdData;
static gint
@@ -333,14 +332,14 @@ compare_ids (gconstpointer a, gconstpointer b)
CompareIdData *data = (CompareIdData *) b;
EGwItemCalId *calid = data->calid;
ECalBackendStore *store = data->store;
-
+
if (!calid->recur_key)
return g_strcmp0 (cache_id->uid, calid->ical_id);
else {
ECalComponent *comp;
gint ret = 1;
- const char *cache_item_id;
-
+ const gchar *cache_item_id;
+
if (strcmp (cache_id->uid, calid->recur_key))
return 1;
@@ -432,7 +431,6 @@ get_deltas (gpointer handle)
if (status == E_GW_CONNECTION_STATUS_INVALID_CONNECTION)
status = e_gw_connection_get_items (cnc, priv->container_id, "attachments recipients message recipientStatus default peek", filter, &item_list);
-
g_object_unref (filter);
if (status != E_GW_CONNECTION_STATUS_OK) {
@@ -602,7 +600,7 @@ get_deltas (gpointer handle)
data.calid = calid;
data.store = store;
-
+
if (!(remove = g_slist_find_custom (cache_ids, &data, (GCompareFunc) compare_ids))) {
g_ptr_array_add (uid_array, g_strdup (calid->item_id));
needs_to_get = TRUE;
@@ -1638,7 +1636,7 @@ e_cal_backend_groupwise_set_default_zone (ECalBackendSync *backend, EDataCal *ca
icaltimezone_set_component (zone, tz_comp);
PRIV_LOCK (priv);
-
+
if (priv->default_zone)
icaltimezone_free (priv->default_zone, 1);
diff --git a/calendar/libecal/e-cal-system-timezone.c b/calendar/libecal/e-cal-system-timezone.c
index 1806379..295bad3 100644
--- a/calendar/libecal/e-cal-system-timezone.c
+++ b/calendar/libecal/e-cal-system-timezone.c
@@ -440,8 +440,8 @@ struct timezone_map_entry
const gchar *olson_string;
};
-static gchar*
-windows_timezone_string_to_olson(const gchar* windows_tz)
+static gchar *
+windows_timezone_string_to_olson(const gchar * windows_tz)
{
/* source: http://www.chronos-st.org/Windows-to-Olson.txt */
static const struct timezone_map_entry timezone_map[] = {
@@ -595,7 +595,7 @@ windows_timezone_string_to_olson(const gchar* windows_tz)
{ "W. Australia", "Australia/Perth" },
{ "W. Australia Standard Time", "Australia/Perth" },
{ "W. Central Africa Standard Time", "Africa/Luanda" },
- { "W. Europe", "Europe/Berlin" },
+ { "W. Europe", "Europe/Berlin" },
{ "W. Europe Standard Time", "Europe/Berlin" },
{ "Warsaw", "Europe/Warsaw" },
{ "West Asia", "Asia/Karachi" },
@@ -608,17 +608,17 @@ windows_timezone_string_to_olson(const gchar* windows_tz)
{ 0, 0 } // end marker
};
- int i;
+ gint i;
for (i=0; timezone_map[i].windows_string && windows_tz; i++) {
- int res = strcmp( timezone_map[i].windows_string, windows_tz);
+ gint res = strcmp( timezone_map[i].windows_string, windows_tz);
if (res > 0)
return NULL;
if (res == 0) {
return g_strdup(timezone_map[i].olson_string);
}
}
-
+
return NULL;
}
@@ -722,7 +722,7 @@ e_cal_system_timezone_get_location (void)
#else
gchar *windows_timezone_string = NULL;
gchar *olson_timezone_string = NULL;
-
+
if (!(windows_timezone_string = system_timezone_win32_query_registry ()))
return NULL;
olson_timezone_string = windows_timezone_string_to_olson (windows_timezone_string);
diff --git a/camel/camel-db.c b/camel/camel-db.c
index 1f5f275..59c98a5 100644
--- a/camel/camel-db.c
+++ b/camel/camel-db.c
@@ -397,7 +397,7 @@ cdb_sql_exec (sqlite3 *db, const gchar * stmt, CamelException *ex)
case insensitively (ascii, not utf8, same as 'LIKE' in SQLite3)
*/
static void
-cdb_match_func (sqlite3_context *ctx, int nArgs, sqlite3_value **values)
+cdb_match_func (sqlite3_context *ctx, gint nArgs, sqlite3_value **values)
{
gboolean matches = FALSE;
const gchar *what, *where;
@@ -416,7 +416,7 @@ cdb_match_func (sqlite3_context *ctx, int nArgs, sqlite3_value **values)
gint i, j;
for (i = 0, j = 0; where[i] && !matches; i++) {
- char c = where[i];
+ gchar c = where[i];
if (c == ' ') {
word = TRUE;
diff --git a/camel/camel-db.h b/camel/camel-db.h
index 254c13e..78173cd 100644
--- a/camel/camel-db.h
+++ b/camel/camel-db.h
@@ -93,55 +93,55 @@ struct _CamelDB {
/**
* CamelMIRecord:
* @uid:
- * Message UID
+ * Message UID
* @flags:
- * Camel Message info flags
+ * Camel Message info flags
* @msg_type:
* @dirty:
* @read:
- * boolean read status
+ * boolean read status
* @deleted:
- * boolean deleted status
+ * boolean deleted status
* @replied:
- * boolean replied status
+ * boolean replied status
* @important:
- * boolean important status
+ * boolean important status
* @junk:
- * boolean junk status
+ * boolean junk status
* @attachment:
- * boolean attachment status
+ * boolean attachment status
* @size:
- * size of the mail
+ * size of the mail
* @dsent:
- * date sent
+ * date sent
* @dreceived:
- * date received
+ * date received
* @subject:
- * subject of the mail
+ * subject of the mail
* @from:
- * sender
+ * sender
* @to:
- * recipient
+ * recipient
* @cc:
- * CC members
+ * CC members
* @mlist:
- * message list headers
+ * message list headers
* @followup_flag:
- * followup flag / also can be queried to see for followup or not
+ * followup flag / also can be queried to see for followup or not
* @followup_completed_on:
- * completed date, can be used to see if completed
+ * completed date, can be used to see if completed
* @followup_due_by:
- * to see the due by date
+ * to see the due by date
* @part:
- * part / references / thread id
+ * part / references / thread id
* @labels:
- * labels of mails also called as userflags
+ * labels of mails also called as userflags
* @usertags:
- * composite string of user tags
+ * composite string of user tags
* @cinfo:
- * content info string - composite string
+ * content info string - composite string
* @bdata:
- * provider specific data
+ * provider specific data
* @bodystructure:
*
* The extensive DB format, supporting basic searching and sorting.
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
index 680ea0a..d549493 100644
--- a/camel/camel-filter-driver.c
+++ b/camel/camel-filter-driver.c
@@ -1368,7 +1368,7 @@ camel_filter_driver_filter_folder (CamelFilterDriver *driver,
report_status (driver, CAMEL_FILTER_STATUS_START, pc, _("Getting message %d of %d"), i+1,
uids->len);
- if (camel_folder_has_summary_capability (folder))
+ if (camel_folder_has_summary_capability (folder))
info = camel_folder_get_message_info (folder, uids->pdata[i]);
else
info = NULL;
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 9755388..f6c64c7 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -5236,7 +5236,6 @@ camel_message_info_dump (CamelMessageInfo *mi)
camel_content_info_dump(((CamelMessageInfoBase *) mi)->content, 0);
}
-
/**
* camel_folder_summary_set_need_preview:
*
diff --git a/camel/camel-mempool.h b/camel/camel-mempool.h
index be01cc1..6d2edb1 100644
--- a/camel/camel-mempool.h
+++ b/camel/camel-mempool.h
@@ -42,13 +42,13 @@ typedef struct _CamelMemPool CamelMemPool;
/**
* CamelMemPoolFlags:
* @CAMEL_MEMPOOL_ALIGN_STRUCT:
- * Allocate to native structure alignment
+ * Allocate to native structure alignment
* @CAMEL_MEMPOOL_ALIGN_WORD:
- * Allocate to words - 16 bit alignment
+ * Allocate to words - 16 bit alignment
* @CAMEL_MEMPOOL_ALIGN_BYTE:
- * Allocate to bytes - 8 bit alignment
+ * Allocate to bytes - 8 bit alignment
* @CAMEL_MEMPOOL_ALIGN_MASK:
- * Which bits determine the alignment information
+ * Which bits determine the alignment information
*
* Since: 3.0
**/
diff --git a/camel/camel-stream-vfs.h b/camel/camel-stream-vfs.h
index 8231725..e086241 100644
--- a/camel/camel-stream-vfs.h
+++ b/camel/camel-stream-vfs.h
@@ -70,11 +70,11 @@ GType camel_stream_vfs_get_type (void);
/**
* CamelStreamVFSOpenMethod:
* CAMEL_STREAM_VFS_CREATE:
- * Writable, creates new file or replaces old file.
+ * Writable, creates new file or replaces old file.
* CAMEL_STREAM_VFS_APPEND:
- * Writable, creates new file or appends at the end of the old file.
+ * Writable, creates new file or appends at the end of the old file.
* CAMEL_STREAM_VFS_READ:
- * Readable, opens existing file for reading.
+ * Readable, opens existing file for reading.
*
* Since: 2.24
**/
diff --git a/camel/camel-vtrash-folder.c b/camel/camel-vtrash-folder.c
index 94e61bc..3659977 100644
--- a/camel/camel-vtrash-folder.c
+++ b/camel/camel-vtrash-folder.c
@@ -84,7 +84,7 @@ vtrash_folder_append_message (CamelFolder *folder,
CamelMimeMessage *message,
const CamelMessageInfo *info,
gchar **appended_uid,
- CamelException *ex)
+ CamelException *ex)
{
camel_exception_setv (
ex, CAMEL_EXCEPTION_SYSTEM, "%s",
diff --git a/camel/providers/groupwise/camel-groupwise-folder.c b/camel/providers/groupwise/camel-groupwise-folder.c
index fedfd5b..d3c847b 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.c
+++ b/camel/providers/groupwise/camel-groupwise-folder.c
@@ -696,7 +696,7 @@ groupwise_sync_summary (CamelFolder *folder, CamelException *ex)
total = camel_folder_summary_count (folder->summary);
unread = folder->summary->unread_count;
-
+
if (si) {
si->unread = unread;
si->total = total;
@@ -1006,7 +1006,7 @@ groupwise_sync (CamelFolder *folder, gboolean expunge, CamelMessageInfo *update_
camel_service_lock (CAMEL_SERVICE (gw_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
success = groupwise_sync_summary (folder, ex);
camel_service_unlock (CAMEL_SERVICE (gw_store), CAMEL_SERVICE_REC_CONNECT_LOCK);
-
+
camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes);
camel_folder_change_info_free (changes);
@@ -1704,13 +1704,13 @@ gw_update_cache (CamelFolder *folder, GList *list, CamelException *ex, gboolean
/************************ First populate summary *************************/
item_status = e_gw_item_get_item_status (item);
-
- /* skip the deleted items */
+
+ /* skip the deleted items */
if (item_status & E_GW_ITEM_STAT_DELETED && strcmp (full_name, "Trash")) {
i++;
continue;
}
-
+
mi = NULL;
pmi = NULL;
pmi = camel_folder_summary_uid (folder->summary, id);
diff --git a/camel/providers/groupwise/camel-groupwise-store.c b/camel/providers/groupwise/camel-groupwise-store.c
index 7cee3be..d061233 100644
--- a/camel/providers/groupwise/camel-groupwise-store.c
+++ b/camel/providers/groupwise/camel-groupwise-store.c
@@ -299,7 +299,6 @@ groupwise_connect (CamelService *service, CamelException *ex)
camel_service_construct (service, service->session, service->provider, service->url, ex);
}
-
camel_service_lock (service, CAMEL_SERVICE_REC_CONNECT_LOCK);
if (priv->cnc) {
diff --git a/camel/providers/imapx/camel-imapx-folder.c b/camel/providers/imapx/camel-imapx-folder.c
index 24ee68a..9666a12 100644
--- a/camel/providers/imapx/camel-imapx-folder.c
+++ b/camel/providers/imapx/camel-imapx-folder.c
@@ -92,7 +92,7 @@ camel_imapx_folder_new(CamelStore *store, const gchar *folder_dir, const gchar *
ifolder->search = camel_folder_search_new ();
ifolder->search_lock = g_mutex_new ();
ifolder->stream_lock = g_mutex_new ();
- ifolder->ignore_recent = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, NULL);
+ ifolder->ignore_recent = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify) g_free, NULL);
ifolder->exists_on_server = 0;
ifolder->unread_on_server = 0;
@@ -103,7 +103,7 @@ camel_imapx_folder_new(CamelStore *store, const gchar *folder_dir, const gchar *
if ((istore->rec_options & IMAPX_FILTER_INBOX))
folder->folder_flags |= CAMEL_FOLDER_FILTER_JUNK;
} else if ((istore->rec_options & (IMAPX_FILTER_JUNK | IMAPX_FILTER_JUNK_INBOX)) == IMAPX_FILTER_JUNK)
- folder->folder_flags |= CAMEL_FOLDER_FILTER_JUNK;
+ folder->folder_flags |= CAMEL_FOLDER_FILTER_JUNK;
g_free (summary_file);
@@ -253,7 +253,7 @@ imapx_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
if (!camel_exception_is_set (ex) && stream) {
msg = camel_mime_message_new();
-
+
g_mutex_lock (ifolder->stream_lock);
if (camel_data_wrapper_construct_from_stream((CamelDataWrapper *)msg, stream) == -1) {
g_object_unref (msg);
diff --git a/camel/providers/imapx/camel-imapx-folder.h b/camel/providers/imapx/camel-imapx-folder.h
index 0ea9361..ec0a802 100644
--- a/camel/providers/imapx/camel-imapx-folder.h
+++ b/camel/providers/imapx/camel-imapx-folder.h
@@ -59,10 +59,10 @@ struct _CamelIMAPXFolder {
guint32 exists_on_server;
guint32 unread_on_server;
-
+
/* hash table of UIDs to ignore as recent when updating folder */
GHashTable *ignore_recent;
-
+
GMutex *search_lock;
GMutex *stream_lock;
};
diff --git a/camel/providers/imapx/camel-imapx-provider.c b/camel/providers/imapx/camel-imapx-provider.c
index 92bb19c..41edc11 100644
--- a/camel/providers/imapx/camel-imapx-provider.c
+++ b/camel/providers/imapx/camel-imapx-provider.c
@@ -46,7 +46,7 @@ CamelProviderConfEntry imapx_conf_entries[] = {
{ CAMEL_PROVIDER_CONF_CHECKBOX, "check_lsub", NULL,
N_("Ch_eck for new messages in subscribed folders"), "0" },
{ CAMEL_PROVIDER_CONF_SECTION_END },
-#if 0
+#if 0
{ CAMEL_PROVIDER_CONF_SECTION_START, "cmdsection", NULL,
N_("Connection to Server") },
{ CAMEL_PROVIDER_CONF_CHECKBOX, "use_command", NULL,
@@ -61,12 +61,12 @@ CamelProviderConfEntry imapx_conf_entries[] = {
N_("Folders") },
{ CAMEL_PROVIDER_CONF_CHECKBOX, "use_lsub", NULL,
N_("_Show only subscribed folders"), "1" },
-#if 0
+#if 0
{ CAMEL_PROVIDER_CONF_CHECKBOX, "override_namespace", NULL,
N_("O_verride server-supplied folder namespace"), "0" },
{ CAMEL_PROVIDER_CONF_ENTRY, "namespace", "override_namespace",
N_("Namespace:") },
-#endif
+#endif
{ CAMEL_PROVIDER_CONF_SECTION_END },
{ CAMEL_PROVIDER_CONF_SECTION_START, "general", NULL, N_("Options") },
{ CAMEL_PROVIDER_CONF_CHECKBOX, "filter", NULL,
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index a235880..9e01474 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -270,7 +270,7 @@ struct _CamelIMAPXJob {
const gchar *ofolder_name;
const gchar *nfolder_name;
} rename_folder;
-
+
const gchar *folder_name;
} u;
};
@@ -855,7 +855,7 @@ imapx_command_start_next(CamelIMAPXServer *is, CamelException *ex)
return;
}
}
-
+
c(printf("-- Checking job queue\n"));
count = 0;
ic = (CamelIMAPXCommand *)is->queue.head;
@@ -868,7 +868,7 @@ imapx_command_start_next(CamelIMAPXServer *is, CamelException *ex)
camel_dlist_remove((CamelDListNode *)ic);
imapx_command_start(is, ic);
count++;
- } else
+ } else
break;
ic = nc;
nc = nc->next;
@@ -1335,7 +1335,7 @@ imapx_untagged(CamelIMAPXServer *imap, CamelException *ex)
if (!camel_folder_summary_check_uid (job->folder->summary, mi->uid)) {
CamelIMAPXFolder *ifolder = (CamelIMAPXFolder *)job->folder;
-
+
camel_folder_summary_add(job->folder->summary, mi);
imapx_set_message_info_flags_for_new_message (mi, server_flags, server_user_flags, job->folder);
camel_folder_change_info_add_uid (job->u.refresh_info.changes, mi->uid);
@@ -2234,14 +2234,13 @@ imapx_connect_to_server (CamelIMAPXServer *is, CamelException *ex)
ic = camel_imapx_command_new ("STARTTLS", NULL, "STARTTLS");
imapx_command_run (is, ic);
-
+
if (camel_exception_is_set (ic->ex) || ic->status->result != IMAPX_OK) {
if (!camel_exception_is_set (ic->ex))
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, "%s", ic->status->text);
else
camel_exception_xfer (ex, ic->ex);
-
camel_imapx_command_free(ic);
goto exit;
}
@@ -2261,7 +2260,7 @@ exit:
e(printf("Unable to connect %d %s \n", ex->id, ex->desc));
g_object_unref (is->stream);
is->stream = NULL;
-
+
if (is->cinfo) {
imapx_free_capability(is->cinfo);
is->cinfo = NULL;
@@ -2338,7 +2337,7 @@ imapx_reconnect (CamelIMAPXServer *is, CamelException *ex)
if (!(camel_exception_is_set (ic->ex) || ic->status->result != IMAPX_OK))
authenticated = TRUE;
else {
- /* If exception is set, it might be mostly due to cancellation and we would get an
+ /* If exception is set, it might be mostly due to cancellation and we would get an
io error, else re-prompt. If authentication fails for other reasons ic->status would be
set with the error message */
if (camel_exception_is_set (ic->ex)) {
@@ -2353,10 +2352,10 @@ imapx_reconnect (CamelIMAPXServer *is, CamelException *ex)
camel_exception_clear (ex);
}
-
+
camel_imapx_command_free(ic);
}
-
+
/* After login we re-capa */
if (is->cinfo) {
imapx_free_capability(is->cinfo);
@@ -2377,7 +2376,7 @@ imapx_reconnect (CamelIMAPXServer *is, CamelException *ex)
is->use_idle = TRUE;
else
is->use_idle = FALSE;
-
+
if (imapx_idle_supported (is))
imapx_init_idle (is);
@@ -2415,7 +2414,7 @@ imapx_reconnect (CamelIMAPXServer *is, CamelException *ex)
exception:
imapx_disconnect (is);
-
+
if (is->cinfo) {
imapx_free_capability(is->cinfo);
is->cinfo = NULL;
@@ -2605,15 +2604,15 @@ imapx_command_copy_messages_step_done (CamelIMAPXServer *is, CamelIMAPXCommand *
/* TODO copy the summary and cached messages to the new folder. We might need a sorted insert to avoid refreshing the dest folder */
if (ic->status->condition == IMAPX_COPYUID) {
gint i;
-
+
for (i = 0; i < ic->status->u.copyuid.copied_uids->len; i++) {
guint32 uid = GPOINTER_TO_UINT(g_ptr_array_index (ic->status->u.copyuid.copied_uids, i));
gchar *str = g_strdup_printf ("%d",uid);
CamelIMAPXFolder *ifolder = (CamelIMAPXFolder *) job->u.copy_messages.dest;
-
+
g_hash_table_insert (ifolder->ignore_recent, str, GINT_TO_POINTER (1));
}
-
+
}
if (i < uids->len) {
@@ -3299,7 +3298,6 @@ imapx_job_list_start(CamelIMAPXServer *is, CamelIMAPXJob *job)
}
/* ********************************************************************** */
-
static gchar *
imapx_encode_folder_name (CamelIMAPXStore *istore, const gchar *folder_name)
{
@@ -3311,7 +3309,7 @@ imapx_encode_folder_name (CamelIMAPXStore *istore, const gchar *folder_name)
g_free (fname);
} else
encoded = camel_utf8_utf7 (folder_name);
-
+
return encoded;
}
@@ -3335,8 +3333,7 @@ imapx_job_manage_subscription_start (CamelIMAPXServer *is, CamelIMAPXJob *job)
CamelIMAPXCommand *ic;
const gchar *str = NULL;
gchar *encoded_fname = NULL;
-
-
+
if (job->u.manage_subscriptions.subscribe)
str = "SUBSCRIBE";
else
@@ -3344,7 +3341,7 @@ imapx_job_manage_subscription_start (CamelIMAPXServer *is, CamelIMAPXJob *job)
encoded_fname = imapx_encode_folder_name ((CamelIMAPXStore *) is->store, job->u.manage_subscriptions.folder_name);
ic = camel_imapx_command_new (str, NULL, "%s %s", str, encoded_fname);
-
+
ic->pri = job->pri;
ic->job = job;
ic->complete = imapx_command_subscription_done;
@@ -3443,7 +3440,7 @@ imapx_job_rename_folder_start (CamelIMAPXServer *is, CamelIMAPXJob *job)
en_ofname = imapx_encode_folder_name ((CamelIMAPXStore *) is->store, job->u.rename_folder.ofolder_name);
en_nfname = imapx_encode_folder_name ((CamelIMAPXStore *) is->store, job->u.rename_folder.nfolder_name);
-
+
ic = camel_imapx_command_new ("RENAME", "INBOX", "RENAME %s %s", en_ofname, en_nfname);
ic->pri = job->pri;
ic->job = job;
@@ -3961,7 +3958,7 @@ imapx_disconnect (CamelIMAPXServer *is)
if (is->cinfo) {
imapx_free_capability(is->cinfo);
- is->cinfo = NULL;
+ is->cinfo = NULL;
}
is->state = IMAPX_DISCONNECTED;
@@ -4033,14 +4030,14 @@ imapx_server_get_message (CamelIMAPXServer *is, CamelFolder *folder, CamelOperat
if ((job = imapx_is_job_in_queue (is, full_name, IMAPX_JOB_GET_MESSAGE, uid))) {
flag = g_hash_table_lookup (is->uid_eflags, uid);
-
+
if (pri > job->pri)
job->pri = pri;
-
+
QUEUE_UNLOCK (is);
e_flag_wait (flag);
-
+
stream = camel_data_cache_get (ifolder->cache, "cur", uid, NULL);
if (!stream)
camel_exception_set (ex, 1, "Could not retrieve the message");
@@ -4082,11 +4079,11 @@ imapx_server_get_message (CamelIMAPXServer *is, CamelFolder *folder, CamelOperat
if (registered)
imapx_run_job(is, job);
-
+
e_flag_set (flag);
if (!camel_exception_is_set (job->ex))
stream = job->u.get_message.stream;
-
+
g_free(job);
/* HACK FIXME just sleep for sometime so that the other waiting locks gets released by that time. Think of a
@@ -4578,7 +4575,7 @@ void
camel_imapx_server_manage_subscription (CamelIMAPXServer *is, const gchar *folder_name, gboolean subscribe, CamelException *ex)
{
CamelIMAPXJob *job;
-
+
job = g_malloc0(sizeof(*job));
job->type = IMAPX_JOB_MANAGE_SUBSCRIPTION;
job->start = imapx_job_manage_subscription_start;
@@ -4586,7 +4583,7 @@ camel_imapx_server_manage_subscription (CamelIMAPXServer *is, const gchar *folde
job->ex = ex;
job->u.manage_subscriptions.subscribe = subscribe;
job->u.manage_subscriptions.folder_name = folder_name;
-
+
if (imapx_register_job (is, job))
imapx_run_job (is, job);
@@ -4597,7 +4594,7 @@ void
camel_imapx_server_create_folder (CamelIMAPXServer *is, const gchar *folder_name, CamelException *ex)
{
CamelIMAPXJob *job;
-
+
job = g_malloc0(sizeof(*job));
job->type = IMAPX_JOB_CREATE_FOLDER;
job->start = imapx_job_create_folder_start;
@@ -4615,7 +4612,7 @@ void
camel_imapx_server_delete_folder (CamelIMAPXServer *is, const gchar *folder_name, CamelException *ex)
{
CamelIMAPXJob *job;
-
+
job = g_malloc0(sizeof(*job));
job->type = IMAPX_JOB_DELETE_FOLDER;
job->start = imapx_job_delete_folder_start;
@@ -4633,7 +4630,7 @@ void
camel_imapx_server_rename_folder (CamelIMAPXServer *is, const gchar *old_name, const gchar *new_name, CamelException *ex)
{
CamelIMAPXJob *job;
-
+
job = g_malloc0(sizeof(*job));
job->type = IMAPX_JOB_RENAME_FOLDER;
job->start = imapx_job_rename_folder_start;
diff --git a/camel/providers/imapx/camel-imapx-store.c b/camel/providers/imapx/camel-imapx-store.c
index 6d1f410..cc451ab 100644
--- a/camel/providers/imapx/camel-imapx-store.c
+++ b/camel/providers/imapx/camel-imapx-store.c
@@ -166,7 +166,7 @@ imapx_query_auth_types (CamelService *service, CamelException *ex)
CamelServiceAuthType *authtype;
GList *sasl_types, *t, *next;
gboolean connected;
-
+
if (CAMEL_OFFLINE_STORE (istore)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) {
camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
_("You must be working online to complete this operation"));
@@ -174,10 +174,10 @@ imapx_query_auth_types (CamelService *service, CamelException *ex)
}
camel_service_lock (service, CAMEL_SERVICE_REC_CONNECT_LOCK);
-
+
if (istore->server == NULL)
istore->server = camel_imapx_server_new((CamelStore *)istore, service->url);
-
+
connected = istore->server->stream != NULL;
if (!connected)
connected = imapx_connect_to_server (istore->server, ex);
@@ -537,7 +537,7 @@ imapx_mark_folder_subscribed (CamelIMAPXStore *istore, const gchar *folder_name,
}
camel_store_summary_info_free((CamelStoreSummary *)istore->summary, si);
}
-
+
if (emit_signal) {
CamelFolderInfo *fi;
@@ -576,7 +576,7 @@ imapx_unsubscribe_folder (CamelStore *store, const gchar *folder_name, gboolean
if (istore->server && camel_imapx_server_connect (istore->server, TRUE, ex))
camel_imapx_server_manage_subscription (istore->server, folder_name, FALSE, ex);
-
+
if (!camel_exception_is_set (ex)) {
imapx_unmark_folder_subscribed (istore, folder_name, emit_signal, ex);
return TRUE;
@@ -595,7 +595,7 @@ static gboolean
imapx_store_unsubscribe_folder (CamelStore *store, const gchar *folder_name, CamelException *ex)
{
CamelException eex = CAMEL_EXCEPTION_INITIALISER;
-
+
if (!ex)
ex = &eex;
@@ -663,7 +663,6 @@ imapx_delete_folder (CamelStore *store, const gchar *folder_name, CamelException
return TRUE;
}
-
static void
rename_folder_info (CamelIMAPXStore *istore, const gchar *old_name, const gchar *new_name, CamelException *ex)
{
@@ -709,7 +708,6 @@ imapx_rename_folder (CamelStore *store, const gchar *old, const gchar *new, Came
CamelIMAPXStore *istore = (CamelIMAPXStore *) store;
gchar *oldpath, *newpath, *storage_path;
-
if (CAMEL_OFFLINE_STORE (store)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) {
camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
_("You must be working online to complete this operation"));
@@ -752,7 +750,7 @@ imapx_rename_folder (CamelStore *store, const gchar *old, const gchar *new, Came
static CamelFolderInfo *
imapx_create_folder (CamelStore *store, const gchar *parent_name, const gchar *folder_name, CamelException *ex)
-{
+{
const gchar *c;
CamelStoreInfo *si;
CamelIMAPXStoreNamespace *ns;
@@ -760,13 +758,13 @@ imapx_create_folder (CamelStore *store, const gchar *parent_name, const gchar *f
gchar *real_name, *full_name, *parent_real;
CamelFolderInfo *fi = NULL;
gchar dir_sep;
-
+
if (CAMEL_OFFLINE_STORE (store)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) {
camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
_("You must be working online to complete this operation"));
return NULL;
}
-
+
if (!(istore->server && camel_imapx_server_connect (istore->server, TRUE, ex)))
return NULL;
@@ -789,7 +787,7 @@ imapx_create_folder (CamelStore *store, const gchar *parent_name, const gchar *f
folder_name, *c);
return NULL;
}
-
+
parent_real = camel_imapx_store_summary_full_from_path(istore->summary, parent_name);
if (parent_real == NULL) {
camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_STATE,
@@ -823,14 +821,12 @@ imapx_create_folder (CamelStore *store, const gchar *parent_name, const gchar *f
camel_object_trigger_event (CAMEL_OBJECT (store), "folder_created", fi);
}
-
g_free (full_name);
g_free(parent_real);
return fi;
}
-
static CamelFolderInfo *
get_folder_info_offline (CamelStore *store, const gchar *top,
guint32 flags, CamelException *ex)
@@ -1157,7 +1153,7 @@ sync_folders (CamelIMAPXStore *istore, const gchar *pattern, gboolean sync, Came
camel_exception_init (&eex);
imapx_unmark_folder_subscribed (istore,dup_folder_name, TRUE, &eex);
imapx_delete_folder_from_cache (istore, dup_folder_name, &eex);
-
+
g_free (dup_folder_name);
camel_exception_clear (&eex);
} else {
@@ -1218,14 +1214,14 @@ discover_inbox (CamelStore *store, CamelException *ex)
{
CamelStoreInfo *si;
CamelIMAPXStore *istore = (CamelIMAPXStore *)store;
-
+
si = camel_store_summary_path((CamelStoreSummary *) istore->summary, "INBOX");
if (si == NULL || (si->flags & CAMEL_FOLDER_SUBSCRIBED) == 0) {
imapx_subscribe_folder (store, "INBOX", FALSE, ex);
-
+
if (!camel_exception_is_set(ex) && !si)
sync_folders (istore, "INBOX", TRUE, ex);
-
+
if (si)
camel_store_summary_info_free((CamelStoreSummary *) istore->summary, si);
}
@@ -1246,7 +1242,7 @@ imapx_get_folder_info(CamelStore *store, const gchar *top, guint32 flags, CamelE
if (CAMEL_OFFLINE_STORE(store)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) {
fi = get_folder_info_offline (store, top, flags, ex);
-
+
g_mutex_unlock (istore->get_finfo_lock);
return fi;
}
@@ -1259,7 +1255,7 @@ imapx_get_folder_info(CamelStore *store, const gchar *top, guint32 flags, CamelE
if (now - istore->last_refresh_time > FINFO_REFRESH_INTERVAL) {
struct _imapx_refresh_msg *m;
-
+
istore->last_refresh_time = time (NULL);
m = camel_session_thread_msg_new(((CamelService *)store)->session, &imapx_refresh_ops, sizeof(*m));
m->store = store;
@@ -1267,12 +1263,12 @@ imapx_get_folder_info(CamelStore *store, const gchar *top, guint32 flags, CamelE
camel_exception_init(&m->ex);
camel_session_thread_queue(((CamelService *)store)->session, &m->msg, 0);
}
-
+
fi = get_folder_info_offline (store, top, flags, ex);
g_mutex_unlock (istore->get_finfo_lock);
return fi;
}
-
+
if (!camel_service_connect((CamelService *)store, ex)) {
g_mutex_unlock (istore->get_finfo_lock);
return NULL;
diff --git a/camel/providers/imapx/camel-imapx-store.h b/camel/providers/imapx/camel-imapx-store.h
index 79fb9da..77f39c9 100644
--- a/camel/providers/imapx/camel-imapx-store.h
+++ b/camel/providers/imapx/camel-imapx-store.h
@@ -72,11 +72,11 @@ struct _CamelIMAPXStore {
guint32 rec_options;
- /* Used for syncronizing get_folder_info. Check for re-use of any other lock. At the
+ /* Used for syncronizing get_folder_info. Check for re-use of any other lock. At the
moment, could not find anything suitable for this */
GMutex *get_finfo_lock;
time_t last_refresh_time;
-
+
/* hash table of UIDs to ignore as recent when updating folder */
GHashTable *ignore_recent;
diff --git a/camel/providers/imapx/camel-imapx-tokenise.h b/camel/providers/imapx/camel-imapx-tokenise.h
index 536b021..fdfd374 100644
--- a/camel/providers/imapx/camel-imapx-tokenise.h
+++ b/camel/providers/imapx/camel-imapx-tokenise.h
@@ -30,7 +30,7 @@
#line 3 "camel-imapx-tokens.txt"
struct _imapx_keyword {const gchar *name; camel_imapx_id_t id; };
-struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register unsigned int len);
+struct _imapx_keyword *imapx_tokenise_struct (register const gchar *str, register guint len);
#define TOTAL_KEYWORDS 36
#define MIN_WORD_LENGTH 2
@@ -46,10 +46,10 @@ __inline
inline
#endif
#endif
-static unsigned int
-imapx_hash (register const char *str, register unsigned int len)
+static guint
+imapx_hash (register const gchar *str, register guint len)
{
- static unsigned char asso_values[] =
+ static guchar asso_values[] =
{
57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
@@ -78,7 +78,7 @@ imapx_hash (register const char *str, register unsigned int len)
57, 57, 57, 57, 57, 57, 57, 57, 57, 57,
57, 57, 57, 57, 57, 57
};
- return len + asso_values[(unsigned char)str[len - 1]] + asso_values[(unsigned char)str[0]];
+ return len + asso_values[(guchar)str[len - 1]] + asso_values[(guchar)str[0]];
}
#ifdef __GNUC__
@@ -88,7 +88,7 @@ __attribute__ ((__gnu_inline__))
#endif
#endif
struct _imapx_keyword *
-imapx_tokenise_struct (register const char *str, register unsigned int len)
+imapx_tokenise_struct (register const gchar *str, register guint len)
{
static struct _imapx_keyword wordlist[] =
{
@@ -178,11 +178,11 @@ imapx_tokenise_struct (register const char *str, register unsigned int len)
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
{
- register int key = imapx_hash (str, len);
+ register gint key = imapx_hash (str, len);
if (key <= MAX_HASH_VALUE && key >= 0)
{
- register const char *s = wordlist[key].name;
+ register const gchar *s = wordlist[key].name;
if (*str == *s && !strcmp (str + 1, s + 1))
return &wordlist[key];
diff --git a/camel/providers/imapx/camel-imapx-utils.c b/camel/providers/imapx/camel-imapx-utils.c
index 386d97f..2c0965e 100644
--- a/camel/providers/imapx/camel-imapx-utils.c
+++ b/camel/providers/imapx/camel-imapx-utils.c
@@ -516,7 +516,7 @@ imapx_parse_namespace_list (CamelIMAPXStream *stream, CamelException *ex)
if (!g_ascii_strncasecmp (node->path, "INBOX", 5) &&
(node->path [6] == '\0' || node->path [6] == node->sep ))
memcpy (node->path, "INBOX", 5);
-
+
/* TODO remove full_name later. not required */
node->full_name = g_strdup (node->path);
diff --git a/libedataserver/e-categories.c b/libedataserver/e-categories.c
index 24ee076..be4ca97 100644
--- a/libedataserver/e-categories.c
+++ b/libedataserver/e-categories.c
@@ -201,7 +201,7 @@ idle_saver_cb (gpointer user_data)
goto exit;
filename = build_categories_filename ();
-
+
g_debug ("Saving categories to \"%s\"", filename);
/* build the file contents */
diff --git a/libedataserverui/e-passwords.c b/libedataserverui/e-passwords.c
index 45ecc14..1b0ee7b 100644
--- a/libedataserverui/e-passwords.c
+++ b/libedataserverui/e-passwords.c
@@ -207,7 +207,7 @@ ep_key_file_save (void)
g_mkdir_with_parents (pathname, 0700);
g_file_set_contents (filename, contents, length, &error);
}
-
+
g_free (pathname);
if (error != NULL) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
