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-listener.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'calendar/cal-client/cal-listener.h') diff --git a/calendar/cal-client/cal-listener.h b/calendar/cal-client/cal-listener.h index 08db22a54b..d0f9a718a4 100644 --- a/calendar/cal-client/cal-listener.h +++ b/calendar/cal-client/cal-listener.h @@ -21,8 +21,7 @@ #ifndef CAL_LISTENER_H #define CAL_LISTENER_H -#include -#include +#include #include "evolution-calendar.h" G_BEGIN_DECLS @@ -30,23 +29,23 @@ G_BEGIN_DECLS #define CAL_LISTENER_TYPE (cal_listener_get_type ()) -#define CAL_LISTENER(obj) (GTK_CHECK_CAST ((obj), CAL_LISTENER_TYPE, CalListener)) -#define CAL_LISTENER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), CAL_LISTENER_TYPE, \ +#define CAL_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAL_LISTENER_TYPE, CalListener)) +#define CAL_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CAL_LISTENER_TYPE, \ CalListenerClass)) -#define IS_CAL_LISTENER(obj) (GTK_CHECK_TYPE ((obj), CAL_LISTENER_TYPE)) -#define IS_CAL_LISTENER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_LISTENER_TYPE)) +#define IS_CAL_LISTENER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAL_LISTENER_TYPE)) +#define IS_CAL_LISTENER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CAL_LISTENER_TYPE)) typedef struct CalListenerPrivate CalListenerPrivate; typedef struct { - BonoboXObject xobject; + BonoboObject xobject; /* Private data */ CalListenerPrivate *priv; } CalListener; typedef struct { - BonoboXObjectClass parent_class; + BonoboObjectClass parent_class; POA_GNOME_Evolution_Calendar_Listener__epv epv; } CalListenerClass; @@ -78,7 +77,7 @@ typedef void (* CalListenerCategoriesChangedFn) (CalListener *listener, gpointer data); -GtkType cal_listener_get_type (void); +GType cal_listener_get_type (void); CalListener *cal_listener_construct (CalListener *listener, CalListenerCalOpenedFn cal_opened_fn, -- cgit v1.2.3