Changeset 16475

Timestamp:

05/26/08 15:38:52 (5 months ago)

Author:

piotras

Message:

Send serialized object as message when general method is invoked

Files:

• trunk/midgard/core/midgard/src/midgard_core_object.h (modified) (1 diff)
• trunk/midgard/core/midgard/src/midgard_dbus.c (modified) (6 diffs)
• trunk/midgard/core/midgard/src/midgard_object.c (modified) (1 diff)

trunk/midgard/core/midgard/src/midgard_core_object.h

@@ -177 +177 @@
-gboolean _midgard_object_violates_sitegroup(MgdObject *object);
-
+/* D-Bus */
+void _midgard_core_dbus_send_serialized_object(MgdObject *object, const gchar *path);
-
-/* ID lists */

trunk/midgard/core/midgard/src/midgard_dbus.c

@@ -19 +19 @@
-#include "midgard_dbus.h"
-#include "midgard_core_object.h"
+#include "midgard_replicator.h"
-
-#define MIDGARD_DBUS_SERVICE    "org.midgardproject"
@@ -134 +135 @@
-}
-
-void midgard_dbus_send(MidgardConnection *mgd, const gchar *path, const gchar *message
+DBusGProxy *__get_bus_proxy(MidgardConnection *mgd, const gchar *path
-{
-        DBusGProxy *remote_object;
-        DBusGProxy *remote_introspection;
-        GError *error = NULL;
-
@@ -145 +145 @@
-
-        if(!new_path)
-
+ NULL
-
-        DBusGConnection *system_bus = 
@@ -156 +156 @@
-        }
-        
-        /* I have no idea (for a while), how to check if given path is correct */
-        /*
-        GObject *registered = 
-                dbus_g_connection_lookup_g_object(system_bus, path);
-
-        if(registered == NULL) {
-                g_warning("'%s' object is not registered", path);
-                return;
-        }
-        */
-
-        remote_object = dbus_g_proxy_new_for_name_owner(system_bus,
-                        MIDGARD_DBUS_SERVICE,
@@ -172 +161 @@
-                        MIDGARD_DBUS_IFACE, &error);
-
-
+
+
-        if(error) {
-
-
+
-                g_error_free(error);
+                return NULL;
+        }
+
+        return remote_object;
+}
+
+void midgard_dbus_send(MidgardConnection *mgd, const gchar *path, const gchar *message)
+{
+        DBusGProxy *remote_object = __get_bus_proxy(mgd, path);
+
+        if(!remote_object) 
-                return;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        g_debug("%s, %s, %s", 
-                        dbus_g_proxy_get_bus_name(remote_object),
@@ -215 +187 @@
-                        G_TYPE_STRING, message, G_TYPE_INVALID);
-        
+        return;
+}
+
+void _midgard_core_dbus_send_serialized_object(MgdObject *object, const gchar *path)
+{
+        g_assert(object != NULL);
+        g_assert(path != NULL);
+
+        DBusGProxy *remote_object = __get_bus_proxy(object->dbpriv->mgd, path);
+
+        if(!remote_object)
+                return;
+
+        gchar *xml = midgard_replicator_serialize(NULL, object);
+
+        dbus_g_proxy_call_no_reply(remote_object, "notify",
+                        G_TYPE_STRING, xml, G_TYPE_INVALID);
+
+        g_free(xml);
+
-        return;
-}

trunk/midgard/core/midgard/src/midgard_object.c

@@ -69 +69 @@
-#define __dbus_send(_obj, _action) \
-        gchar *_dbus_path = g_strconcat("/mgdschema/", \
-
-       
-midgard_dbus_send(_obj->dbpriv->mgd, _dbus_path, _obj->dbpriv->guid
+       
+
+_midgard_core_dbus_send_serialized_object(_obj, _dbus_path
-        g_free(_dbus_path);
-