[evolution-data-server] Add versioning to D-Bus service names.



commit 89b130c3d75cd0fa023af4064b0d0e3ce2147519
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Jan 25 14:46:36 2011 -0500

    Add versioning to D-Bus service names.
    
    This is to address D-Bus interface mismatches when upgrading to and
    running a new Evolution release while leaving the older E-D-S factory
    services running, as many users do.
    
    More details about the problem here:
    http://mail.gnome.org/archives/evolution-hackers/2010-November/msg00041.html
    
    Contrary to the mailing list post, I'm only adding version numbers to
    the service names.  The new service names are:
    
        org.gnome.evolution.dataserver.AddressBook0
        org.gnome.evolution.dataserver.Calendar0
    
    So, this works similar to shared library versioning.  If you add a D-Bus
    method, remove a D-Bus method, change the signature of a D-Bus method,
    or change the behavior of a D-Bus method in an incompatible way, bump
    the version number at the end of the service name.
    
    I'm also renaming our D-Bus object path and interface names to be less
    repetitive, but this should be transparent given the new service names.

 addressbook/libebook/e-book.c                      |   14 +-
 addressbook/libedata-book/e-data-book-factory.c    |    9 +-
 addressbook/libedata-book/e-data-book-factory.xml  |    4 +-
 addressbook/libedata-book/e-data-book-view.xml     |    2 +-
 addressbook/libedata-book/e-data-book.c            |    4 +-
 addressbook/libedata-book/e-data-book.xml          |    2 +-
 ...ome.evolution.dataserver.AddressBook.service.in |    4 +-
 addressbook/libegdbus/e-gdbus-egdbusbook.c         |  162 ++++++------
 addressbook/libegdbus/e-gdbus-egdbusbook.h         |    2 +-
 addressbook/libegdbus/e-gdbus-egdbusbookfactory.c  |   30 ++--
 addressbook/libegdbus/e-gdbus-egdbusbookfactory.h  |    2 +-
 addressbook/libegdbus/e-gdbus-egdbusbookview.c     |   66 +++---
 addressbook/libegdbus/e-gdbus-egdbusbookview.h     |    2 +-
 calendar/libecal/e-cal.c                           |   30 ++--
 calendar/libedata-cal/e-data-cal-factory.c         |   11 +-
 calendar/libedata-cal/e-data-cal-factory.xml       |    4 +-
 calendar/libedata-cal/e-data-cal-view.xml          |    2 +-
 calendar/libedata-cal/e-data-cal.c                 |    4 +-
 calendar/libedata-cal/e-data-cal.xml               |    2 +-
 ....gnome.evolution.dataserver.Calendar.service.in |    4 +-
 calendar/libegdbus/e-gdbus-egdbuscal.c             |  262 ++++++++++----------
 calendar/libegdbus/e-gdbus-egdbuscal.h             |    2 +-
 calendar/libegdbus/e-gdbus-egdbuscalfactory.c      |   30 ++--
 calendar/libegdbus/e-gdbus-egdbuscalfactory.h      |    2 +-
 calendar/libegdbus/e-gdbus-egdbuscalview.c         |   66 +++---
 calendar/libegdbus/e-gdbus-egdbuscalview.h         |    2 +-
 configure.ac                                       |   33 ++-
 27 files changed, 378 insertions(+), 379 deletions(-)
---
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index 9d41259..4a42a23 100644
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -47,8 +47,6 @@
 #include "e-gdbus-egdbusbook.h"
 #include "e-gdbus-egdbusbookview.h"
 
-#define E_DATA_BOOK_FACTORY_SERVICE_NAME "org.gnome.evolution.dataserver.AddressBook"
-
 static gchar ** flatten_stringlist (GList *list);
 static GList *array_to_stringlist (gchar **list);
 static EList *array_to_elist (gchar **list);
@@ -322,8 +320,8 @@ e_book_activate (GError **error)
 	book_factory_proxy = e_gdbus_book_factory_proxy_new_for_bus_sync (
 		G_BUS_TYPE_SESSION,
 		G_DBUS_PROXY_FLAGS_NONE,
-		E_DATA_BOOK_FACTORY_SERVICE_NAME,
-		"/org/gnome/evolution/dataserver/addressbook/BookFactory",
+		ADDRESS_BOOK_DBUS_SERVICE_NAME,
+		"/org/gnome/evolution/dataserver/AddressBookFactory",
 		NULL,
 		error);
 
