[evolution-data-server/mmeeks-gdbus-import] Switch to EVariant etc.
- From: Michael Meeks <michael src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server/mmeeks-gdbus-import] Switch to EVariant etc.
- Date: Fri, 26 Feb 2010 12:13:49 +0000 (UTC)
commit afc0563713077afbaecdb9fce61d2eb1a0e5a883
Author: Michael Meeks <michael meeks novell com>
Date: Fri Feb 26 11:46:31 2010 +0000
Switch to EVariant etc.
addressbook/libebook/e-book-view-private.h | 4 +-
addressbook/libebook/e-book-view.c | 20 +-
addressbook/libebook/e-book.c | 82 +++---
.../libebook/e-data-book-factory-gdbus-bindings.h | 12 +-
addressbook/libebook/e-data-book-gdbus-bindings.h | 344 ++++++++++----------
.../libebook/e-data-book-view-gdbus-bindings.h | 32 +-
calendar/libecal/e-cal-view-private.h | 4 +-
calendar/libecal/e-cal-view.c | 20 +-
calendar/libecal/e-cal.c | 44 ++--
.../libecal/e-data-cal-factory-gdbus-bindings.h | 12 +-
calendar/libecal/e-data-cal-gdbus-bindings.h | 266 ++++++++--------
calendar/libecal/e-data-cal-view-gdbus-bindings.h | 12 +-
configure.ac | 6 +-
.../e-data-gdbus-bindings-common.h | 70 ++--
14 files changed, 463 insertions(+), 465 deletions(-)
---
diff --git a/addressbook/libebook/e-book-view-private.h b/addressbook/libebook/e-book-view-private.h
index 7ce3a1a..92ff24c 100644
--- a/addressbook/libebook/e-book-view-private.h
+++ b/addressbook/libebook/e-book-view-private.h
@@ -22,12 +22,12 @@
#ifndef __E_BOOK_VIEW_PRIVATE_H__
#define __E_BOOK_VIEW_PRIVATE_H__
-#include <gdbus/gdbus.h>
+#include <edbus/edbus.h>
#include "e-book.h"
#include "e-book-view.h"
-EBookView *_e_book_view_new (EBook *book, GDBusProxy *view_proxy, GStaticRecMutex *connection_lock);
+EBookView *_e_book_view_new (EBook *book, EDBusProxy *view_proxy, GStaticRecMutex *connection_lock);
G_END_DECLS
diff --git a/addressbook/libebook/e-book-view.c b/addressbook/libebook/e-book-view.c
index 347996a..41c28a3 100644
--- a/addressbook/libebook/e-book-view.c
+++ b/addressbook/libebook/e-book-view.c
@@ -34,7 +34,7 @@ G_DEFINE_TYPE(EBookView, e_book_view, G_TYPE_OBJECT);
struct _EBookViewPrivate {
EBook *book;
- GDBusProxy *view_proxy;
+ EDBusProxy *view_proxy;
GStaticRecMutex *view_proxy_lock;
gboolean running;
};
@@ -137,40 +137,40 @@ book_view_handle_signal_complete (EBookView *book_view,
}
static void
-book_view_proxy_signal_cb (GDBusProxy *proxy,
+book_view_proxy_signal_cb (EDBusProxy *proxy,
gchar *sender_name,
gchar *signal_name,
- GVariant *parameters,
+ EVariant *parameters,
EBookView *book_view)
{
if (FALSE) {
} else if (!g_strcmp0 (signal_name, "StatusMessage")) {
const char *value;
- g_variant_get (parameters, "(&s)", &value);
+ e_variant_get (parameters, "(&s)", &value);
book_view_handle_signal_status_message (book_view, value);
} else if (!g_strcmp0 (signal_name, "ContactsAdded")) {
const char **value;
- g_variant_get (parameters, "(^a&s)", &value, NULL);
+ e_variant_get (parameters, "(^a&s)", &value, NULL);
book_view_handle_signal_contacts_added (book_view, value);
g_free (value);
} else if (!g_strcmp0 (signal_name, "ContactsChanged")) {
const char **value;
- g_variant_get (parameters, "(^a&s)", &value, NULL);
+ e_variant_get (parameters, "(^a&s)", &value, NULL);
book_view_handle_signal_contacts_changed (book_view, value);
g_free (value);
} else if (!g_strcmp0 (signal_name, "ContactsRemoved")) {
const char **value;
- g_variant_get (parameters, "(^a&s)", &value, NULL);
+ e_variant_get (parameters, "(^a&s)", &value, NULL);
book_view_handle_signal_contacts_removed (book_view, value);
g_free (value);
} else if (!g_strcmp0 (signal_name, "Complete")) {
const guint value;
- g_variant_get (parameters, "(u)", &value);
+ e_variant_get (parameters, "(u)", &value);
book_view_handle_signal_complete (book_view, value);
}
@@ -179,7 +179,7 @@ book_view_proxy_signal_cb (GDBusProxy *proxy,
/*
* e_book_view_new:
* @book: an #EBook
- * @view_proxy: The #GDBusProxy to get signals from
+ * @view_proxy: The #EDBusProxy to get signals from
*
* Creates a new #EBookView based on #EBook and listening to @view_proxy. This
* is a private function, applications should call #e_book_get_book_view or
@@ -189,7 +189,7 @@ book_view_proxy_signal_cb (GDBusProxy *proxy,
**/
EBookView *
_e_book_view_new (EBook *book,
- GDBusProxy *view_proxy,
+ EDBusProxy *view_proxy,
GStaticRecMutex *view_proxy_lock)
{
EBookView *view;
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index 5132937..3b1c2bc 100644
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -60,7 +60,7 @@ struct _EBookPrivate {
ESource *source;
gchar *uri;
DBusGProxy *proxy;
- GDBusProxy *gdbus_proxy;
+ EDBusProxy *gdbus_proxy;
gboolean loaded;
gboolean writable;
gboolean connected;
@@ -68,8 +68,8 @@ struct _EBookPrivate {
gboolean cap_queried;
};
-static GDBusConnection *connection_gdbus = NULL;
-static GDBusProxy *factory_proxy_gdbus = NULL;
+static EDBusConnection *connection_gdbus = NULL;
+static EDBusProxy *factory_proxy_gdbus = NULL;
/* guards both connection and factory_proxy */
static GStaticRecMutex connection_lock = G_STATIC_REC_MUTEX_INIT;
@@ -292,7 +292,7 @@ e_book_activate(GError **error)
/* FIXME: better to just watch for the proxy instead of using the
* connection directly? */
if (!connection_gdbus) {
- connection_gdbus = g_dbus_connection_bus_get_private_sync (G_BUS_TYPE_SESSION, NULL, error);
+ connection_gdbus = e_dbus_connection_bus_get_private_sync (G_BUS_TYPE_SESSION, NULL, error);
if (!connection_gdbus) {
UNLOCK_CONN ();
@@ -305,9 +305,9 @@ e_book_activate(GError **error)
/* FIXME: watch for changes to this proxy instead of relying upon
* dbus-glib to get the unique name */
if (!factory_proxy_gdbus) {
- factory_proxy_gdbus = g_dbus_proxy_new_sync (connection_gdbus,
- G_TYPE_DBUS_PROXY,
- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
+ factory_proxy_gdbus = e_dbus_proxy_new_sync (connection_gdbus,
+ E_TYPE_DBUS_PROXY,
+ E_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | E_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
factory_proxy_name,
"/org/gnome/evolution/dataserver/addressbook/BookFactory",
"org.gnome.evolution.dataserver.addressbook.BookFactory",
@@ -363,15 +363,15 @@ book_handle_signal_auth_required (EBook *book)
}
static void
-book_proxy_signal_cb (GDBusProxy *proxy,
+book_proxy_signal_cb (EDBusProxy *proxy,
gchar *sender_name,
gchar *signal_name,
- GVariant *parameters,
+ EVariant *parameters,
EBook *book)
{
gboolean value = FALSE;
- g_variant_get (parameters, "(b)", &value);
+ e_variant_get (parameters, "(b)", &value);
if (FALSE) {
} else if (!g_strcmp0 (signal_name, "auth_required")) {
@@ -418,7 +418,7 @@ e_book_add_contact (EBook *book,
}
static void
-add_contact_reply (GDBusProxy *proxy,
+add_contact_reply (EDBusProxy *proxy,
gchar *uid,
GError *error,
gpointer user_data)
@@ -507,7 +507,7 @@ e_book_commit_contact (EBook *book,
}
static void
-modify_contact_reply (GDBusProxy *proxy,
+modify_contact_reply (EDBusProxy *proxy,
GError *error,
gpointer user_data)
{
@@ -596,7 +596,7 @@ e_book_get_required_fields (EBook *book,
}
static void
-get_required_fields_reply (GDBusProxy *proxy,
+get_required_fields_reply (EDBusProxy *proxy,
gchar **fields,
GError *error,
gpointer user_data)
@@ -689,7 +689,7 @@ e_book_get_supported_fields (EBook *book,
}
static void
-get_supported_fields_reply (GDBusProxy *proxy,
+get_supported_fields_reply (EDBusProxy *proxy,
gchar **fields,
GError *error,
gpointer user_data)
@@ -782,7 +782,7 @@ e_book_get_supported_auth_methods (EBook *book,
}
static void
-get_supported_auth_methods_reply (GDBusProxy *proxy,
+get_supported_auth_methods_reply (EDBusProxy *proxy,
gchar **methods,
GError *error,
gpointer user_data)
@@ -875,7 +875,7 @@ e_book_authenticate_user (EBook *book,
}
static void
-authenticate_user_reply (GDBusProxy *proxy,
+authenticate_user_reply (EDBusProxy *proxy,
GError *error,
gpointer user_data)
{
@@ -969,7 +969,7 @@ e_book_get_contact (EBook *book,
}
static void
-get_contact_reply (GDBusProxy *proxy,
+get_contact_reply (EDBusProxy *proxy,
gchar *vcard,
GError *error,
gpointer user_data)
@@ -1067,7 +1067,7 @@ e_book_remove_contact (EBook *book,
}
static void
-remove_contact_reply (GDBusProxy *proxy,
+remove_contact_reply (EDBusProxy *proxy,
GError *error,
gpointer user_data)
{
@@ -1157,7 +1157,7 @@ e_book_async_remove_contact (EBook *book,
}
static void
-remove_contact_by_id_reply (GDBusProxy *proxy,
+remove_contact_by_id_reply (EDBusProxy *proxy,
GError *error,
gpointer user_data)
{
@@ -1211,7 +1211,7 @@ e_book_async_remove_contact_by_id (EBook *book,
}
static void
-remove_contacts_reply (GDBusProxy *proxy,
+remove_contacts_reply (EDBusProxy *proxy,
GError *error,
gpointer user_data)
{
@@ -1297,7 +1297,7 @@ e_book_get_book_view (EBook *book,
GError **error)
{
GError *err = NULL;
- GDBusProxy *view_proxy_gdbus;
+ EDBusProxy *view_proxy_gdbus;
gchar *sexp, *view_path;
gboolean ret = TRUE;
@@ -1313,10 +1313,10 @@ e_book_get_book_view (EBook *book,
g_free (sexp);
return unwrap_gerror (err, error);
}
- view_proxy_gdbus = g_dbus_proxy_new_sync (connection_gdbus,
- G_TYPE_DBUS_PROXY,
- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
- g_dbus_proxy_get_unique_bus_name (factory_proxy_gdbus),
+ view_proxy_gdbus = e_dbus_proxy_new_sync (connection_gdbus,
+ E_TYPE_DBUS_PROXY,
+ E_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+ e_dbus_proxy_get_unique_bus_name (factory_proxy_gdbus),
view_path,
"org.gnome.evolution.dataserver.addressbook.BookView",
NULL,
@@ -1339,7 +1339,7 @@ e_book_get_book_view (EBook *book,
}
static void
-get_book_view_reply (GDBusProxy *proxy,
+get_book_view_reply (EDBusProxy *proxy,
gchar *view_path,
GError *error,
gpointer user_data)
@@ -1348,15 +1348,15 @@ get_book_view_reply (GDBusProxy *proxy,
GError *err = NULL;
EBookView *view = NULL;
EBookBookViewCallback cb = data->callback;
- GDBusProxy *view_proxy_gdbus;
+ EDBusProxy *view_proxy_gdbus;
EBookStatus status;
if (view_path) {
LOCK_CONN ();
- view_proxy_gdbus = g_dbus_proxy_new_sync (connection_gdbus,
- G_TYPE_DBUS_PROXY,
- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
- g_dbus_proxy_get_unique_bus_name (factory_proxy_gdbus),
+ view_proxy_gdbus = e_dbus_proxy_new_sync (connection_gdbus,
+ E_TYPE_DBUS_PROXY,
+ E_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+ e_dbus_proxy_get_unique_bus_name (factory_proxy_gdbus),
view_path,
"org.gnome.evolution.dataserver.addressbook.BookView",
NULL,
@@ -1469,7 +1469,7 @@ e_book_get_contacts (EBook *book,
}
static void
-get_contacts_reply (GDBusProxy *proxy,
+get_contacts_reply (EDBusProxy *proxy,
gchar **vcards,
GError *error,
gpointer user_data)
@@ -1597,7 +1597,7 @@ e_book_get_changes (EBook *book,
}
static void
-get_changes_reply (GDBusProxy *proxy,
+get_changes_reply (EDBusProxy *proxy,
GPtrArray *changes,
GError *error,
gpointer user_data)
@@ -1765,7 +1765,7 @@ e_book_open (EBook *book,
}
static void
-open_reply (GDBusProxy *proxy,
+open_reply (EDBusProxy *proxy,
GError *error,
gpointer user_data)
{
@@ -1846,7 +1846,7 @@ e_book_remove (EBook *book,
}
static void
-remove_reply (GDBusProxy *proxy,
+remove_reply (EDBusProxy *proxy,
GError *error,
gpointer user_data)
{
@@ -2309,10 +2309,10 @@ e_book_new (ESource *source, GError **error)
}
g_free (xml);
- book->priv->gdbus_proxy = g_dbus_proxy_new_sync (connection_gdbus,
- G_TYPE_DBUS_PROXY,
- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
- g_dbus_proxy_get_unique_bus_name (factory_proxy_gdbus),
+ book->priv->gdbus_proxy = e_dbus_proxy_new_sync (connection_gdbus,
+ E_TYPE_DBUS_PROXY,
+ E_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+ e_dbus_proxy_get_unique_bus_name (factory_proxy_gdbus),
path,
"org.gnome.evolution.dataserver.addressbook.Book",
NULL,
@@ -2622,11 +2622,11 @@ get_status_from_error (GError *error)
if G_LIKELY (error == NULL)
return E_BOOK_ERROR_OK;
- if (error->domain == G_DBUS_ERROR && g_dbus_error_is_remote_error (error)) {
+ if (error->domain == E_DBUS_ERROR && e_dbus_error_is_remote_error (error)) {
gchar *name;
gint i;
- name = g_dbus_error_get_remote_error (error);
+ name = e_dbus_error_get_remote_error (error);
for (i = 0; i < G_N_ELEMENTS (errors); i++) {
if (g_ascii_strcasecmp (errors[i].name, name) == 0) {
diff --git a/addressbook/libebook/e-data-book-factory-gdbus-bindings.h b/addressbook/libebook/e-data-book-factory-gdbus-bindings.h
index b1d437a..e144093 100644
--- a/addressbook/libebook/e-data-book-factory-gdbus-bindings.h
+++ b/addressbook/libebook/e-data-book-factory-gdbus-bindings.h
@@ -20,7 +20,7 @@
*/
#include <glib.h>
-#include <gdbus/gdbus.h>
+#include <edbus/edbus.h>
#include <libedata-gdbus-bindings/e-data-gdbus-bindings-common.h>
@@ -30,13 +30,13 @@ G_BEGIN_DECLS
* when possible */
static gboolean
-e_data_book_factory_gdbus_get_book_sync (GDBusProxy *proxy, const char * IN_source, char** OUT_path, GError **error)
+e_data_book_factory_gdbus_get_book_sync (EDBusProxy *proxy, const char * IN_source, char** OUT_path, GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(s)", IN_source);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getBook", parameters,
+ parameters = e_variant_new ("(s)", IN_source);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getBook", parameters,
-1, NULL, error);
return demarshal_retvals__OBJPATH (retvals, OUT_path);
diff --git a/addressbook/libebook/e-data-book-gdbus-bindings.h b/addressbook/libebook/e-data-book-gdbus-bindings.h
index 59d85d5..e038cde 100644
--- a/addressbook/libebook/e-data-book-gdbus-bindings.h
+++ b/addressbook/libebook/e-data-book-gdbus-bindings.h
@@ -20,7 +20,7 @@
*/
#include <glib.h>
-#include <gdbus/gdbus.h>
+#include <edbus/edbus.h>
#include <libedata-gdbus-bindings/e-data-gdbus-bindings-common.h>
@@ -30,30 +30,30 @@ G_BEGIN_DECLS
* when possible */
static gboolean
-e_data_book_gdbus_open_sync (GDBusProxy *proxy,
+e_data_book_gdbus_open_sync (EDBusProxy *proxy,
const gboolean IN_only_if_exists,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(b)", IN_only_if_exists);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "open", parameters,
+ parameters = e_variant_new ("(b)", IN_only_if_exists);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "open", parameters,
-1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static void
-open_cb (GDBusProxy *proxy,
+open_cb (EDBusProxy *proxy,
GAsyncResult *result,
gpointer user_data)
{
Closure *closure = user_data;
- GVariant *retvals;
+ EVariant *retvals;
GError *error = NULL;
- retvals = g_dbus_proxy_invoke_method_finish (proxy, result, &error);
+ retvals = e_dbus_proxy_invoke_method_finish (proxy, result, &error);
if (retvals) {
if (!demarshal_retvals__VOID (retvals)) {
error = g_error_new (E_BOOK_ERROR, E_BOOK_ERROR_CORBA_EXCEPTION, "demarshalling results for Book method 'open'");
@@ -65,63 +65,63 @@ open_cb (GDBusProxy *proxy,
}
static void
-e_data_book_gdbus_open (GDBusProxy *proxy,
+e_data_book_gdbus_open (EDBusProxy *proxy,
const gboolean IN_only_if_exists,
reply__VOID callback,
gpointer user_data)
{
- GVariant *parameters;
+ EVariant *parameters;
Closure *closure;
- parameters = g_variant_new ("(b)", IN_only_if_exists);
+ parameters = e_variant_new ("(b)", IN_only_if_exists);
closure = g_slice_new (Closure);
closure->cb = G_CALLBACK (callback);
closure->user_data = user_data;
- g_dbus_proxy_invoke_method (proxy, "open", parameters, -1, NULL, (GAsyncReadyCallback) open_cb, closure);
+ e_dbus_proxy_invoke_method (proxy, "open", parameters, -1, NULL, (GAsyncReadyCallback) open_cb, closure);
}
static gboolean
-e_data_book_gdbus_close_sync (GDBusProxy *proxy,
+e_data_book_gdbus_close_sync (EDBusProxy *proxy,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "close", parameters,
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "close", parameters,
-1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static gboolean
-e_data_book_gdbus_authenticate_user_sync (GDBusProxy *proxy,
+e_data_book_gdbus_authenticate_user_sync (EDBusProxy *proxy,
const char *IN_user,
const char *IN_passwd,
const char *IN_auth_method,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(sss)", IN_user, IN_passwd, IN_auth_method);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "authenticateUser", parameters, -1, NULL, error);
+ parameters = e_variant_new ("(sss)", IN_user, IN_passwd, IN_auth_method);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "authenticateUser", parameters, -1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static void
-authenticate_user_cb (GDBusProxy *proxy,
+authenticate_user_cb (EDBusProxy *proxy,
GAsyncResult *result,
gpointer user_data)
{
Closure *closure = user_data;
- GVariant *retvals;
+ EVariant *retvals;
GError *error = NULL;
- retvals = g_dbus_proxy_invoke_method_finish (proxy, result, &error);
+ retvals = e_dbus_proxy_invoke_method_finish (proxy, result, &error);
if (retvals) {
if (!demarshal_retvals__VOID (retvals)) {
error = g_error_new (E_BOOK_ERROR, E_BOOK_ERROR_CORBA_EXCEPTION, "demarshalling results for Book method 'authenticateUser'");
@@ -133,49 +133,49 @@ authenticate_user_cb (GDBusProxy *proxy,
}
static void
-e_data_book_gdbus_authenticate_user (GDBusProxy *proxy,
+e_data_book_gdbus_authenticate_user (EDBusProxy *proxy,
const char *IN_user,
const char *IN_passwd,
const char *IN_auth_method,
reply__VOID callback,
gpointer user_data)
{
- GVariant *parameters;
+ EVariant *parameters;
Closure *closure;
- parameters = g_variant_new ("(sss)", IN_user, IN_passwd, IN_auth_method);
+ parameters = e_variant_new ("(sss)", IN_user, IN_passwd, IN_auth_method);
closure = g_slice_new (Closure);
closure->cb = G_CALLBACK (callback);
closure->user_data = user_data;
- g_dbus_proxy_invoke_method (proxy, "authenticateUser", parameters, -1, NULL, (GAsyncReadyCallback) authenticate_user_cb, closure);
+ e_dbus_proxy_invoke_method (proxy, "authenticateUser", parameters, -1, NULL, (GAsyncReadyCallback) authenticate_user_cb, closure);
}
static gboolean
-e_data_book_gdbus_remove_sync (GDBusProxy *proxy,
+e_data_book_gdbus_remove_sync (EDBusProxy *proxy,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "remove", parameters,
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "remove", parameters,
-1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static void
-remove_cb (GDBusProxy *proxy,
+remove_cb (EDBusProxy *proxy,
GAsyncResult *result,
gpointer user_data)
{
Closure *closure = user_data;
- GVariant *retvals;
+ EVariant *retvals;
GError *error = NULL;
- retvals = g_dbus_proxy_invoke_method_finish (proxy, result, &error);
+ retvals = e_dbus_proxy_invoke_method_finish (proxy, result, &error);
if (retvals) {
if (!demarshal_retvals__VOID (retvals)) {
error = g_error_new (E_BOOK_ERROR, E_BOOK_ERROR_CORBA_EXCEPTION, "demarshalling results for Book method 'remove'");
@@ -187,48 +187,48 @@ remove_cb (GDBusProxy *proxy,
}
static void
-e_data_book_gdbus_remove (GDBusProxy *proxy,
+e_data_book_gdbus_remove (EDBusProxy *proxy,
reply__VOID callback,
gpointer user_data)
{
- GVariant *parameters;
+ EVariant *parameters;
Closure *closure;
- parameters = g_variant_new ("()");
+ parameters = e_variant_new ("()");
closure = g_slice_new (Closure);
closure->cb = G_CALLBACK (callback);
closure->user_data = user_data;
- g_dbus_proxy_invoke_method (proxy, "remove", parameters, -1, NULL, (GAsyncReadyCallback) remove_cb, closure);
+ e_dbus_proxy_invoke_method (proxy, "remove", parameters, -1, NULL, (GAsyncReadyCallback) remove_cb, closure);
}
static gboolean
-e_data_book_gdbus_get_contact_sync (GDBusProxy *proxy,
+e_data_book_gdbus_get_contact_sync (EDBusProxy *proxy,
const char *IN_uid,
char **OUT_vcard,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(s)", IN_uid);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getContact", parameters, -1, NULL, error);
+ parameters = e_variant_new ("(s)", IN_uid);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getContact", parameters, -1, NULL, error);
return demarshal_retvals__STRING (retvals, OUT_vcard);
}
static void
-get_contact_cb (GDBusProxy *proxy,
+get_contact_cb (EDBusProxy *proxy,
GAsyncResult *result,
gpointer user_data)
{
Closure *closure = user_data;
- GVariant *retvals;
+ EVariant *retvals;
GError *error = NULL;
char *OUT_vcard = NULL;
- retvals = g_dbus_proxy_invoke_method_finish (proxy, result, &error);
+ retvals = e_dbus_proxy_invoke_method_finish (proxy, result, &error);
if (retvals) {
if (!demarshal_retvals__STRING (retvals, &OUT_vcard)) {
error = g_error_new (E_BOOK_ERROR, E_BOOK_ERROR_CORBA_EXCEPTION, "demarshalling results for Book method 'getContact'");
@@ -240,63 +240,63 @@ get_contact_cb (GDBusProxy *proxy,
}
static void
-e_data_book_gdbus_get_contact (GDBusProxy *proxy,
+e_data_book_gdbus_get_contact (EDBusProxy *proxy,
const char *IN_uid,
reply__STRING callback,
gpointer user_data)
{
- GVariant *parameters;
+ EVariant *parameters;
Closure *closure;
- parameters = g_variant_new ("(s)", IN_uid);
+ parameters = e_variant_new ("(s)", IN_uid);
closure = g_slice_new (Closure);
closure->cb = G_CALLBACK (callback);
closure->user_data = user_data;
- g_dbus_proxy_invoke_method (proxy, "getContact", parameters, -1, NULL, (GAsyncReadyCallback) get_contact_cb, closure);
+ e_dbus_proxy_invoke_method (proxy, "getContact", parameters, -1, NULL, (GAsyncReadyCallback) get_contact_cb, closure);
}
static gboolean
-e_data_book_gdbus_get_static_capabilities_sync (GDBusProxy *proxy,
+e_data_book_gdbus_get_static_capabilities_sync (EDBusProxy *proxy,
char **OUT_caps,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getStaticCapabilities", parameters, -1, NULL, error);
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getStaticCapabilities", parameters, -1, NULL, error);
return demarshal_retvals__STRING (retvals, OUT_caps);
}
static gboolean
-e_data_book_gdbus_get_contact_list_sync (GDBusProxy *proxy,
+e_data_book_gdbus_get_contact_list_sync (EDBusProxy *proxy,
const char *IN_query,
char ***OUT_vcards,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(s)", IN_query);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getContactList", parameters, -1, NULL, error);
+ parameters = e_variant_new ("(s)", IN_query);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getContactList", parameters, -1, NULL, error);
return demarshal_retvals__STRINGVECTOR (retvals, OUT_vcards);
}
static void
-get_contact_list_cb (GDBusProxy *proxy,
+get_contact_list_cb (EDBusProxy *proxy,
GAsyncResult *result,
gpointer user_data)
{
Closure *closure = user_data;
- GVariant *retvals;
+ EVariant *retvals;
GError *error = NULL;
char **OUT_vcards = NULL;
- retvals = g_dbus_proxy_invoke_method_finish (proxy, result, &error);
+ retvals = e_dbus_proxy_invoke_method_finish (proxy, result, &error);
if (retvals) {
if (!demarshal_retvals__STRINGVECTOR (retvals, &OUT_vcards)) {
error = g_error_new (E_BOOK_ERROR, E_BOOK_ERROR_CORBA_EXCEPTION, "demarshalling results for Book method 'getContactList'");
@@ -308,48 +308,48 @@ get_contact_list_cb (GDBusProxy *proxy,
}
static void
-e_data_book_gdbus_get_contact_list (GDBusProxy *proxy,
+e_data_book_gdbus_get_contact_list (EDBusProxy *proxy,
const char *IN_query,
reply__STRINGVECTOR callback,
gpointer user_data)
{
- GVariant *parameters;
+ EVariant *parameters;
Closure *closure;
- parameters = g_variant_new ("(s)", IN_query);
+ parameters = e_variant_new ("(s)", IN_query);
closure = g_slice_new (Closure);
closure->cb = G_CALLBACK (callback);
closure->user_data = user_data;
- g_dbus_proxy_invoke_method (proxy, "getContactList", parameters, -1, NULL, (GAsyncReadyCallback) get_contact_list_cb, closure);
+ e_dbus_proxy_invoke_method (proxy, "getContactList", parameters, -1, NULL, (GAsyncReadyCallback) get_contact_list_cb, closure);
}
static gboolean
-e_data_book_gdbus_get_required_fields_sync (GDBusProxy *proxy,
+e_data_book_gdbus_get_required_fields_sync (EDBusProxy *proxy,
char ***OUT_fields,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getRequiredFields", parameters, -1, NULL, error);
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getRequiredFields", parameters, -1, NULL, error);
return demarshal_retvals__STRINGVECTOR (retvals, OUT_fields);
}
static void
-get_required_fields_cb (GDBusProxy *proxy,
+get_required_fields_cb (EDBusProxy *proxy,
GAsyncResult *result,
gpointer user_data)
{
Closure *closure = user_data;
- GVariant *retvals;
+ EVariant *retvals;
GError *error = NULL;
char **OUT_fields = NULL;
- retvals = g_dbus_proxy_invoke_method_finish (proxy, result, &error);
+ retvals = e_dbus_proxy_invoke_method_finish (proxy, result, &error);
if (retvals) {
if (!demarshal_retvals__STRINGVECTOR (retvals, &OUT_fields)) {
error = g_error_new (E_BOOK_ERROR, E_BOOK_ERROR_CORBA_EXCEPTION, "demarshalling results for Book method 'getRequiredFields'");
@@ -361,47 +361,47 @@ get_required_fields_cb (GDBusProxy *proxy,
}
static void
-e_data_book_gdbus_get_required_fields (GDBusProxy *proxy,
+e_data_book_gdbus_get_required_fields (EDBusProxy *proxy,
reply__STRINGVECTOR callback,
gpointer user_data)
{
- GVariant *parameters;
+ EVariant *parameters;
Closure *closure;
- parameters = g_variant_new ("()");
+ parameters = e_variant_new ("()");
closure = g_slice_new (Closure);
closure->cb = G_CALLBACK (callback);
closure->user_data = user_data;
- g_dbus_proxy_invoke_method (proxy, "getRequiredFields", parameters, -1, NULL, (GAsyncReadyCallback) get_required_fields_cb, closure);
+ e_dbus_proxy_invoke_method (proxy, "getRequiredFields", parameters, -1, NULL, (GAsyncReadyCallback) get_required_fields_cb, closure);
}
static gboolean
-e_data_book_gdbus_get_supported_auth_methods_sync (GDBusProxy *proxy,
+e_data_book_gdbus_get_supported_auth_methods_sync (EDBusProxy *proxy,
char ***OUT_methods,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getSupportedAuthMethods", parameters, -1, NULL, error);
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getSupportedAuthMethods", parameters, -1, NULL, error);
return demarshal_retvals__STRINGVECTOR (retvals, OUT_methods);
}
static void
-get_supported_auth_methods_cb (GDBusProxy *proxy,
+get_supported_auth_methods_cb (EDBusProxy *proxy,
GAsyncResult *result,
gpointer user_data)
{
Closure *closure = user_data;
- GVariant *retvals;
+ EVariant *retvals;
GError *error = NULL;
char **OUT_methods = NULL;
- retvals = g_dbus_proxy_invoke_method_finish (proxy, result, &error);
+ retvals = e_dbus_proxy_invoke_method_finish (proxy, result, &error);
if (retvals) {
if (!demarshal_retvals__STRINGVECTOR (retvals, &OUT_methods)) {
error = g_error_new (E_BOOK_ERROR, E_BOOK_ERROR_CORBA_EXCEPTION, "demarshalling results for Book method 'getSupportedAuthMethods'");
@@ -413,47 +413,47 @@ get_supported_auth_methods_cb (GDBusProxy *proxy,
}
static void
-e_data_book_gdbus_get_supported_auth_methods (GDBusProxy *proxy,
+e_data_book_gdbus_get_supported_auth_methods (EDBusProxy *proxy,
reply__STRINGVECTOR callback,
gpointer user_data)
{
- GVariant *parameters;
+ EVariant *parameters;
Closure *closure;
- parameters = g_variant_new ("()");
+ parameters = e_variant_new ("()");
closure = g_slice_new (Closure);
closure->cb = G_CALLBACK (callback);
closure->user_data = user_data;
- g_dbus_proxy_invoke_method (proxy, "getSupportedAuthMethods", parameters, -1, NULL, (GAsyncReadyCallback) get_supported_auth_methods_cb, closure);
+ e_dbus_proxy_invoke_method (proxy, "getSupportedAuthMethods", parameters, -1, NULL, (GAsyncReadyCallback) get_supported_auth_methods_cb, closure);
}
static gboolean
-e_data_book_gdbus_get_supported_fields_sync (GDBusProxy *proxy,
+e_data_book_gdbus_get_supported_fields_sync (EDBusProxy *proxy,
char ***OUT_fields,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getSupportedFields", parameters, -1, NULL, error);
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getSupportedFields", parameters, -1, NULL, error);
return demarshal_retvals__STRINGVECTOR (retvals, OUT_fields);
}
static void
-get_supported_fields_cb (GDBusProxy *proxy,
+get_supported_fields_cb (EDBusProxy *proxy,
GAsyncResult *result,
gpointer user_data)
{
Closure *closure = user_data;
- GVariant *retvals;
+ EVariant *retvals;
GError *error = NULL;
char **OUT_fields = NULL;
- retvals = g_dbus_proxy_invoke_method_finish (proxy, result, &error);
+ retvals = e_dbus_proxy_invoke_method_finish (proxy, result, &error);
if (retvals) {
if (!demarshal_retvals__STRINGVECTOR (retvals, &OUT_fields)) {
error = g_error_new (E_BOOK_ERROR, E_BOOK_ERROR_CORBA_EXCEPTION, "demarshalling results for Book method 'getSupportedFields'");
@@ -465,48 +465,48 @@ get_supported_fields_cb (GDBusProxy *proxy,
}
static void
-e_data_book_gdbus_get_supported_fields (GDBusProxy *proxy,
+e_data_book_gdbus_get_supported_fields (EDBusProxy *proxy,
reply__STRINGVECTOR callback,
gpointer user_data)
{
- GVariant *parameters;
+ EVariant *parameters;
Closure *closure;
- parameters = g_variant_new ("()");
+ parameters = e_variant_new ("()");
closure = g_slice_new (Closure);
closure->cb = G_CALLBACK (callback);
closure->user_data = user_data;
- g_dbus_proxy_invoke_method (proxy, "getSupportedFields", parameters, -1, NULL, (GAsyncReadyCallback) get_supported_fields_cb, closure);
+ e_dbus_proxy_invoke_method (proxy, "getSupportedFields", parameters, -1, NULL, (GAsyncReadyCallback) get_supported_fields_cb, closure);
}
static gboolean
-e_data_book_gdbus_add_contact_sync (GDBusProxy *proxy,
+e_data_book_gdbus_add_contact_sync (EDBusProxy *proxy,
const char *IN_vcard,
char **OUT_uid,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(s)", IN_vcard);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "addContact", parameters, -1, NULL, error);
+ parameters = e_variant_new ("(s)", IN_vcard);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "addContact", parameters, -1, NULL, error);
return demarshal_retvals__STRING (retvals, OUT_uid);
}
static void
-add_contact_cb (GDBusProxy *proxy,
+add_contact_cb (EDBusProxy *proxy,
GAsyncResult *result,
gpointer user_data)
{
Closure *closure = user_data;
- GVariant *retvals;
+ EVariant *retvals;
GError *error = NULL;
char *OUT_uid = NULL;
- retvals = g_dbus_proxy_invoke_method_finish (proxy, result, &error);
+ retvals = e_dbus_proxy_invoke_method_finish (proxy, result, &error);
if (retvals) {
if (!demarshal_retvals__STRING (retvals, &OUT_uid)) {
error = g_error_new (E_BOOK_ERROR, E_BOOK_ERROR_CORBA_EXCEPTION, "demarshalling results for Book method 'addContact'");
@@ -518,47 +518,47 @@ add_contact_cb (GDBusProxy *proxy,
}
static void
-e_data_book_gdbus_add_contact (GDBusProxy *proxy,
+e_data_book_gdbus_add_contact (EDBusProxy *proxy,
const char *IN_vcard,
reply__STRING callback,
gpointer user_data)
{
- GVariant *parameters;
+ EVariant *parameters;
Closure *closure;
- parameters = g_variant_new ("(s)", IN_vcard);
+ parameters = e_variant_new ("(s)", IN_vcard);
closure = g_slice_new (Closure);
closure->cb = G_CALLBACK (callback);
closure->user_data = user_data;
- g_dbus_proxy_invoke_method (proxy, "addContact", parameters, -1, NULL, (GAsyncReadyCallback) add_contact_cb, closure);
+ e_dbus_proxy_invoke_method (proxy, "addContact", parameters, -1, NULL, (GAsyncReadyCallback) add_contact_cb, closure);
}
static gboolean
-e_data_book_gdbus_modify_contact_sync (GDBusProxy *proxy,
+e_data_book_gdbus_modify_contact_sync (EDBusProxy *proxy,
const char *IN_vcard,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(s)", IN_vcard);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "modifyContact", parameters, -1, NULL, error);
+ parameters = e_variant_new ("(s)", IN_vcard);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "modifyContact", parameters, -1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static void
-modify_contact_cb (GDBusProxy *proxy,
+modify_contact_cb (EDBusProxy *proxy,
GAsyncResult *result,
gpointer user_data)
{
Closure *closure = user_data;
- GVariant *retvals;
+ EVariant *retvals;
GError *error = NULL;
- retvals = g_dbus_proxy_invoke_method_finish (proxy, result, &error);
+ retvals = e_dbus_proxy_invoke_method_finish (proxy, result, &error);
if (retvals) {
if (!demarshal_retvals__VOID (retvals)) {
error = g_error_new (E_BOOK_ERROR, E_BOOK_ERROR_CORBA_EXCEPTION, "demarshalling results for Book method 'modifyContact'");
@@ -570,50 +570,50 @@ modify_contact_cb (GDBusProxy *proxy,
}
static void
-e_data_book_gdbus_modify_contact (GDBusProxy *proxy,
+e_data_book_gdbus_modify_contact (EDBusProxy *proxy,
const char *IN_vcard,
reply__VOID callback,
gpointer user_data)
{
- GVariant *parameters;
+ EVariant *parameters;
Closure *closure;
- parameters = g_variant_new ("(s)", IN_vcard);
+ parameters = e_variant_new ("(s)", IN_vcard);
closure = g_slice_new (Closure);
closure->cb = G_CALLBACK (callback);
closure->user_data = user_data;
- g_dbus_proxy_invoke_method (proxy, "modifyContact", parameters, -1, NULL, (GAsyncReadyCallback) modify_contact_cb, closure);
+ e_dbus_proxy_invoke_method (proxy, "modifyContact", parameters, -1, NULL, (GAsyncReadyCallback) modify_contact_cb, closure);
}
static gboolean
-e_data_book_gdbus_remove_contacts_sync (GDBusProxy *proxy,
+e_data_book_gdbus_remove_contacts_sync (EDBusProxy *proxy,
const char **IN_uids,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
g_return_val_if_fail (IN_uids && IN_uids[0], FALSE);
- parameters = g_variant_new ("(^as)", IN_uids);
+ parameters = e_variant_new ("(^as)", IN_uids);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "removeContacts", parameters, -1, NULL, error);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "removeContacts", parameters, -1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static void
-remove_contacts_cb (GDBusProxy *proxy,
+remove_contacts_cb (EDBusProxy *proxy,
GAsyncResult *result,
gpointer user_data)
{
Closure *closure = user_data;
- GVariant *retvals;
+ EVariant *retvals;
GError *error = NULL;
- retvals = g_dbus_proxy_invoke_method_finish (proxy, result, &error);
+ retvals = e_dbus_proxy_invoke_method_finish (proxy, result, &error);
if (retvals) {
if (!demarshal_retvals__VOID (retvals)) {
error = g_error_new (E_BOOK_ERROR, E_BOOK_ERROR_CORBA_EXCEPTION, "demarshalling results for Book method 'removeContacts'");
@@ -625,50 +625,50 @@ remove_contacts_cb (GDBusProxy *proxy,
}
static void
-e_data_book_gdbus_remove_contacts (GDBusProxy *proxy,
+e_data_book_gdbus_remove_contacts (EDBusProxy *proxy,
const char **IN_uids,
reply__VOID callback,
gpointer user_data)
{
- GVariant *parameters;
+ EVariant *parameters;
Closure *closure;
- parameters = g_variant_new ("(^as)", IN_uids);
+ parameters = e_variant_new ("(^as)", IN_uids);
closure = g_slice_new (Closure);
closure->cb = G_CALLBACK (callback);
closure->user_data = user_data;
- g_dbus_proxy_invoke_method (proxy, "removeContacts", parameters, -1, NULL, (GAsyncReadyCallback) remove_contacts_cb, closure);
+ e_dbus_proxy_invoke_method (proxy, "removeContacts", parameters, -1, NULL, (GAsyncReadyCallback) remove_contacts_cb, closure);
}
static gboolean
-e_data_book_gdbus_get_book_view_sync (GDBusProxy *proxy,
+e_data_book_gdbus_get_book_view_sync (EDBusProxy *proxy,
const char *IN_query,
const guint IN_max_results,
char **OUT_view,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(su)", IN_query, IN_max_results);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getBookView", parameters, -1, NULL, error);
+ parameters = e_variant_new ("(su)", IN_query, IN_max_results);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getBookView", parameters, -1, NULL, error);
return demarshal_retvals__OBJPATH (retvals, OUT_view);
}
static void
-get_book_view_cb (GDBusProxy *proxy,
+get_book_view_cb (EDBusProxy *proxy,
GAsyncResult *result,
gpointer user_data)
{
Closure *closure = user_data;
- GVariant *retvals;
+ EVariant *retvals;
GError *error = NULL;
char *OUT_view = NULL;
- retvals = g_dbus_proxy_invoke_method_finish (proxy, result, &error);
+ retvals = e_dbus_proxy_invoke_method_finish (proxy, result, &error);
if (retvals) {
if (!demarshal_retvals__OBJPATH (retvals, &OUT_view)) {
error = g_error_new (E_BOOK_ERROR, E_BOOK_ERROR_CORBA_EXCEPTION, "demarshalling results for Book method 'getBookView'");
@@ -680,63 +680,63 @@ get_book_view_cb (GDBusProxy *proxy,
}
static void
-e_data_book_gdbus_get_book_view (GDBusProxy *proxy,
+e_data_book_gdbus_get_book_view (EDBusProxy *proxy,
const char *IN_query,
const guint IN_max_results,
reply__STRING callback,
gpointer user_data)
{
- GVariant *parameters;
+ EVariant *parameters;
Closure *closure;
- parameters = g_variant_new ("(su)", IN_query, IN_max_results);
+ parameters = e_variant_new ("(su)", IN_query, IN_max_results);
closure = g_slice_new (Closure);
closure->cb = G_CALLBACK (callback);
closure->user_data = user_data;
- g_dbus_proxy_invoke_method (proxy, "getBookView", parameters, -1, NULL, (GAsyncReadyCallback) get_book_view_cb, closure);
+ e_dbus_proxy_invoke_method (proxy, "getBookView", parameters, -1, NULL, (GAsyncReadyCallback) get_book_view_cb, closure);
}
static gboolean
-e_data_book_gdbus_cancel_operation_sync (GDBusProxy *proxy,
+e_data_book_gdbus_cancel_operation_sync (EDBusProxy *proxy,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "cancelOperation", parameters, -1, NULL, error);
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "cancelOperation", parameters, -1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static gboolean
-e_data_book_gdbus_get_changes_sync (GDBusProxy *proxy,
+e_data_book_gdbus_get_changes_sync (EDBusProxy *proxy,
const char *IN_change_id,
GPtrArray **OUT_changes,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(s)", IN_change_id);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getChanges", parameters, -1, NULL, error);
+ parameters = e_variant_new ("(s)", IN_change_id);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getChanges", parameters, -1, NULL, error);
return demarshal_retvals__GPTRARRAY_with_GVALUEARRAY_with_UINT_STRING_endwith_endwith (retvals, OUT_changes);
}
static void
-get_changes_cb (GDBusProxy *proxy,
+get_changes_cb (EDBusProxy *proxy,
GAsyncResult *result,
gpointer user_data)
{
Closure *closure = user_data;
- GVariant *retvals;
+ EVariant *retvals;
GError *error = NULL;
GPtrArray *OUT_changes = NULL;
- retvals = g_dbus_proxy_invoke_method_finish (proxy, result, &error);
+ retvals = e_dbus_proxy_invoke_method_finish (proxy, result, &error);
if (retvals) {
if (!demarshal_retvals__GPTRARRAY_with_GVALUEARRAY_with_UINT_STRING_endwith_endwith (retvals, &OUT_changes)) {
error = g_error_new (E_BOOK_ERROR, E_BOOK_ERROR_CORBA_EXCEPTION, "demarshalling results for Book method 'getChanges'");
@@ -748,21 +748,21 @@ get_changes_cb (GDBusProxy *proxy,
}
static void
-e_data_book_gdbus_get_changes (GDBusProxy *proxy,
+e_data_book_gdbus_get_changes (EDBusProxy *proxy,
const char *IN_change_id,
reply__GPTRARRAY_with_GVALUEARRAY_with_UINT_STRING_endwith_endwith callback,
gpointer user_data)
{
- GVariant *parameters;
+ EVariant *parameters;
Closure *closure;
- parameters = g_variant_new ("(s)", IN_change_id);
+ parameters = e_variant_new ("(s)", IN_change_id);
closure = g_slice_new (Closure);
closure->cb = G_CALLBACK (callback);
closure->user_data = user_data;
- g_dbus_proxy_invoke_method (proxy, "getChanges", parameters, -1, NULL, (GAsyncReadyCallback) get_changes_cb, closure);
+ e_dbus_proxy_invoke_method (proxy, "getChanges", parameters, -1, NULL, (GAsyncReadyCallback) get_changes_cb, closure);
}
diff --git a/addressbook/libebook/e-data-book-view-gdbus-bindings.h b/addressbook/libebook/e-data-book-view-gdbus-bindings.h
index 3e10094..8ba5108 100644
--- a/addressbook/libebook/e-data-book-view-gdbus-bindings.h
+++ b/addressbook/libebook/e-data-book-view-gdbus-bindings.h
@@ -20,7 +20,7 @@
*/
#include <glib.h>
-#include <gdbus/gdbus.h>
+#include <edbus/edbus.h>
#include <libedata-gdbus-bindings/e-data-gdbus-bindings-common.h>
@@ -30,42 +30,42 @@ G_BEGIN_DECLS
* when possible */
static gboolean
-e_data_book_view_gdbus_start_sync (GDBusProxy *proxy,
+e_data_book_view_gdbus_start_sync (EDBusProxy *proxy,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "start", parameters,
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "start", parameters,
-1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static gboolean
-e_data_book_view_gdbus_stop_sync (GDBusProxy *proxy,
+e_data_book_view_gdbus_stop_sync (EDBusProxy *proxy,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "stop", parameters,
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "stop", parameters,
-1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static gboolean
-e_data_book_view_gdbus_dispose_sync (GDBusProxy *proxy,
+e_data_book_view_gdbus_dispose_sync (EDBusProxy *proxy,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "dispose", parameters,
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "dispose", parameters,
-1, NULL, error);
return demarshal_retvals__VOID (retvals);
diff --git a/calendar/libecal/e-cal-view-private.h b/calendar/libecal/e-cal-view-private.h
index 5b2ff39..7851763 100644
--- a/calendar/libecal/e-cal-view-private.h
+++ b/calendar/libecal/e-cal-view-private.h
@@ -24,11 +24,11 @@
#include <libecal/e-cal-types.h>
#include <libecal/e-cal-view.h>
-#include <gdbus/gdbus.h>
+#include <edbus/edbus.h>
G_BEGIN_DECLS
-ECalView *_e_cal_view_new (struct _ECal *client, GDBusProxy *view_proxy, GStaticRecMutex *connection_lock);
+ECalView *_e_cal_view_new (struct _ECal *client, EDBusProxy *view_proxy, GStaticRecMutex *connection_lock);
G_END_DECLS
diff --git a/calendar/libecal/e-cal-view.c b/calendar/libecal/e-cal-view.c
index a80340c..cd23f50 100644
--- a/calendar/libecal/e-cal-view.c
+++ b/calendar/libecal/e-cal-view.c
@@ -42,7 +42,7 @@ G_DEFINE_TYPE(ECalView, e_cal_view, G_TYPE_OBJECT);
/* Private part of the ECalView structure */
struct _ECalViewPrivate {
- GDBusProxy *view_proxy;
+ EDBusProxy *view_proxy;
GStaticRecMutex *view_proxy_lock;
ECal *client;
};
@@ -182,29 +182,29 @@ cal_view_handle_signal_done (ECalView *view,
}
static void
-cal_view_proxy_signal_cb (GDBusProxy *proxy,
+cal_view_proxy_signal_cb (EDBusProxy *proxy,
gchar *sender_name,
gchar *signal_name,
- GVariant *parameters,
+ EVariant *parameters,
ECalView *view)
{
if (FALSE) {
} else if (!g_strcmp0 (signal_name, "ObjectsAdded")) {
const char **value;
- g_variant_get (parameters, "(^a&s)", &value, NULL);
+ e_variant_get (parameters, "(^a&s)", &value, NULL);
cal_view_handle_signal_objects_added (view, value);
g_free (value);
} else if (!g_strcmp0 (signal_name, "ObjectsModified")) {
const char **value;
- g_variant_get (parameters, "(^a&s)", &value, NULL);
+ e_variant_get (parameters, "(^a&s)", &value, NULL);
cal_view_handle_signal_objects_modified (view, value);
g_free (value);
} else if (!g_strcmp0 (signal_name, "ObjectsRemoved")) {
const char **value;
- g_variant_get (parameters, "(^a&s)", &value, NULL);
+ e_variant_get (parameters, "(^a&s)", &value, NULL);
cal_view_handle_signal_objects_removed (view, value);
g_free (value);
@@ -212,12 +212,12 @@ cal_view_proxy_signal_cb (GDBusProxy *proxy,
const char *value_string;
const gint value_int;
- g_variant_get (parameters, "(&su)", &value_string, &value_int);
+ e_variant_get (parameters, "(&su)", &value_string, &value_int);
cal_view_handle_signal_progress (view, value_string, value_int);
} else if (!g_strcmp0 (signal_name, "Done")) {
const guint value;
- g_variant_get (parameters, "(u)", &value);
+ e_variant_get (parameters, "(u)", &value);
cal_view_handle_signal_done (view, value);
}
@@ -379,7 +379,7 @@ e_cal_view_class_init (ECalViewClass *klass)
/**
* _e_cal_view_new:
- * @view_proxy: The @GDBusProxy for the view.
+ * @view_proxy: The @EDBusProxy for the view.
* @client: An #ECal object.
*
* Creates a new view object by issuing the view creation request to the
@@ -388,7 +388,7 @@ e_cal_view_class_init (ECalViewClass *klass)
* Return value: A newly-created view object, or NULL if the request failed.
**/
ECalView *
-_e_cal_view_new (ECal *client, GDBusProxy *view_proxy, GStaticRecMutex *connection_lock)
+_e_cal_view_new (ECal *client, EDBusProxy *view_proxy, GStaticRecMutex *connection_lock)
{
ECalView *view;
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index b8d45ab..e496890 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -48,8 +48,8 @@
#include "e-data-cal-gdbus-bindings.h"
#include <libedata-cal/e-data-cal-types.h>
-static GDBusConnection *connection_gdbus = NULL;
-static GDBusProxy *factory_proxy_gdbus = NULL;
+static EDBusConnection *connection_gdbus = NULL;
+static EDBusProxy *factory_proxy_gdbus = NULL;
/* guards both connection and factory_proxy */
static GStaticRecMutex connection_lock = G_STATIC_REC_MUTEX_INIT;
@@ -87,7 +87,7 @@ struct _ECalPrivate {
gboolean read_only;
- GDBusProxy *gdbus_proxy;
+ EDBusProxy *gdbus_proxy;
/* The authentication function */
ECalAuthFunc auth_func;
@@ -615,7 +615,7 @@ e_cal_activate(GError **error)
/* FIXME: better to just watch for the proxy instead of using the
* connection directly? */
if (!connection_gdbus) {
- connection_gdbus = g_dbus_connection_bus_get_private_sync (G_BUS_TYPE_SESSION, NULL, error);
+ connection_gdbus = e_dbus_connection_bus_get_private_sync (G_BUS_TYPE_SESSION, NULL, error);
if (!connection_gdbus) {
UNLOCK_CONN ();
@@ -628,9 +628,9 @@ e_cal_activate(GError **error)
/* FIXME: watch for changes to this proxy instead of relying upon
* dbus-glib to get the unique name */
if (!factory_proxy_gdbus) {
- factory_proxy_gdbus = g_dbus_proxy_new_sync (connection_gdbus,
- G_TYPE_DBUS_PROXY,
- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
+ factory_proxy_gdbus = e_dbus_proxy_new_sync (connection_gdbus,
+ E_TYPE_DBUS_PROXY,
+ E_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | E_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS,
factory_proxy_name,
"/org/gnome/evolution/dataserver/calendar/CalFactory",
"org.gnome.evolution.dataserver.calendar.CalFactory",
@@ -732,10 +732,10 @@ cal_handle_signal_backend_error (ECal *cal,
}
static void
-cal_proxy_signal_cb (GDBusProxy *proxy,
+cal_proxy_signal_cb (EDBusProxy *proxy,
gchar *sender_name,
gchar *signal_name,
- GVariant *parameters,
+ EVariant *parameters,
ECal *cal)
{
if (FALSE) {
@@ -743,17 +743,17 @@ cal_proxy_signal_cb (GDBusProxy *proxy,
cal_handle_signal_auth_required (cal);
} else if (!g_strcmp0 (signal_name, "backend_error")) {
const char *value;
- g_variant_get (parameters, "(&s)", &value);
+ e_variant_get (parameters, "(&s)", &value);
cal_handle_signal_backend_error (cal, value);
} else if (!g_strcmp0 (signal_name, "readonly")) {
gboolean value;
- g_variant_get (parameters, "(b)", &value);
+ e_variant_get (parameters, "(b)", &value);
cal_handle_signal_readonly (cal, value);
} else if (!g_strcmp0 (signal_name, "mode")) {
gint32 value;
- g_variant_get (parameters, "(i)", &value);
+ e_variant_get (parameters, "(i)", &value);
cal_handle_signal_mode (cal, value);
}
@@ -887,10 +887,10 @@ e_cal_new (ESource *source, ECalSourceType type)
}
g_free (xml);
- priv->gdbus_proxy = g_dbus_proxy_new_sync (connection_gdbus,
- G_TYPE_DBUS_PROXY,
- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
- g_dbus_proxy_get_unique_bus_name (factory_proxy_gdbus),
+ priv->gdbus_proxy = e_dbus_proxy_new_sync (connection_gdbus,
+ E_TYPE_DBUS_PROXY,
+ E_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+ e_dbus_proxy_get_unique_bus_name (factory_proxy_gdbus),
path,
"org.gnome.evolution.dataserver.calendar.Cal",
NULL,
@@ -1153,7 +1153,7 @@ build_pass_key (ECal *ecal)
}
static void
-async_signal_idle_cb (GDBusProxy *proxy,
+async_signal_idle_cb (EDBusProxy *proxy,
GError *error,
gpointer user_data)
{
@@ -3845,7 +3845,7 @@ e_cal_get_query (ECal *ecal, const gchar *sexp, ECalView **query, GError **error
ECalPrivate *priv;
ECalendarStatus status;
gchar *query_path;
- GDBusProxy *query_proxy_gdbus;
+ EDBusProxy *query_proxy_gdbus;
e_return_error_if_fail (sexp, E_CALENDAR_STATUS_INVALID_ARG);
e_return_error_if_fail (query, E_CALENDAR_STATUS_INVALID_ARG);
@@ -3868,10 +3868,10 @@ e_cal_get_query (ECal *ecal, const gchar *sexp, ECalView **query, GError **error
status = E_CALENDAR_STATUS_OK;
LOCK_CONN ();
- query_proxy_gdbus = g_dbus_proxy_new_sync (connection_gdbus,
- G_TYPE_DBUS_PROXY,
- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
- g_dbus_proxy_get_unique_bus_name (factory_proxy_gdbus),
+ query_proxy_gdbus = e_dbus_proxy_new_sync (connection_gdbus,
+ E_TYPE_DBUS_PROXY,
+ E_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
+ e_dbus_proxy_get_unique_bus_name (factory_proxy_gdbus),
query_path,
"org.gnome.evolution.dataserver.calendar.CalView",
NULL,
diff --git a/calendar/libecal/e-data-cal-factory-gdbus-bindings.h b/calendar/libecal/e-data-cal-factory-gdbus-bindings.h
index dcd7008..4072477 100644
--- a/calendar/libecal/e-data-cal-factory-gdbus-bindings.h
+++ b/calendar/libecal/e-data-cal-factory-gdbus-bindings.h
@@ -20,7 +20,7 @@
*/
#include <glib.h>
-#include <gdbus/gdbus.h>
+#include <edbus/edbus.h>
#include <libedata-gdbus-bindings/e-data-gdbus-bindings-common.h>
@@ -30,17 +30,17 @@ G_BEGIN_DECLS
* when possible */
static gboolean
-e_data_cal_factory_gdbus_get_cal_sync (GDBusProxy *proxy,
+e_data_cal_factory_gdbus_get_cal_sync (EDBusProxy *proxy,
const char *IN_source,
const guint IN_type,
char **OUT_path,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(su)", IN_source, IN_type);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getCal", parameters,
+ parameters = e_variant_new ("(su)", IN_source, IN_type);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getCal", parameters,
-1, NULL, error);
return demarshal_retvals__OBJPATH (retvals, OUT_path);
diff --git a/calendar/libecal/e-data-cal-gdbus-bindings.h b/calendar/libecal/e-data-cal-gdbus-bindings.h
index d6639c9..5affa62 100644
--- a/calendar/libecal/e-data-cal-gdbus-bindings.h
+++ b/calendar/libecal/e-data-cal-gdbus-bindings.h
@@ -20,7 +20,7 @@
*/
#include <glib.h>
-#include <gdbus/gdbus.h>
+#include <edbus/edbus.h>
#include <libedata-gdbus-bindings/e-data-gdbus-bindings-common.h>
@@ -30,60 +30,60 @@ G_BEGIN_DECLS
* when possible */
static gboolean
-e_data_cal_gdbus_is_read_only_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_is_read_only_sync (EDBusProxy *proxy,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "isReadOnly",
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "isReadOnly",
parameters, -1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static gboolean
-e_data_cal_gdbus_close_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_close_sync (EDBusProxy *proxy,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "close", parameters,
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "close", parameters,
-1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static gboolean
-e_data_cal_gdbus_open_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_open_sync (EDBusProxy *proxy,
const gboolean IN_only_if_exists,
const char *IN_username,
const char *IN_password,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(bss)", IN_only_if_exists, IN_username, IN_password);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "open", parameters,
+ parameters = e_variant_new ("(bss)", IN_only_if_exists, IN_username, IN_password);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "open", parameters,
-1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static void
-open_cb (GDBusProxy *proxy,
+open_cb (EDBusProxy *proxy,
GAsyncResult *result,
gpointer user_data)
{
Closure *closure = user_data;
- GVariant *retvals;
+ EVariant *retvals;
GError *error = NULL;
- retvals = g_dbus_proxy_invoke_method_finish (proxy, result, &error);
+ retvals = e_dbus_proxy_invoke_method_finish (proxy, result, &error);
if (retvals) {
if (!demarshal_retvals__VOID (retvals)) {
error = g_error_new (E_CALENDAR_ERROR, E_CALENDAR_STATUS_CORBA_EXCEPTION, "demarshalling results for Calendar method 'open'");
@@ -95,358 +95,358 @@ open_cb (GDBusProxy *proxy,
}
static gboolean
-e_data_cal_gdbus_open (GDBusProxy *proxy,
+e_data_cal_gdbus_open (EDBusProxy *proxy,
const gboolean IN_only_if_exists,
const char *IN_username,
const char *IN_password,
reply__VOID callback,
gpointer user_data)
{
- GVariant *parameters;
+ EVariant *parameters;
Closure *closure;
- parameters = g_variant_new ("(bss)", IN_only_if_exists, IN_username, IN_password);
+ parameters = e_variant_new ("(bss)", IN_only_if_exists, IN_username, IN_password);
closure = g_slice_new (Closure);
closure->cb = G_CALLBACK (callback);
closure->user_data = user_data;
- g_dbus_proxy_invoke_method (proxy, "open", parameters, -1, NULL, (GAsyncReadyCallback) open_cb, closure);
+ e_dbus_proxy_invoke_method (proxy, "open", parameters, -1, NULL, (GAsyncReadyCallback) open_cb, closure);
return TRUE;
}
static gboolean
-e_data_cal_gdbus_remove_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_remove_sync (EDBusProxy *proxy,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "remove", parameters,
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "remove", parameters,
-1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static gboolean
-e_data_cal_gdbus_get_alarm_email_address_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_get_alarm_email_address_sync (EDBusProxy *proxy,
char **address,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getAlarmEmailAddress", parameters, -1, NULL, error);
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getAlarmEmailAddress", parameters, -1, NULL, error);
return demarshal_retvals__STRING (retvals, address);
}
static gboolean
-e_data_cal_gdbus_get_cal_address_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_get_cal_address_sync (EDBusProxy *proxy,
char **address,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getCalAddress", parameters, -1, NULL, error);
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getCalAddress", parameters, -1, NULL, error);
return demarshal_retvals__STRING (retvals, address);
}
static gboolean
-e_data_cal_gdbus_get_ldap_attribute_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_get_ldap_attribute_sync (EDBusProxy *proxy,
char **attr,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getLdapAttribute", parameters, -1, NULL, error);
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getLdapAttribute", parameters, -1, NULL, error);
return demarshal_retvals__STRING (retvals, attr);
}
static gboolean
-e_data_cal_gdbus_get_scheduling_information_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_get_scheduling_information_sync (EDBusProxy *proxy,
char **caps,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getSchedulingInformation", parameters, -1, NULL, error);
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getSchedulingInformation", parameters, -1, NULL, error);
return demarshal_retvals__STRING (retvals, caps);
}
static gboolean
-e_data_cal_gdbus_set_mode (GDBusProxy *proxy,
+e_data_cal_gdbus_set_mode (EDBusProxy *proxy,
guint mode,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(u)", mode);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "setMode", parameters, -1, NULL, error);
+ parameters = e_variant_new ("(u)", mode);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "setMode", parameters, -1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static gboolean
-e_data_cal_gdbus_get_object_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_get_object_sync (EDBusProxy *proxy,
const char *IN_uid,
const char *IN_rid,
char **OUT_object,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(ss)", IN_uid, IN_rid);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getObject", parameters, -1, NULL, error);
+ parameters = e_variant_new ("(ss)", IN_uid, IN_rid);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getObject", parameters, -1, NULL, error);
return demarshal_retvals__STRING (retvals, OUT_object);
}
static gboolean
-e_data_cal_gdbus_get_object_list_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_get_object_list_sync (EDBusProxy *proxy,
const char *IN_sexp,
char ***OUT_objects,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(s)", IN_sexp);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getObjectList", parameters, -1, NULL, error);
+ parameters = e_variant_new ("(s)", IN_sexp);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getObjectList", parameters, -1, NULL, error);
return demarshal_retvals__STRINGVECTOR (retvals, OUT_objects);
}
static gboolean
-e_data_cal_gdbus_get_default_object_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_get_default_object_sync (EDBusProxy *proxy,
char **object,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getDefaultObject", parameters, -1, NULL, error);
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getDefaultObject", parameters, -1, NULL, error);
return demarshal_retvals__STRING (retvals, object);
}
static gboolean
-e_data_cal_gdbus_create_object_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_create_object_sync (EDBusProxy *proxy,
const char *IN_object,
char **OUT_uid,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(s)", IN_object);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "createObject", parameters, -1, NULL, error);
+ parameters = e_variant_new ("(s)", IN_object);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "createObject", parameters, -1, NULL, error);
return demarshal_retvals__STRING (retvals, OUT_uid);
}
static gboolean
-e_data_cal_gdbus_modify_object_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_modify_object_sync (EDBusProxy *proxy,
const char *IN_object,
guint IN_mod,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(su)", IN_object, IN_mod);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "modifyObject", parameters, -1, NULL, error);
+ parameters = e_variant_new ("(su)", IN_object, IN_mod);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "modifyObject", parameters, -1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static gboolean
-e_data_cal_gdbus_remove_object_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_remove_object_sync (EDBusProxy *proxy,
const char *IN_uid,
const char *IN_rid,
guint IN_mod,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(ssu)", IN_uid, IN_rid, IN_mod);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "removeObject", parameters, -1, NULL, error);
+ parameters = e_variant_new ("(ssu)", IN_uid, IN_rid, IN_mod);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "removeObject", parameters, -1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static gboolean
-e_data_cal_gdbus_get_timezone_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_get_timezone_sync (EDBusProxy *proxy,
const char *IN_tzid,
char **OUT_object,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(s)", IN_tzid);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getTimezone", parameters, -1, NULL, error);
+ parameters = e_variant_new ("(s)", IN_tzid);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getTimezone", parameters, -1, NULL, error);
return demarshal_retvals__STRING (retvals, OUT_object);
}
static gboolean
-e_data_cal_gdbus_add_timezone_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_add_timezone_sync (EDBusProxy *proxy,
const char *IN_zone,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(s)", IN_zone);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "addTimezone", parameters, -1, NULL, error);
+ parameters = e_variant_new ("(s)", IN_zone);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "addTimezone", parameters, -1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static gboolean
-e_data_cal_gdbus_set_default_timezone_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_set_default_timezone_sync (EDBusProxy *proxy,
const char *IN_zone,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(s)", IN_zone);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "setDefaultTimezone", parameters, -1, NULL, error);
+ parameters = e_variant_new ("(s)", IN_zone);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "setDefaultTimezone", parameters, -1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static gboolean
-e_data_cal_gdbus_get_free_busy_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_get_free_busy_sync (EDBusProxy *proxy,
const char **IN_users,
const guint IN_start,
const guint IN_end,
char ***OUT_free_busy,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(^asuu)", IN_users, -1, IN_start, IN_end);
+ parameters = e_variant_new ("(^asuu)", IN_users, -1, IN_start, IN_end);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getFreeBusy", parameters, -1, NULL, error);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getFreeBusy", parameters, -1, NULL, error);
return demarshal_retvals__STRINGVECTOR (retvals, OUT_free_busy);
}
static gboolean
-e_data_cal_gdbus_send_objects_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_send_objects_sync (EDBusProxy *proxy,
const char *IN_object,
char ***OUT_users,
char **OUT_object,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(s)", IN_object);
+ parameters = e_variant_new ("(s)", IN_object);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "sendObjects", parameters, -1, NULL, error);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "sendObjects", parameters, -1, NULL, error);
return demarshal_retvals__STRINGVECTOR_STRING (retvals, OUT_users, OUT_object);
}
static gboolean
-e_data_cal_gdbus_receive_objects_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_receive_objects_sync (EDBusProxy *proxy,
const char *IN_object,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(s)", IN_object);
+ parameters = e_variant_new ("(s)", IN_object);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "receiveObjects", parameters, -1, NULL, error);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "receiveObjects", parameters, -1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static gboolean
-e_data_cal_gdbus_get_query_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_get_query_sync (EDBusProxy *proxy,
const char *IN_sexp,
char **OUT_path,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(s)", IN_sexp);
+ parameters = e_variant_new ("(s)", IN_sexp);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getQuery", parameters, -1, NULL, error);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getQuery", parameters, -1, NULL, error);
return demarshal_retvals__OBJPATH (retvals, OUT_path);
}
static gboolean
-e_data_cal_gdbus_discard_alarm_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_discard_alarm_sync (EDBusProxy *proxy,
const char *IN_uid,
const char *IN_auid,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(ss)", IN_uid, IN_auid);
+ parameters = e_variant_new ("(ss)", IN_uid, IN_auid);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "discardAlarm", parameters, -1, NULL, error);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "discardAlarm", parameters, -1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
static gboolean
-e_data_cal_gdbus_get_changes_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_get_changes_sync (EDBusProxy *proxy,
const char *IN_change_id,
char ***OUT_additions,
char ***OUT_modifications,
char ***OUT_removals,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(s)", IN_change_id);
+ parameters = e_variant_new ("(s)", IN_change_id);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getChanges", parameters, -1, NULL, error);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getChanges", parameters, -1, NULL, error);
return demarshal_retvals__STRINGVECTOR_STRINGVECTOR_STRINGVECTOR (retvals, OUT_additions, OUT_modifications, OUT_removals);
}
static gboolean
-e_data_cal_gdbus_get_attachment_list_sync (GDBusProxy *proxy,
+e_data_cal_gdbus_get_attachment_list_sync (EDBusProxy *proxy,
const char *IN_uid,
const char *IN_rid,
char ***OUT_attachments,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("(ss)", IN_uid, IN_rid);
+ parameters = e_variant_new ("(ss)", IN_uid, IN_rid);
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "getAttachmentList", parameters, -1, NULL, error);
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "getAttachmentList", parameters, -1, NULL, error);
return demarshal_retvals__STRINGVECTOR (retvals, OUT_attachments);
}
diff --git a/calendar/libecal/e-data-cal-view-gdbus-bindings.h b/calendar/libecal/e-data-cal-view-gdbus-bindings.h
index 37d415f..79e1a33 100644
--- a/calendar/libecal/e-data-cal-view-gdbus-bindings.h
+++ b/calendar/libecal/e-data-cal-view-gdbus-bindings.h
@@ -20,7 +20,7 @@
*/
#include <glib.h>
-#include <gdbus/gdbus.h>
+#include <edbus/edbus.h>
#include <libedata-gdbus-bindings/e-data-gdbus-bindings-common.h>
@@ -30,14 +30,14 @@ G_BEGIN_DECLS
* when possible */
static gboolean
-e_data_cal_view_gdbus_start_sync (GDBusProxy *proxy,
+e_data_cal_view_gdbus_start_sync (EDBusProxy *proxy,
GError **error)
{
- GVariant *parameters;
- GVariant *retvals;
+ EVariant *parameters;
+ EVariant *retvals;
- parameters = g_variant_new ("()");
- retvals = g_dbus_proxy_invoke_method_sync (proxy, "start", parameters, -1, NULL, error);
+ parameters = e_variant_new ("()");
+ retvals = e_dbus_proxy_invoke_method_sync (proxy, "start", parameters, -1, NULL, error);
return demarshal_retvals__VOID (retvals);
}
diff --git a/configure.ac b/configure.ac
index 76c9bc6..be837aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1249,9 +1249,8 @@ dnl ******************************
EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 dbus-glib-1 gobject-2.0 gthread-2.0 gconf-2.0"
EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
-EVOLUTION_ADDRESSBOOK_CFLAGS="$EVOLUTION_ADDRESSBOOK_CFLAGS -I$(top_srcdir)/libedbus"
-EVOLUTION_ADDRESSBOOK_LIBS="$EVOLUTION_ADDRESSBOOK_LIBS $(top_builddir)/libedbus/libedbus.la"
+EVOLUTION_ADDRESSBOOK_LIBS="$EVOLUTION_ADDRESSBOOK_LIBS \$(top_builddir)/edbus/libedbus.la"
AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
@@ -1275,8 +1274,7 @@ dnl *****
AC_SUBST(LIBICAL_EXTRA_LIBS)
EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS, $LIBICAL_EXTRA_CFLAGS, $LIBICAL_EXTRA_LIBS)
- EVOLUTION_CALENDAR_CFLAGS="$EVOLUTION_CALENDAR_CFLAGS -I$(top_srcdir)/libedbus"
- EVOLUTION_CALENDAR_LIBS="$EVOLUTION_CALENDAR_LIBS $(top_builddir)/libedbus/libedbus.la"
+ EVOLUTION_CALENDAR_LIBS="$EVOLUTION_CALENDAR_LIBS \$(top_builddir)/edbus/libedbus.la"
AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
AC_SUBST(EVOLUTION_CALENDAR_LIBS)
diff --git a/libedata-gdbus-bindings/e-data-gdbus-bindings-common.h b/libedata-gdbus-bindings/e-data-gdbus-bindings-common.h
index 3f2c58a..9a20cb1 100644
--- a/libedata-gdbus-bindings/e-data-gdbus-bindings-common.h
+++ b/libedata-gdbus-bindings/e-data-gdbus-bindings-common.h
@@ -36,12 +36,12 @@ closure_free (Closure *closure)
}
static gboolean
-demarshal_retvals__VOID (GVariant *retvals)
+demarshal_retvals__VOID (EVariant *retvals)
{
gboolean success = TRUE;
if (retvals)
- g_variant_unref (retvals);
+ e_variant_unref (retvals);
else
success = FALSE;
@@ -49,21 +49,21 @@ demarshal_retvals__VOID (GVariant *retvals)
}
static gboolean
-demarshal_retvals__OBJPATH (GVariant *retvals, char **OUT_objpath1)
+demarshal_retvals__OBJPATH (EVariant *retvals, char **OUT_objpath1)
{
gboolean success = TRUE;
if (retvals) {
const char *objpath1 = NULL;
- g_variant_get (retvals, "(o)", &objpath1);
+ e_variant_get (retvals, "(o)", &objpath1);
if (objpath1) {
*OUT_objpath1 = g_strdup (objpath1);
} else {
success = FALSE;
}
- g_variant_unref (retvals);
+ e_variant_unref (retvals);
} else {
success = FALSE;
}
@@ -72,21 +72,21 @@ demarshal_retvals__OBJPATH (GVariant *retvals, char **OUT_objpath1)
}
static gboolean
-demarshal_retvals__STRING (GVariant *retvals, char **OUT_string1)
+demarshal_retvals__STRING (EVariant *retvals, char **OUT_string1)
{
gboolean success = TRUE;
if (retvals) {
const char *string1 = NULL;
- g_variant_get (retvals, "(s)", &string1);
+ e_variant_get (retvals, "(s)", &string1);
if (string1) {
*OUT_string1 = g_strdup (string1);
} else {
success = FALSE;
}
- g_variant_unref (retvals);
+ e_variant_unref (retvals);
} else {
success = FALSE;
}
@@ -95,16 +95,16 @@ demarshal_retvals__STRING (GVariant *retvals, char **OUT_string1)
}
static void
-string_dup_from_variant (GVariant *variant,
+string_dup_from_variant (EVariant *variant,
guint child_position,
char **dest,
gboolean *success)
{
- GVariant *string_variant;
+ EVariant *strine_variant;
char *string = NULL;
- string_variant = g_variant_get_child_value (variant, child_position);
- string = g_variant_dup_string (string_variant, NULL);
+ strine_variant = e_variant_get_child_value (variant, child_position);
+ string = e_variant_dup_string (strine_variant, NULL);
if (string) {
*dest = string;
@@ -114,16 +114,16 @@ string_dup_from_variant (GVariant *variant,
}
static void
-strv_dup_from_variant (GVariant *variant,
+strv_dup_from_variant (EVariant *variant,
guint child_position,
char ***dest,
gboolean *success)
{
- GVariant *strv_variant;
+ EVariant *strv_variant;
char **strv = NULL;
- strv_variant = g_variant_get_child_value (variant, child_position);
- strv = g_variant_dup_strv (strv_variant, NULL);
+ strv_variant = e_variant_get_child_value (variant, child_position);
+ strv = e_variant_dup_strv (strv_variant, NULL);
if (strv) {
*dest = strv;
@@ -133,13 +133,13 @@ strv_dup_from_variant (GVariant *variant,
}
static gboolean
-demarshal_retvals__STRINGVECTOR (GVariant *retvals, char ***OUT_strv1)
+demarshal_retvals__STRINGVECTOR (EVariant *retvals, char ***OUT_strv1)
{
gboolean success = TRUE;
if (retvals) {
strv_dup_from_variant (retvals, 0, OUT_strv1, &success);
- g_variant_unref (retvals);
+ e_variant_unref (retvals);
} else {
success = FALSE;
}
@@ -148,7 +148,7 @@ demarshal_retvals__STRINGVECTOR (GVariant *retvals, char ***OUT_strv1)
}
static gboolean
-demarshal_retvals__STRINGVECTOR_STRING (GVariant *retvals,
+demarshal_retvals__STRINGVECTOR_STRING (EVariant *retvals,
char ***OUT_strv1,
char **OUT_string1)
{
@@ -156,7 +156,7 @@ demarshal_retvals__STRINGVECTOR_STRING (GVariant *retvals,
if (retvals) {
string_dup_from_variant (retvals, 1, OUT_string1, &success);
- g_variant_unref (retvals);
+ e_variant_unref (retvals);
} else {
success = FALSE;
}
@@ -165,7 +165,7 @@ demarshal_retvals__STRINGVECTOR_STRING (GVariant *retvals,
}
static gboolean
-demarshal_retvals__STRINGVECTOR_STRINGVECTOR_STRINGVECTOR (GVariant *retvals,
+demarshal_retvals__STRINGVECTOR_STRINGVECTOR_STRINGVECTOR (EVariant *retvals,
char ***OUT_strv1,
char ***OUT_strv2,
char ***OUT_strv3)
@@ -176,7 +176,7 @@ demarshal_retvals__STRINGVECTOR_STRINGVECTOR_STRINGVECTOR (GVariant *retvals,
strv_dup_from_variant (retvals, 0, OUT_strv1, &success);
strv_dup_from_variant (retvals, 1, OUT_strv2, &success);
strv_dup_from_variant (retvals, 2, OUT_strv3, &success);
- g_variant_unref (retvals);
+ e_variant_unref (retvals);
} else {
success = FALSE;
}
@@ -186,32 +186,32 @@ demarshal_retvals__STRINGVECTOR_STRINGVECTOR_STRINGVECTOR (GVariant *retvals,
static gboolean
demarshal_retvals__GPTRARRAY_with_GVALUEARRAY_with_UINT_STRING_endwith_endwith
- (GVariant *retvals,
+ (EVariant *retvals,
GPtrArray **OUT_ptrarray1)
{
gboolean success = TRUE;
if (retvals) {
- GVariant *array1_variant;
- GVariantIter iter1;
+ EVariant *array1_variant;
+ EVariantIter iter1;
GPtrArray *ptrarray1 = NULL;
const guint uint1_tmp;
const char *string1_tmp = NULL;
/* deshelling a (a(us)); there should always be exactly one
* a(us) in the outermost tuple */
- array1_variant = g_variant_get_child_value (retvals, 0);
- g_variant_iter_init (&iter1, array1_variant);
+ array1_variant = e_variant_get_child_value (retvals, 0);
+ e_variant_iter_init (&iter1, array1_variant);
/* return NULL instead of an empty GPtrArray* if there's nothing
* to put in it */
- if (g_variant_n_children (array1_variant) < 1) {
+ if (e_variant_n_children (array1_variant) < 1) {
goto empty_inner_array;
}
ptrarray1 = g_ptr_array_new ();
- while (g_variant_iter_next (&iter1, "(us)", &uint1_tmp, &string1_tmp)) {
+ while (e_variant_iter_next (&iter1, "(us)", &uint1_tmp, &string1_tmp)) {
GValueArray *valuearray = NULL;
GValue uint_value1 = {0};
GValue string_value1 = {0};
@@ -231,7 +231,7 @@ demarshal_retvals__GPTRARRAY_with_GVALUEARRAY_with_UINT_STRING_endwith_endwith
empty_inner_array:
*OUT_ptrarray1 = ptrarray1;
- g_variant_unref (retvals);
+ e_variant_unref (retvals);
} else {
success = FALSE;
}
@@ -240,26 +240,26 @@ empty_inner_array:
}
-typedef void (*reply__VOID) (GDBusProxy *proxy,
+typedef void (*reply__VOID) (EDBusProxy *proxy,
GError *error,
gpointer user_data);
-typedef void (*reply__OBJPATH) (GDBusProxy *proxy,
+typedef void (*reply__OBJPATH) (EDBusProxy *proxy,
char *OUT_path1,
GError *error,
gpointer user_data);
-typedef void (*reply__STRING) (GDBusProxy *proxy,
+typedef void (*reply__STRING) (EDBusProxy *proxy,
char *OUT_string1,
GError *error,
gpointer user_data);
-typedef void (*reply__STRINGVECTOR) (GDBusProxy *proxy,
+typedef void (*reply__STRINGVECTOR) (EDBusProxy *proxy,
char **OUT_strv1,
GError *error,
gpointer user_data);
-typedef void (*reply__GPTRARRAY_with_GVALUEARRAY_with_UINT_STRING_endwith_endwith) (GDBusProxy *proxy,
+typedef void (*reply__GPTRARRAY_with_GVALUEARRAY_with_UINT_STRING_endwith_endwith) (EDBusProxy *proxy,
GPtrArray *OUT_ptrarray1,
GError *error,
gpointer user_data);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
