aboutsummaryrefslogtreecommitdiffstats
path: root/e-util/e-profile-event.c
diff options
context:
space:
mode:
Diffstat (limited to 'e-util/e-profile-event.c')
-rw-r--r--e-util/e-profile-event.c83
1 files changed, 19 insertions, 64 deletions
diff --git a/e-util/e-profile-event.c b/e-util/e-profile-event.c
index 33d7dfbdf7..fc2a609b26 100644
--- a/e-util/e-profile-event.c
+++ b/e-util/e-profile-event.c
@@ -31,20 +31,12 @@
#include "e-profile-event.h"
-static GObjectClass *eme_parent;
static EProfileEvent *e_profile_event;
-static void
-eme_init(GObject *o)
-{
- /*EProfileEvent *eme = (EProfileEvent *)o; */
-}
-
-static void
-eme_finalise(GObject *o)
-{
- ((GObjectClass *)eme_parent)->finalize(o);
-}
+G_DEFINE_TYPE (
+ EProfileEvent,
+ e_profile_event,
+ E_TYPE_EVENT)
static void
eme_target_free(EEvent *ep, EEventTarget *t)
@@ -58,35 +50,18 @@ eme_target_free(EEvent *ep, EEventTarget *t)
break; }
}
- ((EEventClass *)eme_parent)->target_free(ep, t);
+ ((EEventClass *)e_profile_event_parent_class)->target_free(ep, t);
}
static void
-eme_class_init(GObjectClass *klass)
+e_profile_event_class_init (EProfileEventClass *class)
{
- klass->finalize = eme_finalise;
- ((EEventClass *)klass)->target_free = eme_target_free;
+ ((EEventClass *)class)->target_free = eme_target_free;
}
-GType
-e_profile_event_get_type(void)
+static void
+e_profile_event_init (EProfileEvent *event)
{
- static GType type = 0;
-
- if (type == 0) {
- static const GTypeInfo info = {
- sizeof(EProfileEventClass),
- NULL, NULL,
- (GClassInitFunc)eme_class_init,
- NULL, NULL,
- sizeof(EProfileEvent), 0,
- (GInstanceInitFunc)eme_init
- };
- eme_parent = g_type_class_ref(e_event_get_type());
- type = g_type_register_static(e_event_get_type(), "EProfileEvent", &info, 0);
- }
-
- return type;
}
EProfileEvent *
@@ -136,9 +111,6 @@ e_profile_event_emit(const gchar *id, const gchar *uid, guint32 flags)
/* ********************************************************************** */
-static gpointer emeh_parent_class;
-#define emeh ((EProfileEventHook *)eph)
-
static const EEventHookTargetMask emeh_profile_masks[] = {
{ "start", E_PROFILE_EVENT_START },
{ "end", E_PROFILE_EVENT_END },
@@ -151,42 +123,25 @@ static const EEventHookTargetMap emeh_targets[] = {
{ NULL }
};
-static void
-emeh_finalise(GObject *o)
-{
- /*EPluginHook *eph = (EPluginHook *)o;*/
-
- ((GObjectClass *)emeh_parent_class)->finalize(o);
-}
+G_DEFINE_TYPE (
+ EProfileEventHook,
+ e_profile_event_hook,
+ E_TYPE_EVENT_HOOK)
static void
-emeh_class_init(EPluginHookClass *klass)
+e_profile_event_hook_class_init (EProfileEventHookClass *class)
{
gint i;
- ((GObjectClass *)klass)->finalize = emeh_finalise;
- ((EPluginHookClass *)klass)->id = "org.gnome.evolution.profile.events:1.0";
+ ((EPluginHookClass *)class)->id = "org.gnome.evolution.profile.events:1.0";
for (i=0;emeh_targets[i].type;i++)
- e_event_hook_class_add_target_map((EEventHookClass *)klass, &emeh_targets[i]);
+ e_event_hook_class_add_target_map((EEventHookClass *)class, &emeh_targets[i]);
- ((EEventHookClass *)klass)->event = (EEvent *)e_profile_event_peek();
+ ((EEventHookClass *)class)->event = (EEvent *)e_profile_event_peek();
}
-GType
-e_profile_event_hook_get_type(void)
+static void
+e_profile_event_hook_init (EProfileEventHook *hook)
{
- static GType type = 0;
-
- if (!type) {
- static const GTypeInfo info = {
- sizeof(EProfileEventHookClass), NULL, NULL, (GClassInitFunc) emeh_class_init, NULL, NULL,
- sizeof(EProfileEventHook), 0, (GInstanceInitFunc) NULL,
- };
-
- emeh_parent_class = g_type_class_ref(e_event_hook_get_type());
- type = g_type_register_static(e_event_hook_get_type(), "EProfileEventHook", &info, 0);
- }
-
- return type;
}