added new marshallers.

2002-11-04  Rodrigo Moya <rodrigo@ximian.com>

	* cal-util/cal-util-marshal.list: added new marshallers.

	* cal-client/cal-client.c (get_objects_atomically): fixed calls to
	g_signal_handler_disconnect_by_func.
	(cal_client_class_init): fixed typos.

	* cal-client/cal-client-multi.[ch]:
	* cal-client/cal-client-types.c:
	* cal-client/cal-query.[ch]: ported to GObject.

	* cal-client/cal-listener.[ch]: converted to BonoboObject.

	* cal-client/Makefile.am:
	* pcs/Makefile.am: fixed flags for orbit-idl

svn path=/trunk/; revision=18547

1 files changed, 8 insertions, 8 deletions

diff --git a/calendar/cal-client/cal-query.h b/calendar/cal-client/cal-query.h
index a8d7d2a514..b75836cd96 100644
--- a/calendar/cal-client/cal-query.h
+++ b/calendar/cal-client/cal-query.h
@@ -21,7 +21,7 @@
 #ifndef CAL_QUERY_H
 #define CAL_QUERY_H
 
-#include <gtk/gtkobject.h>
+#include <glib-object.h>
 
 #include "evolution-calendar.h"
 
@@ -30,10 +30,10 @@ G_BEGIN_DECLS
 
 
 #define CAL_QUERY_TYPE            (cal_query_get_type ())
-#define CAL_QUERY(obj)            (GTK_CHECK_CAST ((obj), CAL_QUERY_TYPE, CalQuery))
-#define CAL_QUERY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_QUERY_TYPE, CalQueryClass))
-#define IS_CAL_QUERY(obj)         (GTK_CHECK_TYPE ((obj), CAL_QUERY_TYPE))
-#define IS_CAL_QUERY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_QUERY_TYPE))
+#define CAL_QUERY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAL_QUERY_TYPE, CalQuery))
+#define CAL_QUERY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), CAL_QUERY_TYPE, CalQueryClass))
+#define IS_CAL_QUERY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAL_QUERY_TYPE))
+#define IS_CAL_QUERY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CAL_QUERY_TYPE))
 
 /* Status values when a query terminates */
 typedef enum {
@@ -44,14 +44,14 @@ typedef enum {
 typedef struct _CalQueryPrivate CalQueryPrivate;
 
 typedef struct {
-	GtkObject object;
+	GObject object;
 
 	/* Private data */
 	CalQueryPrivate *priv;
 } CalQuery;
 
 typedef struct {
-	GtkObjectClass parent_class;
+	GObjectClass parent_class;
 
 	/* Notification signals */
 
@@ -64,7 +64,7 @@ typedef struct {
 	void (* eval_error) (CalQuery *query, const char *error_str);
 } CalQueryClass;
 
-GtkType cal_query_get_type (void);
+GType     cal_query_get_type (void);
 
 CalQuery *cal_query_construct (CalQuery *query,
 			       GNOME_Evolution_Calendar_Cal cal,