[evolution-data-server] Bug 641757 - Fix warnings from GCC 4.6

[Matthew Barnes <mbarnes src gnome org>]

commit 3969fb87e74a49c6db478d846831d78595877d93
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Tue Feb 8 01:10:11 2011 -0500

    Bug 641757 - Fix warnings from GCC 4.6
    
    GCC learned how to find dead assignments.

 .../backends/groupwise/e-book-backend-groupwise.c  |    6 --
 addressbook/libedata-book/e-book-backend-cache.c   |   18 +-----
 calendar/backends/caldav/e-cal-backend-caldav.c    |   27 +-------
 .../backends/contacts/e-cal-backend-contacts.c     |    6 --
 calendar/backends/file/e-cal-backend-file-events.c |   72 ++------------------
 calendar/backends/file/e-cal-backend-file-events.h |    9 ---
 .../backends/file/e-cal-backend-file-journal.c     |   64 ++----------------
 .../backends/file/e-cal-backend-file-journal.h     |    5 --
 calendar/backends/file/e-cal-backend-file-todos.c  |   70 ++-----------------
 calendar/backends/file/e-cal-backend-file-todos.h  |    9 ---
 calendar/backends/file/e-cal-backend-file.c        |    6 --
 .../groupwise/e-cal-backend-groupwise-utils.c      |    4 +-
 .../backends/groupwise/e-cal-backend-groupwise.c   |   41 +----------
 calendar/backends/http/e-cal-backend-http.c        |   45 ------------
 calendar/libecal/e-cal-component.c                 |    7 --
 calendar/libecal/e-cal-recur.c                     |    4 +-
 calendar/libecal/e-cal.c                           |    3 -
 calendar/libedata-cal/e-cal-backend-cache.c        |    9 ---
 calendar/libedata-cal/e-cal-backend-file-store.c   |   11 +---
 .../libedata-cal/e-cal-backend-loader-factory.c    |    8 --
 calendar/libedata-cal/e-cal-backend-store.c        |    3 -
 calendar/tests/ecal/test-ecal.c                    |    9 +--
 camel/camel-db.c                                   |    3 +-
 camel/camel-folder.c                               |    2 -
 camel/camel-mime-message.c                         |    3 -
 camel/camel-search-sql.c                           |    4 +-
 camel/camel-smime-context.c                        |    8 ++-
 camel/camel-text-index.c                           |    5 +-
 camel/camel-url.c                                  |    6 +-
 camel/camel-vee-folder.c                           |   14 ----
 camel/providers/groupwise/camel-groupwise-folder.c |   13 +---
 camel/providers/groupwise/camel-groupwise-store.c  |    3 -
 camel/providers/groupwise/camel-groupwise-utils.c  |    6 +--
 camel/providers/imapx/camel-imapx-server.c         |   22 +------
 camel/providers/local/camel-local-folder.c         |   13 ----
 camel/providers/local/camel-mbox-store.c           |    6 --
 camel/providers/pop3/camel-pop3-store.c            |    3 +-
 libebackend/e-file-cache.c                         |    4 -
 libebackend/e-offline-listener.c                   |    4 -
 libedataserver/e-account-list.c                    |    2 -
 libedataserver/e-soap-message.c                    |    3 -
 libedataserverui/e-categories-dialog.c             |    2 -
 libedataserverui/e-name-selector-dialog.c          |    7 --
 libedataserverui/e-name-selector-entry.c           |   10 +---
 libedataserverui/e-source-combo-box.c              |    8 --
 libedataserverui/e-source-selector-dialog.c        |    2 -
 libedataserverui/e-tree-model-generator.c          |    4 -
 servers/groupwise/e-gw-connection.c                |   20 +-----
 servers/groupwise/soup-soap-message.c              |    3 -
 49 files changed, 57 insertions(+), 559 deletions(-)
---
diff --git a/addressbook/backends/groupwise/e-book-backend-groupwise.c b/addressbook/backends/groupwise/e-book-backend-groupwise.c
index 8d068db..20be955 100644
--- a/addressbook/backends/groupwise/e-book-backend-groupwise.c
+++ b/addressbook/backends/groupwise/e-book-backend-groupwise.c
@@ -2904,7 +2904,6 @@ update_address_book_deltas (EBookBackendGroupwise *ebgw)
 	gulong diff;
 	gchar *cache_file_name;
 	struct stat buf;
-	time_t mod_time;
 
 	if (!ebgw)
 		return FALSE;
@@ -2978,7 +2977,6 @@ update_address_book_deltas (EBookBackendGroupwise *ebgw)
 	cache_file_name = e_book_backend_db_cache_get_filename (ebgw->priv->file_db);
 	g_stat (cache_file_name, &buf);
 	g_free (cache_file_name);
