aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog6
-rw-r--r--calendar/cal-util/cal-recur.c2
-rw-r--r--calendar/gui/dialogs/task-editor.c1
-rw-r--r--calendar/gui/e-day-view.c6
-rw-r--r--calendar/gui/e-week-view.c6
-rw-r--r--calendar/gui/event-editor.c4
-rw-r--r--calendar/gui/getdate.y7
-rw-r--r--calendar/gui/gncal-todo.c2
-rw-r--r--calendar/gui/gnome-cal.c5
9 files changed, 35 insertions, 4 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 4273145b40..26cf3c3465 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-08 Christopher James Lahey <clahey@helixcode.com>
+
+ * cal-util/cal-recur.c, gui/e-day-view.c, gui/e-week-view.c,
+ gui/event-editor.c, gui/getdate.y, gui/gncal-todo.c,
+ gui/gnome-cal.c, gui/dialogs/task-editor.c: Fixed some warnings.
+
2000-09-08 JP Rosevear <jpr@helixcode.com>
* conduits/calendar/Makefile.am: Tidy
diff --git a/calendar/cal-util/cal-recur.c b/calendar/cal-util/cal-recur.c
index 5cbabc50c7..fe8ec8d682 100644
--- a/calendar/cal-util/cal-recur.c
+++ b/calendar/cal-util/cal-recur.c
@@ -349,6 +349,8 @@ static void cal_obj_time_find_first_week (CalObjTime *cotime,
RecurData *recur_data);
static void cal_object_time_from_time (CalObjTime *cotime,
time_t t);
+static gint cal_obj_date_only_compare_func (const void *arg1,
+ const void *arg2);
CalRecurVTable cal_obj_yearly_vtable = {
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 6b79896e2e..743a575179 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -1253,6 +1253,7 @@ priority_index_to_value (TaskEditorPriority priority)
retval = 7;
break;
default:
+ retval = -1;
g_assert_not_reached ();
break;
}
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 61134ece2c..85bd8872be 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -1240,7 +1240,9 @@ obj_updated_cb (CalClient *client, const char *uid, gpointer data)
else
event = &g_array_index (day_view->events[day],
EDayViewEvent, event_num);
-#warning "FIX ME"
+#ifndef NO_WARNINGS
+#warning "FIXME"
+#endif
/* If we are editing an event which we have just created, we
will get an update_event callback from the server. But we
@@ -1347,6 +1349,7 @@ e_day_view_set_cal_client (EDayView *day_view,
}
+#ifndef NO_WARNINGS
static gboolean
e_day_view_update_event_cb (EDayView *day_view,
gint day,
@@ -1391,6 +1394,7 @@ e_day_view_update_event_cb (EDayView *day_view,
}
return TRUE;
}
+#endif
/* This calls a given function for each event instance that matches the given
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 81d723ac50..fbc3bfb731 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -866,7 +866,9 @@ obj_updated_cb (CalClient *client, const char *uid, gpointer data)
update the event fairly easily without changing the events arrays
or computing a new layout. */
if (e_week_view_find_event_from_uid (week_view, uid, &event_num)) {
-#warning "FIX ME"
+#ifndef NO_WARNINGS
+#warning "FIXME"
+#endif
event = &g_array_index (week_view->events, EWeekViewEvent,
event_num);
@@ -1312,6 +1314,7 @@ e_week_view_set_compress_weekend (EWeekView *week_view,
}
+#ifndef NO_WARNINGS
static gboolean
e_week_view_update_event_cb (EWeekView *week_view,
gint event_num,
@@ -1359,6 +1362,7 @@ e_week_view_update_event_cb (EWeekView *week_view,
return TRUE;
}
+#endif
/* This calls a given function for each event instance that matches the given
diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c
index bdb2bd6c85..53da36d4ca 100644
--- a/calendar/gui/event-editor.c
+++ b/calendar/gui/event-editor.c
@@ -747,7 +747,9 @@ fill_widgets (EventEditor *ee)
}
/* Recurrences */
+#ifndef NO_WARNINGS
#warning "FIX ME"
+#endif
/* Need to handle recurrence dates as well as recurrence rules */
/* Need to handle more than one rrule */
@@ -862,7 +864,9 @@ fill_widgets (EventEditor *ee)
}
/* Exceptions list */
+#ifndef NO_WARNINGS
#warning "FIX ME"
+#endif
/* Need to handle exception rules as well as dates */
cal_component_get_exdate_list (priv->comp, &list);
for (l = list; l; l = l->next) {
diff --git a/calendar/gui/getdate.y b/calendar/gui/getdate.y
index 6df71bddda..43917089d6 100644
--- a/calendar/gui/getdate.y
+++ b/calendar/gui/getdate.y
@@ -111,8 +111,8 @@ extern struct tm *localtime();
#define yylex getdate_yylex
#define yyerror getdate_yyerror
-static int yylex ();
-static int yyerror ();
+static int yylex (void);
+static int yyerror (char *s);
#define EPOCH 1970
#define HOUR(x) ((time_t)(x) * 60)
@@ -894,6 +894,9 @@ difftm (a, b)
}
time_t
+get_date(char *p, struct timeb *now);
+
+time_t
get_date(p, now)
char *p;
struct timeb *now;
diff --git a/calendar/gui/gncal-todo.c b/calendar/gui/gncal-todo.c
index 943dbd7f33..239517ff3b 100644
--- a/calendar/gui/gncal-todo.c
+++ b/calendar/gui/gncal-todo.c
@@ -225,7 +225,9 @@ gncal_todo_edit (CalClient *client, CalComponent *comp)
gtk_text_set_editable (GTK_TEXT (comment_text), TRUE);
gtk_text_set_word_wrap( GTK_TEXT(comment_text), TRUE);
gtk_text_freeze(GTK_TEXT(comment_text));
+#ifndef NO_WARNINGS
#warning "FIX ME"
+#endif
/* Need to handle multiple comments */
cal_component_get_comment_list (comp, &l);
if (l) {
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index aaea601a0c..2b1f14f1c6 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1039,6 +1039,7 @@ load_alarms (GnomeCalendar *gcal)
}
}
+#ifndef NO_WARNINGS
/* FIXME: rename this function */
static void
gnome_calendar_update_all (GnomeCalendar *gcal)
@@ -1050,6 +1051,7 @@ gnome_calendar_update_all (GnomeCalendar *gcal)
load_alarms (gcal);
gnome_calendar_tag_calendar (gcal, priv->date_navigator);
}
+#endif
/* Removes any queued alarms for the specified UID */
static void
@@ -1119,6 +1121,7 @@ cal_loaded_cb (CalClient *client, CalClientLoadStatus status, gpointer data)
priv = gcal->priv;
switch (priv->load_state) {
+ default:
/* FIXME */
}
}
@@ -1618,6 +1621,7 @@ gnome_calendar_get_selected_time_range (GnomeCalendar *gcal,
}
+#ifndef NO_WARNINGS
/* Callback used when an event editor finishes editing an object */
static void
released_event_object_cb (EventEditor *ee, const char *uid, gpointer data)
@@ -1639,6 +1643,7 @@ released_event_object_cb (EventEditor *ee, const char *uid, gpointer data)
g_hash_table_remove (priv->object_editor_hash, orig_uid);
g_free (orig_uid);
}
+#endif
/* Callback used when an event editor dialog is closed */
struct editor_closure