[evolution-data-server] Move ECalClientSourceType enum to e-cal-types.h.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Move ECalClientSourceType enum to e-cal-types.h.
- Date: Sun, 7 Oct 2012 22:40:12 +0000 (UTC)
commit f715315144edc03192e594f90848e4bd06a9295c
Author: Matthew Barnes <mbarnes redhat com>
Date: Sat Oct 6 17:29:54 2012 -0400
Move ECalClientSourceType enum to e-cal-types.h.
Let glib-mkenums generate the GEnumClass for it.
calendar/libecal/e-cal-client.c | 29 -----------------------------
calendar/libecal/e-cal-client.h | 20 +-------------------
calendar/libecal/e-cal-types.h | 14 ++++++++++++++
3 files changed, 15 insertions(+), 48 deletions(-)
---
diff --git a/calendar/libecal/e-cal-client.c b/calendar/libecal/e-cal-client.c
index 4b570df..e0c2d27 100644
--- a/calendar/libecal/e-cal-client.c
+++ b/calendar/libecal/e-cal-client.c
@@ -87,35 +87,6 @@ free_zone_cb (gpointer zone)
* @CLIENT_BACKEND_PROPERTY_CACHE_DIR, @CLIENT_BACKEND_PROPERTY_CAPABILITIES
*/
-/**
- * e_cal_client_source_type_enum_get_type:
- *
- * Registers the #ECalClientSourceTypeEnum type with glib.
- *
- * Returns: the ID of the #ECalClientSourceTypeEnum type.
- */
-GType
-e_cal_client_source_type_enum_get_type (void)
-{
- static volatile gsize enum_type__volatile = 0;
-
- if (g_once_init_enter (&enum_type__volatile)) {
- GType enum_type;
- static GEnumValue values[] = {
- { E_CAL_CLIENT_SOURCE_TYPE_EVENTS, "Events", "Events" },
- { E_CAL_CLIENT_SOURCE_TYPE_TASKS, "Tasks", "Tasks" },
- { E_CAL_CLIENT_SOURCE_TYPE_MEMOS, "Memos", "Memos" },
- { E_CAL_CLIENT_SOURCE_TYPE_LAST, "Invalid", "Invalid" },
- { -1, NULL, NULL}
- };
-
- enum_type = g_enum_register_static ("ECalClientSourceTypeEnum", values);
- g_once_init_leave (&enum_type__volatile, enum_type);
- }
-
- return enum_type__volatile;
-}
-
GQuark
e_cal_client_error_quark (void)
{
diff --git a/calendar/libecal/e-cal-client.h b/calendar/libecal/e-cal-client.h
index d17198f..8383c33 100644
--- a/calendar/libecal/e-cal-client.h
+++ b/calendar/libecal/e-cal-client.h
@@ -30,6 +30,7 @@
#include <libecal/e-cal-client-view.h>
#include <libecal/e-cal-recur.h>
+#include <libecal/e-cal-types.h>
#include <libecal/e-cal-util.h>
/* Standard GObject macros */
@@ -79,25 +80,6 @@
#define CAL_BACKEND_PROPERTY_DEFAULT_OBJECT "default-object"
/**
- * ECalClientSourceType:
- *
- * FIXME: Document me.
- *
- * Since: 3.2
- **/
-typedef enum {
- E_CAL_CLIENT_SOURCE_TYPE_EVENTS,
- E_CAL_CLIENT_SOURCE_TYPE_TASKS,
- E_CAL_CLIENT_SOURCE_TYPE_MEMOS,
- E_CAL_CLIENT_SOURCE_TYPE_LAST
-} ECalClientSourceType;
-
-#define E_TYPE_CAL_CLIENT_SOURCE_TYPE \
- (e_cal_client_source_type_enum_get_type ())
-
-GType e_cal_client_source_type_enum_get_type (void);
-
-/**
* E_CAL_CLIENT_ERROR:
*
* FIXME: Document me.
diff --git a/calendar/libecal/e-cal-types.h b/calendar/libecal/e-cal-types.h
index 3dab5d8..cf6bac9 100644
--- a/calendar/libecal/e-cal-types.h
+++ b/calendar/libecal/e-cal-types.h
@@ -84,6 +84,20 @@ typedef enum {
#endif
/**
+ * ECalClientSourceType:
+ *
+ * FIXME: Document me!
+ *
+ * Since: 3.2
+ **/
+typedef enum {
+ E_CAL_CLIENT_SOURCE_TYPE_EVENTS,
+ E_CAL_CLIENT_SOURCE_TYPE_TASKS,
+ E_CAL_CLIENT_SOURCE_TYPE_MEMOS,
+ E_CAL_CLIENT_SOURCE_TYPE_LAST /*< skip >*/
+} ECalClientSourceType;
+
+/**
* EDataCalCallStatus:
*
* FIXME Document me!
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]