diff options
Diffstat (limited to 'e-util/e-sorter.h')
| -rw-r--r-- | e-util/e-sorter.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/e-util/e-sorter.h b/e-util/e-sorter.h index 5a89fa4c59..a70c2bd2d7 100644 --- a/e-util/e-sorter.h +++ b/e-util/e-sorter.h @@ -24,24 +24,25 @@ #ifndef _E_SORTER_H_ #define _E_SORTER_H_ -#include <gtk/gtkobject.h> +#include <glib-object.h> #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ #define E_SORTER_TYPE (e_sorter_get_type ()) -#define E_SORTER(o) (GTK_CHECK_CAST ((o), E_SORTER_TYPE, ESorter)) -#define E_SORTER_CLASS(k) (GTK_CHECK_CLASS_CAST((k), E_SORTER_TYPE, ESorterClass)) -#define E_IS_SORTER(o) (GTK_CHECK_TYPE ((o), E_SORTER_TYPE)) -#define E_IS_SORTER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_SORTER_TYPE)) +#define E_SORTER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), E_SORTER_TYPE, ESorter)) +#define E_SORTER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), E_SORTER_TYPE, ESorterClass)) +#define E_IS_SORTER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_SORTER_TYPE)) +#define E_IS_SORTER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_SORTER_TYPE)) +#define E_SORTER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), E_SORTER_TYPE, ESorterClass)) typedef struct { - GtkObject base; + GObject base; } ESorter; typedef struct { - GtkObjectClass parent_class; + GObjectClass parent_class; gint (*model_to_sorted) (ESorter *sorter, int row); gint (*sorted_to_model) (ESorter *sorter, @@ -57,7 +58,7 @@ typedef struct { gboolean (*needs_sorting) (ESorter *sorter); } ESorterClass; -GtkType e_sorter_get_type (void); +GType e_sorter_get_type (void); ESorter *e_sorter_new (void); gint e_sorter_model_to_sorted (ESorter *sorter, |