Fixes #332101

svn path=/trunk/; revision=32902

6 files changed, 8 insertions, 9 deletions

diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c
index 79e4a75a77..3c101f860c 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.c
+++ b/calendar/gui/dialogs/cal-attachment-select-file.c
@@ -82,7 +82,7 @@ run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *sho
 							 NULL);
 	
 	gtk_dialog_set_default_response (GTK_DIALOG (selection), GTK_RESPONSE_OK);
-	gtk_file_chooser_set_local_only (selection, FALSE);
+	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (selection), FALSE);
 	
 	if ((flags & SELECTOR_MODE_SAVE) == 0)
 		gtk_file_chooser_set_select_multiple ((GtkFileChooser *) selection, (flags & SELECTOR_MODE_MULTI));
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 9bd5021049..85af6bd892 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2378,7 +2378,7 @@ fill_widgets (CompEditor *editor)
 		GSList *attachment_list = NULL;
 		e_cal_component_get_attachment_list (priv->comp, &attachment_list);
 		set_attachment_list (editor, attachment_list);
-		g_slist_foreach (attachment_list, g_free, NULL);
+		g_slist_foreach (attachment_list, (GFunc)g_free, NULL);
 		g_slist_free (attachment_list);
 	}	
 
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index 113849b81c..c11cb29624 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -201,7 +201,7 @@ prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *pare
 	gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
 	
 	gtk_box_set_spacing ((GtkBox *) (GTK_DIALOG (dialog)->vbox), 12);
-	vbox = GTK_CONTAINER (GTK_DIALOG (dialog)->vbox);
+	vbox = GTK_WIDGET (GTK_DIALOG (dialog)->vbox);
 
 	cb = gtk_check_button_new_with_mnemonic (_("_Delete this item from all other recipient's mailboxes?"));
 	gtk_container_add (GTK_CONTAINER (vbox), cb);
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 179ea27ac8..4d419b317d 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -2746,6 +2746,7 @@ alarm_store_changed_cb (EAlarmList *alarm_list_store, GtkTreePath *path, GtkTree
 	field_changed_cb (NULL, data);
 }
 
+#if 0
 static void
 alarm_custom_clicked_cb (GtkWidget *widget, gpointer data)
 {
@@ -2789,6 +2790,7 @@ alarm_custom_clicked_cb (GtkWidget *widget, gpointer data)
 
 	sensitize_widgets (epage);
 }
+#endif
 
 /* Hooks the widget signals */
 static gboolean
@@ -2799,7 +2801,7 @@ init_widgets (EventPage *epage)
 	icaltimezone *zone;
 	char *menu_label = NULL;
 	GtkTreeSelection *selection;
-	GtkWidget *w, *cus_label, *cus_item, *menu;
+	GtkWidget *w, *cus_item, *menu;
 	
 	priv = epage->priv;
 
diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c
index b6f70fbc5b..081d6aac96 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -244,9 +244,6 @@ memo_editor_set_e_cal (CompEditor *editor, ECal *client)
 static void
 memo_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
 {
-	CompEditorFlags flags = comp_editor_get_flags (editor);
-	ECal *client = comp_editor_get_e_cal (editor);
-	
 	if (COMP_EDITOR_CLASS (memo_editor_parent_class)->edit_comp)
 		COMP_EDITOR_CLASS (memo_editor_parent_class)->edit_comp (editor, comp);
 }
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 487bfcce02..655738894c 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -535,11 +535,11 @@ fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp)
 				continue;
 		
 			if (!str) {
-				str = g_string_new ("");
+				str = g_string_new (NULL);
 				g_string_prepend (str, attendee);
 				continue;
 			}
-			g_string_prepend (str, ";");
+			g_string_prepend_c (str, ';');
 			g_string_prepend (str, attendee);
 		}
 	}