Fix several types of pedantic compiler warnings.

24 files changed, 40 insertions, 40 deletions

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);