Fix several types of pedantic compiler warnings.

94 files changed, 142 insertions, 161 deletions

diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index 79bcdc4750..a28c3c5f99 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -206,7 +206,7 @@ e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *categ
 				category->name[i][j] = '\0';
 			}
 
-			//find a desktop id that is not in use between 128 and 255
+			/* find a desktop id that is not in use between 128 and 255 */
 			/* XXX desktopUniqueID should really be used for tracking
 			 * categories across renaming operations, but as Evo
 			 * doesn't have a concept of category UIDs or renaming,
@@ -265,7 +265,7 @@ void e_pilot_local_category_to_remote(int * pilotCategory,
 	}
 	l = c_list;
 	while(l && *pilotCategory == 0) {
-		//list != 0, so at least 1 category is assigned
+		/* list != 0, so at least 1 category is assigned */
 		category_string = e_pilot_utf8_to_pchar((const char *)l->data);
 		for (i=0; i < PILOT_MAX_CATEGORIES; i++) {
 			/* only 15 chars + nul in palm category name */
diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h
index dc0452e6b1..92d16c795c 100644
--- a/addressbook/gui/component/addressbook-config.h
+++ b/addressbook/gui/component/addressbook-config.h
@@ -30,7 +30,7 @@
 typedef enum {
 	ADDRESSBOOK_LDAP_AUTH_NONE,
 	ADDRESSBOOK_LDAP_AUTH_SIMPLE_EMAIL,
-	ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN,
+	ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN
 } AddressbookLDAPAuthType;
 
 typedef enum {
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index ccaf9b740f..9e07381e4e 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -124,7 +124,7 @@ struct _EContactListEditorPrivate {
 #define VCARD_TYPE "text/x-vcard"
 
 enum {
-	TARGET_TYPE_VCARD,
+	TARGET_TYPE_VCARD
 };
 
 static GtkTargetEntry targets[] = {
diff --git a/addressbook/gui/widgets/a11y/ea-minicard.c b/addressbook/gui/widgets/a11y/ea-minicard.c
index d0219e03b5..258fcbd4bc 100644
--- a/addressbook/gui/widgets/a11y/ea-minicard.c
+++ b/addressbook/gui/widgets/a11y/ea-minicard.c
@@ -240,7 +240,7 @@ static gboolean atk_action_interface_do_action (AtkAction *iface, gint i)
 		return FALSE;
 
 	switch (i) {
-		// open card
+		/* open card */
 		case 0:
 			e_minicard_activate_editor (minicard);
 			break;
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index 2a2f1a2d87..1f9f44bf30 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -49,7 +49,7 @@ enum {
 	PROP_BOOK,
 	PROP_QUERY,
 	PROP_EDITABLE,
-	PROP_MODEL,
+	PROP_MODEL
 };
 
 enum {
diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h
index 59b1705764..6e593f1fb8 100644
--- a/addressbook/gui/widgets/eab-config.h
+++ b/addressbook/gui/widgets/eab-config.h
@@ -45,7 +45,7 @@ struct _EABConfigClass {
 };
 
 enum _eab_config_target_t {
-	EAB_CONFIG_TARGET_SOURCE,
+	EAB_CONFIG_TARGET_SOURCE
 };
 
 typedef struct _EABConfigTargetSource EABConfigTargetSource;
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index e7e5f57506..b9b6b3449c 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -1631,7 +1631,7 @@ pre_sync (GnomePilotConduit *conduit,
 	pi_buffer_free(buffer);
 #endif
 	unpack_AppointmentAppInfo (&(ctxt->ai), buf, len);
-	//unpack_CategoryAppInfo (&(ctxt->ai.category), buf, len);
+	/* unpack_CategoryAppInfo (&(ctxt->ai.category), buf, len); */
 	g_free (buf);
 
 	check_for_slow_setting (conduit, ctxt);
diff --git a/calendar/conduits/common/libecalendar-common-conduit.c b/calendar/conduits/common/libecalendar-common-conduit.c
index fbbe0278b1..59f411da69 100644
--- a/calendar/conduits/common/libecalendar-common-conduit.c
+++ b/calendar/conduits/common/libecalendar-common-conduit.c
@@ -93,7 +93,7 @@ e_pilot_add_category_if_possible(char *cat_to_add, struct CategoryAppInfo *categ
 				category->name[i][j] = '\0';
 			}
 
-			//find a desktop id that is not in use between 128 and 255
+			/* find a desktop id that is not in use between 128 and 255 */
 			for (desktopUniqueID = 128; desktopUniqueID <= 255; desktopUniqueID++) {
 				int found = 0;
 				for(j=0; j<PILOT_MAX_CATEGORIES; j++){
@@ -133,7 +133,7 @@ void e_pilot_local_category_to_remote(int * pilotCategory, ECalComponent *comp,
 	int i;
 	e_cal_component_get_categories_list (comp, &c_list);
 	if (c_list) {
-		//list != 0, so at least 1 category is assigned
+		/* list != 0, so at least 1 category is assigned */
 		category_string = e_pilot_utf8_to_pchar((const char *)c_list->data);
 		if (c_list->next != 0) {
 			LOG (g_message ("Note: item has more categories in evolution, first chosen"));
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index f40bc82eab..7639291504 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -1013,7 +1013,7 @@ pre_sync (GnomePilotConduit *conduit,
 	/* Get the default component */
 	if (!e_cal_get_default_object (ctxt->client, &icalcomp, NULL))
 		return -1;
-	LOG (g_message ( "  Got default component: %p", icalcomp));
+	LOG (g_message ("  Got default component: %p", (gpointer) icalcomp));
 
 	ctxt->default_comp = e_cal_component_new ();
 	if (!e_cal_component_set_icalcomponent (ctxt->default_comp, icalcomp)) {
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 17c743126a..91554a56c1 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -1542,7 +1542,7 @@ display_notification (time_t trigger, CompQueuedAlarms *cqa,
 	g_signal_connect (G_OBJECT (tray_data->query), "objects_removed",
 			  G_CALLBACK (on_dialog_objs_removed_cb), tray_data);
 
-	// FIXME: We should remove this check
+	/* FIXME: We should remove this check */
 	if (!config_data_get_notify_with_tray ()) {
 		tray_blink_id = -1;
 		open_alarm_dialog (tray_data);
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index c7b6050d3e..ec2f26a045 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -209,7 +209,7 @@ static void update_end_time_combo ( EventPage *epage);
 static void event_page_select_organizer (EventPage *epage, const char *backend_address);
 static void set_subscriber_info_string (EventPage *epage, const char *backend_address);
 
-G_DEFINE_TYPE (EventPage, event_page, TYPE_COMP_EDITOR_PAGE);
+G_DEFINE_TYPE (EventPage, event_page, TYPE_COMP_EDITOR_PAGE)
 
 static void
 event_page_dispose (GObject *object)
@@ -1884,7 +1884,7 @@ enum {
 	ATTENDEE_CAN_DELEGATE = 1<<1,
 	ATTENDEE_CAN_DELETE = 1<<2,
 	ATTENDEE_CAN_ADD = 1<<3,
-	ATTENDEE_LAST = 1<<4,
+	ATTENDEE_LAST = 1<<4
 };
 
 static EPopupItem context_menu_items[] = {
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 82fb75564a..b6cbd3e7dc 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -77,7 +77,7 @@ typedef enum {
 	PRIORITY_HIGH,
 	PRIORITY_NORMAL,
 	PRIORITY_LOW,
-	PRIORITY_UNDEFINED,
+	PRIORITY_UNDEFINED
 } TaskEditorPriority;
 
 static const int priority_map[] = {
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index d020d5cd4f..bd568e2e6a 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1195,7 +1195,7 @@ enum {
 	ATTENDEE_CAN_DELEGATE = 1<<1,
 	ATTENDEE_CAN_DELETE = 1<<2,
 	ATTENDEE_CAN_ADD = 1<<3,
-	ATTENDEE_LAST = 1<<4,
+	ATTENDEE_LAST = 1<<4
 };
 
 static EPopupItem context_menu_items[] = {
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index 01c01be6f9..dec1150ad1 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -8,19 +8,11 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
-<<<<<<< HEAD:calendar/gui/e-cal-component-preview.c
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with the program; if not, see <http://www.gnu.org/licenses/>  
  *
  *
-=======
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
- *
- *
->>>>>>> 23df769955ea54f756a579c19964df87ae6fd5c8:calendar/gui/e-cal-component-preview.c
  * Authors:
  *		Federico Mena Quintero <federico@ximian.com>
  *	    Damon Chaplin <damon@ximian.com>
diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h
index 8af6313b5b..8f27cbd2f2 100644
--- a/calendar/gui/e-cal-config.h
+++ b/calendar/gui/e-cal-config.h
@@ -47,7 +47,7 @@ struct _ECalConfigClass {
 
 enum _e_cal_config_target_t {
 	EC_CONFIG_TARGET_SOURCE,
-	EC_CONFIG_TARGET_PREFS,
+	EC_CONFIG_TARGET_PREFS
 };
 
 typedef struct _ECalConfigTargetSource ECalConfigTargetSource;
diff --git a/calendar/gui/e-cal-list-view-config.c b/calendar/gui/e-cal-list-view-config.c
index efa8b9b7fb..6c930b1b61 100644
--- a/calendar/gui/e-cal-list-view-config.c
+++ b/calendar/gui/e-cal-list-view-config.c
@@ -32,7 +32,7 @@ struct _ECalListViewConfigPrivate {
 /* Property IDs */
 enum props {
 	PROP_0,
-	PROP_VIEW,
+	PROP_VIEW
 };
 
 G_DEFINE_TYPE (ECalListViewConfig, e_cal_list_view_config, G_TYPE_OBJECT)
diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h
index 30962d9a1a..9c37a6a9ae 100644
--- a/calendar/gui/e-cal-menu.h
+++ b/calendar/gui/e-cal-menu.h
@@ -39,7 +39,7 @@ typedef struct _ECalMenuClass ECalMenuClass;
 /* Current target description */
 /* Types of popup tagets */
 enum _e_cal_menu_target_t {
-	E_CAL_MENU_TARGET_SELECT,
+	E_CAL_MENU_TARGET_SELECT
 };
 
 /**
@@ -73,7 +73,7 @@ enum _e_cal_menu_target_select_t {
 
 	E_CAL_MENU_SELECT_ASSIGNABLE = 1<<10,
 	E_CAL_MENU_SELECT_HASURL = 1<<11,
-	E_CAL_MENU_SELECT_NOTCOMPLETE = 1<<12,
+	E_CAL_MENU_SELECT_NOTCOMPLETE = 1<<12
 };
 
 typedef struct _ECalMenuTargetSelect ECalMenuTargetSelect;
diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h
index 34874efdba..185e9877f0 100644
--- a/calendar/gui/e-cal-popup.h
+++ b/calendar/gui/e-cal-popup.h
@@ -50,7 +50,7 @@ struct _ECalendarView;
 enum _e_cal_popup_target_t {
 	E_CAL_POPUP_TARGET_SELECT,
 	E_CAL_POPUP_TARGET_SOURCE,
-	E_CAL_POPUP_TARGET_ATTACHMENTS,
+	E_CAL_POPUP_TARGET_ATTACHMENTS
 };
 
 /**
@@ -89,7 +89,7 @@ enum _e_cal_popup_target_select_t {
 	E_CAL_POPUP_SELECT_ACCEPTABLE = 1<<14,
 	E_CAL_POPUP_SELECT_NOTCOMPLETE = 1<<15,
 	E_CAL_POPUP_SELECT_NOSAVESCHEDULES = 1<<16,
-	E_CAL_POPUP_SELECT_COMPLETE = 1<<17,
+	E_CAL_POPUP_SELECT_COMPLETE = 1<<17
 };
 
 /**
@@ -121,7 +121,7 @@ enum _e_cal_popup_target_attachments_t {
 	E_CAL_POPUP_ATTACHMENTS_MANY = 1<<1, /* one or more selected */
 	E_CAL_POPUP_ATTACHMENTS_MODIFY = 1<<2, /* check for modify operation */
 	E_CAL_POPUP_ATTACHMENTS_MULTIPLE = 1<<3,
-	E_CAL_POPUP_ATTACHMENTS_IMAGE = 1<<4,
+	E_CAL_POPUP_ATTACHMENTS_IMAGE = 1<<4
 };
 
 typedef struct _ECalPopupTargetSelect ECalPopupTargetSelect;
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index a888e04c02..4a3bd2e75c 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -79,7 +79,7 @@ static void open_event_with_flags (ECalendarView *cal_view, ECal *client, icalco
 /* Property IDs */
 enum props {
 	PROP_0,
-	PROP_MODEL,
+	PROP_MODEL
 };
 
 /* FIXME Why are we emitting these event signals here? Can't the model just be listened to? */
diff --git a/calendar/gui/e-cell-date-edit-config.c b/calendar/gui/e-cell-date-edit-config.c
index e2a9cc6eb2..5be8569bd3 100644
--- a/calendar/gui/e-cell-date-edit-config.c
+++ b/calendar/gui/e-cell-date-edit-config.c
@@ -35,7 +35,7 @@ struct _ECellDateEditConfigPrivate {
 /* Property IDs */
 enum props {
 	PROP_0,
-	PROP_CELL,
+	PROP_CELL
 };
 
 G_DEFINE_TYPE (ECellDateEditConfig, e_cell_date_edit_config, G_TYPE_OBJECT)
diff --git a/calendar/gui/e-date-edit-config.c b/calendar/gui/e-date-edit-config.c
index 16732305ec..d6fd6cf675 100644
--- a/calendar/gui/e-date-edit-config.c
+++ b/calendar/gui/e-date-edit-config.c
@@ -32,7 +32,7 @@ struct _EDateEditConfigPrivate {
 /* Property IDs */
 enum props {
 	PROP_0,
-	PROP_EDIT,
+	PROP_EDIT
 };
 
 G_DEFINE_TYPE (EDateEditConfig, e_date_edit_config, G_TYPE_OBJECT)
diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c
index b7acf6541f..44156bf18e 100644
--- a/calendar/gui/e-day-view-config.c
+++ b/calendar/gui/e-day-view-config.c
@@ -32,7 +32,7 @@ struct _EDayViewConfigPrivate {
 /* Property IDs */
 enum props {
 	PROP_0,
-	PROP_VIEW,
+	PROP_VIEW
 };
 
 G_DEFINE_TYPE (EDayViewConfig, e_day_view_config, G_TYPE_OBJECT)
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 9f92c4fc5f..5384b4ab0a 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1346,7 +1346,7 @@ msg_composer_subject_changed_cb (EMsgComposer *composer)
 
 enum {
 	UPDATE_AUTO_CC,
-	UPDATE_AUTO_BCC,
+	UPDATE_AUTO_BCC
 };
 
 static void
diff --git a/doc/reference/shell/Makefile.am b/doc/reference/shell/Makefile.am
index 95e6b09565..69d047b6d3 100644
--- a/doc/reference/shell/Makefile.am
+++ b/doc/reference/shell/Makefile.am
@@ -66,21 +66,21 @@ INCLUDES= \
 	-I$(top_srcdir)							\
 	-I$(SHELL_CFLAGS)
 GTKDOC_LIBS=								\
-	$(top_builddir)/shell/e-shell.o					\
-	$(top_builddir)/shell/e-shell-importer.o			\
-	$(top_builddir)/shell/e-shell-migrate.o				\
-	$(top_builddir)/shell/e-shell-nm.o				\
-	$(top_builddir)/shell/e-shell-window-private.o			\
-	$(top_builddir)/shell/es-event.o				\
+	$(top_builddir)/shell/.libs/e-shell.o				\
 	$(top_builddir)/shell/.libs/e-shell-backend.o			\
 	$(top_builddir)/shell/.libs/e-shell-content.o			\
+	$(top_builddir)/shell/.libs/e-shell-importer.o			\
+	$(top_builddir)/shell/.libs/e-shell-migrate.o			\
+	$(top_builddir)/shell/.libs/e-shell-nm.o			\
 	$(top_builddir)/shell/.libs/e-shell-settings.o			\
 	$(top_builddir)/shell/.libs/e-shell-sidebar.o			\
 	$(top_builddir)/shell/.libs/e-shell-switcher.o			\
 	$(top_builddir)/shell/.libs/e-shell-taskbar.o			\
 	$(top_builddir)/shell/.libs/e-shell-view.o			\
 	$(top_builddir)/shell/.libs/e-shell-window-actions.o		\
+	$(top_builddir)/shell/.libs/e-shell-window-private.o		\
 	$(top_builddir)/shell/.libs/e-shell-window.o			\
+	$(top_builddir)/shell/.libs/es-event.o				\
 	$(top_builddir)/e-util/.libs/e-bconf-map.o			\
 	$(top_builddir)/e-util/.libs/e-binding.o			\
 	$(top_builddir)/e-util/.libs/e-dialog-utils.o			\
@@ -97,6 +97,7 @@ GTKDOC_LIBS=								\
 	$(top_builddir)/e-util/.libs/e-plugin-ui.o			\
 	$(top_builddir)/e-util/.libs/e-popup.o				\
 	$(top_builddir)/e-util/.libs/e-print.o				\
+	$(top_builddir)/e-util/.libs/e-unicode.o			\
 	$(top_builddir)/e-util/.libs/e-util.o				\
 	$(top_builddir)/e-util/.libs/e-xml-utils.o			\
 	$(top_builddir)/e-util/.libs/gconf-bridge.o			\
@@ -129,7 +130,6 @@ GTKDOC_LIBS=								\
 	$(top_builddir)/widgets/misc/.libs/e-popup-menu.o		\
 	$(top_builddir)/widgets/misc/.libs/e-preferences-window.o	\
 	$(top_builddir)/widgets/misc/.libs/e-spinner.o			\
-	$(top_builddir)/widgets/misc/.libs/e-unicode.o			\
 	-ledataserver-1.2						\
 	-ledataserverui-1.2						\
 	$(SHELL_LIBS)
diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h
index f47368de78..1d72119c8c 100644
--- a/e-util/e-bconf-map.h
+++ b/e-util/e-bconf-map.h
@@ -41,7 +41,7 @@ enum {
 	E_BCONF_MAP_ENUM,	    /* long/bool -> prop of name 'to', with the value indexed into the child map table's from field */
 	E_BCONF_MAP_CHILD,	    /* a new child of name 'to' */
 	E_BCONF_MAP_MASK = 0x3f,
-	E_BCONF_MAP_CONTENT = 0x80, /* if set, create a new node of name 'to' instead of a property */
+	E_BCONF_MAP_CONTENT = 0x80  /* if set, create a new node of name 'to' instead of a property */
 };
 
 typedef struct _e_bconf_map {
diff --git a/e-util/e-config.h b/e-util/e-config.h
index 2eeb663d59..1ee7e29b58 100644
--- a/e-util/e-config.h
+++ b/e-util/e-config.h
@@ -75,7 +75,7 @@ typedef struct _GtkWidget * (*EConfigItemFactoryFunc)(EConfig *ec, EConfigItem *
 typedef
 enum _e_config_target_change_t {
 	E_CONFIG_TARGET_CHANGED_STATE,
-	E_CONFIG_TARGET_CHANGED_REBUILD,
+	E_CONFIG_TARGET_CHANGED_REBUILD
 } e_config_target_change_t;
 
 /**
@@ -123,7 +123,7 @@ enum _e_config_t {
 	E_CONFIG_SECTION,
 	E_CONFIG_SECTION_TABLE,
 	E_CONFIG_ITEM,
-	E_CONFIG_ITEM_TABLE,	/* only allowed in table sections */
+	E_CONFIG_ITEM_TABLE	/* only allowed in table sections */
 };
 
 /**
diff --git a/e-util/e-cursor.h b/e-util/e-cursor.h
index 9e1a228316..f0b78b3126 100644
--- a/e-util/e-cursor.h
+++ b/e-util/e-cursor.h
@@ -27,11 +27,9 @@
 #include <gtk/gtk.h>
 
 typedef enum {
-
 	E_CURSOR_NORMAL,
-	E_CURSOR_BUSY,
-
-}ECursorType;
+	E_CURSOR_BUSY
+} ECursorType;
 
 void e_cursor_set (GtkWidget *widget, ECursorType cursor);
 
diff --git a/e-util/e-event.h b/e-util/e-event.h
index 074d8deed2..c97f1b30bc 100644
--- a/e-util/e-event.h
+++ b/e-util/e-event.h
@@ -60,7 +60,7 @@ typedef void (*EEventFactoryFunc)(EEvent *ee, void *);
  **/
 enum _e_event_t {
 	E_EVENT_PASS,		/* passthrough */
-	E_EVENT_SINK,		/* sink events */
+	E_EVENT_SINK		/* sink events */
 };
 
 /**
diff --git a/e-util/e-menu.h b/e-util/e-menu.h
index e6ee11f304..f844f80400 100644
--- a/e-util/e-menu.h
+++ b/e-util/e-menu.h
@@ -68,7 +68,7 @@ enum _e_menu_t {
 	E_MENU_TOGGLE,
 	E_MENU_RADIO,
 	E_MENU_TYPE_MASK = 0xffff,
-	E_MENU_ACTIVE = 0x10000,
+	E_MENU_ACTIVE = 0x10000
 };
 
 /**
diff --git a/e-util/e-profile-event.h b/e-util/e-profile-event.h
index b7ac21adc1..dd84671902 100644
--- a/e-util/e-profile-event.h
+++ b/e-util/e-profile-event.h
@@ -42,14 +42,14 @@ typedef struct _EProfileEventClass EProfileEventClass;
 
 /* Current target description */
 enum _e_profile_event_target_t {
-	E_PROFILE_EVENT_TARGET,
+	E_PROFILE_EVENT_TARGET
 };
 
 /* Flags that qualify a target (UNIMPLEMENTED) */
 enum {
 	E_PROFILE_EVENT_START = 1<< 0,
 	E_PROFILE_EVENT_END = 1<< 1,
-	E_PROFILE_EVENT_CANCEL = 1<< 2,
+	E_PROFILE_EVENT_CANCEL = 1<< 2
 };
 
 typedef struct _EProfileEventTarget EProfileEventTarget;
diff --git a/e-util/e-signature-list.h b/e-util/e-signature-list.h
index 4edd48a7dd..cfaa64c28a 100644
--- a/e-util/e-signature-list.h
+++ b/e-util/e-signature-list.h
@@ -41,7 +41,7 @@ typedef struct _ESignatureListClass ESignatureListClass;
 /* search options for the find command */
 typedef enum {
 	E_SIGNATURE_FIND_NAME,
-	E_SIGNATURE_FIND_UID,
+	E_SIGNATURE_FIND_UID
 } e_signature_find_t;
 
 struct _ESignatureList {
diff --git a/em-format/em-format.c b/em-format/em-format.c
index 267c953320..7128644052 100644
--- a/em-format/em-format.c
+++ b/em-format/em-format.c
@@ -82,7 +82,7 @@ static void emf_format_secure(EMFormat *emf, CamelStream *stream, CamelMimePart
 static gboolean emf_busy(EMFormat *emf);
 enum {
 	EMF_COMPLETE,
-	EMF_LAST_SIGNAL,
+	EMF_LAST_SIGNAL
 };
 
 static gpointer parent_class;
@@ -752,7 +752,7 @@ emf_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMimeM
 	g_string_truncate(emf->part_id, 0);
 	if (folder != NULL)
 		/* TODO build some string based on the folder name/location? */
-		g_string_append_printf(emf->part_id, ".%p", folder);
+		g_string_append_printf(emf->part_id, ".%p", (gpointer) folder);
 	if (uid != NULL)
 		g_string_append_printf(emf->part_id, ".%s", uid);
 }
diff --git a/em-format/em-format.h b/em-format/em-format.h
index 3057b3d7a9..281766140e 100644
--- a/em-format/em-format.h
+++ b/em-format/em-format.h
@@ -71,7 +71,7 @@ typedef void (*EMFormatFunc) (EMFormat *md, CamelStream *stream, CamelMimePart *
 typedef enum _em_format_mode_t {
 	EM_FORMAT_NORMAL,
 	EM_FORMAT_ALLHEADERS,
-	EM_FORMAT_SOURCE,
+	EM_FORMAT_SOURCE
 } em_format_mode_t;
 
 /**
@@ -103,7 +103,7 @@ struct _EMFormatHandler {
  **/
 enum _em_format_handler_t {
 	EM_FORMAT_HANDLER_INLINE = 1<<0,
-	EM_FORMAT_HANDLER_INLINE_DISPOSITION = 1<<1,
+	EM_FORMAT_HANDLER_INLINE_DISPOSITION = 1<<1
 };
 
 
diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c
index 599681c4d4..cf92b804f5 100644
--- a/filter/filter-datespec.c
+++ b/filter/filter-datespec.c
@@ -366,7 +366,7 @@ set_values (FilterDatespec *fds)
 
 	p->type = fds->type==FDST_UNKNOWN ? FDST_NOW : fds->type;
 
-	note_type = fds->type==FDST_X_FUTURE ? FDST_X_AGO : fds->type; // FUTURE and AGO use the same notebook pages/etc.
+	note_type = fds->type==FDST_X_FUTURE ? FDST_X_AGO : fds->type; /* FUTURE and AGO use the same notebook pages/etc. */
 
 	switch (p->type) {
 	case FDST_NOW:
diff --git a/filter/filter-datespec.h b/filter/filter-datespec.h
index 29c4f872b1..cbb79a46c5 100644
--- a/filter/filter-datespec.h
+++ b/filter/filter-datespec.h
@@ -42,7 +42,7 @@ typedef enum _FilterDatespec_type {
 	FDST_NOW,
 	FDST_SPECIFIED,
 	FDST_X_AGO,
-	FDST_X_FUTURE,
+	FDST_X_FUTURE
 } FilterDatespec_type;
 
 struct _FilterDatespec {
diff --git a/filter/filter-rule.h b/filter/filter-rule.h
index 184c1270e5..b1683e1c8b 100644
--- a/filter/filter-rule.h
+++ b/filter/filter-rule.h
@@ -52,7 +52,7 @@ enum _filter_threading_t {
 	FILTER_THREAD_ALL,	/* add all possible threads */
 	FILTER_THREAD_REPLIES,	/* add only replies */
 	FILTER_THREAD_REPLIES_PARENTS,	/* replies plus parents */
-	FILTER_THREAD_SINGLE,	/* messages with no replies or parents */
+	FILTER_THREAD_SINGLE	/* messages with no replies or parents */
 };
 
 #define FILTER_SOURCE_INCOMING "incoming" /* performed on incoming email */
diff --git a/filter/rule-context.h b/filter/rule-context.h
index f7a10df65f..ba7e47c381 100644
--- a/filter/rule-context.h
+++ b/filter/rule-context.h
@@ -45,7 +45,7 @@ typedef struct _RuleContextClass RuleContextClass;
 /* backend capabilities, this is a hack since we don't support nested rules */
 enum {
 	RULE_CONTEXT_GROUPING = 1 << 0,
-	RULE_CONTEXT_THREADING = 1 << 1,
+	RULE_CONTEXT_THREADING = 1 << 1
 };
 
 struct _RuleContext {
diff --git a/filter/rule-editor.h b/filter/rule-editor.h
index 4e675f839f..555b5e8263 100644
--- a/filter/rule-editor.h
+++ b/filter/rule-editor.h
@@ -77,7 +77,7 @@ enum {
 	RULE_EDITOR_LOG_EDIT,
 	RULE_EDITOR_LOG_ADD,
 	RULE_EDITOR_LOG_REMOVE,
-	RULE_EDITOR_LOG_RANK,
+	RULE_EDITOR_LOG_RANK
 };
 
 struct _RuleEditorUndo {
diff --git a/mail/e-mail-shell-migrate.c b/mail/e-mail-shell-migrate.c
index b7af75beb2..9a31f67820 100644
--- a/mail/e-mail-shell-migrate.c
+++ b/mail/e-mail-shell-migrate.c
@@ -1322,7 +1322,7 @@ nofile:
 enum {
 	CP_UNIQUE = 0,
 	CP_OVERWRITE,
-	CP_APPEND,
+	CP_APPEND
 };
 
 static int open_flags[3] = {
diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h
index 9a5b09afe3..43e5c0652c 100644
--- a/mail/em-account-editor.h
+++ b/mail/em-account-editor.h
@@ -38,7 +38,7 @@ typedef struct _EMAccountEditorClass EMAccountEditorClass;
 
 typedef enum {
 	EMAE_NOTEBOOK,
-	EMAE_DRUID,
+	EMAE_DRUID
 } em_account_editor_t;
 
 struct _EMAccountEditor {
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index b522ca1861..0a503b579b 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -2057,7 +2057,7 @@ enum {
 	ATTRIB_TM_YEAR,
 	ATTRIB_TM_2YEAR,
 	ATTRIB_TM_WDAY, /* not actually used */
-	ATTRIB_TM_YDAY,
+	ATTRIB_TM_YDAY
 };
 
 typedef void (* AttribFormatter) (GString *str, const char *attr, CamelMimeMessage *message);
diff --git a/mail/em-config.h b/mail/em-config.h
index 5530d27d00..ba19bb1c37 100644
--- a/mail/em-config.h
+++ b/mail/em-config.h
@@ -42,7 +42,7 @@ typedef struct _EMConfigClass EMConfigClass;
 enum _em_config_target_t {
 	EM_CONFIG_TARGET_FOLDER,
 	EM_CONFIG_TARGET_PREFS,
-	EM_CONFIG_TARGET_ACCOUNT,
+	EM_CONFIG_TARGET_ACCOUNT
 };
 
 typedef struct _EMConfigTargetFolder EMConfigTargetFolder;
diff --git a/mail/em-event.h b/mail/em-event.h
index eb45050a27..21df1df42d 100644
--- a/mail/em-event.h
+++ b/mail/em-event.h
@@ -49,37 +49,37 @@ enum _em_event_target_t {
 	EM_EVENT_TARGET_MESSAGE,
 	EM_EVENT_TARGET_COMPOSER,
 	EM_EVENT_TARGET_SEND_RECEIVE,
-	EM_EVENT_TARGET_CUSTOM_ICON,
+	EM_EVENT_TARGET_CUSTOM_ICON
 };
 
 /* Flags for FOLDER BROWSER Events*/
 enum {
-	EM_EVENT_FOLDER_BROWSER = 1<< 0,
+	EM_EVENT_FOLDER_BROWSER = 1<< 0
 };
 
 /* Flags that describe TARGET_FOLDER */
 enum {
-	EM_EVENT_FOLDER_NEWMAIL = 1<< 0,
+	EM_EVENT_FOLDER_NEWMAIL = 1<< 0
 };
 
 /* Flags that describe TARGET_MESSAGE */
 enum {
-	EM_EVENT_MESSAGE_REPLY_ALL = 1<< 0,
+	EM_EVENT_MESSAGE_REPLY_ALL = 1<< 0
 };
 
 /* Flags that describe TARGET_COMPOSER */
 enum {
-	EM_EVENT_COMPOSER_SEND_OPTION = 1<< 0,
+	EM_EVENT_COMPOSER_SEND_OPTION = 1<< 0
 };
 
 /* Flags that describe TARGET_SEND_RECEIVE*/
 enum {
-	EM_EVENT_SEND_RECEIVE = 1<< 0,
+	EM_EVENT_SEND_RECEIVE = 1<< 0
 };
 
 /* Flags that describe TARGET_CUSTOM_ICON*/
 enum {
-	EM_EVENT_CUSTOM_ICON = 1<< 0,
+	EM_EVENT_CUSTOM_ICON = 1<< 0
 };
 
 typedef struct _EMEventTargetFolder EMEventTargetFolder;
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index bfc69f9132..de4d48a77f 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -173,7 +173,7 @@ enum {
 static guint folder_browser_signals [LAST_SIGNAL] = {0, };
 
 enum {
-	ESB_SAVE,
+	ESB_SAVE
 };
 
 static ESearchBarItem emfb_search_items[] = {
diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h
index a97831ec95..ee8fc2856f 100644
--- a/mail/em-folder-selector.h
+++ b/mail/em-folder-selector.h
@@ -71,11 +71,11 @@ struct _EMFolderSelectorClass {
 };
 
 enum {
-	EM_FOLDER_SELECTOR_CAN_CREATE = 1,
+	EM_FOLDER_SELECTOR_CAN_CREATE = 1
 };
 
 enum {
-	EM_FOLDER_SELECTOR_RESPONSE_NEW = 1,
+	EM_FOLDER_SELECTOR_RESPONSE_NEW = 1
 };
 
 GType em_folder_selector_get_type (void);
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 6b9d0b540e..5bea7c8e19 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -827,7 +827,7 @@ emfv_append_menu (EMPopup *des_emp, GtkMenu *des_menu, EMPopup *src_emp, GtkMenu
 	gtk_widget_destroy (GTK_WIDGET (src_menu));
 
 	/* free src_emp together with des_emp; name contains unique identifier */
-	name = g_strdup_printf ("emp_%p", src_emp);
+	name = g_strdup_printf ("emp_%p", (gpointer) src_emp);
 	g_object_set_data_full (G_OBJECT (des_emp), name, src_emp, emfv_free_em_popup);
 	g_free (name);
 
diff --git a/mail/em-folder-view.h b/mail/em-folder-view.h
index 02d6583c0b..77178aaf38 100644
--- a/mail/em-folder-view.h
+++ b/mail/em-folder-view.h
@@ -67,7 +67,7 @@ enum {
 	EM_FOLDER_VIEW_SELECT_SELECTION = EM_POPUP_SELECT_LAST<<6,
 	EM_FOLDER_VIEW_SELECT_NOSELECTION = EM_POPUP_SELECT_LAST<<7,
 	EM_FOLDER_VIEW_PREVIEW_PRESENT = EM_POPUP_SELECT_LAST<<8,
-	EM_FOLDER_VIEW_SELECT_LAST = EM_POPUP_SELECT_LAST<<9,
+	EM_FOLDER_VIEW_SELECT_LAST = EM_POPUP_SELECT_LAST<<9
 };
 
 struct _EMFolderViewEnable {
diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index 758307e0f8..e20daaf5ab 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -65,7 +65,7 @@ typedef struct _EMFormatHTMLPrivate EMFormatHTMLPrivate;
 enum _em_format_html_header_flags {
 	EM_FORMAT_HTML_HEADER_TO = 1<<0,
 	EM_FORMAT_HTML_HEADER_CC = 1<<1,
-	EM_FORMAT_HTML_HEADER_BCC = 1<<2,
+	EM_FORMAT_HTML_HEADER_BCC = 1<<2
 };
 
 typedef enum {
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index 99d64112d2..07dd55fa3a 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -103,7 +103,7 @@ enum {
 	EMIF_BINHEX,
 	EMIF_POSTSCRIPT,
 	EMIF_PGPSIGNED,
-	EMIF_PGPENCRYPTED,
+	EMIF_PGPENCRYPTED
 };
 
 static const struct {
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index 6c4fff4138..589576ab27 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -61,7 +61,7 @@ enum {
 	HEADER_LIST_ENABLED_COLUMN, /* is the header enabled? */
 	HEADER_LIST_IS_DEFAULT_COLUMN,  /* is this header a default header, eg From: */
 	HEADER_LIST_HEADER_COLUMN, /* the real name of this header */
-	HEADER_LIST_N_COLUMNS,
+	HEADER_LIST_N_COLUMNS
 };
 
 static GType col_types[] = {
@@ -183,7 +183,7 @@ mark_seen_timeout_reverse_transform (const GValue *src_value,
 
 enum {
 	JH_LIST_COLUMN_NAME,
-	JH_LIST_COLUMN_VALUE,
+	JH_LIST_COLUMN_VALUE
 };
 
 static void
@@ -243,7 +243,7 @@ jh_add_cb (GtkWidget *widget, gpointer user_data)
 		char *tok;
 		GSList *list = gconf_client_get_list (prefs->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL);
 		
-		//FIXME: Validate the values
+		/* FIXME: Validate the values */
 		
 		tok = g_strdup_printf ("%s=%s", name, value);
 		list = g_slist_append (list, tok);
diff --git a/mail/em-menu.h b/mail/em-menu.h
index 48fc96b7fc..08467fefd8 100644
--- a/mail/em-menu.h
+++ b/mail/em-menu.h
@@ -40,7 +40,7 @@ typedef struct _EMMenuClass EMMenuClass;
 /* Types of popup tagets */
 enum _em_menu_target_t {
 	EM_MENU_TARGET_SELECT,
-	EM_MENU_TARGET_WIDGET,
+	EM_MENU_TARGET_WIDGET
 };
 
 /* Flags that describe a TARGET_SELECT */
diff --git a/mail/em-popup.h b/mail/em-popup.h
index 8df98a6488..870055140b 100644
--- a/mail/em-popup.h
+++ b/mail/em-popup.h
@@ -104,7 +104,7 @@ enum _em_popup_target_select_t {
 	EM_POPUP_SELECT_FOLDER             = 1<<15,     /* do we have any folder at all? */
 	EM_POPUP_SELECT_JUNK               = 1<<16,
 	EM_POPUP_SELECT_NOT_JUNK           = 1<<17,
-	EM_POPUP_SELECT_LAST               = 1<<18,
+	EM_POPUP_SELECT_LAST               = 1<<18
 };
 
 /**
@@ -130,7 +130,7 @@ enum _em_popup_target_uri_t {
  **/
 enum _em_popup_target_part_t {
 	EM_POPUP_PART_MESSAGE = 1<<0,
-	EM_POPUP_PART_IMAGE = 1<<1,
+	EM_POPUP_PART_IMAGE = 1<<1
 };
 
 /**
@@ -151,7 +151,7 @@ enum _em_popup_target_folder_t {
 	EM_POPUP_FOLDER_DELETE = 1<<3, /* folder can be deleted/renamed */
 	EM_POPUP_FOLDER_SELECT = 1<<4, /* folder can be selected/opened */
 	EM_POPUP_FOLDER_OUTBOX = 1<<5, /* Outbox folder */
-	EM_POPUP_FOLDER_NONSTATIC = 1<<6, /* Except static folders like Outbox.*/
+	EM_POPUP_FOLDER_NONSTATIC = 1<<6 /* Except static folders like Outbox.*/
 };
 
 typedef struct _EMPopupTargetSelect EMPopupTargetSelect;
diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c
index ce388eea42..311c2e1b7a 100644
--- a/mail/em-sync-stream.c
+++ b/mail/em-sync-stream.c
@@ -39,7 +39,7 @@
 enum _write_msg_t {
 	EMSS_WRITE,
 	EMSS_FLUSH,
-	EMSS_CLOSE,
+	EMSS_CLOSE
 };
 
 struct _write_msg {
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index d75af50050..fa27e22f9c 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -367,7 +367,7 @@ rule_copy(FilterRule *dest, FilterRule *src)
 enum {
 	BUTTON_ADD,
 	BUTTON_REMOVE,
-	BUTTON_LAST,
+	BUTTON_LAST
 };
 
 struct _source_data {
diff --git a/mail/em-vfolder-rule.h b/mail/em-vfolder-rule.h
index 18f8c3156b..bc6a330c4b 100644
--- a/mail/em-vfolder-rule.h
+++ b/mail/em-vfolder-rule.h
@@ -37,7 +37,7 @@ enum _em_vfolder_rule_with_t {
 	EM_VFOLDER_RULE_WITH_SPECIFIC,
 	EM_VFOLDER_RULE_WITH_LOCAL_REMOTE_ACTIVE,
 	EM_VFOLDER_RULE_WITH_REMOTE_ACTIVE,
-	EM_VFOLDER_RULE_WITH_LOCAL,
+	EM_VFOLDER_RULE_WITH_LOCAL
 };
 
 typedef struct _EMVFolderRule EMVFolderRule;
diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h
index 9f2f66674a..bae8bd8313 100644
--- a/mail/mail-autofilter.h
+++ b/mail/mail-autofilter.h
@@ -35,7 +35,7 @@ enum {
 	AUTO_SUBJECT = 1,
 	AUTO_FROM = 2,
 	AUTO_TO = 4,
-	AUTO_MLIST = 8,
+	AUTO_MLIST = 8
 };
 
 struct _FilterRule *em_vfolder_rule_from_message(struct _EMVFolderContext *context, struct _CamelMimeMessage *msg, int flags, const char *source);
diff --git a/mail/mail-component.h b/mail/mail-component.h
index 41f331d812..7ab8d64cf0 100644
--- a/mail/mail-component.h
+++ b/mail/mail-component.h
@@ -47,7 +47,7 @@ enum _mail_component_folder_t {
 	MAIL_COMPONENT_FOLDER_OUTBOX,
 	MAIL_COMPONENT_FOLDER_SENT,
 	MAIL_COMPONENT_FOLDER_TEMPLATES,
-	MAIL_COMPONENT_FOLDER_LOCAL_INBOX,
+	MAIL_COMPONENT_FOLDER_LOCAL_INBOX
 };
 
 struct _MailComponent {
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index dbdfe3b690..716b36a03c 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -132,7 +132,7 @@ mail_msg_new (MailMsgInfo *info)
 
 #ifdef LOG_OPS
 	if (log_ops)
-		fprintf(log, "%p: New\n", msg);
+		fprintf(log, "%p: New\n", (gpointer) msg);
 #endif
 	MAIL_MT_UNLOCK(mail_msg_lock);
 
diff --git a/mail/mail-mt.h b/mail/mail-mt.h
index dba4adee16..b95620a000 100644
--- a/mail/mail-mt.h
+++ b/mail/mail-mt.h
@@ -100,7 +100,7 @@ typedef struct _MailAsyncEvent {
 
 typedef enum _mail_async_event_t {
 	MAIL_ASYNC_GUI,
-	MAIL_ASYNC_THREAD,
+	MAIL_ASYNC_THREAD
 } mail_async_event_t;
 
 typedef void (*MailAsyncFunc)(void *, void *, void *);
@@ -119,7 +119,7 @@ typedef enum {
 	MAIL_CALL_p_ppp,
 	MAIL_CALL_p_pppp,
 	MAIL_CALL_p_ppppp,
-	MAIL_CALL_p_ppippp,
+	MAIL_CALL_p_ppippp
 } mail_call_t;
 
 typedef void *(*MailMainFunc)();
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 63175d73d6..aaef8b9069 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1673,9 +1673,9 @@ refresh_folder_desc (struct _sync_folder_msg *m)
 static void
 refresh_folder_exec (struct _sync_folder_msg *m)
 {
-	//camel_folder_sync (m->folder, FALSE, &m->base.ex);
+	/* camel_folder_sync (m->folder, FALSE, &m->base.ex); */
 
-	//if (!camel_exception_is_set (&m->base.ex))
+	/* if (!camel_exception_is_set (&m->base.ex)) */
 		camel_folder_refresh_info(m->folder, &m->base.ex);
 }
 
diff --git a/mail/message-list.c b/mail/message-list.c
index 98dab40af1..2a72fe98eb 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -140,7 +140,7 @@ static struct {
 enum {
 	DND_X_UID_LIST,		/* x-uid-list */
 	DND_MESSAGE_RFC822,	/* message/rfc822 */
-	DND_TEXT_URI_LIST,	/* text/uri-list */
+	DND_TEXT_URI_LIST	/* text/uri-list */
 };
 
 /* What we send */
@@ -184,7 +184,7 @@ enum {
 	NORMALISED_SUBJECT,
 	NORMALISED_FROM,
 	NORMALISED_TO,
-	NORMALISED_LAST,
+	NORMALISED_LAST
 };
 
 /* #define SMART_ADDRESS_COMPARE */
@@ -4344,7 +4344,7 @@ regen_list_exec (struct _regen_list_msg *m)
 
 	e_profile_event_emit("list.threaduids", m->folder->full_name, 0);
 
-	//camel_folder_summary_reload_from_db (m->folder->summary, NULL);
+	/* camel_folder_summary_reload_from_db (m->folder->summary, NULL); */
 	if (!camel_operation_cancel_check(m->base.cancel)) {
 		camel_folder_sort_uids (m->folder, showuids);
 
diff --git a/mail/message-list.h b/mail/message-list.h
index bf48f40458..c388f89f96 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -76,7 +76,7 @@ enum {
 	/* Invisible columns */
 	COL_DELETED,
 	COL_UNREAD,
-	COL_COLOUR,
+	COL_COLOUR
 };
 
 #define MESSAGE_LIST_COLUMN_IS_ACTIVE(col) (col == COL_MESSAGE_STATUS || \
@@ -183,7 +183,7 @@ typedef enum {
 	MESSAGE_LIST_SELECT_NEXT = 0,
 	MESSAGE_LIST_SELECT_PREVIOUS = 1,
 	MESSAGE_LIST_SELECT_DIRECTION = 1, /* direction mask */
-	MESSAGE_LIST_SELECT_WRAP = 1<<1, /* option bit */
+	MESSAGE_LIST_SELECT_WRAP = 1<<1 /* option bit */
 } MessageListSelectDirection;
 
 GType          message_list_get_type   (void);
diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c
index 8634ce4000..08c1956303 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@ -65,7 +65,7 @@ typedef struct {
 
 enum {
 	CLUE_KEYWORD_COLUMN,
-	CLUE_N_COLUMNS,
+	CLUE_N_COLUMNS
 };
 
 int e_plugin_lib_enable (EPluginLib *ep, int enable);
diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am
index 73e0b988d6..c17876d622 100644
--- a/plugins/audio-inline/Makefile.am
+++ b/plugins/audio-inline/Makefile.am
@@ -10,8 +10,9 @@ plugin_LTLIBRARIES = liborg-gnome-audio-inline.la
 
 liborg_gnome_audio_inline_la_SOURCES = audio-inline.c
 liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
-liborg_gnome_audio_inline_la_LIBADD =	\
-	$(GSTREAMER_LIBS)		\
+liborg_gnome_audio_inline_la_LIBADD =				\
+	$(top_builddir)/mail/libevolution-module-mail.la	\
+	$(GSTREAMER_LIBS)					\
 	$(EVOLUTION_MAIL_LIBS)
 
 EXTRA_DIST = org-gnome-audio-inline.eplug.xml
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index 5d4a911c9a..f9745e8972 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -48,7 +48,7 @@ void backup_restore_abort (EPlugin *ep, EMConfigTargetAccount *target);
 
 typedef enum _br_flags {
 	BR_OK = 1<<0,
-	BR_START = 1<<1,
+	BR_START = 1<<1
 }br_flags;
 
 static void
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index 38d41f8470..1e88303e50 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -55,7 +55,7 @@ typedef struct {
 enum {
         HEADER_KEY_COLUMN,
 	HEADER_VALUE_COLUMN,
-        HEADER_N_COLUMNS,
+        HEADER_N_COLUMNS
 };
 
 struct _EmailCustomHeaderOptionsDialogPrivate {
@@ -350,7 +350,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 	for (header_section_id = 0,label_row = 0,row = 0,column = 1; 
 		header_section_id < priv->email_custom_header_details->len; header_section_id++,row++,column++) {
 
-		// To create an empty label widget. Text will be added dynamically.
+		/* To create an empty label widget. Text will be added dynamically. */
 		priv->header_type_name_label = gtk_label_new ("");
 		temp_header_ptr = &g_array_index(priv->email_custom_header_details, EmailCustomHeaderDetails,header_section_id);
                 str = (temp_header_ptr->header_type_value)->str;
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index ae889247c8..ccfb6afb71 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -136,7 +136,7 @@ btn_chpass_clicked (GtkButton *button, gpointer data)
 		/* "Cacel" button was hit */
 		return;
 	}
-	//g_print ("Current password is \"%s\"\n", old_password);
+	/* g_print ("Current password is \"%s\"\n", old_password); */
  	result = exchange_account_set_password (account, old_password, new_password);
 	if (result != EXCHANGE_ACCOUNT_CONNECT_SUCCESS)
 		exchange_operations_report_error (account, result);
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index 2f60b34bff..bfe295447f 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -113,10 +113,10 @@ install_folder_response (EMFolderSelector *emfs, int response, gpointer *data)
 				/*changes = camel_folder_change_info_new ();
 				camel_folder_change_info_remove_uid (changes, (char *) item_id);
 				camel_folder_summary_remove_uid (folder->summary, item_id);*/
-				//camel_folder_delete_message (folder, item_id);
+				/* camel_folder_delete_message (folder, item_id); */
 				camel_folder_set_message_flags (folder, item_id, CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED);
 				camel_folder_summary_touch (folder->summary);
-				//camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes);
+				/* camel_object_trigger_event (CAMEL_OBJECT (folder), "folder_changed", changes); */
 				uri = camel_url_to_string (((CamelService *) store)->url, CAMEL_URL_HIDE_ALL);
 				account = mail_config_get_account_by_source_url (uri);
 				uri = account->source->url;
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index 0b811d0787..3a850b2a55 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -94,7 +94,7 @@ refresh_folder_tree (EMFolderTreeModel *model, CamelStore *store)
 	if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE))
 		return;
 	em_folder_tree_model_add_store (model, store, account->name);
-	//camel_object_unref (store);
+	/* camel_object_unref (store); */
 }
 
 void
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index d16c205758..9b3062b1c3 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -181,7 +181,7 @@ free_all (ShareFolder *sf)
 		sf->users_list = NULL;
 	}
 
-	//e_gw_connection_free_container_list (sf->container_list);
+	/* e_gw_connection_free_container_list (sf->container_list); */
 }
 
 
diff --git a/plugins/publish-calendar/publish-location.h b/plugins/publish-calendar/publish-location.h
index ec627d18ce..327cd986fd 100644
--- a/plugins/publish-calendar/publish-location.h
+++ b/plugins/publish-calendar/publish-location.h
@@ -31,29 +31,25 @@ G_BEGIN_DECLS
 enum publish_frequency {
 	URI_PUBLISH_DAILY,
 	URI_PUBLISH_WEEKLY,
-	URI_PUBLISH_MANUAL,
-	/* URI_PUBLISH_AUTO, */
+	URI_PUBLISH_MANUAL
 };
 
 static const int publish_frequency_type_map[] = {
 	URI_PUBLISH_DAILY,
 	URI_PUBLISH_WEEKLY,
 	URI_PUBLISH_MANUAL,
-	/* URI_PUBLISH_AUTO, */
 	-1,
 };
 
 enum publish_format {
 	URI_PUBLISH_AS_ICAL,
-	URI_PUBLISH_AS_FB,
-	/* URI_PUBLISH_AS_HTML, */
+	URI_PUBLISH_AS_FB
 };
 
 static const int publish_format_type_mask[] = {
 	URI_PUBLISH_AS_ICAL,
 	URI_PUBLISH_AS_FB,
-	/* URI_PUBLISH_AS_HTML, */
-	-1,
+	-1
 };
 
 enum FBDurationType {
diff --git a/plugins/publish-calendar/url-editor-dialog.h b/plugins/publish-calendar/url-editor-dialog.h
index 3a85fc895e..94a1a71f00 100644
--- a/plugins/publish-calendar/url-editor-dialog.h
+++ b/plugins/publish-calendar/url-editor-dialog.h
@@ -40,7 +40,7 @@ enum {
 	URL_LIST_ENABLED_COLUMN,
 	URL_LIST_LOCATION_COLUMN,
 	URL_LIST_URL_COLUMN,
-	URL_LIST_N_COLUMNS,
+	URL_LIST_N_COLUMNS
 };
 
 enum {
@@ -50,7 +50,7 @@ enum {
 	TYPE_SMB,
 	TYPE_DAV,
 	TYPE_DAVS,
-	TYPE_URI,
+	TYPE_URI
 };
 
 typedef struct _UrlEditorDialog UrlEditorDialog;
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index 5114e9b386..8a15ce98ac 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -59,7 +59,6 @@ static pthread_mutex_t em_junk_sa_preferred_socket_path_lock = PTHREAD_MUTEX_INI
 static pthread_mutex_t em_junk_sa_spamd_restart_lock = PTHREAD_MUTEX_INITIALIZER;
 
 int e_plugin_lib_enable (EPluginLib *ep, int enable);
-//static const char *em_junk_sa_get_name (void);
 gboolean em_junk_sa_check_junk (EPlugin *ep, EMJunkHookTarget *target);
 void em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target);
 void em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target);
@@ -104,14 +103,6 @@ static gboolean em_junk_sa_allow_tell_tested = FALSE;
 char *em_junk_sa_spamc_gconf_binary = NULL;
 char *em_junk_sa_spamd_gconf_binary = NULL;
 
-#if 0
-static const char *
-em_junk_sa_get_name (void)
-{
-	return _("SpamAssassin (built-in)");
-}
-#endif
-
 static int
 pipe_to_sa_full (CamelMimeMessage *msg, const char *in, char **argv, int rv_err, int wait_for_termination, GByteArray *output_buffer, GError **error)
 {
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index eae87721c4..537b8822bc 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -60,7 +60,7 @@ typedef struct {
 enum {
 	CLUE_KEYWORD_COLUMN,
 	CLUE_VALUE_COLUMN,
-	CLUE_N_COLUMNS,
+	CLUE_N_COLUMNS
 };
 
 typedef struct {
diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am
index f216d7f418..d473f15af0 100644
--- a/plugins/tnef-attachments/Makefile.am
+++ b/plugins/tnef-attachments/Makefile.am
@@ -13,6 +13,9 @@ plugin_LTLIBRARIES = liborg-gnome-tnef-attachments.la
 liborg_gnome_tnef_attachments_la_SOURCES = tnef-plugin.c
 liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version  $(NO_UNDEFINED)
 liborg_gnome_tnef_attachments_la_LIBADD = 		\
+	$(top_builddir)/e-util/libeutil.la		\
+	$(top_builddir)/em-format/libemformat.la	\
+	$(EVOLUTION_MAIL_LIBS)				\
 	-lytnef
 
 EXTRA_DIST = org-gnome-tnef-attachments.eplug.xml
diff --git a/shell/Makefile.am b/shell/Makefile.am
index e8c8dc4d95..07409baf9e 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -72,6 +72,7 @@ eshellinclude_HEADERS = 			\
 	es-event.h
 
 libeshell_la_SOURCES =				\
+	$(NM_SUPPORT_FILES)			\
 	$(IDL_GENERATED)			\
 	e-shell.c				\
 	e-shell-backend.c			\
@@ -110,7 +111,6 @@ endif
 
 evolution_SOURCES =				\
 	$(DATASERVER_IDL_GENERATED)		\
-	$(NM_SUPPORT_FILES)			\
 	e-config-upgrade.c			\
 	e-config-upgrade.h			\
 	main.c					
diff --git a/shell/es-event.h b/shell/es-event.h
index df6d7e6398..415a0ee959 100644
--- a/shell/es-event.h
+++ b/shell/es-event.h
@@ -44,7 +44,7 @@ enum _es_event_target_t {
 /* Flags that qualify TARGET_STATE */
 enum {
 	ES_EVENT_STATE_ONLINE = 1<<0,
-	ES_EVENT_STATE_OFFLINE = 1<<1,
+	ES_EVENT_STATE_OFFLINE = 1<<1
 };
 
 typedef struct _ESEventTargetState ESEventTargetState;
diff --git a/smime/gui/e-cert-selector.h b/smime/gui/e-cert-selector.h
index 130d90920c..542a211745 100644
--- a/smime/gui/e-cert-selector.h
+++ b/smime/gui/e-cert-selector.h
@@ -54,7 +54,7 @@ struct _ECertSelectorClass {
 
 enum _e_cert_selector_type {
 	E_CERT_SELECTOR_SIGNER,
-	E_CERT_SELECTOR_RECIPIENT,
+	E_CERT_SELECTOR_RECIPIENT
 };
 
 GType      e_cert_selector_get_type (void);
diff --git a/smime/lib/e-asn1-object.h b/smime/lib/e-asn1-object.h
index b761730ec3..d0cdb05d27 100644
--- a/smime/lib/e-asn1-object.h
+++ b/smime/lib/e-asn1-object.h
@@ -65,7 +65,7 @@ enum {
 	E_ASN1_OBJECT_TYPE_HIGH_TAG_NUMBER  = 31,
 	E_ASN1_OBJECT_TYPE_CONTEXT_SPECIFIC = 32,
 	E_ASN1_OBJECT_TYPE_APPLICATION      = 33,
-	E_ASN1_OBJECT_TYPE_PRIVATE          = 34,
+	E_ASN1_OBJECT_TYPE_PRIVATE          = 34
 };
 
 struct _EASN1Object {
diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c
index cbede0a5fe..2146fc3d32 100644
--- a/smime/lib/e-cert.c
+++ b/smime/lib/e-cert.c
@@ -1225,10 +1225,10 @@ e_cert_get_asn1_struct (ECert *cert)
 gboolean
 e_cert_mark_for_deletion (ECert *cert)
 {
-	//	nsNSSShutDownPreventionLock locker;
+	/* nsNSSShutDownPreventionLock locker; */
 
 #if 0
-	// make sure user is logged in to the token
+	/* make sure user is logged in to the token */
 	nsCOMPtr<nsIInterfaceRequestor> ctx = new PipUIContext();
 #endif
 
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index 98f16d6e75..759a7fd1d6 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -271,7 +271,7 @@ import_from_file_helper (EPKCS12 *pkcs12, PK11SlotInfo *slot,
 #ifdef notyet
 		/* XXX we need this to check the gerror */
 		if (NS_ERROR_ABORT == rv) {
-			// inputToDecoder indicated a NSS error
+			/* inputToDecoder indicated a NSS error */
 			srv = SECFailure;
 		}
 #else
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c
index 142806d514..bad4c20bc6 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.c
+++ b/widgets/menus/gal-view-instance-save-as-dialog.c
@@ -35,7 +35,7 @@ G_DEFINE_TYPE (GalViewInstanceSaveAsDialog, gal_view_instance_save_as_dialog, GT
 /* The arguments we take */
 enum {
 	PROP_0,
-	PROP_INSTANCE,
+	PROP_INSTANCE
 };
 
 enum {
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index 77cad661e1..4d300f01d4 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -74,7 +74,7 @@ enum {
 	PROP_X1,
 	PROP_X2,
 	PROP_Y1,
-	PROP_Y2,
+	PROP_Y2
 };
 
 static void
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 3cb85c5839..903331576e 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -837,7 +837,7 @@ e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id)
 		if (func)
 			func(info->item, flags, info->id);
 		g_message ("ECANVAS: free info (2): item %p, id %p",
-			   info->item, info->id);
+			   (gpointer) info->item, (gpointer) info->id);
 		g_object_unref (info->item);
 		g_free(info);
 	}
@@ -851,7 +851,7 @@ e_canvas_item_set_cursor (GnomeCanvasItem *item, gpointer id)
 	info->item = item;
 	g_object_ref (info->item);
 	info->id = id;
-	g_message ("ECANVAS: new info item %p, id %p", item, id);
+	g_message ("ECANVAS: new info item %p, id %p", (gpointer) item, (gpointer) id);
 
 	flags = E_CANVAS_ITEM_SELECTION_SELECT | E_CANVAS_ITEM_SELECTION_CURSOR;
 	func = (ECanvasItemSelectionFunc)g_object_get_data(G_OBJECT(item),
@@ -920,7 +920,7 @@ e_canvas_item_add_selection (GnomeCanvasItem *item, gpointer id)
 	info->item = item;
 	g_object_ref (info->item);
 	info->id = id;
-	g_message ("ECANVAS: new info (2): item %p, id %p", item, id);
+	g_message ("ECANVAS: new info (2): item %p, id %p", (gpointer) item, (gpointer) id);
 
 	func = (ECanvasItemSelectionFunc)g_object_get_data(G_OBJECT(item),
 							   "ECanvasItem::selection_callback");
@@ -967,7 +967,7 @@ e_canvas_item_remove_selection (GnomeCanvasItem *item, gpointer id)
 					canvas->cursor = NULL;
 
 				g_message ("ECANVAS: removing info: item %p, info %p",
-					   info->item, info->id);
+					   (gpointer) info->item, (gpointer) info->id);
 				g_object_unref (info->item);
 				g_free(info);
 				g_list_free_1(list);
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
index 6b30b3b11c..81505dcb02 100644
--- a/widgets/misc/e-charset-picker.c
+++ b/widgets/misc/e-charset-picker.c
@@ -46,7 +46,7 @@ typedef enum {
 	E_CHARSET_TURKISH,
 	E_CHARSET_UNICODE,
 	E_CHARSET_WESTERN_EUROPEAN,
-	E_CHARSET_WESTERN_EUROPEAN_NEW,
+	E_CHARSET_WESTERN_EUROPEAN_NEW
 } ECharsetClass;
 
 static const char *classnames[] = {
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index 2125bdf30d..6d4bff46ca 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -37,7 +37,7 @@
 enum {
 	PROP_0,
 	PROP_QUERY,
-	PROP_STATE,
+	PROP_STATE
 };
 
 static gpointer parent_class;
diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h
index edc20e2fec..957eea3d0b 100644
--- a/widgets/misc/e-filter-bar.h
+++ b/widgets/misc/e-filter-bar.h
@@ -107,7 +107,7 @@ enum {
 	E_FILTERBAR_CURRENT_MESSAGE_ID = -6,
 	E_FILTERBAR_CURRENT_FOLDER_ID = -7,
 	E_FILTERBAR_CURRENT_ACCOUNT_ID = -8,
-	E_FILTERBAR_ALL_ACCOUNTS_ID = -9,
+	E_FILTERBAR_ALL_ACCOUNTS_ID = -9
 };
 
 #define E_FILTERBAR_SAVE      { N_("_Save Search..."), E_FILTERBAR_SAVE_ID, 0 }
diff --git a/widgets/table/a11y/gal-a11y-e-table-item.c b/widgets/table/a11y/gal-a11y-e-table-item.c
index 16d50df9b0..e28d0f6b83 100644
--- a/widgets/table/a11y/gal-a11y-e-table-item.c
+++ b/widgets/table/a11y/gal-a11y-e-table-item.c
@@ -760,7 +760,7 @@ enum {
         ETI_HEADER_UNCHANGED = 0,
         ETI_HEADER_REORDERED,
         ETI_HEADER_NEW_ADDED,
-        ETI_HEADER_REMOVED,
+        ETI_HEADER_REMOVED
 };
 
 /*
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index 6c0bded852..5552bd33b2 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -152,15 +152,15 @@ ecv_draw (ECellView *ecell_view, GdkDrawable *drawable,
 		/* Now cause our subcells to draw their contents,
 		   shifted by subcell_offset pixels */
 		int width = allotted_width * hbox_view->def_size_cols[i] / 100;
-			//e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row);
-//		if (width < hbox_view->def_size_cols[i])
-	//		width = hbox_view->def_size_cols[i];
-//		printf("width of %d %d of %d\n", width,hbox_view->def_size_cols[i], allotted_width );
+			/* e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row);
+		if (width < hbox_view->def_size_cols[i])
+			width = hbox_view->def_size_cols[i];
+		printf("width of %d %d of %d\n", width,hbox_view->def_size_cols[i], allotted_width ); */
 		e_cell_draw (hbox_view->subcell_views[i], drawable,
 			     hbox_view->model_cols[i], view_col, row, flags,
 			     x1 + subcell_offset , y1, x1 + subcell_offset + width, y2);
 
-		subcell_offset += width; //e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row);
+		subcell_offset += width; /* e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); */
 	}
 }
 
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
index 8d90267a5e..892ff7cc5d 100644
--- a/widgets/table/e-table-col.c
+++ b/widgets/table/e-table-col.c
@@ -31,7 +31,7 @@ G_DEFINE_TYPE (ETableCol, e_table_col, G_TYPE_OBJECT)
 
 enum {
 	PROP_0,
-	PROP_COMPARE_COL,
+	PROP_COMPARE_COL
 };
 
 static void
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 5f93c32a72..0e69c45754 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -54,7 +54,7 @@ enum {
 
 enum {
 	PROP_0,
-	PROP_STATE,
+	PROP_STATE
 };
 
 enum {
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 754607c376..47ecd4bb45 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -656,7 +656,7 @@ e_table_setup_header (ETable *e_table)
 
 	gtk_widget_show (GTK_WIDGET (e_table->header_canvas));
 
-	pointer = g_strdup_printf("%p", e_table);
+	pointer = g_strdup_printf("%p", (gpointer) e_table);
 
 	e_table->header_item = gnome_canvas_item_new (
 		gnome_canvas_root (e_table->header_canvas),
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index 4eef7a9ad6..2b903ca0bc 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -36,7 +36,7 @@ enum {
 	PROP_CURSOR_ROW,
 	PROP_CURSOR_COL,
 	PROP_MODEL,
-	PROP_ETTA,
+	PROP_ETTA
 };
 
 struct ETreeSelectionModelPriv {
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 08399609a0..c9637cf70e 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -704,7 +704,7 @@ e_tree_setup_header (ETree *e_tree)
 
 	gtk_widget_show (GTK_WIDGET (e_tree->priv->header_canvas));
 
-	pointer = g_strdup_printf("%p", e_tree);
+	pointer = g_strdup_printf("%p", (gpointer) e_tree);
 
 	e_tree->priv->header_item = gnome_canvas_item_new (
 		gnome_canvas_root (e_tree->priv->header_canvas),