From bca61092c2a89aa993abd6302b5c372df099e361 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Tue, 5 Nov 2002 11:47:40 +0000 Subject: added new marshallers. 2002-11-04 Rodrigo Moya * 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 --- calendar/cal-client/cal-client-multi.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'calendar/cal-client/cal-client-multi.h') diff --git a/calendar/cal-client/cal-client-multi.h b/calendar/cal-client/cal-client-multi.h index f16b2d60f4..dd4248bd80 100644 --- a/calendar/cal-client/cal-client-multi.h +++ b/calendar/cal-client/cal-client-multi.h @@ -26,24 +26,24 @@ G_BEGIN_DECLS #define CAL_CLIENT_MULTI_TYPE (cal_client_multi_get_type ()) -#define CAL_CLIENT_MULTI(obj) (GTK_CHECK_CAST ((obj), CAL_CLIENT_MULTI_TYPE, CalClientMulti)) -#define CAL_CLIENT_MULTI_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_MULTI_TYPE, CalClientMultiClass)) -#define IS_CAL_CLIENT_MULTI(obj) (GTK_CHECK_TYPE ((obj), CAL_CLIENT_MULTI_TYPE)) -#define IS_CAL_CLIENT_MULTI_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_MULTI_TYPE)) +#define CAL_CLIENT_MULTI(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAL_CLIENT_MULTI_TYPE, CalClientMulti)) +#define CAL_CLIENT_MULTI_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CAL_CLIENT_MULTI_TYPE, CalClientMultiClass)) +#define IS_CAL_CLIENT_MULTI(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAL_CLIENT_MULTI_TYPE)) +#define IS_CAL_CLIENT_MULTI_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_MULTI_TYPE)) typedef struct _CalClientMulti CalClientMulti; typedef struct _CalClientMultiClass CalClientMultiClass; typedef struct _CalClientMultiPrivate CalClientMultiPrivate; struct _CalClientMulti { - GtkObject object; + GObject object; /* Private data */ CalClientMultiPrivate *priv; }; struct _CalClientMultiClass { - GtkObjectClass parent_class; + GObjectClass parent_class; /* notification signals */ void (* cal_opened) (CalClientMulti *multi, CalClient *client, CalClientOpenStatus status); @@ -56,7 +56,7 @@ struct _CalClientMultiClass { void (* forget_password) (CalClientMulti *multi, CalClient *client, const char *key); }; -GtkType cal_client_multi_get_type (void); +GType cal_client_multi_get_type (void); CalClientMulti *cal_client_multi_new (void); -- cgit v1.2.3