aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/cal-client/cal-client.c6
-rw-r--r--calendar/gui/e-calendar-table.c1
-rw-r--r--calendar/pcs/cal.c4
4 files changed, 11 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 22d351240d..d26b068db5 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-09 Christopher James Lahey <clahey@helixcode.com>
+
+ * cal-client/cal-client.c, gui/e-calendar-table.c, pcs/cal.c:
+ Fixed some warnings.
+
2000-08-08 Federico Mena Quintero <federico@helixcode.com>
* idl/evolution-calendar.idl (Cal): Added a get_objects_in_range()
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
index cb35bafc71..7ef9e5db6a 100644
--- a/calendar/cal-client/cal-client.c
+++ b/calendar/cal-client/cal-client.c
@@ -629,7 +629,7 @@ cal_client_get_object (CalClient *client, const char *uid, CalComponent **comp)
*comp = NULL;
CORBA_exception_init (&ev);
- calobj_str = Evolution_Calendar_Cal_get_object (priv->cal, uid, &ev);
+ calobj_str = Evolution_Calendar_Cal_get_object (priv->cal, (char *) uid, &ev);
if (ev._major == CORBA_USER_EXCEPTION
&& strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_NotFound) == 0)
@@ -1011,7 +1011,7 @@ cal_client_get_alarms_for_object (CalClient *client, const char *uid,
CORBA_exception_init (&ev);
- seq = Evolution_Calendar_Cal_get_alarms_for_object (priv->cal, uid, start, end, &ev);
+ seq = Evolution_Calendar_Cal_get_alarms_for_object (priv->cal, (char *) uid, start, end, &ev);
if (ev._major == CORBA_USER_EXCEPTION
&& strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_NotFound) == 0)
goto out;
@@ -1103,7 +1103,7 @@ cal_client_remove_object (CalClient *client, const char *uid)
retval = FALSE;
CORBA_exception_init (&ev);
- Evolution_Calendar_Cal_remove_object (priv->cal, uid, &ev);
+ Evolution_Calendar_Cal_remove_object (priv->cal, (char *) uid, &ev);
if (ev._major == CORBA_USER_EXCEPTION &&
strcmp (CORBA_exception_id (&ev), ex_Evolution_Calendar_Cal_NotFound) == 0)
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index c98b17f729..1a9e00de12 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -36,6 +36,7 @@
#include <e-table/e-cell-text.h>
#include "e-calendar-table.h"
#include "calendar-model.h"
+#include "gncal-todo.h"
/* Pixmaps. */
#include "task.xpm"
diff --git a/calendar/pcs/cal.c b/calendar/pcs/cal.c
index 5610267b9a..fdb7682e7c 100644
--- a/calendar/pcs/cal.c
+++ b/calendar/pcs/cal.c
@@ -720,7 +720,7 @@ cal_notify_update (Cal *cal, const char *uid)
g_return_if_fail (priv->listener != CORBA_OBJECT_NIL);
CORBA_exception_init (&ev);
- Evolution_Calendar_Listener_obj_updated (priv->listener, uid, &ev);
+ Evolution_Calendar_Listener_obj_updated (priv->listener, (char *) uid, &ev);
if (ev._major != CORBA_NO_EXCEPTION)
g_message ("cal_notify_update(): could not notify the listener "
@@ -751,7 +751,7 @@ cal_notify_remove (Cal *cal, const char *uid)
g_return_if_fail (priv->listener != CORBA_OBJECT_NIL);
CORBA_exception_init (&ev);
- Evolution_Calendar_Listener_obj_removed (priv->listener, uid, &ev);
+ Evolution_Calendar_Listener_obj_removed (priv->listener, (char *) uid, &ev);
if (ev._major != CORBA_NO_EXCEPTION)
g_message ("cal_notify_remove(): could not notify the listener "