From e4fa8fe10408c4c370e1e11e4bb2d7745f50aceb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 16 May 2009 12:11:55 -0400 Subject: Fix several types of pedantic compiler warnings. --- addressbook/gui/component/addressbook-config.h | 2 +- addressbook/gui/component/addressbook-view.c | 2 +- addressbook/gui/contact-list-editor/e-contact-list-editor.c | 2 +- addressbook/gui/widgets/e-addressbook-model.c | 2 +- addressbook/gui/widgets/e-addressbook-reflow-adapter.c | 2 +- addressbook/gui/widgets/e-addressbook-view.c | 4 ++-- addressbook/gui/widgets/e-addressbook-view.h | 2 +- addressbook/gui/widgets/eab-config.h | 2 +- addressbook/gui/widgets/eab-gui-util.h | 2 +- addressbook/gui/widgets/eab-menu.h | 4 ++-- addressbook/gui/widgets/eab-popup.h | 8 ++++---- 11 files changed, 16 insertions(+), 16 deletions(-) (limited to 'addressbook/gui') diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h index 04b44cd872..6ea33f1656 100644 --- a/addressbook/gui/component/addressbook-config.h +++ b/addressbook/gui/component/addressbook-config.h @@ -29,7 +29,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/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c index 53560e87d9..2f77fc4e50 100644 --- a/addressbook/gui/component/addressbook-view.c +++ b/addressbook/gui/component/addressbook-view.c @@ -479,7 +479,7 @@ set_status_message (EABView *eav, const char *message, AddressbookView *view) priv->activity_id = 0; } } else if (priv->activity_id == 0) { - char *clientid = g_strdup_printf ("%p", view); + char *clientid = g_strdup_printf ("%p", (gpointer) view); priv->activity_id = e_activity_handler_operation_started ( activity_handler, clientid, message, TRUE); 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 8fec8b315d..80fb7514a1 100644 --- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c +++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c @@ -126,7 +126,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/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 7273689fd1..73518fc0b2 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -47,7 +47,7 @@ enum { PROP_0, PROP_BOOK, PROP_QUERY, - PROP_EDITABLE, + PROP_EDITABLE }; enum { diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 1f2b1aad7a..d2c20722ef 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -50,7 +50,7 @@ enum { PROP_BOOK, PROP_QUERY, PROP_EDITABLE, - PROP_MODEL, + PROP_MODEL }; enum { diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 3c0c28f6ad..9fdb15eac9 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -111,7 +111,7 @@ enum { PROP_BOOK, PROP_SOURCE, PROP_QUERY, - PROP_TYPE, + PROP_TYPE }; enum { @@ -149,7 +149,7 @@ static GalViewCollection *collection = NULL; enum { ESB_FULL_NAME, ESB_EMAIL, - ESB_ANY, + ESB_ANY }; #if 0 diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index c9ac35d2fa..799e01a792 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -55,7 +55,7 @@ struct _EABMenuTargetSelect; typedef enum { EAB_VIEW_NONE, /* initialized to this */ EAB_VIEW_MINICARD, - EAB_VIEW_TABLE, + EAB_VIEW_TABLE } EABViewType; 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/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h index 79dbe5493a..4cab9b36b0 100644 --- a/addressbook/gui/widgets/eab-gui-util.h +++ b/addressbook/gui/widgets/eab-gui-util.h @@ -66,7 +66,7 @@ void eab_contact_list_save (char *title, typedef enum { EAB_DISPOSITION_AS_ATTACHMENT, - EAB_DISPOSITION_AS_TO, + EAB_DISPOSITION_AS_TO } EABDisposition; void eab_send_contact (EContact *contact, diff --git a/addressbook/gui/widgets/eab-menu.h b/addressbook/gui/widgets/eab-menu.h index 7da05c133b..380346651b 100644 --- a/addressbook/gui/widgets/eab-menu.h +++ b/addressbook/gui/widgets/eab-menu.h @@ -40,7 +40,7 @@ typedef struct _EABMenuClass EABMenuClass; /* Current target description */ enum _eab_menu_target_t { - EAB_MENU_TARGET_SELECT, + EAB_MENU_TARGET_SELECT }; /** @@ -57,7 +57,7 @@ enum _eab_menu_target_select_t { EAB_MENU_SELECT_MANY = 1<<1, EAB_MENU_SELECT_ANY = 1<<2, EAB_MENU_SELECT_EDITABLE = 1<<3, - EAB_MENU_SELECT_EMAIL = 1<<4, + EAB_MENU_SELECT_EMAIL = 1<<4 }; typedef struct _EABMenuTargetSelect EABMenuTargetSelect; diff --git a/addressbook/gui/widgets/eab-popup.h b/addressbook/gui/widgets/eab-popup.h index 933c815af8..b86cc12a99 100644 --- a/addressbook/gui/widgets/eab-popup.h +++ b/addressbook/gui/widgets/eab-popup.h @@ -50,7 +50,7 @@ enum _eab_popup_target_t { EAB_POPUP_TARGET_SELECT, EAB_POPUP_TARGET_URI, EAB_POPUP_TARGET_SOURCE, - EAB_POPUP_TARGET_SELECT_NAMES, + EAB_POPUP_TARGET_SELECT_NAMES }; /** @@ -69,13 +69,13 @@ enum _eab_popup_target_select_t { EAB_POPUP_SELECT_EDITABLE = 1<<3, EAB_POPUP_SELECT_EMAIL = 1<<4, EAB_POPUP_LIST = 1<<5, - EAB_POPUP_CONTACT = 1<<6, + EAB_POPUP_CONTACT = 1<<6 }; enum _eab_popup_target_uri_t { EAB_POPUP_URI_HTTP = 1<<0, EAB_POPUP_URI_MAILTO = 1<<1, - EAB_POPUP_URI_NOT_MAILTO = 1<<2, + EAB_POPUP_URI_NOT_MAILTO = 1<<2 }; /** * enum _eab_popup_target_source_t - EABPopupTargetSource qualifiers. @@ -87,7 +87,7 @@ enum _eab_popup_target_uri_t { enum _eab_popup_target_source_t { EAB_POPUP_SOURCE_PRIMARY = 1<<0, EAB_POPUP_SOURCE_SYSTEM = 1<<1, /* system folder */ - EAB_POPUP_SOURCE_USER = 1<<2, /* user folder (!system) */ + EAB_POPUP_SOURCE_USER = 1<<2 /* user folder (!system) */ }; typedef struct _EABPopupTargetSelect EABPopupTargetSelect; -- cgit