Fix several types of pedantic compiler warnings.

21 files changed, 28 insertions, 28 deletions

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"