[evolution-data-server] Remove e-gdbus-templates from libedataserver
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Remove e-gdbus-templates from libedataserver
- Date: Thu, 8 Nov 2018 17:52:58 +0000 (UTC)
commit 3ddb21132920cc3106cf9ef0642369d2f59d3fdb
Author: Milan Crha <mcrha redhat com>
Date: Thu Nov 8 18:44:19 2018 +0100
Remove e-gdbus-templates from libedataserver
The only two parts using it were GDBus objects for address book and
calendar view, which could be easily transformed to use gdbus-codegen,
the same as the rest of the GDBus objects defined in src/private/.
CMakeLists.txt | 2 +-
.../evolution-data-server-docs.sgml.in | 1 -
src/addressbook/CMakeLists.txt | 1 -
src/addressbook/libebook/CMakeLists.txt | 3 -
src/addressbook/libebook/e-book-client-view.c | 48 +-
src/addressbook/libedata-book/CMakeLists.txt | 7 -
src/addressbook/libedata-book/e-data-book-view.c | 91 +-
src/addressbook/libegdbus/CMakeLists.txt | 37 -
src/addressbook/libegdbus/e-gdbus-book-view.c | 865 -------
src/addressbook/libegdbus/e-gdbus-book-view.h | 167 --
src/calendar/CMakeLists.txt | 1 -
src/calendar/libecal/CMakeLists.txt | 5 +-
src/calendar/libecal/e-cal-client-view.c | 44 +-
src/calendar/libedata-cal/CMakeLists.txt | 9 +-
src/calendar/libedata-cal/e-data-cal-view.c | 89 +-
src/calendar/libegdbus/CMakeLists.txt | 37 -
src/calendar/libegdbus/e-gdbus-cal-view.c | 865 -------
src/calendar/libegdbus/e-gdbus-cal-view.h | 149 --
src/libedataserver/CMakeLists.txt | 2 -
src/libedataserver/e-gdbus-templates.c | 2393 --------------------
src/libedataserver/e-gdbus-templates.h | 764 -------
src/libedataserver/libedataserver.h | 1 -
src/private/CMakeLists.txt | 26 +
....gnome.evolution.dataserver.AddressBookView.xml | 51 +
...org.gnome.evolution.dataserver.CalendarView.xml | 51 +
.../evolution-addressbook-factory.c | 1 -
.../evolution-alarm-notify.c | 1 -
.../evolution-calendar-factory.c | 1 -
.../evolution-source-registry.c | 1 -
.../evolution-user-prompter.c | 1 -
30 files changed, 285 insertions(+), 5429 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c60afbd25..71d3a317e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,7 @@ set(LIBEBACKEND_CURRENT 10)
set(LIBEBACKEND_REVISION 0)
set(LIBEBACKEND_AGE 0)
-set(LIBEDATASERVER_CURRENT 23)
+set(LIBEDATASERVER_CURRENT 24)
set(LIBEDATASERVER_REVISION 0)
set(LIBEDATASERVER_AGE 0)
diff --git a/docs/reference/evolution-data-server/evolution-data-server-docs.sgml.in
b/docs/reference/evolution-data-server/evolution-data-server-docs.sgml.in
index 3e7913468..a5ba6f283 100644
--- a/docs/reference/evolution-data-server/evolution-data-server-docs.sgml.in
+++ b/docs/reference/evolution-data-server/evolution-data-server-docs.sgml.in
@@ -230,7 +230,6 @@
<xi:include href="xml/e-flag.xml"/>
<xi:include href="xml/e-free-form-exp.xml"/>
<xi:include href="xml/e-gdata-oauth2-authorizer.xml"/>
- <xi:include href="xml/e-gdbus-templates.xml"/>
<xi:include href="xml/e-memory.xml"/>
<xi:include href="xml/e-network-monitor.xml"/>
<xi:include href="xml/e-operation-pool.xml"/>
diff --git a/src/addressbook/CMakeLists.txt b/src/addressbook/CMakeLists.txt
index b1c70664b..85d56e647 100644
--- a/src/addressbook/CMakeLists.txt
+++ b/src/addressbook/CMakeLists.txt
@@ -2,4 +2,3 @@ add_subdirectory(backends)
add_subdirectory(libebook)
add_subdirectory(libebook-contacts)
add_subdirectory(libedata-book)
-add_subdirectory(libegdbus)
diff --git a/src/addressbook/libebook/CMakeLists.txt b/src/addressbook/libebook/CMakeLists.txt
index e0926ccde..6ed4c13f6 100644
--- a/src/addressbook/libebook/CMakeLists.txt
+++ b/src/addressbook/libebook/CMakeLists.txt
@@ -9,7 +9,6 @@ set(DEPENDENCIES
edbus-private
edataserver
edata-book
- egdbus-book
)
set(SOURCES
@@ -67,12 +66,10 @@ target_include_directories(ebook PUBLIC
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/src
${CMAKE_BINARY_DIR}/src/addressbook
- ${CMAKE_BINARY_DIR}/src/addressbook/libegdbus
${CMAKE_BINARY_DIR}/src/private
${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/src/private
${CMAKE_SOURCE_DIR}/src/addressbook
- ${CMAKE_SOURCE_DIR}/src/addressbook/libegdbus
${CMAKE_CURRENT_BINARY_DIR}
${ADDRESSBOOK_INCLUDE_DIRS}
)
diff --git a/src/addressbook/libebook/e-book-client-view.c b/src/addressbook/libebook/e-book-client-view.c
index a18dab322..dc4796c2d 100644
--- a/src/addressbook/libebook/e-book-client-view.c
+++ b/src/addressbook/libebook/e-book-client-view.c
@@ -38,7 +38,7 @@
#include "e-book-client.h"
#include "e-book-client-view.h"
-#include "e-gdbus-book-view.h"
+#include "e-dbus-address-book-view.h"
#define E_BOOK_CLIENT_VIEW_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -48,7 +48,7 @@ typedef struct _SignalClosure SignalClosure;
struct _EBookClientViewPrivate {
EBookClient *client;
- GDBusProxy *dbus_proxy;
+ EDBusAddressBookView *dbus_proxy;
GDBusConnection *connection;
gchar *object_path;
guint running : 1;
@@ -446,7 +446,7 @@ direct_contacts_fetch (EBookClientView *client_view,
}
static void
-book_client_view_objects_added_cb (EGdbusBookView *object,
+book_client_view_objects_added_cb (EDBusAddressBookView *object,
const gchar * const *vcards,
GWeakRef *client_view_weak_ref)
{
@@ -491,7 +491,7 @@ book_client_view_objects_added_cb (EGdbusBookView *object,
}
static void
-book_client_view_objects_modified_cb (EGdbusBookView *object,
+book_client_view_objects_modified_cb (EDBusAddressBookView *object,
const gchar * const *vcards,
GWeakRef *client_view_weak_ref)
{
@@ -536,8 +536,8 @@ book_client_view_objects_modified_cb (EGdbusBookView *object,
}
static void
-book_client_view_objects_removed_cb (EGdbusBookView *object,
- const gchar * const *ids,
+book_client_view_objects_removed_cb (EDBusAddressBookView *object,
+ const gchar * const *uids,
GWeakRef *client_view_weak_ref)
{
EBookClientView *client_view;
@@ -556,8 +556,8 @@ book_client_view_objects_removed_cb (EGdbusBookView *object,
return;
}
- for (ii = 0; ids[ii] != NULL; ii++)
- list = g_slist_prepend (list, g_strdup (ids[ii]));
+ for (ii = 0; uids[ii] != NULL; ii++)
+ list = g_slist_prepend (list, g_strdup (uids[ii]));
signal_closure = g_slice_new0 (SignalClosure);
g_weak_ref_init (&signal_closure->client_view, client_view);
@@ -581,7 +581,7 @@ book_client_view_objects_removed_cb (EGdbusBookView *object,
}
static void
-book_client_view_progress_cb (EGdbusBookView *object,
+book_client_view_progress_cb (EDBusAddressBookView *object,
guint percent,
const gchar *message,
GWeakRef *client_view_weak_ref)
@@ -623,8 +623,9 @@ book_client_view_progress_cb (EGdbusBookView *object,
}
static void
-book_client_view_complete_cb (EGdbusBookView *object,
- const gchar * const *in_error_strv,
+book_client_view_complete_cb (EDBusAddressBookView *object,
+ const gchar *arg_error_name,
+ const gchar *arg_error_message,
GWeakRef *client_view_weak_ref)
{
EBookClientView *client_view;
@@ -643,8 +644,11 @@ book_client_view_complete_cb (EGdbusBookView *object,
signal_closure = g_slice_new0 (SignalClosure);
g_weak_ref_init (&signal_closure->client_view, client_view);
- e_gdbus_templates_decode_error (
- in_error_strv, &signal_closure->error);
+ if (arg_error_name && *arg_error_name && arg_error_message)
+ signal_closure->error = g_dbus_error_new_for_dbus_error (arg_error_name,
arg_error_message);
+ else
+ signal_closure->error = NULL;
+
if (signal_closure->error)
g_dbus_error_strip_remote_error (signal_closure->error);
@@ -822,7 +826,7 @@ book_client_view_dispose (GObject *object)
* Also omit a callback function, so the GDBusMessage
* uses G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED.
*/
- e_gdbus_book_view_call_dispose (priv->dbus_proxy, NULL, NULL, NULL);
+ e_dbus_address_book_view_call_dispose (priv->dbus_proxy, NULL, NULL, NULL);
g_object_unref (priv->dbus_proxy);
priv->dbus_proxy = NULL;
}
@@ -854,7 +858,7 @@ book_client_view_initable_init (GInitable *initable,
{
EBookClient *book_client;
EBookClientViewPrivate *priv;
- EGdbusBookView *gdbus_bookview;
+ EDBusAddressBookView *dbus_bookview;
gulong handler_id;
gchar *bus_name;
@@ -873,7 +877,7 @@ book_client_view_initable_init (GInitable *initable,
bus_name = e_client_dup_bus_name (E_CLIENT (book_client));
g_object_unref (book_client);
- gdbus_bookview = e_gdbus_book_view_proxy_new_sync (
+ dbus_bookview = e_dbus_address_book_view_proxy_new_sync (
priv->connection,
G_DBUS_PROXY_FLAGS_NONE,
bus_name,
@@ -882,10 +886,10 @@ book_client_view_initable_init (GInitable *initable,
g_free (bus_name);
- if (gdbus_bookview == NULL)
+ if (dbus_bookview == NULL)
return FALSE;
- priv->dbus_proxy = G_DBUS_PROXY (gdbus_bookview);
+ priv->dbus_proxy = dbus_bookview;
handler_id = g_signal_connect_data (
priv->dbus_proxy, "objects-added",
@@ -1169,7 +1173,7 @@ e_book_client_view_start (EBookClientView *client_view,
client_view->priv->running = TRUE;
- e_gdbus_book_view_call_start_sync (
+ e_dbus_address_book_view_call_start_sync (
client_view->priv->dbus_proxy, NULL, &local_error);
if (local_error != NULL) {
@@ -1196,7 +1200,7 @@ e_book_client_view_stop (EBookClientView *client_view,
client_view->priv->running = FALSE;
- e_gdbus_book_view_call_stop_sync (
+ e_dbus_address_book_view_call_stop_sync (
client_view->priv->dbus_proxy, NULL, &local_error);
if (local_error != NULL) {
@@ -1224,7 +1228,7 @@ e_book_client_view_set_flags (EBookClientView *client_view,
g_return_if_fail (E_IS_BOOK_CLIENT_VIEW (client_view));
- e_gdbus_book_view_call_set_flags_sync (
+ e_dbus_address_book_view_call_set_flags_sync (
client_view->priv->dbus_proxy, flags, NULL, &local_error);
if (local_error != NULL) {
@@ -1274,7 +1278,7 @@ e_book_client_view_set_fields_of_interest (EBookClientView *client_view,
} else
strv = e_client_util_slist_to_strv (fields_of_interest);
- e_gdbus_book_view_call_set_fields_of_interest_sync (
+ e_dbus_address_book_view_call_set_fields_of_interest_sync (
client_view->priv->dbus_proxy,
(const gchar * const *) strv,
NULL, &local_error);
diff --git a/src/addressbook/libedata-book/CMakeLists.txt b/src/addressbook/libedata-book/CMakeLists.txt
index 994d5f40a..8972c9bd5 100644
--- a/src/addressbook/libedata-book/CMakeLists.txt
+++ b/src/addressbook/libedata-book/CMakeLists.txt
@@ -6,7 +6,6 @@ set(DEPENDENCIES
ebook-contacts
edbus-private
edataserver
- egdbus-book
)
set(SOURCES
@@ -95,12 +94,10 @@ target_include_directories(edata-book PUBLIC
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/src
${CMAKE_BINARY_DIR}/src/addressbook
- ${CMAKE_BINARY_DIR}/src/addressbook/libegdbus
${CMAKE_BINARY_DIR}/src/private
${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/src/private
${CMAKE_SOURCE_DIR}/src/addressbook
- ${CMAKE_SOURCE_DIR}/src/addressbook/libegdbus
${CMAKE_CURRENT_BINARY_DIR}
${ADDRESSBOOK_INCLUDE_DIRS}
${LIBDB_INCLUDE_DIRS}
@@ -141,12 +138,10 @@ target_include_directories(e-book-backend-sqlitedb-test PUBLIC
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/src
${CMAKE_BINARY_DIR}/src/addressbook
- ${CMAKE_BINARY_DIR}/src/addressbook/libegdbus
${CMAKE_BINARY_DIR}/src/private
${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/src/private
${CMAKE_SOURCE_DIR}/src/addressbook
- ${CMAKE_SOURCE_DIR}/src/addressbook/libegdbus
${CMAKE_CURRENT_BINARY_DIR}
${ADDRESSBOOK_INCLUDE_DIRS}
${LIBDB_INCLUDE_DIRS}
@@ -185,12 +180,10 @@ target_include_directories(evolution-addressbook-factory-subprocess PUBLIC
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/src
${CMAKE_BINARY_DIR}/src/addressbook
- ${CMAKE_BINARY_DIR}/src/addressbook/libegdbus
${CMAKE_BINARY_DIR}/src/private
${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/src/private
${CMAKE_SOURCE_DIR}/src/addressbook
- ${CMAKE_SOURCE_DIR}/src/addressbook/libegdbus
${CMAKE_CURRENT_BINARY_DIR}
${ADDRESSBOOK_INCLUDE_DIRS}
${GTK_INCLUDE_DIRS}
diff --git a/src/addressbook/libedata-book/e-data-book-view.c
b/src/addressbook/libedata-book/e-data-book-view.c
index 36157adc6..86c98af92 100644
--- a/src/addressbook/libedata-book/e-data-book-view.c
+++ b/src/addressbook/libedata-book/e-data-book-view.c
@@ -40,7 +40,7 @@
#include "e-data-book.h"
#include "e-book-backend.h"
-#include "e-gdbus-book-view.h"
+#include "e-dbus-address-book-view.h"
#define E_DATA_BOOK_VIEW_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -54,7 +54,7 @@
struct _EDataBookViewPrivate {
GDBusConnection *connection;
- EGdbusBookView *gdbus_object;
+ EDBusAddressBookView *dbus_object;
gchar *object_path;
EBookBackend *backend;
@@ -158,8 +158,8 @@ send_pending_adds (EDataBookView *view)
if (view->priv->adds->len == 0)
return;
- e_gdbus_book_view_emit_objects_added (
- view->priv->gdbus_object,
+ e_dbus_address_book_view_emit_objects_added (
+ view->priv->dbus_object,
(const gchar * const *) view->priv->adds->data);
reset_array (view->priv->adds);
}
@@ -170,8 +170,8 @@ send_pending_changes (EDataBookView *view)
if (view->priv->changes->len == 0)
return;
- e_gdbus_book_view_emit_objects_modified (
- view->priv->gdbus_object,
+ e_dbus_address_book_view_emit_objects_modified (
+ view->priv->dbus_object,
(const gchar * const *) view->priv->changes->data);
reset_array (view->priv->changes);
}
@@ -182,8 +182,8 @@ send_pending_removes (EDataBookView *view)
if (view->priv->removes->len == 0)
return;
- e_gdbus_book_view_emit_objects_removed (
- view->priv->gdbus_object,
+ e_dbus_address_book_view_emit_objects_removed (
+ view->priv->dbus_object,
(const gchar * const *) view->priv->removes->data);
reset_array (view->priv->removes);
}
@@ -231,7 +231,7 @@ bookview_start_thread (gpointer data)
}
static gboolean
-impl_DataBookView_start (EGdbusBookView *object,
+impl_DataBookView_start (EDBusAddressBookView *object,
GDBusMethodInvocation *invocation,
EDataBookView *view)
{
@@ -244,7 +244,7 @@ impl_DataBookView_start (EGdbusBookView *object,
NULL, bookview_start_thread, g_object_ref (view));
g_thread_unref (thread);
- e_gdbus_book_view_complete_start (object, invocation, NULL);
+ e_dbus_address_book_view_complete_start (object, invocation);
return TRUE;
}
@@ -262,7 +262,7 @@ bookview_stop_thread (gpointer data)
}
static gboolean
-impl_DataBookView_stop (EGdbusBookView *object,
+impl_DataBookView_stop (EDBusAddressBookView *object,
GDBusMethodInvocation *invocation,
EDataBookView *view)
{
@@ -275,30 +275,30 @@ impl_DataBookView_stop (EGdbusBookView *object,
NULL, bookview_stop_thread, g_object_ref (view));
g_thread_unref (thread);
- e_gdbus_book_view_complete_stop (object, invocation, NULL);
+ e_dbus_address_book_view_complete_stop (object, invocation);
return TRUE;
}
static gboolean
-impl_DataBookView_setFlags (EGdbusBookView *object,
+impl_DataBookView_setFlags (EDBusAddressBookView *object,
GDBusMethodInvocation *invocation,
EBookClientViewFlags flags,
EDataBookView *view)
{
view->priv->flags = flags;
- e_gdbus_book_view_complete_set_flags (object, invocation, NULL);
+ e_dbus_address_book_view_complete_set_flags (object, invocation);
return TRUE;
}
static gboolean
-impl_DataBookView_dispose (EGdbusBookView *object,
+impl_DataBookView_dispose (EDBusAddressBookView *object,
GDBusMethodInvocation *invocation,
EDataBookView *view)
{
- e_gdbus_book_view_complete_dispose (object, invocation, NULL);
+ e_dbus_address_book_view_complete_dispose (object, invocation);
e_book_backend_stop_view (view->priv->backend, view);
view->priv->running = FALSE;
@@ -308,7 +308,7 @@ impl_DataBookView_dispose (EGdbusBookView *object,
}
static gboolean
-impl_DataBookView_set_fields_of_interest (EGdbusBookView *object,
+impl_DataBookView_set_fields_of_interest (EDBusAddressBookView *object,
GDBusMethodInvocation *invocation,
const gchar * const *in_fields_of_interest,
EDataBookView *view)
@@ -348,8 +348,7 @@ impl_DataBookView_set_fields_of_interest (EGdbusBookView *object,
g_strdup (field), GINT_TO_POINTER (1));
}
- e_gdbus_book_view_complete_set_fields_of_interest (
- object, invocation, NULL);
+ e_dbus_address_book_view_complete_set_fields_of_interest (object, invocation);
return TRUE;
}
@@ -485,7 +484,7 @@ data_book_view_dispose (GObject *object)
g_mutex_unlock (&priv->pending_mutex);
g_clear_object (&priv->connection);
- g_clear_object (&priv->gdbus_object);
+ g_clear_object (&priv->dbus_object);
g_clear_object (&priv->backend);
g_clear_object (&priv->sexp);
@@ -529,8 +528,8 @@ data_book_view_initable_init (GInitable *initable,
view = E_DATA_BOOK_VIEW (initable);
- return e_gdbus_book_view_register_object (
- view->priv->gdbus_object,
+ return g_dbus_interface_skeleton_export (
+ G_DBUS_INTERFACE_SKELETON (view->priv->dbus_object),
view->priv->connection,
view->priv->object_path,
error);
@@ -613,21 +612,21 @@ e_data_book_view_init (EDataBookView *view)
view->priv->flags = E_BOOK_CLIENT_VIEW_FLAGS_NOTIFY_INITIAL;
- view->priv->gdbus_object = e_gdbus_book_view_stub_new ();
+ view->priv->dbus_object = e_dbus_address_book_view_skeleton_new ();
g_signal_connect (
- view->priv->gdbus_object, "handle-start",
+ view->priv->dbus_object, "handle-start",
G_CALLBACK (impl_DataBookView_start), view);
g_signal_connect (
- view->priv->gdbus_object, "handle-stop",
+ view->priv->dbus_object, "handle-stop",
G_CALLBACK (impl_DataBookView_stop), view);
g_signal_connect (
- view->priv->gdbus_object, "handle-set-flags",
+ view->priv->dbus_object, "handle-set-flags",
G_CALLBACK (impl_DataBookView_setFlags), view);
g_signal_connect (
- view->priv->gdbus_object, "handle-dispose",
+ view->priv->dbus_object, "handle-dispose",
G_CALLBACK (impl_DataBookView_dispose), view);
g_signal_connect (
- view->priv->gdbus_object, "handle-set-fields-of-interest",
+ view->priv->dbus_object, "handle-set-fields-of-interest",
G_CALLBACK (impl_DataBookView_set_fields_of_interest), view);
view->priv->fields_of_interest = NULL;
@@ -1073,7 +1072,7 @@ void
e_data_book_view_notify_complete (EDataBookView *view,
const GError *error)
{
- gchar **strv_error;
+ gchar *error_name, *error_message;
g_return_if_fail (E_IS_DATA_BOOK_VIEW (view));
@@ -1091,11 +1090,25 @@ e_data_book_view_notify_complete (EDataBookView *view,
g_mutex_unlock (&view->priv->pending_mutex);
- strv_error = e_gdbus_templates_encode_error (error);
- e_gdbus_book_view_emit_complete (
- view->priv->gdbus_object,
- (const gchar * const *) strv_error);
- g_strfreev (strv_error);
+ if (error) {
+ gchar *dbus_error_name = g_dbus_error_encode_gerror (error);
+
+ error_name = e_util_utf8_make_valid (dbus_error_name ? dbus_error_name : "");
+ error_message = e_util_utf8_make_valid (error->message);
+
+ g_free (dbus_error_name);
+ } else {
+ error_name = g_strdup ("");
+ error_message = g_strdup ("");
+ }
+
+ e_dbus_address_book_view_emit_complete (
+ view->priv->dbus_object,
+ error_name,
+ error_message);
+
+ g_free (error_name);
+ g_free (error_message);
}
/**
@@ -1115,18 +1128,18 @@ e_data_book_view_notify_progress (EDataBookView *view,
guint percent,
const gchar *message)
{
- gchar *gdbus_message = NULL;
+ gchar *dbus_message = NULL;
g_return_if_fail (E_IS_DATA_BOOK_VIEW (view));
if (!view->priv->running)
return;
- e_gdbus_book_view_emit_progress (
- view->priv->gdbus_object, percent,
- e_util_ensure_gdbus_string (message, &gdbus_message));
+ e_dbus_address_book_view_emit_progress (
+ view->priv->dbus_object, percent,
+ e_util_ensure_gdbus_string (message, &dbus_message));
- g_free (gdbus_message);
+ g_free (dbus_message);
}
/**
diff --git a/src/calendar/CMakeLists.txt b/src/calendar/CMakeLists.txt
index b555f9e97..d02647c7d 100644
--- a/src/calendar/CMakeLists.txt
+++ b/src/calendar/CMakeLists.txt
@@ -1,4 +1,3 @@
add_subdirectory(backends)
add_subdirectory(libecal)
add_subdirectory(libedata-cal)
-add_subdirectory(libegdbus)
diff --git a/src/calendar/libecal/CMakeLists.txt b/src/calendar/libecal/CMakeLists.txt
index addfa07a0..b1cdf8d5a 100644
--- a/src/calendar/libecal/CMakeLists.txt
+++ b/src/calendar/libecal/CMakeLists.txt
@@ -5,7 +5,6 @@ add_pkgconfig_file(libecal.pc.in libecal-${API_VERSION}.pc)
set(DEPENDENCIES
edbus-private
edataserver
- egdbus-cal
)
set(SOURCES
@@ -72,12 +71,10 @@ target_include_directories(ecal PUBLIC
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/src
${CMAKE_BINARY_DIR}/src/calendar
- ${CMAKE_BINARY_DIR}/src/calendar/libegdbus
${CMAKE_BINARY_DIR}/src/private
${CMAKE_SOURCE_DIR}/src
- ${CMAKE_SOURCE_DIR}/src/private
${CMAKE_SOURCE_DIR}/src/calendar
- ${CMAKE_SOURCE_DIR}/src/calendar/libegdbus
+ ${CMAKE_SOURCE_DIR}/src/private
${CMAKE_CURRENT_BINARY_DIR}
${CALENDAR_INCLUDE_DIRS}
)
diff --git a/src/calendar/libecal/e-cal-client-view.c b/src/calendar/libecal/e-cal-client-view.c
index 8dcf3da48..70dcb50e9 100644
--- a/src/calendar/libecal/e-cal-client-view.c
+++ b/src/calendar/libecal/e-cal-client-view.c
@@ -38,7 +38,7 @@
#include "e-cal-client.h"
#include "e-cal-client-view.h"
-#include "e-gdbus-cal-view.h"
+#include "e-dbus-calendar-view.h"
#define E_CAL_CLIENT_VIEW_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -48,7 +48,7 @@ typedef struct _SignalClosure SignalClosure;
struct _ECalClientViewPrivate {
ECalClient *client;
- GDBusProxy *dbus_proxy;
+ EDBusCalendarView *dbus_proxy;
GDBusConnection *connection;
gchar *object_path;
gboolean running;
@@ -300,7 +300,7 @@ cal_client_view_emit_complete_idle_cb (gpointer user_data)
}
static void
-cal_client_view_objects_added_cb (EGdbusCalView *dbus_proxy,
+cal_client_view_objects_added_cb (EDBusCalendarView *dbus_proxy,
const gchar * const *objects,
GWeakRef *client_view_weak_ref)
{
@@ -340,7 +340,7 @@ cal_client_view_objects_added_cb (EGdbusCalView *dbus_proxy,
}
static void
-cal_client_view_objects_modified_cb (EGdbusCalView *dbus_proxy,
+cal_client_view_objects_modified_cb (EDBusCalendarView *dbus_proxy,
const gchar * const *objects,
GWeakRef *client_view_weak_ref)
{
@@ -380,7 +380,7 @@ cal_client_view_objects_modified_cb (EGdbusCalView *dbus_proxy,
}
static void
-cal_client_view_objects_removed_cb (EGdbusCalView *dbus_proxy,
+cal_client_view_objects_removed_cb (EDBusCalendarView *dbus_proxy,
const gchar * const *uids,
GWeakRef *client_view_weak_ref)
{
@@ -420,7 +420,7 @@ cal_client_view_objects_removed_cb (EGdbusCalView *dbus_proxy,
}
static void
-cal_client_view_progress_cb (EGdbusCalView *dbus_proxy,
+cal_client_view_progress_cb (EDBusCalendarView *dbus_proxy,
guint percent,
const gchar *message,
GWeakRef *client_view_weak_ref)
@@ -462,8 +462,9 @@ cal_client_view_progress_cb (EGdbusCalView *dbus_proxy,
}
static void
-cal_client_view_complete_cb (EGdbusCalView *dbus_proxy,
- const gchar * const *arg_error,
+cal_client_view_complete_cb (EDBusCalendarView *dbus_proxy,
+ const gchar *arg_error_name,
+ const gchar *arg_error_message,
GWeakRef *client_view_weak_ref)
{
ECalClientView *client_view;
@@ -482,8 +483,13 @@ cal_client_view_complete_cb (EGdbusCalView *dbus_proxy,
signal_closure = g_slice_new0 (SignalClosure);
g_weak_ref_init (&signal_closure->client_view, client_view);
- e_gdbus_templates_decode_error (
- arg_error, &signal_closure->error);
+ if (arg_error_name && *arg_error_name && arg_error_message)
+ signal_closure->error = g_dbus_error_new_for_dbus_error (arg_error_name,
arg_error_message);
+ else
+ signal_closure->error = NULL;
+
+ if (signal_closure->error)
+ g_dbus_error_strip_remote_error (signal_closure->error);
main_context = cal_client_view_ref_main_context (client_view);
@@ -633,7 +639,7 @@ cal_client_view_dispose (GObject *object)
* Also omit a callback function, so the GDBusMessage
* uses G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED.
*/
- e_gdbus_cal_view_call_dispose (priv->dbus_proxy, NULL, NULL, NULL);
+ e_dbus_calendar_view_call_dispose (priv->dbus_proxy, NULL, NULL, NULL);
g_object_unref (priv->dbus_proxy);
priv->dbus_proxy = NULL;
}
@@ -665,7 +671,7 @@ cal_client_view_initable_init (GInitable *initable,
{
ECalClient *cal_client;
ECalClientViewPrivate *priv;
- EGdbusCalView *gdbus_calview;
+ EDBusCalendarView *dbus_calview;
gulong handler_id;
gchar *bus_name;
@@ -684,7 +690,7 @@ cal_client_view_initable_init (GInitable *initable,
bus_name = e_client_dup_bus_name (E_CLIENT (cal_client));
g_object_unref (cal_client);
- gdbus_calview = e_gdbus_cal_view_proxy_new_sync (
+ dbus_calview = e_dbus_calendar_view_proxy_new_sync (
priv->connection,
G_DBUS_PROXY_FLAGS_NONE,
bus_name,
@@ -693,10 +699,10 @@ cal_client_view_initable_init (GInitable *initable,
g_free (bus_name);
- if (gdbus_calview == NULL)
+ if (dbus_calview == NULL)
return FALSE;
- priv->dbus_proxy = G_DBUS_PROXY (gdbus_calview);
+ priv->dbus_proxy = dbus_calview;
handler_id = g_signal_connect_data (
priv->dbus_proxy, "objects-added",
@@ -1011,7 +1017,7 @@ e_cal_client_view_start (ECalClientView *client_view,
client_view->priv->running = TRUE;
- e_gdbus_cal_view_call_start_sync (
+ e_dbus_calendar_view_call_start_sync (
client_view->priv->dbus_proxy, NULL, &local_error);
if (local_error != NULL) {
@@ -1040,7 +1046,7 @@ e_cal_client_view_stop (ECalClientView *client_view,
client_view->priv->running = FALSE;
- e_gdbus_cal_view_call_stop_sync (
+ e_dbus_calendar_view_call_stop_sync (
client_view->priv->dbus_proxy, NULL, &local_error);
if (local_error != NULL) {
@@ -1079,7 +1085,7 @@ e_cal_client_view_set_fields_of_interest (ECalClientView *client_view,
g_return_if_fail (E_IS_CAL_CLIENT_VIEW (client_view));
strv = e_client_util_slist_to_strv (fields_of_interest);
- e_gdbus_cal_view_call_set_fields_of_interest_sync (
+ e_dbus_calendar_view_call_set_fields_of_interest_sync (
client_view->priv->dbus_proxy,
(const gchar * const *) strv,
NULL, &local_error);
@@ -1110,7 +1116,7 @@ e_cal_client_view_set_flags (ECalClientView *client_view,
g_return_if_fail (E_IS_CAL_CLIENT_VIEW (client_view));
- e_gdbus_cal_view_call_set_flags_sync (
+ e_dbus_calendar_view_call_set_flags_sync (
client_view->priv->dbus_proxy, flags, NULL, &local_error);
if (local_error != NULL) {
diff --git a/src/calendar/libedata-cal/CMakeLists.txt b/src/calendar/libedata-cal/CMakeLists.txt
index 15df5d213..749fdf68d 100644
--- a/src/calendar/libedata-cal/CMakeLists.txt
+++ b/src/calendar/libedata-cal/CMakeLists.txt
@@ -5,7 +5,6 @@ set(DEPENDENCIES
ecal
edbus-private
edataserver
- egdbus-cal
)
set(SOURCES
@@ -73,12 +72,10 @@ target_include_directories(edata-cal PUBLIC
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/src
${CMAKE_BINARY_DIR}/src/calendar
- ${CMAKE_BINARY_DIR}/src/calendar/libegdbus
${CMAKE_BINARY_DIR}/src/private
${CMAKE_SOURCE_DIR}/src
- ${CMAKE_SOURCE_DIR}/src/private
${CMAKE_SOURCE_DIR}/src/calendar
- ${CMAKE_SOURCE_DIR}/src/calendar/libegdbus
+ ${CMAKE_SOURCE_DIR}/src/private
${CMAKE_CURRENT_BINARY_DIR}
${CALENDAR_INCLUDE_DIRS}
)
@@ -120,12 +117,10 @@ target_include_directories(evolution-calendar-factory-subprocess PUBLIC
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/src
${CMAKE_BINARY_DIR}/src/calendar
- ${CMAKE_BINARY_DIR}/src/calendar/libegdbus
${CMAKE_BINARY_DIR}/src/private
${CMAKE_SOURCE_DIR}/src
- ${CMAKE_SOURCE_DIR}/src/private
${CMAKE_SOURCE_DIR}/src/calendar
- ${CMAKE_SOURCE_DIR}/src/calendar/libegdbus
+ ${CMAKE_SOURCE_DIR}/src/private
${CMAKE_CURRENT_BINARY_DIR}
${CALENDAR_INCLUDE_DIRS}
${GTK_INCLUDE_DIRS}
diff --git a/src/calendar/libedata-cal/e-data-cal-view.c b/src/calendar/libedata-cal/e-data-cal-view.c
index 6180baaaf..f858349b4 100644
--- a/src/calendar/libedata-cal/e-data-cal-view.c
+++ b/src/calendar/libedata-cal/e-data-cal-view.c
@@ -39,7 +39,7 @@
#include "e-cal-backend.h"
#include "e-cal-backend-sexp.h"
#include "e-data-cal-view.h"
-#include "e-gdbus-cal-view.h"
+#include "e-dbus-calendar-view.h"
#define E_DATA_CAL_VIEW_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -53,7 +53,7 @@
struct _EDataCalViewPrivate {
GDBusConnection *connection;
- EGdbusCalView *gdbus_object;
+ EDBusCalendarView *dbus_object;
gchar *object_path;
/* The backend we are monitoring */
@@ -187,7 +187,7 @@ calview_start_thread (gpointer data)
}
static gboolean
-impl_DataCalView_start (EGdbusCalView *object,
+impl_DataCalView_start (EDBusCalendarView *object,
GDBusMethodInvocation *invocation,
EDataCalView *view)
{
@@ -206,7 +206,7 @@ impl_DataCalView_start (EGdbusCalView *object,
g_thread_unref (thread);
}
- e_gdbus_cal_view_complete_start (object, invocation, NULL);
+ e_dbus_calendar_view_complete_start (object, invocation);
return TRUE;
}
@@ -224,7 +224,7 @@ calview_stop_thread (gpointer data)
}
static gboolean
-impl_DataCalView_stop (EGdbusCalView *object,
+impl_DataCalView_stop (EDBusCalendarView *object,
GDBusMethodInvocation *invocation,
EDataCalView *view)
{
@@ -235,30 +235,30 @@ impl_DataCalView_stop (EGdbusCalView *object,
thread = g_thread_new (NULL, calview_stop_thread, g_object_ref (view));
g_thread_unref (thread);
- e_gdbus_cal_view_complete_stop (object, invocation, NULL);
+ e_dbus_calendar_view_complete_stop (object, invocation);
return TRUE;
}
static gboolean
-impl_DataCalView_setFlags (EGdbusCalView *object,
+impl_DataCalView_setFlags (EDBusCalendarView *object,
GDBusMethodInvocation *invocation,
ECalClientViewFlags flags,
EDataCalView *view)
{
view->priv->flags = flags;
- e_gdbus_cal_view_complete_set_flags (object, invocation, NULL);
+ e_dbus_calendar_view_complete_set_flags (object, invocation);
return TRUE;
}
static gboolean
-impl_DataCalView_dispose (EGdbusCalView *object,
+impl_DataCalView_dispose (EDBusCalendarView *object,
GDBusMethodInvocation *invocation,
EDataCalView *view)
{
- e_gdbus_cal_view_complete_dispose (object, invocation, NULL);
+ e_dbus_calendar_view_complete_dispose (object, invocation);
e_cal_backend_stop_view (view->priv->backend, view);
view->priv->stopped = TRUE;
@@ -268,7 +268,7 @@ impl_DataCalView_dispose (EGdbusCalView *object,
}
static gboolean
-impl_DataCalView_set_fields_of_interest (EGdbusCalView *object,
+impl_DataCalView_set_fields_of_interest (EDBusCalendarView *object,
GDBusMethodInvocation *invocation,
const gchar * const *in_fields_of_interest,
EDataCalView *view)
@@ -301,8 +301,7 @@ impl_DataCalView_set_fields_of_interest (EGdbusCalView *object,
g_strdup (field), GINT_TO_POINTER (1));
}
- e_gdbus_cal_view_complete_set_fields_of_interest (
- object, invocation, NULL);
+ e_dbus_calendar_view_complete_set_fields_of_interest (object, invocation);
return TRUE;
}
@@ -438,7 +437,7 @@ data_cal_view_dispose (GObject *object)
g_mutex_unlock (&priv->pending_mutex);
g_clear_object (&priv->connection);
- g_clear_object (&priv->gdbus_object);
+ g_clear_object (&priv->dbus_object);
g_clear_object (&priv->backend);
g_clear_object (&priv->sexp);
@@ -483,8 +482,8 @@ data_cal_view_initable_init (GInitable *initable,
view = E_DATA_CAL_VIEW (initable);
- return e_gdbus_cal_view_register_object (
- view->priv->gdbus_object,
+ return g_dbus_interface_skeleton_export (
+ G_DBUS_INTERFACE_SKELETON (view->priv->dbus_object),
view->priv->connection,
view->priv->object_path,
error);
@@ -567,21 +566,21 @@ e_data_cal_view_init (EDataCalView *view)
view->priv->flags = E_CAL_CLIENT_VIEW_FLAGS_NOTIFY_INITIAL;
- view->priv->gdbus_object = e_gdbus_cal_view_stub_new ();
+ view->priv->dbus_object = e_dbus_calendar_view_skeleton_new ();
g_signal_connect (
- view->priv->gdbus_object, "handle-start",
+ view->priv->dbus_object, "handle-start",
G_CALLBACK (impl_DataCalView_start), view);
g_signal_connect (
- view->priv->gdbus_object, "handle-stop",
+ view->priv->dbus_object, "handle-stop",
G_CALLBACK (impl_DataCalView_stop), view);
g_signal_connect (
- view->priv->gdbus_object, "handle-set-flags",
+ view->priv->dbus_object, "handle-set-flags",
G_CALLBACK (impl_DataCalView_setFlags), view);
g_signal_connect (
- view->priv->gdbus_object, "handle-dispose",
+ view->priv->dbus_object, "handle-dispose",
G_CALLBACK (impl_DataCalView_dispose), view);
g_signal_connect (
- view->priv->gdbus_object, "handle-set-fields-of-interest",
+ view->priv->dbus_object, "handle-set-fields-of-interest",
G_CALLBACK (impl_DataCalView_set_fields_of_interest), view);
view->priv->backend = NULL;
@@ -649,8 +648,8 @@ send_pending_adds (EDataCalView *view)
if (view->priv->adds->len == 0)
return;
- e_gdbus_cal_view_emit_objects_added (
- view->priv->gdbus_object,
+ e_dbus_calendar_view_emit_objects_added (
+ view->priv->dbus_object,
(const gchar * const *) view->priv->adds->data);
reset_array (view->priv->adds);
}
@@ -661,8 +660,8 @@ send_pending_changes (EDataCalView *view)
if (view->priv->changes->len == 0)
return;
- e_gdbus_cal_view_emit_objects_modified (
- view->priv->gdbus_object,
+ e_dbus_calendar_view_emit_objects_modified (
+ view->priv->dbus_object,
(const gchar * const *) view->priv->changes->data);
reset_array (view->priv->changes);
}
@@ -674,8 +673,8 @@ send_pending_removes (EDataCalView *view)
return;
/* send ECalComponentIds as <uid>[\n<rid>], as encoded in notify_remove() */
- e_gdbus_cal_view_emit_objects_removed (
- view->priv->gdbus_object,
+ e_dbus_calendar_view_emit_objects_removed (
+ view->priv->dbus_object,
(const gchar * const *) view->priv->removes->data);
reset_array (view->priv->removes);
}
@@ -1359,18 +1358,18 @@ e_data_cal_view_notify_progress (EDataCalView *view,
gint percent,
const gchar *message)
{
- gchar *gdbus_message = NULL;
+ gchar *dbus_message = NULL;
g_return_if_fail (E_IS_DATA_CAL_VIEW (view));
if (!view->priv->started || view->priv->stopped)
return;
- e_gdbus_cal_view_emit_progress (
- view->priv->gdbus_object, percent,
- e_util_ensure_gdbus_string (message, &gdbus_message));
+ e_dbus_calendar_view_emit_progress (
+ view->priv->dbus_object, percent,
+ e_util_ensure_gdbus_string (message, &dbus_message));
- g_free (gdbus_message);
+ g_free (dbus_message);
}
/**
@@ -1387,7 +1386,7 @@ void
e_data_cal_view_notify_complete (EDataCalView *view,
const GError *error)
{
- gchar **error_strv;
+ gchar *error_name, *error_message;
g_return_if_fail (E_IS_DATA_CAL_VIEW (view));
@@ -1402,13 +1401,25 @@ e_data_cal_view_notify_complete (EDataCalView *view,
send_pending_changes (view);
send_pending_removes (view);
- error_strv = e_gdbus_templates_encode_error (error);
+ if (error) {
+ gchar *dbus_error_name = g_dbus_error_encode_gerror (error);
- e_gdbus_cal_view_emit_complete (
- view->priv->gdbus_object,
- (const gchar * const *) error_strv);
+ error_name = e_util_utf8_make_valid (dbus_error_name ? dbus_error_name : "");
+ error_message = e_util_utf8_make_valid (error->message);
- g_strfreev (error_strv);
+ g_free (dbus_error_name);
+ } else {
+ error_name = g_strdup ("");
+ error_message = g_strdup ("");
+ }
+
+ e_dbus_calendar_view_emit_complete (
+ view->priv->dbus_object,
+ error_name,
+ error_message);
+
+ g_free (error_name);
+ g_free (error_message);
g_mutex_unlock (&view->priv->pending_mutex);
}
diff --git a/src/libedataserver/CMakeLists.txt b/src/libedataserver/CMakeLists.txt
index e82b3d7ed..4393579c8 100644
--- a/src/libedataserver/CMakeLists.txt
+++ b/src/libedataserver/CMakeLists.txt
@@ -58,7 +58,6 @@ set(SOURCES
e-flag.c
e-free-form-exp.c
e-gdata-oauth2-authorizer.c
- e-gdbus-templates.c
e-iterator.c
e-list.c
e-list-iterator.c
@@ -147,7 +146,6 @@ set(HEADERS
e-flag.h
e-free-form-exp.h
e-gdata-oauth2-authorizer.h
- e-gdbus-templates.h
e-iterator.h
e-list.h
e-list-iterator.h
diff --git a/src/libedataserver/libedataserver.h b/src/libedataserver/libedataserver.h
index 3f0b49279..8b19ef572 100644
--- a/src/libedataserver/libedataserver.h
+++ b/src/libedataserver/libedataserver.h
@@ -32,7 +32,6 @@
#include <libedataserver/e-flag.h>
#include <libedataserver/e-free-form-exp.h>
#include <libedataserver/e-gdata-oauth2-authorizer.h>
-#include <libedataserver/e-gdbus-templates.h>
#include <libedataserver/e-iterator.h>
#include <libedataserver/e-list-iterator.h>
#include <libedataserver/e-list.h>
diff --git a/src/private/CMakeLists.txt b/src/private/CMakeLists.txt
index 401acf2c6..c2de59bba 100644
--- a/src/private/CMakeLists.txt
+++ b/src/private/CMakeLists.txt
@@ -88,6 +88,18 @@ gdbus_codegen(org.gnome.evolution.dataserver.AddressBookCursor.xml
e-dbus-address-book-cursor
GENERATED_DBUS_ADDRESS_BOOK_CURSOR)
+set(GENERATED_DBUS_ADDRESS_BOOK_VIEW
+ e-dbus-address-book-view.c
+ e-dbus-address-book-view.h
+ e-dbus-address-book-view-org.gnome.evolution.dataserver.AddressBookView.xml
+)
+
+gdbus_codegen(org.gnome.evolution.dataserver.AddressBookView.xml
+ org.gnome.evolution.dataserver.
+ E_DBus
+ e-dbus-address-book-view
+ GENERATED_DBUS_ADDRESS_BOOK_VIEW)
+
set(GENERATED_DBUS_DIRECT_BOOK
e-dbus-direct-book.c
e-dbus-direct-book.h
@@ -136,6 +148,18 @@ gdbus_codegen(org.gnome.evolution.dataserver.CalendarFactory.xml
e-dbus-calendar-factory
GENERATED_DBUS_CALENDAR_FACTORY)
+set(GENERATED_DBUS_CALENDAR_VIEW
+ e-dbus-calendar-view.c
+ e-dbus-calendar-view.h
+ e-dbus-calendar-view-org.gnome.evolution.dataserver.CalendarView.xml
+)
+
+gdbus_codegen(org.gnome.evolution.dataserver.CalendarView.xml
+ org.gnome.evolution.dataserver.
+ E_DBus
+ e-dbus-calendar-view
+ GENERATED_DBUS_CALENDAR_VIEW)
+
set(GENERATED_DBUS_SUBPROCESS_BACKEND
e-dbus-subprocess-backend.c
e-dbus-subprocess-backend.h
@@ -156,10 +180,12 @@ add_library(edbus-private SHARED
${GENERATED_DBUS_AUTHENTICATOR}
${GENERATED_DBUS_ADDRESS_BOOK}
${GENERATED_DBUS_ADDRESS_BOOK_CURSOR}
+ ${GENERATED_DBUS_ADDRESS_BOOK_VIEW}
${GENERATED_DBUS_DIRECT_BOOK}
${GENERATED_DBUS_ADDRESS_BOOK_FACTORY}
${GENERATED_DBUS_CALENDAR}
${GENERATED_DBUS_CALENDAR_FACTORY}
+ ${GENERATED_DBUS_CALENDAR_VIEW}
${GENERATED_DBUS_USER_PROMPTER}
${GENERATED_DBUS_SUBPROCESS_BACKEND}
)
diff --git a/src/private/org.gnome.evolution.dataserver.AddressBookView.xml
b/src/private/org.gnome.evolution.dataserver.AddressBookView.xml
new file mode 100644
index 000000000..bf481a464
--- /dev/null
+++ b/src/private/org.gnome.evolution.dataserver.AddressBookView.xml
@@ -0,0 +1,51 @@
+<!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.AddressBookView:
+ @short_description: Address book view
+ @since: 3.32
+
+ This interface allows for interaction with an address book view.
+-->
+<interface name="org.gnome.evolution.dataserver.AddressBookView">
+
+ <signal name="ObjectsAdded">
+ <arg name="objects" type="as"/>
+ </signal>
+
+ <signal name="ObjectsModified">
+ <arg name="objects" type="as"/>
+ </signal>
+
+ <signal name="ObjectsRemoved">
+ <arg name="uids" type="as"/>
+ </signal>
+
+ <signal name="Progress">
+ <arg name="percent" type="u"/>
+ <arg name="message" type="s"/>
+ </signal>
+
+ <signal name="Complete">
+ <arg name="error_name" type="s"/>
+ <arg name="error_message" type="s"/>
+ </signal>
+
+ <method name="Start"/>
+
+ <method name="Stop"/>
+
+ <method name="SetFlags">
+ <arg name="flags" type="u"/>
+ </method>
+
+ <method name="SetFieldsOfInterest">
+ <arg name="only_fields" direction="in" type="as"/>
+ </method>
+
+ <method name="Dispose"/>
+
+</interface>
diff --git a/src/private/org.gnome.evolution.dataserver.CalendarView.xml
b/src/private/org.gnome.evolution.dataserver.CalendarView.xml
new file mode 100644
index 000000000..805902938
--- /dev/null
+++ b/src/private/org.gnome.evolution.dataserver.CalendarView.xml
@@ -0,0 +1,51 @@
+<!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.CalendarView:
+ @short_description: Calendar view
+ @since: 3.32
+
+ This interface allows for interaction with a calendar view.
+-->
+<interface name="org.gnome.evolution.dataserver.CalendarView">
+
+ <signal name="ObjectsAdded">
+ <arg name="objects" type="as"/>
+ </signal>
+
+ <signal name="ObjectsModified">
+ <arg name="objects" type="as"/>
+ </signal>
+
+ <signal name="ObjectsRemoved">
+ <arg name="uids" type="as"/>
+ </signal>
+
+ <signal name="Progress">
+ <arg name="percent" type="u"/>
+ <arg name="message" type="s"/>
+ </signal>
+
+ <signal name="Complete">
+ <arg name="error_name" type="s"/>
+ <arg name="error_message" type="s"/>
+ </signal>
+
+ <method name="Start"/>
+
+ <method name="Stop"/>
+
+ <method name="SetFlags">
+ <arg name="flags" type="u"/>
+ </method>
+
+ <method name="SetFieldsOfInterest">
+ <arg name="only_fields" direction="in" type="as"/>
+ </method>
+
+ <method name="Dispose"/>
+
+</interface>
diff --git a/src/services/evolution-addressbook-factory/evolution-addressbook-factory.c
b/src/services/evolution-addressbook-factory/evolution-addressbook-factory.c
index 78dd6fc12..20639d2eb 100644
--- a/src/services/evolution-addressbook-factory/evolution-addressbook-factory.c
+++ b/src/services/evolution-addressbook-factory/evolution-addressbook-factory.c
@@ -82,7 +82,6 @@ main (gint argc,
exit (EXIT_FAILURE);
}
- e_gdbus_templates_init_main_thread ();
e_xml_initialize_in_main ();
reload:
diff --git a/src/services/evolution-alarm-notify/evolution-alarm-notify.c
b/src/services/evolution-alarm-notify/evolution-alarm-notify.c
index d3a46ba96..3e9e68e62 100644
--- a/src/services/evolution-alarm-notify/evolution-alarm-notify.c
+++ b/src/services/evolution-alarm-notify/evolution-alarm-notify.c
@@ -67,7 +67,6 @@ main (gint argc,
exit (EXIT_FAILURE);
}
- e_gdbus_templates_init_main_thread ();
e_xml_initialize_in_main ();
alarm_notify = e_alarm_notify_new (NULL, &error);
diff --git a/src/services/evolution-calendar-factory/evolution-calendar-factory.c
b/src/services/evolution-calendar-factory/evolution-calendar-factory.c
index 1c7a5bdbe..4217305bd 100644
--- a/src/services/evolution-calendar-factory/evolution-calendar-factory.c
+++ b/src/services/evolution-calendar-factory/evolution-calendar-factory.c
@@ -92,7 +92,6 @@ main (gint argc,
icaltzutil_set_exact_vtimezones_support (0);
#endif
- e_gdbus_templates_init_main_thread ();
e_xml_initialize_in_main ();
reload:
diff --git a/src/services/evolution-source-registry/evolution-source-registry.c
b/src/services/evolution-source-registry/evolution-source-registry.c
index 49c02c309..1c0a11382 100644
--- a/src/services/evolution-source-registry/evolution-source-registry.c
+++ b/src/services/evolution-source-registry/evolution-source-registry.c
@@ -177,7 +177,6 @@ main (gint argc,
exit (EXIT_FAILURE);
}
- e_gdbus_templates_init_main_thread ();
e_xml_initialize_in_main ();
reload:
diff --git a/src/services/evolution-user-prompter/evolution-user-prompter.c
b/src/services/evolution-user-prompter/evolution-user-prompter.c
index 9f52d1178..f711baa18 100644
--- a/src/services/evolution-user-prompter/evolution-user-prompter.c
+++ b/src/services/evolution-user-prompter/evolution-user-prompter.c
@@ -68,7 +68,6 @@ main (gint argc,
exit (EXIT_FAILURE);
}
- e_gdbus_templates_init_main_thread ();
e_xml_initialize_in_main ();
reload:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
