Changeset 2563

Timestamp:

02/07/06 00:51:00

Author:

chipx86

Message:

When a status is added, compute the object path and send it back to the caller.

Files:

• branches/galago-daemon/protocol-cleanup/ChangeLog (modified) (1 diff)
• branches/galago-daemon/protocol-cleanup/src/presence.c (modified) (3 diffs)

branches/galago-daemon/protocol-cleanup/ChangeLog

@@ +1 @@
+Tue Feb 07 00:50:39 PST 2006  Christian Hammond <chipx86@chipx86.com>
+
+    * src/presence.c:
+      - When a status is added, compute the object path and send it back
+        to the caller.
+
-Mon Feb 06 01:10:05 PST 2006  Christian Hammond <chipx86@chipx86.com>
-

branches/galago-daemon/protocol-cleanup/src/presence.c

@@ -23 +23 @@
-#include "utils.h"
-
+static char *
+galagod_status_generate_path(GalagoPresence *presence, GalagoStatus *status)
+{
+    return g_strdup_printf("%s/%s",
+        galago_object_get_dbus_path(GALAGO_OBJECT(presence)),
+        galago_status_get_id(status));
+}
+
-static void
-_galagod_dbus_presence_emit_status_added(GalagoPresence *presence,
@@ -72 +80 @@
-{
-    GalagoStatus *status;
-
+ = GALAGOD_META_PRESENCE(presence)
-    GalagoPresence *main_presence;
-    DBusMessageIter iter;
+    DBusMessage *reply;
-    const GList* l;
-    const char *status_id;
-    int status_weight = 0;
-
-
+
-
-    dbus_message_iter_init(message, &iter);
-    status = galago_dbus_message_iter_get_object(&iter, GALAGO_TYPE_STATUS);
-
-
+
+
-    status_id = galago_status_get_id(status);
+    obj_path = galagod_status_generate_path(presence, status);
+    galago_object_set_dbus_path(GALAGO_OBJECT(status), obj_path);
+
+    /* Send the reply containing the object path. */
+    reply = dbus_message_new_method_return(message);
+    dbus_message_iter_init_append(reply, &iter);
+    dbus_message_iter_append_basic(&iter, DBUS_TYPE_STRING, &obj_path);
+    dbus_connection_send(dbus_conn, reply, NULL);
+    dbus_message_unref(reply);
+    g_free(obj_path);
-
-    if (!galago_presence_has_status(presence, status_id))
-
+
+
+
+
+
+
+
+
-
-    for (l = galagod_meta_presence_get_presences(meta_presence);
@@ -104 +129 @@
-    main_presence = galagod_meta_presence_get_presence(meta_presence);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    g_object_unref(status);
-
-    galagod_dbus_send_empty_reply(dbus_conn, message);
-
-    return DBUS_HANDLER_RESULT_HANDLED;