-	mod_time = buf.st_mtime;
 
 	if (cache_last_sequence != server_last_sequence) {
 
@@ -3688,13 +3686,9 @@ e_book_backend_groupwise_remove (EBookBackend *backend,
 static gchar *
 e_book_backend_groupwise_get_static_capabilities (EBookBackend *backend)
 {
-	EBookBackendGroupwise *ebgw;
-
 	if (enable_debug)
 		printf ("\ne_book_backend_groupwise_get_static_capabilities...\n");
 
-	ebgw = E_BOOK_BACKEND_GROUPWISE (backend);
-
 	/* do-initialy-query is enabled for system address book also, so that we get the
 	 * book_view, which is needed for displaying cache update progress.
 	 * and null query is handled for system address book.
diff --git a/addressbook/libedata-book/e-book-backend-cache.c b/addressbook/libedata-book/e-book-backend-cache.c
index 7a77848..df1a2c6 100644
--- a/addressbook/libedata-book/e-book-backend-cache.c
+++ b/addressbook/libedata-book/e-book-backend-cache.c
@@ -114,12 +114,9 @@ e_book_backend_cache_add_contact (EBookBackendCache *cache,
 	gchar *vcard_str;
 	const gchar *uid;
 	gboolean retval;
-	EBookBackendCachePrivate *priv;
 
 	g_return_val_if_fail (E_IS_BOOK_BACKEND_CACHE (cache), FALSE);
 
-	priv = cache->priv;
-
 	uid = e_contact_get_const (contact, E_CONTACT_UID);
 	vcard_str = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30);
 
@@ -147,21 +144,13 @@ e_book_backend_cache_remove_contact (EBookBackendCache *cache,
 				    const gchar *uid)
 
 {
-	gboolean retval;
-	EBookBackendCachePrivate *priv;
-
 	g_return_val_if_fail (E_IS_BOOK_BACKEND_CACHE (cache), FALSE);
 	g_return_val_if_fail (uid != NULL, FALSE);
 
-	priv = cache->priv;
-
-	if (!e_file_cache_get_object (E_FILE_CACHE (cache), uid)) {
+	if (!e_file_cache_get_object (E_FILE_CACHE (cache), uid))
 		return FALSE;
-	}
-
-	retval = e_file_cache_remove_object (E_FILE_CACHE (cache), uid);
 
-	return retval;
+	return e_file_cache_remove_object (E_FILE_CACHE (cache), uid);
 }
 
 /**
@@ -178,13 +167,10 @@ e_book_backend_cache_check_contact (EBookBackendCache *cache, const gchar *uid)
 {
 
 	gboolean retval;
-	EBookBackendCachePrivate *priv;
 
 	g_return_val_if_fail (E_IS_BOOK_BACKEND_CACHE (cache), FALSE);
 	g_return_val_if_fail (uid != NULL, FALSE);
 
-	priv = cache->priv;
-
 	retval = FALSE;
 	if (e_file_cache_get_object (E_FILE_CACHE (cache), uid))
 		retval = TRUE;
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index 8f809b6..469997b 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -2244,15 +2244,10 @@ caldav_get_static_capabilities (ECalBackendSync  *backend,
 				gchar           **capabilities,
 				GError          **perror)
 {
-	ECalBackendCalDAV        *cbdav;
-	ECalBackendCalDAVPrivate *priv;
 	ESource *source;
 	GString *caps;
 	gchar *usermail;
 
-	cbdav = E_CAL_BACKEND_CALDAV (backend);
-	priv  = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav);
-
 	caps = g_string_new (CAL_STATIC_CAPABILITY_NO_THISANDFUTURE ","
 			     CAL_STATIC_CAPABILITY_NO_THISANDPRIOR ","
 			     CAL_STATIC_CAPABILITY_REFRESH_SUPPORTED);
@@ -2713,7 +2708,6 @@ get_comp_from_cache (ECalBackendCalDAV *cbdav, const gchar *uid, const gchar *ri
 static gboolean
 put_comp_to_cache (ECalBackendCalDAV *cbdav, icalcomponent *icalcomp, const gchar *href, const gchar *etag)
 {
-	ECalBackendCalDAVPrivate *priv;
 	icalcomponent_kind my_kind;
 	ECalComponent *comp;
 	gboolean res = FALSE;
@@ -2721,8 +2715,6 @@ put_comp_to_cache (ECalBackendCalDAV *cbdav, icalcomponent *icalcomp, const gcha
 	g_return_val_if_fail (cbdav != NULL, FALSE);
 	g_return_val_if_fail (icalcomp != NULL, FALSE);
 
-	priv  = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav);
-
 	my_kind = e_cal_backend_get_kind (E_CAL_BACKEND (cbdav));
 	comp = e_cal_component_new ();
 
@@ -2809,7 +2801,6 @@ strip_unneeded_x_props (icalcomponent *icomp)
 static void
 convert_to_inline_attachment (ECalBackendCalDAV *cbdav, icalcomponent *icalcomp)
 {
-	ECalBackendCalDAVPrivate *priv;
 	icalcomponent *cclone;
 	icalproperty *p;
 	GSList *to_remove = NULL;
@@ -2837,7 +2828,6 @@ convert_to_inline_attachment (ECalBackendCalDAV *cbdav, icalcomponent *icalcomp)
 	g_slist_free (to_remove);
 
 	/* convert local url attachments to inline attachments now */
-	priv = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav);
 	for (p = icalcomponent_get_first_property (cclone, ICAL_ATTACH_PROPERTY);
 	     p;
 	     p = icalcomponent_get_next_property (cclone, ICAL_ATTACH_PROPERTY)) {
@@ -2900,7 +2890,6 @@ convert_to_inline_attachment (ECalBackendCalDAV *cbdav, icalcomponent *icalcomp)
 static void
 convert_to_url_attachment (ECalBackendCalDAV *cbdav, icalcomponent *icalcomp)
 {
-	ECalBackendCalDAVPrivate *priv;
 	ECalBackend *backend;
 	GSList *to_remove = NULL;
 	const gchar *cache_dir;
@@ -2929,7 +2918,6 @@ convert_to_url_attachment (ECalBackendCalDAV *cbdav, icalcomponent *icalcomp)
 	g_slist_free (to_remove);
 
 	/* convert inline attachments to url attachments now */
-	priv = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav);
 	for (p = icalcomponent_get_first_property (cclone, ICAL_ATTACH_PROPERTY);
 	     p;
 	     p = icalcomponent_get_next_property (cclone, ICAL_ATTACH_PROPERTY)) {
@@ -2995,13 +2983,12 @@ remove_dir (const gchar *dir)
 
 		while ((entry = g_dir_read_name (d)) != NULL) {
 			gchar *path;
-			gint ret;
 
 			path = g_build_filename (dir, entry, NULL);
 			if (g_file_test (path, G_FILE_TEST_IS_DIR))
 				remove_dir (path);
 			else
-				ret = g_unlink (path);
+				g_unlink (path);
 			g_free (path);
 		}
 		g_dir_close (d);
@@ -3100,12 +3087,9 @@ add_timezones_from_component (ECalBackendCalDAV *cbdav, icalcomponent *vcal_comp
 static gchar *
 pack_cobj (ECalBackendCalDAV *cbdav, icalcomponent *icomp)
 {
-	ECalBackendCalDAVPrivate *priv;
 	icalcomponent *calcomp;
 	gchar          *objstr;
 
-	priv  = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav);
-
 	if (icalcomponent_isa (icomp) != ICAL_VCALENDAR_COMPONENT) {
 		icalcomponent *cclone;
 
@@ -3324,15 +3308,12 @@ replace_master (ECalBackendCalDAV *cbdav, icalcomponent *old_comp, icalcomponent
 static void
 do_create_object (ECalBackendCalDAV *cbdav, gchar **calobj, gchar **uid, GError **perror)
 {
-	ECalBackendCalDAVPrivate *priv;
 	ECalComponent            *comp;
 	gboolean                  online, did_put = FALSE;
 	struct icaltimetype current;
 	icalcomponent *icalcomp;
 	const gchar *comp_uid;
 
-	priv  = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav);
-
 	if (!check_state (cbdav, &online, perror))
 		return;
 
@@ -3765,7 +3746,6 @@ process_object (ECalBackendCalDAV   *cbdav,
 		icalproperty_method  method,
 		GError             **error)
 {
-	ECalBackendCalDAVPrivate *priv;
 	ECalBackend              *backend;
 	struct icaltimetype       now;
 	gchar *new_obj_str;
@@ -3774,7 +3754,6 @@ process_object (ECalBackendCalDAV   *cbdav,
 	ECalComponentId *id = e_cal_component_get_id (ecomp);
 	GError *err = NULL;
 
-	priv = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav);
 	backend = E_CAL_BACKEND (cbdav);
 
 	e_return_data_cal_error_if_fail (id != NULL, InvalidObject);
@@ -3872,7 +3851,6 @@ static void
 do_receive_objects (ECalBackendSync *backend, EDataCal *cal, const gchar *calobj, GError **perror)
 {
 	ECalBackendCalDAV        *cbdav;
-	ECalBackendCalDAVPrivate *priv;
 	icalcomponent            *icomp;
 	icalcomponent_kind        kind;
 	icalproperty_method       tmethod;
@@ -3882,7 +3860,6 @@ do_receive_objects (ECalBackendSync *backend, EDataCal *cal, const gchar *calobj
 	GError *err = NULL;
 
 	cbdav = E_CAL_BACKEND_CALDAV (backend);
-	priv  = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav);
 
 	if (!check_state (cbdav, &online, perror))
 		return;
@@ -4029,11 +4006,9 @@ static void
 caldav_get_object (ECalBackendSync *backend, EDataCal *cal, const gchar *uid, const gchar *rid, gchar **object, GError **perror)
 {
 	ECalBackendCalDAV        *cbdav;
-	ECalBackendCalDAVPrivate *priv;
 	icalcomponent            *icalcomp;
 
 	cbdav = E_CAL_BACKEND_CALDAV (backend);
-	priv  = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav);
 
 	*object = NULL;
 	icalcomp = get_comp_from_cache (cbdav, uid, rid, NULL, NULL);
diff --git a/calendar/backends/contacts/e-cal-backend-contacts.c b/calendar/backends/contacts/e-cal-backend-contacts.c
index 0a42134..5f23037 100644
--- a/calendar/backends/contacts/e-cal-backend-contacts.c
+++ b/calendar/backends/contacts/e-cal-backend-contacts.c
@@ -1275,12 +1275,6 @@ e_cal_backend_contacts_init (ECalBackendContacts *cbc)
 static void
 e_cal_backend_contacts_create_object (ECalBackendSync *backend, EDataCal *cal, gchar **calobj, gchar **uid, GError **perror)
 {
-	ECalBackendContacts *cbcontacts;
-	ECalBackendContactsPrivate *priv;
-
-	cbcontacts = E_CAL_BACKEND_CONTACTS (backend);
-	priv = cbcontacts->priv;
-
 	g_propagate_error (perror, EDC_ERROR (PermissionDenied));
 }
 
diff --git a/calendar/backends/file/e-cal-backend-file-events.c b/calendar/backends/file/e-cal-backend-file-events.c
index 03a2b7c..28f2b6d 100644
--- a/calendar/backends/file/e-cal-backend-file-events.c
+++ b/calendar/backends/file/e-cal-backend-file-events.c
@@ -25,80 +25,20 @@
 
 #include "e-cal-backend-file-events.h"
 
-G_DEFINE_TYPE (ECalBackendFileEvents, e_cal_backend_file_events, E_TYPE_CAL_BACKEND_FILE)
+G_DEFINE_TYPE (
+	ECalBackendFileEvents,
+	e_cal_backend_file_events,
+	E_TYPE_CAL_BACKEND_FILE)
 
-
-
-/* Private part of the CalBackendFileEvents structure */
-struct _ECalBackendFileEventsPrivate {
-	guint reserved;
-};
-
-
-
-static void e_cal_backend_file_events_dispose (GObject *object);
-static void e_cal_backend_file_events_finalize (GObject *object);
-
-static GObjectClass *parent_class;
-
-
-
-/* Class initialization function for the file backend */
 static void
 e_cal_backend_file_events_class_init (ECalBackendFileEventsClass *klass)
 {
-	GObjectClass *object_class;
-	ECalBackendClass *backend_class;
-
-	object_class = G_OBJECT_CLASS (klass);
-	backend_class = E_CAL_BACKEND_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class->dispose = e_cal_backend_file_events_dispose;
-	object_class->finalize = e_cal_backend_file_events_finalize;
 }
 
-/* Object initialization function for the file backend */
 static void
 e_cal_backend_file_events_init (ECalBackendFileEvents *cbfile)
 {
-	ECalBackendFileEventsPrivate *priv;
-
-	priv = g_new0 (ECalBackendFileEventsPrivate, 1);
-	cbfile->priv = priv;
-
-	e_cal_backend_file_set_file_name (E_CAL_BACKEND_FILE (cbfile), "calendar.ics");
-}
-
-/* Dispose handler for the file backend */
-static void
-e_cal_backend_file_events_dispose (GObject *object)
-{
-	ECalBackendFileEvents *cbfile;
-	ECalBackendFileEventsPrivate *priv;
-
-	cbfile = E_CAL_BACKEND_FILE_EVENTS (object);
-	priv = cbfile->priv;
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-/* Finalize handler for the file backend */
-static void
-e_cal_backend_file_events_finalize (GObject *object)
-{
-	ECalBackendFileEvents *cbfile;
-	ECalBackendFileEventsPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_CAL_BACKEND_FILE_EVENTS (object));
-
-	cbfile = E_CAL_BACKEND_FILE_EVENTS (object);
-	priv = cbfile->priv;
-
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+	e_cal_backend_file_set_file_name (
+		E_CAL_BACKEND_FILE (cbfile), "calendar.ics");
 }
 
diff --git a/calendar/backends/file/e-cal-backend-file-events.h b/calendar/backends/file/e-cal-backend-file-events.h
index 9aa1938..8a726a3 100644
--- a/calendar/backends/file/e-cal-backend-file-events.h
+++ b/calendar/backends/file/e-cal-backend-file-events.h
@@ -25,8 +25,6 @@
 
 G_BEGIN_DECLS
 
-
-
 #define E_TYPE_CAL_BACKEND_FILE_EVENTS            (e_cal_backend_file_events_get_type ())
 #define E_CAL_BACKEND_FILE_EVENTS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_BACKEND_FILE_EVENTS,		\
 					  ECalBackendFileEvents))
@@ -38,13 +36,8 @@ G_BEGIN_DECLS
 typedef struct _ECalBackendFileEvents ECalBackendFileEvents;
 typedef struct _ECalBackendFileEventsClass ECalBackendFileEventsClass;
 
-typedef struct _ECalBackendFileEventsPrivate ECalBackendFileEventsPrivate;
-
 struct _ECalBackendFileEvents {
 	ECalBackendFile backend;
-
-	/* Private data */
-	ECalBackendFileEventsPrivate *priv;
 };
 
 struct _ECalBackendFileEventsClass {
@@ -53,8 +46,6 @@ struct _ECalBackendFileEventsClass {
 
 GType e_cal_backend_file_events_get_type (void);
 
-
-
 G_END_DECLS
 
 #endif
diff --git a/calendar/backends/file/e-cal-backend-file-journal.c b/calendar/backends/file/e-cal-backend-file-journal.c
index 815158c..f36e172 100644
--- a/calendar/backends/file/e-cal-backend-file-journal.c
+++ b/calendar/backends/file/e-cal-backend-file-journal.c
@@ -20,72 +20,20 @@
 
 #include "e-cal-backend-file-journal.h"
 
-G_DEFINE_TYPE (ECalBackendFileJournal, e_cal_backend_file_journal, E_TYPE_CAL_BACKEND_FILE)
+G_DEFINE_TYPE (
+	ECalBackendFileJournal,
+	e_cal_backend_file_journal,
+	E_TYPE_CAL_BACKEND_FILE)
 
-struct _ECalBackendFileJournalPrivate {
-	guint reserved;
-};
-
-static void e_cal_backend_file_journal_dispose (GObject *object);
-static void e_cal_backend_file_journal_finalize (GObject *object);
-
-static ECalBackendFileClass *parent_class;
-
-/* Class initialization function for the journal file backend */
 static void
 e_cal_backend_file_journal_class_init (ECalBackendFileJournalClass *klass)
 {
-	GObjectClass *object_class;
-	ECalBackendClass *backend_class;
-
-	object_class = G_OBJECT_CLASS (klass);
-	backend_class = E_CAL_BACKEND_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class->dispose = e_cal_backend_file_journal_dispose;
-	object_class->finalize = e_cal_backend_file_journal_finalize;
 }
 
-/* Object initialization function for the journal file backend */
 static void
 e_cal_backend_file_journal_init (ECalBackendFileJournal *cbfile)
 {
-	ECalBackendFileJournalPrivate *priv;
-
-	priv = g_new0 (ECalBackendFileJournalPrivate, 1);
-	cbfile->priv = priv;
-
-	e_cal_backend_file_set_file_name (E_CAL_BACKEND_FILE (cbfile), "journal.ics");
-}
-
-/* Dispose handler for the journal file backend */
-static void
-e_cal_backend_file_journal_dispose (GObject *object)
-{
-	ECalBackendFileJournal *cbfile;
-	ECalBackendFileJournalPrivate *priv;
-
-	cbfile = E_CAL_BACKEND_FILE_JOURNAL (object);
-	priv = cbfile->priv;
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
+	e_cal_backend_file_set_file_name (
+		E_CAL_BACKEND_FILE (cbfile), "journal.ics");
 }
 
-/* Finalize handler for the journal file backend */
-static void
-e_cal_backend_file_journal_finalize (GObject *object)
-{
-	ECalBackendFileJournal *cbfile;
-	ECalBackendFileJournalPrivate *priv;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_CAL_BACKEND_FILE_JOURNAL (object));
-
-	cbfile = E_CAL_BACKEND_FILE_JOURNAL (object);
-	priv = cbfile->priv;
-
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
-}
diff --git a/calendar/backends/file/e-cal-backend-file-journal.h b/calendar/backends/file/e-cal-backend-file-journal.h
index 542bbc2..b59c2e2 100644
--- a/calendar/backends/file/e-cal-backend-file-journal.h
+++ b/calendar/backends/file/e-cal-backend-file-journal.h
@@ -34,13 +34,8 @@
 typedef struct _ECalBackendFileJournal ECalBackendFileJournal;
 typedef struct _ECalBackendFileJournalClass ECalBackendFileJournalClass;
 
-typedef struct _ECalBackendFileJournalPrivate ECalBackendFileJournalPrivate;
-
 struct _ECalBackendFileJournal {
 	ECalBackendFile backend;
-
-	/* Private data */
-	ECalBackendFileJournalPrivate *priv;
 };
 
 struct _ECalBackendFileJournalClass {
diff --git a/calendar/backends/file/e-cal-backend-file-todos.c b/calendar/backends/file/e-cal-backend-file-todos.c
index fe187a1..cefca9d 100644
--- a/calendar/backends/file/e-cal-backend-file-todos.c
+++ b/calendar/backends/file/e-cal-backend-file-todos.c
@@ -25,78 +25,20 @@
 
 #include "e-cal-backend-file-todos.h"
 
-G_DEFINE_TYPE (ECalBackendFileTodos, e_cal_backend_file_todos, E_TYPE_CAL_BACKEND_FILE)
+G_DEFINE_TYPE (
+	ECalBackendFileTodos,
+	e_cal_backend_file_todos,
+	E_TYPE_CAL_BACKEND_FILE)
 
-
-
-/* Private part of the ECalBackendFileTodos structure */
-struct _ECalBackendFileTodosPrivate {
-	guint reserved;
-};
-
-
-
-static void e_cal_backend_file_todos_dispose (GObject *object);
-static void e_cal_backend_file_todos_finalize (GObject *object);
-
-static ECalBackendFileClass *parent_class;
-
-
-
-/* Class initialization function for the file backend */
 static void
 e_cal_backend_file_todos_class_init (ECalBackendFileTodosClass *klass)
 {
-	GObjectClass *object_class;
-	ECalBackendClass *backend_class;
-
-	object_class = G_OBJECT_CLASS (klass);
-	backend_class = E_CAL_BACKEND_CLASS (klass);
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class->dispose = e_cal_backend_file_todos_dispose;
-	object_class->finalize = e_cal_backend_file_todos_finalize;
 }
 
-/* Object initialization function for the file backend */
 static void
 e_cal_backend_file_todos_init (ECalBackendFileTodos *cbfile)
 {
-	ECalBackendFileTodosPrivate *priv;
-
-	priv = g_new0 (ECalBackendFileTodosPrivate, 1);
-	cbfile->priv = priv;
-
-	e_cal_backend_file_set_file_name (E_CAL_BACKEND_FILE (cbfile), "tasks.ics");
-}
-
-/* Dispose handler for the file backend */
-static void
-e_cal_backend_file_todos_dispose (GObject *object)
-{
-	ECalBackendFileTodos *cbfile;
-	ECalBackendFileTodosPrivate *priv;
-
-	cbfile = E_CAL_BACKEND_FILE_TODOS (object);
-	priv = cbfile->priv;
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
-/* Finalize handler for the file backend */
-static void
-e_cal_backend_file_todos_finalize (GObject *object)
-{
-	ECalBackendFileTodos *cbfile;
-
-	g_return_if_fail (object != NULL);
-	g_return_if_fail (E_IS_CAL_BACKEND_FILE_TODOS (object));
-
-	cbfile = E_CAL_BACKEND_FILE_TODOS (object);
-
-	if (G_OBJECT_CLASS (parent_class)->finalize)
-		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
+	e_cal_backend_file_set_file_name (
+		E_CAL_BACKEND_FILE (cbfile), "tasks.ics");
 }
 
diff --git a/calendar/backends/file/e-cal-backend-file-todos.h b/calendar/backends/file/e-cal-backend-file-todos.h
index 9cf56e5..0a04063 100644
--- a/calendar/backends/file/e-cal-backend-file-todos.h
+++ b/calendar/backends/file/e-cal-backend-file-todos.h
@@ -25,8 +25,6 @@
 
 G_BEGIN_DECLS
 
-
-
 #define E_TYPE_CAL_BACKEND_FILE_TODOS            (e_cal_backend_file_todos_get_type ())
 #define E_CAL_BACKEND_FILE_TODOS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_BACKEND_FILE_TODOS,		\
 					  ECalBackendFileTodos))
@@ -38,13 +36,8 @@ G_BEGIN_DECLS
 typedef struct _ECalBackendFileTodos ECalBackendFileTodos;
 typedef struct _ECalBackendFileTodosClass ECalBackendFileTodosClass;
 
-typedef struct _ECalBackendFileTodosPrivate ECalBackendFileTodosPrivate;
-
 struct _ECalBackendFileTodos {
 	ECalBackendFile backend;
-
-	/* Private data */
-	ECalBackendFileTodosPrivate *priv;
 };
 
 struct _ECalBackendFileTodosClass {
@@ -53,8 +46,6 @@ struct _ECalBackendFileTodosClass {
 
 GType e_cal_backend_file_todos_get_type (void);
 
-
-
 G_END_DECLS
 
 #endif
diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index 6790470..492c565 100644
--- a/calendar/backends/file/e-cal-backend-file.c
+++ b/calendar/backends/file/e-cal-backend-file.c
@@ -1483,12 +1483,6 @@ e_cal_backend_file_is_loaded (ECalBackend *backend)
 static CalMode
 e_cal_backend_file_get_mode (ECalBackend *backend)
 {
-	ECalBackendFile *cbfile;
-	ECalBackendFilePrivate *priv;
-
-	cbfile = E_CAL_BACKEND_FILE (backend);
-	priv = cbfile->priv;
-
 	return CAL_MODE_LOCAL;
 }
 
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c b/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
index 3b4011c..23984bd 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise-utils.c
@@ -2202,7 +2202,6 @@ e_cal_backend_groupwise_store_settings (GwSettings *hold)
 
 		/* Delay delivery */
 		if (gopts->delay_enabled) {
-			gchar *value;
 			tt = icaltime_today ();
 			icaltime_adjust (&tt, gopts->delay_until, 0, 0, 0);
 			value = icaltime_as_ical_string_r (tt);
@@ -2265,10 +2264,9 @@ e_cal_backend_groupwise_utils_check_delegate (ECalComponent *comp, const gchar *
 	prop = icalcomponent_get_first_property (icalcomp,
 						 ICAL_X_PROPERTY);
 	while (prop) {
-		const gchar *x_name, *x_val;
+		const gchar *x_name;
 
 		x_name = icalproperty_get_x_name (prop);
-		x_val = icalproperty_get_x (prop);
 		if (!strcmp (x_name, "X-EVOLUTION-DELEGATED")) {
 			icalcomponent_remove_property (icalcomp, prop);
 			return TRUE;
diff --git a/calendar/backends/groupwise/e-cal-backend-groupwise.c b/calendar/backends/groupwise/e-cal-backend-groupwise.c
index db5282c..e3e2c25 100644
--- a/calendar/backends/groupwise/e-cal-backend-groupwise.c
+++ b/calendar/backends/groupwise/e-cal-backend-groupwise.c
@@ -110,7 +110,6 @@ struct _ECalBackendGroupwisePrivate {
 #define PRIV_LOCK(p)   (g_static_rec_mutex_lock (&(p)->rec_mutex))
 #define PRIV_UNLOCK(p) (g_static_rec_mutex_unlock (&(p)->rec_mutex))
 
-static void e_cal_backend_groupwise_dispose (GObject *object);
 static void e_cal_backend_groupwise_finalize (GObject *object);
 static void e_cal_backend_groupwise_add_timezone (ECalBackendSync *backend, EDataCal *cal, const gchar *tzobj, GError **perror);
 static const gchar * get_gw_item_id (icalcomponent *icalcomp);
@@ -458,7 +457,6 @@ get_deltas (gpointer handle)
 
 	if (status != E_GW_CONNECTION_STATUS_OK) {
 
-		const gchar *msg = NULL;
 		gint failures;
 
 		if (!attempts)
@@ -470,12 +468,6 @@ get_deltas (gpointer handle)
 		e_cal_backend_store_put_key_value (store, ATTEMPTS_KEY, attempts);
 		g_free (attempts);
 
-		if (status == E_GW_CONNECTION_STATUS_NO_RESPONSE) {
-			return TRUE;
-		}
-
-		msg = e_gw_connection_get_error_message (status);
-
 		return TRUE;
 	}
 
@@ -884,11 +876,8 @@ cache_init (ECalBackendGroupwise *cbgw)
 {
 	ECalBackendGroupwisePrivate *priv = cbgw->priv;
 	EGwConnectionStatus cnc_status;
-	icalcomponent_kind kind;
 	EGwSendOptions *opts;
 
-	kind = e_cal_backend_get_kind (E_CAL_BACKEND (cbgw));
-
 	cnc_status = e_gw_connection_get_settings (priv->cnc, &opts);
 	if (cnc_status == E_GW_CONNECTION_STATUS_OK) {
 		GwSettings *hold = g_new0 (GwSettings, 1);
@@ -1149,20 +1138,6 @@ connect_to_server (ECalBackendGroupwise *cbgw, GError **perror)
 	}
 }
 
-/* Dispose handler for the file backend */
-static void
-e_cal_backend_groupwise_dispose (GObject *object)
-{
-	ECalBackendGroupwise *cbgw;
-	ECalBackendGroupwisePrivate *priv;
-
-	cbgw = E_CAL_BACKEND_GROUPWISE (object);
-	priv = cbgw->priv;
-
-	if (G_OBJECT_CLASS (parent_class)->dispose)
-		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
-}
-
 /* Finalize handler for the file backend */
 static void
 e_cal_backend_groupwise_finalize (GObject *object)
@@ -1684,14 +1659,9 @@ e_cal_backend_groupwise_get_object_list (ECalBackendSync *backend, EDataCal *cal
 static void
 e_cal_backend_groupwise_start_query (ECalBackend *backend, EDataCalView *query)
 {
-	ECalBackendGroupwise *cbgw;
-	ECalBackendGroupwisePrivate *priv;
 	GList *objects = NULL;
 	GError *err = NULL;
 
-	cbgw = E_CAL_BACKEND_GROUPWISE (backend);
-	priv = cbgw->priv;
-
 	e_cal_backend_groupwise_get_object_list (E_CAL_BACKEND_SYNC (backend), NULL,
 							  e_data_cal_view_get_text (query), &objects, &err);
 	if (err) {
@@ -1717,12 +1687,10 @@ static void
 e_cal_backend_groupwise_get_free_busy (ECalBackendSync *backend, EDataCal *cal, GList *users,
 				       time_t start, time_t end, GList **freebusy, GError **perror)
 {
-       EGwConnectionStatus status;
-       ECalBackendGroupwise *cbgw;
-       EGwConnection *cnc;
+	EGwConnectionStatus status;
+	ECalBackendGroupwise *cbgw;
 
-       cbgw = E_CAL_BACKEND_GROUPWISE (backend);
-       cnc = cbgw->priv->cnc;
+	cbgw = E_CAL_BACKEND_GROUPWISE (backend);
 
 	if (cbgw->priv->mode == CAL_MODE_LOCAL) {
 		in_offline (cbgw);
@@ -1889,14 +1857,12 @@ update_from_server (ECalBackendGroupwise *cbgw, GSList *uid_list, gchar **calobj
 {
 	EGwConnectionStatus stat;
 	ECalBackendGroupwisePrivate *priv;
-	ECalBackendSync *backend;
 	GList *list = NULL, *tmp;
 	GSList *l;
 	GPtrArray *uid_array = g_ptr_array_new ();
 	gint i;
 
 	priv = cbgw->priv;
-	backend = E_CAL_BACKEND_SYNC (cbgw);
 
 	for (l = uid_list; l; l = g_slist_next (l)) {
 		g_ptr_array_add (uid_array, l->data);
@@ -2814,7 +2780,6 @@ e_cal_backend_groupwise_class_init (ECalBackendGroupwiseClass *class)
 
 	parent_class = g_type_class_peek_parent (class);
 
-	object_class->dispose = e_cal_backend_groupwise_dispose;
 	object_class->finalize = e_cal_backend_groupwise_finalize;
 
 	sync_class->is_read_only_sync = e_cal_backend_groupwise_is_read_only;
diff --git a/calendar/backends/http/e-cal-backend-http.c b/calendar/backends/http/e-cal-backend-http.c
index 7600f1e..e47f41c 100644
--- a/calendar/backends/http/e-cal-backend-http.c
+++ b/calendar/backends/http/e-cal-backend-http.c
@@ -917,14 +917,9 @@ e_cal_backend_http_set_mode (ECalBackend *backend, CalMode mode)
 static void
 e_cal_backend_http_get_default_object (ECalBackendSync *backend, EDataCal *cal, gchar **object, GError **perror)
 {
-	ECalBackendHttp *cbhttp;
-	ECalBackendHttpPrivate *priv;
 	icalcomponent *icalcomp;
 	icalcomponent_kind kind;
 
-	cbhttp = E_CAL_BACKEND_HTTP (backend);
-	priv = cbhttp->priv;
-
 	kind = e_cal_backend_get_kind (E_CAL_BACKEND (backend));
 	icalcomp = e_cal_util_new_component (kind);
 	*object = icalcomponent_as_ical_string_r (icalcomp);
@@ -1299,12 +1294,6 @@ static void
 e_cal_backend_http_get_changes (ECalBackendSync *backend, EDataCal *cal, const gchar *change_id,
 				GList **adds, GList **modifies, GList **deletes, GError **perror)
 {
-	ECalBackendHttp *cbhttp;
-	ECalBackendHttpPrivate *priv;
-
-	cbhttp = E_CAL_BACKEND_HTTP (backend);
-	priv = cbhttp->priv;
-
 	g_propagate_error (perror, EDC_ERROR (NotSupported));
 }
 
@@ -1312,24 +1301,12 @@ e_cal_backend_http_get_changes (ECalBackendSync *backend, EDataCal *cal, const g
 static void
 e_cal_backend_http_discard_alarm (ECalBackendSync *backend, EDataCal *cal, const gchar *uid, const gchar *auid, GError **perror)
 {
-	ECalBackendHttp *cbhttp;
-	ECalBackendHttpPrivate *priv;
-
-	cbhttp = E_CAL_BACKEND_HTTP (backend);
-	priv = cbhttp->priv;
-
 	/* FIXME */
 }
 
 static void
 e_cal_backend_http_create_object (ECalBackendSync *backend, EDataCal *cal, gchar **calobj, gchar **uid, GError **perror)
 {
-	ECalBackendHttp *cbhttp;
-	ECalBackendHttpPrivate *priv;
-
-	cbhttp = E_CAL_BACKEND_HTTP (backend);
-	priv = cbhttp->priv;
-
 	g_propagate_error (perror, EDC_ERROR (PermissionDenied));
 }
 
@@ -1337,12 +1314,6 @@ static void
 e_cal_backend_http_modify_object (ECalBackendSync *backend, EDataCal *cal, const gchar *calobj,
 				CalObjModType mod, gchar **old_object, gchar **new_object, GError **perror)
 {
-	ECalBackendHttp *cbhttp;
-	ECalBackendHttpPrivate *priv;
-
-	cbhttp = E_CAL_BACKEND_HTTP (backend);
-	priv = cbhttp->priv;
-
 	g_propagate_error (perror, EDC_ERROR (PermissionDenied));
 }
 
@@ -1353,12 +1324,6 @@ e_cal_backend_http_remove_object (ECalBackendSync *backend, EDataCal *cal,
 				CalObjModType mod, gchar **old_object,
 				gchar **object, GError **perror)
 {
-	ECalBackendHttp *cbhttp;
-	ECalBackendHttpPrivate *priv;
-
-	cbhttp = E_CAL_BACKEND_HTTP (backend);
-	priv = cbhttp->priv;
-
 	*old_object = *object = NULL;
 
 	g_propagate_error (perror, EDC_ERROR (PermissionDenied));
@@ -1368,10 +1333,6 @@ e_cal_backend_http_remove_object (ECalBackendSync *backend, EDataCal *cal,
 static void
 e_cal_backend_http_receive_objects (ECalBackendSync *backend, EDataCal *cal, const gchar *calobj, GError **perror)
 {
-	ECalBackendHttp *cbhttp;
-
-	cbhttp = E_CAL_BACKEND_HTTP (backend);
-
 	g_propagate_error (perror, EDC_ERROR (PermissionDenied));
 }
 
@@ -1379,12 +1340,6 @@ static void
 e_cal_backend_http_send_objects (ECalBackendSync *backend, EDataCal *cal, const gchar *calobj, GList **users,
 				 gchar **modified_calobj, GError **perror)
 {
-	ECalBackendHttp *cbhttp;
-	ECalBackendHttpPrivate *priv;
-
-	cbhttp = E_CAL_BACKEND_HTTP (backend);
-	priv = cbhttp->priv;
-
 	*users = NULL;
 	*modified_calobj = NULL;
 
diff --git a/calendar/libecal/e-cal-component.c b/calendar/libecal/e-cal-component.c
index 38404ae..9287a5f 100644
--- a/calendar/libecal/e-cal-component.c
+++ b/calendar/libecal/e-cal-component.c
@@ -889,13 +889,10 @@ add_alarm (ECalComponent *comp, icalcomponent *alarm, const gchar *auid)
 static void
 scan_alarm (ECalComponent *comp, icalcomponent *alarm)
 {
-	ECalComponentPrivate *priv;
 	icalproperty *prop;
 	const gchar *auid;
 	gchar *new_auid;
 
-	priv = comp->priv;
-
 	for (prop = icalcomponent_get_first_property (alarm, ICAL_X_PROPERTY);
 	     prop;
 	     prop = icalcomponent_get_next_property (alarm, ICAL_X_PROPERTY)) {
@@ -1141,13 +1138,9 @@ e_cal_component_get_icalcomponent (ECalComponent *comp)
 void
 e_cal_component_rescan (ECalComponent *comp)
 {
-	ECalComponentPrivate *priv;
-
 	g_return_if_fail (comp != NULL);
 	g_return_if_fail (E_IS_CAL_COMPONENT (comp));
 
-	priv = comp->priv;
-
 	/* Clear everything out */
 	free_icalcomponent (comp, FALSE);
 
diff --git a/calendar/libecal/e-cal-recur.c b/calendar/libecal/e-cal-recur.c
index 1843238..3c30618 100644
--- a/calendar/libecal/e-cal-recur.c
+++ b/calendar/libecal/e-cal-recur.c
@@ -3099,7 +3099,7 @@ cal_obj_byday_expand_weekly	(RecurData  *recur_data,
 	GArray *new_occs;
 	CalObjTime *occ;
 	GList *elem;
-	gint len, i, weekday, week_num;
+	gint len, i, weekday;
 	gint weekday_offset, new_weekday_offset;
 
 	/* If BYDAY has not been specified, or the array is empty, just
@@ -3121,7 +3121,7 @@ cal_obj_byday_expand_weekly	(RecurData  *recur_data,
 			/* FIXME: Currently we just ignore this, but maybe we
 			   should skip all elements where week_num != 0.
 			   The spec isn't clear about this. */
-			week_num = GPOINTER_TO_INT (elem->data);
+			/*week_num = GPOINTER_TO_INT (elem->data);*/
 			elem = elem->next;
 
 			weekday_offset = cal_obj_time_weekday_offset (occ, recur_data->recur);
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index 68fdf38..d5e87e4 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -3096,7 +3096,6 @@ e_cal_generate_instances_for_object (ECal *ecal, icalcomponent *icalcomp,
 				     time_t start, time_t end,
 				     ECalRecurInstanceFn cb, gpointer cb_data)
 {
-	ECalPrivate *priv;
 	ECalComponent *comp;
 	const gchar *uid;
 	gchar *rid;
@@ -3112,8 +3111,6 @@ e_cal_generate_instances_for_object (ECal *ecal, icalcomponent *icalcomp,
 	g_return_if_fail (end >= 0);
 	g_return_if_fail (cb != NULL);
 
-	priv = ecal->priv;
-
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (icalcomp));
 
diff --git a/calendar/libedata-cal/e-cal-backend-cache.c b/calendar/libedata-cal/e-cal-backend-cache.c
index fdec62b..04e9abe 100644
--- a/calendar/libedata-cal/e-cal-backend-cache.c
+++ b/calendar/libedata-cal/e-cal-backend-cache.c
@@ -222,13 +222,10 @@ e_cal_backend_cache_remove_component (ECalBackendCache *cache,
 {
 	gchar *real_key;
 	gboolean retval;
-	ECalBackendCachePrivate *priv;
 
 	g_return_val_if_fail (E_IS_CAL_BACKEND_CACHE (cache), FALSE);
 	g_return_val_if_fail (uid != NULL, FALSE);
 
-	priv = cache->priv;
-
 	real_key = get_key (uid, rid);
 	if (!e_file_cache_get_object (E_FILE_CACHE (cache), real_key)) {
 		g_free (real_key);
@@ -450,15 +447,12 @@ e_cal_backend_cache_put_timezone (ECalBackendCache *cache, const icaltimezone *z
 gboolean
 e_cal_backend_cache_put_default_timezone (ECalBackendCache *cache, icaltimezone *default_zone)
 {
-	ECalBackendCachePrivate *priv;
 	icalcomponent *icalcomp;
 	gboolean retval;
 	gchar *obj;
 
 	g_return_val_if_fail (E_IS_CAL_BACKEND_CACHE (cache), FALSE);
 
-	priv = cache->priv;
-
 	/* add the timezone to the cache file */
 	icalcomp = icaltimezone_get_component (default_zone);
 	if (!icalcomp)
@@ -496,12 +490,9 @@ e_cal_backend_cache_get_default_timezone (ECalBackendCache *cache)
 {
 	icaltimezone *zone;
 	const gchar *comp_str;
-	ECalBackendCachePrivate *priv;
 
 	g_return_val_if_fail (E_IS_CAL_BACKEND_CACHE (cache), NULL);
 
-	priv = cache->priv;
-
 	/*  look for the timezone in the cache */
 	comp_str = e_file_cache_get_object (E_FILE_CACHE (cache), "default_zone");
 	if (comp_str) {
diff --git a/calendar/libedata-cal/e-cal-backend-file-store.c b/calendar/libedata-cal/e-cal-backend-file-store.c
index cd6ab59..7a512aa 100644
--- a/calendar/libedata-cal/e-cal-backend-file-store.c
+++ b/calendar/libedata-cal/e-cal-backend-file-store.c
@@ -211,9 +211,6 @@ static ECalComponent *
 e_cal_backend_file_store_get_component (ECalBackendStore *store, const gchar *uid, const gchar *rid)
 {
 	ECalBackendFileStore *fstore = E_CAL_BACKEND_FILE_STORE (store);
-	ECalBackendFileStorePrivate *priv;
-
-	priv = E_CAL_BACKEND_FILE_STORE_GET_PRIVATE (fstore);
 
 	return get_component (fstore, uid, rid);
 }
@@ -424,7 +421,6 @@ e_cal_backend_file_store_set_default_timezone (ECalBackendStore *store, const ic
 	const gchar *tzid;
 	icaltimezone *copy;
 	const gchar *key = "default-zone";
-	gboolean ret_val;
 
 	priv = E_CAL_BACKEND_FILE_STORE_GET_PRIVATE (fstore);
 
@@ -435,9 +431,9 @@ e_cal_backend_file_store_set_default_timezone (ECalBackendStore *store, const ic
 	g_hash_table_insert (priv->timezones, g_strdup (tzid), copy);
 
 	if (e_file_cache_get_object (priv->keys_cache, key))
-		ret_val = e_file_cache_replace_object (priv->keys_cache, key, tzid);
+		e_file_cache_replace_object (priv->keys_cache, key, tzid);
 	else
-		ret_val = e_file_cache_add_object (priv->keys_cache, key, tzid);
+		e_file_cache_add_object (priv->keys_cache, key, tzid);
 
 	g_static_rw_lock_writer_unlock (&priv->lock);
 
@@ -645,12 +641,9 @@ static void
 scan_vcalendar (ECalBackendStore *store, icalcomponent *top_icalcomp)
 {
 	ECalBackendFileStore *fstore = E_CAL_BACKEND_FILE_STORE (store);
-	ECalBackendFileStorePrivate *priv;
 	icalcompiter iter;
 	time_t time_start, time_end;
 
-	priv = E_CAL_BACKEND_FILE_STORE_GET_PRIVATE (fstore);
-
 	for (iter = icalcomponent_begin_component (top_icalcomp, ICAL_ANY_COMPONENT);
 	     icalcompiter_deref (&iter) != NULL;
 	     icalcompiter_next (&iter)) {
diff --git a/calendar/libedata-cal/e-cal-backend-loader-factory.c b/calendar/libedata-cal/e-cal-backend-loader-factory.c
index 22e589e..69c7ac2 100644
--- a/calendar/libedata-cal/e-cal-backend-loader-factory.c
+++ b/calendar/libedata-cal/e-cal-backend-loader-factory.c
@@ -17,8 +17,6 @@
 
 G_DEFINE_TYPE (ECalBackendLoaderFactory, e_cal_backend_loader_factory, E_TYPE_CAL_BACKEND_FACTORY)
 
-static GObjectClass *parent_class = NULL;
-
 static void
 e_cal_backend_loader_factory_init (ECalBackendLoaderFactory *factory)
 {
@@ -27,10 +25,4 @@ e_cal_backend_loader_factory_init (ECalBackendLoaderFactory *factory)
 static void
 e_cal_backend_loader_factory_class_init (ECalBackendLoaderFactoryClass *klass)
 {
-	GObjectClass *object_class;
-
-	parent_class = g_type_class_peek_parent (klass);
-
-	object_class = G_OBJECT_CLASS (klass);
-
 }
diff --git a/calendar/libedata-cal/e-cal-backend-store.c b/calendar/libedata-cal/e-cal-backend-store.c
index 8e1b9dc..89cd906 100644
--- a/calendar/libedata-cal/e-cal-backend-store.c
+++ b/calendar/libedata-cal/e-cal-backend-store.c
@@ -267,12 +267,9 @@ e_cal_backend_store_put_component_with_time_range (ECalBackendStore *store, ECal
 gboolean
 e_cal_backend_store_put_component (ECalBackendStore *store, ECalComponent *comp)
 {
-	ECalBackendStorePrivate *priv;
 	g_return_val_if_fail (E_IS_CAL_BACKEND_STORE (store), FALSE);
 	g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE);
 
-	priv = E_CAL_BACKEND_STORE_GET_PRIVATE (store);
-
 	return (E_CAL_BACKEND_STORE_GET_CLASS (store))->put_component (store, comp);
 }
 
diff --git a/calendar/tests/ecal/test-ecal.c b/calendar/tests/ecal/test-ecal.c
index bd520dc..a0285bc 100644
--- a/calendar/tests/ecal/test-ecal.c
+++ b/calendar/tests/ecal/test-ecal.c
@@ -446,12 +446,11 @@ test_e_cal_remove (ECal *ecal, const gchar *uri)
 static const gchar *
 test_new_system_calendar (void)
 {
-	ECal *cal;
 	const gchar *user_data_dir;
 	gchar *filename;
 	gboolean created;
 
-	cal = e_cal_new_system_calendar ();
+	e_cal_new_system_calendar ();
 
 	user_data_dir = e_get_user_data_dir ();
 	filename = g_build_filename (
@@ -467,12 +466,11 @@ test_new_system_calendar (void)
 static const gchar *
 test_new_system_tasks (void)
 {
-	ECal *cal;
 	const gchar *user_data_dir;
 	gchar *filename;
 	gboolean created;
 
-	cal = e_cal_new_system_tasks ();
+	e_cal_new_system_tasks ();
 
 	user_data_dir = e_get_user_data_dir ();
 	filename = g_build_filename (
@@ -488,12 +486,11 @@ test_new_system_tasks (void)
 static const gchar *
 test_new_system_memos (void)
 {
-	ECal *cal;
 	const gchar *user_data_dir;
 	gchar *filename;
 	gboolean created;
 
-	cal = e_cal_new_system_memos ();
+	e_cal_new_system_memos ();
 
 	user_data_dir = e_get_user_data_dir ();
 	filename = g_build_filename (
diff --git a/camel/camel-db.c b/camel/camel-db.c
index b6757de..bf27789 100644
--- a/camel/camel-db.c
+++ b/camel/camel-db.c
@@ -1023,12 +1023,11 @@ camel_db_recreate_vfolder (CamelDB *db,
                            const gchar *folder_name,
                            GError **error)
 {
-	gint ret;
 	gchar *table_query;
 
 	table_query = sqlite3_mprintf ("DROP TABLE %Q", folder_name);
 
-	ret = camel_db_command (db, table_query, error);
+	camel_db_command (db, table_query, error);
 
 	sqlite3_free (table_query);
 
diff --git a/camel/camel-folder.c b/camel/camel-folder.c
index 826cc5e..b30ffd1 100644
--- a/camel/camel-folder.c
+++ b/camel/camel-folder.c
@@ -510,10 +510,8 @@ folder_dispose (GObject *object)
 static void
 folder_finalize (GObject *object)
 {
-	CamelFolder *folder;
 	CamelFolderPrivate *priv;
 
-	folder = CAMEL_FOLDER (object);
 	priv = CAMEL_FOLDER_GET_PRIVATE (object);
 
 	g_free (priv->name);
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c
index 217b85c..a6bc1b5 100644
--- a/camel/camel-mime-message.c
+++ b/camel/camel-mime-message.c
@@ -1132,7 +1132,6 @@ static const gchar tz_days[][4] = {
 gchar *
 camel_mime_message_build_mbox_from (CamelMimeMessage *message)
 {
-	CamelMimePart *mime_part;
 	struct _camel_header_raw *header = ((CamelMimePart *)message)->headers;
 	GString *out = g_string_new("From ");
 	gchar *ret;
@@ -1141,8 +1140,6 @@ camel_mime_message_build_mbox_from (CamelMimeMessage *message)
 	gint offset;
 	struct tm tm;
 
-	mime_part = CAMEL_MIME_PART (message);
-
 	tmp = camel_header_raw_find (&header, "Sender", NULL);
 	if (tmp == NULL)
 		tmp = camel_header_raw_find (&header, "From", NULL);
diff --git a/camel/camel-search-sql.c b/camel/camel-search-sql.c
index 1b41915..482b610 100644
--- a/camel/camel-search-sql.c
+++ b/camel/camel-search-sql.c
@@ -215,7 +215,7 @@ camel_sexp_to_sql (const gchar *txt)
 	GList *tlist;
 	GList *operators=NULL, *operands=NULL, *all=NULL, *preserve=NULL;
 	GList *tmp;
-	Node *n1=NULL, *n2=NULL, *n3=NULL, *op=NULL, *last, *lastoper=NULL;
+	Node *n1=NULL, *n2=NULL, *n3=NULL, *last, *lastoper=NULL;
 	GList *res=NULL;
 	gboolean last_sysnode = FALSE;
 
@@ -730,7 +730,7 @@ camel_sexp_to_sql (const gchar *txt)
 
 	res=NULL;
 	tmp = all;
-	op=NULL; n1=NULL;
+	n1=NULL;
 
 	/* Time to operate on the stack. */
 	tmp = all;
diff --git a/camel/camel-smime-context.c b/camel/camel-smime-context.c
index e28d12f..0f34fbe 100644
--- a/camel/camel-smime-context.c
+++ b/camel/camel-smime-context.c
@@ -535,8 +535,10 @@ sm_verify_cmsg (CamelCipherContext *context,
 {
 	CamelSMIMEContextPrivate *p = ((CamelSMIMEContext *)context)->priv;
 	NSSCMSSignedData *sigd = NULL;
+#if 0
 	NSSCMSEnvelopedData *envd;
 	NSSCMSEncryptedData *encd;
+#endif
 	SECAlgorithmID **digestalgs;
 	NSSCMSDigestContext *digcx;
 	gint count, i, nsigners, j;
@@ -673,10 +675,12 @@ sm_verify_cmsg (CamelCipherContext *context,
 			}
 			break;
 		case SEC_OID_PKCS7_ENVELOPED_DATA:
-			envd = (NSSCMSEnvelopedData *)NSS_CMSContentInfo_GetContent (cinfo);
+			/* FIXME Do something with this? */
+			/*envd = (NSSCMSEnvelopedData *)NSS_CMSContentInfo_GetContent (cinfo);*/
 			break;
 		case SEC_OID_PKCS7_ENCRYPTED_DATA:
-			encd = (NSSCMSEncryptedData *)NSS_CMSContentInfo_GetContent (cinfo);
+			/* FIXME Do something with this? */
+			/*encd = (NSSCMSEncryptedData *)NSS_CMSContentInfo_GetContent (cinfo);*/
 			break;
 		case SEC_OID_PKCS7_DATA:
 			break;
diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c
index 666be15..d178cc2 100644
--- a/camel/camel-text-index.c
+++ b/camel/camel-text-index.c
@@ -328,7 +328,7 @@ text_index_sync (CamelIndex *idx)
 	CamelTextIndexPrivate *p = CAMEL_TEXT_INDEX_GET_PRIVATE (idx);
 	struct _CamelTextIndexWord *ww;
 	struct _CamelTextIndexRoot *rb;
-	gint ret = 0, wfrag, nfrag, work = FALSE;
+	gint ret = 0, wfrag, nfrag;
 
 	d (printf ("sync: blocks = %p\n", p->blocks));
 
@@ -348,8 +348,6 @@ text_index_sync (CamelIndex *idx)
 	/* this doesn't really need to be dropped, its only used in updates anyway */
 	p->word_cache_limit = 1024;
 
-	work = !camel_dlist_empty (&p->word_cache);
-
 	while ((ww = (struct _CamelTextIndexWord *)camel_dlist_remhead (&p->word_cache))) {
 		if (ww->used > 0) {
 			io (printf ("writing key file entry '%s' [%x]\n", ww->word, ww->data));
@@ -378,7 +376,6 @@ text_index_sync (CamelIndex *idx)
 	/* only do the frag/compress check if we did some new writes on this index */
 	wfrag = rb->words ? (((rb->keys - rb->words) * 100)/ rb->words) : 0;
 	nfrag = rb->names ? ((rb->deleted * 100) / rb->names) : 0;
-	d (printf ("wfrag = %d, nfrag = %d, work = %s, ret = %d\n", wfrag, nfrag, work?"true":"false", ret));
 	d (printf ("  words = %d, keys = %d\n", rb->words, rb->keys));
 
 	if (ret == 0) {
diff --git a/camel/camel-url.c b/camel/camel-url.c
index 05ffbce..7f8590e 100644
--- a/camel/camel-url.c
+++ b/camel/camel-url.c
@@ -58,14 +58,16 @@ CamelURL *
 camel_url_new_with_base (CamelURL *base, const gchar *url_string)
 {
 	CamelURL *url;
-	const gchar *start;
 	const gchar *end, *hash, *colon, *semi, *at, *slash, *question;
 	const gchar *p;
 
+#ifdef G_OS_WIN32
+	const gchar *start = url_string;
+#endif
+
 	g_return_val_if_fail (url_string != NULL, NULL);
 
 	url = g_new0 (CamelURL, 1);
-	start = url_string;
 
 	/* See RFC1808 for details. IF YOU CHANGE ANYTHING IN THIS
 	 * FUNCTION, RUN tests/misc/url AFTERWARDS.
diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index bb2236c..21ff8ca 100644
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -774,15 +774,10 @@ summary_header_to_db (CamelFolderSummary *s,
                       GError **error)
 {
 	CamelFIRecord * record = g_new0 (CamelFIRecord, 1);
-	CamelStore *parent_store;
-	CamelDB *db;
 	const gchar *full_name;
-	guint32 visible, unread, deleted, junked, junked_not_deleted;
 
 	/* We do this during write, so lets use write handle, though we gonna read */
 	full_name = camel_folder_get_full_name (s->folder);
-	parent_store = camel_folder_get_parent_store (s->folder);
-	db = parent_store->cdb_w;
 
 	record->folder_name = g_strdup (full_name);
 
@@ -794,12 +789,6 @@ summary_header_to_db (CamelFolderSummary *s,
 
 	record->saved_count = s->uids->len;
 
-	unread = s->unread_count;
-	deleted = s->deleted_count;
-	junked = s->junk_count;
-	junked_not_deleted = s->junk_not_deleted_count;
-	visible = s->visible_count;
-
 	if (1) { /* We always would do this. Just refactor the code again. */
 		/*!(((CamelVeeSummary *) s)->force_counts) && !g_getenv ("FORCE_VFOLDER_COUNT")) {*/
 		/* We should be in sync always. so use the count. Don't search.*/
@@ -2404,14 +2393,11 @@ camel_vee_folder_sync_headers (CamelFolder *vf,
 {
 	CamelFIRecord * record;
 	CamelStore *parent_store;
-	time_t start, end;
 
 	/* Save the counts to DB */
-	start = time (NULL);
 	record = summary_header_to_db (vf->summary, error);
 	parent_store = camel_folder_get_parent_store (vf);
 	camel_db_write_folder_info_record (parent_store->cdb_w, record, error);
-	end = time (NULL);
 
 	g_free (record->folder_name);
 	g_free (record);
diff --git a/camel/providers/groupwise/camel-groupwise-folder.c b/camel/providers/groupwise/camel-groupwise-folder.c
index 978df6c..7c8f5eb 100644
--- a/camel/providers/groupwise/camel-groupwise-folder.c
+++ b/camel/providers/groupwise/camel-groupwise-folder.c
@@ -562,7 +562,6 @@ move_to_junk (CamelFolder *folder,
               GError **error)
 {
 	CamelFolder *dest;
-	CamelFolderInfo *fi;
 	CamelStore *parent_store;
 	GPtrArray *uids;
 	const gchar *uid = camel_message_info_uid (info);
@@ -579,7 +578,7 @@ move_to_junk (CamelFolder *folder,
 		groupwise_transfer_messages_to_sync (
 			folder, uids, dest, TRUE, NULL, cancellable, error);
 	else {
-		fi = create_junk_folder (parent_store);
+		create_junk_folder (parent_store);
 		dest = camel_store_get_folder_sync (
 			parent_store, JUNK_FOLDER, 0, cancellable, error);
 		if (!dest)
@@ -1476,7 +1475,7 @@ gw_update_cache (CamelFolder *folder,
 	CamelOfflineFolder *offline_folder;
 	CamelStore *parent_store;
 	EGwConnection *cnc;
-	guint32 item_status, status_flags = 0;
+	guint32 item_status;
 	CamelFolderChangeInfo *changes = NULL;
 	gboolean exists = FALSE;
 	GString *str_to = g_string_new (NULL);
@@ -1536,7 +1535,6 @@ gw_update_cache (CamelFolder *folder,
 		gint rk;
 
 		exists = FALSE;
-		status_flags = 0;
 
 		if (uid_flag == FALSE) {
 			temp_item = (EGwItem *)item_list->data;
@@ -1951,7 +1949,6 @@ groupwise_folder_item_to_msg ( CamelFolder *folder,
 	gchar *body = NULL;
 	gint body_len = 0;
 	const gchar *uid = NULL, *message_id, *parent_threads;
-	gboolean is_text_html = FALSE;
 	gboolean has_mime_822 = FALSE, ignore_mime_822 = FALSE;
 	gboolean is_text_html_embed = FALSE;
 	gboolean is_base64_encoded = FALSE;
@@ -1998,7 +1995,6 @@ groupwise_folder_item_to_msg ( CamelFolder *folder,
 				if (!g_ascii_strcasecmp (attach->name, "TEXT.htm")) {
 					body = g_strdup (attachment);
 					g_free (attachment);
-					is_text_html = TRUE;
 				}
 			}/* if attachment and len */
 		} /* if Mime.822 or TEXT.htm */
@@ -2817,7 +2813,7 @@ groupwise_transfer_messages_to_sync (CamelFolder *source,
                                      GCancellable *cancellable,
                                      GError **error)
 {
-	gint count, index = 0;
+	gint index = 0;
 	GList *item_ids = NULL;
 	const gchar *source_container_id = NULL, *dest_container_id = NULL;
 	CamelGroupwiseStore *gw_store;
@@ -2846,7 +2842,6 @@ groupwise_transfer_messages_to_sync (CamelFolder *source,
 	else
 		destination_is_trash = FALSE;
 
-	count = camel_folder_summary_count (destination->summary);
 	qsort (uids->pdata, uids->len, sizeof (gpointer), uid_compar);
 
 	changes = camel_folder_change_info_new ();
@@ -2915,8 +2910,6 @@ groupwise_transfer_messages_to_sync (CamelFolder *source,
 		CamelMessageInfo *info = NULL;
 		CamelGroupwiseMessageInfo *gw_info = NULL;
 		flags_diff_t diff, unset_flags;
-		gint count;
-		count = camel_folder_summary_count (destination->summary);
 
 		info = camel_folder_summary_uid (source->summary, uids->pdata[index]);
 		if (!info) {
diff --git a/camel/providers/groupwise/camel-groupwise-store.c b/camel/providers/groupwise/camel-groupwise-store.c
index 93d45f7..3afd18c 100644
--- a/camel/providers/groupwise/camel-groupwise-store.c
+++ b/camel/providers/groupwise/camel-groupwise-store.c
@@ -513,9 +513,6 @@ groupwise_forget_folder (CamelGroupwiseStore *gw_store, const gchar *folder_name
 	gchar *state_file;
 	gchar *folder_dir, *storage_path;
 	CamelFolderInfo *fi;
-	const gchar *name;
-
-	name = folder_name;
 
 	storage_path = g_strdup_printf ("%s/folders", priv->storage_path);
 	folder_dir = e_path_to_physical (storage_path,folder_name);
diff --git a/camel/providers/groupwise/camel-groupwise-utils.c b/camel/providers/groupwise/camel-groupwise-utils.c
index f40129b..0c8f11b 100644
--- a/camel/providers/groupwise/camel-groupwise-utils.c
+++ b/camel/providers/groupwise/camel-groupwise-utils.c
@@ -628,9 +628,8 @@ do_multipart (EGwConnection *cnc, EGwItem *item, CamelMultipart *mp, GSList **at
 		CamelStream *content;
 		CamelDataWrapper *dw = NULL;
 		GByteArray *buffer;
-		const gchar *disposition, *filename;
+		const gchar *filename;
 		const gchar *content_id = NULL;
-		gboolean is_alternative = FALSE;
 
 		buffer = g_byte_array_new ();
 		content = camel_stream_mem_new_with_byte_array (buffer);
@@ -666,11 +665,9 @@ do_multipart (EGwConnection *cnc, EGwItem *item, CamelMultipart *mp, GSList **at
 
 			temp_part = camel_multipart_get_part ((CamelMultipart *)dw, 1);
 			if (temp_part) {
-				is_alternative = TRUE;
 				temp_dw = camel_medium_get_content (CAMEL_MEDIUM (temp_part));
 				camel_data_wrapper_write_to_stream_sync (temp_dw, temp_content, NULL, NULL);
 				filename = camel_mime_part_get_filename (temp_part);
-				disposition = camel_mime_part_get_disposition (temp_part);
 				cid = camel_mime_part_get_content_id (temp_part);
 				send_as_attachment (cnc, item, temp_content, type, temp_dw, filename, cid, attach_list);
 			}
@@ -707,7 +704,6 @@ do_multipart (EGwConnection *cnc, EGwItem *item, CamelMultipart *mp, GSList **at
 			e_gw_item_set_message (item, (const gchar *) buffer->data);
 		} else {
 			filename = camel_mime_part_get_filename (part);
-			disposition = camel_mime_part_get_disposition (part);
 			content_id = camel_mime_part_get_content_id (part);
 
 			camel_data_wrapper_decode_to_stream_sync (dw, content, NULL, NULL);
diff --git a/camel/providers/imapx/camel-imapx-server.c b/camel/providers/imapx/camel-imapx-server.c
index 924c58a..d53a4b1 100644
--- a/camel/providers/imapx/camel-imapx-server.c
+++ b/camel/providers/imapx/camel-imapx-server.c
@@ -540,9 +540,6 @@ imapx_command_addv (CamelIMAPXCommand *ic, const gchar *fmt, va_list ap)
 	guint width;
 	gchar ch;
 	gint llong;
-	gint left;
-	gint fill;
-	gint zero;
 	gchar *s;
 	gchar *P;
 	gint d;
@@ -573,17 +570,14 @@ imapx_command_addv (CamelIMAPXCommand *ic, const gchar *fmt, va_list ap)
 				camel_stream_write ((CamelStream *)ic->mem, ps, p-ps-1, ic->cancellable, NULL);
 				start = p-1;
 				width = 0;
-				left = FALSE;
-				fill = FALSE;
-				zero = FALSE;
 				llong = 0;
 
 				do {
 					c = *p++;
 					if (c == '0')
-						zero = TRUE;
+						;
 					else if ( c== '-')
-						left = TRUE;
+						;
 					else
 						break;
 				} while (c);
@@ -2028,10 +2022,7 @@ imapx_command_complete (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
 static void
 imapx_command_run_sync (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
 {
-	CamelIMAPXCommandFunc complete = NULL;
-
 	ic->flag = e_flag_new ();
-	complete = ic->complete;
 
 	if (!ic->complete)
 		ic->complete = imapx_command_complete;
@@ -2193,9 +2184,6 @@ imapx_job_idle_start (CamelIMAPXServer *is,
 {
 	CamelIMAPXCommand *ic;
 	CamelIMAPXCommandPart *cp;
-	const gchar *full_name;
-
-	full_name = camel_folder_get_full_name (job->folder);
 
 	ic = camel_imapx_command_new (
 		is, "IDLE", job->folder,
@@ -2548,9 +2536,6 @@ imapx_select (CamelIMAPXServer *is,
               GError **error)
 {
 	CamelIMAPXCommand *ic;
-	const gchar *full_name;
-
-	full_name = camel_folder_get_full_name (folder);
 
 	/* Select is complicated by the fact we may have commands
 	   active on the server for a different selection.
@@ -3246,7 +3231,6 @@ static void
 imapx_command_fetch_message_done (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
 {
 	CamelIMAPXJob *job = ic->job;
-	const gchar *full_name;
 	gboolean failed = FALSE;
 
 	/* We either have more to fetch (partial mode?), we are complete,
@@ -3255,8 +3239,6 @@ imapx_command_fetch_message_done (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
 
 	job->commands--;
 
-	full_name = camel_folder_get_full_name (job->folder);
-
 	if (ic->error != NULL || ic->status->result != IMAPX_OK) {
 		failed = TRUE;
 		job->u.get_message.body_len = -1;
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
index 1a53166..551e25e 100644
--- a/camel/providers/local/camel-local-folder.c
+++ b/camel/providers/local/camel-local-folder.c
@@ -509,10 +509,8 @@ camel_local_folder_construct (CamelLocalFolder *lf,
 	CamelLocalStore *ls;
 	CamelStore *parent_store;
 	const gchar *full_name;
-	const gchar *name;
 
 	folder = CAMEL_FOLDER (lf);
-	name = camel_folder_get_name (folder);
 	full_name = camel_folder_get_full_name (folder);
 	parent_store = camel_folder_get_parent_store (folder);
 
@@ -594,17 +592,6 @@ camel_local_folder_construct (CamelLocalFolder *lf,
 		}
 	}
 
-	/* We don't need to sync here ..., it can sync later on when it calls refresh info */
-#if 0
-	/*if (camel_local_summary_check((CamelLocalSummary *)folder->summary, lf->changes, ex) == -1) {*/
-	/* we sync here so that any hard work setting up the folder isn't lost */
-	/*if (camel_local_summary_sync((CamelLocalSummary *)folder->summary, FALSE, lf->changes, ex) == -1) {
-		g_object_unref (CAMEL_OBJECT (folder));
-		g_free (name);
-		return NULL;
-		}*/
-#endif
-
 	/* TODO: This probably shouldn't be here? */
 	if ((flags & CAMEL_STORE_FOLDER_CREATE) != 0) {
 		CamelFolderInfo *fi;
diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c
index 988af8a..6e5d013 100644
--- a/camel/providers/local/camel-mbox-store.c
+++ b/camel/providers/local/camel-mbox-store.c
@@ -263,7 +263,6 @@ xrename (CamelStore *store, const gchar *old_name, const gchar *new_name, const
 	gchar *oldpath, *newpath;
 	struct stat st;
 	gint ret = -1;
-	gint err = 0;
 
 	if (ext != NULL) {
 		oldpath = camel_local_store_get_meta_path (ls, old_name, ext);
@@ -277,7 +276,6 @@ xrename (CamelStore *store, const gchar *old_name, const gchar *new_name, const
 		if (missingok && errno == ENOENT) {
 			ret = 0;
 		} else {
-			err = errno;
 			ret = -1;
 		}
 #ifndef G_OS_WIN32
@@ -286,7 +284,6 @@ xrename (CamelStore *store, const gchar *old_name, const gchar *new_name, const
 		if (g_rename (oldpath, newpath) == 0 || g_stat (newpath, &st) == 0) {
 			ret = 0;
 		} else {
-			err = errno;
 			ret = -1;
 		}
 	} else if (link (oldpath, newpath) == 0 /* and link for files */
@@ -294,19 +291,16 @@ xrename (CamelStore *store, const gchar *old_name, const gchar *new_name, const
 		if (unlink (oldpath) == 0) {
 			ret = 0;
 		} else {
-			err = errno;
 			unlink (newpath);
 			ret = -1;
 		}
 	} else {
-		err = errno;
 		ret = -1;
 #else
 	} else if ((!g_file_test (newpath, G_FILE_TEST_EXISTS) || g_remove (newpath) == 0) &&
 		   g_rename (oldpath, newpath) == 0) {
 		ret = 0;
 	} else {
-		err = errno;
 		ret = -1;
 #endif
 	}
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 8ca850f..7c0b7b4 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -573,7 +573,6 @@ pop3_store_connect_sync (CamelService *service,
 	gboolean reprompt = FALSE;
 	CamelSession *session;
 	gchar *errbuf = NULL;
-	gint status;
 	GError *local_error = NULL;
 
 	session = camel_service_get_session (service);
@@ -597,7 +596,7 @@ pop3_store_connect_sync (CamelService *service,
 		return FALSE;
 
 	while (1) {
-		status = pop3_try_authenticate (
+		pop3_try_authenticate (
 			service, reprompt, errbuf,
 			cancellable, &local_error);
 		g_free (errbuf);
diff --git a/libebackend/e-file-cache.c b/libebackend/e-file-cache.c
index 505d0d7..a4bbf23 100644
--- a/libebackend/e-file-cache.c
+++ b/libebackend/e-file-cache.c
@@ -405,13 +405,9 @@ e_file_cache_add_object (EFileCache *cache, const gchar *key, const gchar *value
 gboolean
 e_file_cache_replace_object (EFileCache *cache, const gchar *key, const gchar *new_value)
 {
-	EFileCachePrivate *priv;
-
 	g_return_val_if_fail (E_IS_FILE_CACHE (cache), FALSE);
 	g_return_val_if_fail (key != NULL, FALSE);
 
-	priv = cache->priv;
-
 	if (!e_file_cache_get_object (cache, key))
 		return FALSE;
 
diff --git a/libebackend/e-offline-listener.c b/libebackend/e-offline-listener.c
index 8a58d89..981e07b 100644
--- a/libebackend/e-offline-listener.c
+++ b/libebackend/e-offline-listener.c
@@ -50,10 +50,6 @@ struct _EOfflineListenerPrivate
 static void
 set_online_status (EOfflineListener *eol, gboolean is_offline)
 {
-	EOfflineListenerPrivate *priv;
-
-	priv = eol->priv;
-
 	g_signal_emit (eol, signals[CHANGED], 0);
 }
 
diff --git a/libedataserver/e-account-list.c b/libedataserver/e-account-list.c
index 70debb8..5abccdd 100644
--- a/libedataserver/e-account-list.c
+++ b/libedataserver/e-account-list.c
@@ -462,7 +462,6 @@ e_account_list_set_default (EAccountList *accounts, EAccount *account)
 const EAccount *
 e_account_list_find (EAccountList *accounts, e_account_find_t type, const gchar *key)
 {
-	gchar *val;
 	EIterator *it;
 	const EAccount *account = NULL;
 
@@ -479,7 +478,6 @@ e_account_list_find (EAccountList *accounts, e_account_find_t type, const gchar
 
 		account = (const EAccount *)e_iterator_get (it);
 
-		val = NULL;
 		switch (type) {
 		case E_ACCOUNT_FIND_NAME:
 			found = strcmp (account->name, key) == 0;
diff --git a/libedataserver/e-soap-message.c b/libedataserver/e-soap-message.c
index 138c624..32587b3 100644
--- a/libedataserver/e-soap-message.c
+++ b/libedataserver/e-soap-message.c
@@ -719,10 +719,7 @@ e_soap_message_add_namespace (ESoapMessage *msg, const gchar *prefix, const gcha
 void
 e_soap_message_set_default_namespace (ESoapMessage *msg, const gchar *ns_uri)
 {
-	ESoapMessagePrivate *priv;
-
 	g_return_if_fail (E_IS_SOAP_MESSAGE (msg));
-	priv = E_SOAP_MESSAGE_GET_PRIVATE (msg);
 
 	e_soap_message_add_namespace (msg, NULL, ns_uri);
 }
diff --git a/libedataserverui/e-categories-dialog.c b/libedataserverui/e-categories-dialog.c
index c959b9f..aa82bfa 100644
--- a/libedataserverui/e-categories-dialog.c
+++ b/libedataserverui/e-categories-dialog.c
@@ -432,7 +432,6 @@ static void
 edit_button_clicked_cb (GtkButton *button, gpointer user_data)
 {
 	ECategoriesDialog *dialog;
-	ECategoriesDialogPrivate *priv;
 	CategoryPropertiesDialog *prop_dialog;
 	GtkTreeSelection *selection;
 	GtkTreeIter iter;
@@ -443,7 +442,6 @@ edit_button_clicked_cb (GtkButton *button, gpointer user_data)
 	const gchar *icon_file;
 
 	dialog = user_data;
-	priv = dialog->priv;
 
 	tree_view = GTK_TREE_VIEW (dialog->priv->categories_list);
 	selection = gtk_tree_view_get_selection (tree_view);
diff --git a/libedataserverui/e-name-selector-dialog.c b/libedataserverui/e-name-selector-dialog.c
index b153687..a7a88f0 100644
--- a/libedataserverui/e-name-selector-dialog.c
+++ b/libedataserverui/e-name-selector-dialog.c
@@ -409,10 +409,6 @@ e_name_selector_dialog_init (ENameSelectorDialog *name_selector_dialog)
 static void
 e_name_selector_dialog_dispose (GObject *object)
 {
-	ENameSelectorDialogPrivate *priv;
-
-	priv = E_NAME_SELECTOR_DIALOG_GET_PRIVATE (object);
-
 	remove_books (E_NAME_SELECTOR_DIALOG (object));
 	shutdown_name_selector_model (E_NAME_SELECTOR_DIALOG (object));
 
@@ -1273,7 +1269,6 @@ transfer_button_clicked (ENameSelectorDialog *name_selector_dialog, GtkButton *t
 static void
 setup_name_selector_model (ENameSelectorDialog *name_selector_dialog)
 {
-	EContactStore       *contact_store;
 	ETreeModelGenerator *contact_filter;
 	GList               *new_sections;
 	GList               *l;
@@ -1311,8 +1306,6 @@ setup_name_selector_model (ENameSelectorDialog *name_selector_dialog)
 
 	/* Get contact store and its filter wrapper */
 
-	contact_store  = e_name_selector_model_peek_contact_store  (
-		name_selector_dialog->priv->name_selector_model);
 	contact_filter = e_name_selector_model_peek_contact_filter (
 		name_selector_dialog->priv->name_selector_model);
 
diff --git a/libedataserverui/e-name-selector-entry.c b/libedataserverui/e-name-selector-entry.c
index 774f245..3a6740d 100644
--- a/libedataserverui/e-name-selector-entry.c
+++ b/libedataserverui/e-name-selector-entry.c
@@ -787,15 +787,12 @@ find_existing_completion (ENameSelectorEntry *name_selector_entry, const gchar *
 	EContact      *best_contact    = NULL;
 	gint           best_field_rank = G_MAXINT;
 	EContactField  best_field = 0;
-	gint           cue_len;
 
 	g_assert (cue_str);
 
 	if (!name_selector_entry->priv->contact_store)
 		return FALSE;
 
-	cue_len = strlen (cue_str);
-
 	ENS_DEBUG (g_print ("Completing '%s'\n", cue_str));
 
 	if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (name_selector_entry->priv->contact_store), &iter))
@@ -1751,10 +1748,6 @@ user_focus_in (ENameSelectorEntry *name_selector_entry, GdkEventFocus *event_foc
 static gboolean
 user_focus_out (ENameSelectorEntry *name_selector_entry, GdkEventFocus *event_focus)
 {
-	ENameSelectorEntryPrivate *priv;
-
-	priv = E_NAME_SELECTOR_ENTRY_GET_PRIVATE (name_selector_entry);
-
 	if (!event_focus->in) {
 		entry_activate (name_selector_entry);
 	}
@@ -2319,7 +2312,6 @@ editor_closed_cb (GtkWidget *editor, gpointer data)
 	EDestination *destination;
 	GList *books;
 	EBook *book;
-	gboolean result;
 	gint email_num;
 	ENameSelectorEntry *name_selector_entry = E_NAME_SELECTOR_ENTRY (data);
 
@@ -2341,7 +2333,7 @@ editor_closed_cb (GtkWidget *editor, gpointer data)
 	if (!book)
 		return;
 
-	result = e_book_get_contact (book, contact_uid, &contact, NULL);
+	e_book_get_contact (book, contact_uid, &contact, NULL);
 	email_num = e_destination_get_email_num (destination);
 	e_destination_set_contact (destination, contact, email_num);
 
diff --git a/libedataserverui/e-source-combo-box.c b/libedataserverui/e-source-combo-box.c
index 3dc8992..8bd95cb 100644
--- a/libedataserverui/e-source-combo-box.c
+++ b/libedataserverui/e-source-combo-box.c
@@ -231,10 +231,6 @@ e_source_combo_box_set_property (GObject *object,
                                  const GValue *value,
                                  GParamSpec *pspec)
 {
-	ESourceComboBoxPrivate *priv;
-
-	priv = E_SOURCE_COMBO_BOX_GET_PRIVATE (object);
-
 	switch (property_id) {
 		case PROP_SOURCE_LIST:
 			e_source_combo_box_set_source_list (
@@ -252,10 +248,6 @@ e_source_combo_box_get_property (GObject *object,
                                  GValue *value,
                                  GParamSpec *pspec)
 {
-	ESourceComboBoxPrivate *priv;
-
-	priv = E_SOURCE_COMBO_BOX_GET_PRIVATE (object);
-
 	switch (property_id) {
 		case PROP_SOURCE_LIST:
 			g_value_set_object (
diff --git a/libedataserverui/e-source-selector-dialog.c b/libedataserverui/e-source-selector-dialog.c
index 44efaf7..71aef27 100644
--- a/libedataserverui/e-source-selector-dialog.c
+++ b/libedataserverui/e-source-selector-dialog.c
@@ -88,7 +88,6 @@ e_source_selector_dialog_init (ESourceSelectorDialog *dialog)
 	ESourceSelectorDialogPrivate *priv;
 	GtkWidget *action_area;
 	GtkWidget *content_area;
-	GtkStyleContext *context;
 
 	priv = g_new0 (ESourceSelectorDialogPrivate, 1);
 	priv->selected_source = NULL;
@@ -100,7 +99,6 @@ e_source_selector_dialog_init (ESourceSelectorDialog *dialog)
 	/* prepare the dialog */
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Select destination"));
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 320, 240);
-	context = gtk_widget_get_style_context (GTK_WIDGET (dialog));
 	gtk_container_set_border_width (GTK_CONTAINER (content_area), 0);
 	gtk_container_set_border_width (GTK_CONTAINER (action_area), 12);
 	gtk_dialog_add_buttons (GTK_DIALOG (dialog),
diff --git a/libedataserverui/e-tree-model-generator.c b/libedataserverui/e-tree-model-generator.c
index 5537528..e9846e8 100644
--- a/libedataserverui/e-tree-model-generator.c
+++ b/libedataserverui/e-tree-model-generator.c
@@ -946,7 +946,6 @@ e_tree_model_generator_convert_iter_to_child_iter (ETreeModelGenerator *tree_mod
 {
 	GtkTreePath *path;
 	GArray      *group;
-	gint         generator_index;
 	gint         index;
 	gint         internal_offset = 0;
 
@@ -956,12 +955,9 @@ e_tree_model_generator_convert_iter_to_child_iter (ETreeModelGenerator *tree_mod
 	path = gtk_tree_path_new ();
 	ITER_GET (generator_iter, &group, &index);
 
-	generator_index = index;
 	index = generated_offset_to_child_offset (group, index, &internal_offset);
 	gtk_tree_path_prepend_index (path, index);
 
-	ETMG_DEBUG (g_print ("iter_to_child_iter: %d -> %d (%d)\n", generator_index, index, internal_offset));
-
 	while (group) {
 		Node *node = &g_array_index (group, Node, index);
 
diff --git a/servers/groupwise/e-gw-connection.c b/servers/groupwise/e-gw-connection.c
index 73115e9..a4e281e 100644
--- a/servers/groupwise/e-gw-connection.c
+++ b/servers/groupwise/e-gw-connection.c
@@ -3693,19 +3693,7 @@ e_gw_connection_read_cal_ids (EGwConnection *cnc, const gchar *container, gint c
 			subparam = soup_soap_parameter_get_next_child_by_name (subparam, "item")) {
 		SoupSoapParameter *param_id;
 		EGwItemCalId *calid = g_new0 (EGwItemCalId, 1);
-		EGwItemType type;
-		gchar *id = NULL, *item_type = NULL;
-
-		item_type = soup_soap_parameter_get_property (subparam, "type");
-
-		if (g_str_equal (item_type, "Appointment"))
-				type  = E_GW_ITEM_TYPE_APPOINTMENT;
-		else if  (g_str_equal (item_type, "Task"))
-			type = E_GW_ITEM_TYPE_TASK;
-		else {
-			type = E_GW_ITEM_TYPE_NOTE;
-		}
-		g_free (item_type);
+		gchar *id = NULL;
 
 		param_id = soup_soap_parameter_get_first_child_by_name (subparam, "id");
 		if (param_id) {
@@ -3939,7 +3927,6 @@ e_gw_connection_remove_proxy (EGwConnection *cnc, proxyHandler *removeProxy)
 {
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
-	EGwConnectionStatus status;
 
 	g_return_val_if_fail (E_IS_GW_CONNECTION (cnc), E_GW_CONNECTION_STATUS_UNKNOWN);
 
@@ -3954,7 +3941,7 @@ e_gw_connection_remove_proxy (EGwConnection *cnc, proxyHandler *removeProxy)
 		g_object_unref (msg);
 		return E_GW_CONNECTION_STATUS_INVALID_RESPONSE;
 	}
-	status = e_gw_connection_parse_response_status (response);
+	e_gw_connection_parse_response_status (response);
 	g_object_unref (response);
 	g_object_unref (msg);
 	return E_GW_CONNECTION_STATUS_OK;
@@ -4061,7 +4048,6 @@ e_gw_connection_get_proxy_connection (EGwConnection *parent_cnc, gchar *username
 	EGwConnection *cnc;
 	SoupSoapMessage *msg;
 	SoupSoapResponse *response;
-	EGwConnectionStatus status;
 	SoupSoapParameter *param;
 	SoupSoapParameter *subparam;
 	gchar *hash_key;
@@ -4114,7 +4100,7 @@ e_gw_connection_get_proxy_connection (EGwConnection *parent_cnc, gchar *username
 		return NULL;
 	}
 
-	status = e_gw_connection_parse_response_status (response);
+	e_gw_connection_parse_response_status (response);
 
 	param = soup_soap_response_get_first_parameter_by_name (response, "session");
 	if (!param) {
diff --git a/servers/groupwise/soup-soap-message.c b/servers/groupwise/soup-soap-message.c
index f026012..5918091 100644
--- a/servers/groupwise/soup-soap-message.c
+++ b/servers/groupwise/soup-soap-message.c
@@ -665,10 +665,7 @@ soup_soap_message_add_namespace (SoupSoapMessage *msg, const gchar *prefix, cons
 void
 soup_soap_message_set_default_namespace (SoupSoapMessage *msg, const gchar *ns_uri)
 {
-	SoupSoapMessagePrivate *priv;
-
 	g_return_if_fail (SOUP_IS_SOAP_MESSAGE (msg));
-	priv = SOUP_SOAP_MESSAGE_GET_PRIVATE (msg);
 
 	soup_soap_message_add_namespace (msg, NULL, ns_uri);
 }