Allow dbus clients to silence logging when a service is unavailable.

dbus/object_proxy.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef DBUS_OBJECT_PROXY_H_
 #define DBUS_OBJECT_PROXY_H_
 #pragma once
 
 #include <dbus/dbus.h>
 
@@ skipping 12 matching lines @@
 class Response;
 class Signal;
 
 // ObjectProxy is used to communicate with remote objects, mainly for
 // calling methods of these objects.
 //
 // ObjectProxy is a ref counted object, to ensure that |this| of the
 // object is is alive when callbacks referencing |this| are called.
 class ObjectProxy : public base::RefCountedThreadSafe<ObjectProxy> {
  public:
+  // Clients should decide whether the service pointed to by this
+  // proxy must be available for proper operation. If not, they should
+  // pass IGNORE_SERVICE_UNKNOWN_ERRORS to silence logging of
+  // org.freedesktop.DBus.Error.ServiceUnknown errors.
+  enum ServiceUnknownBehavior {
+    LOG_SERVICE_UNKNOWN_ERRORS,
+    IGNORE_SERVICE_UNKNOWN_ERRORS

[satorux1, 2012/02/10 08:12:52]

Let's make this more generic like

// OR-ed options.
enum ObjectProxyOptions {
  NONE = 0,
  IGNORE_SERVICE_UNKNOWN_ERRORS = 1 << 0,
  // The options are OR-ed so the next option value should be 1 << 1
}

[satorux1, 2012/02/10 08:15:13]

Since it's inside ObjectProxy class, just 'Options' should suffice.

[adamk, 2012/02/10 17:57:16]

Done.

[adamk, 2012/02/10 17:57:16]

Done.

+  };
+
   // Client code should use Bus::GetObjectProxy() instead of this
   // constructor.
   ObjectProxy(Bus* bus,
               const std::string& service_name,
-              const std::string& object_path);
+              const std::string& object_path,
+              ServiceUnknownBehavior service_unknown_behavior);

[satorux1, 2012/02/10 08:12:52]

And make it 'int'

[adamk, 2012/02/10 17:57:16]

Done.

 
   // Special timeout constants.
   //
   // The constants correspond to DBUS_TIMEOUT_USE_DEFAULT and
   // DBUS_TIMEOUT_INFINITE. Here we use literal numbers instead of these
   // macros as these aren't defined with D-Bus earlier than 1.4.12.
   enum {
     TIMEOUT_USE_DEFAULT = -1,
     TIMEOUT_INFINITE = 0x7fffffff,
   };
@@ skipping 139 matching lines @@
   // True if the message filter was added.
   bool filter_added_;
 
   // The method table where keys are absolute signal names (i.e. interface
   // name + signal name), and values are the corresponding callbacks.
   typedef std::map<std::string, SignalCallback> MethodTable;
   MethodTable method_table_;
 
   std::set<std::string> match_rules_;
 
+  const bool log_unknown_service_errors_;
+
   DISALLOW_COPY_AND_ASSIGN(ObjectProxy);
 };
 
 }  // namespace dbus
 
 #endif  // DBUS_OBJECT_PROXY_H_