Generate D-Bus address book interfaces with gdbus-codegen.

diff --git a/docs/reference/private/libedbus-private-docs.sgml b/docs/reference/private/libedbus-private-docs.sgml
index e628863..344ec24 100644 (file)
--- a/docs/reference/private/libedbus-private-docs.sgml
+++ b/docs/reference/private/libedbus-private-docs.sgml
@@ -20,6 +20,7 @@
     <xi:include href="xml/e-dbus-source-manager.xml"/>
     <xi:include href="xml/e-dbus-object-manager-client.xml"/>
     <xi:include href="xml/e-dbus-authenticator.xml"/>
+    <xi:include href="xml/e-dbus-address-book.xml"/>
     <xi:include href="xml/e-dbus-address-book-factory.xml"/>
     <xi:include href="xml/e-dbus-calendar-factory.xml"/>
     <xi:include href="xml/e-dbus-user-prompter.xml"/>
@@ -35,6 +36,7 @@
     <xi:include href="../../../private/e-dbus-source-org.gnome.evolution.dataserver.Source.OAuth2Support.xml"/>
     <xi:include href="../../../private/e-dbus-source-manager-org.gnome.evolution.dataserver.SourceManager.xml"/>
     <xi:include href="../../../private/e-dbus-authenticator-org.gnome.evolution.dataserver.Authenticator.xml"/>
+    <xi:include href="../../../private/e-dbus-address-book-org.gnome.evolution.dataserver.AddressBook.xml"/>
     <xi:include href="../../../private/e-dbus-address-book-factory-org.gnome.evolution.dataserver.AddressBookFactory.xml"/>
     <xi:include href="../../../private/e-dbus-calendar-factory-org.gnome.evolution.dataserver.CalendarFactory.xml"/>
     <xi:include href="../../../private/e-dbus-user-prompter-org.gnome.evolution.dataserver.UserPrompter.xml"/>

diff --git a/docs/reference/private/libedbus-private-sections.txt b/docs/reference/private/libedbus-private-sections.txt
index b8fd1da..9a8b0a5 100644 (file)
--- a/docs/reference/private/libedbus-private-sections.txt
+++ b/docs/reference/private/libedbus-private-sections.txt
@@ -1,4 +1,109 @@
 <SECTION>
