diff options
| author | Tarnyko <tarnyko@tarnyko.net> | 2014-02-26 15:46:30 +0100 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2014-02-26 15:46:30 +0100 |
| commit | c0f7b4797597f38bbc8fa2c0dfd4aad4297f48bc (patch) | |
| tree | 0ac5355a6bcb83f4ecf0093b84c1e1b199a4c9f8 /libebackend/e-source-registry-server.c | |
| parent | b752152aa42a3c188451b8c2fc08aaf76c56cadf (diff) | |
| download | evolution-data-server-c0f7b4797597f38bbc8fa2c0dfd4aad4297f48bc.tar.gz | |
Replace 'interface' with 'iface' in the code
Win32 headers have a #define for 'interface', which breaks the build when
this word is used in the code, thus replace it to 'iface', the same way
as GLib or GTK+ code use to have it.
Diffstat (limited to 'libebackend/e-source-registry-server.c')
| -rw-r--r-- | libebackend/e-source-registry-server.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libebackend/e-source-registry-server.c b/libebackend/e-source-registry-server.c index 75e028a21..7525b8b33 100644 --- a/libebackend/e-source-registry-server.c +++ b/libebackend/e-source-registry-server.c @@ -652,7 +652,7 @@ source_registry_server_wait_for_client_cb (GObject *source_object, } static gboolean -source_registry_server_allow_auth_prompt_all_cb (EDBusSourceManager *interface, +source_registry_server_allow_auth_prompt_all_cb (EDBusSourceManager *dbus_interface, GDBusMethodInvocation *invocation, ESourceRegistryServer *server) { @@ -667,13 +667,13 @@ source_registry_server_allow_auth_prompt_all_cb (EDBusSourceManager *interface, g_list_free_full (list, (GDestroyNotify) g_object_unref); e_dbus_source_manager_complete_allow_auth_prompt_all ( - interface, invocation); + dbus_interface, invocation); return TRUE; } static gboolean -source_registry_server_authenticate_cb (EDBusSourceManager *interface, +source_registry_server_authenticate_cb (EDBusSourceManager *dbus_interface, GDBusMethodInvocation *invocation, const gchar *source_uid, const gchar *prompt_title, @@ -741,7 +741,7 @@ source_registry_server_authenticate_cb (EDBusSourceManager *interface, g_object_ref (session)); e_dbus_source_manager_complete_authenticate ( - interface, invocation, auth_object_path); + dbus_interface, invocation, auth_object_path); g_object_unref (authenticator); g_object_unref (session); @@ -854,7 +854,7 @@ source_registry_server_create_source (ESourceRegistryServer *server, } static gboolean -source_registry_server_create_sources_cb (EDBusSourceManager *interface, +source_registry_server_create_sources_cb (EDBusSourceManager *dbus_interface, GDBusMethodInvocation *invocation, GVariant *array, ESourceRegistryServer *server) @@ -880,13 +880,13 @@ source_registry_server_create_sources_cb (EDBusSourceManager *interface, g_dbus_method_invocation_take_error (invocation, error); else e_dbus_source_manager_complete_create_sources ( - interface, invocation); + dbus_interface, invocation); return TRUE; } static gboolean -source_registry_server_reload_cb (EDBusSourceManager *interface, +source_registry_server_reload_cb (EDBusSourceManager *dbus_interface, GDBusMethodInvocation *invocation, ESourceRegistryServer *server) { @@ -894,7 +894,7 @@ source_registry_server_reload_cb (EDBusSourceManager *interface, E_DBUS_SERVER (server), E_DBUS_SERVER_EXIT_RELOAD); - e_dbus_source_manager_complete_reload (interface, invocation); + e_dbus_source_manager_complete_reload (dbus_interface, invocation); return TRUE; } |