[evolution-data-server] Coding style and whitespace cleanups.
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Coding style and whitespace cleanups.
- Date: Sat, 23 Jan 2010 03:08:32 +0000 (UTC)
commit 94c5307c7a55c912f14bc3b5369082f077955ccc
Author: Matthew Barnes <mbarnes redhat com>
Date: Fri Jan 22 20:39:37 2010 -0500
Coding style and whitespace cleanups.
addressbook/tests/ebook/ebook-test-utils.c | 74 ++++++++--------
addressbook/tests/ebook/ebook-test-utils.h | 26 +++---
addressbook/tests/ebook/test-ebook-add-contact.c | 4 +-
.../tests/ebook/test-ebook-commit-contact.c | 4 +-
addressbook/tests/ebook/test-ebook-get-book-view.c | 2 +-
addressbook/tests/ebook/test-ebook-get-contact.c | 2 +-
.../tests/ebook/test-ebook-get-required-fields.c | 6 +-
.../ebook/test-ebook-get-static-capabilities.c | 2 +-
.../ebook/test-ebook-get-supported-auth-methods.c | 6 +-
.../tests/ebook/test-ebook-get-supported-fields.c | 6 +-
.../tests/ebook/test-ebook-remove-contact-by-id.c | 16 ++--
.../tests/ebook/test-ebook-remove-contact.c | 3 +-
.../tests/ebook/test-ebook-remove-contacts.c | 14 ++--
addressbook/tests/ebook/test-ebook-remove.c | 2 +-
.../tests/ebook/test-ebook-stress-factory--fifo.c | 2 +-
.../ebook/test-ebook-stress-factory--serial.c | 2 +-
.../ebook/test-ebook-stress-factory--single-book.c | 2 +-
calendar/tests/ecal/ecal-test-utils.c | 70 +++++++-------
calendar/tests/ecal/ecal-test-utils.h | 40 ++++----
calendar/tests/ecal/test-ecal-add-timezone.c | 4 +-
calendar/tests/ecal/test-ecal-create-object--2.c | 4 +-
calendar/tests/ecal/test-ecal-create-object.c | 4 +-
.../tests/ecal/test-ecal-get-alarm-email-address.c | 4 +-
calendar/tests/ecal/test-ecal-get-cal-address.c | 4 +-
calendar/tests/ecal/test-ecal-get-capabilities.c | 2 +-
calendar/tests/ecal/test-ecal-get-default-object.c | 4 +-
calendar/tests/ecal/test-ecal-get-free-busy.c | 2 +-
calendar/tests/ecal/test-ecal-get-ldap-attribute.c | 4 +-
calendar/tests/ecal/test-ecal-get-object-list.c | 4 +-
.../tests/ecal/test-ecal-get-objects-for-uid.c | 4 +-
calendar/tests/ecal/test-ecal-get-query.c | 4 +-
calendar/tests/ecal/test-ecal-get-timezone.c | 2 +-
calendar/tests/ecal/test-ecal-modify-object.c | 4 +-
calendar/tests/ecal/test-ecal-open.c | 2 +-
calendar/tests/ecal/test-ecal-receive-objects.c | 4 +-
calendar/tests/ecal/test-ecal-remove-object.c | 4 +-
calendar/tests/ecal/test-ecal-remove.c | 2 +-
calendar/tests/ecal/test-ecal-send-objects.c | 4 +-
.../tests/ecal/test-ecal-set-default-timezone.c | 2 +-
calendar/tests/ecal/test-ecal-set-mode.c | 2 +-
.../tests/ecal/test-ecal-stress-factory--fifo.c | 2 +-
.../ecal/test-ecal-stress-factory--open-async.c | 2 +-
.../tests/ecal/test-ecal-stress-factory--serial.c | 2 +-
.../ecal/test-ecal-stress-factory--single-cal.c | 2 +-
camel/camel-sasl-gssapi.c | 12 +-
camel/providers/imapx/camel-imapx-folder.c | 8 +-
camel/providers/imapx/camel-imapx-folder.h | 4 +-
camel/providers/imapx/camel-imapx-server.c | 97 ++++++++++----------
camel/providers/pop3/camel-pop3-store.c | 6 +-
49 files changed, 242 insertions(+), 246 deletions(-)
---
diff --git a/addressbook/tests/ebook/ebook-test-utils.c b/addressbook/tests/ebook/ebook-test-utils.c
index 46e03c2..d47fc58 100644
--- a/addressbook/tests/ebook/ebook-test-utils.c
+++ b/addressbook/tests/ebook/ebook-test-utils.c
@@ -8,11 +8,11 @@
#include "ebook-test-utils.h"
void
-test_print (const char *format,
+test_print (const gchar *format,
...)
{
va_list args;
- const char *debug_string;
+ const gchar *debug_string;
static gboolean debug_set = FALSE;
static gboolean debug = FALSE;
@@ -40,14 +40,14 @@ ebook_test_utils_callback_quit (gpointer user_data)
return FALSE;
}
-char*
-ebook_test_utils_new_vcard_from_test_case (const char *case_name)
+gchar *
+ebook_test_utils_new_vcard_from_test_case (const gchar *case_name)
{
- char *filename;
- char *case_filename;
+ gchar *filename;
+ gchar *case_filename;
GFile* file;
GError *error = NULL;
- char *vcard;
+ gchar *vcard;
case_filename = g_strdup_printf ("%s.vcf", case_name);
filename = g_build_filename (EBOOK_TEST_UTILS_DATA_DIR, EBOOK_TEST_UTILS_VCARDS_DIR, case_filename, NULL);
@@ -65,15 +65,15 @@ ebook_test_utils_new_vcard_from_test_case (const char *case_name)
return vcard;
}
-char*
+gchar *
ebook_test_utils_book_add_contact_from_test_case_verify (EBook *book,
- const char *case_name,
+ const gchar *case_name,
EContact **contact)
{
- char *vcard;
+ gchar *vcard;
EContact *contact_orig;
EContact *contact_final;
- char *uid;
+ gchar *uid;
vcard = ebook_test_utils_new_vcard_from_test_case (case_name);
contact_orig = e_contact_new_from_vcard (vcard);
@@ -96,7 +96,7 @@ ebook_test_utils_contacts_are_equal_shallow (EContact *a,
EContact *b)
{
- const char *uid_a, *uid_b;
+ const gchar *uid_a, *uid_b;
/* Avoid warnings if one or more are NULL, to make this function
* "NULL-friendly" */
@@ -111,14 +111,14 @@ ebook_test_utils_contacts_are_equal_shallow (EContact *a,
return g_strcmp0 (uid_a, uid_b) == 0;
}
-const char*
+const gchar *
ebook_test_utils_book_add_contact (EBook *book,
EContact *contact)
{
GError *error = NULL;
if (!e_book_add_contact (book, contact, &error)) {
- const char *uri;
+ const gchar *uri;
uri = e_book_get_uri (book);
g_warning ("failed to add contact to addressbook: `%s': %s",
@@ -132,7 +132,7 @@ ebook_test_utils_book_add_contact (EBook *book,
static void
add_contact_cb (EBook *book,
EBookStatus status,
- const char *uid,
+ const gchar *uid,
EBookTestClosure *closure)
{
if (status != E_BOOK_ERROR_OK) {
@@ -174,10 +174,10 @@ ebook_test_utils_book_commit_contact (EBook *book,
GError *error = NULL;
if (!e_book_commit_contact (book, contact, &error)) {
- const char *uid;
- const char *uri;
+ const gchar *uid;
+ const gchar *uri;
- uid = (const char*) e_contact_get_const (contact, E_CONTACT_UID);
+ uid = (const gchar *) e_contact_get_const (contact, E_CONTACT_UID);
uri = e_book_get_uri (book);
g_warning ("failed to commit changes to contact '%s' to addressbook: `%s': %s",
uid, uri, error->message);
@@ -224,13 +224,13 @@ ebook_test_utils_book_async_commit_contact (EBook *book,
EContact*
ebook_test_utils_book_get_contact (EBook *book,
- const char *uid)
+ const gchar *uid)
{
EContact *contact = NULL;
GError *error = NULL;
if (!e_book_get_contact (book, uid, &contact, &error)) {
- const char *uri;
+ const gchar *uri;
uri = e_book_get_uri (book);
g_warning ("failed to get contact '%s' in addressbook: `%s': "
@@ -247,7 +247,7 @@ get_contact_cb (EBook *book,
EContact *contact,
EBookTestClosure *closure)
{
- const char *uid;
+ const gchar *uid;
if (status != E_BOOK_ERROR_OK) {
g_warning ("failed to asynchronously get the contact: "
@@ -267,7 +267,7 @@ get_contact_cb (EBook *book,
void
ebook_test_utils_book_async_get_contact (EBook *book,
- const char *uid,
+ const gchar *uid,
GSourceFunc callback,
gpointer user_data)
{
@@ -291,7 +291,7 @@ ebook_test_utils_book_get_required_fields (EBook *book)
GError *error = NULL;
if (!e_book_get_required_fields (book, &fields, &error)) {
- const char *uri;
+ const gchar *uri;
uri = e_book_get_uri (book);
g_warning ("failed to get required fields for addressbook "
@@ -342,14 +342,14 @@ ebook_test_utils_book_async_get_required_fields (EBook *book,
}
}
-const char*
+const gchar *
ebook_test_utils_book_get_static_capabilities (EBook *book)
{
GError *error = NULL;
- const char *caps;
+ const gchar *caps;
if (!(caps = e_book_get_static_capabilities (book, &error))) {
- const char *uri;
+ const gchar *uri;
uri = e_book_get_uri (book);
g_warning ("failed to get capabilities for addressbook: `%s': "
@@ -367,7 +367,7 @@ ebook_test_utils_book_get_supported_auth_methods (EBook *book)
GError *error = NULL;
if (!e_book_get_supported_auth_methods (book, &fields, &error)) {
- const char *uri;
+ const gchar *uri;
uri = e_book_get_uri (book);
g_warning ("failed to get supported auth methods for "
@@ -426,7 +426,7 @@ ebook_test_utils_book_get_supported_fields (EBook *book)
GError *error = NULL;
if (!e_book_get_supported_fields (book, &fields, &error)) {
- const char *uri;
+ const gchar *uri;
uri = e_book_get_uri (book);
g_warning ("failed to get supported fields for addressbook "
@@ -479,12 +479,12 @@ ebook_test_utils_book_async_get_supported_fields (EBook *book,
void
ebook_test_utils_book_remove_contact (EBook *book,
- const char *uid)
+ const gchar *uid)
{
GError *error = NULL;
if (!e_book_remove_contact (book, uid, &error)) {
- const char *uri;
+ const gchar *uri;
uri = e_book_get_uri (book);
g_warning ("failed to remove contact '%s' from addressbook: `%s': %s",
@@ -552,7 +552,7 @@ remove_contact_by_id_cb (EBook *book,
void
ebook_test_utils_book_async_remove_contact_by_id (EBook *book,
- const char *uid,
+ const gchar *uid,
GSourceFunc callback,
gpointer user_data)
{
@@ -576,7 +576,7 @@ ebook_test_utils_book_remove_contacts (EBook *book,
GError *error = NULL;
if (!e_book_remove_contacts (book, ids, &error)) {
- const char *uri;
+ const gchar *uri;
uri = e_book_get_uri (book);
g_warning ("failed to remove contacts from addressbook: `%s': %s",
@@ -624,7 +624,7 @@ ebook_test_utils_book_async_remove_contacts (EBook *book,
}
EBook*
-ebook_test_utils_book_new_from_uri (const char *uri)
+ebook_test_utils_book_new_from_uri (const gchar *uri)
{
EBook *book;
GError *error = NULL;
@@ -640,12 +640,12 @@ ebook_test_utils_book_new_from_uri (const char *uri)
}
EBook*
-ebook_test_utils_book_new_temp (char **uri)
+ebook_test_utils_book_new_temp (gchar **uri)
{
EBook *book;
GError *error = NULL;
gchar *file_template;
- char *uri_result;
+ gchar *uri_result;
file_template = g_build_filename (g_get_tmp_dir (),
"ebook-test-XXXXXX/", NULL);
@@ -676,7 +676,7 @@ ebook_test_utils_book_open (EBook *book,
GError *error = NULL;
if (!e_book_open (book, only_if_exists, &error)) {
- const char *uri;
+ const gchar *uri;
uri = e_book_get_uri (book);
@@ -739,7 +739,7 @@ ebook_test_utils_book_get_book_view (EBook *book,
GError *error = NULL;
if (!e_book_get_book_view (book, query, NULL, -1, view, &error)) {
- const char *uri;
+ const gchar *uri;
uri = e_book_get_uri (book);
diff --git a/addressbook/tests/ebook/ebook-test-utils.h b/addressbook/tests/ebook/ebook-test-utils.h
index 47f33eb..789e21d 100644
--- a/addressbook/tests/ebook/ebook-test-utils.h
+++ b/addressbook/tests/ebook/ebook-test-utils.h
@@ -36,18 +36,18 @@ typedef struct {
} EBookTestClosure;
void
-test_print (const char *format,
+test_print (const gchar *format,
...);
gboolean
ebook_test_utils_callback_quit (gpointer user_data);
-char*
-ebook_test_utils_new_vcard_from_test_case (const char *case_name);
+gchar *
+ebook_test_utils_new_vcard_from_test_case (const gchar *case_name);
-char*
+gchar *
ebook_test_utils_book_add_contact_from_test_case_verify (EBook *book,
- const char *case_name,
+ const gchar *case_name,
EContact **contact);
gboolean
@@ -55,12 +55,12 @@ ebook_test_utils_contacts_are_equal_shallow (EContact *a,
EContact *b);
EBook*
-ebook_test_utils_book_new_from_uri (const char *uri);
+ebook_test_utils_book_new_from_uri (const gchar *uri);
EBook*
-ebook_test_utils_book_new_temp (char **uri);
+ebook_test_utils_book_new_temp (gchar **uri);
-const char*
+const gchar *
ebook_test_utils_book_add_contact (EBook *book,
EContact *contact);
void
@@ -80,10 +80,10 @@ ebook_test_utils_book_async_commit_contact (EBook *book,
EContact*
ebook_test_utils_book_get_contact (EBook *book,
- const char *uid);
+ const gchar *uid);
void
ebook_test_utils_book_async_get_contact (EBook *book,
- const char *uid,
+ const gchar *uid,
GSourceFunc callback,
gpointer user_data);
@@ -108,12 +108,12 @@ ebook_test_utils_book_async_get_supported_auth_methods (EBook *book,
GSourceFunc callback,
gpointer user_data);
-const char*
+const gchar *
ebook_test_utils_book_get_static_capabilities (EBook *book);
void
ebook_test_utils_book_remove_contact (EBook *book,
- const char *uid);
+ const gchar *uid);
void
ebook_test_utils_book_async_remove_contact (EBook *book,
EContact *contact,
@@ -121,7 +121,7 @@ ebook_test_utils_book_async_remove_contact (EBook *book,
gpointer user_data);
void
ebook_test_utils_book_async_remove_contact_by_id (EBook *book,
- const char *uid,
+ const gchar *uid,
GSourceFunc callback,
gpointer user_data);
diff --git a/addressbook/tests/ebook/test-ebook-add-contact.c b/addressbook/tests/ebook/test-ebook-add-contact.c
index 37c587a..7fb19ab 100644
--- a/addressbook/tests/ebook/test-ebook-add-contact.c
+++ b/addressbook/tests/ebook/test-ebook-add-contact.c
@@ -10,10 +10,10 @@ main (gint argc, gchar **argv)
{
EBook *book;
GMainLoop *loop;
- char *vcard;
+ gchar *vcard;
EContact *contact;
EContact *contact_final;
- char *uid;
+ gchar *uid;
g_type_init ();
diff --git a/addressbook/tests/ebook/test-ebook-commit-contact.c b/addressbook/tests/ebook/test-ebook-commit-contact.c
index b057980..4f93fe7 100644
--- a/addressbook/tests/ebook/test-ebook-commit-contact.c
+++ b/addressbook/tests/ebook/test-ebook-commit-contact.c
@@ -8,7 +8,7 @@
#define EMAIL_ADD "foo bar com"
static EBook *book;
-static char *uid;
+static gchar *uid;
static void
verify_precommit_and_prepare_contact (EContact *contact)
@@ -25,7 +25,7 @@ static void
verify_commit (EContact *contact)
{
EVCardAttribute *attr;
- char *email_value;
+ gchar *email_value;
g_assert ((attr = e_vcard_get_attribute (E_VCARD (contact), EVC_EMAIL)));
g_assert (e_vcard_attribute_is_single_valued (attr));
diff --git a/addressbook/tests/ebook/test-ebook-get-book-view.c b/addressbook/tests/ebook/test-ebook-get-book-view.c
index 064364a..c238168 100644
--- a/addressbook/tests/ebook/test-ebook-get-book-view.c
+++ b/addressbook/tests/ebook/test-ebook-get-book-view.c
@@ -57,7 +57,7 @@ sequence_complete (EBookView *book_view, EBookViewStatus status)
static void
setup_and_start_view (EBookView *view)
{
- g_signal_connect (view, "contacts_added", G_CALLBACK (contacts_added), NULL);
+ g_signal_connect (view, "contacts_added", G_CALLBACK (contacts_added), NULL);
g_signal_connect (view, "contacts_removed", G_CALLBACK (contacts_removed), NULL);
g_signal_connect (view, "sequence_complete", G_CALLBACK (sequence_complete), NULL);
diff --git a/addressbook/tests/ebook/test-ebook-get-contact.c b/addressbook/tests/ebook/test-ebook-get-contact.c
index 7c81536..72c5961 100644
--- a/addressbook/tests/ebook/test-ebook-get-contact.c
+++ b/addressbook/tests/ebook/test-ebook-get-contact.c
@@ -11,7 +11,7 @@ main (gint argc, gchar **argv)
EBook *book;
GMainLoop *loop;
EContact *contact_final;
- const char *uid;
+ const gchar *uid;
g_type_init ();
diff --git a/addressbook/tests/ebook/test-ebook-get-required-fields.c b/addressbook/tests/ebook/test-ebook-get-required-fields.c
index a5f7aea..d6fff7c 100644
--- a/addressbook/tests/ebook/test-ebook-get-required-fields.c
+++ b/addressbook/tests/ebook/test-ebook-get-required-fields.c
@@ -6,8 +6,8 @@
#include "ebook-test-utils.h"
static void
-list_member_print_and_free (char *member,
- gpointer user_data)
+list_member_print_and_free (gchar *member,
+ gpointer user_data)
{
test_print (" %s\n", member);
g_free (member);
@@ -20,7 +20,7 @@ get_required_fields_cb (EBookTestClosure *closure)
* we do get */
if (closure->list) {
EIterator *iter;
- const char *field;
+ const gchar *field;
test_print ("required fields:\n");
iter = e_list_get_iterator (closure->list);
diff --git a/addressbook/tests/ebook/test-ebook-get-static-capabilities.c b/addressbook/tests/ebook/test-ebook-get-static-capabilities.c
index 3e42eb5..d225e04 100644
--- a/addressbook/tests/ebook/test-ebook-get-static-capabilities.c
+++ b/addressbook/tests/ebook/test-ebook-get-static-capabilities.c
@@ -9,7 +9,7 @@ gint
main (gint argc, gchar **argv)
{
EBook *book;
- const char *caps;
+ const gchar *caps;
g_type_init ();
diff --git a/addressbook/tests/ebook/test-ebook-get-supported-auth-methods.c b/addressbook/tests/ebook/test-ebook-get-supported-auth-methods.c
index db668e1..5f4e6f1 100644
--- a/addressbook/tests/ebook/test-ebook-get-supported-auth-methods.c
+++ b/addressbook/tests/ebook/test-ebook-get-supported-auth-methods.c
@@ -6,8 +6,8 @@
#include "ebook-test-utils.h"
static void
-list_member_print_and_free (char *member,
- gpointer user_data)
+list_member_print_and_free (gchar *member,
+ gpointer user_data)
{
test_print (" %s\n", member);
g_free (member);
@@ -20,7 +20,7 @@ get_supported_auth_methods_cb (EBookTestClosure *closure)
* we do get */
if (closure->list) {
EIterator *iter;
- const char *field;
+ const gchar *field;
test_print ("supported auth methods:\n");
iter = e_list_get_iterator (closure->list);
diff --git a/addressbook/tests/ebook/test-ebook-get-supported-fields.c b/addressbook/tests/ebook/test-ebook-get-supported-fields.c
index 584ae1c..9df99dc 100644
--- a/addressbook/tests/ebook/test-ebook-get-supported-fields.c
+++ b/addressbook/tests/ebook/test-ebook-get-supported-fields.c
@@ -6,8 +6,8 @@
#include "ebook-test-utils.h"
static void
-list_member_print_and_free (char *member,
- gpointer user_data)
+list_member_print_and_free (gchar *member,
+ gpointer user_data)
{
test_print (" %s\n", member);
g_free (member);
@@ -20,7 +20,7 @@ get_supported_fields_cb (EBookTestClosure *closure)
* we do get */
if (closure->list) {
EIterator *iter;
- const char *field;
+ const gchar *field;
test_print ("supported fields:\n");
iter = e_list_get_iterator (closure->list);
diff --git a/addressbook/tests/ebook/test-ebook-remove-contact-by-id.c b/addressbook/tests/ebook/test-ebook-remove-contact-by-id.c
index d6c9ac2..004b1a7 100644
--- a/addressbook/tests/ebook/test-ebook-remove-contact-by-id.c
+++ b/addressbook/tests/ebook/test-ebook-remove-contact-by-id.c
@@ -4,15 +4,15 @@
#include "ebook-test-utils.h"
-gint
+gint
main (gint argc, gchar **argv)
-{
+{
EBook *book;
GMainLoop *loop;
- char *uid;
-
+ gchar *uid;
+
g_type_init ();
-
+
/*
* Async version
*/
@@ -24,11 +24,11 @@ main (gint argc, gchar **argv)
loop = g_main_loop_new (NULL, TRUE);
ebook_test_utils_book_async_remove_contact_by_id (book, uid,
ebook_test_utils_callback_quit, loop);
-
+
g_main_loop_run (loop);
-
+
ebook_test_utils_book_remove (book);
g_free (uid);
-
+
return 0;
}
diff --git a/addressbook/tests/ebook/test-ebook-remove-contact.c b/addressbook/tests/ebook/test-ebook-remove-contact.c
index 8b77d27..5767f49 100644
--- a/addressbook/tests/ebook/test-ebook-remove-contact.c
+++ b/addressbook/tests/ebook/test-ebook-remove-contact.c
@@ -10,7 +10,7 @@ main (gint argc, gchar **argv)
EBook *book;
GMainLoop *loop;
EContact *contact_final;
- char *uid;
+ gchar *uid;
g_type_init ();
@@ -49,7 +49,6 @@ main (gint argc, gchar **argv)
ebook_test_utils_book_async_remove_contact (book, contact_final,
ebook_test_utils_callback_quit, loop);
-
g_main_loop_run (loop);
ebook_test_utils_book_remove (book);
diff --git a/addressbook/tests/ebook/test-ebook-remove-contacts.c b/addressbook/tests/ebook/test-ebook-remove-contacts.c
index 658b4a9..11f5b2d 100644
--- a/addressbook/tests/ebook/test-ebook-remove-contacts.c
+++ b/addressbook/tests/ebook/test-ebook-remove-contacts.c
@@ -4,17 +4,17 @@
#include "ebook-test-utils.h"
-gint
+gint
main (gint argc, gchar **argv)
-{
+{
EBook *book;
GMainLoop *loop;
EContact *contact_final;
- char *uid_1, *uid_2;
+ gchar *uid_1, *uid_2;
GList *uids = NULL;
-
+
g_type_init ();
-
+
/*
* Setup
*/
@@ -43,7 +43,7 @@ main (gint argc, gchar **argv)
g_free (uid_1);
g_free (uid_2);
g_list_free (uids);
-
+
/*
* Async version
*/
@@ -59,7 +59,7 @@ main (gint argc, gchar **argv)
loop = g_main_loop_new (NULL, TRUE);
ebook_test_utils_book_async_remove_contacts (book, uids,
ebook_test_utils_callback_quit, loop);
-
+
g_main_loop_run (loop);
ebook_test_utils_book_remove (book);
diff --git a/addressbook/tests/ebook/test-ebook-remove.c b/addressbook/tests/ebook/test-ebook-remove.c
index 3f21fef..c3d4671 100644
--- a/addressbook/tests/ebook/test-ebook-remove.c
+++ b/addressbook/tests/ebook/test-ebook-remove.c
@@ -9,7 +9,7 @@ gint
main (gint argc, gchar **argv)
{
EBook *book;
- char *uri = NULL;
+ gchar *uri = NULL;
GMainLoop *loop;
g_type_init ();
diff --git a/addressbook/tests/ebook/test-ebook-stress-factory--fifo.c b/addressbook/tests/ebook/test-ebook-stress-factory--fifo.c
index cf8e03e..6483fdb 100644
--- a/addressbook/tests/ebook/test-ebook-stress-factory--fifo.c
+++ b/addressbook/tests/ebook/test-ebook-stress-factory--fifo.c
@@ -10,7 +10,7 @@
gint
main (gint argc, gchar **argv)
{
- char *uri = NULL;
+ gchar *uri = NULL;
EBook *books[NUM_BOOKS];
gint i;
diff --git a/addressbook/tests/ebook/test-ebook-stress-factory--serial.c b/addressbook/tests/ebook/test-ebook-stress-factory--serial.c
index 64bfc34..8c19bb7 100644
--- a/addressbook/tests/ebook/test-ebook-stress-factory--serial.c
+++ b/addressbook/tests/ebook/test-ebook-stress-factory--serial.c
@@ -9,7 +9,7 @@
gint
main (gint argc, gchar **argv)
{
- char *uri = NULL;
+ gchar *uri = NULL;
gint i;
g_type_init ();
diff --git a/addressbook/tests/ebook/test-ebook-stress-factory--single-book.c b/addressbook/tests/ebook/test-ebook-stress-factory--single-book.c
index 9e3e9be..53848b3 100644
--- a/addressbook/tests/ebook/test-ebook-stress-factory--single-book.c
+++ b/addressbook/tests/ebook/test-ebook-stress-factory--single-book.c
@@ -10,7 +10,7 @@
gint
main (gint argc, gchar **argv)
{
- char *uri = NULL;
+ gchar *uri = NULL;
EBook *book;
gint i;
diff --git a/calendar/tests/ecal/ecal-test-utils.c b/calendar/tests/ecal/ecal-test-utils.c
index 6aaed34..7aead7c 100644
--- a/calendar/tests/ecal/ecal-test-utils.c
+++ b/calendar/tests/ecal/ecal-test-utils.c
@@ -27,11 +27,11 @@
#include "ecal-test-utils.h"
void
-test_print (const char *format,
+test_print (const gchar *format,
...)
{
va_list args;
- const char *debug_string;
+ const gchar *debug_string;
static gboolean debug_set = FALSE;
static gboolean debug = FALSE;
@@ -51,7 +51,7 @@ test_print (const char *format,
}
ECal*
-ecal_test_utils_cal_new_from_uri (const char *uri,
+ecal_test_utils_cal_new_from_uri (const gchar *uri,
ECalSourceType type)
{
ECal *cal;
@@ -65,13 +65,13 @@ ecal_test_utils_cal_new_from_uri (const char *uri,
}
ECal*
-ecal_test_utils_cal_new_temp (char **uri,
+ecal_test_utils_cal_new_temp (gchar **uri,
ECalSourceType type)
{
ECal *cal;
GError *error = NULL;
gchar *file_template;
- char *uri_result;
+ gchar *uri_result;
file_template = g_build_filename (g_get_tmp_dir (),
"ecal-test-XXXXXX/", NULL);
@@ -101,7 +101,7 @@ ecal_test_utils_cal_open (ECal *cal,
GError *error = NULL;
if (!e_cal_open (cal, only_if_exists, &error)) {
- const char *uri;
+ const gchar *uri;
uri = e_cal_get_uri (cal);
@@ -167,11 +167,11 @@ ecal_test_utils_cal_remove (ECal *cal)
g_object_unref (cal);
}
-char*
+gchar *
ecal_test_utils_cal_get_alarm_email_address (ECal *cal)
{
GError *error = NULL;
- char *address = NULL;
+ gchar *address = NULL;
if (!e_cal_get_alarm_email_address (cal, &address, &error)) {
g_warning ("failed to get alarm email address; %s\n", error->message);
@@ -182,11 +182,11 @@ ecal_test_utils_cal_get_alarm_email_address (ECal *cal)
return address;
}
-char*
+gchar *
ecal_test_utils_cal_get_cal_address (ECal *cal)
{
GError *error = NULL;
- char *address = NULL;
+ gchar *address = NULL;
if (!e_cal_get_cal_address (cal, &address, &error)) {
g_warning ("failed to get calendar address; %s\n", error->message);
@@ -197,11 +197,11 @@ ecal_test_utils_cal_get_cal_address (ECal *cal)
return address;
}
-char*
+gchar *
ecal_test_utils_cal_get_ldap_attribute (ECal *cal)
{
GError *error = NULL;
- char *attr = NULL;
+ gchar *attr = NULL;
if (!e_cal_get_ldap_attribute (cal, &attr, &error)) {
g_warning ("failed to get ldap attribute; %s\n", error->message);
@@ -212,7 +212,7 @@ ecal_test_utils_cal_get_ldap_attribute (ECal *cal)
return attr;
}
-static const char*
+static const gchar *
b2s (gboolean value)
{
return value ? "true" : "false";
@@ -300,7 +300,7 @@ void
ecal_test_utils_cal_assert_objects_equal_shallow (icalcomponent *a,
icalcomponent *b)
{
- const char *uid_a, *uid_b;
+ const gchar *uid_a, *uid_b;
if (!icalcomponent_is_valid (a) && !icalcomponent_is_valid (b)) {
g_warning ("both components invalid");
@@ -344,7 +344,7 @@ ecal_test_utils_cal_assert_e_cal_components_equal (ECalComponent *a,
icalcomponent*
ecal_test_utils_cal_get_object (ECal *cal,
- const char *uid)
+ const gchar *uid)
{
GError *error = NULL;
icalcomponent *component = NULL;
@@ -382,7 +382,7 @@ ecal_test_utils_cal_modify_object (ECal *cal,
void
ecal_test_utils_cal_remove_object (ECal *cal,
- const char *uid)
+ const gchar *uid)
{
GError *error = NULL;
@@ -414,7 +414,7 @@ ecal_test_utils_cal_get_default_object (ECal *cal)
GList*
ecal_test_utils_cal_get_object_list (ECal *cal,
- const char *query)
+ const gchar *query)
{
GError *error = NULL;
GList *objects = NULL;
@@ -430,7 +430,7 @@ ecal_test_utils_cal_get_object_list (ECal *cal,
GList*
ecal_test_utils_cal_get_objects_for_uid (ECal *cal,
- const char *uid)
+ const gchar *uid)
{
GError *error = NULL;
GList *objects = NULL;
@@ -444,13 +444,13 @@ ecal_test_utils_cal_get_objects_for_uid (ECal *cal,
return objects;
}
-char*
+gchar *
ecal_test_utils_cal_create_object (ECal *cal,
icalcomponent *component)
{
GError *error = NULL;
- char *uid = NULL;
- char *ical_string = NULL;
+ gchar *uid = NULL;
+ gchar *ical_string = NULL;
if (!icalcomponent_is_valid (component)) {
g_warning ("supplied icalcomponent is invalid\n");
@@ -472,9 +472,9 @@ ecal_test_utils_cal_create_object (ECal *cal,
static void
cal_set_mode_cb (ECal *cal,
- ECalendarStatus status,
+ ECalendarStatus status,
CalMode mode,
- ECalTestClosure *closure)
+ ECalTestClosure *closure)
{
if (FALSE) {
} else if (status == E_CALENDAR_STATUS_BUSY) {
@@ -514,20 +514,20 @@ ecal_test_utils_cal_set_mode (ECal *cal,
void
ecal_test_utils_create_component (ECal *cal,
- const char *dtstart,
- const char *dtstart_tzid,
- const char *dtend,
- const char *dtend_tzid,
- const char *summary,
+ const gchar *dtstart,
+ const gchar *dtstart_tzid,
+ const gchar *dtend,
+ const gchar *dtend_tzid,
+ const gchar *summary,
ECalComponent **comp_out,
- char **uid_out)
+ gchar **uid_out)
{
ECalComponent *comp;
icalcomponent *icalcomp;
struct icaltimetype tt;
ECalComponentText text;
ECalComponentDateTime dt;
- char *uid;
+ gchar *uid;
comp = e_cal_component_new ();
/* set fields */
@@ -566,7 +566,7 @@ ecal_test_utils_cal_component_set_icalcomponent (ECalComponent *e_component,
icaltimezone*
ecal_test_utils_cal_get_timezone (ECal *cal,
- const char *tzid)
+ const gchar *tzid)
{
GError *error = NULL;
icaltimezone *zone = NULL;
@@ -585,7 +585,7 @@ ecal_test_utils_cal_add_timezone (ECal *cal,
icaltimezone *zone)
{
GError *error = NULL;
- const char *name;
+ const gchar *name;
name = icaltimezone_get_display_name (zone);
@@ -601,7 +601,7 @@ ecal_test_utils_cal_set_default_timezone (ECal *cal,
icaltimezone *zone)
{
GError *error = NULL;
- const char *name;
+ const gchar *name;
name = icaltimezone_get_display_name (zone);
@@ -663,7 +663,7 @@ ecal_test_utils_cal_send_objects (ECal *cal,
return;
}
for (l = *users; l; l = l->next) {
- test_print (" %s\n", (const char*) l->data);
+ test_print (" %s\n", (const gchar *) l->data);
}
}
@@ -682,7 +682,7 @@ ecal_test_utils_cal_receive_objects (ECal *cal,
ECalView*
ecal_test_utils_get_query (ECal *cal,
- const char *sexp)
+ const gchar *sexp)
{
GError *error = NULL;
ECalView *query = NULL;
diff --git a/calendar/tests/ecal/ecal-test-utils.h b/calendar/tests/ecal/ecal-test-utils.h
index 4d16a0a..60760e7 100644
--- a/calendar/tests/ecal/ecal-test-utils.h
+++ b/calendar/tests/ecal/ecal-test-utils.h
@@ -33,16 +33,16 @@ typedef struct {
} ECalTestClosure;
void
-test_print (const char *format,
+test_print (const gchar *format,
...);
ECal*
-ecal_test_utils_cal_new_from_uri (const char *uri,
+ecal_test_utils_cal_new_from_uri (const gchar *uri,
ECalSourceType type);
ECal*
-ecal_test_utils_cal_new_temp (char **uri,
- ECalSourceType type);
+ecal_test_utils_cal_new_temp (gchar **uri,
+ ECalSourceType type);
void
ecal_test_utils_cal_open (ECal *cal,
@@ -57,13 +57,13 @@ ecal_test_utils_cal_async_open (ECal *cal,
void
ecal_test_utils_cal_remove (ECal *cal);
-char*
+gchar *
ecal_test_utils_cal_get_alarm_email_address (ECal *cal);
-char*
+gchar *
ecal_test_utils_cal_get_cal_address (ECal *cal);
-char*
+gchar *
ecal_test_utils_cal_get_ldap_attribute (ECal *cal);
void
@@ -85,7 +85,7 @@ ecal_test_utils_cal_assert_e_cal_components_equal (ECalComponent *a,
icalcomponent*
ecal_test_utils_cal_get_object (ECal *cal,
- const char *uid);
+ const gchar *uid);
void
ecal_test_utils_cal_modify_object (ECal *cal,
@@ -94,20 +94,20 @@ ecal_test_utils_cal_modify_object (ECal *cal,
void
ecal_test_utils_cal_remove_object (ECal *cal,
- const char *uid);
+ const gchar *uid);
icalcomponent*
ecal_test_utils_cal_get_default_object (ECal *cal);
GList*
ecal_test_utils_cal_get_object_list (ECal *cal,
- const char *query);
+ const gchar *query);
GList*
ecal_test_utils_cal_get_objects_for_uid (ECal *cal,
- const char *uid);
+ const gchar *uid);
-char*
+gchar *
ecal_test_utils_cal_create_object (ECal *cal,
icalcomponent *component);
@@ -119,13 +119,13 @@ ecal_test_utils_cal_set_mode (ECal *cal,
void
ecal_test_utils_create_component (ECal *cal,
- const char *dtstart,
- const char *dtstart_tzid,
- const char *dtend,
- const char *dtend_tzid,
- const char *summary,
+ const gchar *dtstart,
+ const gchar *dtstart_tzid,
+ const gchar *dtend,
+ const gchar *dtend_tzid,
+ const gchar *summary,
ECalComponent **comp_out,
- char **uid_out);
+ gchar **uid_out);
void
ecal_test_utils_cal_component_set_icalcomponent (ECalComponent *e_component,
@@ -133,7 +133,7 @@ ecal_test_utils_cal_component_set_icalcomponent (ECalComponent *e_component,
icaltimezone*
ecal_test_utils_cal_get_timezone (ECal *cal,
- const char *tzid);
+ const gchar *tzid);
void
ecal_test_utils_cal_add_timezone (ECal *cal,
@@ -155,6 +155,6 @@ ecal_test_utils_cal_receive_objects (ECal *cal,
ECalView*
ecal_test_utils_get_query (ECal *cal,
- const char *sexp);
+ const gchar *sexp);
#endif /* _ECAL_TEST_UTILS_H */
diff --git a/calendar/tests/ecal/test-ecal-add-timezone.c b/calendar/tests/ecal/test-ecal-add-timezone.c
index eeb4413..2c034c1 100644
--- a/calendar/tests/ecal/test-ecal-add-timezone.c
+++ b/calendar/tests/ecal/test-ecal-add-timezone.c
@@ -13,7 +13,7 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
icalproperty *property;
icalcomponent *component;
icaltimezone *zone;
@@ -32,7 +32,7 @@ main (gint argc, gchar **argv)
icalcomponent_add_property (component, property);
zone = icaltimezone_new ();
icaltimezone_set_component (zone, component);
-
+
/* add */
ecal_test_utils_cal_add_timezone (cal, zone);
diff --git a/calendar/tests/ecal/test-ecal-create-object--2.c b/calendar/tests/ecal/test-ecal-create-object--2.c
index 550f735..220790c 100644
--- a/calendar/tests/ecal/test-ecal-create-object--2.c
+++ b/calendar/tests/ecal/test-ecal-create-object--2.c
@@ -12,10 +12,10 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
ECalComponent *e_component, *e_component_final;
icalcomponent *icalcomponent_final;
- char *uid;
+ gchar *uid;
cal = ecal_test_utils_cal_new_temp (&uri, E_CAL_SOURCE_TYPE_EVENT);
ecal_test_utils_cal_open (cal, FALSE);
diff --git a/calendar/tests/ecal/test-ecal-create-object.c b/calendar/tests/ecal/test-ecal-create-object.c
index 4d20482..e9f2301 100644
--- a/calendar/tests/ecal/test-ecal-create-object.c
+++ b/calendar/tests/ecal/test-ecal-create-object.c
@@ -10,10 +10,10 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
icalcomponent *component;
icalcomponent *component_final;
- char *uid;
+ gchar *uid;
g_type_init ();
diff --git a/calendar/tests/ecal/test-ecal-get-alarm-email-address.c b/calendar/tests/ecal/test-ecal-get-alarm-email-address.c
index f32254c..c9bff46 100644
--- a/calendar/tests/ecal/test-ecal-get-alarm-email-address.c
+++ b/calendar/tests/ecal/test-ecal-get-alarm-email-address.c
@@ -9,8 +9,8 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
- char *address;
+ gchar *uri = NULL;
+ gchar *address;
g_type_init ();
diff --git a/calendar/tests/ecal/test-ecal-get-cal-address.c b/calendar/tests/ecal/test-ecal-get-cal-address.c
index 1522baf..5bd21b6 100644
--- a/calendar/tests/ecal/test-ecal-get-cal-address.c
+++ b/calendar/tests/ecal/test-ecal-get-cal-address.c
@@ -9,8 +9,8 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
- char *address;
+ gchar *uri = NULL;
+ gchar *address;
g_type_init ();
diff --git a/calendar/tests/ecal/test-ecal-get-capabilities.c b/calendar/tests/ecal/test-ecal-get-capabilities.c
index fa68a9f..d81ddb8 100644
--- a/calendar/tests/ecal/test-ecal-get-capabilities.c
+++ b/calendar/tests/ecal/test-ecal-get-capabilities.c
@@ -9,7 +9,7 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
g_type_init ();
diff --git a/calendar/tests/ecal/test-ecal-get-default-object.c b/calendar/tests/ecal/test-ecal-get-default-object.c
index a003179..f6ff1e8 100644
--- a/calendar/tests/ecal/test-ecal-get-default-object.c
+++ b/calendar/tests/ecal/test-ecal-get-default-object.c
@@ -10,9 +10,9 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
icalcomponent *component;
- char *component_string;
+ gchar *component_string;
g_type_init ();
diff --git a/calendar/tests/ecal/test-ecal-get-free-busy.c b/calendar/tests/ecal/test-ecal-get-free-busy.c
index 0fa395d..8ecdf7e 100644
--- a/calendar/tests/ecal/test-ecal-get-free-busy.c
+++ b/calendar/tests/ecal/test-ecal-get-free-busy.c
@@ -11,7 +11,7 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
GList *users = NULL;
icaltimezone *utc;
time_t start = time (NULL), end;
diff --git a/calendar/tests/ecal/test-ecal-get-ldap-attribute.c b/calendar/tests/ecal/test-ecal-get-ldap-attribute.c
index 04ca522..7f1e3c1 100644
--- a/calendar/tests/ecal/test-ecal-get-ldap-attribute.c
+++ b/calendar/tests/ecal/test-ecal-get-ldap-attribute.c
@@ -9,8 +9,8 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
- char *attr;
+ gchar *uri = NULL;
+ gchar *attr;
g_type_init ();
diff --git a/calendar/tests/ecal/test-ecal-get-object-list.c b/calendar/tests/ecal/test-ecal-get-object-list.c
index 6705439..fb9a563 100644
--- a/calendar/tests/ecal/test-ecal-get-object-list.c
+++ b/calendar/tests/ecal/test-ecal-get-object-list.c
@@ -12,11 +12,11 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
ECalComponent *e_component;
icalcomponent *component;
icalcomponent *component_final;
- char *uid;
+ gchar *uid;
GList *components;
g_type_init ();
diff --git a/calendar/tests/ecal/test-ecal-get-objects-for-uid.c b/calendar/tests/ecal/test-ecal-get-objects-for-uid.c
index cd5e7d1..a502008 100644
--- a/calendar/tests/ecal/test-ecal-get-objects-for-uid.c
+++ b/calendar/tests/ecal/test-ecal-get-objects-for-uid.c
@@ -10,11 +10,11 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
icalcomponent *component;
icalcomponent *component_final;
ECalComponent *e_component_final;
- char *uid;
+ gchar *uid;
GList *components;
g_type_init ();
diff --git a/calendar/tests/ecal/test-ecal-get-query.c b/calendar/tests/ecal/test-ecal-get-query.c
index 5984c7b..b1f54ec 100644
--- a/calendar/tests/ecal/test-ecal-get-query.c
+++ b/calendar/tests/ecal/test-ecal-get-query.c
@@ -102,7 +102,7 @@ alter_cal_cb (ECal *cal)
icalcomponent *component;
icalcomponent *component_final;
struct icaltimetype icaltime;
- char *uid;
+ gchar *uid;
/* create a calendar object */
ecal_test_utils_create_component (cal, INITIAL_BEGIN_TIME,
@@ -149,7 +149,7 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
ECalView *view = NULL;
g_type_init ();
diff --git a/calendar/tests/ecal/test-ecal-get-timezone.c b/calendar/tests/ecal/test-ecal-get-timezone.c
index 3f6961b..29399ec 100644
--- a/calendar/tests/ecal/test-ecal-get-timezone.c
+++ b/calendar/tests/ecal/test-ecal-get-timezone.c
@@ -10,7 +10,7 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
icaltimezone *zone;
icaltimezone *utc_zone;
diff --git a/calendar/tests/ecal/test-ecal-modify-object.c b/calendar/tests/ecal/test-ecal-modify-object.c
index be11289..b1c9933 100644
--- a/calendar/tests/ecal/test-ecal-modify-object.c
+++ b/calendar/tests/ecal/test-ecal-modify-object.c
@@ -18,13 +18,13 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
ECalComponent *e_component;
ECalComponent *e_component_final;
icalcomponent *component;
icalcomponent *component_final;
struct icaltimetype icaltime;
- char *uid;
+ gchar *uid;
g_type_init ();
diff --git a/calendar/tests/ecal/test-ecal-open.c b/calendar/tests/ecal/test-ecal-open.c
index 1363731..2eeaa92 100644
--- a/calendar/tests/ecal/test-ecal-open.c
+++ b/calendar/tests/ecal/test-ecal-open.c
@@ -31,7 +31,7 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
GMainLoop *loop;
g_type_init ();
diff --git a/calendar/tests/ecal/test-ecal-receive-objects.c b/calendar/tests/ecal/test-ecal-receive-objects.c
index 6500d8f..4721d65 100644
--- a/calendar/tests/ecal/test-ecal-receive-objects.c
+++ b/calendar/tests/ecal/test-ecal-receive-objects.c
@@ -10,10 +10,10 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
ECalComponent *e_component = NULL;
icalcomponent *component = NULL;
- char *uid = NULL;
+ gchar *uid = NULL;
g_type_init ();
diff --git a/calendar/tests/ecal/test-ecal-remove-object.c b/calendar/tests/ecal/test-ecal-remove-object.c
index 7e05731..1bc9e1c 100644
--- a/calendar/tests/ecal/test-ecal-remove-object.c
+++ b/calendar/tests/ecal/test-ecal-remove-object.c
@@ -10,10 +10,10 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
icalcomponent *component;
icalcomponent *component_final;
- char *uid;
+ gchar *uid;
g_type_init ();
diff --git a/calendar/tests/ecal/test-ecal-remove.c b/calendar/tests/ecal/test-ecal-remove.c
index 7b48ff7..2d6b048 100644
--- a/calendar/tests/ecal/test-ecal-remove.c
+++ b/calendar/tests/ecal/test-ecal-remove.c
@@ -9,7 +9,7 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
g_type_init ();
diff --git a/calendar/tests/ecal/test-ecal-send-objects.c b/calendar/tests/ecal/test-ecal-send-objects.c
index fcd7c95..aa7c0d5 100644
--- a/calendar/tests/ecal/test-ecal-send-objects.c
+++ b/calendar/tests/ecal/test-ecal-send-objects.c
@@ -10,12 +10,12 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
GList *users = NULL;
ECalComponent *e_component = NULL;
icalcomponent *component = NULL;
icalcomponent *modified_component = NULL;
- char *uid = NULL;
+ gchar *uid = NULL;
g_type_init ();
diff --git a/calendar/tests/ecal/test-ecal-set-default-timezone.c b/calendar/tests/ecal/test-ecal-set-default-timezone.c
index 11b04f6..98a18de 100644
--- a/calendar/tests/ecal/test-ecal-set-default-timezone.c
+++ b/calendar/tests/ecal/test-ecal-set-default-timezone.c
@@ -14,7 +14,7 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
icalproperty *property;
icalcomponent *component;
icaltimezone *zone;
diff --git a/calendar/tests/ecal/test-ecal-set-mode.c b/calendar/tests/ecal/test-ecal-set-mode.c
index 7eafb22..9b07b63 100644
--- a/calendar/tests/ecal/test-ecal-set-mode.c
+++ b/calendar/tests/ecal/test-ecal-set-mode.c
@@ -37,7 +37,7 @@ gint
main (gint argc, gchar **argv)
{
ECal *cal;
- char *uri = NULL;
+ gchar *uri = NULL;
GMainLoop *loop;
g_type_init ();
diff --git a/calendar/tests/ecal/test-ecal-stress-factory--fifo.c b/calendar/tests/ecal/test-ecal-stress-factory--fifo.c
index 27fac7d..16a4069 100644
--- a/calendar/tests/ecal/test-ecal-stress-factory--fifo.c
+++ b/calendar/tests/ecal/test-ecal-stress-factory--fifo.c
@@ -10,7 +10,7 @@
gint
main (gint argc, gchar **argv)
{
- char *uri = NULL;
+ gchar *uri = NULL;
ECal *cals[NUM_CALS];
gint i;
diff --git a/calendar/tests/ecal/test-ecal-stress-factory--open-async.c b/calendar/tests/ecal/test-ecal-stress-factory--open-async.c
index b148490..7844eb2 100644
--- a/calendar/tests/ecal/test-ecal-stress-factory--open-async.c
+++ b/calendar/tests/ecal/test-ecal-stress-factory--open-async.c
@@ -38,7 +38,7 @@ open_timeout_cb (gpointer user_data)
gint
main (gint argc, gchar **argv)
{
- char *uri = NULL;
+ gchar *uri = NULL;
GMainLoop *loop;
gint i;
diff --git a/calendar/tests/ecal/test-ecal-stress-factory--serial.c b/calendar/tests/ecal/test-ecal-stress-factory--serial.c
index 092e02c..9960fb2 100644
--- a/calendar/tests/ecal/test-ecal-stress-factory--serial.c
+++ b/calendar/tests/ecal/test-ecal-stress-factory--serial.c
@@ -10,7 +10,7 @@
gint
main (gint argc, gchar **argv)
{
- char *uri = NULL;
+ gchar *uri = NULL;
gint i;
g_type_init ();
diff --git a/calendar/tests/ecal/test-ecal-stress-factory--single-cal.c b/calendar/tests/ecal/test-ecal-stress-factory--single-cal.c
index 3abe97b..a969e6a 100644
--- a/calendar/tests/ecal/test-ecal-stress-factory--single-cal.c
+++ b/calendar/tests/ecal/test-ecal-stress-factory--single-cal.c
@@ -10,7 +10,7 @@
gint
main (gint argc, gchar **argv)
{
- char *uri = NULL;
+ gchar *uri = NULL;
ECal *cal;
gint i;
diff --git a/camel/camel-sasl-gssapi.c b/camel/camel-sasl-gssapi.c
index 151c3a4..5c49d0e 100644
--- a/camel/camel-sasl-gssapi.c
+++ b/camel/camel-sasl-gssapi.c
@@ -215,11 +215,11 @@ gssapi_set_exception (OM_uint32 major, OM_uint32 minor, CamelException *ex)
/* DBUS Specific code */
static gboolean
-send_dbus_message (char *name)
+send_dbus_message (gchar *name)
{
DBusMessage *message, *reply;
DBusError dbus_error;
- int success = FALSE;
+ gint success = FALSE;
DBusConnection *bus = NULL;
dbus_error_init (&dbus_error);
@@ -241,7 +241,7 @@ send_dbus_message (char *name)
}
/* Appends the data as an argument to the message */
if (strchr(name, '\\'))
- name = strchr(name, '\\');
+ name = strchr(name, '\\');
dbus_message_append_args (message,
DBUS_TYPE_STRING, &name,
DBUS_TYPE_INVALID);
@@ -261,7 +261,7 @@ send_dbus_message (char *name)
dbus_error_free(&dbus_error);
dbus_message_unref(reply);
}
-
+
/* Free the message */
dbus_message_unref (message);
dbus_connection_unref (bus);
@@ -337,8 +337,8 @@ gssapi_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
break;
default:
if (major == (OM_uint32)GSS_S_FAILURE &&
- (minor == (OM_uint32)KRB5KRB_AP_ERR_TKT_EXPIRED ||
- minor == (OM_uint32)KRB5KDC_ERR_NEVER_VALID)) {
+ (minor == (OM_uint32)KRB5KRB_AP_ERR_TKT_EXPIRED ||
+ minor == (OM_uint32)KRB5KDC_ERR_NEVER_VALID)) {
if (send_dbus_message (sasl->service->url->user))
goto challenge;
} else
diff --git a/camel/providers/imapx/camel-imapx-folder.c b/camel/providers/imapx/camel-imapx-folder.c
index 67d35ad..19be6ea 100644
--- a/camel/providers/imapx/camel-imapx-folder.c
+++ b/camel/providers/imapx/camel-imapx-folder.c
@@ -93,7 +93,7 @@ camel_imapx_folder_new(CamelStore *store, const gchar *folder_dir, const gchar *
short_name);
return NULL;
}
-
+
ifolder->search = camel_folder_search_new ();
ifolder->search_lock = g_mutex_new ();
ifolder->exists_on_server = -1;
@@ -166,14 +166,14 @@ imapx_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
CamelStream *stream = NULL;
CamelIMAPXStore *istore = (CamelIMAPXStore *)folder->parent_store;
CamelIMAPXFolder *ifolder = (CamelIMAPXFolder *) folder;
- const char *path = NULL;
+ const gchar *path = NULL;
gboolean offline_message = FALSE;
if (!strchr (uid, '-'))
path = "cur";
else {
path = "new";
- offline_message = TRUE;
+ offline_message = TRUE;
}
stream = camel_data_cache_get (ifolder->cache, path, uid, NULL);
@@ -190,7 +190,7 @@ imapx_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
return NULL;
}
}
-
+
if (!camel_exception_is_set (ex)) {
msg = camel_mime_message_new();
if (camel_data_wrapper_construct_from_stream((CamelDataWrapper *)msg, stream) == -1) {
diff --git a/camel/providers/imapx/camel-imapx-folder.h b/camel/providers/imapx/camel-imapx-folder.h
index b4f90cc..b331bec 100644
--- a/camel/providers/imapx/camel-imapx-folder.h
+++ b/camel/providers/imapx/camel-imapx-folder.h
@@ -43,10 +43,10 @@ typedef struct _CamelIMAPXFolder {
gchar *raw_name;
CamelDataCache *cache;
CamelFolderSearch *search;
-
+
guint32 exists_on_server;
guint32 unread_on_server;
-
+
GMutex *search_lock;
} CamelIMAPXFolder;
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index f3305b1..8cf6303 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -260,7 +260,6 @@ struct _CamelIMAPXIdle {
gboolean idle_exit;
};
-
static gboolean imapx_in_idle (CamelIMAPXServer *is);
static gboolean imapx_idle_supported (CamelIMAPXServer *is);
static void imapx_start_idle (CamelIMAPXServer *is);
@@ -269,7 +268,6 @@ static void imapx_init_idle (CamelIMAPXServer *is);
static void imapx_stop_idle (CamelIMAPXServer *is, CamelException *ex);
static void camel_imapx_server_idle (CamelIMAPXServer *is, CamelFolder *folder, CamelException *ex);
-
enum {
USE_SSL_NEVER,
USE_SSL_ALWAYS,
@@ -871,7 +869,7 @@ imapx_command_start_next(CamelIMAPXServer *is, CamelException *ex)
static gboolean
imapx_is_command_queue_empty (CamelIMAPXServer *is)
{
- gboolean ret = FALSE;
+ gboolean ret = FALSE;
if (camel_dlist_empty (&is->queue) && camel_dlist_empty (&is->active))
ret = TRUE;
@@ -890,7 +888,7 @@ imapx_command_queue(CamelIMAPXServer *is, CamelIMAPXCommand *ic)
camel_imapx_command_close(ic);
c(printf("enqueue job '%.*s'\n", ((CamelIMAPXCommandPart *)ic->parts.head)->data_size, ((CamelIMAPXCommandPart *)ic->parts.head)->data));
-
+
QUEUE_LOCK(is);
scan = (CamelIMAPXCommand *)is->queue.head;
@@ -1041,7 +1039,7 @@ imapx_untagged(CamelIMAPXServer *imap, CamelException *ex)
camel_db_delete_uids (imap->store->cdb_w, imap->select_folder->full_name, imap->expunged, NULL);
imap_update_store_summary (imap->select_folder);
camel_object_trigger_event(imap->select_folder, "folder_changed", imap->changes);
-
+
g_slist_foreach (imap->expunged, (GFunc) g_free, NULL);
imap->expunged = NULL;
camel_folder_change_info_clear (imap->changes);
@@ -1069,7 +1067,7 @@ imapx_untagged(CamelIMAPXServer *imap, CamelException *ex)
if (imapx_idle_supported (imap) && imapx_in_idle (imap)) {
((CamelIMAPXFolder *) imap->select_folder)->exists_on_server = id;
-
+
if (camel_folder_summary_count (imap->select_folder->summary) < id)
imapx_stop_idle (imap, ex);
}
@@ -1147,7 +1145,7 @@ imapx_untagged(CamelIMAPXServer *imap, CamelException *ex)
camel_object_trigger_event(imap->select_folder, "folder_changed", imap->changes);
camel_folder_change_info_clear (imap->changes);
}
-
+
camel_object_unref (folder);
}
}
@@ -1571,7 +1569,6 @@ imapx_command_status_done (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
{
CamelIMAPXFolder *ifolder = (CamelIMAPXFolder *) ic->job->folder;
-
ifolder->exists_on_server = is->exists;
ifolder->unread_on_server = is->unread;
@@ -1588,8 +1585,8 @@ imapx_command_run_sync (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
complete = ic->complete;
if (!ic->complete)
- ic->complete = imapx_command_complete;
-
+ ic->complete = imapx_command_complete;
+
imapx_command_queue (is, ic);
e_flag_wait (ic->flag);
@@ -1619,14 +1616,14 @@ static void
imapx_command_idle_done (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
{
CamelIMAPXIdle *idle = is->idle;
-
+
if (camel_exception_is_set (ic->ex) || ic->status->result != IMAP_OK) {
- if (!camel_exception_is_set (ic->ex))
+ if (!camel_exception_is_set (ic->ex))
camel_exception_setv(ic->job->ex, 1, "Error performing IDLE: %s", ic->status->text);
else
camel_exception_xfer (ic->job->ex, ic->ex);
}
-
+
IDLE_LOCK (idle);
idle->in_idle = FALSE;
idle->idle_issue_done = FALSE;
@@ -1636,21 +1633,21 @@ imapx_command_idle_done (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
imapx_job_done (ic->job);
camel_imapx_command_free (ic);
}
-
+
static void
imapx_job_idle_start(CamelIMAPXServer *is, CamelIMAPXJob *job)
{
CamelIMAPXCommand *ic;
CamelIMAPXCommandPart *cp;
-
+
ic = camel_imapx_command_new ("IDLE", job->folder->full_name, "IDLE");
ic->job = job;
ic->complete = imapx_command_idle_done;
-
+
camel_imapx_command_close(ic);
cp = (CamelIMAPXCommandPart *)ic->parts.head;
- cp->type |= CAMEL_IMAPX_COMMAND_CONTINUATION;
-
+ cp->type |= CAMEL_IMAPX_COMMAND_CONTINUATION;
+
QUEUE_LOCK (is);
imapx_command_start (is, ic);
QUEUE_UNLOCK (is);
@@ -1660,7 +1657,7 @@ static void
camel_imapx_server_idle (CamelIMAPXServer *is, CamelFolder *folder, CamelException *ex)
{
CamelIMAPXJob *job;
-
+
job = g_malloc0 (sizeof(*job));
job->type = IMAPX_JOB_IDLE;
job->start = imapx_job_idle_start;
@@ -1687,7 +1684,7 @@ imapx_server_fetch_new_messages (CamelIMAPXServer *is, CamelFolder *folder, Came
job->noreply = 1;
job->ex = ex;
job->u.refresh_info.changes = camel_folder_change_info_new();
-
+
imapx_run_job (is, job);
}
@@ -1702,8 +1699,8 @@ idle_thread (gpointer data)
e_flag_clear (is->idle->idle_start_watch);
camel_imapx_server_idle (is, is->select_folder, ex);
-
- if (!camel_exception_is_set (ex) && ifolder->exists_on_server >
+
+ if (!camel_exception_is_set (ex) && ifolder->exists_on_server >
camel_folder_summary_count (((CamelFolder *) ifolder)->summary))
imapx_server_fetch_new_messages (is, is->select_folder, ex);
@@ -1714,7 +1711,7 @@ idle_thread (gpointer data)
}
e_flag_wait (is->idle->idle_start_watch);
-
+
if (is->idle->idle_exit)
break;
}
@@ -1722,14 +1719,14 @@ idle_thread (gpointer data)
camel_exception_free (ex);
return NULL;
}
-
+
static void
imapx_stop_idle (CamelIMAPXServer *is, CamelException *ex)
{
CamelIMAPXIdle *idle = is->idle;
-
+
IDLE_LOCK (idle);
-
+
if (!idle->idle_issue_done && idle->started) {
imapx_command_idle_stop (is, ex);
idle->idle_issue_done = TRUE;
@@ -1749,10 +1746,10 @@ static void
imapx_exit_idle (CamelIMAPXServer *is)
{
CamelIMAPXIdle *idle = is->idle;
-
+
if (!idle)
return;
-
+
IDLE_LOCK (idle);
if (idle->idle_thread_id) {
@@ -1767,7 +1764,7 @@ imapx_exit_idle (CamelIMAPXServer *is)
g_mutex_free (idle->idle_lock);
if (idle->idle_start_watch)
e_flag_free (idle->idle_start_watch);
-
+
g_free (is->idle);
is->idle = NULL;
}
@@ -2124,7 +2121,7 @@ retry:
is->state = IMAPX_AUTHENTICATED;
is->use_idle = TRUE;
- if (imapx_idle_supported (is))
+ if (imapx_idle_supported (is))
imapx_init_idle (is);
/* Fetch namespaces */
@@ -2232,7 +2229,7 @@ imapx_command_fetch_message_done(CamelIMAPXServer *is, CamelIMAPXCommand *ic)
else
camel_exception_xfer (job->ex, ic->ex);
}
-
+
camel_operation_end (job->op);
imapx_job_done (job);
}
@@ -2245,7 +2242,7 @@ imapx_job_get_message_start(CamelIMAPXServer *is, CamelIMAPXJob *job)
{
CamelIMAPXCommand *ic;
gint i;
-
+
/* FIXME: MUST ensure we never try to get the same message
twice at the same time.
@@ -2303,14 +2300,14 @@ imapx_command_append_message_done (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
CamelFolderChangeInfo *changes;
mi->uid = g_strdup_printf("%u", (guint)ic->status->u.appenduid.uid);
-
+
cur = camel_data_cache_get_filename (ifolder->cache, "cur", mi->uid, NULL);
printf("Moving cache item %s to %s\n", job->u.append_message.path, cur);
link (job->u.append_message.path, cur);
-
+
/* should we update the message count ? */
camel_folder_summary_add (job->folder->summary, mi);
-
+
changes = camel_folder_change_info_new ();
camel_folder_change_info_add_uid (changes, mi->uid);
camel_object_trigger_event (CAMEL_OBJECT (job->folder), "folder_changed",
@@ -2469,7 +2466,7 @@ imapx_command_step_fetch_done(CamelIMAPXServer *is, CamelIMAPXCommand *ic)
cleanup:
camel_operation_end (job->op);
-
+
for (i=0;i<infos->len;i++) {
struct _refresh_info *r = &g_array_index(infos, struct _refresh_info, i);
@@ -2618,7 +2615,7 @@ imapx_job_refresh_info_done(CamelIMAPXServer *is, CamelIMAPXCommand *ic)
g_free(r->uid);
}
-
+
camel_operation_end (job->op);
g_array_free(job->u.refresh_info.infos, TRUE);
imapx_job_done (job);
@@ -2650,7 +2647,7 @@ imapx_command_fetch_new_messages_done (CamelIMAPXServer *is, CamelIMAPXCommand *
camel_exception_xfer (ic->job->ex, ic->ex);
goto exception;
}
-
+
if (camel_folder_change_info_changed(ic->job->u.refresh_info.changes)) {
imap_update_store_summary (ic->job->folder);
camel_folder_summary_save_to_db (ic->job->folder->summary, NULL);
@@ -2662,7 +2659,7 @@ imapx_command_fetch_new_messages_done (CamelIMAPXServer *is, CamelIMAPXCommand *
exception:
if (ic->job->noreply)
camel_folder_change_info_free(ic->job->u.refresh_info.changes);
-
+
imapx_job_done (ic->job);
camel_imapx_command_free (ic);
}
@@ -2678,7 +2675,7 @@ imapx_job_fetch_new_messages_start (CamelIMAPXServer *is, CamelIMAPXJob *job)
total = camel_folder_summary_count (folder->summary);
diff = ifolder->exists_on_server - total;
-
+
if (total > 0)
uid = camel_folder_summary_uid_from_index (folder->summary, total - 1);
else
@@ -2769,8 +2766,8 @@ imapx_command_noop_done (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
else
camel_exception_xfer (ic->job->ex, ic->ex);
}
-
- if (ic->job->folder)
+
+ if (ic->job->folder)
((CamelIMAPXFolder *) ic->job->folder)->exists_on_server = is->exists;
imapx_job_done (ic->job);
@@ -3214,10 +3211,10 @@ static gboolean
imapx_disconnect (CamelIMAPXServer *is)
{
gboolean ret = TRUE;
-
+
if (imapx_idle_supported (is))
imapx_exit_idle (is);
-
+
if (is->stream) {
if (camel_stream_close (is->stream->source) == -1)
ret = FALSE;
@@ -3362,14 +3359,14 @@ imapx_server_get_message (CamelIMAPXServer *is, CamelFolder *folder, const gchar
job->op = camel_operation_registered ();
job->u.get_message.uid = (gchar *)uid;
job->u.get_message.stream = stream;
- if (job->u.get_message.stream == NULL)
+ if (job->u.get_message.stream == NULL)
job->u.get_message.stream = camel_stream_mem_new();
job->ex = ex;
mi = camel_folder_summary_uid (folder->summary, uid);
if (((CamelMessageInfoBase *) mi)->size > MULTI_SIZE)
job->u.get_message.use_multi_fetch = TRUE;
-
+
job->u.get_message.size = ((CamelMessageInfoBase *) mi)->size;
camel_message_info_free (mi);
@@ -3383,8 +3380,8 @@ imapx_server_get_message (CamelIMAPXServer *is, CamelFolder *folder, const gchar
if (CAMEL_IS_STREAM_MEM (stream))
camel_stream_reset(stream);
else {
- char *tmp = camel_data_cache_get_filename (ifolder->cache, "tmp", uid, NULL);
-
+ gchar *tmp = camel_data_cache_get_filename (ifolder->cache, "tmp", uid, NULL);
+
if (camel_stream_flush(stream) == 0 && camel_stream_close(stream) == 0) {
gchar *temp = g_strrstr (cache_file, "/"), *dir;
@@ -3403,7 +3400,7 @@ imapx_server_get_message (CamelIMAPXServer *is, CamelFolder *folder, const gchar
camel_object_unref(stream);
stream = NULL;
}
-
+
camel_data_cache_remove (ifolder->cache, "tmp", uid, NULL);
g_free (tmp);
}
@@ -3480,7 +3477,7 @@ camel_imapx_server_append_message(CamelIMAPXServer *is, CamelFolder *folder, Cam
imapx_run_job(is, job);
fail:
- return;
+ return;
}
#include "camel-imapx-store.h"
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 3d9b684..ecff22e 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -257,7 +257,7 @@ connect_to_server (CamelService *service, struct addrinfo *ai, gint ssl_mode, Ca
if (ret == FALSE) {
gchar *tmp = get_valid_utf8_error ((gchar *) store->engine->line);
-
+
camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
_("Failed to connect to POP server %s in secure mode%s"),
service->url->host, tmp ? tmp:"");
@@ -583,7 +583,7 @@ pop3_try_authenticate (CamelService *service, gboolean reprompt, const gchar *er
}
} else if (pcu && pcu->state != CAMEL_POP3_COMMAND_OK) {
gchar *tmp = get_valid_utf8_error ((gchar *) store->engine->line);
-
+
camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
_("Unable to connect to POP server %s.\n"
"Error sending username%s"),
@@ -592,7 +592,7 @@ pop3_try_authenticate (CamelService *service, gboolean reprompt, const gchar *er
g_free (tmp);
} else if (pcp->state != CAMEL_POP3_COMMAND_OK) {
gchar *tmp = get_valid_utf8_error ((gchar *) store->engine->line);
-
+
camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
_("Unable to connect to POP server %s.\n"
"Error sending password%s"),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
