4 files changed, 17 insertions, 16 deletions
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
index 2125760eb0..63d33610f6 100644
--- a/calendar/cal-client/cal-client.c
+++ b/calendar/cal-client/cal-client.c
@@ -245,17 +245,17 @@ cal_loaded_cb (CalListener *listener,
 
 /* Handle the obj_added signal from the listener */
 static void
-obj_added_cb (CalListener *listener, Evolution_Calendar_CalObj calobj, gpointer data)
+obj_added_cb (CalListener *listener, const Evolution_Calendar_CalObjUID uid, gpointer data)
 {
 	CalClient *client;
 
 	client = CAL_CLIENT (data);
-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[OBJ_ADDED], calobj);
+	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[OBJ_ADDED], uid);
 }
 
 /* Handle the obj_removed signal from the listener */
 static void
-obj_removed_cb (CalListener *listener, Evolution_Calendar_CalObjUID uid, gpointer data)
+obj_removed_cb (CalListener *listener, const Evolution_Calendar_CalObjUID uid, gpointer data)
 {
 	CalClient *client;
 
@@ -265,12 +265,12 @@ obj_removed_cb (CalListener *listener, Evolution_Calendar_CalObjUID uid, gpointe
 
 /* Handle the obj_changed signal from the listener */
 static void
-obj_changed_cb (CalListener *listener, Evolution_Calendar_CalObj calobj, gpointer data)
+obj_changed_cb (CalListener *listener, const Evolution_Calendar_CalObjUID uid, gpointer data)
 {
 	CalClient *client;
 
 	client = CAL_CLIENT (data);
-	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[OBJ_CHANGED], calobj);
+	gtk_signal_emit (GTK_OBJECT (client), cal_client_signals[OBJ_CHANGED], uid);
 }
 
 
@@ -432,8 +432,9 @@ cal_client_load_calendar (CalClient *client, const char *str_uri)
  * 
  * Queries a calendar for a calendar object based on its unique identifier.
  * 
- * Return value: The string representation of the calendar object corresponding
- * to the specified @uid, or NULL if no such object was found.
+ * Return value: The string representation of a complete calendar wrapping the
+ * sought object, or NULL if no object had the specified UID.  A complete
+ * calendar is returned because you also need the timezone data.
  **/
 char *
 cal_client_get_object (CalClient *client, const char *uid)
diff --git a/calendar/cal-client/cal-client.h b/calendar/cal-client/cal-client.h
index b20a3c378c..2f9ae5e1f8 100644
--- a/calendar/cal-client/cal-client.h
+++ b/calendar/cal-client/cal-client.h
@@ -58,9 +58,9 @@ struct _CalClientClass {
 
 	void (* cal_loaded) (CalClient *client, CalClientLoadStatus status);
 
-	void (* obj_added) (CalClient *client, const char *str_obj);
+	void (* obj_added) (CalClient *client, const char *uid);
 	void (* obj_removed) (CalClient *client, const char *uid);
-	void (* obj_changed) (CalClient *client, const char *str_obj);
+	void (* obj_changed) (CalClient *client, const char *uid);
 };
 
 GtkType cal_client_get_type (void);
diff --git a/calendar/cal-client/cal-listener.c b/calendar/cal-client/cal-listener.c
index 62db9c287d..fee7e96024 100644
--- a/calendar/cal-client/cal-listener.c
+++ b/calendar/cal-client/cal-listener.c
@@ -269,14 +269,14 @@ Listener_cal_loaded (PortableServer_Servant servant,
 /* Listener::obj_added method */
 static void
 Listener_obj_added (PortableServer_Servant servant,
-		    Evolution_Calendar_CalObj calobj,
+		    Evolution_Calendar_CalObjUID uid,
 		    CORBA_Environment *ev)
 {
 	CalListener *listener;
 
 	listener = CAL_LISTENER (bonobo_object_from_servant (servant));
 	gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[OBJ_ADDED],
-			 calobj);
+			 uid);
 }
 
 /* Listener::obj_removed method */
@@ -295,14 +295,14 @@ Listener_obj_removed (PortableServer_Servant servant,
 /* Listener::obj_changed method */
 static void
 Listener_obj_changed (PortableServer_Servant servant,
-		      Evolution_Calendar_CalObj calobj,
+		      Evolution_Calendar_CalObjUID uid,
 		      CORBA_Environment *ev)
 {
 	CalListener *listener;
 
 	listener = CAL_LISTENER (bonobo_object_from_servant (servant));
 	gtk_signal_emit (GTK_OBJECT (listener), cal_listener_signals[OBJ_CHANGED],
-			 calobj);
+			 uid);
 }
 
 /**
diff --git a/calendar/cal-client/cal-listener.h b/calendar/cal-client/cal-listener.h
index bc112091f9..8988148f34 100644
--- a/calendar/cal-client/cal-listener.h
+++ b/calendar/cal-client/cal-listener.h
@@ -61,9 +61,9 @@ struct _CalListenerClass {
 	void (* cal_loaded) (CalListener *listener,
 			     CalListenerLoadStatus status,
 			     Evolution_Calendar_Cal cal);
-	void (* obj_added) (CalListener *listener, Evolution_Calendar_CalObj calobj);
-	void (* obj_removed) (CalListener *listener, Evolution_Calendar_CalObjUID uid);
-	void (* obj_changed) (CalListener *listener, Evolution_Calendar_CalObj calobj);
+	void (* obj_added) (CalListener *listener, const Evolution_Calendar_CalObjUID uid);
+	void (* obj_removed) (CalListener *listener, const Evolution_Calendar_CalObjUID uid);
+	void (* obj_changed) (CalListener *listener, const Evolution_Calendar_CalObjUID uid);
 };
 
 GtkType cal_listener_get_type (void);