#include <e-util/e-cursors.h>

2000-08-23  Federico Mena Quintero  <federico@helixcode.com>

	* gui/main.c: #include <e-util/e-cursors.h>

	* gui/e-day-view-time-item.c (e_day_view_time_item_draw):
	Initialize time_min_x1 and hour_r to keep gcc happy.

	* gui/e-day-view.c (e_day_view_update_event_label): Warning fix.
	(e_day_view_update_main_canvas_drag): Initialize start_row.

	* gui/e-week-view-event-item.c (e_week_view_event_item_draw):
	Initialize time_y_small_min, icon_x.

	* Makefile.am (SUBDIRS): Re-enable the gui directory.

	* gui/prop.c (prop_store_alarm_default_values): Temporarily #if 0
	out.

svn path=/trunk/; revision=4993

8 files changed, 38 insertions, 19 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 07a1f54aa6..bfb0b2e5bb 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,21 @@
+2000-08-23  Federico Mena Quintero  <federico@helixcode.com>
+
+	* gui/main.c: #include <e-util/e-cursors.h>
+
+	* gui/e-day-view-time-item.c (e_day_view_time_item_draw):
+	Initialize time_min_x1 and hour_r to keep gcc happy.
+
+	* gui/e-day-view.c (e_day_view_update_event_label): Warning fix.
+	(e_day_view_update_main_canvas_drag): Initialize start_row.
+
+	* gui/e-week-view-event-item.c (e_week_view_event_item_draw):
+	Initialize time_y_small_min, icon_x.
+
+	* Makefile.am (SUBDIRS): Re-enable the gui directory.
+
+	* gui/prop.c (prop_store_alarm_default_values): Temporarily #if 0
+	out.
+
 2000-08-23  JP Rosevear  <jpr@helixcode.com>
 
 	* gui/e-week-view.c (e_week_view_key_press): Set vtype of new
@@ -9,7 +27,7 @@
 2000-08-23  JP Rosevear  <jpr@helixcode.com>
 
 	* gui/e-day-view-time-item.c: Include gnome.h for gettext purposes
-	
+
 	* gui/gnome-cal.c: ditto
 
 	* gui/prop.c: #if out some alarm stuff
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index eabf812a90..00cd1f51b1 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -1,3 +1,2 @@
-#SUBDIRS = idl cal-util pcs cal-client
-#SUBDIRS = idl cal-util pcs cal-client gui conduits
 SUBDIRS = idl cal-util pcs cal-client gui
+#SUBDIRS = idl cal-util pcs cal-client gui conduits
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 105c85d31e..49720456f3 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -29,8 +29,6 @@
 
 #include <config.h>
 #include <gnome.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkradiomenuitem.h>
 #include "e-day-view-time-item.h"
 #include "../../e-util/e-gui-utils.h"
 
@@ -246,6 +244,9 @@ e_day_view_time_item_draw (GnomeCanvasItem *canvas_item,
 	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
 	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
 
+	time_min_x1 = 0;
+	hour_r = 0;
+
 	/* Step through each row, drawing the horizontal grid lines for each
 	   day column and the times. */
 	time_hour_x1 = E_DVTMI_TIME_GRID_X_PAD - x;
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index d8e52e683b..70463188b5 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1365,7 +1365,7 @@ e_day_view_update_event_label (EDayView *day_view,
 			       gint event_num)
 {
 	EDayViewEvent *event;
-	gchar *text;
+	char *text;
 	gboolean free_text = FALSE, editing_event = FALSE;
 	gint offset, start_minute, end_minute;
 	CalComponentText summary;
@@ -1378,7 +1378,7 @@ e_day_view_update_event_label (EDayView *day_view,
 		return;
 
 	cal_component_get_summary (event->comp, &summary);
-	text = summary.value ? summary.value : "";
+	text = summary.value ? (char *) summary.value : "";
 
 	if (day_view->editing_event_day == day
 	    && day_view->editing_event_num == event_num)
@@ -1397,6 +1397,7 @@ e_day_view_update_event_label (EDayView *day_view,
 					end_minute / 60,
 					end_minute % 60,
 					text);
+
 		free_text = TRUE;
 	}
 
@@ -5288,6 +5289,7 @@ e_day_view_update_main_canvas_drag (EDayView *day_view,
 	/* Calculate the event's position. If the event is in the same
 	   position we started in, we use the same columns. */
 	cols_in_row = 1;
+	start_row = 0;
 	start_col = 0;
 	num_columns = 1;
 	num_rows = 1;
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index f8812f6c33..6924dc705c 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -280,12 +280,17 @@ e_week_view_event_item_draw (GnomeCanvasItem  *canvas_item,
 	icon_y = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT + E_WEEK_VIEW_ICON_Y_PAD;
 	start_minute = event->start_minute;
 	end_minute = event->end_minute;
+	time_y_small_min = 0;
+	icon_x = 0;
+
 	time_y = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT
 		+ E_WEEK_VIEW_EVENT_TEXT_Y_PAD + font->ascent;
+
 	if (week_view->small_font)
 		time_y_small_min = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT
 			+ E_WEEK_VIEW_EVENT_TEXT_Y_PAD
 			+ week_view->small_font->ascent;
+
 	if (week_view->use_small_font && week_view->small_font)
 		time_width = week_view->digit_width * 2
 			+ week_view->small_digit_width * 2;
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 4713a394fe..2ef5ef7248 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -13,14 +13,9 @@
 #include <signal.h>
 #include <sys/wait.h>
 #include <fcntl.h>
-#include <gtk/gtkframe.h>
+#include <gnome.h>
 #include <widgets/e-paned/e-hpaned.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkscrolledwindow.h>
 #include <widgets/e-paned/e-vpaned.h>
-#include <libgnomeui/gnome-messagebox.h>
 #include <cal-util/timeutil.h>
 #include "dialogs/alarm-notify-dialog.h"
 #include "alarm.h"
@@ -459,8 +454,8 @@ mail_notification (char *mail_address, char *text, time_t app_time)
 		_exit (127);
 	}
 	command = g_strconcat ("To: ", mail_address, "\n",
-				  "Subject: ", _("Reminder of your appointment at "),
-				  ctime (&app_time), "\n\n", text, "\n", NULL);
+			       "Subject: ", _("Reminder of your appointment at "),
+			       ctime (&app_time), "\n\n", text, "\n", NULL);
 	write (p [1], command, strlen (command));
  	close (p [1]);
 	close (p [0]);
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index 6876fbd6b5..07d362df73 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -37,6 +37,7 @@
 #include <libgnorba/gnorba.h>
 #endif
 
+#include <e-util/e-cursors.h>
 #include <cal-util/timeutil.h>
 #include <gui/alarm.h>
 #include <gui/gnome-cal.h>
diff --git a/calendar/gui/prop.c b/calendar/gui/prop.c
index f08280b69d..cd89e19d58 100644
--- a/calendar/gui/prop.c
+++ b/calendar/gui/prop.c
@@ -864,12 +864,12 @@ create_alarm_page (void)
 		      FALSE, prop_changed);
 	*/
 }
+	
+#if 0
 
-#if 0	
 static void
 prop_store_alarm_default_values (CalendarAlarm* alarm)
 {
-#warning "FIX ME"
   //	ee_store_alarm (alarm, alarm->type);
 
 	switch (alarm->type) {
@@ -895,9 +895,7 @@ prop_store_alarm_default_values (CalendarAlarm* alarm)
 	gnome_config_pop_prefix ();
 	gnome_config_sync ();
 }
-#endif	
 
-#if 0
 static void
 prop_apply_alarms ()
 {