* doc/TODO, various source files: Audited todo's and FIXME's and

  prepended the ones we should be looking at with 1.0.  Those
  prepended with 1.0? need clerification or might not be needed
  for 1.0

10 files changed, 20 insertions, 21 deletions

diff --git a/dbus/dbus-auth.c b/dbus/dbus-auth.c
index 63348536..7ece76e4 100644
--- a/dbus/dbus-auth.c
+++ b/dbus/dbus-auth.c
@@ -1925,7 +1925,7 @@ process_command (DBusAuth *auth)
   if (!_dbus_string_move (&line, i, &args, 0))
     goto out;
 
-  /* FIXME we should probably validate that only the allowed
+  /* FIXME 1.0 we should probably validate that only the allowed
    * chars are in the command name
    */
   
@@ -2397,7 +2397,7 @@ _dbus_auth_needs_decoding (DBusAuth *auth)
  * the peer. If no encoding was negotiated, just copies the bytes (you
  * can avoid this by checking _dbus_auth_needs_decoding()).
  *
- * @todo We need to be able to distinguish "out of memory" error
+ * @todo 1.0? We need to be able to distinguish "out of memory" error
  * from "the data is hosed" error.
  *
  * @param auth the auth conversation
diff --git a/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 27720998..06c08d01 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -444,7 +444,7 @@ _dbus_connection_queue_received_message_link (DBusConnection  *connection,
  * @param connection the connection.
  * @param link the list node and message to queue.
  *
- * @todo This needs to wake up the mainloop if it is in
+ * @todo 1.0? This needs to wake up the mainloop if it is in
  * a poll/select and this is a multithreaded app.
  */
 void
@@ -863,9 +863,10 @@ free_pending_call_on_hash_removal (void *data)
       _dbus_pending_call_set_timeout_added_unlocked (pending, FALSE);
     }
 
-  /* FIXME this is sort of dangerous and undesirable to drop the lock here, but
-   * the pending call finalizer could in principle call out to application code
-   * so we pretty much have to... some larger code reorg might be needed.
+  /* FIXME 1.0? this is sort of dangerous and undesirable to drop the lock 
+   * here, but the pending call finalizer could in principle call out to 
+   * application code so we pretty much have to... some larger code reorg 
+   * might be needed.
    */
   _dbus_connection_ref_unlocked (connection);
   _dbus_pending_call_unref_and_unlock (pending);
