diff options
Diffstat (limited to 'calendar/cal-client/cal-client.h')
| -rw-r--r-- | calendar/cal-client/cal-client.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/calendar/cal-client/cal-client.h b/calendar/cal-client/cal-client.h index 9c40722888..3d6a4fe85d 100644 --- a/calendar/cal-client/cal-client.h +++ b/calendar/cal-client/cal-client.h @@ -21,8 +21,7 @@ #ifndef CAL_CLIENT_H #define CAL_CLIENT_H -#include <glib/gmacros.h> -#include <gtk/gtkobject.h> +#include <glib-object.h> #include <cal-util/cal-recur.h> #include <cal-util/cal-util.h> #include <cal-client/cal-query.h> @@ -32,10 +31,10 @@ G_BEGIN_DECLS #define CAL_CLIENT_TYPE (cal_client_get_type ()) -#define CAL_CLIENT(obj) (GTK_CHECK_CAST ((obj), CAL_CLIENT_TYPE, CalClient)) -#define CAL_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_TYPE, CalClientClass)) -#define IS_CAL_CLIENT(obj) (GTK_CHECK_TYPE ((obj), CAL_CLIENT_TYPE)) -#define IS_CAL_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_TYPE)) +#define CAL_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CAL_CLIENT_TYPE, CalClient)) +#define CAL_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CAL_CLIENT_TYPE, CalClientClass)) +#define IS_CAL_CLIENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CAL_CLIENT_TYPE)) +#define IS_CAL_CLIENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_TYPE)) typedef struct _CalClient CalClient; typedef struct _CalClientClass CalClientClass; @@ -90,14 +89,14 @@ typedef enum { } CalClientLoadState; struct _CalClient { - GtkObject object; + GObject object; /* Private data */ CalClientPrivate *priv; }; struct _CalClientClass { - GtkObjectClass parent_class; + GObjectClass parent_class; /* Notification signals */ @@ -121,7 +120,7 @@ typedef gchar * (* CalClientAuthFunc) (CalClient *client, const gchar *key, gpointer user_data); -GtkType cal_client_get_type (void); +GType cal_client_get_type (void); CalClient *cal_client_construct (CalClient *client); |