aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog9
-rw-r--r--calendar/alarm.c6
-rw-r--r--calendar/calendar.c6
-rw-r--r--calendar/gncal-full-day.c6
-rw-r--r--calendar/gui/alarm-notify/alarm.c6
-rw-r--r--calendar/gui/alarm.c6
-rw-r--r--calendar/gui/calendar.c6
-rw-r--r--calendar/gui/gncal-full-day.c6
-rw-r--r--calendar/gui/main.c2
-rw-r--r--calendar/main.c2
10 files changed, 32 insertions, 23 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index f9d4353e64..ffa0f5107b 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,12 @@
+1998-08-03 Federico Mena Quintero <federico@nuclecu.unam.mx>
+
+ * main.c (about_calendar_cmd): Use an array of const strings to
+ keep gcc happy.
+
+ * alarm.c (alarm_compare_by_time): Use gconstpointer to keep gcc happy.
+ * calendar.c (calendar_object_compare_by_start): Likewise.
+ * gncal-full-day.c (child_compare_by_start): Likewise.
+
1998-07-07 Miguel de Icaza <miguel@nuclecu.unam.mx>
* main.c: Add support for --view flag.
diff --git a/calendar/alarm.c b/calendar/alarm.c
index 6573a1be3d..280d4125e3 100644
--- a/calendar/alarm.c
+++ b/calendar/alarm.c
@@ -61,10 +61,10 @@ alarm_ready (void *closure, int fd, GdkInputCondition cond)
}
static int
-alarm_compare_by_time (gpointer a, gpointer b)
+alarm_compare_by_time (gconstpointer a, gconstpointer b)
{
- AlarmRecord *ara = a;
- AlarmRecord *arb = b;
+ const AlarmRecord *ara = a;
+ const AlarmRecord *arb = b;
time_t diff;
diff = ara->activation_time - arb->activation_time;
diff --git a/calendar/calendar.c b/calendar/calendar.c
index c53d2f1566..a76d95758f 100644
--- a/calendar/calendar.c
+++ b/calendar/calendar.c
@@ -339,10 +339,10 @@ calendar_save (Calendar *cal, char *fname)
}
static gint
-calendar_object_compare_by_start (gpointer a, gpointer b)
+calendar_object_compare_by_start (gconstpointer a, gconstpointer b)
{
- CalendarObject *ca = a;
- CalendarObject *cb = b;
+ const CalendarObject *ca = a;
+ const CalendarObject *cb = b;
time_t diff;
diff = ca->ev_start - cb->ev_start;
diff --git a/calendar/gncal-full-day.c b/calendar/gncal-full-day.c
index ea4fc575da..64e5ec6ef4 100644
--- a/calendar/gncal-full-day.c
+++ b/calendar/gncal-full-day.c
@@ -2115,10 +2115,10 @@ gncal_full_day_foreach (GtkContainer *container, GtkCallback callback, gpointer
}
static gint
-child_compare_by_start (gpointer a, gpointer b)
+child_compare_by_start (gconstpointer a, gconstpointer b)
{
- Child *ca = a;
- Child *cb = b;
+ const Child *ca = a;
+ const Child *cb = b;
time_t diff;
diff = ca->start - cb->start;
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
index 6573a1be3d..280d4125e3 100644
--- a/calendar/gui/alarm-notify/alarm.c
+++ b/calendar/gui/alarm-notify/alarm.c
@@ -61,10 +61,10 @@ alarm_ready (void *closure, int fd, GdkInputCondition cond)
}
static int
-alarm_compare_by_time (gpointer a, gpointer b)
+alarm_compare_by_time (gconstpointer a, gconstpointer b)
{
- AlarmRecord *ara = a;
- AlarmRecord *arb = b;
+ const AlarmRecord *ara = a;
+ const AlarmRecord *arb = b;
time_t diff;
diff = ara->activation_time - arb->activation_time;
diff --git a/calendar/gui/alarm.c b/calendar/gui/alarm.c
index 6573a1be3d..280d4125e3 100644
--- a/calendar/gui/alarm.c
+++ b/calendar/gui/alarm.c
@@ -61,10 +61,10 @@ alarm_ready (void *closure, int fd, GdkInputCondition cond)
}
static int
-alarm_compare_by_time (gpointer a, gpointer b)
+alarm_compare_by_time (gconstpointer a, gconstpointer b)
{
- AlarmRecord *ara = a;
- AlarmRecord *arb = b;
+ const AlarmRecord *ara = a;
+ const AlarmRecord *arb = b;
time_t diff;
diff = ara->activation_time - arb->activation_time;
diff --git a/calendar/gui/calendar.c b/calendar/gui/calendar.c
index c53d2f1566..a76d95758f 100644
--- a/calendar/gui/calendar.c
+++ b/calendar/gui/calendar.c
@@ -339,10 +339,10 @@ calendar_save (Calendar *cal, char *fname)
}
static gint
-calendar_object_compare_by_start (gpointer a, gpointer b)
+calendar_object_compare_by_start (gconstpointer a, gconstpointer b)
{
- CalendarObject *ca = a;
- CalendarObject *cb = b;
+ const CalendarObject *ca = a;
+ const CalendarObject *cb = b;
time_t diff;
diff = ca->ev_start - cb->ev_start;
diff --git a/calendar/gui/gncal-full-day.c b/calendar/gui/gncal-full-day.c
index ea4fc575da..64e5ec6ef4 100644
--- a/calendar/gui/gncal-full-day.c
+++ b/calendar/gui/gncal-full-day.c
@@ -2115,10 +2115,10 @@ gncal_full_day_foreach (GtkContainer *container, GtkCallback callback, gpointer
}
static gint
-child_compare_by_start (gpointer a, gpointer b)
+child_compare_by_start (gconstpointer a, gconstpointer b)
{
- Child *ca = a;
- Child *cb = b;
+ const Child *ca = a;
+ const Child *cb = b;
time_t diff;
diff = ca->start - cb->start;
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index 27042c3d2a..a769fa6df0 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -122,7 +122,7 @@ static void
about_calendar_cmd (GtkWidget *widget, void *data)
{
GtkWidget *about;
- gchar *authors[] = {
+ const gchar *authors[] = {
"Miguel de Icaza (miguel@kernel.org)",
"Federico Mena (quartic@gimp.org)",
"Arturo Espinosa (arturo@nuclecu.unam.mx)",
diff --git a/calendar/main.c b/calendar/main.c
index 27042c3d2a..a769fa6df0 100644
--- a/calendar/main.c
+++ b/calendar/main.c
@@ -122,7 +122,7 @@ static void
about_calendar_cmd (GtkWidget *widget, void *data)
{
GtkWidget *about;
- gchar *authors[] = {
+ const gchar *authors[] = {
"Miguel de Icaza (miguel@kernel.org)",
"Federico Mena (quartic@gimp.org)",
"Arturo Espinosa (arturo@nuclecu.unam.mx)",