+<FILE>e-dbus-address-book</FILE>
+<TITLE>EDBusAddressBook</TITLE>
+EDBusAddressBook
+e_dbus_address_book_get_online
+e_dbus_address_book_set_online
+e_dbus_address_book_get_revision
+e_dbus_address_book_dup_revision
+e_dbus_address_book_set_revision
+e_dbus_address_book_get_writable
+e_dbus_address_book_set_writable
+e_dbus_address_book_get_cache_dir
+e_dbus_address_book_dup_cache_dir
+e_dbus_address_book_set_cache_dir
+e_dbus_address_book_get_capabilities
+e_dbus_address_book_dup_capabilities
+e_dbus_address_book_set_capabilities
+e_dbus_address_book_get_required_fields
+e_dbus_address_book_dup_required_fields
+e_dbus_address_book_set_required_fields
+e_dbus_address_book_get_supported_fields
+e_dbus_address_book_dup_supported_fields
+e_dbus_address_book_set_supported_fields
+e_dbus_address_book_call_open_sync
+e_dbus_address_book_call_open
+e_dbus_address_book_call_open_finish
+e_dbus_address_book_complete_open
+e_dbus_address_book_call_close_sync
+e_dbus_address_book_call_close
+e_dbus_address_book_call_close_finish
+e_dbus_address_book_complete_close
+e_dbus_address_book_call_refresh_sync
+e_dbus_address_book_call_refresh
+e_dbus_address_book_call_refresh_finish
+e_dbus_address_book_complete_refresh
+e_dbus_address_book_call_create_contacts_sync
+e_dbus_address_book_call_create_contacts
+e_dbus_address_book_call_create_contacts_finish
+e_dbus_address_book_complete_create_contacts
+e_dbus_address_book_call_modify_contacts_sync
+e_dbus_address_book_call_modify_contacts
+e_dbus_address_book_call_modify_contacts_finish
+e_dbus_address_book_complete_modify_contacts
+e_dbus_address_book_call_remove_contacts_sync
+e_dbus_address_book_call_remove_contacts
+e_dbus_address_book_call_remove_contacts_finish
+e_dbus_address_book_complete_remove_contacts
+e_dbus_address_book_call_get_contact_sync
+e_dbus_address_book_call_get_contact
+e_dbus_address_book_call_get_contact_finish
+e_dbus_address_book_complete_get_contact
+e_dbus_address_book_call_get_contact_list_sync
+e_dbus_address_book_call_get_contact_list
+e_dbus_address_book_call_get_contact_list_finish
+e_dbus_address_book_complete_get_contact_list
+e_dbus_address_book_call_get_contact_list_uids_sync
+e_dbus_address_book_call_get_contact_list_uids
+e_dbus_address_book_call_get_contact_list_uids_finish
+e_dbus_address_book_complete_get_contact_list_uids
+e_dbus_address_book_call_get_view_sync
+e_dbus_address_book_call_get_view
+e_dbus_address_book_call_get_view_finish
+e_dbus_address_book_complete_get_view
+e_dbus_address_book_emit_error
+e_dbus_address_book_interface_info
+e_dbus_address_book_override_properties
+<SUBSECTION Proxy>
+EDBusAddressBookProxy
+e_dbus_address_book_proxy_new_sync
+e_dbus_address_book_proxy_new
+e_dbus_address_book_proxy_new_finish
+e_dbus_address_book_proxy_new_for_bus_sync
+e_dbus_address_book_proxy_new_for_bus
+e_dbus_address_book_proxy_new_for_bus_finish
+<SUBSECTION Skeleton>
+EDBusAddressBookSkeleton
+e_dbus_address_book_skeleton_new
+<SUBSECTION Standard>
+E_DBUS_ADDRESS_BOOK
+E_DBUS_IS_ADDRESS_BOOK
+E_DBUS_TYPE_ADDRESS_BOOK
+E_DBUS_ADDRESS_BOOK_GET_IFACE
+E_DBUS_ADDRESS_BOOK_PROXY
+E_DBUS_IS_ADDRESS_BOOK_PROXY
+E_DBUS_TYPE_ADDRESS_BOOK_PROXY
+E_DBUS_ADDRESS_BOOK_PROXY_CLASS
+E_DBUS_IS_ADDRESS_BOOK_PROXY_CLASS
+E_DBUS_ADDRESS_BOOK_PROXY_GET_CLASS
+E_DBUS_ADDRESS_BOOK_SKELETON
+E_DBUS_IS_ADDRESS_BOOK_SKELETON
+E_DBUS_TYPE_ADDRESS_BOOK_SKELETON
+E_DBUS_ADDRESS_BOOK_SKELETON_CLASS
+E_DBUS_IS_ADDRESS_BOOK_SKELETON_CLASS
+E_DBUS_ADDRESS_BOOK_SKELETON_GET_CLASS
+EDBusAddressBookIface
+EDBusAddressBookProxyClass
+EDBusAddressBookSkeletonClass
+e_dbus_address_book_get_type
+e_dbus_address_book_proxy_get_type
+e_dbus_address_book_skeleton_get_type
+<SUBSECTION Private>
+EDBusAddressBookProxyPrivate
+EDBusAddressBookSkeletonPrivate
+</SECTION>
+
+<SECTION>
 <FILE>e-dbus-address-book-factory</FILE>
 <TITLE>EDBusAddressBookFactory</TITLE>
 EDBusAddressBookFactory

diff --git a/docs/reference/private/libedbus-private.types b/docs/reference/private/libedbus-private.types
index d950f0b..a4c3347 100644 (file)
--- a/docs/reference/private/libedbus-private.types
+++ b/docs/reference/private/libedbus-private.types
@@ -1,6 +1,7 @@
 #include <private/e-dbus-source.h>
 #include <private/e-dbus-source-manager.h>
 #include <private/e-dbus-authenticator.h>
+#include <private/e-dbus-address-book.h>
 #include <private/e-dbus-address-book-factory.h>
 #include <private/e-dbus-calendar-factory.h>
 #include <private/e-dbus-user-prompter.h>
@@ -33,6 +34,9 @@ e_dbus_source_oauth2_support_skeleton_get_type
 e_dbus_authenticator_get_type
 e_dbus_authenticator_proxy_get_type
 e_dbus_authenticator_skeleton_get_type
+e_dbus_address_book_get_type
+e_dbus_address_book_proxy_get_type
+e_dbus_address_book_skeleton_get_type
 e_dbus_address_book_factory_get_type
 e_dbus_address_book_factory_proxy_get_type
 e_dbus_address_book_factory_skeleton_get_type

diff --git a/private/Makefile.am b/private/Makefile.am
index 30d0e65..7f4bd50 100644 (file)
--- a/private/Makefile.am
+++ b/private/Makefile.am
@@ -28,6 +28,15 @@ $(GENERATED_DBUS_AUTHENTICATOR) : Makefile.am org.gnome.evolution.dataserver.Aut
        $(top_srcdir)/private/org.gnome.evolution.dataserver.Authenticator.xml \
        $(NULL)
 
