[evolution-data-server] Fix several types of pedantic compiler warnings.
- From: Matthew Barnes <mbarnes src gnome org>
- To: svn-commits-list gnome org
- Subject: [evolution-data-server] Fix several types of pedantic compiler warnings.
- Date: Sat, 16 May 2009 08:09:12 -0400 (EDT)
commit b2d5a875f65aed208bc7796f992c6294bb50e07d
Author: Matthew Barnes <mbarnes redhat com>
Date: Sat May 16 07:29:48 2009 -0400
Fix several types of pedantic compiler warnings.
---
addressbook/backends/file/e-book-backend-file.c | 2 +-
.../backends/google/e-book-backend-google.c | 4 +--
addressbook/backends/groupwise/create-account.c | 2 +-
.../backends/groupwise/e-book-backend-groupwise.c | 2 +-
addressbook/backends/ldap/e-book-backend-ldap.c | 7 ++--
addressbook/backends/vcf/e-book-backend-vcf.c | 2 +-
addressbook/libebook/e-book-listener.c | 2 +-
addressbook/libebook/e-book-query.h | 2 +-
addressbook/libebook/e-book-view-listener.c | 2 +-
addressbook/libebook/e-book-view-listener.h | 2 +-
addressbook/libebook/e-vcard.c | 2 -
.../libedata-book/e-book-backend-db-cache.c | 2 +-
addressbook/libedata-book/e-data-book-factory.c | 6 ++--
addressbook/libedata-book/e-data-book-view.c | 2 +-
addressbook/libedata-book/e-data-book.c | 4 +-
.../backends/caldav/e-cal-backend-caldav-factory.c | 6 ++--
calendar/backends/caldav/e-cal-backend-caldav.c | 5 +--
calendar/backends/file/e-cal-backend-file-events.c | 2 -
calendar/backends/file/e-cal-backend-file-todos.c | 2 -
.../backends/groupwise/e-cal-backend-groupwise.c | 2 +-
calendar/libecal/e-cal-listener.c | 2 +-
calendar/libecal/e-cal-view-listener.c | 2 +-
calendar/libedata-cal/e-cal-backend.c | 2 +-
calendar/libedata-cal/e-data-cal-factory.c | 4 +-
calendar/libedata-cal/e-data-cal-view.c | 2 +-
calendar/libedata-cal/e-data-cal.c | 2 +-
calendar/tests/ecal/test-ecal.c | 18 ++++++----
camel/camel-db.c | 18 +++++-----
camel/camel-exception.c | 2 +-
camel/camel-filter-driver.c | 2 +-
camel/camel-folder-summary.c | 16 ++++----
camel/camel-folder.c | 4 +-
camel/camel-object.c | 4 +-
camel/camel-search-sql-sexp.c | 4 +-
camel/camel-search-sql.c | 28 ++++++++--------
camel/camel-vee-folder.c | 4 +-
camel/camel-vee-summary.c | 12 ++++---
camel/camel-vtrash-folder.c | 35 +++++++++++---------
camel/providers/groupwise/camel-groupwise-folder.c | 18 +++++-----
.../groupwise/camel-groupwise-store-summary.h | 2 +-
camel/providers/groupwise/camel-groupwise-store.c | 2 +-
.../providers/groupwise/camel-groupwise-summary.c | 2 +-
.../providers/groupwise/camel-groupwise-summary.h | 2 +-
camel/providers/imap/camel-imap-folder.c | 2 +-
camel/providers/imap/camel-imap-folder.h | 2 +-
camel/providers/imap/camel-imap-summary.h | 2 +-
camel/providers/local/camel-local-summary.c | 2 +-
camel/providers/pop3/camel-pop3-engine.h | 2 +-
libebackend/e-dbhash.h | 2 +-
libebackend/e-file-cache.c | 2 +-
libedataserver/e-account-list.c | 2 +-
libedataserver/e-account-list.h | 2 +-
libedataserver/e-account.c | 4 +-
libedataserver/e-account.h | 2 +-
libedataserver/e-categories.c | 2 +-
libedataserver/e-component-listener.c | 2 +-
libedataserver/e-iterator.c | 2 +-
libedataserver/e-list-iterator.c | 2 +-
libedataserver/e-list.c | 2 +-
libedataserver/e-memory.h | 2 +-
libedataserver/e-msgport.h | 4 +-
libedataserver/e-sexp.h | 2 +-
libedataserver/e-source-group.c | 2 +-
libedataserver/e-source-list.c | 2 +-
libedataserver/e-source.c | 2 +-
libedataserver/e-trie.c | 4 +-
libedataserver/test-source-list.c | 3 +-
libedataserverui/e-name-selector-dialog.c | 2 +-
libedataserverui/e-name-selector-entry.c | 2 +-
libedataserverui/e-name-selector-list.c | 2 +-
libedataserverui/e-name-selector-model.c | 2 +-
libedataserverui/e-name-selector.c | 2 +-
libedataserverui/e-passwords.h | 2 +-
libedataserverui/e-source-selector.c | 3 +-
servers/exchange/lib/e2k-autoconfig.c | 4 +-
servers/exchange/lib/e2k-autoconfig.h | 2 +-
servers/exchange/lib/e2k-global-catalog.c | 2 +-
servers/exchange/lib/e2k-kerberos.h | 2 +-
servers/exchange/lib/mapi.h | 2 +-
servers/exchange/storage/e-folder-type-registry.c | 2 +-
servers/exchange/storage/exchange-account.c | 2 +-
.../exchange/storage/exchange-hierarchy-webdav.h | 2 +-
.../google/libgdata-google/gdata-google-service.c | 2 +-
servers/google/libgdata/gdata-entry.c | 4 --
servers/google/libgdata/gdata-feed.c | 5 ---
servers/groupwise/e-gw-connection.c | 20 ++++++------
servers/groupwise/e-gw-filter.c | 2 +-
servers/groupwise/e-gw-item.c | 2 +-
88 files changed, 180 insertions(+), 190 deletions(-)
diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index 043b56f..d895437 100644
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -65,7 +65,7 @@
#define PAS_ID_PREFIX "pas-id-"
#define SUMMARY_FLUSH_TIMEOUT 5000
-G_DEFINE_TYPE (EBookBackendFile, e_book_backend_file, E_TYPE_BOOK_BACKEND_SYNC);
+G_DEFINE_TYPE (EBookBackendFile, e_book_backend_file, E_TYPE_BOOK_BACKEND_SYNC)
struct _EBookBackendFilePrivate {
char *dirname;
diff --git a/addressbook/backends/google/e-book-backend-google.c b/addressbook/backends/google/e-book-backend-google.c
index fc0ff61..5e530cc 100644
--- a/addressbook/backends/google/e-book-backend-google.c
+++ b/addressbook/backends/google/e-book-backend-google.c
@@ -32,7 +32,7 @@
#include "google-book.h"
#include "util.h"
-G_DEFINE_TYPE (EBookBackendGoogle, e_book_backend_google, E_TYPE_BOOK_BACKEND_SYNC);
+G_DEFINE_TYPE (EBookBackendGoogle, e_book_backend_google, E_TYPE_BOOK_BACKEND_SYNC)
struct _EBookBackendGooglePrivate
{
@@ -625,8 +625,6 @@ e_book_backend_google_dispose (GObject *object)
static void
e_book_backend_google_finalize (GObject *object)
{
- //EBookBackendGooglePrivate *priv = GET_PRIVATE (object);
-
__debug__ (G_STRFUNC);
G_OBJECT_CLASS (e_book_backend_google_parent_class)->finalize (object);
diff --git a/addressbook/backends/groupwise/create-account.c b/addressbook/backends/groupwise/create-account.c
index 1676e6c..4eaece0 100644
--- a/addressbook/backends/groupwise/create-account.c
+++ b/addressbook/backends/groupwise/create-account.c
@@ -51,7 +51,7 @@ static gboolean
idle_cb (gpointer data)
{
add_account ("/apps/evolution/addressbook/sources", arg_hostname, arg_username, arg_password);
-// add_account ("/apps/evolution/tasks/sources", arg_hostname, arg_username, arg_password);
+/* add_account ("/apps/evolution/tasks/sources", arg_hostname, arg_username, arg_password); */
g_main_loop_quit (main_loop);
diff --git a/addressbook/backends/groupwise/e-book-backend-groupwise.c b/addressbook/backends/groupwise/e-book-backend-groupwise.c
index 205ae86..9517647 100644
--- a/addressbook/backends/groupwise/e-book-backend-groupwise.c
+++ b/addressbook/backends/groupwise/e-book-backend-groupwise.c
@@ -56,7 +56,7 @@
#include "e-gw-item.h"
#include "e-gw-filter.h"
-G_DEFINE_TYPE (EBookBackendGroupwise, e_book_backend_groupwise, E_TYPE_BOOK_BACKEND);
+G_DEFINE_TYPE (EBookBackendGroupwise, e_book_backend_groupwise, E_TYPE_BOOK_BACKEND)
typedef struct {
GCond *cond;
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index b044d50..ef5f477 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -131,7 +131,7 @@
typedef enum {
E_BOOK_BACKEND_LDAP_TLS_NO,
E_BOOK_BACKEND_LDAP_TLS_ALWAYS,
- E_BOOK_BACKEND_LDAP_TLS_WHEN_POSSIBLE,
+ E_BOOK_BACKEND_LDAP_TLS_WHEN_POSSIBLE
} EBookBackendLDAPUseTLS;
/* interval for our poll_ldap timeout */
@@ -158,7 +158,7 @@ static gchar *e_book_backend_ldap_build_query (EBookBackendLDAP *bl, const char
typedef struct LDAPOp LDAPOp;
-G_DEFINE_TYPE (EBookBackendLDAP, e_book_backend_ldap, E_TYPE_BOOK_BACKEND);
+G_DEFINE_TYPE (EBookBackendLDAP, e_book_backend_ldap, E_TYPE_BOOK_BACKEND)
struct _EBookBackendLDAPPrivate {
gboolean connected;
@@ -3951,7 +3951,7 @@ build_contact_from_entry (EBookBackendLDAP *bl,
break;
}
- printf ("info = %p\n", info);
+ printf ("info = %p\n", (gpointer) info);
if (info) {
if (info->prop_type & PROP_WRITE_ONLY) {
@@ -4238,7 +4238,6 @@ ldap_search_handler (LDAPOp *op, LDAPMessage *res)
}
else {
g_warning ("unhandled search result type %d returned", msg_type);
- //e_data_book_view_notify_complete (view, GNOME_Evolution_Addressbook_OtherError);
e_data_book_view_notify_complete (view, GNOME_Evolution_Addressbook_InvalidQuery);
ldap_op_finished (op);
}
diff --git a/addressbook/backends/vcf/e-book-backend-vcf.c b/addressbook/backends/vcf/e-book-backend-vcf.c
index dc81e28..af39c82 100644
--- a/addressbook/backends/vcf/e-book-backend-vcf.c
+++ b/addressbook/backends/vcf/e-book-backend-vcf.c
@@ -56,7 +56,7 @@
#define d(x)
-G_DEFINE_TYPE (EBookBackendVCF, e_book_backend_vcf, E_TYPE_BOOK_BACKEND_SYNC);
+G_DEFINE_TYPE (EBookBackendVCF, e_book_backend_vcf, E_TYPE_BOOK_BACKEND_SYNC)
typedef struct _EBookBackendVCFBookView EBookBackendVCFBookView;
typedef struct _EBookBackendVCFSearchContext EBookBackendVCFSearchContext;
diff --git a/addressbook/libebook/e-book-listener.c b/addressbook/libebook/e-book-listener.c
index 9824eee..242b6dd 100644
--- a/addressbook/libebook/e-book-listener.c
+++ b/addressbook/libebook/e-book-listener.c
@@ -492,4 +492,4 @@ BONOBO_TYPE_FUNC_FULL (
EBookListener,
GNOME_Evolution_Addressbook_BookListener,
BONOBO_TYPE_OBJECT,
- e_book_listener);
+ e_book_listener)
diff --git a/addressbook/libebook/e-book-query.h b/addressbook/libebook/e-book-query.h
index ff867a4..4c81818 100644
--- a/addressbook/libebook/e-book-query.h
+++ b/addressbook/libebook/e-book-query.h
@@ -14,7 +14,7 @@ typedef enum {
E_BOOK_QUERY_IS,
E_BOOK_QUERY_CONTAINS,
E_BOOK_QUERY_BEGINS_WITH,
- E_BOOK_QUERY_ENDS_WITH,
+ E_BOOK_QUERY_ENDS_WITH
/*
Consider these "coming soon".
diff --git a/addressbook/libebook/e-book-view-listener.c b/addressbook/libebook/e-book-view-listener.c
index d5375c7..e0d5935 100644
--- a/addressbook/libebook/e-book-view-listener.c
+++ b/addressbook/libebook/e-book-view-listener.c
@@ -402,4 +402,4 @@ BONOBO_TYPE_FUNC_FULL (
EBookViewListener,
GNOME_Evolution_Addressbook_BookViewListener,
BONOBO_TYPE_OBJECT,
- e_book_view_listener);
+ e_book_view_listener)
diff --git a/addressbook/libebook/e-book-view-listener.h b/addressbook/libebook/e-book-view-listener.h
index 85a15ab..57d9374 100644
--- a/addressbook/libebook/e-book-view-listener.h
+++ b/addressbook/libebook/e-book-view-listener.h
@@ -63,7 +63,7 @@ typedef enum {
ContactsRemovedEvent,
ContactsModifiedEvent,
SequenceCompleteEvent,
- StatusMessageEvent,
+ StatusMessageEvent
} EBookViewListenerOperation;
struct _EBookViewListenerResponse {
diff --git a/addressbook/libebook/e-vcard.c b/addressbook/libebook/e-vcard.c
index f0b24e8..f7fb745 100644
--- a/addressbook/libebook/e-vcard.c
+++ b/addressbook/libebook/e-vcard.c
@@ -636,8 +636,6 @@ parse (EVCard *evc, const char *str)
buf = make_valid_utf8 (str);
- //buf = fold_lines (buf);
-
d(printf ("BEFORE FOLDING:\n"));
d(printf (str));
d(printf ("\n\nAFTER FOLDING:\n"));
diff --git a/addressbook/libedata-book/e-book-backend-db-cache.c b/addressbook/libedata-book/e-book-backend-db-cache.c
index 19014ec..e104f47 100644
--- a/addressbook/libedata-book/e-book-backend-db-cache.c
+++ b/addressbook/libedata-book/e-book-backend-db-cache.c
@@ -183,7 +183,7 @@ e_book_backend_db_cache_add_contact (DB *db,
vcard_str = e_vcard_to_string (E_VCARD(contact), EVC_FORMAT_VCARD_30);
string_to_dbt (vcard_str, &vcard_dbt);
- //db_error = db->del (db, NULL, &uid_dbt, 0);
+ /* db_error = db->del (db, NULL, &uid_dbt, 0); */
db_error = db->put (db, NULL, &uid_dbt, &vcard_dbt, 0);
g_free (vcard_str);
diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c
index 961acfb..f5890f8 100644
--- a/addressbook/libedata-book/e-data-book-factory.c
+++ b/addressbook/libedata-book/e-data-book-factory.c
@@ -177,7 +177,7 @@ dump_active_server_map_entry (gpointer key, gpointer value, gpointer data)
uri = key;
backend = E_BOOK_BACKEND (value);
- g_message (" %s: %p", uri, backend);
+ g_message (" %s: %p", uri, (gpointer) backend);
}
/**
@@ -366,7 +366,7 @@ impl_GNOME_Evolution_Addressbook_BookFactory_getBook (PortableServer_Servant
g_object_unref (source);
if (book)
- printf (" => %p\n", book);
+ printf (" => %p\n", (gpointer) book);
return corba_book;
}
@@ -573,4 +573,4 @@ BONOBO_TYPE_FUNC_FULL (
EDataBookFactory,
GNOME_Evolution_Addressbook_BookFactory,
BONOBO_TYPE_OBJECT,
- e_data_book_factory);
+ e_data_book_factory)
diff --git a/addressbook/libedata-book/e-data-book-view.c b/addressbook/libedata-book/e-data-book-view.c
index 6b89f0f..d31a333 100644
--- a/addressbook/libedata-book/e-data-book-view.c
+++ b/addressbook/libedata-book/e-data-book-view.c
@@ -763,4 +763,4 @@ BONOBO_TYPE_FUNC_FULL (
EDataBookView,
GNOME_Evolution_Addressbook_BookView,
BONOBO_TYPE_OBJECT,
- e_data_book_view);
+ e_data_book_view)
diff --git a/addressbook/libedata-book/e-data-book.c b/addressbook/libedata-book/e-data-book.c
index 5034b97..ba8aa28 100644
--- a/addressbook/libedata-book/e-data-book.c
+++ b/addressbook/libedata-book/e-data-book.c
@@ -35,7 +35,7 @@ impl_GNOME_Evolution_Addressbook_Book_open (PortableServer_Servant servant,
{
EDataBook *book = E_DATA_BOOK (bonobo_object (servant));
- printf ("impl_GNOME_Evolution_Addressbook_Book_open (%p)\n", book);
+ printf ("impl_GNOME_Evolution_Addressbook_Book_open (%p)\n", (gpointer) book);
e_book_backend_open (e_data_book_get_backend (book), book, opid, only_if_exists);
}
@@ -1013,4 +1013,4 @@ BONOBO_TYPE_FUNC_FULL (
EDataBook,
GNOME_Evolution_Addressbook_Book,
BONOBO_TYPE_OBJECT,
- e_data_book);
+ e_data_book)
diff --git a/calendar/backends/caldav/e-cal-backend-caldav-factory.c b/calendar/backends/caldav/e-cal-backend-caldav-factory.c
index e3b0787..1bda5e1 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav-factory.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav-factory.c
@@ -106,9 +106,9 @@ backend_factory_get_type_ ## _type (GTypeModule *module) \
return type; \
} \
-declare_functions (VEVENT, "ECalBackendCalDAVEventsFactory");
-declare_functions (VTODO, "ECalBackendCalDAVTodosFactory");
-declare_functions (VJOURNAL, "ECalBackendCalDAVMemosFactory");
+declare_functions (VEVENT, "ECalBackendCalDAVEventsFactory")
+declare_functions (VTODO, "ECalBackendCalDAVTodosFactory")
+declare_functions (VJOURNAL, "ECalBackendCalDAVMemosFactory")
static GType caldav_types[3];
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index 336c17b..107c258 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -374,7 +374,7 @@ typedef enum {
/* local changes */
E_CAL_COMPONENT_LOCALLY_CREATED,
E_CAL_COMPONENT_LOCALLY_DELETED,
- E_CAL_COMPONENT_LOCALLY_MODIFIED,
+ E_CAL_COMPONENT_LOCALLY_MODIFIED
} ECalComponentSyncState;
@@ -750,7 +750,6 @@ parse_report_response (SoupMessage *soup_message, CalDAVObject **objs, int *len)
xpres = xpath_eval (xpctx,XPATH_STATUS , i + 1);
object->status = xp_object_get_status (xpres);
- //dump_xp_object (xpres);
if (object->status && object->status != 200) {
continue;
}
@@ -3030,7 +3029,7 @@ caldav_internal_get_timezone (ECalBackend *backend,
/* ************************************************************************* */
/* ***************************** GObject Foo ******************************* */
-G_DEFINE_TYPE (ECalBackendCalDAV, e_cal_backend_caldav, E_TYPE_CAL_BACKEND_SYNC);
+G_DEFINE_TYPE (ECalBackendCalDAV, e_cal_backend_caldav, E_TYPE_CAL_BACKEND_SYNC)
static void
e_cal_backend_caldav_dispose (GObject *object)
diff --git a/calendar/backends/file/e-cal-backend-file-events.c b/calendar/backends/file/e-cal-backend-file-events.c
index 178becf..c749873 100644
--- a/calendar/backends/file/e-cal-backend-file-events.c
+++ b/calendar/backends/file/e-cal-backend-file-events.c
@@ -89,8 +89,6 @@ e_cal_backend_file_events_class_init (ECalBackendFileEventsClass *klass)
object_class->dispose = e_cal_backend_file_events_dispose;
object_class->finalize = e_cal_backend_file_events_finalize;
-
-// backend_class->get_uri = e_cal_backend_file_events_get_uri;
}
/* Object initialization function for the file backend */
diff --git a/calendar/backends/file/e-cal-backend-file-todos.c b/calendar/backends/file/e-cal-backend-file-todos.c
index 6926582..28dae79 100644
--- a/calendar/backends/file/e-cal-backend-file-todos.c
+++ b/calendar/backends/file/e-cal-backend-file-todos.c
@@ -89,8 +89,6 @@ e_cal_backend_file_todos_class_init (ECalBackendFileTodosClass *klass)
object_class->dispose = e_cal_backend_file_todos_dispose;
object_class->finalize = e_cal_backend_file_todos_finalize;
-
-// backend_class->get_uri = e_cal_backend_file_todos_get_uri;
}
/* Object initialization function for the file backend */
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise.c b/calendar/backends/groupwise/e-cal-backend-groupwise.c
index 57ba6e8..5ef5669 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise.c
@@ -645,7 +645,7 @@ get_deltas (gpointer handle)
if (cache_keys) {
/*FIXME this is a memory leak, but free'ing it causes crash in gslice */
-// g_slist_free (cache_keys);
+ /*g_slist_free (cache_keys);*/
}
g_static_mutex_unlock (&connecting);
diff --git a/calendar/libecal/e-cal-listener.c b/calendar/libecal/e-cal-listener.c
index e33e3cf..8b1a25a 100644
--- a/calendar/libecal/e-cal-listener.c
+++ b/calendar/libecal/e-cal-listener.c
@@ -975,7 +975,7 @@ e_cal_listener_class_init (ECalListenerClass *klass)
BONOBO_TYPE_FUNC_FULL (ECalListener,
GNOME_Evolution_Calendar_CalListener,
BONOBO_TYPE_OBJECT,
- e_cal_listener);
+ e_cal_listener)
/**
* e_cal_listener_construct:
diff --git a/calendar/libecal/e-cal-view-listener.c b/calendar/libecal/e-cal-view-listener.c
index 2177722..a671d0a 100644
--- a/calendar/libecal/e-cal-view-listener.c
+++ b/calendar/libecal/e-cal-view-listener.c
@@ -303,7 +303,7 @@ e_cal_view_listener_class_init (ECalViewListenerClass *klass)
BONOBO_TYPE_FUNC_FULL (ECalViewListener,
GNOME_Evolution_Calendar_CalViewListener,
BONOBO_TYPE_OBJECT,
- e_cal_view_listener);
+ e_cal_view_listener)
/**
* e_cal_view_listener_new:
diff --git a/calendar/libedata-cal/e-cal-backend.c b/calendar/libedata-cal/e-cal-backend.c
index b719e93..a5fb477 100644
--- a/calendar/libedata-cal/e-cal-backend.c
+++ b/calendar/libedata-cal/e-cal-backend.c
@@ -30,7 +30,7 @@
-G_DEFINE_TYPE (ECalBackend, e_cal_backend, G_TYPE_OBJECT);
+G_DEFINE_TYPE (ECalBackend, e_cal_backend, G_TYPE_OBJECT)
/* Private part of the CalBackend structure */
struct _ECalBackendPrivate {
diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c
index b5c78e9..18c7c24 100644
--- a/calendar/libedata-cal/e-data-cal-factory.c
+++ b/calendar/libedata-cal/e-data-cal-factory.c
@@ -376,7 +376,7 @@ e_data_cal_factory_init (EDataCalFactory *factory, EDataCalFactoryClass *klass)
BONOBO_TYPE_FUNC_FULL (EDataCalFactory,
GNOME_Evolution_Calendar_CalFactory,
PARENT_TYPE,
- e_data_cal_factory);
+ e_data_cal_factory)
/**
* e_data_cal_factory_register_storage:
@@ -557,7 +557,7 @@ dump_backend (gpointer key, gpointer value, gpointer data)
uri = key;
backend = value;
- g_message (" %s: %p", uri, backend);
+ g_message (" %s: %p", uri, (gpointer) backend);
}
/**
diff --git a/calendar/libedata-cal/e-data-cal-view.c b/calendar/libedata-cal/e-data-cal-view.c
index 614629e..c669f1e 100644
--- a/calendar/libedata-cal/e-data-cal-view.c
+++ b/calendar/libedata-cal/e-data-cal-view.c
@@ -71,7 +71,7 @@ static BonoboObjectClass *parent_class;
BONOBO_TYPE_FUNC_FULL (EDataCalView,
GNOME_Evolution_Calendar_CalView,
BONOBO_TYPE_OBJECT,
- e_data_cal_view);
+ e_data_cal_view)
/* Property IDs */
enum props {
diff --git a/calendar/libedata-cal/e-data-cal.c b/calendar/libedata-cal/e-data-cal.c
index 8795762..28d21bb 100644
--- a/calendar/libedata-cal/e-data-cal.c
+++ b/calendar/libedata-cal/e-data-cal.c
@@ -702,7 +702,7 @@ e_data_cal_init (EDataCal *cal, EDataCalClass *klass)
(GDestroyNotify) bonobo_object_unref);
}
-BONOBO_TYPE_FUNC_FULL (EDataCal, GNOME_Evolution_Calendar_Cal, PARENT_TYPE, e_data_cal);
+BONOBO_TYPE_FUNC_FULL (EDataCal, GNOME_Evolution_Calendar_Cal, PARENT_TYPE, e_data_cal)
/**
* e_data_cal_notify_read_only:
diff --git a/calendar/tests/ecal/test-ecal.c b/calendar/tests/ecal/test-ecal.c
index 38e3afd..8c0f6a2 100644
--- a/calendar/tests/ecal/test-ecal.c
+++ b/calendar/tests/ecal/test-ecal.c
@@ -231,8 +231,8 @@ test_object_modification (ECal *client, char *uid)
return error->message;
}
- // modify one property of the icalcomp and save it. Now retrieve it and
- // check the field.
+ /* Modify one property of the icalcomp and save it.
+ * Now retrieve it and check the field. */
icalcomponent_set_summary (icalcomp, summary);
if (!e_cal_modify_object (client, icalcomp, CALOBJ_MOD_THIS, &error)) {
cl_printf (client, "Test Modify object : Could not modify the object: %s\n", error->message);
@@ -497,7 +497,7 @@ test_new_system_memos(void)
static char *
test_get_free_busy (ECal *client)
{
- // TODO uses NULL for users and currently specific to file backend.
+ /* TODO uses NULL for users and currently specific to file backend. */
GList *l, *freebusy = NULL;
GError *error = NULL;
icaltimezone *utc;
@@ -644,13 +644,15 @@ all_tests(ECal *client, const gchar *uri)
mu_run_test (test_get_free_busy (client));
mu_run_test (test_object_creation (client, &uid));
mu_run_test (test_object_modification (client, uid));
-// mu_run_test (test_object_removal (client));
+ /* mu_run_test (test_object_removal (client)); */
mu_run_test (test_get_alarms_in_range (client));
-// tmp = g_strconcat (uri, "_tmp", NULL);
-// mu_run_test (test_e_cal_new (&ecal, tmp));
-// mu_run_test (test_e_cal_remove (ecal, tmp));
-// g_free (tmp);
+#if 0
+ tmp = g_strconcat (uri, "_tmp", NULL);
+ mu_run_test (test_e_cal_new (&ecal, tmp));
+ mu_run_test (test_e_cal_remove (ecal, tmp));
+ g_free (tmp);
+#endif
test_timezones (client);
diff --git a/camel/camel-db.c b/camel/camel-db.c
index 4d38fce..5636270 100644
--- a/camel/camel-db.c
+++ b/camel/camel-db.c
@@ -476,7 +476,7 @@ camel_db_set_collate (CamelDB *cdb, const char *col, const char *collate, CamelD
return 0;
g_mutex_lock (cdb->lock);
- d(g_print("Creating Collation %s on %s with %p\n", collate, col, func));
+ d(g_print("Creating Collation %s on %s with %p\n", collate, col, (gpointer) func));
if (collate && func)
ret = sqlite3_create_collation(cdb->db, collate, SQLITE_UTF8, NULL, func);
g_mutex_unlock (cdb->lock);
@@ -768,8 +768,8 @@ camel_db_count_total_message_info (CamelDB *cdb, const char *table_name, guint32
int
camel_db_select (CamelDB *cdb, const char* stmt, CamelDBSelectCB callback, gpointer data, CamelException *ex)
{
- char *errmsg = NULL;
- //int nrecs = 0;
+ char *errmsg = NULL;
+ /*int nrecs = 0;*/
int ret = -1;
if (!cdb)
@@ -1297,8 +1297,8 @@ write_mir (CamelDB *cdb, const char *folder_name, CamelMIRecord *record, CamelEx
record->part, record->labels, record->usertags,
record->cinfo, record->bdata);
- //if (delete_old_record)
- // del_query = sqlite3_mprintf ("DELETE FROM %Q WHERE uid = %Q", folder_name, record->uid);
+ /* if (delete_old_record)
+ del_query = sqlite3_mprintf ("DELETE FROM %Q WHERE uid = %Q", folder_name, record->uid); */
#if 0
char *upd_query;
@@ -1308,14 +1308,14 @@ write_mir (CamelDB *cdb, const char *folder_name, CamelMIRecord *record, CamelEx
g_free (upd_query);
#else
- //if (delete_old_record)
- // ret = camel_db_add_to_transaction (cdb, del_query, ex);
+ /* if (delete_old_record)
+ ret = camel_db_add_to_transaction (cdb, del_query, ex); */
ret = camel_db_add_to_transaction (cdb, ins_query, ex);
#endif
- //if (delete_old_record)
- // sqlite3_free (del_query);
+ /* if (delete_old_record)
+ sqlite3_free (del_query); */
sqlite3_free (ins_query);
return ret;
diff --git a/camel/camel-exception.c b/camel/camel-exception.c
index 2a72fc4..c4f7fe9 100644
--- a/camel/camel-exception.c
+++ b/camel/camel-exception.c
@@ -200,7 +200,7 @@ camel_exception_xfer (CamelException *ex_dst,
CamelException *ex_src)
{
if (ex_src == NULL) {
- w(g_warning ("camel_exception_xfer: trying to transfer NULL exception to %p\n", ex_dst));
+ w(g_warning ("camel_exception_xfer: trying to transfer NULL exception to %p\n", (gpointer) ex_dst));
return;
}
diff --git a/camel/camel-filter-driver.c b/camel/camel-filter-driver.c
index c5d180d..1c096a6 100644
--- a/camel/camel-filter-driver.c
+++ b/camel/camel-filter-driver.c
@@ -62,7 +62,7 @@ enum filter_log_t {
FILTER_LOG_NONE,
FILTER_LOG_START, /* start of new log entry */
FILTER_LOG_ACTION, /* an action performed */
- FILTER_LOG_END, /* end of log */
+ FILTER_LOG_END /* end of log */
};
/* list of rule nodes */
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 23be990..6726cc3 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -204,7 +204,7 @@ camel_folder_summary_finalize (CamelObject *obj)
g_hash_table_destroy (p->flag_cache);
if (s->timeout_handle)
g_source_remove (s->timeout_handle);
- //camel_folder_summary_clear(s);
+ /*camel_folder_summary_clear(s);*/
g_ptr_array_foreach (s->uids, (GFunc) camel_pstring_free, NULL);
g_ptr_array_free (s->uids, TRUE);
g_hash_table_destroy (s->loaded_infos);
@@ -800,7 +800,7 @@ cfs_count_dirty (CamelFolderSummary *s)
static gboolean
remove_item (char *key, CamelMessageInfoBase *info, CamelFolderSummary *s)
{
- d(printf("%d(%d)\t", info->refcount, info->dirty)); //camel_message_info_dump (info);
+ d(printf("%d(%d)\t", info->refcount, info->dirty)); /* camel_message_info_dump (info); */
CAMEL_SUMMARY_LOCK(info->summary, ref_lock);
if (info->refcount == 1 && !info->dirty && !(info->flags & CAMEL_MESSAGE_FOLDER_FLAGGED)) {
CAMEL_SUMMARY_UNLOCK(info->summary, ref_lock);
@@ -834,7 +834,7 @@ remove_cache (CamelSession *session, CamelSessionThreadMsg *msg)
if (time(NULL) - s->cache_load_time < SUMMARY_CACHE_DROP)
return;
- dd(printf("removing cache for %s %d %p\n", s->folder ? s->folder->full_name : s->summary_path, g_hash_table_size (s->loaded_infos), s->loaded_infos));
+ dd(printf("removing cache for %s %d %p\n", s->folder ? s->folder->full_name : s->summary_path, g_hash_table_size (s->loaded_infos), (gpointer) s->loaded_infos));
/* FIXME[disk-summary] hack. fix it */
CAMEL_SUMMARY_LOCK (s, summary_lock);
g_hash_table_foreach_remove (s->loaded_infos, (GHRFunc) remove_item, s);
@@ -1796,7 +1796,7 @@ camel_folder_summary_add (CamelFolderSummary *s, CamelMessageInfo *info)
#endif
/* Summary always holds a ref for the loaded infos */
- //camel_message_info_ref(info); //FIXME: Check how things are loaded.
+ /* camel_message_info_ref(info); FIXME: Check how things are loaded. */
/* FIXME[disk-summary] SHould we ref it or redesign it later on */
/* The uid array should have its own memory. We will unload the infos when not reqd.*/
g_ptr_array_add (s->uids, (gpointer) camel_pstring_strdup((camel_message_info_uid(info))));
@@ -1825,7 +1825,7 @@ camel_folder_summary_insert (CamelFolderSummary *s, CamelMessageInfo *info, gboo
#endif
/* Summary always holds a ref for the loaded infos */
- //camel_message_info_ref(info); //FIXME: Check how things are loaded.
+ /* camel_message_info_ref(info); FIXME: Check how things are loaded. */
/* FIXME[disk-summary] SHould we ref it or redesign it later on */
/* The uid array should have its own memory. We will unload the infos when not reqd.*/
if (!load)
@@ -1858,7 +1858,7 @@ update_summary (CamelFolderSummary *summary, CamelMessageInfoBase *info)
if (flags & CAMEL_MESSAGE_JUNK)
junk = 1;
- dd(printf("%p: %d %d %d | %d %d %d \n", summary, unread, deleted, junk, summary->unread_count, summary->visible_count, summary->saved_count));
+ dd(printf("%p: %d %d %d | %d %d %d \n", (gpointer) summary, unread, deleted, junk, summary->unread_count, summary->visible_count, summary->saved_count));
info->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;
info->dirty = TRUE;
@@ -1880,7 +1880,7 @@ update_summary (CamelFolderSummary *summary, CamelMessageInfoBase *info)
camel_folder_summary_touch(summary);
}
- dd(printf("%p: %d %d %d | %d %d %d\n", summary, unread, deleted, junk, summary->unread_count, summary->visible_count, summary->saved_count));
+ dd(printf("%p: %d %d %d | %d %d %d\n", (gpointer) summary, unread, deleted, junk, summary->unread_count, summary->visible_count, summary->saved_count));
}
@@ -2389,7 +2389,7 @@ camel_folder_summary_remove_range (CamelFolderSummary *s, int start, int end)
int i;
CamelDB *cdb;
- CamelException ex;// May be this should come from the caller
+ CamelException ex; /* May be this should come from the caller */
char *folder_name;
GSList *uids = NULL;
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index 200ba6b..80bec83 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -431,7 +431,7 @@ folder_getv(CamelObject *object, CamelException *ex, CamelArgGetV *args)
* vfolders summary storage, does it
* harm ? */
if (unread == -1) {
- //unread = folder->summary->unread_count;
+ /*unread = folder->summary->unread_count;*/
/*
folder->summary->junk_count = junked;
folder->summary->deleted_count = deleted;
@@ -477,7 +477,7 @@ folder_getv(CamelObject *object, CamelException *ex, CamelArgGetV *args)
}
}
*arg->ca_ptr = array;*/
- // WTH this is reqd ?, let it crash to find out who uses this
+ /* WTH this is reqd ?, let it crash to find out who uses this */
g_assert (0);
break; }
case CAMEL_FOLDER_ARG_INFO_ARRAY:
diff --git a/camel/camel-object.c b/camel/camel-object.c
index 2645c84..bdf3b43 100644
--- a/camel/camel-object.c
+++ b/camel/camel-object.c
@@ -1912,13 +1912,13 @@ object_class_dump_tree_rec(CamelType root, int depth)
#ifdef CAMEL_OBJECT_TRACK_INSTANCES
o = root->instances;
while (o) {
- printf("%s instance %p [%d]\n", p, o, o->ref_count);
+ printf("%s instance %p [%d]\n", p, (gpointer) o, o->ref_count);
/* todo: should lock hooks while it scans them */
if (o->hooks) {
CamelHookPair *pair = o->hooks->list;
while (pair) {
- printf("%s hook '%s' func %p data %p\n", p, pair->name, pair->func.event, pair->data);
+ printf("%s hook '%s' func %p data %p\n", p, pair->name, (gpointer) pair->func.event, (gpointer) pair->data);
pair = pair->next;
}
}
diff --git a/camel/camel-search-sql-sexp.c b/camel/camel-search-sql-sexp.c
index 13947dc..b7e1c69 100644
--- a/camel/camel-search-sql-sexp.c
+++ b/camel/camel-search-sql-sexp.c
@@ -33,7 +33,7 @@
#include <glib.h>
#include "camel-search-sql-sexp.h"
#include "libedataserver/e-sexp.h"
-#define d(x) //x;printf("\n");
+#define d(x) /* x;printf("\n"); */
#ifdef TEST_MAIN
#include <sqlite3.h>
@@ -653,7 +653,7 @@ dreceived NUMERIC , (match-all (< (get-received-date) (- (get-curr
char * camel_db_get_column_name (const char *raw_name)
{
- //d(g_print ("\n\aRAW name is : [%s] \n\a", raw_name));
+ /* d(g_print ("\n\aRAW name is : [%s] \n\a", raw_name)); */
if (!g_ascii_strcasecmp (raw_name, "Subject"))
return g_strdup ("subject");
else if (!g_ascii_strcasecmp (raw_name, "from"))
diff --git a/camel/camel-search-sql.c b/camel/camel-search-sql.c
index 55d9f54..0aa02da 100644
--- a/camel/camel-search-sql.c
+++ b/camel/camel-search-sql.c
@@ -187,7 +187,7 @@ g_node_dump (GList *l)
while (l) {
node = l->data;
- printf("%p (%d %d '%s')\t", node, node->ref, node->level, node->exact_token);
+ printf("%p (%d %d '%s')\t", (gpointer) node, node->ref, node->level, node->exact_token);
l = l->next;
}
printf("\n");
@@ -393,14 +393,14 @@ camel_sexp_to_sql (const char *txt)
} else {
d(printf("str %s\n", scanner->value.v_string));
if (g_ascii_strcasecmp (scanner->value.v_string, "get-current-date") == 0) {
- lval = time(NULL); //Make this 12:00 am
+ lval = time(NULL); /* Make this 12:00 am */
} else
lval = atol (scanner->value.v_string);
d(printf("str %d\n", lval));
}
token = g_scanner_get_next_token (scanner);
}
- // (> (get-sent-date) (- (get-current-date) 100))) )
+ /* (> (get-sent-date) (- (get-current-date) 100))) ) */
d(printf("lvl = %d %ld\n", lvl, lval));
bstr = g_strdup_printf ("%d", lval);
}
@@ -440,14 +440,14 @@ camel_sexp_to_sql (const char *txt)
} else {
d(printf("str %s\n", scanner->value.v_string));
if (g_ascii_strcasecmp (scanner->value.v_string, "get-current-date") == 0) {
- lval = time(NULL); //Make this 12:00 am
+ lval = time(NULL); /* Make this 12:00 am */
} else
lval = atol (scanner->value.v_string);
d(printf("str %d\n", lval));
}
token = g_scanner_get_next_token (scanner);
}
- // (> (get-sent-date) (- (get-current-date) 100))) )
+ /* (> (get-sent-date) (- (get-current-date) 100))) ) */
d(printf("lvl = %ld\n", lval));
node = g_new0 (Node, 1);
node->token = bstr;
@@ -461,9 +461,9 @@ camel_sexp_to_sql (const char *txt)
operands = g_list_prepend (operands, node);
all = g_list_prepend (all, node);
level--;
- //g_node_dump (all);printf("\n\n");
- //g_node_dump (operands);printf("\n\n");
- //g_node_dump (operators);printf("\n\n");
+ /* g_node_dump (all);printf("\n\n"); */
+ /* g_node_dump (operands);printf("\n\n"); */
+ /* g_node_dump (operators);printf("\n\n"); */
} else if (token == '>' || token == '<') {
@@ -495,9 +495,9 @@ camel_sexp_to_sql (const char *txt)
all = g_list_prepend (all, node);
}
- //g_node_dump (all);printf("\n\n");
- //g_node_dump (operands);printf("\n\n");
- //g_node_dump (operators);printf("\n\n");
+ /* g_node_dump (all);printf("\n\n"); */
+ /* g_node_dump (operands);printf("\n\n"); */
+ /* g_node_dump (operators);printf("\n\n"); */
if (operands) {
mnode = operands->data;
@@ -631,7 +631,7 @@ camel_sexp_to_sql (const char *txt)
sqstr = g_strdup_printf("%c%s%c", n3->pre_token, n1->exact_token, n3->post_token);
escstr = escape_values(sqstr);
str = g_strdup_printf("(%s %s%s %s %s)", n3->ignore_lhs ? "":n2->exact_token, prefix ? prefix : " ", temp_op, n3->exact_token, escstr);
- //printf("str %s\n", str);
+ /* printf("str %s\n", str); */
g_free (n3->exact_token);
g_free (sqstr);
@@ -658,14 +658,14 @@ camel_sexp_to_sql (const char *txt)
free_node(opnode); free_node(opnode);
operators = g_list_delete_link (operators, operators);
all = g_list_delete_link (all, all);
- //g_node_dump (operators);
+ /* g_node_dump (operators); */
}
if (n2->execute) {
Node *popnode=NULL;
gboolean dbl = FALSE;
- //g_node_dump (operators);
+ /* g_node_dump (operators); */
if (n2->prefix) {
if (operators && operators->next)
popnode = operators->next->data;
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index f603283..cc20c7e 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -525,7 +525,7 @@ summary_header_to_db (CamelFolderSummary *s, CamelException *ex)
CAMEL_FOLDER_JUNKED_NOT_DELETED, &junked_not_deleted,
CAMEL_FOLDER_UNREAD, &unread, NULL);
if (1) { /* We always would do this. Just refactor the code again. */
- //!(((CamelVeeSummary *) s)->force_counts) && !g_getenv("FORCE_VFOLDER_COUNT")) {
+ /*!(((CamelVeeSummary *) s)->force_counts) && !g_getenv("FORCE_VFOLDER_COUNT")) {*/
/* We should be in sync always. so use the count. Don't search.*/
record->junk_count = s->junk_count;
record->deleted_count = s->deleted_count;
@@ -2019,7 +2019,7 @@ vf_getv(CamelObject *object, CamelException *ex, CamelArgGetV *args)
guint32 flags;
vinfo = (CamelVeeMessageInfo *) info;
- flags = vinfo->old_flags;// ? vinfo->old_flags : camel_message_info_flags(info);
+ flags = vinfo->old_flags; /* ? vinfo->old_flags : camel_message_info_flags(info); */
if ((flags & (CAMEL_MESSAGE_SEEN)) == 0)
unread++;
diff --git a/camel/camel-vee-summary.c b/camel/camel-vee-summary.c
index 4260380..31d6082 100644
--- a/camel/camel-vee-summary.c
+++ b/camel/camel-vee-summary.c
@@ -265,12 +265,14 @@ vee_info_set_flags(CamelMessageInfo *mi, guint32 flags, guint32 set)
if (hacked_unread_folder && !vsummary->fake_visible_count)
vsummary->fake_visible_count = mi->summary->visible_count;
+#if 0
/* Keep the summary in sync */
- //mi->summary->unread_count += unread - old_unread;
- //mi->summary->deleted_count += deleted - old_deleted;
- //mi->summary->junk_count += junked - old_junked;
- //mi->summary->junk_not_deleted_count += junked_not_deleted - old_junked_not_deleted;
- //mi->summary->visible_count += visible - old_visible;
+ mi->summary->unread_count += unread - old_unread;
+ mi->summary->deleted_count += deleted - old_deleted;
+ mi->summary->junk_count += junked - old_junked;
+ mi->summary->junk_not_deleted_count += junked_not_deleted - old_junked_not_deleted;
+ mi->summary->visible_count += visible - old_visible;
+#endif
if (vsummary->fake_visible_count || hacked_unread_folder)
vsummary->fake_visible_count += visible - old_visible;
diff --git a/camel/camel-vtrash-folder.c b/camel/camel-vtrash-folder.c
index fe09abf..aa32656 100644
--- a/camel/camel-vtrash-folder.c
+++ b/camel/camel-vtrash-folder.c
@@ -151,7 +151,7 @@ vtrash_getv(CamelObject *object, CamelException *ex, CamelArgGetV *args)
guint32 flags;
vinfo = (CamelVeeMessageInfo *) info;
- flags = vinfo->old_flags;// ? vinfo->old_flags : camel_message_info_flags(info);
+ flags = vinfo->old_flags;/* ? vinfo->old_flags : camel_message_info_flags(info); */
if ((flags & (CAMEL_MESSAGE_SEEN)) == 0)
unread++;
@@ -334,7 +334,7 @@ vtrash_search_by_expression(CamelFolder *folder, const char *expression, CamelEx
CamelVeeMessageInfo *vmi = (CamelVeeMessageInfo *) camel_folder_summary_uid (folder->summary, infos->pdata[i]);
if (!vmi)
continue;
- //if (camel_message_info_flags(mi) & ((CamelVTrashFolder *)folder)->bit)
+ /* if (camel_message_info_flags(mi) & ((CamelVTrashFolder *)folder)->bit) */
if (vmi->summary == f->summary) /* Belongs to this folder */
g_ptr_array_add(uids, (void *)camel_pstring_strdup(infos->pdata[i]+8));
camel_message_info_free (vmi);
@@ -387,22 +387,24 @@ vtrash_search_by_uids(CamelFolder *folder, const char *expression, GPtrArray *ui
/* map the vfolder uid's to the source folder uid's first */
/* FIXME[disk-summary] check this. is it uids od folder_uids */
- //g_ptr_array_set_size(uids, 0);
+ /*g_ptr_array_set_size(uids, 0);*/
g_ptr_array_set_size (folder_uids, 0);
for (i=0;i<uids->len;i++) {
char *uid = uids->pdata[i];
- //if (strlen(uid) >= 8 && strncmp(uid, hash, 8) == 0) {
- if (strncmp(uid, hash, 8) == 0) {
- //CamelMessageInfo *mi;
+ /*if (strlen(uid) >= 8 && strncmp(uid, hash, 8) == 0) {*/
+ if (strncmp(uid, hash, 8) == 0) {
+#if 0
+ CamelMessageInfo *mi;
/* FIXME[disk-summary] is it really reqd, if
* so uncomment it */
- //mi = camel_folder_get_message_info(f, uid+8);
- //if (mi) {
- // if(camel_message_info_flags(mi) & ((CamelVTrashFolder *)folder)->bit)
+ mi = camel_folder_get_message_info(f, uid+8);
+ if (mi) {
+ if(camel_message_info_flags(mi) & ((CamelVTrashFolder *)folder)->bit)
g_ptr_array_add(folder_uids, uid+8);
- // camel_folder_free_message_info(f, mi);
- //}
+ camel_folder_free_message_info(f, mi);
+ }
+#endif
}
}
@@ -663,10 +665,11 @@ camel_vtrash_folder_class_init (CamelVTrashFolderClass *klass)
/* Not required, lets use the base class search function */
/* folder_class->search_by_expression = vtrash_search_by_expression; */
/* folder_class->search_by_uids = vtrash_search_by_uids; */
+#if 0
+ ((CamelVeeFolderClass *)klass)->add_folder = vtrash_add_folder;
+ ((CamelVeeFolderClass *)klass)->remove_folder = vtrash_remove_folder;
+ ((CamelVeeFolderClass *)klass)->rebuild_folder = vtrash_rebuild_folder;
- //((CamelVeeFolderClass *)klass)->add_folder = vtrash_add_folder;
- //((CamelVeeFolderClass *)klass)->remove_folder = vtrash_remove_folder;
- //((CamelVeeFolderClass *)klass)->rebuild_folder = vtrash_rebuild_folder;
-
- //((CamelVeeFolderClass *)klass)->folder_changed = vtrash_folder_changed;
+ ((CamelVeeFolderClass *)klass)->folder_changed = vtrash_folder_changed;
+#endif
}
diff --git a/camel/providers/groupwise/camel-groupwise-folder.c b/camel/providers/groupwise/camel-groupwise-folder.c
index dfa1d42..0b0f289 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.c
+++ b/camel/providers/groupwise/camel-groupwise-folder.c
@@ -1078,7 +1078,7 @@ groupwise_refresh_info(CamelFolder *folder, CamelException *ex)
}
camel_store_summary_info_free ((CamelStoreSummary *)((CamelGroupwiseStore *)folder->parent_store)->summary, si);
}
- //camel_folder_summary_save_to_db (folder->summary, ex);
+ /* camel_folder_summary_save_to_db (folder->summary, ex); */
camel_store_summary_save ((CamelStoreSummary *)((CamelGroupwiseStore *)folder->parent_store)->summary);
} else {
/* We probably could not get the messages the first time. (get_folder) failed???!
@@ -1111,7 +1111,7 @@ groupwise_refresh_folder(CamelFolder *folder, CamelException *ex)
/* Sync-up the (un)read changes before getting updates,
so that the getFolderList will reflect the most recent changes too */
- //groupwise_sync (folder, FALSE, ex);
+ /*groupwise_sync (folder, FALSE, ex);*/
if (((CamelOfflineStore *) gw_store)->state == CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL) {
g_warning ("In offline mode. Cannot refresh!!!\n");
@@ -1191,7 +1191,7 @@ groupwise_refresh_folder(CamelFolder *folder, CamelException *ex)
g_free (summary->time_string);
- //summary->time_string = g_strdup (t_str);
+ /*summary->time_string = g_strdup (t_str);*/
((CamelGroupwiseSummary *) folder->summary)->time_string = g_strdup (t_str);
camel_folder_summary_touch (folder->summary);
groupwise_sync_summary (folder, ex);
@@ -1781,7 +1781,7 @@ groupwise_folder_item_to_msg( CamelFolder *folder,
attach_list = e_gw_item_get_attach_id_list (item);
if (attach_list) {
- //int attach_count = g_slist_length (attach_list);
+ /*int attach_count = g_slist_length (attach_list);*/
GSList *al = attach_list;
EGwItemAttachment *attach = (EGwItemAttachment *)al->data;
char *attachment = NULL;
@@ -1804,8 +1804,8 @@ groupwise_folder_item_to_msg( CamelFolder *folder,
g_free (attachment);
is_text_html = TRUE;
}
- }//if attachment and len
- } // if Mime.822 or TEXT.htm
+ }/* if attachment and len */
+ } /* if Mime.822 or TEXT.htm */
if (!ignore_mime_822) {
for (al = attach_list ; al != NULL ; al = al->next) {
@@ -1858,7 +1858,7 @@ groupwise_folder_item_to_msg( CamelFolder *folder,
}
}
- }//if attach_list
+ } /* if attach_list */
msg = camel_mime_message_new ();
@@ -2019,7 +2019,7 @@ groupwise_folder_item_to_msg( CamelFolder *folder,
camel_mime_part_set_content_id (part, attach->contentid);
}
- //camel_mime_part_set_filename(part, g_strdup(attach->name));
+ /*camel_mime_part_set_filename(part, g_strdup(attach->name));*/
if (attach->contentType) {
if (is_base64_encoded)
camel_mime_part_set_encoding (part, CAMEL_TRANSFER_ENCODING_BASE64);
@@ -2385,7 +2385,7 @@ groupwise_transfer_messages_to (CamelFolder *source, GPtrArray *uids,
camel_folder_summary_remove_uid (source->summary, uids->pdata[index]);
camel_folder_change_info_remove_uid (changes, uids->pdata[index]);
- //}
+ /*}*/
}
} else {
g_warning ("Warning!! Could not move item : %s\n", (char *)uids->pdata[index]);
diff --git a/camel/providers/groupwise/camel-groupwise-store-summary.h b/camel/providers/groupwise/camel-groupwise-store-summary.h
index 12a3214..5df3bce 100644
--- a/camel/providers/groupwise/camel-groupwise-store-summary.h
+++ b/camel/providers/groupwise/camel-groupwise-store-summary.h
@@ -39,7 +39,7 @@ typedef struct _CamelGroupwiseStoreInfo CamelGroupwiseStoreInfo;
enum {
CAMEL_GW_STORE_INFO_FULL_NAME = CAMEL_STORE_INFO_LAST,
- CAMEL_GW_STORE_INFO_LAST,
+ CAMEL_GW_STORE_INFO_LAST
};
struct _CamelGroupwiseStoreInfo {
diff --git a/camel/providers/groupwise/camel-groupwise-store.c b/camel/providers/groupwise/camel-groupwise-store.c
index 3813600..0f26dff 100644
--- a/camel/providers/groupwise/camel-groupwise-store.c
+++ b/camel/providers/groupwise/camel-groupwise-store.c
@@ -416,7 +416,7 @@ groupwise_disconnect (CamelService *service, gboolean clean, CamelException *ex)
CAMEL_SERVICE_REC_UNLOCK (groupwise_store, connect_lock);
}
- //groupwise_disconnect_cleanup (service, clean, ex);
+ /* groupwise_disconnect_cleanup (service, clean, ex); */
return TRUE;
}
diff --git a/camel/providers/groupwise/camel-groupwise-summary.c b/camel/providers/groupwise/camel-groupwise-summary.c
index e4fe38e..c5d1fdf 100644
--- a/camel/providers/groupwise/camel-groupwise-summary.c
+++ b/camel/providers/groupwise/camel-groupwise-summary.c
@@ -494,7 +494,7 @@ groupwise_summary_clear (CamelFolderSummary *summary, gboolean uncache)
}
camel_folder_summary_clear_db (summary);
- //camel_folder_summary_save (summary);
+ /*camel_folder_summary_save (summary);*/
if (uncache)
camel_data_cache_clear (((CamelGroupwiseFolder *) summary->folder)->cache, "cache", NULL);
diff --git a/camel/providers/groupwise/camel-groupwise-summary.h b/camel/providers/groupwise/camel-groupwise-summary.h
index a1b4583..33a8137 100644
--- a/camel/providers/groupwise/camel-groupwise-summary.h
+++ b/camel/providers/groupwise/camel-groupwise-summary.h
@@ -40,7 +40,7 @@ typedef struct _CamelGroupwiseMessageContentInfo CamelGroupwiseMessageContentInf
/* extra summary flags*/
enum {
CAMEL_GW_MESSAGE_JUNK = 1<<17,
- CAMEL_GW_MESSAGE_NOJUNK = 1<<18,
+ CAMEL_GW_MESSAGE_NOJUNK = 1<<18
};
struct _CamelGroupwiseMessageInfo {
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index f219be4..b6c0f1e 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -100,7 +100,7 @@ static void imap_sync (CamelFolder *folder, gboolean expunge, CamelException *ex
static void imap_expunge_uids_online (CamelFolder *folder, GPtrArray *uids, CamelException *ex);
static void imap_expunge_uids_offline (CamelFolder *folder, GPtrArray *uids, CamelException *ex);
static void imap_expunge (CamelFolder *folder, CamelException *ex);
-//static void imap_cache_message (CamelDiscoFolder *disco_folder, const char *uid, CamelException *ex);
+/*static void imap_cache_message (CamelDiscoFolder *disco_folder, const char *uid, CamelException *ex);*/
static void imap_rename (CamelFolder *folder, const char *new);
static GPtrArray * imap_get_uncached_uids (CamelFolder *folder, GPtrArray * uids, CamelException *ex);
static char* imap_get_filename (CamelFolder *folder, const char *uid, CamelException *ex);
diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h
index fb0fe7d..ef5a615 100644
--- a/camel/providers/imap/camel-imap-folder.h
+++ b/camel/providers/imap/camel-imap-folder.h
@@ -47,7 +47,7 @@ enum {
};
enum {
- CAMEL_IMAP_FOLDER_CHECK_FOLDER = CAMEL_IMAP_FOLDER_ARG_CHECK_FOLDER | CAMEL_ARG_BOO,
+ CAMEL_IMAP_FOLDER_CHECK_FOLDER = CAMEL_IMAP_FOLDER_ARG_CHECK_FOLDER | CAMEL_ARG_BOO
};
typedef struct _CamelImapFolderClass CamelImapFolderClass;
diff --git a/camel/providers/imap/camel-imap-summary.h b/camel/providers/imap/camel-imap-summary.h
index c17bcef..8cb3b57 100644
--- a/camel/providers/imap/camel-imap-summary.h
+++ b/camel/providers/imap/camel-imap-summary.h
@@ -40,7 +40,7 @@
G_BEGIN_DECLS
enum {
- CAMEL_IMAP_MESSAGE_RECENT = 1<<17,
+ CAMEL_IMAP_MESSAGE_RECENT = 1<<17
};
typedef struct _CamelImapSummaryClass CamelImapSummaryClass;
diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c
index 28c8c27..8df4790 100644
--- a/camel/providers/local/camel-local-summary.c
+++ b/camel/providers/local/camel-local-summary.c
@@ -474,7 +474,7 @@ local_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMess
mi = (CamelLocalMessageInfo *)camel_folder_summary_add_from_message((CamelFolderSummary *)cls, msg);
if (mi) {
- //d(printf("Added, uid = %s\n", mi->uid));
+ /*d(printf("Added, uid = %s\n", mi->uid));*/
if (info) {
const CamelTag *tag = camel_message_info_user_tags(info);
const CamelFlag *flag = camel_message_info_user_flags(info);
diff --git a/camel/providers/pop3/camel-pop3-engine.h b/camel/providers/pop3/camel-pop3-engine.h
index 55f1a12..b2da7ae 100644
--- a/camel/providers/pop3/camel-pop3-engine.h
+++ b/camel/providers/pop3/camel-pop3-engine.h
@@ -72,7 +72,7 @@ enum {
/* enable/disable flags for the engine itself */
enum {
- CAMEL_POP3_ENGINE_DISABLE_EXTENSIONS = 1<<0,
+ CAMEL_POP3_ENGINE_DISABLE_EXTENSIONS = 1<<0
};
typedef void (*CamelPOP3CommandFunc)(CamelPOP3Engine *pe, CamelPOP3Stream *stream, void *data);
diff --git a/libebackend/e-dbhash.h b/libebackend/e-dbhash.h
index 65a35af..9d7b7c5 100644
--- a/libebackend/e-dbhash.h
+++ b/libebackend/e-dbhash.h
@@ -18,7 +18,7 @@ G_BEGIN_DECLS
typedef enum {
E_DBHASH_STATUS_SAME,
E_DBHASH_STATUS_DIFFERENT,
- E_DBHASH_STATUS_NOT_FOUND,
+ E_DBHASH_STATUS_NOT_FOUND
} EDbHashStatus;
typedef struct _EDbHash EDbHash;
diff --git a/libebackend/e-file-cache.c b/libebackend/e-file-cache.c
index b594343..a59219a 100644
--- a/libebackend/e-file-cache.c
+++ b/libebackend/e-file-cache.c
@@ -43,7 +43,7 @@ enum {
PROP_FILENAME
};
-G_DEFINE_TYPE (EFileCache, e_file_cache, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EFileCache, e_file_cache, G_TYPE_OBJECT)
static void
e_file_cache_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
diff --git a/libedataserver/e-account-list.c b/libedataserver/e-account-list.c
index 00b1f61..0c683f5 100644
--- a/libedataserver/e-account-list.c
+++ b/libedataserver/e-account-list.c
@@ -43,7 +43,7 @@ static guint signals [LAST_SIGNAL] = { 0 };
static void dispose (GObject *);
static void finalize (GObject *);
-G_DEFINE_TYPE (EAccountList, e_account_list, E_TYPE_LIST);
+G_DEFINE_TYPE (EAccountList, e_account_list, E_TYPE_LIST)
static void
e_account_list_class_init (EAccountListClass *klass)
diff --git a/libedataserver/e-account-list.h b/libedataserver/e-account-list.h
index d0f5d52..10df7db 100644
--- a/libedataserver/e-account-list.h
+++ b/libedataserver/e-account-list.h
@@ -40,7 +40,7 @@ typedef enum _e_account_find_t {
E_ACCOUNT_FIND_UID,
E_ACCOUNT_FIND_ID_NAME,
E_ACCOUNT_FIND_ID_ADDRESS,
- E_ACCOUNT_FIND_PARENT_UID,
+ E_ACCOUNT_FIND_PARENT_UID
} e_account_find_t;
typedef struct _EAccountList {
diff --git a/libedataserver/e-account.c b/libedataserver/e-account.c
index 47ec526..56d089e 100644
--- a/libedataserver/e-account.c
+++ b/libedataserver/e-account.c
@@ -44,7 +44,7 @@ static guint signals[LAST_SIGNAL];
static void finalize (GObject *);
-G_DEFINE_TYPE (EAccount, e_account, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EAccount, e_account, G_TYPE_OBJECT)
/*
lock mail accounts Relatively difficult -- involves redesign of the XML blobs which describe accounts
@@ -726,7 +726,7 @@ enum {
EAP_LOCK_DEFAULT_FOLDERS,
EAP_LOCK_SAVE_PASSWD,
EAP_LOCK_SOURCE,
- EAP_LOCK_TRANSPORT,
+ EAP_LOCK_TRANSPORT
};
static struct _system_info {
diff --git a/libedataserver/e-account.h b/libedataserver/e-account.h
index 353ff16..4d92103 100644
--- a/libedataserver/e-account.h
+++ b/libedataserver/e-account.h
@@ -77,7 +77,7 @@ typedef enum _e_account_item_t {
} e_account_item_t;
typedef enum _e_account_access_t {
- E_ACCOUNT_ACCESS_WRITE = 1<<0,
+ E_ACCOUNT_ACCESS_WRITE = 1<<0
} e_account_access_t;
typedef struct _EAccountIdentity {
diff --git a/libedataserver/e-categories.c b/libedataserver/e-categories.c
index d972ed3..459fa17 100644
--- a/libedataserver/e-categories.c
+++ b/libedataserver/e-categories.c
@@ -106,7 +106,7 @@ e_changed_listener_init (EChangedListener *changed)
{
}
-G_DEFINE_TYPE (EChangedListener, e_changed_listener, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EChangedListener, e_changed_listener, G_TYPE_OBJECT)
/* ------------------------------------------------------------------------- */
diff --git a/libedataserver/e-component-listener.c b/libedataserver/e-component-listener.c
index 192ffe2..f4b93e4 100644
--- a/libedataserver/e-component-listener.c
+++ b/libedataserver/e-component-listener.c
@@ -62,7 +62,7 @@ connection_listen_cb (gpointer object, gpointer user_data)
g_static_rec_mutex_unlock (&watched_lock);
}
-G_DEFINE_TYPE (EComponentListener, e_component_listener, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EComponentListener, e_component_listener, G_TYPE_OBJECT)
static void
e_component_listener_class_init (EComponentListenerClass *klass)
diff --git a/libedataserver/e-iterator.c b/libedataserver/e-iterator.c
index 4686534..b164dda 100644
--- a/libedataserver/e-iterator.c
+++ b/libedataserver/e-iterator.c
@@ -20,7 +20,7 @@ enum {
static guint e_iterator_signals [LAST_SIGNAL] = { 0, };
-G_DEFINE_TYPE (EIterator, e_iterator, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EIterator, e_iterator, G_TYPE_OBJECT)
static void
e_iterator_class_init (EIteratorClass *klass)
diff --git a/libedataserver/e-list-iterator.c b/libedataserver/e-list-iterator.c
index 9527c00..005a6d5 100644
--- a/libedataserver/e-list-iterator.c
+++ b/libedataserver/e-list-iterator.c
@@ -30,7 +30,7 @@ static void e_list_iterator_last (EIterator *iterator);
static const void *e_list_iterator_get (EIterator *iterator);
static void e_list_iterator_dispose (GObject *object);
-G_DEFINE_TYPE(EListIterator, e_list_iterator, E_TYPE_ITERATOR);
+G_DEFINE_TYPE(EListIterator, e_list_iterator, E_TYPE_ITERATOR)
static void
e_list_iterator_class_init (EListIteratorClass *klass)
diff --git a/libedataserver/e-list.c b/libedataserver/e-list.c
index 4f40051..88ae729 100644
--- a/libedataserver/e-list.c
+++ b/libedataserver/e-list.c
@@ -15,7 +15,7 @@ static void e_list_init (EList *list);
static void e_list_class_init (EListClass *klass);
static void e_list_dispose (GObject *object);
-G_DEFINE_TYPE (EList, e_list, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EList, e_list, G_TYPE_OBJECT)
static void
e_list_class_init (EListClass *klass)
diff --git a/libedataserver/e-memory.h b/libedataserver/e-memory.h
index 5433e0d..c967e86 100644
--- a/libedataserver/e-memory.h
+++ b/libedataserver/e-memory.h
@@ -45,7 +45,7 @@ typedef enum {
E_MEMPOOL_ALIGN_STRUCT = 0, /* allocate to native structure alignment */
E_MEMPOOL_ALIGN_WORD = 1, /* allocate to words - 16 bit alignment */
E_MEMPOOL_ALIGN_BYTE = 2, /* allocate to bytes - 8 bit alignment */
- E_MEMPOOL_ALIGN_MASK = 3, /* which bits determine the alignment information */
+ E_MEMPOOL_ALIGN_MASK = 3 /* which bits determine the alignment information */
} EMemPoolFlags;
EMemPool *e_mempool_new(int blocksize, int threshold, EMemPoolFlags flags);
diff --git a/libedataserver/e-msgport.h b/libedataserver/e-msgport.h
index 576a089..f7b9e2b 100644
--- a/libedataserver/e-msgport.h
+++ b/libedataserver/e-msgport.h
@@ -80,7 +80,7 @@ typedef struct _EThread EThread;
typedef enum {
E_THREAD_QUEUE = 0, /* run one by one, until done, if the queue_limit is reached, discard new request */
E_THREAD_DROP, /* run one by one, until done, if the queue_limit is reached, discard oldest requests */
- E_THREAD_NEW, /* always run in a new thread, if the queue limit is reached, new requests are
+ E_THREAD_NEW /* always run in a new thread, if the queue limit is reached, new requests are
stored in the queue until a thread becomes available for it, creating a thread pool */
} e_thread_t;
@@ -103,7 +103,7 @@ typedef struct _EMutex EMutex;
typedef enum _e_mutex_t {
E_MUTEX_SIMPLE, /* == pthread_mutex */
- E_MUTEX_REC, /* recursive mutex */
+ E_MUTEX_REC /* recursive mutex */
} e_mutex_t;
EMutex *e_mutex_new(e_mutex_t type);
diff --git a/libedataserver/e-sexp.h b/libedataserver/e-sexp.h
index 3109b92..d804fc5 100644
--- a/libedataserver/e-sexp.h
+++ b/libedataserver/e-sexp.h
@@ -74,7 +74,7 @@ enum _ESExpTermType {
ESEXP_TERM_TIME, /* time_t literal (number of seconds past the epoch) */
ESEXP_TERM_FUNC, /* normal function, arguments are evaluated before calling */
ESEXP_TERM_IFUNC, /* immediate function, raw terms are arguments */
- ESEXP_TERM_VAR, /* variable reference */
+ ESEXP_TERM_VAR /* variable reference */
};
struct _ESExpSymbol {
diff --git a/libedataserver/e-source-group.c b/libedataserver/e-source-group.c
index 6ba0c64..499b40b 100644
--- a/libedataserver/e-source-group.c
+++ b/libedataserver/e-source-group.c
@@ -71,7 +71,7 @@ source_changed_callback (ESource *source,
/* GObject methods. */
-G_DEFINE_TYPE (ESourceGroup, e_source_group, G_TYPE_OBJECT);
+G_DEFINE_TYPE (ESourceGroup, e_source_group, G_TYPE_OBJECT)
static void
impl_dispose (GObject *object)
diff --git a/libedataserver/e-source-list.c b/libedataserver/e-source-list.c
index e8c69d7..675de23 100644
--- a/libedataserver/e-source-list.c
+++ b/libedataserver/e-source-list.c
@@ -228,7 +228,7 @@ conf_changed_callback (GConfClient *client,
/* GObject methods. */
-G_DEFINE_TYPE (ESourceList, e_source_list, G_TYPE_OBJECT);
+G_DEFINE_TYPE (ESourceList, e_source_list, G_TYPE_OBJECT)
static void
impl_dispose (GObject *object)
diff --git a/libedataserver/e-source.c b/libedataserver/e-source.c
index 240d875..62e8dee 100644
--- a/libedataserver/e-source.c
+++ b/libedataserver/e-source.c
@@ -72,7 +72,7 @@ group_weak_notify (ESource *source,
/* GObject methods. */
-G_DEFINE_TYPE (ESource, e_source, G_TYPE_OBJECT);
+G_DEFINE_TYPE (ESource, e_source, G_TYPE_OBJECT)
static void
impl_finalize (GObject *object)
diff --git a/libedataserver/e-trie.c b/libedataserver/e-trie.c
index 2a83824..c627cfc 100644
--- a/libedataserver/e-trie.c
+++ b/libedataserver/e-trie.c
@@ -203,10 +203,10 @@ dump_trie (struct _trie_state *s, int depth)
p[depth * 2] = '\0';
fprintf (stderr, "%s[state] %p: final=%d; pattern-id=%d; fail=%p\n",
- p, s, s->final, s->id, s->fail);
+ p, (gpointer) s, s->final, s->id, (gpointer) s->fail);
m = s->match;
while (m) {
- fprintf (stderr, " %s'%c' -> %p\n", p, m->c, m->state);
+ fprintf (stderr, " %s'%c' -> %p\n", p, m->c, (gpointer) m->state);
if (m->state)
dump_trie (m->state, depth + 1);
diff --git a/libedataserver/test-source-list.c b/libedataserver/test-source-list.c
index 8a7c8f3..870a236 100644
--- a/libedataserver/test-source-list.c
+++ b/libedataserver/test-source-list.c
@@ -125,7 +125,8 @@ dump_group (ESourceGroup *group)
if (e_source_peek_group (source) != group)
g_warning ("\t\t** ERROR ** parent pointer is %p, should be %p",
- e_source_peek_group (source), group);
+ (gpointer) e_source_peek_group (source),
+ (gpointer) group);
}
}
diff --git a/libedataserverui/e-name-selector-dialog.c b/libedataserverui/e-name-selector-dialog.c
index c64a93b..e5ba197 100644
--- a/libedataserverui/e-name-selector-dialog.c
+++ b/libedataserverui/e-name-selector-dialog.c
@@ -82,7 +82,7 @@ static void destination_column_formatter (GtkTreeViewColumn *column, GtkCel
* Class/object setup *
* ------------------ */
-G_DEFINE_TYPE (ENameSelectorDialog, e_name_selector_dialog, GTK_TYPE_DIALOG);
+G_DEFINE_TYPE (ENameSelectorDialog, e_name_selector_dialog, GTK_TYPE_DIALOG)
#define E_NAME_SELECTOR_DIALOG_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), E_TYPE_NAME_SELECTOR_DIALOG, ENameSelectorDialogPrivate))
diff --git a/libedataserverui/e-name-selector-entry.c b/libedataserverui/e-name-selector-entry.c
index 1db864e..cfe2e32 100644
--- a/libedataserverui/e-name-selector-entry.c
+++ b/libedataserverui/e-name-selector-entry.c
@@ -42,7 +42,7 @@ static guint COMPLETION_CUE_MIN_LEN = 0;
static gboolean COMPLETION_FORCE_SHOW_ADDRESS = FALSE;
#define ENS_DEBUG(x)
-G_DEFINE_TYPE (ENameSelectorEntry, e_name_selector_entry, GTK_TYPE_ENTRY);
+G_DEFINE_TYPE (ENameSelectorEntry, e_name_selector_entry, GTK_TYPE_ENTRY)
typedef struct _ENameSelectorEntryPrivate ENameSelectorEntryPrivate;
struct _ENameSelectorEntryPrivate
diff --git a/libedataserverui/e-name-selector-list.c b/libedataserverui/e-name-selector-list.c
index b1b35e9..b056eec 100644
--- a/libedataserverui/e-name-selector-list.c
+++ b/libedataserverui/e-name-selector-list.c
@@ -39,7 +39,7 @@
#define MAX_ROW 10
-G_DEFINE_TYPE (ENameSelectorList, e_name_selector_list, E_TYPE_NAME_SELECTOR_ENTRY);
+G_DEFINE_TYPE (ENameSelectorList, e_name_selector_list, E_TYPE_NAME_SELECTOR_ENTRY)
static void e_name_selector_list_class_init (ENameSelectorListClass *name_selector_list_class);
static void e_name_selector_list_init (ENameSelectorList *name_selector_list);
diff --git a/libedataserverui/e-name-selector-model.c b/libedataserverui/e-name-selector-model.c
index cbdbc33..70caac1 100644
--- a/libedataserverui/e-name-selector-model.c
+++ b/libedataserverui/e-name-selector-model.c
@@ -58,7 +58,7 @@ enum {
static guint signals [LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (ENameSelectorModel, e_name_selector_model, G_TYPE_OBJECT);
+G_DEFINE_TYPE (ENameSelectorModel, e_name_selector_model, G_TYPE_OBJECT)
static void
e_name_selector_model_init (ENameSelectorModel *name_selector_model)
diff --git a/libedataserverui/e-name-selector.c b/libedataserverui/e-name-selector.c
index d5dddfe..a373754 100644
--- a/libedataserverui/e-name-selector.c
+++ b/libedataserverui/e-name-selector.c
@@ -57,7 +57,7 @@ static void e_name_selector_finalize (GObject *object);
* Class/object setup *
* ------------------ */
-G_DEFINE_TYPE (ENameSelector, e_name_selector, G_TYPE_OBJECT);
+G_DEFINE_TYPE (ENameSelector, e_name_selector, G_TYPE_OBJECT)
static void
source_books_destroy (GArray *source_books)
diff --git a/libedataserverui/e-passwords.h b/libedataserverui/e-passwords.h
index 0d7baee..4260c0e 100644
--- a/libedataserverui/e-passwords.h
+++ b/libedataserverui/e-passwords.h
@@ -58,7 +58,7 @@ typedef enum {
E_PASSWORDS_REPROMPT = 1<<9,
E_PASSWORDS_ONLINE = 1<<10, /* only ask if we're online */
E_PASSWORDS_DISABLE_REMEMBER = 1<<11, /* disable the 'remember password' checkbox */
- E_PASSWORDS_PASSPHRASE = 1<<12, /* We are asking a passphrase */
+ E_PASSWORDS_PASSPHRASE = 1<<12 /* We are asking a passphrase */
} EPasswordsRememberType;
char * e_passwords_ask_password (const char *title,
diff --git a/libedataserverui/e-source-selector.c b/libedataserverui/e-source-selector.c
index 3a894db..cabbf02 100644
--- a/libedataserverui/e-source-selector.c
+++ b/libedataserverui/e-source-selector.c
@@ -1625,7 +1625,8 @@ e_source_selector_set_primary_selection (ESourceSelector *selector, ESource *sou
gtk_tree_path_free (path);
} else {
g_warning (G_STRLOC ": Cannot find source %p (%s) in selector %p",
- source, e_source_peek_name (source), selector);
+ (gpointer) source, e_source_peek_name (source),
+ (gpointer) selector);
}
}
diff --git a/servers/exchange/lib/e2k-autoconfig.c b/servers/exchange/lib/e2k-autoconfig.c
index 3e2bb84..85a74b9 100644
--- a/servers/exchange/lib/e2k-autoconfig.c
+++ b/servers/exchange/lib/e2k-autoconfig.c
@@ -1491,8 +1491,8 @@ validate (const char *owa_url, char *user, char *password, ExchangeParams *excha
E2K_AUTOCONFIG_USE_EITHER);
e2k_operation_init (&op);
- // e2k_autoconfig_set_gc_server (ac, ad_server, gal_limit) FIXME
- // e2k_autoconfig_set_gc_server (ac, NULL, -1);
+ /* e2k_autoconfig_set_gc_server (ac, ad_server, gal_limit) FIXME */
+ /* e2k_autoconfig_set_gc_server (ac, NULL, -1); */
*result = e2k_autoconfig_check_exchange (ac, &op);
if (*result == E2K_AUTOCONFIG_OK) {
diff --git a/servers/exchange/lib/e2k-autoconfig.h b/servers/exchange/lib/e2k-autoconfig.h
index 8901f43..5aab24d 100644
--- a/servers/exchange/lib/e2k-autoconfig.h
+++ b/servers/exchange/lib/e2k-autoconfig.h
@@ -24,7 +24,7 @@ typedef enum {
typedef enum {
E2K_AUTOCONFIG_USE_BASIC,
E2K_AUTOCONFIG_USE_NTLM,
- E2K_AUTOCONFIG_USE_EITHER,
+ E2K_AUTOCONFIG_USE_EITHER
} E2kAutoconfigAuthPref;
typedef struct {
diff --git a/servers/exchange/lib/e2k-global-catalog.c b/servers/exchange/lib/e2k-global-catalog.c
index 79e1f75..4f0827c 100644
--- a/servers/exchange/lib/e2k-global-catalog.c
+++ b/servers/exchange/lib/e2k-global-catalog.c
@@ -1105,7 +1105,7 @@ lookup_passwd_max_age (E2kGlobalCatalog *gc, E2kOperation *op)
maxAge = strtod (val, NULL);
}
- //g_hash_table_insert (gc->priv->server_cache, g_strdup (dn), hostname); FIXME?
+ /*g_hash_table_insert (gc->priv->server_cache, g_strdup (dn), hostname); FIXME? */
E2K_GC_DEBUG_MSG(("GC: maxPwdAge = %f\n", maxAge));
diff --git a/servers/exchange/lib/e2k-kerberos.h b/servers/exchange/lib/e2k-kerberos.h
index 51e5c56..aec7e31 100644
--- a/servers/exchange/lib/e2k-kerberos.h
+++ b/servers/exchange/lib/e2k-kerberos.h
@@ -19,7 +19,7 @@ typedef enum {
E2K_KERBEROS_KDC_UNREACHABLE,
E2K_KERBEROS_TIME_SKEW,
- E2K_KERBEROS_FAILED,
+ E2K_KERBEROS_FAILED
} E2kKerberosResult;
E2kKerberosResult e2k_kerberos_check_password (const char *user,
diff --git a/servers/exchange/lib/mapi.h b/servers/exchange/lib/mapi.h
index d5aaefc..de374a9 100644
--- a/servers/exchange/lib/mapi.h
+++ b/servers/exchange/lib/mapi.h
@@ -92,7 +92,7 @@ typedef enum {
typedef enum {
MAPI_ACTION_FLAG_REPLIED_TO_SENDER = 102,
MAPI_ACTION_FLAG_REPLIED_TO_ALL = 103,
- MAPI_ACTION_FLAG_FORWARDED = 104,
+ MAPI_ACTION_FLAG_FORWARDED = 104
} MapiPrActionFlag;
typedef enum {
diff --git a/servers/exchange/storage/e-folder-type-registry.c b/servers/exchange/storage/e-folder-type-registry.c
index fb137c1..eec224f 100644
--- a/servers/exchange/storage/e-folder-type-registry.c
+++ b/servers/exchange/storage/e-folder-type-registry.c
@@ -240,7 +240,7 @@ e_folder_type_registry_set_handler_for_type (EFolderTypeRegistry *folder_type_r
GObject *handler)
{
g_return_val_if_fail (E_IS_FOLDER_TYPE_REGISTRY (folder_type_registry), FALSE);
- //g_return_val_if_fail (EVOLUTION_IS_SHELL_COMPONENT_CLIENT (handler), FALSE);
+ /* g_return_val_if_fail (EVOLUTION_IS_SHELL_COMPONENT_CLIENT (handler), FALSE); */
return set_handler (folder_type_registry, type_name, handler);
}
diff --git a/servers/exchange/storage/exchange-account.c b/servers/exchange/storage/exchange-account.c
index 3bba4e9..7b4cd32 100644
--- a/servers/exchange/storage/exchange-account.c
+++ b/servers/exchange/storage/exchange-account.c
@@ -951,7 +951,7 @@ get_password (ExchangeAccount *account, E2kAutoconfig *ac, ExchangeAccountResult
password = e_passwords_get_password ("Exchange", account->priv->password_key);
#if 0
- // SURF : if (exchange_component_is_interactive (global_exchange_component)) {
+ if (exchange_component_is_interactive (global_exchange_component)) {
gboolean remember, oldremember;
if (!password) {
char *prompt;
diff --git a/servers/exchange/storage/exchange-hierarchy-webdav.h b/servers/exchange/storage/exchange-hierarchy-webdav.h
index 44357d4..0438d4c 100644
--- a/servers/exchange/storage/exchange-hierarchy-webdav.h
+++ b/servers/exchange/storage/exchange-hierarchy-webdav.h
@@ -5,7 +5,7 @@
#define __EXCHANGE_HIERARCHY_WEBDAV_H__
#include "exchange-hierarchy.h"
-//#include "exchange-folder-size.h"
+/* #include "exchange-folder-size.h" */
#ifdef __cplusplus
extern "C" {
diff --git a/servers/google/libgdata-google/gdata-google-service.c b/servers/google/libgdata-google/gdata-google-service.c
index 907d062..282badd 100644
--- a/servers/google/libgdata-google/gdata-google-service.c
+++ b/servers/google/libgdata-google/gdata-google-service.c
@@ -63,7 +63,7 @@ struct _GDataGoogleServicePrivate {
enum {
PROP_0,
PROP_NAME,
- PROP_AGENT,
+ PROP_AGENT
};
diff --git a/servers/google/libgdata/gdata-entry.c b/servers/google/libgdata/gdata-entry.c
index 69fb416..df45682 100644
--- a/servers/google/libgdata/gdata-entry.c
+++ b/servers/google/libgdata/gdata-entry.c
@@ -174,10 +174,6 @@ static void destroy_postal_address (gpointer data, gpointer user_data)
}
-enum {
- PROP_0,
-};
-
static void gdata_entry_init (GTypeInstance *instance,
gpointer g_class)
{
diff --git a/servers/google/libgdata/gdata-feed.c b/servers/google/libgdata/gdata-feed.c
index b730b8d..06a0dad 100644
--- a/servers/google/libgdata/gdata-feed.c
+++ b/servers/google/libgdata/gdata-feed.c
@@ -151,11 +151,6 @@ static void destroy_entries(gpointer data, gpointer user_data)
g_object_unref(G_OBJECT(entry));
}
-enum {
- PROP_0,
-
-};
-
static void
gdata_feed_init(GTypeInstance *instance,
gpointer g_class)
diff --git a/servers/groupwise/e-gw-connection.c b/servers/groupwise/e-gw-connection.c
index 76f4c59..3b6bf7c 100644
--- a/servers/groupwise/e-gw-connection.c
+++ b/servers/groupwise/e-gw-connection.c
@@ -1186,7 +1186,7 @@ e_gw_connection_get_deltas ( EGwConnection *cnc, GSList **adds, GSList **deletes
msg = e_gw_message_new_with_header (cnc->priv->uri, cnc->priv->session_id, "getDeltaRequest");
if (!msg) {
g_warning (G_STRLOC ": Could not build SOAP message");
- // g_object_unref (cnc);
+ /* g_object_unref (cnc); */
return E_GW_CONNECTION_STATUS_UNKNOWN;
}
@@ -1199,7 +1199,7 @@ e_gw_connection_get_deltas ( EGwConnection *cnc, GSList **adds, GSList **deletes
response = e_gw_connection_send_message (cnc, msg);
if (!response) {
g_object_unref (msg);
- // g_object_unref (cnc);
+ /* g_object_unref (cnc); */
return E_GW_CONNECTION_STATUS_NO_RESPONSE;
}
@@ -1207,7 +1207,7 @@ e_gw_connection_get_deltas ( EGwConnection *cnc, GSList **adds, GSList **deletes
if (status != E_GW_CONNECTION_STATUS_OK) {
g_object_unref (response);
g_object_unref (msg);
- // g_object_unref (cnc);
+ /* g_object_unref (cnc); */
return status;
}
@@ -1216,7 +1216,7 @@ e_gw_connection_get_deltas ( EGwConnection *cnc, GSList **adds, GSList **deletes
if (!param) {
g_object_unref (response);
g_object_unref (msg);
- // g_object_unref (cnc);
+ /* g_object_unref (cnc); */
return E_GW_CONNECTION_STATUS_INVALID_RESPONSE;
}
@@ -1224,7 +1224,7 @@ e_gw_connection_get_deltas ( EGwConnection *cnc, GSList **adds, GSList **deletes
if (!g_ascii_strcasecmp (tmp, "0")) {
g_free (tmp);
g_message ("No deltas");
- // g_object_unref (cnc);
+ /* g_object_unref (cnc); */
return E_GW_CONNECTION_STATUS_OK;
}
@@ -1234,8 +1234,8 @@ e_gw_connection_get_deltas ( EGwConnection *cnc, GSList **adds, GSList **deletes
if (!param) {
g_object_unref (response);
g_object_unref (msg);
- // g_object_unref (cnc);
-// return E_GW_CONNECTION_STATUS_INVALID_RESPONSE;
+ /* g_object_unref (cnc); */
+ /* return E_GW_CONNECTION_STATUS_INVALID_RESPONSE; */
/* getting around the server behavior that deltas can be null
* though changes is true */
return E_GW_CONNECTION_STATUS_OK;
@@ -1255,7 +1255,7 @@ e_gw_connection_get_deltas ( EGwConnection *cnc, GSList **adds, GSList **deletes
if (!param_id) {
g_object_unref (response);
g_object_unref (msg);
- // g_object_unref (cnc);
+ /* g_object_unref (cnc); */
}
uid = (char *)soup_soap_parameter_get_string_value (param_id);
/*if (!e_cal_backend_cache_remove_component (cache, uid, NULL))
@@ -1277,7 +1277,7 @@ e_gw_connection_get_deltas ( EGwConnection *cnc, GSList **adds, GSList **deletes
if (!item) {
g_object_unref (response);
g_object_unref (msg);
- // g_object_unref (cnc);
+ /* g_object_unref (cnc); */
return E_GW_CONNECTION_STATUS_INVALID_RESPONSE;
}
/*if (!e_cal_backend_cache_put_component (cache, comp))
@@ -1348,7 +1348,7 @@ e_gw_connection_send_item (EGwConnection *cnc, EGwItem *item, GSList **id_list)
SoupSoapParameter *param;
/* get the generated ID from the SOAP response */
- // for loop here to populate the list_ids.
+ /* for loop here to populate the list_ids. */
for (param = soup_soap_response_get_first_parameter_by_name (response, "id");
param; param = soup_soap_response_get_next_parameter_by_name (response, param, "id")) {
diff --git a/servers/groupwise/e-gw-filter.c b/servers/groupwise/e-gw-filter.c
index bc8bb0d..88bbc40 100644
--- a/servers/groupwise/e-gw-filter.c
+++ b/servers/groupwise/e-gw-filter.c
@@ -198,7 +198,7 @@ e_gw_filter_append_to_soap_message (EGwFilter *filter, SoupSoapMessage *msg)
}
else
append_child_component (filter_component, msg);
- soup_soap_message_end_element (msg); //end filter
+ soup_soap_message_end_element (msg); /* end filter */
}
}
diff --git a/servers/groupwise/e-gw-item.c b/servers/groupwise/e-gw-item.c
index 0a78049..7aa3b7d 100644
--- a/servers/groupwise/e-gw-item.c
+++ b/servers/groupwise/e-gw-item.c
@@ -3256,7 +3256,7 @@ e_gw_item_append_to_soap_message (EGwItem *item, SoupSoapMessage *msg)
char *str_len ;
str = g_base64_encode (priv->message, strlen (priv->message));
- //str = g_strdup (priv->message);
+ /*str = g_strdup (priv->message);*/
str_len = g_strdup_printf ("%d", str ? (int)strlen (str) : 0);
soup_soap_message_start_element (msg, "part", NULL, NULL);
soup_soap_message_add_attribute (msg, "length", str_len, NULL, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
