[evolution-data-server] Give EDataCalFactory a proper "new" function.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Give EDataCalFactory a proper "new" function.
- Date: Thu, 29 Sep 2011 18:06:49 +0000 (UTC)
commit 034773cbfd002a1d78b1ecb796bfb15956a9177c
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu Sep 29 14:06:27 2011 -0400
Give EDataCalFactory a proper "new" function.
calendar/libedata-cal/e-data-cal-factory.c | 10 ++++++++++
calendar/libedata-cal/e-data-cal-factory.h | 4 +++-
.../libedata-cal/libedata-cal-sections.txt | 1 +
.../libedata-cal/tmpl/e-data-cal-factory.sgml | 10 ++++++++++
.../evolution-calendar-factory.c | 3 +--
5 files changed, 25 insertions(+), 3 deletions(-)
---
diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c
index 3557ef4..ed56e8d 100644
--- a/calendar/libedata-cal/e-data-cal-factory.c
+++ b/calendar/libedata-cal/e-data-cal-factory.c
@@ -438,3 +438,13 @@ e_data_cal_factory_init (EDataCalFactory *factory)
(GDestroyNotify) g_free,
(GDestroyNotify) NULL);
}
+
+EDBusServer *
+e_data_cal_factory_new (GCancellable *cancellable,
+ GError **error)
+{
+ return g_initable_new (
+ E_TYPE_DATA_CAL_FACTORY,
+ cancellable, error, NULL);
+}
+
diff --git a/calendar/libedata-cal/e-data-cal-factory.h b/calendar/libedata-cal/e-data-cal-factory.h
index 6026df2..bf21f41 100644
--- a/calendar/libedata-cal/e-data-cal-factory.h
+++ b/calendar/libedata-cal/e-data-cal-factory.h
@@ -58,7 +58,9 @@ struct _EDataCalFactoryClass {
EDataFactoryClass parent_class;
};
-GType e_data_cal_factory_get_type (void);
+GType e_data_cal_factory_get_type (void);
+EDBusServer * e_data_cal_factory_new (GCancellable *cancellable,
+ GError **error);
G_END_DECLS
diff --git a/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt b/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt
index 7fea0bc..e4c85e4 100644
--- a/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt
+++ b/docs/reference/calendar/libedata-cal/libedata-cal-sections.txt
@@ -324,6 +324,7 @@ ECalBackendSExpClass
<FILE>e-data-cal-factory</FILE>
<TITLE>EDataCalFactory</TITLE>
EDataCalFactory
+e_data_cal_factory_new
<SUBSECTION Standard>
E_DATA_CAL_FACTORY
E_IS_DATA_CAL_FACTORY
diff --git a/docs/reference/calendar/libedata-cal/tmpl/e-data-cal-factory.sgml b/docs/reference/calendar/libedata-cal/tmpl/e-data-cal-factory.sgml
index 0cceaf6..12c2942 100644
--- a/docs/reference/calendar/libedata-cal/tmpl/e-data-cal-factory.sgml
+++ b/docs/reference/calendar/libedata-cal/tmpl/e-data-cal-factory.sgml
@@ -28,3 +28,13 @@ Implementation of the calendar CORBA factory.
@parent:
@priv:
+<!-- ##### FUNCTION e_data_cal_factory_new ##### -->
+<para>
+
+</para>
+
+ cancellable:
+ error:
+ Returns:
+
+
diff --git a/services/evolution-calendar-factory/evolution-calendar-factory.c b/services/evolution-calendar-factory/evolution-calendar-factory.c
index 403f888..40bf10b 100644
--- a/services/evolution-calendar-factory/evolution-calendar-factory.c
+++ b/services/evolution-calendar-factory/evolution-calendar-factory.c
@@ -122,8 +122,7 @@ main (gint argc,
/* Migrate user data from ~/.evolution to XDG base directories. */
evolution_calendar_factory_migrate_basedir ();
- server = g_initable_new (
- E_TYPE_DATA_CAL_FACTORY, NULL, &error, NULL);
+ server = e_data_cal_factory_new (NULL, &error);
if (error != NULL) {
g_printerr ("%s\n", error->message);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]