@@ -2693,7 +2694,7 @@ _dbus_connection_block_pending_call (DBusPendingCall *pending)
   
   if (!_dbus_connection_get_is_connected_unlocked (connection))
     {
-      /* FIXME send a "DBUS_ERROR_DISCONNECTED" instead, just to help
+      /* FIXME 1.0 send a "DBUS_ERROR_DISCONNECTED" instead, just to help
        * programmers understand what went wrong since the timeout is
        * confusing
        */
diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c
index 018f45af..491e3701 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 there's a memory leak on some codepath in here, I saw it once
+ * @todo 1.0? 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-marshal-basic.c b/dbus/dbus-marshal-basic.c
index 048e85a1..e5144fed 100644
--- a/dbus/dbus-marshal-basic.c
+++ b/dbus/dbus-marshal-basic.c
@@ -598,7 +598,8 @@ _dbus_marshal_read_basic (const DBusString      *str,
  * If you ask for #DBUS_TYPE_DOUBLE you will get a "const double*" back
  * and the "value" argument should be a "const double**" and so on.
  *
- * @todo we aren't using this function (except in the test suite)
+ * @todo 1.0 we aren't using this function (except in the test suite)
+ *       add #ifdefs around it
  * 
  * @param str the string to read from
  * @param pos position to read from
@@ -1359,7 +1360,8 @@ _dbus_type_to_string (int typecode)
 /**
  * If in verbose mode, print a block of binary data.
  *
- * @todo right now it prints even if not in verbose mode
+ * @todo 1.0 right now it prints even if not in verbose mode
+ *           check for verbose mode and return if not
  *
  * @param data the data
  * @param len the length of the data
diff --git a/dbus/dbus-marshal-recursive.h b/dbus/dbus-marshal-recursive.h
index 328741ac..686d162e 100644
--- a/dbus/dbus-marshal-recursive.h
+++ b/dbus/dbus-marshal-recursive.h
@@ -46,7 +46,7 @@ typedef struct DBusArrayLenFixup   DBusArrayLenFixup;
  * and getting the values should be fast and not involve all this type
  * reader nonsense.
  *
- * @todo DBusTypeMark isn't used right now and probably won't be, we should delete it
+ * @todo 1.0 DBusTypeMark isn't used right now and probably won't be, we should delete it
  */
 struct DBusTypeMark
 {
diff --git a/dbus/dbus-message-util.c b/dbus/dbus-message-util.c
index 81034da4..67cfffdc 100644
--- a/dbus/dbus-message-util.c
+++ b/dbus/dbus-message-util.c
@@ -40,10 +40,6 @@
  * basic type may be read with this function. See
  * dbus_message_get_args() for more details.
  *
- * @todo this is static for now because there's no corresponding
- * iter_append_args() and I'm not sure we need this function to be
- * public since dbus_message_get_args() is what you usually want
- *
  * @param iter the message iterator
  * @param error error to be filled in on failure
  * @param first_arg_type the first argument type
diff --git a/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c
index bb903922..91eff7aa 100644
--- a/dbus/dbus-pending-call.c
+++ b/dbus/dbus-pending-call.c
@@ -624,7 +624,7 @@ dbus_pending_call_steal_reply (DBusPendingCall *pending)
  * If the pending call is already completed, this function returns
  * immediately.
  *
- * @todo when you start blocking, the timeout is reset, but it should
+ * @todo 1.0? when you start blocking, the timeout is reset, but it should
  * really only use time remaining since the pending call was created.
  *
  * @param pending the pending call
diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c
index b406c869..63e6b268 100644
--- a/dbus/dbus-server.c
+++ b/dbus/dbus-server.c
@@ -471,7 +471,7 @@ _dbus_server_toggle_timeout (DBusServer  *server,
  * dbus_server_set_watch_functions() should be called
  * immediately to render the server fully functional.
  *
- * @todo error messages on bad address could really be better.
+ * @todo 1.0? error messages on bad address could really be better.
  * DBusResultCode is a bit limiting here.
  *
  * @param address the address of this server.
@@ -558,7 +558,7 @@ dbus_server_listen (const char     *address,
                   goto out;
                 }
               
-              /* FIXME - we will unconditionally unlink() the path if
+              /* 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
diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
index 404be44b..0c57379a 100644
--- a/dbus/dbus-sysdeps-util-unix.c
+++ b/dbus/dbus-sysdeps-util-unix.c
@@ -252,7 +252,7 @@ _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 not sure this is right, maybe if setuid()
+   * FIXME 1.0 not sure this is right, maybe if setuid()
    * is going to work then setgroups() should also work.
    */
   if (setgroups (0, NULL) < 0)
@@ -494,7 +494,7 @@ _dbus_directory_open (const DBusString *filename,
  * UNIX. If an error occurs, the contents of "filename" are
  * undefined. The error is never set if the function succeeds.
  *
- * @todo for thread safety, I think we have to use
+ * @todo 1.0 for thread safety, I think we have to use
  * readdir_r(). (GLib has the same issue, should file a bug.)
  *
  * @param iter the iterator
diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index 3dfe0e8b..e5ea4359 100644
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -98,7 +98,7 @@ _dbus_abort (void)
  * Wrapper for setenv(). If the value is #NULL, unsets
  * the environment variable.
  *
- * @todo if someone can verify it's safe, we could avoid the
+ * @todo 1.0 if someone can verify it's safe, we could avoid the
  * memleak when doing an unset.
  *
  * @param varname name of environment variable