+$(GENERATED_DBUS_ADDRESS_BOOK) : Makefile.am org.gnome.evolution.dataserver.AddressBook.xml
+       $(AM_V_GEN) gdbus-codegen \
+       --interface-prefix org.gnome.evolution.dataserver \
+       --c-namespace E_DBus \
+       --generate-c-code e-dbus-address-book \
+       --generate-docbook e-dbus-address-book \
+       $(top_srcdir)/private/org.gnome.evolution.dataserver.AddressBook.xml \
+       $(NULL)
+
 $(GENERATED_DBUS_ADDRESS_BOOK_FACTORY) : Makefile.am org.gnome.evolution.dataserver.AddressBookFactory.xml
        $(AM_V_GEN) gdbus-codegen \
        --interface-prefix org.gnome.evolution.dataserver \
@@ -84,6 +93,12 @@ GENERATED_DBUS_USER_PROMPTER = \
        e-dbus-user-prompter-org.gnome.evolution.dataserver.UserPrompter.xml \
        $(NULL)
 
+GENERATED_DBUS_ADDRESS_BOOK = \
+       e-dbus-address-book.c \
+       e-dbus-address-book.h \
+       e-dbus-address-book-org.gnome.evolution.dataserver.AddressBook.xml \
+       $(NULL)
+
 GENERATED_DBUS_ADDRESS_BOOK_FACTORY = \
        e-dbus-address-book-factory.c \
        e-dbus-address-book-factory.h \
@@ -100,6 +115,7 @@ BUILT_SOURCES = \
        $(GENERATED_DBUS_SOURCE) \
        $(GENERATED_DBUS_SOURCE_MANAGER) \
        $(GENERATED_DBUS_AUTHENTICATOR) \
+       $(GENERATED_DBUS_ADDRESS_BOOK) \
        $(GENERATED_DBUS_ADDRESS_BOOK_FACTORY) \
        $(GENERATED_DBUS_CALENDAR_FACTORY) \
        $(GENERATED_DBUS_USER_PROMPTER) \
@@ -134,6 +150,7 @@ EXTRA_DIST = \
        org.gnome.evolution.dataserver.Source.xml \
        org.gnome.evolution.dataserver.SourceManager.xml \
        org.gnome.evolution.dataserver.Authenticator.xml \
+       org.gnome.evolution.dataserver.AddressBook.xml \
        org.gnome.evolution.dataserver.AddressBookFactory.xml \
        org.gnome.evolution.dataserver.CalendarFactory.xml \
        org.gnome.evolution.dataserver.UserPrompter.xml \

diff --git a/private/org.gnome.evolution.dataserver.AddressBook.xml b/private/org.gnome.evolution.dataserver.AddressBook.xml
new file mode 100644 (file)
index 0000000..bc60632
--- /dev/null
+++ b/private/org.gnome.evolution.dataserver.AddressBook.xml
@@ -0,0 +1,69 @@
+<!DOCTYPE node PUBLIC
+"-//freedesktop//DTD D-Bus Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+
+<!--
+    org.gnome.evolution.dataserver.AddressBook:
+    @short_description: Address book objects
+    @since: 3.8
+
+    This interface allows for interaction with an address book backend.
+-->
+<interface name="org.gnome.evolution.dataserver.AddressBook">
+
+  <property name="Online" type="b" access="read"/>
+  <property name="Revision" type="s" access="read"/>
+  <property name="Writable" type="b" access="read"/>
+
+  <!-- These properties are static. -->
+
+  <property name="CacheDir" type="s" access="read"/>
+  <property name="Capabilities" type="as" access="read"/>
+  <property name="RequiredFields" type="as" access="read"/>
+  <property name="SupportedFields" type="as" access="read"/>
+
+  <signal name="Error">
+    <arg name="error_message" type="s"/>
+  </signal>
+
+  <method name="Open"/>
+
+  <method name="Close"/>
+
+  <method name="Refresh"/>
+
+  <method name="CreateContacts">
+    <arg name="vcards" direction="in" type="as"/>
+    <arg name="uids" direction="out" type="as"/>
+  </method>
+
+  <method name="ModifyContacts">
+    <arg name="vcards" direction="in" type="as"/>
+  </method>
+
+  <method name="RemoveContacts">
+    <arg name="uids" direction="in" type="as"/>
+  </method>
+
+  <method name="GetContact">
+    <arg name="uid" direction="in" type="s"/>
+    <arg name="vcard" direction="out" type="s"/>
+  </method>
+
+  <method name="GetContactList">
+    <arg name="query" direction="in" type="s"/>
+    <arg name="vcards" direction="out" type="as"/>
+  </method>
+
+  <method name="GetContactListUids">
+    <arg name="query" direction="in" type="s"/>
+    <arg name="uids" direction="out" type="as"/>
+  </method>
+
+  <method name="GetView">
+    <arg name="query" direction="in" type="s"/>
+    <arg name="object_path" direction="out" type="o"/>
+  </method>
+
+</interface>