From ba0bc7dff09ade6b8014183c44c4c44b42ed1396 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Fri, 26 Nov 2004 15:15:36 +0000 Subject: test prog 2004-11-26 JP Rosevear * test-info-label.c: test prog * e-url-entry.c: get image directly from icon factory * e-combo-button.c: ditto; convert to G_DEFINE_TYPE * e-activity-handler.c: convert to G_DEFINE_TYPE * e-task-widget.c: ditto * e-task-bar.c: ditto * e-multi-config-dialog.c: ditto * e-dropdown-button.c: ditto * e-cell-renderer-combo.c: ditto * e-cell-date-edit.c: ditto * e-calendar.c: ditto * e-calendar-item.c: ditto * Makefile.am: don't build the title bar, build an info label test program svn path=/trunk/; revision=27999 --- widgets/misc/e-activity-handler.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) (limited to 'widgets/misc/e-activity-handler.c') diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c index fd5fb9a275..cdbe7518b5 100644 --- a/widgets/misc/e-activity-handler.c +++ b/widgets/misc/e-activity-handler.c @@ -32,14 +32,8 @@ #include #include -#include #include - -#define PARENT_TYPE G_TYPE_OBJECT -static GObjectClass *parent_class = NULL; - - #define ICON_SIZE 16 @@ -55,11 +49,12 @@ struct _ActivityInfo { typedef struct _ActivityInfo ActivityInfo; struct _EActivityHandlerPrivate { - uint next_activity_id; + guint next_activity_id; GList *activity_infos; GSList *task_bars; }; +G_DEFINE_TYPE (EActivityHandler, e_activity_handler, G_TYPE_OBJECT) /* Utility functions. */ @@ -230,7 +225,7 @@ impl_dispose (GObject *object) g_object_weak_unref (G_OBJECT (sp->data), task_bar_destroy_notify, handler); priv->task_bars = NULL; - (* G_OBJECT_CLASS (parent_class)->dispose) (object); + (* G_OBJECT_CLASS (e_activity_handler_parent_class)->dispose) (object); } static void @@ -244,23 +239,20 @@ impl_finalize (GObject *object) g_free (priv); - (* G_OBJECT_CLASS (parent_class)->finalize) (object); + (* G_OBJECT_CLASS (e_activity_handler_parent_class)->finalize) (object); } - -/* GTK+ type stuff. */ - static void -class_init (GObjectClass *object_class) +e_activity_handler_class_init (EActivityHandlerClass *activity_handler_class) { - parent_class = g_type_class_ref(PARENT_TYPE); - + GObjectClass *object_class = (GObjectClass *) activity_handler_class; + object_class->dispose = impl_dispose; object_class->finalize = impl_finalize; } static void -init (EActivityHandler *activity_handler) +e_activity_handler_init (EActivityHandler *activity_handler) { EActivityHandlerPrivate *priv; @@ -416,5 +408,3 @@ e_activity_handler_operation_finished (EActivityHandler *activity_handler, } } - -E_MAKE_TYPE (e_activity_handler, "EActivityHandler", EActivityHandler, class_init, init, PARENT_TYPE) -- cgit v1.2.3