[evolution-data-server] Give EDataBookFactory a proper "new" function.
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Give EDataBookFactory a proper "new" function.
- Date: Thu, 29 Sep 2011 18:06:44 +0000 (UTC)
commit e37b632fbaa79908a79adf99d12f6ee6731d38a7
Author: Matthew Barnes <mbarnes redhat com>
Date: Thu Sep 29 14:02:33 2011 -0400
Give EDataBookFactory a proper "new" function.
addressbook/libedata-book/e-data-book-factory.c | 8 ++++++++
addressbook/libedata-book/e-data-book-factory.h | 2 ++
.../libedata-book/libedata-book-sections.txt | 1 +
.../libedata-book/tmpl/e-data-book-factory.sgml | 10 ++++++++++
.../libedata-book/tmpl/libedata-book-unused.sgml | 7 -------
.../evolution-addressbook-factory.c | 3 +--
6 files changed, 22 insertions(+), 9 deletions(-)
---
diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c
index a61b0bb..3e6809e 100644
--- a/addressbook/libedata-book/e-data-book-factory.c
+++ b/addressbook/libedata-book/e-data-book-factory.c
@@ -527,3 +527,11 @@ e_data_book_factory_init (EDataBookFactory *factory)
#endif
}
+EDBusServer *
+e_data_book_factory_new (GCancellable *cancellable,
+ GError **error)
+{
+ return g_initable_new (
+ E_TYPE_DATA_BOOK_FACTORY,
+ cancellable, error, NULL);
+}
diff --git a/addressbook/libedata-book/e-data-book-factory.h b/addressbook/libedata-book/e-data-book-factory.h
index d0a977d..13bba49 100644
--- a/addressbook/libedata-book/e-data-book-factory.h
+++ b/addressbook/libedata-book/e-data-book-factory.h
@@ -58,6 +58,8 @@ struct _EDataBookFactoryClass {
};
GType e_data_book_factory_get_type (void) G_GNUC_CONST;
+EDBusServer * e_data_book_factory_new (GCancellable *cancellable,
+ GError **error);
G_END_DECLS
diff --git a/docs/reference/addressbook/libedata-book/libedata-book-sections.txt b/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
index 4a1b1cb..a010756 100644
--- a/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
+++ b/docs/reference/addressbook/libedata-book/libedata-book-sections.txt
@@ -302,6 +302,7 @@ e_data_book_status_get_type
<FILE>e-data-book-factory</FILE>
<TITLE>EDataBookFactory</TITLE>
EDataBookFactory
+e_data_book_factory_new
<SUBSECTION Standard>
E_DATA_BOOK_FACTORY
E_IS_DATA_BOOK_FACTORY
diff --git a/docs/reference/addressbook/libedata-book/tmpl/e-data-book-factory.sgml b/docs/reference/addressbook/libedata-book/tmpl/e-data-book-factory.sgml
index 05ca591..4227835 100644
--- a/docs/reference/addressbook/libedata-book/tmpl/e-data-book-factory.sgml
+++ b/docs/reference/addressbook/libedata-book/tmpl/e-data-book-factory.sgml
@@ -28,3 +28,13 @@ EDataBookFactory
@parent:
@priv:
+<!-- ##### FUNCTION e_data_book_factory_new ##### -->
+<para>
+
+</para>
+
+ cancellable:
+ error:
+ Returns:
+
+
diff --git a/docs/reference/addressbook/libedata-book/tmpl/libedata-book-unused.sgml b/docs/reference/addressbook/libedata-book/tmpl/libedata-book-unused.sgml
index fb408c8..4f9016d 100644
--- a/docs/reference/addressbook/libedata-book/tmpl/libedata-book-unused.sgml
+++ b/docs/reference/addressbook/libedata-book/tmpl/libedata-book-unused.sgml
@@ -548,13 +548,6 @@ e-data-book-types
@factory:
@Returns:
-<!-- ##### FUNCTION e_data_book_factory_new ##### -->
-<para>
-
-</para>
-
- Returns:
-
<!-- ##### FUNCTION e_data_book_factory_register_backend ##### -->
<para>
diff --git a/services/evolution-addressbook-factory/evolution-addressbook-factory.c b/services/evolution-addressbook-factory/evolution-addressbook-factory.c
index 3d41dd5..4577e8c 100644
--- a/services/evolution-addressbook-factory/evolution-addressbook-factory.c
+++ b/services/evolution-addressbook-factory/evolution-addressbook-factory.c
@@ -114,8 +114,7 @@ main (gint argc,
/* Migrate user data from ~/.evolution to XDG base directories. */
evolution_addressbook_factory_migrate_basedir ();
- server = g_initable_new (
- E_TYPE_DATA_BOOK_FACTORY, NULL, &error, NULL);
+ server = e_data_book_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]