Fix an unused variable

	* gui/alarm-notify/alarm-queue.c (on_dialog_obj_updated_cb): Fix
	an unused variable

	* gui/calendar-commands.c (purge_cmd): Fix warnings.

	* gui/calendar-config.h: s/confirm_expunge/confirm_purge/ to match
	the actual functions

	* gui/control-factory.c: add some missing #includes

	* gui/dialogs/delete-comp.c (delete_component_dialog): Fix a
	warning

	* gui/e-itip-control.c (write_label_piece): Remove unused variable.

	* gui/print.c (print_calendar): Remove unused variable
	(print_comp): Likewise.

	* gui/tasks-control.c (confirm_purge): Fix warnings.
	(print_tasks): Remove unused variable.

svn path=/trunk/; revision=21905

8 files changed, 17 insertions, 11 deletions

diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index c973901bd3..8aed099252 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -660,7 +660,9 @@ struct notify_dialog_closure {
 static void
 on_dialog_obj_updated_cb (CalClient *client, const char *uid, gpointer data)
 {
+/* commented out so gcc won't complain about the unused variable
 	struct notify_dialog_closure *c = data;
+*/
 }
 
 static void
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 8f2aba9988..d756f52cff 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -35,6 +35,7 @@
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtkfilesel.h>
+#include <gtk/gtklabel.h>
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkspinbutton.h>
@@ -344,7 +345,7 @@ static void
 purge_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
 {
 	GnomeCalendar *gcal;
-	GtkWidget *dialog, *parent, *box, *label, *spin, *unit;
+	GtkWidget *dialog, *parent, *box, *label, *spin;
 	int response;
 
 	gcal = GNOME_CALENDAR (data);
@@ -352,7 +353,7 @@ purge_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
 	/* create the dialog */
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (gcal));
 	dialog = gtk_message_dialog_new (
-		parent,
+		(GtkWindow *)parent,
 		GTK_DIALOG_DESTROY_WITH_PARENT,
 		GTK_MESSAGE_WARNING,
 		GTK_BUTTONS_OK_CANCEL,
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index ad6ec1869b..48f2e4f2e0 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -155,8 +155,8 @@ char*	  calendar_config_get_hide_completed_tasks_sexp (void);
 gboolean  calendar_config_get_confirm_delete (void);
 void      calendar_config_set_confirm_delete (gboolean confirm);
 
-gboolean  calendar_config_get_confirm_expunge (void);
-void      calendar_config_set_confirm_expunge (gboolean confirm);
+gboolean  calendar_config_get_confirm_purge (void);
+void      calendar_config_set_confirm_purge (gboolean confirm);
 
 /* Default reminder options */
 gboolean calendar_config_get_use_default_reminder (void);
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
index 413077de14..8a6f6faf11 100644
--- a/calendar/gui/control-factory.c
+++ b/calendar/gui/control-factory.c
@@ -21,6 +21,7 @@
  */
 
 #include <config.h>
+#include <string.h>
 #include <gtk/gtksignal.h>
 #include <glade/glade.h>
 #include <bonobo/bonobo-control.h>
@@ -29,10 +30,12 @@
 #include <bonobo/bonobo-context.h>
 #include <bonobo/bonobo-property-bag.h>
 #include <glade/glade.h>
+#include <libgnomeui/gnome-dialog-util.h>
 
 #include <cal-util/timeutil.h>
 #include <gui/gnome-cal.h>
 #include <gui/calendar-commands.h>
+#include <gui/calendar-config.h>
 
 #include "control-factory.h"
 
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index b222bc7285..b29c6305ce 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -150,7 +150,7 @@ delete_component_dialog (CalComponent *comp,
 		}
 	}
 
-	dialog = gtk_message_dialog_new (gtk_widget_get_toplevel (widget),
+	dialog = gtk_message_dialog_new ((GtkWindow *)gtk_widget_get_toplevel (widget),
 					 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", str);
 	g_free (str);
 	ret = gtk_dialog_run ((GtkDialog *)dialog) == GTK_RESPONSE_YES;
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 7ecd6f85a7..2e1ff4cb67 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -602,7 +602,7 @@ write_label_piece (EItipControl *itip, CalComponentDateTime *dt,
 {
 	EItipControlPrivate *priv;
 	struct tm tmp_tm;
-	char time_buf[64], *time_utf8;
+	char time_buf[64];
 	icaltimezone *zone = NULL;
 	char *display_name;
 
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index e61e8465e2..aaf12f548a 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -2417,7 +2417,7 @@ print_calendar (GnomeCalendar *gcal, gboolean preview, time_t date,
 	GnomePrintJob *gpm;
 	GnomePrintContext *pc;
 	int copies, collate;
-	double l, r, t, b, temp_d;
+	double l, r, t, b;
 	gchar *old_orientation;
 
 	g_return_if_fail (gcal != NULL);
@@ -2533,7 +2533,7 @@ print_comp (CalComponent *comp, CalClient *client, gboolean preview)
 	GnomePrintJob *gpm;
 	GnomePrintContext *pc;
 	int copies, collate;
-	double l, r, t, b, temp_d;
+	double l, r, t, b;
 
 	g_return_if_fail (comp != NULL);
 	g_return_if_fail (IS_CAL_COMPONENT (comp));
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 7430adf61c..5ed9faa0d6 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -433,7 +433,7 @@ tasks_control_complete_cmd		(BonoboUIComponent	*uic,
 static gboolean
 confirm_purge (ETasks *tasks)
 {
-	GtkWidget *dialog, *label, *checkbox, *parent;
+	GtkWidget *dialog, *checkbox, *parent;
 	int button;
 	
 	if (!calendar_config_get_confirm_purge ())
@@ -441,7 +441,7 @@ confirm_purge (ETasks *tasks)
 
 	parent = gtk_widget_get_toplevel (GTK_WIDGET (tasks));
 	dialog = gtk_message_dialog_new (
-		parent,
+		(GtkWindow *)parent,
 		GTK_DIALOG_DESTROY_WITH_PARENT,
 		GTK_MESSAGE_WARNING,
 		GTK_BUTTONS_YES_NO,
@@ -506,7 +506,7 @@ print_tasks (ETasks *tasks, gboolean preview)
 	ETable *etable;
 	GnomePrintContext *pc;
 	GnomePrintJob *gpm;
-	double l, r, t, b, page_width, page_height, left_margin, bottom_margin, temp_d;
+	double l, r, t, b, page_width, page_height, left_margin, bottom_margin;
 
 	if (!print_config)
 		print_config = gnome_print_config_default ();