evolution r36132 - branches/mail-dbus-remoting/mail

[sragavan svn gnome org]

Author: sragavan
Date: Wed Aug 27 18:23:45 2008
New Revision: 36132
URL: http://svn.gnome.org/viewvc/evolution?rev=36132&view=rev

Log:
remove all hacks, it still doesn't work.


Modified:
   branches/mail-dbus-remoting/mail/camel-object-remote-impl.c
   branches/mail-dbus-remoting/mail/camel-object-remote.c

Modified: branches/mail-dbus-remoting/mail/camel-object-remote-impl.c
==============================================================================
--- branches/mail-dbus-remoting/mail/camel-object-remote-impl.c	(original)
+++ branches/mail-dbus-remoting/mail/camel-object-remote-impl.c	Wed Aug 27 18:23:45 2008
@@ -41,13 +41,13 @@
 	dbus_error_init (&err);
 
 	DBusConnection *dbus = e_dbus_connection_get();
-
-	signal = dbus_message_new_method_call (CAMEL_DBUS_NAME, CAMEL_SESSION_OBJECT_PATH, 
+	printf("Sending session cb signal\n");
+	signal = dbus_message_new_method_call ("org.gnome.evolution.mail", CAMEL_SESSION_OBJECT_PATH, 
 					CAMEL_SESSION_INTERFACE, 
 					"session_signal");
 	/* It sucks here to pass the pointer across the object */
 	dbus_message_append_args (signal, DBUS_TYPE_INT32, &ev_data, DBUS_TYPE_INT32, &data, DBUS_TYPE_INVALID);
-	if (!dbus_connection_send (ctx->cnx, signal, &err)) {
+	if (!dbus_connection_send (dbus, signal, &err)) {
 		g_warning ("error: %s\n", err.message);
 	}
 	dbus_message_unref (signal);

Modified: branches/mail-dbus-remoting/mail/camel-object-remote.c
==============================================================================
--- branches/mail-dbus-remoting/mail/camel-object-remote.c	(original)
+++ branches/mail-dbus-remoting/mail/camel-object-remote.c	Wed Aug 27 18:23:45 2008
@@ -44,11 +44,14 @@
 {
 	DBusObjectPathVTable *dbus_listener_vtable;
 	DBindContext *ctx = evolution_dbus_peek_context ();
-
+	DBusError err; int ret;
+	dbus_error_init (&err);
 	dbus_listener_vtable = g_new0 (DBusObjectPathVTable, 1);
 	dbus_listener_vtable->message_function = reg;
 	dbus_listener_vtable->unregister_function = unreg;
-
+	
+	ret = dbus_bus_request_name (ctx->cnx, "org.gnome.evolution.mail", DBUS_NAME_FLAG_REPLACE_EXISTING, &err);
+	printf("req bus :%d %s\n", ret, err.message);
 	if (!dbus_connection_register_object_path (ctx->cnx,
 						   object_path,
 						   dbus_listener_vtable,