aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog10
-rw-r--r--calendar/cal-client/cal-client.c5
-rw-r--r--calendar/cal-client/cal-query.c3
-rw-r--r--calendar/cal-client/client-test.c10
4 files changed, 20 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 054b8d0a2e..2d3a3f061e 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-13 Federico Mena Quintero <federico@ximian.com>
+
+ * cal-client/cal-query.c: #include <string.h>
+ (obj_removed_cb): Fixed prototype.
+
+ * cal-client/cal-client.c (get_objects_atomically): Fix use of
+ g_signal_handler_disconnect().
+
+ * cal-client/client-test.c (create_client): Add G_CALLBACK casts.
+
2002-11-12 Federico Mena Quintero <federico@ximian.com>
* pcs/cal-backend-util.c: #include <string.h>
diff --git a/calendar/cal-client/cal-client.c b/calendar/cal-client/cal-client.c
index b1c36653fe..bde9e6f375 100644
--- a/calendar/cal-client/cal-client.c
+++ b/calendar/cal-client/cal-client.c
@@ -22,6 +22,7 @@
#include <config.h>
#endif
+#include <string.h>
#include <bonobo-activation/bonobo-activation.h>
#include <bonobo/bonobo-exception.h>
#include <libgnome/gnome-util.h>
@@ -1838,8 +1839,8 @@ get_objects_atomically (CalClient *client, CalObjType type, time_t start, time_t
* notification signals and generate the final list of components.
*/
- g_signal_handlers_disconnect_by_func (G_OBJECT (client), obj_updated_id, client);
- g_signal_handlers_disconnect_by_func (G_OBJECT (client), obj_removed_id, client);
+ g_signal_handler_disconnect (client, obj_updated_id);
+ g_signal_handler_disconnect (client, obj_removed_id);
objects = NULL;
g_hash_table_foreach (uid_comp_hash, add_component, &objects);
diff --git a/calendar/cal-client/cal-query.c b/calendar/cal-client/cal-query.c
index 7f29952f04..52fba27ef3 100644
--- a/calendar/cal-client/cal-query.c
+++ b/calendar/cal-client/cal-query.c
@@ -22,6 +22,7 @@
#include <config.h>
#endif
+#include <string.h>
#include <bonobo/bonobo-exception.h>
#include "cal-util/cal-util-marshal.h"
#include "cal-query.h"
@@ -225,7 +226,7 @@ obj_updated_cb (QueryListener *ql,
/* Callback used when an object is removed from the query */
static void
obj_removed_cb (QueryListener *ql,
- const GNOME_Evolution_Calendar_CalObjUID uid,
+ const CORBA_char *uid,
gpointer data)
{
CalQuery *query;
diff --git a/calendar/cal-client/client-test.c b/calendar/cal-client/client-test.c
index 312fe1536b..f4cb06b8dd 100644
--- a/calendar/cal-client/client-test.c
+++ b/calendar/cal-client/client-test.c
@@ -187,14 +187,14 @@ create_client (CalClient **client, const char *uri, gboolean only_if_exists)
exit (1);
}
- g_signal_connect (G_OBJECT (*client), "destroy",
- client_destroy_cb,
+ g_signal_connect (*client, "destroy",
+ G_CALLBACK (client_destroy_cb),
NULL);
- g_signal_connect (G_OBJECT (*client), "cal_opened",
+ g_signal_connect (*client, "cal_opened",
G_CALLBACK (cal_opened_cb),
- NULL);
- g_signal_connect (G_OBJECT (*client), "obj_updated",
+ NULL);
+ g_signal_connect (*client, "obj_updated",
G_CALLBACK (obj_updated_cb),
NULL);