diff options
109 files changed, 160 insertions, 187 deletions
diff --git a/a11y/addressbook/ea-minicard.c b/a11y/addressbook/ea-minicard.c index d0219e03b5..258fcbd4bc 100644 --- a/a11y/addressbook/ea-minicard.c +++ b/a11y/addressbook/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/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c index 16d50df9b0..e28d0f6b83 100644 --- a/a11y/e-table/gal-a11y-e-table-item.c +++ b/a11y/e-table/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/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c index 6340b999f4..c939b9cd27 100644 --- a/addressbook/conduit/address-conduit.c +++ b/addressbook/conduit/address-conduit.c @@ -207,7 +207,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, @@ -266,7 +266,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 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; 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 859b775607..e7be5554b8 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -1540,7 +1540,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/calendar-component.c b/calendar/gui/calendar-component.c index 4d30929272..078c854b98 100644 --- a/calendar/gui/calendar-component.c +++ b/calendar/gui/calendar-component.c @@ -73,7 +73,7 @@ #define CALENDAR_ERROR_TIME_OUT_KEY "/apps/evolution/calendar/display/error_timeout" enum DndTargetType { - DND_TARGET_TYPE_CALENDAR_LIST, + DND_TARGET_TYPE_CALENDAR_LIST }; #define CALENDAR_TYPE "text/calendar" #define XCALENDAR_TYPE "text/x-calendar" diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index dfc33fbbc4..cd54c65c08 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) @@ -1885,7 +1885,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 959c275443..86a39aad24 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 c3a8e34ba0..fc0c2330bf 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-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-event.h b/calendar/gui/e-cal-event.h index 4fbaa394ec..a77d2a147f 100644 --- a/calendar/gui/e-cal-event.h +++ b/calendar/gui/e-cal-event.h @@ -37,12 +37,12 @@ typedef struct _ECalEvent ECalEvent; typedef struct _ECalEventClass ECalEventClass; enum _e_cal_event_target_t { - E_CAL_EVENT_TARGET_COMPONENT, + E_CAL_EVENT_TARGET_COMPONENT }; /* Flags that describe TARGET_COMPONENT */ enum { - E_CAL_EVENT_COMPONENT_MIGRATION = 1 << 0, + E_CAL_EVENT_COMPONENT_MIGRATION = 1 << 0 }; typedef struct _ECalEventTargetComponent ECalEventTargetComponent; 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-table.c b/calendar/gui/e-calendar-table.c index ddf96d00f2..d032066f86 100644 --- a/calendar/gui/e-calendar-table.c +++ b/calendar/gui/e-calendar-table.c @@ -1882,7 +1882,7 @@ e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *mes cal_table->activity_id = 0; } } else if (cal_table->activity_id == 0) { - char *client_id = g_strdup_printf ("%p", cal_table); + char *client_id = g_strdup_printf ("%p", (gpointer) cal_table); cal_table->activity_id = e_activity_handler_operation_started ( cal_table->activity_handler, client_id, message, TRUE); diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index 6c8e1f83ab..a99149ae2e 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -85,7 +85,7 @@ extern ECompEditorRegistry *comp_editor_registry; /* 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? */ @@ -567,7 +567,7 @@ e_calendar_view_set_status_message (ECalendarView *cal_view, const gchar *messag priv->activity_id = 0; } } else if (priv->activity_id == 0) { - char *client_id = g_strdup_printf ("%p", cal_view); + char *client_id = g_strdup_printf ("%p", (gpointer) cal_view); priv->activity_id = e_activity_handler_operation_started ( priv->activity_handler, client_id, message, TRUE); 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/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c index 260103ada0..067a87bf29 100644 --- a/calendar/gui/e-memo-table.c +++ b/calendar/gui/e-memo-table.c @@ -1130,7 +1130,7 @@ e_memo_table_set_status_message (EMemoTable *memo_table, const gchar *message) memo_table->activity_id = 0; } } else if (memo_table->activity_id == 0) { - char *client_id = g_strdup_printf ("%p", memo_table); + char *client_id = g_strdup_printf ("%p", (gpointer) memo_table); memo_table->activity_id = e_activity_handler_operation_started ( memo_table->activity_handler, client_id, message, TRUE); diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c index 0e422d548d..66b6f6a2ec 100644 --- a/calendar/gui/memos-component.c +++ b/calendar/gui/memos-component.c @@ -59,7 +59,7 @@ #define CREATE_MEMO_LIST_ID "memo-list" enum DndTargetType { - DND_TARGET_TYPE_CALENDAR_LIST, + DND_TARGET_TYPE_CALENDAR_LIST }; #define CALENDAR_TYPE "text/calendar" #define XCALENDAR_TYPE "text/x-calendar" diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c index 9ed21d5186..25bf06bda1 100644 --- a/calendar/gui/tasks-component.c +++ b/calendar/gui/tasks-component.c @@ -58,7 +58,7 @@ #define CREATE_TASK_LIST_ID "task-list" enum DndTargetType { - DND_TARGET_TYPE_CALENDAR_LIST, + DND_TARGET_TYPE_CALENDAR_LIST }; #define CALENDAR_TYPE "text/calendar" #define XCALENDAR_TYPE "text/x-calendar" diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 3079e8ed57..32a2a40a9c 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1361,7 +1361,7 @@ msg_composer_subject_changed_cb (EMsgComposer *composer) enum { UPDATE_AUTO_CC, - UPDATE_AUTO_BCC, + UPDATE_AUTO_BCC }; static void 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/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/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 0425645abe..2336f3c798 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -2047,7 +2047,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 58e42a5834..7a3e690e2b 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -181,7 +181,7 @@ enum { static guint folder_browser_signals [LAST_SIGNAL] = {0, }; enum { - ESB_SAVE, + ESB_SAVE }; static ESearchBarItem emfb_search_items[] = { @@ -1363,7 +1363,7 @@ emfb_list_key_press(ETree *tree, int row, ETreePath path, int col, GdkEvent *ev, } if (!folder_choose && !emfb->view.preview->caret_mode && mail_config_get_enable_magic_spacebar ()) { - //check for unread messages. if yes .. rewindback to the folder + /* check for unread messages. if yes .. rewindback to the folder */ EMFolderTree *emft = g_object_get_data((GObject*)emfb, "foldertree"); switch (ev->key.keyval) { case GDK_space: diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h index 06b1bc4520..7b011f588c 100644 --- a/mail/em-folder-selector.h +++ b/mail/em-folder-selector.h @@ -61,11 +61,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-tree-model.c b/mail/em-folder-tree-model.c index 8687b1cbd2..04e66e2c86 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -295,7 +295,7 @@ em_folder_tree_model_init (EMFolderTreeModel *model) model->account_hash = g_hash_table_new (g_direct_hash, g_direct_equal); model->account_changed_id = g_signal_connect (model->accounts, "account-changed", G_CALLBACK (account_changed), model); model->account_removed_id = g_signal_connect (model->accounts, "account-removed", G_CALLBACK (account_removed), model); - //g_signal_connect (model, "row-changed", G_CALLBACK (emft_model_unread_count_changed), NULL); + /* g_signal_connect (model, "row-changed", G_CALLBACK (emft_model_unread_count_changed), NULL); */ } static void diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 2fa04b5990..42037b5a33 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -2821,7 +2821,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 42ef20d296..4af4760cac 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-display.c b/mail/em-format-html-display.c index f20af59683..68a28ea7cd 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -182,7 +182,7 @@ enum { EFHD_LINK_CLICKED, EFHD_POPUP_EVENT, EFHD_ON_URL, - EFHD_LAST_SIGNAL, + EFHD_LAST_SIGNAL }; static guint efhd_signals[EFHD_LAST_SIGNAL] = { 0 }; @@ -606,11 +606,11 @@ em_format_html_get_search_dialog (EMFormatHTMLDisplay *efhd) g_signal_connect (G_OBJECT (p->search_entry), "changed", (GCallback) icon_entry_changed_cb, clear_button); gtk_box_pack_start ((GtkBox *)(p->search_entry_box), icon_entry, FALSE, FALSE, 0); -// gtk_box_pack_start ((GtkBox *)(p->search_entry_box), icon_entry, TRUE, TRUE, 0); + /* gtk_box_pack_start ((GtkBox *)(p->search_entry_box), icon_entry, TRUE, TRUE, 0); */ hbox2 = gtk_hbox_new (FALSE, 0); gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, FALSE, FALSE, 5); -// gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5); + /* gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5); */ button3 = gtk_button_new_with_mnemonic (_("_Previous")); gtk_button_set_image (GTK_BUTTON (button3), GTK_WIDGET(gtk_image_new_from_stock(GTK_STOCK_GO_BACK, GTK_ICON_SIZE_BUTTON))); diff --git a/mail/em-format-html.h b/mail/em-format-html.h index a34f7b6915..7cadd5e282 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-format.c b/mail/em-format.c index 89445ab35a..1d5570be96 100644 --- a/mail/em-format.c +++ b/mail/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 guint emf_signals[EMF_LAST_SIGNAL]; @@ -718,7 +718,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/mail/em-format.h b/mail/em-format.h index 004d9c2e96..92c6b3dddf 100644 --- a/mail/em-format.h +++ b/mail/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/mail/em-inline-filter.c b/mail/em-inline-filter.c index 07c7afa192..f671159369 100644 --- a/mail/em-inline-filter.c +++ b/mail/em-inline-filter.c @@ -102,7 +102,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 e489e16826..9784f480b8 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -60,7 +60,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[] = { @@ -190,7 +190,7 @@ enum { enum { JH_LIST_COLUMN_NAME, - JH_LIST_COLUMN_VALUE, + JH_LIST_COLUMN_VALUE }; static void label_sensitive_buttons (EMMailerPrefs *prefs) @@ -356,7 +356,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); @@ -842,18 +842,6 @@ custom_junk_button_toggled (GtkToggleButton *toggle, EMMailerPrefs *prefs) } -#if 0 -// not used at the moment, commenting out -static void -toggle_button_toggled_not (GtkToggleButton *toggle, EMMailerPrefs *prefs) -{ - const char *key; - - key = g_object_get_data ((GObject *) toggle, "key"); - gconf_client_set_bool (prefs->gconf, key, !gtk_toggle_button_get_active (toggle), NULL); -} -#endif - static void custom_font_changed (GtkToggleButton *toggle, EMMailerPrefs *prefs) { 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-migrate.c b/mail/em-migrate.c index 8338bf56dc..1c58b6ca99 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -1347,7 +1347,7 @@ nofile: enum { CP_UNIQUE = 0, CP_OVERWRITE, - CP_APPEND, + CP_APPEND }; static int open_flags[3] = { @@ -2936,7 +2936,7 @@ migrate_to_db() i++; e_iterator_next (iter); } - //camel_session_set_online ((CamelSession *) session, TRUE); + /* camel_session_set_online ((CamelSession *) session, TRUE); */ g_object_unref (iter); em_migrate_close_progress_dialog (); } 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 6e12a0456d..a777faaefe 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -366,7 +366,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 3aa088c890..c1215c61c4 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 5d26c13b3f..6388a56938 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 896ec73aec..6feadd5b9c 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -1657,9 +1657,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 68177535e2..e2c23db51a 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -126,7 +126,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 */ @@ -170,7 +170,7 @@ enum { NORMALISED_SUBJECT, NORMALISED_FROM, NORMALISED_TO, - NORMALISED_LAST, + NORMALISED_LAST }; /* #define SMART_ADDRESS_COMPARE */ @@ -4169,7 +4169,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 47be897fd2..15dae0fcb7 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -73,7 +73,7 @@ enum { /* Invisible columns */ COL_DELETED, COL_UNREAD, - COL_COLOUR, + COL_COLOUR }; #define MESSAGE_LIST_COLUMN_IS_ACTIVE(col) (col == COL_MESSAGE_STATUS || \ @@ -178,7 +178,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/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 fe1a73febb..85e275f2a0 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/shell/e-component-registry.h b/shell/e-component-registry.h index fa0de9c5c1..474dba871d 100644 --- a/shell/e-component-registry.h +++ b/shell/e-component-registry.h @@ -59,7 +59,7 @@ struct _EComponentRegistryClass { enum _EComponentRegistryField { ECR_FIELD_ID, ECR_FIELD_ALIAS, - ECR_FIELD_SCHEMA, + ECR_FIELD_SCHEMA }; struct _EComponentInfo { diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index 9d6905203b..548e987588 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -913,7 +913,7 @@ store_window_size (GtkWidget* widget) g_object_unref(client); E_SHELL_WINDOW (widget)->priv->store_window_size_timer = 0; - return FALSE; // remove this timeout + return FALSE; /* remove this timeout */ } static void diff --git a/shell/es-event.h b/shell/es-event.h index ca12eb22dd..ed248d11df 100644 --- a/shell/es-event.h +++ b/shell/es-event.h @@ -49,7 +49,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/shell/es-menu.h b/shell/es-menu.h index 7ea4df5576..89f60112c6 100644 --- a/shell/es-menu.h +++ b/shell/es-menu.h @@ -39,13 +39,13 @@ typedef struct _ESMenuClass ESMenuClass; /* Current target description */ /* Types of popup tagets */ enum _es_menu_target_t { - ES_MENU_TARGET_SHELL, + ES_MENU_TARGET_SHELL }; /* Flags that describe a TARGET_SHELL */ enum { ES_MENU_SHELL_ONLINE = 1<<0, - ES_MENU_SHELL_OFFLINE = 1<<1, + ES_MENU_SHELL_OFFLINE = 1<<1 }; typedef struct _ESMenuTargetShell ESMenuTargetShell; 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 cf3f758ce7..87652974cb 100644 --- a/widgets/misc/e-charset-picker.c +++ b/widgets/misc/e-charset-picker.c @@ -49,7 +49,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 a52756943c..ac5012b7d2 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -49,7 +49,7 @@ static ESearchBarClass *parent_class = NULL; enum { PROP_0, PROP_QUERY, - PROP_STATE, + PROP_STATE }; diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h index e1d4fc7def..be7e26c83b 100644 --- a/widgets/misc/e-filter-bar.h +++ b/widgets/misc/e-filter-bar.h @@ -98,7 +98,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/misc/e-search-bar.c b/widgets/misc/e-search-bar.c index 30cba7f074..9cf158021c 100644 --- a/widgets/misc/e-search-bar.c +++ b/widgets/misc/e-search-bar.c @@ -60,7 +60,7 @@ enum { PROP_0, PROP_ITEM_ID, PROP_SUBITEM_ID, - PROP_TEXT, + PROP_TEXT }; diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h index 1f7072d988..105777311c 100644 --- a/widgets/misc/e-search-bar.h +++ b/widgets/misc/e-search-bar.h @@ -49,7 +49,7 @@ G_BEGIN_DECLS enum _ESearchBarItemType { ESB_ITEMTYPE_NORMAL, ESB_ITEMTYPE_CHECK, - ESB_ITEMTYPE_RADIO, + ESB_ITEMTYPE_RADIO }; typedef enum _ESearchBarItemType ESearchBarItemType; diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c index b9a8544f57..f6cb11e509 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 5becaa30f2..510b5074f6 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 69a300d950..f8321011b2 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 0963229c94..2eba9d4a82 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), |