[evolution-data-server] Coding style and whitespace cleanups.
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Subject: [evolution-data-server] Coding style and whitespace cleanups.
- Date: Fri, 17 Jul 2009 23:27:14 +0000 (UTC)
commit 0b0de19984f743de0ff662bcbfaf0678d767d1f7
Author: Matthew Barnes <mbarnes redhat com>
Date: Fri Jul 17 19:13:19 2009 -0400
Coding style and whitespace cleanups.
calendar/backends/caldav/e-cal-backend-caldav.c | 6 +-
.../groupwise/e-cal-backend-groupwise-utils.c | 2 +-
.../backends/groupwise/e-cal-backend-groupwise.c | 2 +-
calendar/libedata-cal/e-cal-backend-file-store.c | 71 ++++++++++----------
calendar/libedata-cal/e-cal-backend-store.c | 38 +++++-----
calendar/libedata-cal/e-cal-backend-store.h | 5 +-
camel/camel-mime-utils.c | 2 +-
camel/providers/nntp/camel-nntp-utils.c | 4 +-
8 files changed, 64 insertions(+), 66 deletions(-)
---
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index 970591b..052cbf5 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -1622,7 +1622,7 @@ remove_complist_from_cache_and_notify_cb (gpointer key, gpointer value, gpointer
e_cal_component_free_id (id);
}
- remove_cached_attachment (cbdav, (const char *)key);
+ remove_cached_attachment (cbdav, (const gchar *)key);
return FALSE;
}
@@ -2836,7 +2836,7 @@ convert_to_url_attachment (ECalBackendCalDAV *cbdav, icalcomponent *icalcomp)
}
static void
-remove_dir (const char *dir)
+remove_dir (const gchar *dir)
{
GDir *d;
@@ -2851,7 +2851,7 @@ remove_dir (const char *dir)
while ((entry = g_dir_read_name (d)) != NULL) {
gchar *path;
- int ret;
+ gint ret;
path = g_build_filename (dir, entry, NULL);
if (g_file_test (path, G_FILE_TEST_IS_DIR))
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c b/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
index 02f2421..11f6509 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
@@ -492,7 +492,7 @@ get_actual_count (ECalComponent *comp, ECalBackendGroupwise *cbgw)
dzone = e_cal_backend_groupwise_get_default_zone (cbgw);
utc = icaltimezone_get_utc_timezone ();
-
+
if (dzone)
e_cal_recur_generate_instances (comp, -1, -1,get_recur_count, &count, resolve_tzid_cb, NULL, (icaltimezone *) dzone);
else
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise.c b/calendar/backends/groupwise/e-cal-backend-groupwise.c
index 86be730..f3836c7 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise.c
@@ -2070,7 +2070,7 @@ e_cal_backend_groupwise_create_object (ECalBackendSync *backend, EDataCal *cal,
/* Get the item back from server to update the last-modified time */
status = update_from_server (cbgw, uid_list, calobj, comp);
if (status != E_GW_CONNECTION_STATUS_OK)
- return GNOME_Evolution_Calendar_OtherError;
+ return GNOME_Evolution_Calendar_OtherError;
break;
default :
diff --git a/calendar/libedata-cal/e-cal-backend-file-store.c b/calendar/libedata-cal/e-cal-backend-file-store.c
index 9238adf..64d8280 100644
--- a/calendar/libedata-cal/e-cal-backend-file-store.c
+++ b/calendar/libedata-cal/e-cal-backend-file-store.c
@@ -44,7 +44,7 @@ struct _ECalBackendFileStorePrivate {
GHashTable *timezones;
GHashTable *comp_uid_hash;
EFileCache *keys_cache;
-
+
GStaticRWLock lock;
gchar *cache_file_name;
@@ -58,12 +58,11 @@ struct _ECalBackendFileStorePrivate {
static void save_cache (ECalBackendFileStore *store);
-
static FullCompObject *
create_new_full_object (void)
{
FullCompObject *obj;
-
+
obj = g_new0 (FullCompObject, 1);
obj->recurrences = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
@@ -102,7 +101,7 @@ put_component (ECalBackendFileStore *fstore, ECalComponent *comp)
}
g_static_rw_lock_writer_lock (&priv->lock);
-
+
obj = g_hash_table_lookup (priv->comp_uid_hash, uid);
if (obj == NULL) {
@@ -133,7 +132,7 @@ remove_component (ECalBackendFileStore *fstore, const gchar *uid, const gchar *r
FullCompObject *obj = NULL;
gboolean ret_val = TRUE;
gboolean remove_completely = FALSE;
-
+
priv = GET_PRIVATE (fstore);
g_static_rw_lock_writer_lock (&priv->lock);
@@ -166,13 +165,13 @@ get_component (ECalBackendFileStore *fstore, const gchar *uid, const gchar *rid)
ECalBackendFileStorePrivate *priv;
FullCompObject *obj = NULL;
ECalComponent *comp = NULL;
-
+
priv = GET_PRIVATE(fstore);
g_static_rw_lock_reader_lock (&priv->lock);
obj = g_hash_table_lookup (priv->comp_uid_hash, uid);
- if (obj == NULL)
+ if (obj == NULL)
goto end;
if (rid != NULL)
@@ -183,7 +182,7 @@ get_component (ECalBackendFileStore *fstore, const gchar *uid, const gchar *rid)
if (comp != NULL)
g_object_ref (comp);
-end:
+end:
g_static_rw_lock_reader_unlock (&priv->lock);
return comp;
}
@@ -209,7 +208,7 @@ e_cal_backend_file_store_put_component (ECalBackendStore *store, ECalComponent *
priv = GET_PRIVATE (fstore);
ret_val = put_component (fstore, comp);
-
+
if (ret_val) {
priv->dirty = TRUE;
@@ -226,18 +225,18 @@ e_cal_backend_file_store_remove_component (ECalBackendStore *store, const gchar
ECalBackendFileStore *fstore = E_CAL_BACKEND_FILE_STORE (store);
ECalBackendFileStorePrivate *priv;
gboolean ret_val = FALSE;
-
+
priv = GET_PRIVATE (fstore);
-
+
ret_val = remove_component (fstore, uid, rid);
-
+
if (ret_val) {
priv->dirty = TRUE;
-
+
if (!priv->freeze_changes)
save_cache (fstore);
}
-
+
return ret_val;
}
@@ -247,14 +246,14 @@ e_cal_backend_file_store_get_timezone (ECalBackendStore *store, const gchar *tzi
ECalBackendFileStore *fstore = E_CAL_BACKEND_FILE_STORE (store);
ECalBackendFileStorePrivate *priv;
const icaltimezone *zone = NULL;
-
+
priv = GET_PRIVATE (fstore);
-
+
g_static_rw_lock_reader_lock (&priv->lock);
zone = g_hash_table_lookup (priv->timezones, tzid);
g_static_rw_lock_reader_unlock (&priv->lock);
-
- return zone;
+
+ return zone;
}
static gboolean
@@ -265,14 +264,14 @@ e_cal_backend_file_store_put_timezone (ECalBackendStore *store, const icaltimezo
gboolean ret_val = FALSE;
priv = GET_PRIVATE (fstore);
-
+
g_static_rw_lock_writer_lock (&priv->lock);
g_hash_table_insert (priv->timezones, g_strdup (icaltimezone_get_tzid ((icaltimezone *) zone)), (icaltimezone *) zone);
g_static_rw_lock_writer_unlock (&priv->lock);
if (ret_val) {
priv->dirty = TRUE;
-
+
if (!priv->freeze_changes)
save_cache (fstore);
}
@@ -286,21 +285,21 @@ e_cal_backend_file_store_remove_timezone (ECalBackendStore *store, const gchar *
ECalBackendFileStore *fstore = E_CAL_BACKEND_FILE_STORE (store);
ECalBackendFileStorePrivate *priv;
gboolean ret_val = FALSE;
-
+
priv = GET_PRIVATE (fstore);
-
+
g_static_rw_lock_writer_lock (&priv->lock);
ret_val = g_hash_table_remove (priv->timezones, tzid);
g_static_rw_lock_writer_unlock (&priv->lock);
if (ret_val) {
priv->dirty = TRUE;
-
+
if (!priv->freeze_changes)
save_cache (fstore);
}
- return ret_val;
+ return ret_val;
}
static const gchar *
@@ -327,12 +326,12 @@ e_cal_backend_file_store_put_key_value (ECalBackendStore *store, const gchar *ke
gboolean ret_val = FALSE;
priv = GET_PRIVATE (fstore);
-
+
g_static_rw_lock_writer_lock (&priv->lock);
ret_val = e_file_cache_replace_object (priv->keys_cache, key, value);
g_static_rw_lock_writer_unlock (&priv->lock);
- return ret_val;
+ return ret_val;
}
static const icaltimezone *
@@ -362,11 +361,11 @@ e_cal_backend_file_store_set_default_timezone (ECalBackendStore *store, const ic
ECalBackendFileStore *fstore = E_CAL_BACKEND_FILE_STORE (store);
ECalBackendFileStorePrivate *priv;
const gchar *tzid;
-
+
priv = GET_PRIVATE (fstore);
g_static_rw_lock_writer_lock (&priv->lock);
-
+
tzid = icaltimezone_get_tzid ((icaltimezone*) zone);
g_hash_table_insert (priv->timezones, g_strdup (tzid), (icaltimezone *) zone);
e_file_cache_replace_object (priv->keys_cache, "default-zone", tzid);
@@ -385,7 +384,7 @@ e_cal_backend_file_store_thaw_changes (ECalBackendStore *store)
priv = GET_PRIVATE (fstore);
priv->freeze_changes = FALSE;
-
+
e_file_cache_thaw_changes (priv->keys_cache);
if (priv->dirty) {
save_cache (fstore);
@@ -423,7 +422,7 @@ e_cal_backend_file_store_get_components_by_uid (ECalBackendStore *store, const g
GSList *comps = NULL;
priv = GET_PRIVATE (fstore);
-
+
g_static_rw_lock_reader_lock (&priv->lock);
obj = g_hash_table_lookup (priv->comp_uid_hash, uid);
@@ -437,7 +436,7 @@ e_cal_backend_file_store_get_components_by_uid (ECalBackendStore *store, const g
}
g_hash_table_foreach (obj->recurrences, (GHFunc) add_comp_to_slist, &comps);
-end:
+end:
g_static_rw_lock_reader_unlock (&priv->lock);
return comps;
}
@@ -448,7 +447,7 @@ add_timezone (ECalBackendFileStore *fstore, icalcomponent *vtzcomp)
ECalBackendFileStorePrivate *priv;
icalproperty *prop;
icaltimezone *zone;
- const char *tzid;
+ const gchar *tzid;
prop = icalcomponent_get_first_property (vtzcomp, ICAL_TZID_PROPERTY);
if (!prop)
@@ -469,7 +468,7 @@ add_timezone (ECalBackendFileStore *fstore, icalcomponent *vtzcomp)
g_static_rw_lock_writer_unlock (&priv->lock);
}
-static void
+static void
scan_vcalendar (ECalBackendFileStore *fstore, icalcomponent *top_icalcomp)
{
ECalBackendFileStorePrivate *priv;
@@ -530,7 +529,7 @@ e_cal_backend_file_store_load (ECalBackendStore *store)
if (icalcomponent_isa (icalcomp) != ICAL_VCALENDAR_COMPONENT) {
icalcomponent_free (icalcomp);
-
+
return FALSE;
}
@@ -563,7 +562,7 @@ save_object (gpointer key, gpointer value, gpointer user_data)
g_hash_table_foreach (obj->recurrences, save_instance, vcalcomp);
}
-
+
static void
save_timezone (gpointer key, gpointer tz, gpointer vcalcomp)
{
@@ -588,7 +587,7 @@ timeout_save_cache (gpointer user_data)
g_static_rw_lock_reader_lock (&priv->lock);
priv->save_timeout_id = 0;
-
+
vcalcomp = e_cal_util_new_top_level ();
g_hash_table_foreach (priv->timezones, save_timezone, vcalcomp);
g_hash_table_foreach (priv->comp_uid_hash, save_object, vcalcomp);
diff --git a/calendar/libedata-cal/e-cal-backend-store.c b/calendar/libedata-cal/e-cal-backend-store.c
index 4e934bc..25306d1 100644
--- a/calendar/libedata-cal/e-cal-backend-store.c
+++ b/calendar/libedata-cal/e-cal-backend-store.c
@@ -68,7 +68,7 @@ set_store_path (ECalBackendStore *store)
if (priv->uri)
{
const gchar *component = get_component (priv->source_type);
- char *mangled_uri = NULL;
+ gchar *mangled_uri = NULL;
mangled_uri = g_strdup (priv->uri);
mangled_uri = g_strdelimit (mangled_uri, ":/",'_');
@@ -77,7 +77,7 @@ set_store_path (ECalBackendStore *store)
g_free (priv->path);
priv->path = g_build_filename (g_get_home_dir (), ".evolution/cache/",
- component, mangled_uri, NULL);
+ component, mangled_uri, NULL);
}
}
@@ -123,7 +123,7 @@ e_cal_backend_store_get_property (GObject *object, guint property_id, GValue *va
store = E_CAL_BACKEND_STORE (object);
priv = GET_PRIVATE(store);
- switch (property_id)
+ switch (property_id)
{
case PROP_SOURCE_TYPE:
g_value_set_enum (value, priv->source_type);
@@ -187,7 +187,7 @@ e_cal_backend_store_class_init (ECalBackendStoreClass *klass)
klass->get_key = NULL;
klass->put_key = NULL;
- g_object_class_install_property (object_class, PROP_SOURCE_TYPE,
+ g_object_class_install_property (object_class, PROP_SOURCE_TYPE,
g_param_spec_enum ("source_type", NULL, NULL,
e_cal_source_type_enum_get_type (),
E_CAL_SOURCE_TYPE_EVENT,
@@ -210,7 +210,7 @@ e_cal_backend_store_init (ECalBackendStore *store)
priv->source_type = E_CAL_SOURCE_TYPE_EVENT;
}
-const char *
+const gchar *
e_cal_backend_store_get_path (ECalBackendStore *store)
{
ECalBackendStorePrivate *priv;
@@ -219,7 +219,7 @@ e_cal_backend_store_get_path (ECalBackendStore *store)
g_return_val_if_fail (E_IS_CAL_BACKEND_STORE (store), NULL);
priv = GET_PRIVATE(store);
-
+
return priv->path;
}
@@ -228,7 +228,7 @@ e_cal_backend_store_load (ECalBackendStore *store)
{
g_return_val_if_fail (store != NULL, FALSE);
g_return_val_if_fail (E_IS_CAL_BACKEND_STORE (store), FALSE);
-
+
return (E_CAL_BACKEND_STORE_GET_CLASS (store))->load (store);
}
@@ -250,7 +250,7 @@ e_cal_backend_store_put_component (ECalBackendStore *store, ECalComponent *comp)
g_return_val_if_fail (E_IS_CAL_BACKEND_STORE (store), FALSE);
g_return_val_if_fail (comp != NULL, FALSE);
g_return_val_if_fail (E_IS_CAL_COMPONENT (comp) != FALSE, FALSE);
-
+
return (E_CAL_BACKEND_STORE_GET_CLASS (store))->put_component (store, comp);
}
@@ -261,7 +261,7 @@ e_cal_backend_store_remove_component (ECalBackendStore *store, const gchar *uid,
g_return_val_if_fail (E_IS_CAL_BACKEND_STORE (store), FALSE);
g_return_val_if_fail (uid != NULL, FALSE);
g_return_val_if_fail (rid != NULL, FALSE);
-
+
return (E_CAL_BACKEND_STORE_GET_CLASS (store))->remove_component (store, uid, rid);
}
@@ -271,7 +271,7 @@ e_cal_backend_store_get_timezone (ECalBackendStore *store, const gchar *tzid)
g_return_val_if_fail (store != NULL, NULL);
g_return_val_if_fail (E_IS_CAL_BACKEND_STORE (store), NULL);
g_return_val_if_fail (tzid != NULL, NULL);
-
+
return (E_CAL_BACKEND_STORE_GET_CLASS (store))->get_timezone (store, tzid);
}
@@ -281,7 +281,7 @@ e_cal_backend_store_put_timezone (ECalBackendStore *store, const icaltimezone *z
g_return_val_if_fail (store != NULL, FALSE);
g_return_val_if_fail (E_IS_CAL_BACKEND_STORE (store), FALSE);
g_return_val_if_fail (zone != NULL, FALSE);
-
+
return (E_CAL_BACKEND_STORE_GET_CLASS (store))->put_timezone (store, zone);
}
@@ -291,7 +291,7 @@ e_cal_backend_store_remove_timezone (ECalBackendStore *store, const gchar *tzid)
g_return_val_if_fail (store != NULL, FALSE);
g_return_val_if_fail (E_IS_CAL_BACKEND_STORE (store), FALSE);
g_return_val_if_fail (tzid != NULL, FALSE);
-
+
return (E_CAL_BACKEND_STORE_GET_CLASS (store))->remove_timezone (store, tzid);
}
@@ -300,7 +300,7 @@ e_cal_backend_store_get_default_timezone (ECalBackendStore *store)
{
g_return_val_if_fail (store != NULL, NULL);
g_return_val_if_fail (E_IS_CAL_BACKEND_STORE (store), NULL);
-
+
return (E_CAL_BACKEND_STORE_GET_CLASS (store))->get_default_timezone (store);
}
@@ -310,7 +310,7 @@ e_cal_backend_store_set_default_timezone (ECalBackendStore *store, const icaltim
g_return_val_if_fail (store != NULL, FALSE);
g_return_val_if_fail (E_IS_CAL_BACKEND_STORE (store), FALSE);
g_return_val_if_fail (zone != NULL, FALSE);
-
+
return (E_CAL_BACKEND_STORE_GET_CLASS (store))->set_default_timezone (store, zone);
}
@@ -320,7 +320,7 @@ e_cal_backend_store_get_components_by_uid (ECalBackendStore *store, const gchar
g_return_val_if_fail (store != NULL, NULL);
g_return_val_if_fail (E_IS_CAL_BACKEND_STORE (store), NULL);
g_return_val_if_fail (uid != NULL, NULL);
-
+
return (E_CAL_BACKEND_STORE_GET_CLASS (store))->get_components_by_uid (store, uid);
}
@@ -330,7 +330,7 @@ e_cal_backend_store_get_key (ECalBackendStore *store, const gchar *key)
g_return_val_if_fail (store != NULL, NULL);
g_return_val_if_fail (E_IS_CAL_BACKEND_STORE (store), NULL);
g_return_val_if_fail (key != NULL, NULL);
-
+
return (E_CAL_BACKEND_STORE_GET_CLASS (store))->get_key (store, key);
}
@@ -340,7 +340,7 @@ e_cal_backend_store_put_key (ECalBackendStore *store, const gchar *key, const gc
g_return_val_if_fail (store != NULL, FALSE);
g_return_val_if_fail (E_IS_CAL_BACKEND_STORE (store), FALSE);
g_return_val_if_fail (key != NULL, FALSE);
-
+
return (E_CAL_BACKEND_STORE_GET_CLASS (store))->put_key (store, key, value);
}
@@ -349,7 +349,7 @@ e_cal_backend_store_thaw_changes (ECalBackendStore *store)
{
g_return_if_fail (store != NULL);
g_return_if_fail (E_IS_CAL_BACKEND_STORE (store));
-
+
(E_CAL_BACKEND_STORE_GET_CLASS (store))->thaw_changes (store);
}
@@ -358,6 +358,6 @@ e_cal_backend_store_freeze_changes (ECalBackendStore *store)
{
g_return_if_fail (store != NULL);
g_return_if_fail (E_IS_CAL_BACKEND_STORE (store));
-
+
(E_CAL_BACKEND_STORE_GET_CLASS (store))->freeze_changes (store);
}
diff --git a/calendar/libedata-cal/e-cal-backend-store.h b/calendar/libedata-cal/e-cal-backend-store.h
index e517912..de04dcf 100644
--- a/calendar/libedata-cal/e-cal-backend-store.h
+++ b/calendar/libedata-cal/e-cal-backend-store.h
@@ -59,7 +59,7 @@ typedef struct {
gboolean (*put_component) (ECalBackendStore *store, ECalComponent *comp);
gboolean (*remove_component) (ECalBackendStore *store, const gchar *uid, const gchar *rid);
GSList * (*get_components_by_uid) (ECalBackendStore *store, const gchar *uid);
-
+
const icaltimezone * (*get_timezone) (ECalBackendStore *store, const gchar *tzid);
gboolean (*put_timezone) (ECalBackendStore *store, const icaltimezone *zone);
gboolean (*remove_timezone) (ECalBackendStore *store, const gchar *tzid);
@@ -77,7 +77,7 @@ typedef struct {
GType e_cal_backend_store_get_type (void);
-const char *e_cal_backend_store_get_path (ECalBackendStore *store);
+const gchar *e_cal_backend_store_get_path (ECalBackendStore *store);
gboolean e_cal_backend_store_load (ECalBackendStore *store);
ECalComponent * e_cal_backend_store_get_component (ECalBackendStore *store, const gchar *uid, const gchar *rid);
@@ -95,7 +95,6 @@ gboolean e_cal_backend_store_put_key (ECalBackendStore *store, const gchar *ke
void e_cal_backend_store_thaw_changes (ECalBackendStore *store);
void e_cal_backend_store_freeze_changes (ECalBackendStore *store);
-
G_END_DECLS
#endif /* _E_CAL_BACKEND_STORE */
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index 56bff9f..a304c5c 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -4423,7 +4423,7 @@ camel_header_msgid_generate (void)
gchar *msgid;
gint retval;
struct addrinfo *ai = NULL, hints = { 0 };
- static char *cached_hostname = NULL;
+ static gchar *cached_hostname = NULL;
if (!cached_hostname) {
retval = gethostname (host, sizeof (host));
diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c
index 8f12405..8943863 100644
--- a/camel/providers/nntp/camel-nntp-utils.c
+++ b/camel/providers/nntp/camel-nntp-utils.c
@@ -273,7 +273,7 @@ camel_nntp_get_headers (CamelStore *store,
camel_folder_summary_clear(folder->summary);
else {
while(uid_num(folder->summary, 0) < first_message) {
- char *uid = camel_folder_summary_uid_from_index (folder->summary, 0);
+ gchar *uid = camel_folder_summary_uid_from_index (folder->summary, 0);
del = g_slist_prepend (del, uid);
camel_folder_summary_remove_index_fast (s, 0);
}
@@ -281,7 +281,7 @@ camel_nntp_get_headers (CamelStore *store,
camel_db_delete_uids (folder->parent_store->cdb_w, folder->full_name, del, ex);
g_slist_foreach (del, (GFunc) g_free, NULL);
g_slist_free (del);
-
+
if(last_summary >= last_message)
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]