Fix compiler warnings in the calendar directory (#439122).

svn path=/trunk/; revision=33625

6 files changed, 18 insertions, 14 deletions

diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 97f6c02fc3..803324b949 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -169,7 +169,7 @@ edit_clicked_cb (GtkButton *button, gpointer data)
 		return;
 	}
 
-	alarm = e_alarm_list_get_alarm (dialog->list_store, &iter);
+	alarm = (ECalComponentAlarm *)e_alarm_list_get_alarm (dialog->list_store, &iter);
 	path = gtk_tree_model_get_path (GTK_TREE_MODEL (dialog->list_store), &iter);
 
 	if (alarm_dialog_run (dialog->toplevel, dialog->ecal, alarm)) {
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 665f76d2c6..159a6b4578 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -326,7 +326,7 @@ alarms_selection_changed (ESourceSelector *selector, CalendarPrefsDialog *prefs)
 		for (sources = e_source_group_peek_sources (group); sources; sources = sources->next) {
 			source = E_SOURCE (sources->data);
 
-			alarm = e_source_get_property (source, "alarm");
+			alarm = (gchar *)e_source_get_property (source, "alarm");
 			if (alarm && !g_ascii_strcasecmp (alarm, "never"))
 				continue;
 				
@@ -341,7 +341,7 @@ alarms_selection_changed (ESourceSelector *selector, CalendarPrefsDialog *prefs)
 	for (l = selection; l; l = l->next) {
 		source = E_SOURCE (l->data);
 
-		alarm = e_source_get_property (source, "alarm");
+		alarm = (gchar *)e_source_get_property (source, "alarm");
 		if (alarm && !g_ascii_strcasecmp (alarm, "never"))
 			continue;
 
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index ab546ca2a4..e186156163 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -83,7 +83,7 @@ eccp_commit (EConfig *ec, GSList *items, void *data)
 	if (sdialog->original_source) {
 		const gchar *color_spec;
 
-		xml = xmlNewNode (NULL, "dummy");
+		xml = xmlNewNode (NULL, (const unsigned char *)"dummy");
 		e_source_dump_to_xml_node (sdialog->source, xml);
 		e_source_update_from_xml_node (sdialog->original_source, xml->children, NULL);
 		xmlFreeNode (xml);
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index fe27aa1e9d..c20791eb3f 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -257,7 +257,7 @@ drop_action(CompEditor *editor, GdkDragContext *context, guint32 action, GtkSele
 		d(printf ("dropping a message/rfc822\n"));
 		/* write the message(s) out to a CamelStream so we can use it */
 		stream = camel_stream_mem_new ();
-		camel_stream_write (stream, selection->data, selection->length);
+		camel_stream_write (stream, (char *)selection->data, selection->length);
 		camel_stream_reset (stream);
 		
 		msg = camel_mime_message_new ();
@@ -273,7 +273,7 @@ drop_action(CompEditor *editor, GdkDragContext *context, guint32 action, GtkSele
 	case DND_TYPE_TEXT_URI_LIST:
 	case DND_TYPE_NETSCAPE_URL:
 		d(printf ("dropping a text/uri-list\n"));
-		tmp = g_strndup (selection->data, selection->length);
+		tmp = g_strndup ((char *)selection->data, selection->length);
 		urls = g_strsplit (tmp, "\n", 0);
 		g_free (tmp);
 		
@@ -319,7 +319,7 @@ drop_action(CompEditor *editor, GdkDragContext *context, guint32 action, GtkSele
 		d(printf ("dropping a %s\n", content_type));
 		
 		mime_part = camel_mime_part_new ();
-		camel_mime_part_set_content (mime_part, selection->data, selection->length, content_type);
+		camel_mime_part_set_content (mime_part, (char *)selection->data, selection->length, content_type);
 		camel_mime_part_set_disposition (mime_part, "inline");
 		
 		e_attachment_bar_attach_mime_part
@@ -341,8 +341,8 @@ drop_action(CompEditor *editor, GdkDragContext *context, guint32 action, GtkSele
 
 		uids = g_ptr_array_new();
 
-		inptr = selection->data;
-		inend = selection->data + selection->length;
+		inptr = (char *)selection->data;
+		inend = (char *)(selection->data + selection->length);
 		while (inptr < inend) {
 			char *start = inptr;
 
@@ -356,7 +356,7 @@ drop_action(CompEditor *editor, GdkDragContext *context, guint32 action, GtkSele
 		}
 
 		if (uids->len > 0) {
-			folder = mail_tool_uri_to_folder(selection->data, 0, &ex);
+			folder = mail_tool_uri_to_folder((char *)selection->data, 0, &ex);
 			if (folder) {
 				if (uids->len == 1) {
 					msg = camel_folder_get_message(folder, uids->pdata[0], &ex);
@@ -419,7 +419,7 @@ drop_action(CompEditor *editor, GdkDragContext *context, guint32 action, GtkSele
 				camel_object_unref(folder);
 			} else {
 				e_error_run((GtkWindow *)editor, "mail-editor:attach-nomessages",
-					    selection->data, camel_exception_get_description(&ex), NULL);
+					    (char *)selection->data, camel_exception_get_description(&ex), NULL);
 			}
 
 			camel_exception_clear(&ex);
@@ -2771,7 +2771,7 @@ comp_editor_get_mime_attach_list (CompEditor *editor)
 		camel_data_wrapper_decode_to_stream (wrapper, (CamelStream *) mstream);
 		buffer = g_memdup (mstream->buffer->data, mstream->buffer->len);
 		
-		cal_mime_attach->encoded_data = buffer;
+		cal_mime_attach->encoded_data = (char *)buffer;
 		cal_mime_attach->length = mstream->buffer->len;
 		cal_mime_attach->filename = g_strdup (camel_mime_part_get_filename
 			((CamelMimePart *) l->data));
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 127c741210..5ce9c90cb5 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -1783,13 +1783,15 @@ remove_clicked_cb (GtkButton *btn, EventPage *epage)
 	GList *paths = NULL, *tmp;
 	GtkTreeIter iter;
 	GtkTreePath *path = NULL;
+	GtkTreeModel *model = NULL;
 	gboolean valid_iter;
 	char *address;
 	
 	priv = epage->priv;
 
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->list_view));
-	if (!(paths = gtk_tree_selection_get_selected_rows (selection, (GtkTreeModel **) &(priv->model)))) {
+	model = GTK_TREE_MODEL (priv->model);
+	if (!(paths = gtk_tree_selection_get_selected_rows (selection, &model ))) {
 		g_warning ("Could not get a selection to delete.");
 		return;
 	}
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 1a7352aab5..43a9b793eb 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1081,13 +1081,15 @@ remove_clicked_cb (GtkButton *btn, TaskPage *page)
 	GList *paths = NULL, *tmp;
 	GtkTreeIter iter;
 	GtkTreePath *path = NULL;
+	GtkTreeModel *model = NULL;
 	gboolean valid_iter;
 	char *address;
 	
 	priv = page->priv;
 
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->list_view));
-	if (!(paths = gtk_tree_selection_get_selected_rows (selection, (GtkTreeModel **) &(priv->model)))) {
+	model = GTK_TREE_MODEL (priv->model);
+	if (!(paths = gtk_tree_selection_get_selected_rows (selection, &model))) {
 		g_warning ("Could not get a selection to delete.");
 		return;
 	}