@@ -1872,7 +1870,7 @@ e_book_get_book_view (EBook       *book,
 
 	gdbus_bookview = e_gdbus_book_view_proxy_new_sync (g_dbus_proxy_get_connection (G_DBUS_PROXY (book_factory_proxy)),
 							G_DBUS_PROXY_FLAGS_NONE,
-							E_DATA_BOOK_FACTORY_SERVICE_NAME,
+							ADDRESS_BOOK_DBUS_SERVICE_NAME,
 							view_path,
 							NULL,
 							error);
@@ -1911,7 +1909,7 @@ get_book_view_reply (GObject *gdbus_book, GAsyncResult *res, gpointer user_data)
 	if (view_path) {
 		gdbus_bookview = e_gdbus_book_view_proxy_new_sync (g_dbus_proxy_get_connection (G_DBUS_PROXY (book_factory_proxy)),
 							G_DBUS_PROXY_FLAGS_NONE,
-							E_DATA_BOOK_FACTORY_SERVICE_NAME,
+							ADDRESS_BOOK_DBUS_SERVICE_NAME,
 							view_path,
 							NULL,
 							&error);
@@ -3171,7 +3169,7 @@ e_book_new (ESource *source, GError **error)
 
 	book->priv->gdbus_book = e_gdbus_book_proxy_new_sync (g_dbus_proxy_get_connection (G_DBUS_PROXY (book_factory_proxy)),
 						      G_DBUS_PROXY_FLAGS_NONE,
-						      E_DATA_BOOK_FACTORY_SERVICE_NAME,
+						      ADDRESS_BOOK_DBUS_SERVICE_NAME,
 						      path,
 						      NULL,
 						      &err);
@@ -3438,7 +3436,7 @@ e_book_new_default_addressbook (GError **error)
 static EBookStatus
 get_status_from_error (GError *error)
 {
-	#define err(a,b) "org.gnome.evolution.dataserver.addressbook.Book." a, b
+	#define err(a,b) "org.gnome.evolution.dataserver.AddressBook." a, b
 	static struct {
 		const gchar *name;
 		EBookStatus err_code;
diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c
index 37c56fc..5b025a1 100644
--- a/addressbook/libedata-book/e-data-book-factory.c
+++ b/addressbook/libedata-book/e-data-book-factory.c
@@ -228,7 +228,7 @@ construct_book_factory_path (void)
 	static volatile gint counter = 1;
 
 	return g_strdup_printf (
-		"/org/gnome/evolution/dataserver/addressbook/%d/%u",
+		"/org/gnome/evolution/dataserver/AddressBook/%d/%u",
 		getpid (), g_atomic_int_exchange_and_add (&counter, 1));
 }
 
@@ -506,9 +506,6 @@ offline_state_changed_cb (EOfflineListener *eol, EDataBookFactory *factory)
 		E_DATA_BOOK_MODE_REMOTE : E_DATA_BOOK_MODE_LOCAL);
 }
 
-#define E_DATA_BOOK_FACTORY_SERVICE_NAME \
-	"org.gnome.evolution.dataserver.AddressBook"
-
 static void
 on_bus_acquired (GDBusConnection *connection,
                  const gchar     *name,
@@ -521,7 +518,7 @@ on_bus_acquired (GDBusConnection *connection,
 	registration_id = e_data_book_factory_register_gdbus_object (
 		factory,
 		connection,
-		"/org/gnome/evolution/dataserver/addressbook/BookFactory",
+		"/org/gnome/evolution/dataserver/AddressBookFactory",
 		&error);
 
 	if (error)
@@ -631,7 +628,7 @@ main (gint argc, gchar **argv)
 		G_CALLBACK (offline_state_changed_cb), factory);
 
 	owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
-		E_DATA_BOOK_FACTORY_SERVICE_NAME,
+		ADDRESS_BOOK_DBUS_SERVICE_NAME,
 		G_BUS_NAME_OWNER_FLAGS_NONE,
 		on_bus_acquired,
 		on_name_acquired,
diff --git a/addressbook/libedata-book/e-data-book-factory.xml b/addressbook/libedata-book/e-data-book-factory.xml
index 560e24c..1d85257 100644
--- a/addressbook/libedata-book/e-data-book-factory.xml
+++ b/addressbook/libedata-book/e-data-book-factory.xml
@@ -6,9 +6,9 @@
   Copyright (C) 2005 Opened Hand Ltd
   Copyright (C) 2009 Intel Corporation
 -->
-<node name="/org/gnome/evolution/dataserver/addressbook/BookFactory">
+<node name="/org/gnome/evolution/dataserver/AddressBookFactory">
 
-  <interface name="org.gnome.evolution.dataserver.addressbook.BookFactory">
+  <interface name="org.gnome.evolution.dataserver.AddressBookFactory">
     <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="EDataBookFactory"/>
     <annotation name="org.freedesktop.DBus.GLib.Singleton" value="true"/>
 
diff --git a/addressbook/libedata-book/e-data-book-view.xml b/addressbook/libedata-book/e-data-book-view.xml
index 0ef2447..1fa1960 100644
--- a/addressbook/libedata-book/e-data-book-view.xml
+++ b/addressbook/libedata-book/e-data-book-view.xml
@@ -8,7 +8,7 @@
 -->
 <node>
 
-  <interface name="org.gnome.evolution.dataserver.addressbook.BookView">
+  <interface name="org.gnome.evolution.dataserver.AddressBookView">
     <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="EDataBookView"/>
 
     <method name="start">
diff --git a/addressbook/libedata-book/e-data-book.c b/addressbook/libedata-book/e-data-book.c
index 64081dd..a7ce338 100644
--- a/addressbook/libedata-book/e-data-book.c
+++ b/addressbook/libedata-book/e-data-book.c
@@ -208,7 +208,7 @@ e_data_book_status_to_string (EDataBookStatus status)
 GQuark
 e_data_book_error_quark (void)
 {
-	#define ERR_PREFIX "org.gnome.evolution.dataserver.addressbook.Book."
+	#define ERR_PREFIX "org.gnome.evolution.dataserver.AddressBook."
 
 	static const GDBusErrorEntry entries[] = {
 		{ E_DATA_BOOK_STATUS_SUCCESS,				ERR_PREFIX "Success" },
@@ -645,7 +645,7 @@ construct_bookview_path (void)
 {
 	static volatile guint counter = 1;
 
-	return g_strdup_printf ("/org/gnome/evolution/dataserver/addressbook/BookView/%d/%d",
+	return g_strdup_printf ("/org/gnome/evolution/dataserver/AddressBookView/%d/%d",
 				getpid (),
 				g_atomic_int_exchange_and_add ((int*)&counter, 1));
 }
diff --git a/addressbook/libedata-book/e-data-book.xml b/addressbook/libedata-book/e-data-book.xml
index 4641483..8be711e 100644
--- a/addressbook/libedata-book/e-data-book.xml
+++ b/addressbook/libedata-book/e-data-book.xml
@@ -8,7 +8,7 @@
 -->
 <node>
 
-  <interface name="org.gnome.evolution.dataserver.addressbook.Book">
+  <interface name="org.gnome.evolution.dataserver.AddressBook">
     <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="EDataBook"/>
 
     <signal name="writable">
diff --git a/addressbook/libedata-book/org.gnome.evolution.dataserver.AddressBook.service.in b/addressbook/libedata-book/org.gnome.evolution.dataserver.AddressBook.service.in
index adcc073..6d80567 100644
--- a/addressbook/libedata-book/org.gnome.evolution.dataserver.AddressBook.service.in
+++ b/addressbook/libedata-book/org.gnome.evolution.dataserver.AddressBook.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.gnome.evolution.dataserver.AddressBook
-Exec= LIBEXECDIR@/e-addressbook-factory EXEEXT@
+Name= ADDRESS_BOOK_DBUS_SERVICE_NAME@
+Exec= libexecdir@/e-addressbook-factory
diff --git a/addressbook/libegdbus/e-gdbus-egdbusbook.c b/addressbook/libegdbus/e-gdbus-egdbusbook.c
index 589efa8..952e514 100644
--- a/addressbook/libegdbus/e-gdbus-egdbusbook.c
+++ b/addressbook/libegdbus/e-gdbus-egdbusbook.c
@@ -1,7 +1,7 @@
 /* File:       e-gdbus-egdbusbook.c
  *
  * GType name: EGdbusBook
- * D-Bus name: org.gnome.evolution.dataserver.addressbook.Book
+ * D-Bus name: org.gnome.evolution.dataserver.AddressBook
  *
  * Generated by GDBus Binding Tool 0.1. DO NOT EDIT.
  */
@@ -9,10 +9,10 @@
 /**
  * SECTION:e-gdbus-egdbusbook
  * @title: EGdbusBook
- * @short_description: Wraps the org.gnome.evolution.dataserver.addressbook.Book D-Bus interface
+ * @short_description: Wraps the org.gnome.evolution.dataserver.AddressBook D-Bus interface
  * @include: gio/gio.h
  *
- * The abstract #EGdbusBook interface type wraps the <literal>org.gnome.evolution.dataserver.addressbook.Book</literal> D-Bus interface. Two concrete implementations of this type are included: #EGdbusBookProxy and #EGdbusBookStub.
+ * The abstract #EGdbusBook interface type wraps the <literal>org.gnome.evolution.dataserver.AddressBook</literal> D-Bus interface. Two concrete implementations of this type are included: #EGdbusBookProxy and #EGdbusBookStub.
  *
  * The generated proxy type #EGdbusBookProxy is typically used with the generated constructors e_gdbus_book_proxy_new(), e_gdbus_book_proxy_new_sync() and e_gdbus_book_proxy_new_for_bus(), e_gdbus_book_proxy_new_for_bus_sync().
  *
@@ -167,7 +167,7 @@ signal_emission_hook_cb_writable (GSignalInvocationHint *ihint,
   g_dbus_connection_emit_signal (connection,
                                  NULL,
                                  path,
-                                 "org.gnome.evolution.dataserver.addressbook.Book",
+                                 "org.gnome.evolution.dataserver.AddressBook",
                                  "writable",
                                  params,
                                  NULL);
@@ -208,7 +208,7 @@ signal_emission_hook_cb_connection (GSignalInvocationHint *ihint,
   g_dbus_connection_emit_signal (connection,
                                  NULL,
                                  path,
-                                 "org.gnome.evolution.dataserver.addressbook.Book",
+                                 "org.gnome.evolution.dataserver.AddressBook",
                                  "connection",
                                  params,
                                  NULL);
@@ -240,7 +240,7 @@ signal_emission_hook_cb_auth_required (GSignalInvocationHint *ihint,
   g_dbus_connection_emit_signal (connection,
                                  NULL,
                                  path,
-                                 "org.gnome.evolution.dataserver.addressbook.Book",
+                                 "org.gnome.evolution.dataserver.AddressBook",
                                  "auth_required",
                                  params,
                                  NULL);
@@ -790,7 +790,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.open</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBook.open</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -826,7 +826,7 @@ void e_gdbus_book_call_open (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_call_open().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.Book.open</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBook.open</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -854,7 +854,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.open</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBook.open</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -895,7 +895,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.remove</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBook.remove</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -929,7 +929,7 @@ void e_gdbus_book_call_remove (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_call_remove().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.Book.remove</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBook.remove</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -956,7 +956,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.remove</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBook.remove</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -996,7 +996,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.getContact</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBook.getContact</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -1033,7 +1033,7 @@ void e_gdbus_book_call_get_contact (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_call_get_contact().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.Book.getContact</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBook.getContact</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -1068,7 +1068,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.getContact</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBook.getContact</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -1116,7 +1116,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.getContactList</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBook.getContactList</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -1153,7 +1153,7 @@ void e_gdbus_book_call_get_contact_list (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_call_get_contact_list().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.Book.getContactList</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBook.getContactList</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -1188,7 +1188,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.getContactList</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBook.getContactList</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -1238,7 +1238,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.authenticateUser</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBook.authenticateUser</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -1278,7 +1278,7 @@ void e_gdbus_book_call_authenticate_user (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_call_authenticate_user().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.Book.authenticateUser</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBook.authenticateUser</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -1308,7 +1308,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.authenticateUser</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBook.authenticateUser</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -1354,7 +1354,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.addContact</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBook.addContact</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -1391,7 +1391,7 @@ void e_gdbus_book_call_add_contact (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_call_add_contact().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.Book.addContact</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBook.addContact</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -1426,7 +1426,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.addContact</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBook.addContact</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -1474,7 +1474,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.removeContacts</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBook.removeContacts</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -1510,7 +1510,7 @@ void e_gdbus_book_call_remove_contacts (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_call_remove_contacts().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.Book.removeContacts</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBook.removeContacts</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -1538,7 +1538,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.removeContacts</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBook.removeContacts</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -1580,7 +1580,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.modifyContact</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBook.modifyContact</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -1616,7 +1616,7 @@ void e_gdbus_book_call_modify_contact (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_call_modify_contact().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.Book.modifyContact</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBook.modifyContact</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -1644,7 +1644,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.modifyContact</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBook.modifyContact</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -1685,7 +1685,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.getStaticCapabilities</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBook.getStaticCapabilities</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -1720,7 +1720,7 @@ void e_gdbus_book_call_get_static_capabilities (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_call_get_static_capabilities().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.Book.getStaticCapabilities</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBook.getStaticCapabilities</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -1754,7 +1754,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.getStaticCapabilities</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBook.getStaticCapabilities</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -1799,7 +1799,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.getRequiredFields</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBook.getRequiredFields</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -1834,7 +1834,7 @@ void e_gdbus_book_call_get_required_fields (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_call_get_required_fields().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.Book.getRequiredFields</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBook.getRequiredFields</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -1868,7 +1868,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.getRequiredFields</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBook.getRequiredFields</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -1913,7 +1913,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.getSupportedFields</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBook.getSupportedFields</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -1948,7 +1948,7 @@ void e_gdbus_book_call_get_supported_fields (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_call_get_supported_fields().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.Book.getSupportedFields</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBook.getSupportedFields</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -1982,7 +1982,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.getSupportedFields</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBook.getSupportedFields</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -2027,7 +2027,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.getSupportedAuthMethods</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBook.getSupportedAuthMethods</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -2062,7 +2062,7 @@ void e_gdbus_book_call_get_supported_auth_methods (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_call_get_supported_auth_methods().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.Book.getSupportedAuthMethods</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBook.getSupportedAuthMethods</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -2096,7 +2096,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.getSupportedAuthMethods</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBook.getSupportedAuthMethods</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -2143,7 +2143,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.getBookView</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBook.getBookView</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -2182,7 +2182,7 @@ void e_gdbus_book_call_get_book_view (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_call_get_book_view().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.Book.getBookView</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBook.getBookView</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -2218,7 +2218,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.getBookView</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBook.getBookView</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -2268,7 +2268,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.getChanges</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBook.getChanges</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -2305,7 +2305,7 @@ void e_gdbus_book_call_get_changes (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_call_get_changes().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.Book.getChanges</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBook.getChanges</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -2340,7 +2340,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.getChanges</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBook.getChanges</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -2387,7 +2387,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.cancelOperation</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBook.cancelOperation</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -2421,7 +2421,7 @@ void e_gdbus_book_call_cancel_operation (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_call_cancel_operation().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.Book.cancelOperation</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBook.cancelOperation</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -2448,7 +2448,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.cancelOperation</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBook.cancelOperation</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -2487,7 +2487,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.close</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBook.close</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -2521,7 +2521,7 @@ void e_gdbus_book_call_close (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_call_close().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.Book.close</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBook.close</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -2548,7 +2548,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.Book.close</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBook.close</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -2585,7 +2585,7 @@ _out:
  * @object: A #EGdbusBook.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.Book.open</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBook.open</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -2605,7 +2605,7 @@ void e_gdbus_book_complete_open (
  * @object: A #EGdbusBook.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.Book.remove</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBook.remove</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -2626,7 +2626,7 @@ void e_gdbus_book_complete_remove (
  * @invocation: A #GDBusMethodInvocation.
  * @out_vcard: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.Book.getContact</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBook.getContact</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -2651,7 +2651,7 @@ void e_gdbus_book_complete_get_contact (
  * @invocation: A #GDBusMethodInvocation.
  * @out_vcards: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.Book.getContactList</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBook.getContactList</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -2675,7 +2675,7 @@ void e_gdbus_book_complete_get_contact_list (
  * @object: A #EGdbusBook.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.Book.authenticateUser</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBook.authenticateUser</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -2696,7 +2696,7 @@ void e_gdbus_book_complete_authenticate_user (
  * @invocation: A #GDBusMethodInvocation.
  * @out_uid: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.Book.addContact</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBook.addContact</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -2720,7 +2720,7 @@ void e_gdbus_book_complete_add_contact (
  * @object: A #EGdbusBook.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.Book.removeContacts</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBook.removeContacts</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -2740,7 +2740,7 @@ void e_gdbus_book_complete_remove_contacts (
  * @object: A #EGdbusBook.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.Book.modifyContact</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBook.modifyContact</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -2761,7 +2761,7 @@ void e_gdbus_book_complete_modify_contact (
  * @invocation: A #GDBusMethodInvocation.
  * @out_capabilities: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.Book.getStaticCapabilities</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBook.getStaticCapabilities</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -2786,7 +2786,7 @@ void e_gdbus_book_complete_get_static_capabilities (
  * @invocation: A #GDBusMethodInvocation.
  * @out_fields: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.Book.getRequiredFields</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBook.getRequiredFields</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -2811,7 +2811,7 @@ void e_gdbus_book_complete_get_required_fields (
  * @invocation: A #GDBusMethodInvocation.
  * @out_fields: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.Book.getSupportedFields</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBook.getSupportedFields</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -2836,7 +2836,7 @@ void e_gdbus_book_complete_get_supported_fields (
  * @invocation: A #GDBusMethodInvocation.
  * @out_auth_methods: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.Book.getSupportedAuthMethods</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBook.getSupportedAuthMethods</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -2861,7 +2861,7 @@ void e_gdbus_book_complete_get_supported_auth_methods (
  * @invocation: A #GDBusMethodInvocation.
  * @out_view: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.Book.getBookView</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBook.getBookView</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -2886,7 +2886,7 @@ void e_gdbus_book_complete_get_book_view (
  * @invocation: A #GDBusMethodInvocation.
  * @out_changes: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.Book.getChanges</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBook.getChanges</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -2910,7 +2910,7 @@ void e_gdbus_book_complete_get_changes (
  * @object: A #EGdbusBook.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.Book.cancelOperation</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBook.cancelOperation</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -2930,7 +2930,7 @@ void e_gdbus_book_complete_cancel_operation (
  * @object: A #EGdbusBook.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.Book.close</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBook.close</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -2950,7 +2950,7 @@ void e_gdbus_book_complete_close (
  * @object: A #EGdbusBook.
  * @arg_value: Signal parameter.
  *
- * Emits the <literal>org.gnome.evolution.dataserver.addressbook.Book.writable</literal>
+ * Emits the <literal>org.gnome.evolution.dataserver.AddressBook.writable</literal>
  * D-Bus signal.
  */
 void e_gdbus_book_emit_writable (
@@ -2965,7 +2965,7 @@ void e_gdbus_book_emit_writable (
  * @object: A #EGdbusBook.
  * @arg_connected: Signal parameter.
  *
- * Emits the <literal>org.gnome.evolution.dataserver.addressbook.Book.connection</literal>
+ * Emits the <literal>org.gnome.evolution.dataserver.AddressBook.connection</literal>
  * D-Bus signal.
  */
 void e_gdbus_book_emit_connection (
@@ -2979,7 +2979,7 @@ void e_gdbus_book_emit_connection (
  * e_gdbus_book_emit_auth_required:
  * @object: A #EGdbusBook.
  *
- * Emits the <literal>org.gnome.evolution.dataserver.addressbook.Book.auth_required</literal>
+ * Emits the <literal>org.gnome.evolution.dataserver.AddressBook.auth_required</literal>
  * D-Bus signal.
  */
 void e_gdbus_book_emit_auth_required (
@@ -3472,7 +3472,7 @@ static const GDBusMethodInfo * const e_gdbus_book_method_info_pointers[] =
 static const GDBusInterfaceInfo _e_gdbus_book_interface_info =
 {
   -1,
-  (gchar *) "org.gnome.evolution.dataserver.addressbook.Book",
+  (gchar *) "org.gnome.evolution.dataserver.AddressBook",
   (GDBusMethodInfo **) &e_gdbus_book_method_info_pointers,
   (GDBusSignalInfo **) &e_gdbus_book_signal_info_pointers,
   (GDBusPropertyInfo **) NULL,
@@ -3846,7 +3846,7 @@ emit_notifications_in_idle (gpointer user_data)
                                      "org.freedesktop.DBus.Properties",
                                      "PropertiesChanged",
                                      g_variant_new ("(sa{sv}as)",
-                                                    "org.gnome.evolution.dataserver.addressbook.Book",
+                                                    "org.gnome.evolution.dataserver.AddressBook",
                                                     builder,
                                                     invalidated_builder),
                                      NULL);
@@ -4001,7 +4001,7 @@ e_gdbus_book_register_object (EGdbusBook *object,
 /**
  * e_gdbus_book_interface_info:
  *
- * Gets interface description for the <literal>org.gnome.evolution.dataserver.addressbook.Book</literal> D-Bus interface.
+ * Gets interface description for the <literal>org.gnome.evolution.dataserver.AddressBook</literal> D-Bus interface.
  *
  * Returns: A #GDBusInterfaceInfo. Do not free, the object is statically allocated.
  */
@@ -4132,7 +4132,7 @@ e_gdbus_book_proxy_set_property (GObject      *object,
       g_dbus_proxy_call (G_DBUS_PROXY (object),
                          "org.freedesktop.DBus.Properties.Set",
                          g_variant_new ("(ssv)",
-                                        "org.gnome.evolution.dataserver.addressbook.Book",
+                                        "org.gnome.evolution.dataserver.AddressBook",
                                         property_name,
                                         new_value),
                          G_DBUS_CALL_FLAGS_NONE,
@@ -4224,7 +4224,7 @@ void e_gdbus_book_proxy_new (GDBusConnection     *connection,
                               "g-name", name,
                               "g-connection", connection,
                               "g-object-path", object_path,
-                              "g-interface-name", "org.gnome.evolution.dataserver.addressbook.Book",
+                              "g-interface-name", "org.gnome.evolution.dataserver.AddressBook",
                               NULL);
 }
 
@@ -4284,7 +4284,7 @@ EGdbusBook *e_gdbus_book_proxy_new_sync (GDBusConnection     *connection,
                              "g-name", name,
                              "g-connection", connection,
                              "g-object-path", object_path,
-                             "g-interface-name", "org.gnome.evolution.dataserver.addressbook.Book",
+                             "g-interface-name", "org.gnome.evolution.dataserver.AddressBook",
                              NULL);
   if (initable != NULL)
     return E_GDBUS_BOOK (initable);
@@ -4323,7 +4323,7 @@ void e_gdbus_book_proxy_new_for_bus (GBusType             bus_type,
                               "g-name", name,
                               "g-bus-type", bus_type,
                               "g-object-path", object_path,
-                              "g-interface-name", "org.gnome.evolution.dataserver.addressbook.Book",
+                              "g-interface-name", "org.gnome.evolution.dataserver.AddressBook",
                               NULL);
 }
 
@@ -4383,7 +4383,7 @@ EGdbusBook *e_gdbus_book_proxy_new_for_bus_sync (GBusType             bus_type,
                              "g-name", name,
                              "g-bus-type", bus_type,
                              "g-object-path", object_path,
-                             "g-interface-name", "org.gnome.evolution.dataserver.addressbook.Book",
+                             "g-interface-name", "org.gnome.evolution.dataserver.AddressBook",
                              NULL);
   if (initable != NULL)
     return E_GDBUS_BOOK (initable);
diff --git a/addressbook/libegdbus/e-gdbus-egdbusbook.h b/addressbook/libegdbus/e-gdbus-egdbusbook.h
index 767dbea..0251778 100644
--- a/addressbook/libegdbus/e-gdbus-egdbusbook.h
+++ b/addressbook/libegdbus/e-gdbus-egdbusbook.h
@@ -1,7 +1,7 @@
 /* File:       e-gdbus-egdbusbook.h
  *
  * GType name: EGdbusBook
- * D-Bus name: org.gnome.evolution.dataserver.addressbook.Book
+ * D-Bus name: org.gnome.evolution.dataserver.AddressBook
  *
  * Generated by GDBus Binding Tool 0.1. DO NOT EDIT.
  */
diff --git a/addressbook/libegdbus/e-gdbus-egdbusbookfactory.c b/addressbook/libegdbus/e-gdbus-egdbusbookfactory.c
index d5bf096..5d87afa 100644
--- a/addressbook/libegdbus/e-gdbus-egdbusbookfactory.c
+++ b/addressbook/libegdbus/e-gdbus-egdbusbookfactory.c
@@ -1,7 +1,7 @@
 /* File:       e-gdbus-egdbusbookfactory.c
  *
  * GType name: EGdbusBookFactory
- * D-Bus name: org.gnome.evolution.dataserver.addressbook.BookFactory
+ * D-Bus name: org.gnome.evolution.dataserver.AddressBookFactory
  *
  * Generated by GDBus Binding Tool 0.1. DO NOT EDIT.
  */
@@ -9,10 +9,10 @@
 /**
  * SECTION:e-gdbus-egdbusbookfactory
  * @title: EGdbusBookFactory
- * @short_description: Wraps the org.gnome.evolution.dataserver.addressbook.BookFactory D-Bus interface
+ * @short_description: Wraps the org.gnome.evolution.dataserver.AddressBookFactory D-Bus interface
  * @include: gio/gio.h
  *
- * The abstract #EGdbusBookFactory interface type wraps the <literal>org.gnome.evolution.dataserver.addressbook.BookFactory</literal> D-Bus interface. Two concrete implementations of this type are included: #EGdbusBookFactoryProxy and #EGdbusBookFactoryStub.
+ * The abstract #EGdbusBookFactory interface type wraps the <literal>org.gnome.evolution.dataserver.AddressBookFactory</literal> D-Bus interface. Two concrete implementations of this type are included: #EGdbusBookFactoryProxy and #EGdbusBookFactoryStub.
  *
  * The generated proxy type #EGdbusBookFactoryProxy is typically used with the generated constructors e_gdbus_book_factory_proxy_new(), e_gdbus_book_factory_proxy_new_sync() and e_gdbus_book_factory_proxy_new_for_bus(), e_gdbus_book_factory_proxy_new_for_bus_sync().
  *
@@ -171,7 +171,7 @@ e_gdbus_book_factory_default_init (EGdbusBookFactoryIface *iface)
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.BookFactory.getBook</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBookFactory.getBook</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -208,7 +208,7 @@ void e_gdbus_book_factory_call_get_book (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_factory_call_get_book().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.BookFactory.getBook</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBookFactory.getBook</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -243,7 +243,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.BookFactory.getBook</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBookFactory.getBook</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -289,7 +289,7 @@ _out:
  * @invocation: A #GDBusMethodInvocation.
  * @out_path: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.BookFactory.getBook</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBookFactory.getBook</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -352,7 +352,7 @@ static const GDBusMethodInfo * const e_gdbus_book_factory_method_info_pointers[]
 static const GDBusInterfaceInfo _e_gdbus_book_factory_interface_info =
 {
   -1,
-  (gchar *) "org.gnome.evolution.dataserver.addressbook.BookFactory",
+  (gchar *) "org.gnome.evolution.dataserver.AddressBookFactory",
   (GDBusMethodInfo **) &e_gdbus_book_factory_method_info_pointers,
   (GDBusSignalInfo **) NULL,
   (GDBusPropertyInfo **) NULL,
@@ -507,7 +507,7 @@ emit_notifications_in_idle (gpointer user_data)
                                      "org.freedesktop.DBus.Properties",
                                      "PropertiesChanged",
                                      g_variant_new ("(sa{sv}as)",
-                                                    "org.gnome.evolution.dataserver.addressbook.BookFactory",
+                                                    "org.gnome.evolution.dataserver.AddressBookFactory",
                                                     builder,
                                                     invalidated_builder),
                                      NULL);
@@ -662,7 +662,7 @@ e_gdbus_book_factory_register_object (EGdbusBookFactory *object,
 /**
  * e_gdbus_book_factory_interface_info:
  *
- * Gets interface description for the <literal>org.gnome.evolution.dataserver.addressbook.BookFactory</literal> D-Bus interface.
+ * Gets interface description for the <literal>org.gnome.evolution.dataserver.AddressBookFactory</literal> D-Bus interface.
  *
  * Returns: A #GDBusInterfaceInfo. Do not free, the object is statically allocated.
  */
@@ -761,7 +761,7 @@ e_gdbus_book_factory_proxy_set_property (GObject      *object,
       g_dbus_proxy_call (G_DBUS_PROXY (object),
                          "org.freedesktop.DBus.Properties.Set",
                          g_variant_new ("(ssv)",
-                                        "org.gnome.evolution.dataserver.addressbook.BookFactory",
+                                        "org.gnome.evolution.dataserver.AddressBookFactory",
                                         property_name,
                                         new_value),
                          G_DBUS_CALL_FLAGS_NONE,
@@ -853,7 +853,7 @@ void e_gdbus_book_factory_proxy_new (GDBusConnection     *connection,
                               "g-name", name,
                               "g-connection", connection,
                               "g-object-path", object_path,
-                              "g-interface-name", "org.gnome.evolution.dataserver.addressbook.BookFactory",
+                              "g-interface-name", "org.gnome.evolution.dataserver.AddressBookFactory",
                               NULL);
 }
 
@@ -913,7 +913,7 @@ EGdbusBookFactory *e_gdbus_book_factory_proxy_new_sync (GDBusConnection     *con
                              "g-name", name,
                              "g-connection", connection,
                              "g-object-path", object_path,
-                             "g-interface-name", "org.gnome.evolution.dataserver.addressbook.BookFactory",
+                             "g-interface-name", "org.gnome.evolution.dataserver.AddressBookFactory",
                              NULL);
   if (initable != NULL)
     return E_GDBUS_BOOK_FACTORY (initable);
@@ -952,7 +952,7 @@ void e_gdbus_book_factory_proxy_new_for_bus (GBusType             bus_type,
                               "g-name", name,
                               "g-bus-type", bus_type,
                               "g-object-path", object_path,
-                              "g-interface-name", "org.gnome.evolution.dataserver.addressbook.BookFactory",
+                              "g-interface-name", "org.gnome.evolution.dataserver.AddressBookFactory",
                               NULL);
 }
 
@@ -1012,7 +1012,7 @@ EGdbusBookFactory *e_gdbus_book_factory_proxy_new_for_bus_sync (GBusType
                              "g-name", name,
                              "g-bus-type", bus_type,
                              "g-object-path", object_path,
-                             "g-interface-name", "org.gnome.evolution.dataserver.addressbook.BookFactory",
+                             "g-interface-name", "org.gnome.evolution.dataserver.AddressBookFactory",
                              NULL);
   if (initable != NULL)
     return E_GDBUS_BOOK_FACTORY (initable);
diff --git a/addressbook/libegdbus/e-gdbus-egdbusbookfactory.h b/addressbook/libegdbus/e-gdbus-egdbusbookfactory.h
index 1715c6e..953c224 100644
--- a/addressbook/libegdbus/e-gdbus-egdbusbookfactory.h
+++ b/addressbook/libegdbus/e-gdbus-egdbusbookfactory.h
@@ -1,7 +1,7 @@
 /* File:       e-gdbus-egdbusbookfactory.h
  *
  * GType name: EGdbusBookFactory
- * D-Bus name: org.gnome.evolution.dataserver.addressbook.BookFactory
+ * D-Bus name: org.gnome.evolution.dataserver.AddressBookFactory
  *
  * Generated by GDBus Binding Tool 0.1. DO NOT EDIT.
  */
diff --git a/addressbook/libegdbus/e-gdbus-egdbusbookview.c b/addressbook/libegdbus/e-gdbus-egdbusbookview.c
index 9f92a0a..12b7f8d 100644
--- a/addressbook/libegdbus/e-gdbus-egdbusbookview.c
+++ b/addressbook/libegdbus/e-gdbus-egdbusbookview.c
@@ -1,7 +1,7 @@
 /* File:       e-gdbus-egdbusbookview.c
  *
  * GType name: EGdbusBookView
- * D-Bus name: org.gnome.evolution.dataserver.addressbook.BookView
+ * D-Bus name: org.gnome.evolution.dataserver.AddressBookView
  *
  * Generated by GDBus Binding Tool 0.1. DO NOT EDIT.
  */
@@ -9,10 +9,10 @@
 /**
  * SECTION:e-gdbus-egdbusbookview
  * @title: EGdbusBookView
- * @short_description: Wraps the org.gnome.evolution.dataserver.addressbook.BookView D-Bus interface
+ * @short_description: Wraps the org.gnome.evolution.dataserver.AddressBookView D-Bus interface
  * @include: gio/gio.h
  *
- * The abstract #EGdbusBookView interface type wraps the <literal>org.gnome.evolution.dataserver.addressbook.BookView</literal> D-Bus interface. Two concrete implementations of this type are included: #EGdbusBookViewProxy and #EGdbusBookViewStub.
+ * The abstract #EGdbusBookView interface type wraps the <literal>org.gnome.evolution.dataserver.AddressBookView</literal> D-Bus interface. Two concrete implementations of this type are included: #EGdbusBookViewProxy and #EGdbusBookViewStub.
  *
  * The generated proxy type #EGdbusBookViewProxy is typically used with the generated constructors e_gdbus_book_view_proxy_new(), e_gdbus_book_view_proxy_new_sync() and e_gdbus_book_view_proxy_new_for_bus(), e_gdbus_book_view_proxy_new_for_bus_sync().
  *
@@ -156,7 +156,7 @@ signal_emission_hook_cb_contacts_added (GSignalInvocationHint *ihint,
   g_dbus_connection_emit_signal (connection,
                                  NULL,
                                  path,
-                                 "org.gnome.evolution.dataserver.addressbook.BookView",
+                                 "org.gnome.evolution.dataserver.AddressBookView",
                                  "ContactsAdded",
                                  params,
                                  NULL);
@@ -197,7 +197,7 @@ signal_emission_hook_cb_contacts_changed (GSignalInvocationHint *ihint,
   g_dbus_connection_emit_signal (connection,
                                  NULL,
                                  path,
-                                 "org.gnome.evolution.dataserver.addressbook.BookView",
+                                 "org.gnome.evolution.dataserver.AddressBookView",
                                  "ContactsChanged",
                                  params,
                                  NULL);
@@ -238,7 +238,7 @@ signal_emission_hook_cb_contacts_removed (GSignalInvocationHint *ihint,
   g_dbus_connection_emit_signal (connection,
                                  NULL,
                                  path,
-                                 "org.gnome.evolution.dataserver.addressbook.BookView",
+                                 "org.gnome.evolution.dataserver.AddressBookView",
                                  "ContactsRemoved",
                                  params,
                                  NULL);
@@ -279,7 +279,7 @@ signal_emission_hook_cb_status_message (GSignalInvocationHint *ihint,
   g_dbus_connection_emit_signal (connection,
                                  NULL,
                                  path,
-                                 "org.gnome.evolution.dataserver.addressbook.BookView",
+                                 "org.gnome.evolution.dataserver.AddressBookView",
                                  "StatusMessage",
                                  params,
                                  NULL);
@@ -323,7 +323,7 @@ signal_emission_hook_cb_complete (GSignalInvocationHint *ihint,
   g_dbus_connection_emit_signal (connection,
                                  NULL,
                                  path,
-                                 "org.gnome.evolution.dataserver.addressbook.BookView",
+                                 "org.gnome.evolution.dataserver.AddressBookView",
                                  "Complete",
                                  params,
                                  NULL);
@@ -589,7 +589,7 @@ e_gdbus_book_view_default_init (EGdbusBookViewIface *iface)
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.BookView.start</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBookView.start</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -623,7 +623,7 @@ void e_gdbus_book_view_call_start (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_view_call_start().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.BookView.start</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBookView.start</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -650,7 +650,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.BookView.start</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBookView.start</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -689,7 +689,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.BookView.stop</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBookView.stop</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -723,7 +723,7 @@ void e_gdbus_book_view_call_stop (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_view_call_stop().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.BookView.stop</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBookView.stop</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -750,7 +750,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.BookView.stop</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBookView.stop</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -789,7 +789,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.addressbook.BookView.dispose</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.AddressBookView.dispose</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -823,7 +823,7 @@ void e_gdbus_book_view_call_dispose (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_book_view_call_dispose().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.addressbook.BookView.dispose</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.AddressBookView.dispose</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -850,7 +850,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.addressbook.BookView.dispose</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.AddressBookView.dispose</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -887,7 +887,7 @@ _out:
  * @object: A #EGdbusBookView.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.BookView.start</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBookView.start</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -907,7 +907,7 @@ void e_gdbus_book_view_complete_start (
  * @object: A #EGdbusBookView.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.BookView.stop</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBookView.stop</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -927,7 +927,7 @@ void e_gdbus_book_view_complete_stop (
  * @object: A #EGdbusBookView.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.addressbook.BookView.dispose</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.AddressBookView.dispose</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -947,7 +947,7 @@ void e_gdbus_book_view_complete_dispose (
  * @object: A #EGdbusBookView.
  * @arg_vcards: Signal parameter.
  *
- * Emits the <literal>org.gnome.evolution.dataserver.addressbook.BookView.ContactsAdded</literal>
+ * Emits the <literal>org.gnome.evolution.dataserver.AddressBookView.ContactsAdded</literal>
  * D-Bus signal.
  */
 void e_gdbus_book_view_emit_contacts_added (
@@ -962,7 +962,7 @@ void e_gdbus_book_view_emit_contacts_added (
  * @object: A #EGdbusBookView.
  * @arg_vcards: Signal parameter.
  *
- * Emits the <literal>org.gnome.evolution.dataserver.addressbook.BookView.ContactsChanged</literal>
+ * Emits the <literal>org.gnome.evolution.dataserver.AddressBookView.ContactsChanged</literal>
  * D-Bus signal.
  */
 void e_gdbus_book_view_emit_contacts_changed (
@@ -977,7 +977,7 @@ void e_gdbus_book_view_emit_contacts_changed (
  * @object: A #EGdbusBookView.
  * @arg_ids: Signal parameter.
  *
- * Emits the <literal>org.gnome.evolution.dataserver.addressbook.BookView.ContactsRemoved</literal>
+ * Emits the <literal>org.gnome.evolution.dataserver.AddressBookView.ContactsRemoved</literal>
  * D-Bus signal.
  */
 void e_gdbus_book_view_emit_contacts_removed (
@@ -992,7 +992,7 @@ void e_gdbus_book_view_emit_contacts_removed (
  * @object: A #EGdbusBookView.
  * @arg_message: Signal parameter.
  *
- * Emits the <literal>org.gnome.evolution.dataserver.addressbook.BookView.StatusMessage</literal>
+ * Emits the <literal>org.gnome.evolution.dataserver.AddressBookView.StatusMessage</literal>
  * D-Bus signal.
  */
 void e_gdbus_book_view_emit_status_message (
@@ -1008,7 +1008,7 @@ void e_gdbus_book_view_emit_status_message (
  * @arg_status: Signal parameter.
  * @arg_message: Signal parameter.
  *
- * Emits the <literal>org.gnome.evolution.dataserver.addressbook.BookView.Complete</literal>
+ * Emits the <literal>org.gnome.evolution.dataserver.AddressBookView.Complete</literal>
  * D-Bus signal.
  */
 void e_gdbus_book_view_emit_complete (
@@ -1180,7 +1180,7 @@ static const GDBusMethodInfo * const e_gdbus_book_view_method_info_pointers[] =
 static const GDBusInterfaceInfo _e_gdbus_book_view_interface_info =
 {
   -1,
-  (gchar *) "org.gnome.evolution.dataserver.addressbook.BookView",
+  (gchar *) "org.gnome.evolution.dataserver.AddressBookView",
   (GDBusMethodInfo **) &e_gdbus_book_view_method_info_pointers,
   (GDBusSignalInfo **) &e_gdbus_book_view_signal_info_pointers,
   (GDBusPropertyInfo **) NULL,
@@ -1355,7 +1355,7 @@ emit_notifications_in_idle (gpointer user_data)
                                      "org.freedesktop.DBus.Properties",
                                      "PropertiesChanged",
                                      g_variant_new ("(sa{sv}as)",
-                                                    "org.gnome.evolution.dataserver.addressbook.BookView",
+                                                    "org.gnome.evolution.dataserver.AddressBookView",
                                                     builder,
                                                     invalidated_builder),
                                      NULL);
@@ -1510,7 +1510,7 @@ e_gdbus_book_view_register_object (EGdbusBookView *object,
 /**
  * e_gdbus_book_view_interface_info:
  *
- * Gets interface description for the <literal>org.gnome.evolution.dataserver.addressbook.BookView</literal> D-Bus interface.
+ * Gets interface description for the <literal>org.gnome.evolution.dataserver.AddressBookView</literal> D-Bus interface.
  *
  * Returns: A #GDBusInterfaceInfo. Do not free, the object is statically allocated.
  */
@@ -1674,7 +1674,7 @@ e_gdbus_book_view_proxy_set_property (GObject      *object,
       g_dbus_proxy_call (G_DBUS_PROXY (object),
                          "org.freedesktop.DBus.Properties.Set",
                          g_variant_new ("(ssv)",
-                                        "org.gnome.evolution.dataserver.addressbook.BookView",
+                                        "org.gnome.evolution.dataserver.AddressBookView",
                                         property_name,
                                         new_value),
                          G_DBUS_CALL_FLAGS_NONE,
@@ -1766,7 +1766,7 @@ void e_gdbus_book_view_proxy_new (GDBusConnection     *connection,
                               "g-name", name,
                               "g-connection", connection,
                               "g-object-path", object_path,
-                              "g-interface-name", "org.gnome.evolution.dataserver.addressbook.BookView",
+                              "g-interface-name", "org.gnome.evolution.dataserver.AddressBookView",
                               NULL);
 }
 
@@ -1826,7 +1826,7 @@ EGdbusBookView *e_gdbus_book_view_proxy_new_sync (GDBusConnection     *connectio
                              "g-name", name,
                              "g-connection", connection,
                              "g-object-path", object_path,
-                             "g-interface-name", "org.gnome.evolution.dataserver.addressbook.BookView",
+                             "g-interface-name", "org.gnome.evolution.dataserver.AddressBookView",
                              NULL);
   if (initable != NULL)
     return E_GDBUS_BOOK_VIEW (initable);
@@ -1865,7 +1865,7 @@ void e_gdbus_book_view_proxy_new_for_bus (GBusType             bus_type,
                               "g-name", name,
                               "g-bus-type", bus_type,
                               "g-object-path", object_path,
-                              "g-interface-name", "org.gnome.evolution.dataserver.addressbook.BookView",
+                              "g-interface-name", "org.gnome.evolution.dataserver.AddressBookView",
                               NULL);
 }
 
@@ -1925,7 +1925,7 @@ EGdbusBookView *e_gdbus_book_view_proxy_new_for_bus_sync (GBusType             b
                              "g-name", name,
                              "g-bus-type", bus_type,
                              "g-object-path", object_path,
-                             "g-interface-name", "org.gnome.evolution.dataserver.addressbook.BookView",
+                             "g-interface-name", "org.gnome.evolution.dataserver.AddressBookView",
                              NULL);
   if (initable != NULL)
     return E_GDBUS_BOOK_VIEW (initable);
diff --git a/addressbook/libegdbus/e-gdbus-egdbusbookview.h b/addressbook/libegdbus/e-gdbus-egdbusbookview.h
index 7ef6399..53643de 100644
--- a/addressbook/libegdbus/e-gdbus-egdbusbookview.h
+++ b/addressbook/libegdbus/e-gdbus-egdbusbookview.h
@@ -1,7 +1,7 @@
 /* File:       e-gdbus-egdbusbookview.h
  *
  * GType name: EGdbusBookView
- * D-Bus name: org.gnome.evolution.dataserver.addressbook.BookView
+ * D-Bus name: org.gnome.evolution.dataserver.AddressBookView
  *
  * Generated by GDBus Binding Tool 0.1. DO NOT EDIT.
  */
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index 686f190..457fbc0 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -212,7 +212,7 @@ e_calendar_error_quark (void)
 static ECalendarStatus
 get_status_from_error (const GError *error)
 {
-	#define err(a,b) "org.gnome.evolution.dataserver.calendar.Cal." a, b
+	#define err(a,b) "org.gnome.evolution.dataserver.Calendar." a, b
 	static struct {
 		const gchar *name;
 		ECalendarStatus err_code;
@@ -702,8 +702,8 @@ e_cal_activate (GError **error)
 	cal_factory_proxy = e_gdbus_cal_factory_proxy_new_for_bus_sync (
 		G_BUS_TYPE_SESSION,
 		G_DBUS_PROXY_FLAGS_NONE,
-		"org.gnome.evolution.dataserver.Calendar",
-		"/org/gnome/evolution/dataserver/calendar/CalFactory",
+		CALENDAR_DBUS_SERVICE_NAME,
+		"/org/gnome/evolution/dataserver/CalendarFactory",
 		NULL,
 		error);
 
@@ -715,11 +715,11 @@ e_cal_activate (GError **error)
 	connection = g_dbus_proxy_get_connection (G_DBUS_PROXY (cal_factory_proxy));
 	g_dbus_connection_set_exit_on_close (connection, FALSE);
 	cal_connection_closed_id = g_dbus_connection_signal_subscribe (connection,
-		NULL,						/* sender */
-		"org.freedesktop.DBus",				/* interface */
-		"NameOwnerChanged",				/* member */
-		"/org/freedesktop/DBus",			/* object_path */
-		"org.gnome.evolution.dataserver.Calendar",	/* arg0 */
+		NULL,					/* sender */
+		"org.freedesktop.DBus",			/* interface */
+		"NameOwnerChanged",			/* member */
+		"/org/freedesktop/DBus",		/* object_path */
+		CALENDAR_DBUS_SERVICE_NAME,		/* arg0 */
 		G_DBUS_SIGNAL_FLAGS_NONE,
 		cal_factory_connection_gone_cb, NULL, NULL);
 
@@ -897,7 +897,7 @@ e_cal_new (ESource *source, ECalSourceType type)
 
 	priv->gdbus_cal = e_gdbus_cal_proxy_new_sync (g_dbus_proxy_get_connection (G_DBUS_PROXY (cal_factory_proxy)),
 						      G_DBUS_PROXY_FLAGS_NONE,
-						      "org.gnome.evolution.dataserver.Calendar",
+						      CALENDAR_DBUS_SERVICE_NAME,
 						      path,
 						      NULL,
 						      &error);
@@ -914,11 +914,11 @@ e_cal_new (ESource *source, ECalSourceType type)
 
 	connection = g_dbus_proxy_get_connection (G_DBUS_PROXY (priv->gdbus_cal));
 	priv->gone_signal_id = g_dbus_connection_signal_subscribe (connection,
-		"org.freedesktop.DBus",				/* sender */
-		"org.freedesktop.DBus",				/* interface */
-		"NameOwnerChanged",				/* member */
-		"/org/freedesktop/DBus",			/* object_path */
-		"org.gnome.evolution.dataserver.Calendar",	/* arg0 */
+		"org.freedesktop.DBus",			/* sender */
+		"org.freedesktop.DBus",			/* interface */
+		"NameOwnerChanged",			/* member */
+		"/org/freedesktop/DBus",		/* object_path */
+		CALENDAR_DBUS_SERVICE_NAME,		/* arg0 */
 		G_DBUS_SIGNAL_FLAGS_NONE,
 		gdbus_cal_connection_gone_cb, ecal, NULL);
 	g_signal_connect (connection, "closed", G_CALLBACK (gdbus_cal_closed_cb), ecal);
@@ -4060,7 +4060,7 @@ e_cal_get_query (ECal *ecal, const gchar *sexp, ECalView **query, GError **error
 
 	gdbus_calview = e_gdbus_cal_view_proxy_new_sync (g_dbus_proxy_get_connection (G_DBUS_PROXY (cal_factory_proxy)),
 							G_DBUS_PROXY_FLAGS_NONE,
-							"org.gnome.evolution.dataserver.Calendar",
+							CALENDAR_DBUS_SERVICE_NAME,
 							query_path,
 							NULL,
 							error);
diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c
index 379b066..2675f43 100644
--- a/calendar/libedata-cal/e-data-cal-factory.c
+++ b/calendar/libedata-cal/e-data-cal-factory.c
@@ -244,7 +244,7 @@ construct_cal_factory_path (void)
 	static volatile gint counter = 1;
 
 	return g_strdup_printf (
-		"/org/gnome/evolution/dataserver/calendar/%d/%u",
+		"/org/gnome/evolution/dataserver/Calendar/%d/%u",
 		getpid (), g_atomic_int_exchange_and_add (&counter, 1));
 }
 
@@ -822,9 +822,6 @@ offline_state_changed_cb (EOfflineListener *eol,
 		factory, state == EOL_STATE_ONLINE ? Remote : Local);
 }
 
-#define E_DATA_CAL_FACTORY_SERVICE_NAME \
-	"org.gnome.evolution.dataserver.Calendar"
-
 static void
 on_bus_acquired (GDBusConnection *connection,
                  const gchar     *name,
@@ -837,11 +834,11 @@ on_bus_acquired (GDBusConnection *connection,
 	registration_id = e_data_cal_factory_register_gdbus_object (
 		factory,
 		connection,
-		"/org/gnome/evolution/dataserver/calendar/CalFactory",
+		"/org/gnome/evolution/dataserver/CalendarFactory",
 		&error);
 
 	if (error)
-		die ("Failed to register a CalFactory object", error);
+		die ("Failed to register a CalendarFactory object", error);
 
 	g_assert (registration_id > 0);
 }
@@ -953,7 +950,7 @@ main (gint argc, gchar **argv)
 		G_CALLBACK (offline_state_changed_cb), factory);
 
 	owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
-		E_DATA_CAL_FACTORY_SERVICE_NAME,
+		CALENDAR_DBUS_SERVICE_NAME,
 		G_BUS_NAME_OWNER_FLAGS_NONE,
 		on_bus_acquired,
 		on_name_acquired,
diff --git a/calendar/libedata-cal/e-data-cal-factory.xml b/calendar/libedata-cal/e-data-cal-factory.xml
index 99a7f49..2cf555c 100644
--- a/calendar/libedata-cal/e-data-cal-factory.xml
+++ b/calendar/libedata-cal/e-data-cal-factory.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<node name="/org/gnome/evolution/dataserver/calendar/CalFactory">
+<node name="/org/gnome/evolution/dataserver/CalendarFactory">
 
-	<interface name="org.gnome.evolution.dataserver.calendar.CalFactory">
+	<interface name="org.gnome.evolution.dataserver.CalendarFactory">
 		<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="EDataCalFactory"/>
 		<annotation name="org.freedesktop.DBus.GLib.Singleton" value="true"/>
 		
diff --git a/calendar/libedata-cal/e-data-cal-view.xml b/calendar/libedata-cal/e-data-cal-view.xml
index beb32d9..9c98e19 100644
--- a/calendar/libedata-cal/e-data-cal-view.xml
+++ b/calendar/libedata-cal/e-data-cal-view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <node>
-  <interface name="org.gnome.evolution.dataserver.calendar.CalView">
+  <interface name="org.gnome.evolution.dataserver.CalendarView">
     <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="EDataCalView"/>
     
     <method name="start">
diff --git a/calendar/libedata-cal/e-data-cal.c b/calendar/libedata-cal/e-data-cal.c
index f03e104..d659d4d 100644
--- a/calendar/libedata-cal/e-data-cal.c
+++ b/calendar/libedata-cal/e-data-cal.c
@@ -55,7 +55,7 @@ struct _EDataCalPrivate {
 GQuark
 e_data_cal_error_quark (void)
 {
-	#define ERR_PREFIX "org.gnome.evolution.dataserver.calendar.Cal."
+	#define ERR_PREFIX "org.gnome.evolution.dataserver.Calendar."
 
 	static const GDBusErrorEntry entries[] = {
 		{ Success,				ERR_PREFIX "Success" },
@@ -458,7 +458,7 @@ static gchar *
 construct_calview_path (void)
 {
 	static guint counter = 1;
-	return g_strdup_printf ("/org/gnome/evolution/dataserver/calendar/CalView/%d/%d", getpid(), counter++);
+	return g_strdup_printf ("/org/gnome/evolution/dataserver/CalendarView/%d/%d", getpid(), counter++);
 }
 
 /* EDataCal::getQuery method */
diff --git a/calendar/libedata-cal/e-data-cal.xml b/calendar/libedata-cal/e-data-cal.xml
index 8076710..95717d9 100644
--- a/calendar/libedata-cal/e-data-cal.xml
+++ b/calendar/libedata-cal/e-data-cal.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <node>
-	<interface name="org.gnome.evolution.dataserver.calendar.Cal">
+	<interface name="org.gnome.evolution.dataserver.Calendar">
 		<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="EDataCal"/>
 		
 		<signal name="auth_required"/>
diff --git a/calendar/libedata-cal/org.gnome.evolution.dataserver.Calendar.service.in b/calendar/libedata-cal/org.gnome.evolution.dataserver.Calendar.service.in
index 80f47e7..c23c276 100644
--- a/calendar/libedata-cal/org.gnome.evolution.dataserver.Calendar.service.in
+++ b/calendar/libedata-cal/org.gnome.evolution.dataserver.Calendar.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.gnome.evolution.dataserver.Calendar
-Exec= LIBEXECDIR@/e-calendar-factory EXEEXT@
+Name= CALENDAR_DBUS_SERVICE_NAME@
+Exec= libexecdir@/e-calendar-factory
diff --git a/calendar/libegdbus/e-gdbus-egdbuscal.c b/calendar/libegdbus/e-gdbus-egdbuscal.c
index 5d68a42..3b83b73 100644
--- a/calendar/libegdbus/e-gdbus-egdbuscal.c
+++ b/calendar/libegdbus/e-gdbus-egdbuscal.c
@@ -1,7 +1,7 @@
 /* File:       e-gdbus-egdbuscal.c
  *
  * GType name: EGdbusCal
- * D-Bus name: org.gnome.evolution.dataserver.calendar.Cal
+ * D-Bus name: org.gnome.evolution.dataserver.Calendar
  *
  * Generated by GDBus Binding Tool 0.1. DO NOT EDIT.
  */
@@ -9,10 +9,10 @@
 /**
  * SECTION:e-gdbus-egdbuscal
  * @title: EGdbusCal
- * @short_description: Wraps the org.gnome.evolution.dataserver.calendar.Cal D-Bus interface
+ * @short_description: Wraps the org.gnome.evolution.dataserver.Calendar D-Bus interface
  * @include: gio/gio.h
  *
- * The abstract #EGdbusCal interface type wraps the <literal>org.gnome.evolution.dataserver.calendar.Cal</literal> D-Bus interface. Two concrete implementations of this type are included: #EGdbusCalProxy and #EGdbusCalStub.
+ * The abstract #EGdbusCal interface type wraps the <literal>org.gnome.evolution.dataserver.Calendar</literal> D-Bus interface. Two concrete implementations of this type are included: #EGdbusCalProxy and #EGdbusCalStub.
  *
  * The generated proxy type #EGdbusCalProxy is typically used with the generated constructors e_gdbus_cal_proxy_new(), e_gdbus_cal_proxy_new_sync() and e_gdbus_cal_proxy_new_for_bus(), e_gdbus_cal_proxy_new_for_bus_sync().
  *
@@ -171,7 +171,7 @@ signal_emission_hook_cb_auth_required (GSignalInvocationHint *ihint,
   g_dbus_connection_emit_signal (connection,
                                  NULL,
                                  path,
-                                 "org.gnome.evolution.dataserver.calendar.Cal",
+                                 "org.gnome.evolution.dataserver.Calendar",
                                  "auth_required",
                                  params,
                                  NULL);
@@ -212,7 +212,7 @@ signal_emission_hook_cb_backend_error (GSignalInvocationHint *ihint,
   g_dbus_connection_emit_signal (connection,
                                  NULL,
                                  path,
-                                 "org.gnome.evolution.dataserver.calendar.Cal",
+                                 "org.gnome.evolution.dataserver.Calendar",
                                  "backend_error",
                                  params,
                                  NULL);
@@ -253,7 +253,7 @@ signal_emission_hook_cb_readonly (GSignalInvocationHint *ihint,
   g_dbus_connection_emit_signal (connection,
                                  NULL,
                                  path,
-                                 "org.gnome.evolution.dataserver.calendar.Cal",
+                                 "org.gnome.evolution.dataserver.Calendar",
                                  "readonly",
                                  params,
                                  NULL);
@@ -294,7 +294,7 @@ signal_emission_hook_cb_mode (GSignalInvocationHint *ihint,
   g_dbus_connection_emit_signal (connection,
                                  NULL,
                                  path,
-                                 "org.gnome.evolution.dataserver.calendar.Cal",
+                                 "org.gnome.evolution.dataserver.Calendar",
                                  "mode",
                                  params,
                                  NULL);
@@ -1204,7 +1204,7 @@ e_gdbus_cal_default_init (EGdbusCalIface *iface)
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getUri</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.getUri</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -1239,7 +1239,7 @@ void e_gdbus_cal_call_get_uri (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_get_uri().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.getUri</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.getUri</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -1273,7 +1273,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getUri</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.getUri</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -1318,7 +1318,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getCacheDir</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.getCacheDir</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -1353,7 +1353,7 @@ void e_gdbus_cal_call_get_cache_dir (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_get_cache_dir().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.getCacheDir</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.getCacheDir</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -1387,7 +1387,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getCacheDir</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.getCacheDir</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -1435,7 +1435,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.open</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.open</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -1475,7 +1475,7 @@ void e_gdbus_cal_call_open (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_open().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.open</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.open</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -1505,7 +1505,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.open</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.open</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -1550,7 +1550,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.refresh</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.refresh</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -1584,7 +1584,7 @@ void e_gdbus_cal_call_refresh (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_refresh().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.refresh</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.refresh</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -1611,7 +1611,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.refresh</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.refresh</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -1650,7 +1650,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.close</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.close</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -1684,7 +1684,7 @@ void e_gdbus_cal_call_close (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_close().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.close</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.close</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -1711,7 +1711,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.close</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.close</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -1750,7 +1750,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.remove</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.remove</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -1784,7 +1784,7 @@ void e_gdbus_cal_call_remove (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_remove().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.remove</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.remove</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -1811,7 +1811,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.remove</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.remove</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -1850,7 +1850,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.isReadOnly</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.isReadOnly</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -1884,7 +1884,7 @@ void e_gdbus_cal_call_is_read_only (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_is_read_only().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.isReadOnly</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.isReadOnly</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -1911,7 +1911,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.isReadOnly</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.isReadOnly</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -1950,7 +1950,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getCalAddress</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.getCalAddress</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -1985,7 +1985,7 @@ void e_gdbus_cal_call_get_cal_address (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_get_cal_address().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.getCalAddress</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.getCalAddress</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -2019,7 +2019,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getCalAddress</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.getCalAddress</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -2064,7 +2064,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getAlarmEmailAddress</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.getAlarmEmailAddress</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -2099,7 +2099,7 @@ void e_gdbus_cal_call_get_alarm_email_address (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_get_alarm_email_address().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.getAlarmEmailAddress</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.getAlarmEmailAddress</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -2133,7 +2133,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getAlarmEmailAddress</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.getAlarmEmailAddress</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -2178,7 +2178,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getLdapAttribute</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.getLdapAttribute</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -2213,7 +2213,7 @@ void e_gdbus_cal_call_get_ldap_attribute (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_get_ldap_attribute().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.getLdapAttribute</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.getLdapAttribute</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -2247,7 +2247,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getLdapAttribute</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.getLdapAttribute</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -2292,7 +2292,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getSchedulingInformation</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.getSchedulingInformation</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -2327,7 +2327,7 @@ void e_gdbus_cal_call_get_scheduling_information (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_get_scheduling_information().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.getSchedulingInformation</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.getSchedulingInformation</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -2361,7 +2361,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getSchedulingInformation</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.getSchedulingInformation</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -2407,7 +2407,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.setMode</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.setMode</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -2443,7 +2443,7 @@ void e_gdbus_cal_call_set_mode (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_set_mode().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.setMode</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.setMode</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -2471,7 +2471,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.setMode</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.setMode</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -2512,7 +2512,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getDefaultObject</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.getDefaultObject</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -2547,7 +2547,7 @@ void e_gdbus_cal_call_get_default_object (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_get_default_object().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.getDefaultObject</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.getDefaultObject</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -2581,7 +2581,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getDefaultObject</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.getDefaultObject</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -2628,7 +2628,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getObject</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.getObject</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -2667,7 +2667,7 @@ void e_gdbus_cal_call_get_object (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_get_object().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.getObject</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.getObject</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -2703,7 +2703,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getObject</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.getObject</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -2753,7 +2753,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getObjectList</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.getObjectList</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -2790,7 +2790,7 @@ void e_gdbus_cal_call_get_object_list (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_get_object_list().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.getObjectList</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.getObjectList</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -2825,7 +2825,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getObjectList</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.getObjectList</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -2873,7 +2873,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getChanges</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.getChanges</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -2912,7 +2912,7 @@ void e_gdbus_cal_call_get_changes (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_get_changes().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.getChanges</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.getChanges</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -2953,7 +2953,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getChanges</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.getChanges</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -3007,7 +3007,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getFreeBusy</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.getFreeBusy</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -3048,7 +3048,7 @@ void e_gdbus_cal_call_get_free_busy (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_get_free_busy().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.getFreeBusy</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.getFreeBusy</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -3085,7 +3085,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getFreeBusy</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.getFreeBusy</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -3138,7 +3138,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.discardAlarm</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.discardAlarm</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -3176,7 +3176,7 @@ void e_gdbus_cal_call_discard_alarm (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_discard_alarm().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.discardAlarm</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.discardAlarm</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -3205,7 +3205,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.discardAlarm</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.discardAlarm</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -3249,7 +3249,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.createObject</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.createObject</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -3286,7 +3286,7 @@ void e_gdbus_cal_call_create_object (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_create_object().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.createObject</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.createObject</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -3321,7 +3321,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.createObject</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.createObject</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -3370,7 +3370,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.modifyObject</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.modifyObject</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -3408,7 +3408,7 @@ void e_gdbus_cal_call_modify_object (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_modify_object().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.modifyObject</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.modifyObject</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -3437,7 +3437,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.modifyObject</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.modifyObject</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -3483,7 +3483,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.removeObject</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.removeObject</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -3523,7 +3523,7 @@ void e_gdbus_cal_call_remove_object (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_remove_object().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.removeObject</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.removeObject</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -3553,7 +3553,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.removeObject</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.removeObject</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -3599,7 +3599,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.receiveObjects</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.receiveObjects</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -3635,7 +3635,7 @@ void e_gdbus_cal_call_receive_objects (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_receive_objects().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.receiveObjects</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.receiveObjects</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -3663,7 +3663,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.receiveObjects</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.receiveObjects</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -3705,7 +3705,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.sendObjects</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.sendObjects</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -3743,7 +3743,7 @@ void e_gdbus_cal_call_send_objects (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_send_objects().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.sendObjects</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.sendObjects</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -3781,7 +3781,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.sendObjects</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.sendObjects</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -3832,7 +3832,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getAttachmentList</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.getAttachmentList</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -3871,7 +3871,7 @@ void e_gdbus_cal_call_get_attachment_list (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_get_attachment_list().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.getAttachmentList</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.getAttachmentList</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -3907,7 +3907,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getAttachmentList</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.getAttachmentList</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -3957,7 +3957,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getQuery</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.getQuery</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -3994,7 +3994,7 @@ void e_gdbus_cal_call_get_query (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_get_query().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.getQuery</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.getQuery</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -4029,7 +4029,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getQuery</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.getQuery</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -4077,7 +4077,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getTimezone</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.getTimezone</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -4114,7 +4114,7 @@ void e_gdbus_cal_call_get_timezone (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_get_timezone().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.getTimezone</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.getTimezone</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -4149,7 +4149,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.getTimezone</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.getTimezone</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -4197,7 +4197,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.addTimezone</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.addTimezone</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -4233,7 +4233,7 @@ void e_gdbus_cal_call_add_timezone (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_add_timezone().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.addTimezone</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.addTimezone</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -4261,7 +4261,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.addTimezone</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.addTimezone</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -4303,7 +4303,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.setDefaultTimezone</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.Calendar.setDefaultTimezone</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -4339,7 +4339,7 @@ void e_gdbus_cal_call_set_default_timezone (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_call_set_default_timezone().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.Cal.setDefaultTimezone</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.Calendar.setDefaultTimezone</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -4367,7 +4367,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.Cal.setDefaultTimezone</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.Calendar.setDefaultTimezone</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -4407,7 +4407,7 @@ _out:
  * @invocation: A #GDBusMethodInvocation.
  * @out_str_uri_copy: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.getUri</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.getUri</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4432,7 +4432,7 @@ void e_gdbus_cal_complete_get_uri (
  * @invocation: A #GDBusMethodInvocation.
  * @out_dirname: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.getCacheDir</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.getCacheDir</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4456,7 +4456,7 @@ void e_gdbus_cal_complete_get_cache_dir (
  * @object: A #EGdbusCal.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.open</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.open</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4476,7 +4476,7 @@ void e_gdbus_cal_complete_open (
  * @object: A #EGdbusCal.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.refresh</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.refresh</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4496,7 +4496,7 @@ void e_gdbus_cal_complete_refresh (
  * @object: A #EGdbusCal.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.close</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.close</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4516,7 +4516,7 @@ void e_gdbus_cal_complete_close (
  * @object: A #EGdbusCal.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.remove</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.remove</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4536,7 +4536,7 @@ void e_gdbus_cal_complete_remove (
  * @object: A #EGdbusCal.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.isReadOnly</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.isReadOnly</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4557,7 +4557,7 @@ void e_gdbus_cal_complete_is_read_only (
  * @invocation: A #GDBusMethodInvocation.
  * @out_address: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.getCalAddress</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.getCalAddress</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4582,7 +4582,7 @@ void e_gdbus_cal_complete_get_cal_address (
  * @invocation: A #GDBusMethodInvocation.
  * @out_address: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.getAlarmEmailAddress</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.getAlarmEmailAddress</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4607,7 +4607,7 @@ void e_gdbus_cal_complete_get_alarm_email_address (
  * @invocation: A #GDBusMethodInvocation.
  * @out_address: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.getLdapAttribute</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.getLdapAttribute</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4632,7 +4632,7 @@ void e_gdbus_cal_complete_get_ldap_attribute (
  * @invocation: A #GDBusMethodInvocation.
  * @out_capabilities: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.getSchedulingInformation</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.getSchedulingInformation</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4656,7 +4656,7 @@ void e_gdbus_cal_complete_get_scheduling_information (
  * @object: A #EGdbusCal.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.setMode</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.setMode</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4677,7 +4677,7 @@ void e_gdbus_cal_complete_set_mode (
  * @invocation: A #GDBusMethodInvocation.
  * @out_object: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.getDefaultObject</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.getDefaultObject</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4702,7 +4702,7 @@ void e_gdbus_cal_complete_get_default_object (
  * @invocation: A #GDBusMethodInvocation.
  * @out_object: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.getObject</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.getObject</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4727,7 +4727,7 @@ void e_gdbus_cal_complete_get_object (
  * @invocation: A #GDBusMethodInvocation.
  * @out_objects: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.getObjectList</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.getObjectList</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4754,7 +4754,7 @@ void e_gdbus_cal_complete_get_object_list (
  * @out_modifications: Value to return.
  * @out_removals: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.getChanges</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.getChanges</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4783,7 +4783,7 @@ void e_gdbus_cal_complete_get_changes (
  * @invocation: A #GDBusMethodInvocation.
  * @out_freebusy: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.getFreeBusy</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.getFreeBusy</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4807,7 +4807,7 @@ void e_gdbus_cal_complete_get_free_busy (
  * @object: A #EGdbusCal.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.discardAlarm</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.discardAlarm</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4828,7 +4828,7 @@ void e_gdbus_cal_complete_discard_alarm (
  * @invocation: A #GDBusMethodInvocation.
  * @out_uid: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.createObject</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.createObject</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4852,7 +4852,7 @@ void e_gdbus_cal_complete_create_object (
  * @object: A #EGdbusCal.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.modifyObject</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.modifyObject</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4872,7 +4872,7 @@ void e_gdbus_cal_complete_modify_object (
  * @object: A #EGdbusCal.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.removeObject</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.removeObject</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4892,7 +4892,7 @@ void e_gdbus_cal_complete_remove_object (
  * @object: A #EGdbusCal.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.receiveObjects</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.receiveObjects</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4914,7 +4914,7 @@ void e_gdbus_cal_complete_receive_objects (
  * @out_users: Value to return.
  * @out_calobj: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.sendObjects</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.sendObjects</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4941,7 +4941,7 @@ void e_gdbus_cal_complete_send_objects (
  * @invocation: A #GDBusMethodInvocation.
  * @out_attachments: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.getAttachmentList</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.getAttachmentList</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4966,7 +4966,7 @@ void e_gdbus_cal_complete_get_attachment_list (
  * @invocation: A #GDBusMethodInvocation.
  * @out_query: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.getQuery</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.getQuery</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -4991,7 +4991,7 @@ void e_gdbus_cal_complete_get_query (
  * @invocation: A #GDBusMethodInvocation.
  * @out_object: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.getTimezone</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.getTimezone</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -5015,7 +5015,7 @@ void e_gdbus_cal_complete_get_timezone (
  * @object: A #EGdbusCal.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.addTimezone</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.addTimezone</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -5035,7 +5035,7 @@ void e_gdbus_cal_complete_add_timezone (
  * @object: A #EGdbusCal.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.Cal.setDefaultTimezone</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.Calendar.setDefaultTimezone</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -5054,7 +5054,7 @@ void e_gdbus_cal_complete_set_default_timezone (
  * e_gdbus_cal_emit_auth_required:
  * @object: A #EGdbusCal.
  *
- * Emits the <literal>org.gnome.evolution.dataserver.calendar.Cal.auth_required</literal>
+ * Emits the <literal>org.gnome.evolution.dataserver.Calendar.auth_required</literal>
  * D-Bus signal.
  */
 void e_gdbus_cal_emit_auth_required (
@@ -5068,7 +5068,7 @@ void e_gdbus_cal_emit_auth_required (
  * @object: A #EGdbusCal.
  * @arg_error: Signal parameter.
  *
- * Emits the <literal>org.gnome.evolution.dataserver.calendar.Cal.backend_error</literal>
+ * Emits the <literal>org.gnome.evolution.dataserver.Calendar.backend_error</literal>
  * D-Bus signal.
  */
 void e_gdbus_cal_emit_backend_error (
@@ -5083,7 +5083,7 @@ void e_gdbus_cal_emit_backend_error (
  * @object: A #EGdbusCal.
  * @arg_is_readonly: Signal parameter.
  *
- * Emits the <literal>org.gnome.evolution.dataserver.calendar.Cal.readonly</literal>
+ * Emits the <literal>org.gnome.evolution.dataserver.Calendar.readonly</literal>
  * D-Bus signal.
  */
 void e_gdbus_cal_emit_readonly (
@@ -5098,7 +5098,7 @@ void e_gdbus_cal_emit_readonly (
  * @object: A #EGdbusCal.
  * @arg_mode: Signal parameter.
  *
- * Emits the <literal>org.gnome.evolution.dataserver.calendar.Cal.mode</literal>
+ * Emits the <literal>org.gnome.evolution.dataserver.Calendar.mode</literal>
  * D-Bus signal.
  */
 void e_gdbus_cal_emit_mode (
@@ -6009,7 +6009,7 @@ static const GDBusMethodInfo * const e_gdbus_cal_method_info_pointers[] =
 static const GDBusInterfaceInfo _e_gdbus_cal_interface_info =
 {
   -1,
-  (gchar *) "org.gnome.evolution.dataserver.calendar.Cal",
+  (gchar *) "org.gnome.evolution.dataserver.Calendar",
   (GDBusMethodInfo **) &e_gdbus_cal_method_info_pointers,
   (GDBusSignalInfo **) &e_gdbus_cal_signal_info_pointers,
   (GDBusPropertyInfo **) NULL,
@@ -6573,7 +6573,7 @@ emit_notifications_in_idle (gpointer user_data)
                                      "org.freedesktop.DBus.Properties",
                                      "PropertiesChanged",
                                      g_variant_new ("(sa{sv}as)",
-                                                    "org.gnome.evolution.dataserver.calendar.Cal",
+                                                    "org.gnome.evolution.dataserver.Calendar",
                                                     builder,
                                                     invalidated_builder),
                                      NULL);
@@ -6728,7 +6728,7 @@ e_gdbus_cal_register_object (EGdbusCal *object,
 /**
  * e_gdbus_cal_interface_info:
  *
- * Gets interface description for the <literal>org.gnome.evolution.dataserver.calendar.Cal</literal> D-Bus interface.
+ * Gets interface description for the <literal>org.gnome.evolution.dataserver.Calendar</literal> D-Bus interface.
  *
  * Returns: A #GDBusInterfaceInfo. Do not free, the object is statically allocated.
  */
@@ -6871,7 +6871,7 @@ e_gdbus_cal_proxy_set_property (GObject      *object,
       g_dbus_proxy_call (G_DBUS_PROXY (object),
                          "org.freedesktop.DBus.Properties.Set",
                          g_variant_new ("(ssv)",
-                                        "org.gnome.evolution.dataserver.calendar.Cal",
+                                        "org.gnome.evolution.dataserver.Calendar",
                                         property_name,
                                         new_value),
                          G_DBUS_CALL_FLAGS_NONE,
@@ -6963,7 +6963,7 @@ void e_gdbus_cal_proxy_new (GDBusConnection     *connection,
                               "g-name", name,
                               "g-connection", connection,
                               "g-object-path", object_path,
-                              "g-interface-name", "org.gnome.evolution.dataserver.calendar.Cal",
+                              "g-interface-name", "org.gnome.evolution.dataserver.Calendar",
                               NULL);
 }
 
@@ -7023,7 +7023,7 @@ EGdbusCal *e_gdbus_cal_proxy_new_sync (GDBusConnection     *connection,
                              "g-name", name,
                              "g-connection", connection,
                              "g-object-path", object_path,
-                             "g-interface-name", "org.gnome.evolution.dataserver.calendar.Cal",
+                             "g-interface-name", "org.gnome.evolution.dataserver.Calendar",
                              NULL);
   if (initable != NULL)
     return E_GDBUS_CAL (initable);
@@ -7062,7 +7062,7 @@ void e_gdbus_cal_proxy_new_for_bus (GBusType             bus_type,
                               "g-name", name,
                               "g-bus-type", bus_type,
                               "g-object-path", object_path,
-                              "g-interface-name", "org.gnome.evolution.dataserver.calendar.Cal",
+                              "g-interface-name", "org.gnome.evolution.dataserver.Calendar",
                               NULL);
 }
 
@@ -7122,7 +7122,7 @@ EGdbusCal *e_gdbus_cal_proxy_new_for_bus_sync (GBusType             bus_type,
                              "g-name", name,
                              "g-bus-type", bus_type,
                              "g-object-path", object_path,
-                             "g-interface-name", "org.gnome.evolution.dataserver.calendar.Cal",
+                             "g-interface-name", "org.gnome.evolution.dataserver.Calendar",
                              NULL);
   if (initable != NULL)
     return E_GDBUS_CAL (initable);
diff --git a/calendar/libegdbus/e-gdbus-egdbuscal.h b/calendar/libegdbus/e-gdbus-egdbuscal.h
index e2420d2..7b3f57d 100644
--- a/calendar/libegdbus/e-gdbus-egdbuscal.h
+++ b/calendar/libegdbus/e-gdbus-egdbuscal.h
@@ -1,7 +1,7 @@
 /* File:       e-gdbus-egdbuscal.h
  *
  * GType name: EGdbusCal
- * D-Bus name: org.gnome.evolution.dataserver.calendar.Cal
+ * D-Bus name: org.gnome.evolution.dataserver.Calendar
  *
  * Generated by GDBus Binding Tool 0.1. DO NOT EDIT.
  */
diff --git a/calendar/libegdbus/e-gdbus-egdbuscalfactory.c b/calendar/libegdbus/e-gdbus-egdbuscalfactory.c
index 832759e..7670719 100644
--- a/calendar/libegdbus/e-gdbus-egdbuscalfactory.c
+++ b/calendar/libegdbus/e-gdbus-egdbuscalfactory.c
@@ -1,7 +1,7 @@
 /* File:       e-gdbus-egdbuscalfactory.c
  *
  * GType name: EGdbusCalFactory
- * D-Bus name: org.gnome.evolution.dataserver.calendar.CalFactory
+ * D-Bus name: org.gnome.evolution.dataserver.CalendarFactory
  *
  * Generated by GDBus Binding Tool 0.1. DO NOT EDIT.
  */
@@ -9,10 +9,10 @@
 /**
  * SECTION:e-gdbus-egdbuscalfactory
  * @title: EGdbusCalFactory
- * @short_description: Wraps the org.gnome.evolution.dataserver.calendar.CalFactory D-Bus interface
+ * @short_description: Wraps the org.gnome.evolution.dataserver.CalendarFactory D-Bus interface
  * @include: gio/gio.h
  *
- * The abstract #EGdbusCalFactory interface type wraps the <literal>org.gnome.evolution.dataserver.calendar.CalFactory</literal> D-Bus interface. Two concrete implementations of this type are included: #EGdbusCalFactoryProxy and #EGdbusCalFactoryStub.
+ * The abstract #EGdbusCalFactory interface type wraps the <literal>org.gnome.evolution.dataserver.CalendarFactory</literal> D-Bus interface. Two concrete implementations of this type are included: #EGdbusCalFactoryProxy and #EGdbusCalFactoryStub.
  *
  * The generated proxy type #EGdbusCalFactoryProxy is typically used with the generated constructors e_gdbus_cal_factory_proxy_new(), e_gdbus_cal_factory_proxy_new_sync() and e_gdbus_cal_factory_proxy_new_for_bus(), e_gdbus_cal_factory_proxy_new_for_bus_sync().
  *
@@ -174,7 +174,7 @@ e_gdbus_cal_factory_default_init (EGdbusCalFactoryIface *iface)
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.CalFactory.getCal</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.CalendarFactory.getCal</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -213,7 +213,7 @@ void e_gdbus_cal_factory_call_get_cal (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_factory_call_get_cal().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.CalFactory.getCal</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.CalendarFactory.getCal</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -249,7 +249,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.CalFactory.getCal</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.CalendarFactory.getCal</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -297,7 +297,7 @@ _out:
  * @invocation: A #GDBusMethodInvocation.
  * @out_path: Value to return.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.CalFactory.getCal</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.CalendarFactory.getCal</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -368,7 +368,7 @@ static const GDBusMethodInfo * const e_gdbus_cal_factory_method_info_pointers[]
 static const GDBusInterfaceInfo _e_gdbus_cal_factory_interface_info =
 {
   -1,
-  (gchar *) "org.gnome.evolution.dataserver.calendar.CalFactory",
+  (gchar *) "org.gnome.evolution.dataserver.CalendarFactory",
   (GDBusMethodInfo **) &e_gdbus_cal_factory_method_info_pointers,
   (GDBusSignalInfo **) NULL,
   (GDBusPropertyInfo **) NULL,
@@ -525,7 +525,7 @@ emit_notifications_in_idle (gpointer user_data)
                                      "org.freedesktop.DBus.Properties",
                                      "PropertiesChanged",
                                      g_variant_new ("(sa{sv}as)",
-                                                    "org.gnome.evolution.dataserver.calendar.CalFactory",
+                                                    "org.gnome.evolution.dataserver.CalendarFactory",
                                                     builder,
                                                     invalidated_builder),
                                      NULL);
@@ -680,7 +680,7 @@ e_gdbus_cal_factory_register_object (EGdbusCalFactory *object,
 /**
  * e_gdbus_cal_factory_interface_info:
  *
- * Gets interface description for the <literal>org.gnome.evolution.dataserver.calendar.CalFactory</literal> D-Bus interface.
+ * Gets interface description for the <literal>org.gnome.evolution.dataserver.CalendarFactory</literal> D-Bus interface.
  *
  * Returns: A #GDBusInterfaceInfo. Do not free, the object is statically allocated.
  */
@@ -779,7 +779,7 @@ e_gdbus_cal_factory_proxy_set_property (GObject      *object,
       g_dbus_proxy_call (G_DBUS_PROXY (object),
                          "org.freedesktop.DBus.Properties.Set",
                          g_variant_new ("(ssv)",
-                                        "org.gnome.evolution.dataserver.calendar.CalFactory",
+                                        "org.gnome.evolution.dataserver.CalendarFactory",
                                         property_name,
                                         new_value),
                          G_DBUS_CALL_FLAGS_NONE,
@@ -871,7 +871,7 @@ void e_gdbus_cal_factory_proxy_new (GDBusConnection     *connection,
                               "g-name", name,
                               "g-connection", connection,
                               "g-object-path", object_path,
-                              "g-interface-name", "org.gnome.evolution.dataserver.calendar.CalFactory",
+                              "g-interface-name", "org.gnome.evolution.dataserver.CalendarFactory",
                               NULL);
 }
 
@@ -931,7 +931,7 @@ EGdbusCalFactory *e_gdbus_cal_factory_proxy_new_sync (GDBusConnection     *conne
                              "g-name", name,
                              "g-connection", connection,
                              "g-object-path", object_path,
-                             "g-interface-name", "org.gnome.evolution.dataserver.calendar.CalFactory",
+                             "g-interface-name", "org.gnome.evolution.dataserver.CalendarFactory",
                              NULL);
   if (initable != NULL)
     return E_GDBUS_CAL_FACTORY (initable);
@@ -970,7 +970,7 @@ void e_gdbus_cal_factory_proxy_new_for_bus (GBusType             bus_type,
                               "g-name", name,
                               "g-bus-type", bus_type,
                               "g-object-path", object_path,
-                              "g-interface-name", "org.gnome.evolution.dataserver.calendar.CalFactory",
+                              "g-interface-name", "org.gnome.evolution.dataserver.CalendarFactory",
                               NULL);
 }
 
@@ -1030,7 +1030,7 @@ EGdbusCalFactory *e_gdbus_cal_factory_proxy_new_for_bus_sync (GBusType
                              "g-name", name,
                              "g-bus-type", bus_type,
                              "g-object-path", object_path,
-                             "g-interface-name", "org.gnome.evolution.dataserver.calendar.CalFactory",
+                             "g-interface-name", "org.gnome.evolution.dataserver.CalendarFactory",
                              NULL);
   if (initable != NULL)
     return E_GDBUS_CAL_FACTORY (initable);
diff --git a/calendar/libegdbus/e-gdbus-egdbuscalfactory.h b/calendar/libegdbus/e-gdbus-egdbuscalfactory.h
index 7255d00..da05dab 100644
--- a/calendar/libegdbus/e-gdbus-egdbuscalfactory.h
+++ b/calendar/libegdbus/e-gdbus-egdbuscalfactory.h
@@ -1,7 +1,7 @@
 /* File:       e-gdbus-egdbuscalfactory.h
  *
  * GType name: EGdbusCalFactory
- * D-Bus name: org.gnome.evolution.dataserver.calendar.CalFactory
+ * D-Bus name: org.gnome.evolution.dataserver.CalendarFactory
  *
  * Generated by GDBus Binding Tool 0.1. DO NOT EDIT.
  */
diff --git a/calendar/libegdbus/e-gdbus-egdbuscalview.c b/calendar/libegdbus/e-gdbus-egdbuscalview.c
index 970835e..b97b176 100644
--- a/calendar/libegdbus/e-gdbus-egdbuscalview.c
+++ b/calendar/libegdbus/e-gdbus-egdbuscalview.c
@@ -1,7 +1,7 @@
 /* File:       e-gdbus-egdbuscalview.c
  *
  * GType name: EGdbusCalView
- * D-Bus name: org.gnome.evolution.dataserver.calendar.CalView
+ * D-Bus name: org.gnome.evolution.dataserver.CalendarView
  *
  * Generated by GDBus Binding Tool 0.1. DO NOT EDIT.
  */
@@ -9,10 +9,10 @@
 /**
  * SECTION:e-gdbus-egdbuscalview
  * @title: EGdbusCalView
- * @short_description: Wraps the org.gnome.evolution.dataserver.calendar.CalView D-Bus interface
+ * @short_description: Wraps the org.gnome.evolution.dataserver.CalendarView D-Bus interface
  * @include: gio/gio.h
  *
- * The abstract #EGdbusCalView interface type wraps the <literal>org.gnome.evolution.dataserver.calendar.CalView</literal> D-Bus interface. Two concrete implementations of this type are included: #EGdbusCalViewProxy and #EGdbusCalViewStub.
+ * The abstract #EGdbusCalView interface type wraps the <literal>org.gnome.evolution.dataserver.CalendarView</literal> D-Bus interface. Two concrete implementations of this type are included: #EGdbusCalViewProxy and #EGdbusCalViewStub.
  *
  * The generated proxy type #EGdbusCalViewProxy is typically used with the generated constructors e_gdbus_cal_view_proxy_new(), e_gdbus_cal_view_proxy_new_sync() and e_gdbus_cal_view_proxy_new_for_bus(), e_gdbus_cal_view_proxy_new_for_bus_sync().
  *
@@ -156,7 +156,7 @@ signal_emission_hook_cb_objects_added (GSignalInvocationHint *ihint,
   g_dbus_connection_emit_signal (connection,
                                  NULL,
                                  path,
-                                 "org.gnome.evolution.dataserver.calendar.CalView",
+                                 "org.gnome.evolution.dataserver.CalendarView",
                                  "ObjectsAdded",
                                  params,
                                  NULL);
@@ -197,7 +197,7 @@ signal_emission_hook_cb_objects_modified (GSignalInvocationHint *ihint,
   g_dbus_connection_emit_signal (connection,
                                  NULL,
                                  path,
-                                 "org.gnome.evolution.dataserver.calendar.CalView",
+                                 "org.gnome.evolution.dataserver.CalendarView",
                                  "ObjectsModified",
                                  params,
                                  NULL);
@@ -238,7 +238,7 @@ signal_emission_hook_cb_objects_removed (GSignalInvocationHint *ihint,
   g_dbus_connection_emit_signal (connection,
                                  NULL,
                                  path,
-                                 "org.gnome.evolution.dataserver.calendar.CalView",
+                                 "org.gnome.evolution.dataserver.CalendarView",
                                  "ObjectsRemoved",
                                  params,
                                  NULL);
@@ -282,7 +282,7 @@ signal_emission_hook_cb_progress (GSignalInvocationHint *ihint,
   g_dbus_connection_emit_signal (connection,
                                  NULL,
                                  path,
-                                 "org.gnome.evolution.dataserver.calendar.CalView",
+                                 "org.gnome.evolution.dataserver.CalendarView",
                                  "Progress",
                                  params,
                                  NULL);
@@ -326,7 +326,7 @@ signal_emission_hook_cb_done (GSignalInvocationHint *ihint,
   g_dbus_connection_emit_signal (connection,
                                  NULL,
                                  path,
-                                 "org.gnome.evolution.dataserver.calendar.CalView",
+                                 "org.gnome.evolution.dataserver.CalendarView",
                                  "Done",
                                  params,
                                  NULL);
@@ -595,7 +595,7 @@ e_gdbus_cal_view_default_init (EGdbusCalViewIface *iface)
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.CalView.start</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.CalendarView.start</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -629,7 +629,7 @@ void e_gdbus_cal_view_call_start (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_view_call_start().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.CalView.start</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.CalendarView.start</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -656,7 +656,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.CalView.start</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.CalendarView.start</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -695,7 +695,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.CalView.stop</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.CalendarView.stop</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -729,7 +729,7 @@ void e_gdbus_cal_view_call_stop (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_view_call_stop().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.CalView.stop</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.CalendarView.stop</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -756,7 +756,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.CalView.stop</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.CalendarView.stop</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -795,7 +795,7 @@ _out:
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
  * @user_data: Data to pass to @callback.
  *
- * Invokes the <literal>org.gnome.evolution.dataserver.calendar.CalView.dispose</literal>
+ * Invokes the <literal>org.gnome.evolution.dataserver.CalendarView.dispose</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * This is an asynchronous method. When the operation is finished,
@@ -829,7 +829,7 @@ void e_gdbus_cal_view_call_dispose (
  * @res: A #GAsyncResult obtained from the #GAsyncReadyCallback passed to e_gdbus_cal_view_call_dispose().
  * @error: Return location for error or %NULL.
  *
- * Finishes invoking the <literal>org.gnome.evolution.dataserver.calendar.CalView.dispose</literal>
+ * Finishes invoking the <literal>org.gnome.evolution.dataserver.CalendarView.dispose</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * Returns: %TRUE if the call succeeded, %FALSE if @error is set.
@@ -856,7 +856,7 @@ _out:
  * @cancellable: A #GCancellable or %NULL.
  * @error: Return location for error or %NULL.
  *
- * Synchronously invokes the <literal>org.gnome.evolution.dataserver.calendar.CalView.dispose</literal>
+ * Synchronously invokes the <literal>org.gnome.evolution.dataserver.CalendarView.dispose</literal>
  * D-Bus method on the remote object represented by @proxy.
  *
  * The calling thread is blocked until a reply is received. See
@@ -893,7 +893,7 @@ _out:
  * @object: A #EGdbusCalView.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.CalView.start</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.CalendarView.start</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -913,7 +913,7 @@ void e_gdbus_cal_view_complete_start (
  * @object: A #EGdbusCalView.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.CalView.stop</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.CalendarView.stop</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -933,7 +933,7 @@ void e_gdbus_cal_view_complete_stop (
  * @object: A #EGdbusCalView.
  * @invocation: A #GDBusMethodInvocation.
  *
- * Completes handling the <literal>org.gnome.evolution.dataserver.calendar.CalView.dispose</literal>
+ * Completes handling the <literal>org.gnome.evolution.dataserver.CalendarView.dispose</literal>
  * D-Bus method invocation by returning a value.
  *
  * If you want to return an error, use g_dbus_method_invocation_return_error()
@@ -953,7 +953,7 @@ void e_gdbus_cal_view_complete_dispose (
  * @object: A #EGdbusCalView.
  * @arg_objects: Signal parameter.
  *
- * Emits the <literal>org.gnome.evolution.dataserver.calendar.CalView.ObjectsAdded</literal>
+ * Emits the <literal>org.gnome.evolution.dataserver.CalendarView.ObjectsAdded</literal>
  * D-Bus signal.
  */
 void e_gdbus_cal_view_emit_objects_added (
@@ -968,7 +968,7 @@ void e_gdbus_cal_view_emit_objects_added (
  * @object: A #EGdbusCalView.
  * @arg_objects: Signal parameter.
  *
- * Emits the <literal>org.gnome.evolution.dataserver.calendar.CalView.ObjectsModified</literal>
+ * Emits the <literal>org.gnome.evolution.dataserver.CalendarView.ObjectsModified</literal>
  * D-Bus signal.
  */
 void e_gdbus_cal_view_emit_objects_modified (
@@ -983,7 +983,7 @@ void e_gdbus_cal_view_emit_objects_modified (
  * @object: A #EGdbusCalView.
  * @arg_ids: Signal parameter.
  *
- * Emits the <literal>org.gnome.evolution.dataserver.calendar.CalView.ObjectsRemoved</literal>
+ * Emits the <literal>org.gnome.evolution.dataserver.CalendarView.ObjectsRemoved</literal>
  * D-Bus signal.
  */
 void e_gdbus_cal_view_emit_objects_removed (
@@ -999,7 +999,7 @@ void e_gdbus_cal_view_emit_objects_removed (
  * @arg_message: Signal parameter.
  * @arg_progress: Signal parameter.
  *
- * Emits the <literal>org.gnome.evolution.dataserver.calendar.CalView.Progress</literal>
+ * Emits the <literal>org.gnome.evolution.dataserver.CalendarView.Progress</literal>
  * D-Bus signal.
  */
 void e_gdbus_cal_view_emit_progress (
@@ -1016,7 +1016,7 @@ void e_gdbus_cal_view_emit_progress (
  * @arg_status: Signal parameter.
  * @arg_message: Signal parameter.
  *
- * Emits the <literal>org.gnome.evolution.dataserver.calendar.CalView.Done</literal>
+ * Emits the <literal>org.gnome.evolution.dataserver.CalendarView.Done</literal>
  * D-Bus signal.
  */
 void e_gdbus_cal_view_emit_done (
@@ -1196,7 +1196,7 @@ static const GDBusMethodInfo * const e_gdbus_cal_view_method_info_pointers[] =
 static const GDBusInterfaceInfo _e_gdbus_cal_view_interface_info =
 {
   -1,
-  (gchar *) "org.gnome.evolution.dataserver.calendar.CalView",
+  (gchar *) "org.gnome.evolution.dataserver.CalendarView",
   (GDBusMethodInfo **) &e_gdbus_cal_view_method_info_pointers,
   (GDBusSignalInfo **) &e_gdbus_cal_view_signal_info_pointers,
   (GDBusPropertyInfo **) NULL,
@@ -1371,7 +1371,7 @@ emit_notifications_in_idle (gpointer user_data)
                                      "org.freedesktop.DBus.Properties",
                                      "PropertiesChanged",
                                      g_variant_new ("(sa{sv}as)",
-                                                    "org.gnome.evolution.dataserver.calendar.CalView",
+                                                    "org.gnome.evolution.dataserver.CalendarView",
                                                     builder,
                                                     invalidated_builder),
                                      NULL);
@@ -1526,7 +1526,7 @@ e_gdbus_cal_view_register_object (EGdbusCalView *object,
 /**
  * e_gdbus_cal_view_interface_info:
  *
- * Gets interface description for the <literal>org.gnome.evolution.dataserver.calendar.CalView</literal> D-Bus interface.
+ * Gets interface description for the <literal>org.gnome.evolution.dataserver.CalendarView</literal> D-Bus interface.
  *
  * Returns: A #GDBusInterfaceInfo. Do not free, the object is statically allocated.
  */
@@ -1692,7 +1692,7 @@ e_gdbus_cal_view_proxy_set_property (GObject      *object,
       g_dbus_proxy_call (G_DBUS_PROXY (object),
                          "org.freedesktop.DBus.Properties.Set",
                          g_variant_new ("(ssv)",
-                                        "org.gnome.evolution.dataserver.calendar.CalView",
+                                        "org.gnome.evolution.dataserver.CalendarView",
                                         property_name,
                                         new_value),
                          G_DBUS_CALL_FLAGS_NONE,
@@ -1784,7 +1784,7 @@ void e_gdbus_cal_view_proxy_new (GDBusConnection     *connection,
                               "g-name", name,
                               "g-connection", connection,
                               "g-object-path", object_path,
-                              "g-interface-name", "org.gnome.evolution.dataserver.calendar.CalView",
+                              "g-interface-name", "org.gnome.evolution.dataserver.CalendarView",
                               NULL);
 }
 
@@ -1844,7 +1844,7 @@ EGdbusCalView *e_gdbus_cal_view_proxy_new_sync (GDBusConnection     *connection,
                              "g-name", name,
                              "g-connection", connection,
                              "g-object-path", object_path,
-                             "g-interface-name", "org.gnome.evolution.dataserver.calendar.CalView",
+                             "g-interface-name", "org.gnome.evolution.dataserver.CalendarView",
                              NULL);
   if (initable != NULL)
     return E_GDBUS_CAL_VIEW (initable);
@@ -1883,7 +1883,7 @@ void e_gdbus_cal_view_proxy_new_for_bus (GBusType             bus_type,
                               "g-name", name,
                               "g-bus-type", bus_type,
                               "g-object-path", object_path,
-                              "g-interface-name", "org.gnome.evolution.dataserver.calendar.CalView",
+                              "g-interface-name", "org.gnome.evolution.dataserver.CalendarView",
                               NULL);
 }
 
@@ -1943,7 +1943,7 @@ EGdbusCalView *e_gdbus_cal_view_proxy_new_for_bus_sync (GBusType             bus
                              "g-name", name,
                              "g-bus-type", bus_type,
                              "g-object-path", object_path,
-                             "g-interface-name", "org.gnome.evolution.dataserver.calendar.CalView",
+                             "g-interface-name", "org.gnome.evolution.dataserver.CalendarView",
                              NULL);
   if (initable != NULL)
     return E_GDBUS_CAL_VIEW (initable);
diff --git a/calendar/libegdbus/e-gdbus-egdbuscalview.h b/calendar/libegdbus/e-gdbus-egdbuscalview.h
index b3361d0..af10979 100644
--- a/calendar/libegdbus/e-gdbus-egdbuscalview.h
+++ b/calendar/libegdbus/e-gdbus-egdbuscalview.h
@@ -1,7 +1,7 @@
 /* File:       e-gdbus-egdbuscalview.h
  *
  * GType name: EGdbusCalView
- * D-Bus name: org.gnome.evolution.dataserver.calendar.CalView
+ * D-Bus name: org.gnome.evolution.dataserver.CalendarView
  *
  * Generated by GDBus Binding Tool 0.1. DO NOT EDIT.
  */
diff --git a/configure.ac b/configure.ac
index 9943889..f31ff0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,25 @@ EDS_MINOR_VERSION=eds_minor_version
 EDS_MICRO_VERSION=eds_micro_version
 
 dnl ******************************
+dnl D-Bus versioning
+dnl ******************************
+ADDRESS_BOOK_DBUS_SERVICE_NAME="org.gnome.evolution.dataserver.AddressBook0"
+CALENDAR_DBUS_SERVICE_NAME="org.gnome.evolution.dataserver.Calendar0"
+
+AC_DEFINE_UNQUOTED(
+       ADDRESS_BOOK_DBUS_SERVICE_NAME,
+       ["$ADDRESS_BOOK_DBUS_SERVICE_NAME"],
+       [D-Bus service name for the address book factory])
+
+AC_DEFINE_UNQUOTED(
+       CALENDAR_DBUS_SERVICE_NAME,
+       ["$CALENDAR_DBUS_SERVICE_NAME"],
+       [D-Bus service name for the calendar factory])
+
+AC_SUBST(ADDRESS_BOOK_DBUS_SERVICE_NAME)
+AC_SUBST(CALENDAR_DBUS_SERVICE_NAME)
+
+dnl ******************************
 dnl Libtool versioning
 dnl ******************************
 LIBEDATASERVER_CURRENT=14
@@ -1380,22 +1399,10 @@ dnl separate camel from e-d-s? or should it be under the same spot? same for now
 camel_providerdir='${libdir}'/evolution-data-server/camel-providers
 AC_SUBST(camel_providerdir)
 
-dnl ******************************
-dnl IDL/Component Versioning
-dnl ******************************
-INTERFACE_VERSION="$BASE_VERSION"
-AC_SUBST(INTERFACE_VERSION)
-AC_DEFINE_UNQUOTED(INTERFACE_VERSION, "$INTERFACE_VERSION", [IDL interface version (Major.Minor)])
-
-EVO_SUBST_SERVER_RULE='%.server.in: %.server.in.in ; sed -e "s|\ BINDIR\@|$(bindir)|" -e "s|\ LIBEXECDIR_IN_SERVER_FILE\@|$(LIBEXECDIR_IN_SERVER_FILE)|" -e "s|\ COMPONENTDIR\@|$(componentdir)|" -e "s|\ IMPORTERSDIR\@|$(importersdir)|" -e "s|\ EXEEXT\@|$(EXEEXT)|" -e "s|\ VERSION\@|$(BASE_VERSION)|" -e "s|\ API_VERSION\@|$(API_VERSION)|" -e "s|\ INTERFACE_VERSION\@|$(INTERFACE_VERSION)|" $< > $@'
-EVO_NAME_SERVER_RULE='%_$(API_VERSION).server: %.server ; mv $< $@'
-AC_SUBST(EVO_SUBST_SERVER_RULE)
-AC_SUBST(EVO_NAME_SERVER_RULE)
-
 dnl *******************
 dnl D-BUS service stuff
 dnl *******************
-EVO_SUBST_SERVICE_RULE='%.service: %.service.in Makefile ; sed -e "s|\ BINDIR\@|$(bindir)|" -e "s|\ LIBEXECDIR\@|$(libexecdir)|" -e "s|\ COMPONENTDIR\@|$(componentdir)|" -e "s|\ IMPORTERSDIR\@|$(importersdir)|" -e "s|\ VERSION\@|$(BASE_VERSION)|" -e "s|\ EXEEXT\@|$(EXEEXT)|" -e "s|\ INTERFACE_VERSION\@|$(INTERFACE_VERSION)|" $< > $@'
+EVO_SUBST_SERVICE_RULE='%.service: %.service.in Makefile ; sed -e "s|\ libexecdir\@|$(libexecdir)|" -e s"|\ ADDRESS_BOOK_DBUS_SERVICE_NAME\@|$(ADDRESS_BOOK_DBUS_SERVICE_NAME)|" -e "s|\ CALENDAR_DBUS_SERVICE_NAME\@|$(CALENDAR_DBUS_SERVICE_NAME)|" $< > $@'
 AC_SUBST(EVO_SUBST_SERVICE_RULE)
 
 dnl ******************************



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]