6 files changed, 10 insertions, 12 deletions
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index ad53c71668..90f3e72e2b 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -29,6 +29,7 @@
 #endif
 
 #include <string.h>
+#include <glib/gi18n.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkdialog.h>
@@ -40,7 +41,7 @@
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktextview.h>
 #include <gtk/gtktogglebutton.h>
-#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-file-entry.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-exception.h>
 #include <bonobo/bonobo-widget.h>
@@ -365,7 +366,7 @@ alarm_to_dalarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm )
 
 	if (description.value) {
 		e_dialog_toggle_set (dialog->dalarm_message, TRUE);
-		text_buffer = gtk_text_view_get_buffer (dialog->dalarm_description);
+		text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (dialog->dalarm_description));
 		gtk_text_buffer_set_text (text_buffer, description.value, -1);
 	}
 }
@@ -654,7 +655,7 @@ populate_widgets_from_alarm (Dialog *dialog)
 
 	/* Alarm options */
 	e_dialog_option_menu_set (dialog->action, *action, action_map);
-	action_selection_done_cb (dialog->action, dialog);
+	action_selection_done_cb (GTK_MENU_SHELL (dialog->action), dialog);
 
 	switch (*action) {
 	case E_CAL_COMPONENT_ALARM_AUDIO:
@@ -1078,7 +1079,7 @@ action_selection_done_cb (GtkMenuShell *menu_shell, gpointer data)
 	case E_CAL_COMPONENT_ALARM_AUDIO:
 		dir = calendar_config_get_dir_path ();
 		if ( dir && *dir )
-			gnome_file_entry_set_default_path (dialog->aalarm_file_entry, dir);
+			gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (dialog->aalarm_file_entry), dir);
 		check_custom_sound (dialog);
 		break;
 
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index ccdca7573e..15831d8ed9 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -308,8 +308,6 @@ GtkWidget *
 alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store)
 {
 	Dialog *dialog;
-	int response_id;
-	GList *icon_list;
 	char *gladefile;
 	
 	dialog = (Dialog *)g_new (Dialog, 1);
@@ -339,8 +337,8 @@ alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store)
 	g_object_unref (dialog->xml);
 
 	/* Free the other stuff when the parent really gets destroyed. */
-	g_object_set_data_full (dialog->box, "toplevel", dialog->toplevel, gtk_widget_destroy);
-	g_object_set_data_full (dialog->box, "dialog", dialog, g_free);
+	g_object_set_data_full (G_OBJECT (dialog->box), "toplevel", dialog->toplevel, (GDestroyNotify) gtk_widget_destroy);
+	g_object_set_data_full (G_OBJECT (dialog->box), "dialog", dialog, g_free);
 
 	return dialog->box;
 }
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 6e1aa165d3..bd22a5f21e 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -486,7 +486,7 @@ show_alarms_config (CalendarPrefsDialog *prefs)
 	atk_object_set_name (gtk_widget_get_accessible (prefs->alarm_list_widget), _("Selected Calendars for Alarms"));
 	gtk_container_add (GTK_CONTAINER (prefs->scrolled_window), prefs->alarm_list_widget);
 	gtk_widget_show (prefs->alarm_list_widget);
-	initialize_selection (prefs->alarm_list_widget, prefs->alarms_list);
+	initialize_selection (E_SOURCE_SELECTOR (prefs->alarm_list_widget), prefs->alarms_list);
 }
 
 /* Shows the current config settings in the dialog. */
diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c
index 56ad644801..b6f70fbc5b 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -266,7 +266,6 @@ memo_editor_finalize (GObject *object)
 {
 	MemoEditor *me;
 	MemoEditorPrivate *priv;
-	ECalComponent *comp;
 
 	g_return_if_fail (object != NULL);
 	g_return_if_fail (IS_MEMO_EDITOR (object));
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 1bd47883d5..38df8901d0 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -283,7 +283,7 @@ memo_page_set_classification (MemoPage *page, ECalComponentClassification class)
 static void
 sensitize_widgets (MemoPage *mpage)
 {
-	gboolean read_only, sens, sensitize;
+	gboolean read_only, sens = FALSE, sensitize;
 	MemoPagePrivate *priv;
 	
 	priv = mpage->priv;
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 581714dc00..130a113cd7 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -979,7 +979,7 @@ add_clicked_cb (GtkButton *btn, TaskPage *page)
 	e_meeting_list_view_edit (page->priv->list_view, attendee);
 }
 
-void edit_clicked_cb (GtkButton *btn, TaskPage *tpage)
+static void edit_clicked_cb (GtkButton *btn, TaskPage *tpage)
 {
 	TaskPagePrivate *priv;
 	GtkTreePath *path = NULL;