diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-04-28 22:57:05 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-04-28 22:57:05 +0800 |
| commit | 6f2f7292a7934a93e18d36594a8b9ef8dc4454e7 (patch) | |
| tree | d2c915af4de525703ba9c7fef599a6ffb5a02fdc /e-util | |
| parent | 9ec72b2da8880ca93ecff50cb83c5b2ce5ec206c (diff) | |
| download | gsoc2013-evolution-6f2f7292a7934a93e18d36594a8b9ef8dc4454e7.tar.gz gsoc2013-evolution-6f2f7292a7934a93e18d36594a8b9ef8dc4454e7.tar.zst gsoc2013-evolution-6f2f7292a7934a93e18d36594a8b9ef8dc4454e7.zip | |
Resolve some differences between this branch and master.
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/e-util.c | 30 |
1 files changed, 0 insertions, 30 deletions
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; -} |