[evolution-patches] Cleanups for evolution/calendar

[Kjartan Maraas <kmaraas broadpark no>]

This patch fixes a bunch of compiler warnings in evolution/calendar.

Cheers
Kjartan

? calendar.error
? conduits/memo/Makefile
? conduits/memo/Makefile.in
? gui/apps_evolution_calendar-2.6.schemas
? gui/apps_evolution_calendar-2.8.schemas
Index: gui/alarm-notify/alarm-notify.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-notify.c,v
retrieving revision 1.55
diff -u -p -r1.55 alarm-notify.c
--- gui/alarm-notify/alarm-notify.c	21 Apr 2006 19:38:16 -0000	1.55
+++ gui/alarm-notify/alarm-notify.c	16 Aug 2006 14:53:15 -0000
@@ -170,7 +170,7 @@ list_changed_cb (ESourceList *source_lis
 	g_hash_table_foreach (priv->uri_client_hash[source_type], (GHFunc) process_removal_in_hash, &prd);
 
 	for (l = prd.removals; l; l = l->next) {
-		d (printf("%s:%d (list_changed_cb) - Removing Calendar %s\n", __FILE__, __LINE__, l->data));		
+		d (printf("%p:%d (list_changed_cb) - Removing Calendar %s\n", __FILE__, __LINE__, l->data));		
 		alarm_notify_remove_calendar (an, source_type, l->data);
 	}
 	g_list_free (prd.removals);
Index: gui/alarm-notify/alarm-queue.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-queue.c,v
retrieving revision 1.103
diff -u -p -r1.103 alarm-queue.c
--- gui/alarm-notify/alarm-queue.c	14 Aug 2006 08:18:49 -0000	1.103
+++ gui/alarm-notify/alarm-queue.c	16 Aug 2006 14:53:15 -0000
@@ -1320,8 +1320,6 @@ open_alarm_dialog (TrayIconData *tray_da
 static gint
 tray_icon_clicked_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_data)
 {
-	TrayIconData *tray_data = user_data;
-
 	if (event->type == GDK_BUTTON_PRESS) {
 			d(printf("%s:%d (tray_icon_clicked_cb) - left click and %d alarms\n",__FILE__, __LINE__, g_list_length (tray_icons_list))); 		 
 		if (event->button == 1 && g_list_length (tray_icons_list) > 0) {
Index: gui/dialogs/alarm-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/alarm-dialog.c,v
retrieving revision 1.17
diff -u -p -r1.17 alarm-dialog.c
--- gui/dialogs/alarm-dialog.c	7 Jul 2006 04:45:27 -0000	1.17
+++ gui/dialogs/alarm-dialog.c	16 Aug 2006 14:53:15 -0000
@@ -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,
 
 	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 *dia
 
 	/* 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 *
 	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;
 
Index: gui/dialogs/alarm-list-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/alarm-list-dialog.c,v
retrieving revision 1.10
diff -u -p -r1.10 alarm-list-dialog.c
--- gui/dialogs/alarm-list-dialog.c	3 Mar 2006 12:58:48 -0000	1.10
+++ gui/dialogs/alarm-list-dialog.c	16 Aug 2006 14:53:15 -0000
@@ -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, EAla
 	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;
 }
Index: gui/dialogs/cal-prefs-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/cal-prefs-dialog.c,v
retrieving revision 1.56
diff -u -p -r1.56 cal-prefs-dialog.c
--- gui/dialogs/cal-prefs-dialog.c	10 Jul 2006 10:42:58 -0000	1.56
+++ gui/dialogs/cal-prefs-dialog.c	16 Aug 2006 14:53:15 -0000
@@ -486,7 +486,7 @@ show_alarms_config (CalendarPrefsDialog 
 	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. */
Index: gui/dialogs/memo-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/memo-editor.c,v
retrieving revision 1.6
diff -u -p -r1.6 memo-editor.c
--- gui/dialogs/memo-editor.c	10 Aug 2006 07:53:02 -0000	1.6
+++ gui/dialogs/memo-editor.c	16 Aug 2006 14:53:15 -0000
@@ -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));
Index: gui/dialogs/memo-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/memo-page.c,v
retrieving revision 1.9
diff -u -p -r1.9 memo-page.c
--- gui/dialogs/memo-page.c	10 Aug 2006 07:53:02 -0000	1.9
+++ gui/dialogs/memo-page.c	16 Aug 2006 14:53:15 -0000
@@ -283,7 +283,7 @@ memo_page_set_classification (MemoPage *
 static void
 sensitize_widgets (MemoPage *mpage)
 {
-	gboolean read_only, sens, sensitize;
+	gboolean read_only, sens = FALSE, sensitize;
 	MemoPagePrivate *priv;
 	
 	priv = mpage->priv;
Index: gui/dialogs/task-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/task-page.c,v
retrieving revision 1.88
diff -u -p -r1.88 task-page.c
--- gui/dialogs/task-page.c	31 Jul 2006 09:54:41 -0000	1.88
+++ gui/dialogs/task-page.c	16 Aug 2006 14:53:15 -0000
@@ -979,7 +979,7 @@ add_clicked_cb (GtkButton *btn, TaskPage
 	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;