From 6f2f7292a7934a93e18d36594a8b9ef8dc4454e7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 28 Apr 2009 10:57:05 -0400 Subject: Resolve some differences between this branch and master. --- e-util/e-util.c | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'e-util') diff --git a/e-util/e-util.c b/e-util/e-util.c index 04be119657..071f5e58b8 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -1531,33 +1531,3 @@ e_camel_object_get_type (void) return type; } - -static gpointer -e_camel_object_copy (gpointer camel_object) -{ - if (CAMEL_IS_OBJECT (camel_object)) - camel_object_ref (camel_object); - - return camel_object; -} - -static void -e_camel_object_free (gpointer camel_object) -{ - if (CAMEL_IS_OBJECT (camel_object)) - camel_object_unref (camel_object); -} - -GType -e_camel_object_get_type (void) -{ - static GType type = 0; - - if (G_UNLIKELY (type == 0)) - type = g_boxed_type_register_static ( - "ECamelObject", - (GBoxedCopyFunc) e_camel_object_copy, - (GBoxedFreeFunc) e_camel_object_free); - - return type; -} -- cgit