-/* static void */
-/* update_device_name_from_msg (DBusMessage *message) */
-/* { */
-/* DBusError error; */
-/* DBusMessageIter iter; */
-
-/* dbus_error_init (&error); */
-
-/* if (dbus_set_error_from_message (&error, message)) { */
-/* g_printerr ("modest: failed to get bluetooth name: %s\n", error.message); */
-/* dbus_error_free (&error); */
-/* } else { */
-/* const gchar *device_name; */
-/* if (!dbus_message_iter_init (message, &iter)) { */
-/* g_printerr ("modest: message did not have argument\n"); */
-/* return; */
-/* } */
-/* dbus_message_iter_get_basic (&iter, &device_name); */
-/* modest_conf_set_string (modest_runtime_get_conf(), */
-/* MODEST_CONF_DEVICE_NAME, device_name, */
-/* NULL); */
-/* } */
-/* } */
-
-
-/* static void */
-/* on_device_name_received (DBusPendingCall *call, void *user_data) */
-/* { */
-/* DBusMessage *message; */
-
-/* g_return_if_fail (dbus_pending_call_get_completed (call)); */
-
-/* message = dbus_pending_call_steal_reply (call); */
-/* if (!message) { */
-/* g_printerr ("modest: no reply on device name query\n"); */
-/* return; */
-/* } */
-
-/* update_device_name_from_msg (message); */
-/* dbus_message_unref (message); */
-/* } */
-
-
-/* static DBusHandlerResult */
-/* handle_dbus_signal (DBusConnection *conn, DBusMessage *msg, gpointer data) */
-/* { */
-/* if (dbus_message_is_signal(msg, BTNAME_SIGNAL_IF, BTNAME_SIG_CHANGED)) */
-/* update_device_name_from_msg (msg); */
-
-/* return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; */
-/* } */
-