[evolution-data-server] Revert "Fix build"



commit 6dfb201dacee79617915400d63f5625cd2f58b76
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Dec 23 16:34:38 2012 -0500

    Revert "Fix build"
    
    This reverts commit 6a243777a56279325847323342492769ce942cf3.
    
    This is wrong.  The bus name is not the same as the object path.

 libebackend/e-user-prompter-server.c |    2 +-
 libebackend/e-user-prompter.c        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/libebackend/e-user-prompter-server.c b/libebackend/e-user-prompter-server.c
index 3d467a7..2ee9ff8 100644
--- a/libebackend/e-user-prompter-server.c
+++ b/libebackend/e-user-prompter-server.c
@@ -386,7 +386,7 @@ e_user_prompter_server_class_init (EUserPrompterServerClass *class)
 	object_class->finalize = user_prompter_server_finalize;
 
 	dbus_server_class = E_DBUS_SERVER_CLASS (class);
-	dbus_server_class->bus_name = E_USER_PROMPTER_SERVER_OBJECT_PATH;
+	dbus_server_class->bus_name = USER_PROMPTER_DBUS_SERVICE_NAME;
 	dbus_server_class->module_directory = MODULE_DIRECTORY;
 	dbus_server_class->bus_acquired = user_prompter_server_bus_acquired;
 	dbus_server_class->quit_server = user_prompter_server_quit_server;
diff --git a/libebackend/e-user-prompter.c b/libebackend/e-user-prompter.c
index f57bb2a..2f4df0b 100644
--- a/libebackend/e-user-prompter.c
+++ b/libebackend/e-user-prompter.c
@@ -243,7 +243,7 @@ user_prompter_prompt_thread (GSimpleAsyncResult *simple,
 	dbus_prompter = e_dbus_user_prompter_proxy_new_for_bus_sync (
 		G_BUS_TYPE_SESSION,
 		G_DBUS_PROXY_FLAGS_NONE,
-		E_USER_PROMPTER_SERVER_OBJECT_PATH,
+		USER_PROMPTER_DBUS_SERVICE_NAME,
 		"/org/gnome/evolution/dataserver/UserPrompter",
 		cancellable,
 		&local_error);



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