diff options
Diffstat (limited to 'calendar/cal-client/cal-listener.h')
| -rw-r--r-- | calendar/cal-client/cal-listener.h | 17 |
1 files changed, 8 insertions, 9 deletions
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 <gtk/gtkobject.h> -#include <bonobo/bonobo-xobject.h> +#include <bonobo/bonobo-object.h> #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, |