Merge mozilla-central and birch
authorEd Morley <emorley@mozilla.com>
Thu, 11 Jul 2013 10:59:04 +0100
changeset 138167 7add0d101b2c56783f59eb6c849b689e7c23c468
parent 138119 82fafd8ee40fac3255f81cf1ae2d5c72cf75deb7 (current diff)
parent 138166 69c95014121c0a22f1ffab54aa9935029eea2bde (diff)
child 138168 727dbc1b23d01c86c900885505931faae7e774c3
push id30845
push userryanvm@gmail.com
push dateThu, 11 Jul 2013 14:59:18 +0000
treeherdermozilla-inbound@f20a94209ab7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central and birch
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,4 +1,4 @@
 {
-    "revision": "19b1966f7051577da93d84f7c7b13411a168cce9", 
+    "revision": "3f9b2319c2b3b9491a5e7dd525fe3c22cca73490", 
     "repo_path": "/integration/gaia-central"
 }
--- a/dom/bluetooth/linux/BluetoothDBusService.cpp
+++ b/dom/bluetooth/linux/BluetoothDBusService.cpp
@@ -338,38 +338,16 @@ ExtractHandles(DBusMessage *aReply, nsTA
     }
   } else {
     LOG_AND_FREE_DBUS_ERROR(&err);
   }
 }
 
 // static
 bool
-BluetoothDBusService::AddServiceRecords(const char* serviceName,
-                                        unsigned long long uuidMsb,
-                                        unsigned long long uuidLsb,
-                                        int channel)
-{
-  MOZ_ASSERT(!NS_IsMainThread());
-
-  DBusMessage* reply =
-    dbus_func_args(gThreadConnection->GetConnection(),
-                   NS_ConvertUTF16toUTF8(sAdapterPath).get(),
-                   DBUS_ADAPTER_IFACE, "AddRfcommServiceRecord",
-                   DBUS_TYPE_STRING, &serviceName,
-                   DBUS_TYPE_UINT64, &uuidMsb,
-                   DBUS_TYPE_UINT64, &uuidLsb,
-                   DBUS_TYPE_UINT16, &channel,
-                   DBUS_TYPE_INVALID);
-
-  return reply ? dbus_returns_uint32(reply) : -1;
-}
-
-// static
-bool
 BluetoothDBusService::AddReservedServicesInternal(
                                    const nsTArray<uint32_t>& aServices,
                                    nsTArray<uint32_t>& aServiceHandlesContainer)
 {
   MOZ_ASSERT(!NS_IsMainThread());
 
   int length = aServices.Length();
   if (length == 0) return false;
--- a/dom/bluetooth/linux/BluetoothDBusService.h
+++ b/dom/bluetooth/linux/BluetoothDBusService.h
@@ -53,28 +53,16 @@ public:
               BluetoothReplyRunnable* aRunnable) MOZ_OVERRIDE;
 
   virtual bool
   GetDevicePath(const nsAString& aAdapterPath,
                 const nsAString& aDeviceAddress,
                 nsAString& aDevicePath) MOZ_OVERRIDE;
 
   static bool
-  AddServiceRecords(const char* serviceName,
-                    unsigned long long uuidMsb,
-                    unsigned long long uuidLsb,
-                    int channel);
-
-  static bool
-  RemoveServiceRecords(const char* serviceName,
-                       unsigned long long uuidMsb,
-                       unsigned long long uuidLsb,
-                       int channel);
-
-  static bool
   AddReservedServicesInternal(const nsTArray<uint32_t>& aServices,
                               nsTArray<uint32_t>& aServiceHandlesContainer);
 
   static bool
   RemoveReservedServicesInternal(const nsTArray<uint32_t>& aServiceHandles);
 
   virtual nsresult
   GetScoSocket(const nsAString& aObjectPath,
--- a/ipc/dbus/DBusUtils.cpp
+++ b/ipc/dbus/DBusUtils.cpp
@@ -625,32 +625,16 @@ int dbus_returns_int32(DBusMessage *repl
                              DBUS_TYPE_INT32, &ret,
                              DBUS_TYPE_INVALID)) {
     LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, reply);
   }
 
   return ret;
 }
 
-int dbus_returns_uint32(DBusMessage *reply)
-{
-  DBusError err;
-  uint32_t ret = -1;
-
-  dbus_error_init(&err);
-  if (!dbus_message_get_args(reply, &err,
-                             DBUS_TYPE_UINT32, &ret,
-                             DBUS_TYPE_INVALID)) {
-    LOG_AND_FREE_DBUS_ERROR_WITH_MSG(&err, reply);
-  }
-
-  dbus_message_unref(reply);
-  return ret;
-}
-
 void DBusReplyHandler::Callback(DBusMessage* aReply, void* aData)
 {
   MOZ_ASSERT(aData);
 
   nsRefPtr<DBusReplyHandler> handler =
     already_AddRefed<DBusReplyHandler>(static_cast<DBusReplyHandler*>(aData));
 
   handler->Handle(aReply);
--- a/ipc/dbus/DBusUtils.h
+++ b/ipc/dbus/DBusUtils.h
@@ -158,15 +158,13 @@ DBusMessage*  dbus_func_args_timeout_val
                                             const char* path,
                                             const char* ifc,
                                             const char* func,
                                             int first_arg_type,
                                             va_list args);
 
 int dbus_returns_int32(DBusMessage *reply);
 
-int dbus_returns_uint32(DBusMessage *reply);
-
 }
 }
 
 #endif