* remove a bunch of todo items from the 1.0 list

10 files changed, 17 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 83a8b34c..5be892d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-09-11  John (J5) Palmieri  <johnp@redhat.com>
 
+	* remove a bunch of todo items from the 1.0 list
+
+2006-09-11  John (J5) Palmieri  <johnp@redhat.com>
+
 	* bus/activation.c, bus/desktop-file.c: Distinguish between OOM and
 	key not found
 
diff --git a/bus/activation.c b/bus/activation.c
index fa439c41..8f9d653f 100644
--- a/bus/activation.c
+++ b/bus/activation.c
@@ -1017,7 +1017,7 @@ bus_activation_send_pending_auto_activation_messages (BusActivation  *activation
 }
 
 /**
- * FIXME @todo 1.0? the error messages here would ideally be preallocated
+ * FIXME @todo the error messages here would ideally be preallocated
  * so we don't need to allocate memory to send them.
  * Using the usual tactic, prealloc an OOM message, then
  * if we can't alloc the real error send the OOM error instead.
diff --git a/bus/connection.c b/bus/connection.c
index d05b7756..a7f3c1e9 100644
--- a/bus/connection.c
+++ b/bus/connection.c
@@ -183,12 +183,12 @@ bus_connection_disconnected (DBusConnection *connection)
       bus_matchmaker_disconnected (matchmaker, connection);
     }
   
-  /* Drop any service ownership. FIXME 1.0? Unfortunately, this requires
+  /* Drop any service ownership. Unfortunately, this requires
    * memory allocation and there doesn't seem to be a good way to
    * handle it other than sleeping; we can't "fail" the operation of
    * disconnecting a client, and preallocating a broadcast "service is
    * now gone" message for every client-service pair seems kind of
-   * involved. Probably we need to do that though.
+   * involved.
    */
   while ((service = _dbus_list_get_last (&d->services_owned)))
     {
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 4011c013..a9755131 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -446,8 +446,6 @@ _dbus_connection_queue_received_message_link (DBusConnection  *connection,
  * @param connection the connection.
  * @param link the list node and message to queue.
  *
- * @todo 1.0? This needs to wake up the mainloop if it is in
- * a poll/select and this is a multithreaded app.
  */
 void
 _dbus_connection_queue_synthesized_message_link (DBusConnection *connection,
diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c
index 491e3701..018f45af 100644
--- a/dbus/dbus-keyring.c
+++ b/dbus/dbus-keyring.c
@@ -44,7 +44,7 @@
  * by a single server instance for a fixed period of time, then
  * discarded). Also, the keys are not sent over the wire.
  *
- * @todo 1.0? there's a memory leak on some codepath in here, I saw it once
+ * @todo there's a memory leak on some codepath in here, I saw it once
  * when running make check - probably some specific initial cookies
  * present in the cookie file, then depending on what we do with them.
  */
diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c
index 91eff7aa..ec57395e 100644
--- a/dbus/dbus-pending-call.c
+++ b/dbus/dbus-pending-call.c
@@ -624,8 +624,9 @@ dbus_pending_call_steal_reply (DBusPendingCall *pending)
  * If the pending call is already completed, this function returns
  * immediately.
  *
- * @todo 1.0? when you start blocking, the timeout is reset, but it should
+ * @todo when you start blocking, the timeout is reset, but it should
  * really only use time remaining since the pending call was created.
+ * This requires storing timestamps instead of intervals in the timeout
  *
  * @param pending the pending call
  */
diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c
index 63e6b268..d9c7f028 100644
--- a/dbus/dbus-server.c
+++ b/dbus/dbus-server.c
@@ -558,13 +558,6 @@ dbus_server_listen (const char     *address,
                   goto out;
                 }
               
-              /* FIXME 1.0 - we will unconditionally unlink() the path if
-               * we don't support abstract namespace.  unlink() does
-               * not follow symlinks, but would like independent
-               * confirmation this is safe enough. See also
-               * _dbus_listen_unix_socket() and comments therein.
-               */
-
               /* Always use abstract namespace if possible with tmpdir */
               
               server =
diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index c40c5206..b7c1ba06 100644
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -455,7 +455,7 @@ _dbus_listen_unix_socket (const char     *path,
     }
   else
     {
-      /* FIXME discussed security implications of this with Nalin,
+      /* Discussed security implications of this with Nalin,
        * and we couldn't think of where it would kick our ass, but
        * it still seems a bit sucky. It also has non-security suckage;
        * really we'd prefer to exit if the socket is already in use.
diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
index 0c57379a..981d4e3e 100644
--- a/dbus/dbus-sysdeps-util-unix.c
+++ b/dbus/dbus-sysdeps-util-unix.c
@@ -252,7 +252,8 @@ _dbus_change_identity  (dbus_uid_t     uid,
   /* setgroups() only works if we are a privileged process,
    * so we don't return error on failure; the only possible
    * failure is that we don't have perms to do it.
-   * FIXME 1.0 not sure this is right, maybe if setuid()
+   *
+   * not sure this is right, maybe if setuid()
    * is going to work then setgroups() should also work.
    */
   if (setgroups (0, NULL) < 0)
diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index 7da367a6..d09f33e6 100644
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -75,8 +75,10 @@ _dbus_abort (void)
  * Wrapper for setenv(). If the value is #NULL, unsets
  * the environment variable.
  *
- * @todo 1.0 if someone can verify it's safe, we could avoid the
- * memleak when doing an unset.
+ * There is an unfixable memleak in that it is unsafe to
+ * free memory malloced for use with setenv. This is because
+ * we can not rely on internal implementation details of
+ * the underlying libc library.
  *
  * @param varname name of environment variable
  * @param value value of environment variable