From 63e2099d75600e4f83849f38f5390074a91e26fc Mon Sep 17 00:00:00 2001
From: JP Rosevear <jpr@novell.com>
Date: Thu, 7 Oct 2004 20:39:11 +0000
Subject: guard config.h include, kill warning and remove useless include

2004-10-07  JP Rosevear  <jpr@novell.com>

	* gui/calendar-commands.c: guard config.h include, kill warning
	and remove useless include

svn path=/trunk/; revision=27500
---
 calendar/ChangeLog               | 5 +++++
 calendar/gui/calendar-commands.c | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 8497dbdb21..e87b28afe7 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-07  JP Rosevear  <jpr@novell.com>
+
+	* gui/calendar-commands.c: guard config.h include, kill warning
+	and remove useless include
+
 2004-10-06  Rodrigo Moya <rodrigo@novell.com>
 
 	Fixes #65932
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 0755ca6863..e3ebf3a6da 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -24,7 +24,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <pwd.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -48,7 +51,6 @@
 #include <libgnome/gnome-i18n.h>
 #include <bonobo/bonobo-ui-util.h>
 #include <bonobo/bonobo-exception.h>
-#include <gal/util/e-util.h>
 #include <libecal/e-cal-time-util.h>
 #include "shell/Evolution.h"
 #include "calendar-commands.h"
@@ -80,7 +82,7 @@ file_open_event_cb (BonoboUIComponent *uic, gpointer data, const char *path)
 
 	gcal = GNOME_CALENDAR (data);
 
-	e_calendar_view_open_event (gnome_calendar_get_current_view_widget (gcal));
+	e_calendar_view_open_event (E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (gcal)));
 }
 
 
-- 
cgit v1.2.3